From c7bd48573a60a25f1d2cbadf642f781eb991e1f1 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 10:16:13 -0800
Subject: [PATCH 01/18] fix(codegen): function prologue resolution edge cases
 (#3005)

* fix(codegen): function prologue resolution edge cases

* remove hacky fallback

* case insensitive lookup

* fix python nan and inf resolution

* remove template literal check

* fix tests

* consolidate literal gen
---
 apps/sim/app/api/function/execute/route.ts    | 20 ++++----
 apps/sim/executor/utils/code-formatting.ts    | 48 +++++++++++++++++++
 apps/sim/executor/variables/resolver.ts       | 18 +++----
 .../variables/resolvers/block.test.ts         | 10 +---
 .../sim/executor/variables/resolvers/block.ts | 35 ++------------
 .../executor/variables/resolvers/reference.ts | 10 +++-
 apps/sim/lib/execution/isolated-vm-worker.cjs |  2 +
 .../variables/variable-manager.test.ts        |  4 +-
 .../workflows/variables/variable-manager.ts   |  2 +-
 9 files changed, 86 insertions(+), 63 deletions(-)
 create mode 100644 apps/sim/executor/utils/code-formatting.ts

diff --git a/apps/sim/app/api/function/execute/route.ts b/apps/sim/app/api/function/execute/route.ts
index 434b2d54d..4ccbd8d7c 100644
--- a/apps/sim/app/api/function/execute/route.ts
+++ b/apps/sim/app/api/function/execute/route.ts
@@ -8,6 +8,7 @@ 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,
@@ -387,7 +388,12 @@ function resolveWorkflowVariables(
       if (type === 'number') {
         variableValue = Number(variableValue)
       } else if (type === 'boolean') {
-        variableValue = variableValue === 'true' || variableValue === true
+        if (typeof variableValue === 'boolean') {
+          // Already a boolean, keep as-is
+        } else {
+          const normalized = String(variableValue).toLowerCase().trim()
+          variableValue = normalized === 'true'
+        }
       } else if (type === 'json' && typeof variableValue === 'string') {
         try {
           variableValue = JSON.parse(variableValue)
@@ -687,11 +693,7 @@ 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)) {
-          if (v === undefined) {
-            prologue += `const ${k} = undefined;\n`
-          } else {
-            prologue += `const ${k} = JSON.parse(${JSON.stringify(JSON.stringify(v))});\n`
-          }
+          prologue += `const ${k} = ${formatLiteralForCode(v, 'javascript')};\n`
           prologueLineCount++
         }
 
@@ -762,11 +764,7 @@ 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)) {
-        if (v === undefined) {
-          prologue += `${k} = None\n`
-        } else {
-          prologue += `${k} = json.loads(${JSON.stringify(JSON.stringify(v))})\n`
-        }
+        prologue += `${k} = ${formatLiteralForCode(v, 'python')}\n`
         prologueLineCount++
       }
       const wrapped = [
diff --git a/apps/sim/executor/utils/code-formatting.ts b/apps/sim/executor/utils/code-formatting.ts
new file mode 100644
index 000000000..a4a73dee8
--- /dev/null
+++ b/apps/sim/executor/utils/code-formatting.ts
@@ -0,0 +1,48 @@
+/**
+ * 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)
+}
diff --git a/apps/sim/executor/variables/resolver.ts b/apps/sim/executor/variables/resolver.ts
index 980708931..05077c81e 100644
--- a/apps/sim/executor/variables/resolver.ts
+++ b/apps/sim/executor/variables/resolver.ts
@@ -157,7 +157,14 @@ export class VariableResolver {
 
     let replacementError: Error | null = null
 
-    // Use generic utility for smart variable reference replacement
+    const blockType = block?.metadata?.id
+    const language =
+      blockType === BlockType.FUNCTION
+        ? ((block?.config?.params as Record<string, unknown> | undefined)?.language as
+            | string
+            | undefined)
+        : undefined
+
     let result = replaceValidReferences(template, (match) => {
       if (replacementError) return match
 
@@ -167,14 +174,7 @@ export class VariableResolver {
           return match
         }
 
-        const blockType = block?.metadata?.id
-        const isInTemplateLiteral =
-          blockType === BlockType.FUNCTION &&
-          template.includes('${') &&
-          template.includes('}') &&
-          template.includes('`')
-
-        return this.blockResolver.formatValueForBlock(resolved, blockType, isInTemplateLiteral)
+        return this.blockResolver.formatValueForBlock(resolved, blockType, language)
       } catch (error) {
         replacementError = error instanceof Error ? error : new Error(String(error))
         return match
diff --git a/apps/sim/executor/variables/resolvers/block.test.ts b/apps/sim/executor/variables/resolvers/block.test.ts
index f08b22fc2..01a804900 100644
--- a/apps/sim/executor/variables/resolvers/block.test.ts
+++ b/apps/sim/executor/variables/resolvers/block.test.ts
@@ -257,15 +257,9 @@ describe('BlockResolver', () => {
       expect(result).toBe('"hello"')
     })
 
-    it.concurrent('should format string for function block in template literal', () => {
+    it.concurrent('should format object for function block', () => {
       const resolver = new BlockResolver(createTestWorkflow())
-      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)
+      const result = resolver.formatValueForBlock({ a: 1 }, 'function')
       expect(result).toBe('{"a":1}')
     })
 
diff --git a/apps/sim/executor/variables/resolvers/block.ts b/apps/sim/executor/variables/resolvers/block.ts
index 09d246e80..63ab36138 100644
--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -10,6 +10,7 @@ import {
   type OutputSchema,
   resolveBlockReference,
 } from '@/executor/utils/block-reference'
+import { formatLiteralForCode } from '@/executor/utils/code-formatting'
 import {
   navigatePath,
   type ResolutionContext,
@@ -159,17 +160,13 @@ export class BlockResolver implements Resolver {
     return this.nameToBlockId.get(normalizeName(name))
   }
 
-  public formatValueForBlock(
-    value: any,
-    blockType: string | undefined,
-    isInTemplateLiteral = false
-  ): string {
+  public formatValueForBlock(value: any, blockType: string | undefined, language?: string): string {
     if (blockType === 'condition') {
       return this.stringifyForCondition(value)
     }
 
     if (blockType === 'function') {
-      return this.formatValueForCodeContext(value, isInTemplateLiteral)
+      return this.formatValueForCodeContext(value, language)
     }
 
     if (blockType === 'response') {
@@ -210,29 +207,7 @@ export class BlockResolver implements Resolver {
     return String(value)
   }
 
-  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)
+  private formatValueForCodeContext(value: any, language?: string): string {
+    return formatLiteralForCode(value, language === 'python' ? 'python' : 'javascript')
   }
 }
diff --git a/apps/sim/executor/variables/resolvers/reference.ts b/apps/sim/executor/variables/resolvers/reference.ts
index 9f4b69eec..2c153154f 100644
--- a/apps/sim/executor/variables/resolvers/reference.ts
+++ b/apps/sim/executor/variables/resolvers/reference.ts
@@ -30,7 +30,10 @@ export function navigatePath(obj: any, path: string[]): any {
     const arrayMatch = part.match(/^([^[]+)(\[.+)$/)
     if (arrayMatch) {
       const [, prop, bracketsPart] = arrayMatch
-      current = current[prop]
+      current =
+        typeof current === 'object' && current !== null
+          ? (current as Record<string, unknown>)[prop]
+          : undefined
       if (current === undefined || current === null) {
         return undefined
       }
@@ -49,7 +52,10 @@ export function navigatePath(obj: any, path: string[]): any {
       const index = Number.parseInt(part, 10)
       current = Array.isArray(current) ? current[index] : undefined
     } else {
-      current = current[part]
+      current =
+        typeof current === 'object' && current !== null
+          ? (current as Record<string, unknown>)[part]
+          : undefined
     }
   }
   return current
diff --git a/apps/sim/lib/execution/isolated-vm-worker.cjs b/apps/sim/lib/execution/isolated-vm-worker.cjs
index f6c587a15..932ef997d 100644
--- a/apps/sim/lib/execution/isolated-vm-worker.cjs
+++ b/apps/sim/lib/execution/isolated-vm-worker.cjs
@@ -132,6 +132,8 @@ 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())
       }
diff --git a/apps/sim/lib/workflows/variables/variable-manager.test.ts b/apps/sim/lib/workflows/variables/variable-manager.test.ts
index 4796ce19b..08da0cc85 100644
--- 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(true)
+      expect(VariableManager.parseInputForStorage('1', 'boolean')).toBe(false)
       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(true)
+      expect(VariableManager.resolveForExecution('1', 'boolean')).toBe(false)
       expect(VariableManager.resolveForExecution('0', 'boolean')).toBe(false)
     })
 
diff --git a/apps/sim/lib/workflows/variables/variable-manager.ts b/apps/sim/lib/workflows/variables/variable-manager.ts
index 04ed5b9e4..7807d466c 100644
--- 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' || normalized === '1'
+        return normalized === 'true'
       }
 
       case 'object':

From 56bc809c6fa10b9ea0c8709493f3b85991e77b75 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 13:07:11 -0800
Subject: [PATCH 02/18] fix(docs): separate local and blob asset resolution for
 quick-reference (#3007)

* fix(docs): separate local and blob asset resolution for quick-reference

ActionImage now uses local paths directly for PNGs while ActionVideo
uses blob storage with proper path normalization (strips static/ prefix).

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* refactor(docs): simplify asset resolution by using correct paths directly

Remove path normalization logic from action-media component. Instead,
use the appropriate paths in MDX:
- PNGs: /static/quick-reference/... (local)
- MP4s: quick-reference/... (blob via getAssetUrl)

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 apps/docs/components/ui/action-media.tsx      |  6 +--
 .../content/docs/en/quick-reference/index.mdx | 38 +++++++++----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/apps/docs/components/ui/action-media.tsx b/apps/docs/components/ui/action-media.tsx
index 13c906368..1f187fb90 100644
--- a/apps/docs/components/ui/action-media.tsx
+++ b/apps/docs/components/ui/action-media.tsx
@@ -13,11 +13,9 @@ interface ActionVideoProps {
 }
 
 export function ActionImage({ src, alt }: ActionImageProps) {
-  const resolvedSrc = getAssetUrl(src.startsWith('/') ? src.slice(1) : src)
-
   return (
     <img
-      src={resolvedSrc}
+      src={src}
       alt={alt}
       className='inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700'
     />
@@ -25,7 +23,7 @@ export function ActionImage({ src, alt }: ActionImageProps) {
 }
 
 export function ActionVideo({ src, alt }: ActionVideoProps) {
-  const resolvedSrc = getAssetUrl(src.startsWith('/') ? src.slice(1) : src)
+  const resolvedSrc = getAssetUrl(src)
 
   return (
     <video
diff --git a/apps/docs/content/docs/en/quick-reference/index.mdx b/apps/docs/content/docs/en/quick-reference/index.mdx
index e0996d0b1..85ca46867 100644
--- 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="/static/quick-reference/create-workspace.mp4" alt="Create workspace" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/switch-workspace.mp4" alt="Switch workspaces" /></td>
+      <td><ActionVideo src="quick-reference/switch-workspace.mp4" alt="Switch workspaces" /></td>
     </tr>
     <tr>
       <td>Invite team members</td>
       <td>Sidebar → **Invite**</td>
-      <td><ActionVideo src="/static/quick-reference/invite.mp4" alt="Invite team members" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/reordering.mp4" alt="Reorder workflows" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/multiselect.mp4" alt="Multi-select workflows" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/add-block.mp4" alt="Add a block" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/multiselect-blocks.mp4" alt="Multi-select blocks" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/copy-paste.mp4" alt="Copy and paste blocks" /></td>
+      <td rowSpan={2}><ActionVideo src="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="/static/quick-reference/duplicate-block.mp4" alt="Duplicate blocks" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/rename-block.mp4" alt="Rename a block" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/toggle-handles.mp4" alt="Toggle handle orientation" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/configure-block.mp4" alt="Configure a block" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/connect-blocks.mp4" alt="Connect blocks" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/delete-connection.mp4" alt="Delete connection" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/connection-tag.mp4" alt="Use connection tag" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/search-toolbar.mp4" alt="Search toolbar" /></td>
+      <td><ActionVideo src="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="/static/quick-reference/collapse-sidebar.mp4" alt="Collapse sidebar" /></td>
+      <td><ActionVideo src="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 → Copy API endpoint URL</td>
+      <td>Deploy tab → API → Copy API cURL</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 `&#123;&#123;ENV_VAR&#125;&#125;` syntax in block inputs</td>
+      <td>Use `{{ENV_VAR}}` syntax in block inputs</td>
       <td><ActionImage src="/static/quick-reference/env-variable-reference.png" alt="Reference environment variable" /></td>
     </tr>
   </tbody>

From d8d85fccf0cce24e321962d650901684c754a84f Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 13:19:23 -0800
Subject: [PATCH 03/18] feat(helm): add branding configmap for custom assets
 (#3008)

---
 helm/sim/templates/configmap-branding.yaml | 25 +++++++++++++++++++++
 helm/sim/templates/deployment-app.yaml     | 14 ++++++++++--
 helm/sim/values.yaml                       | 26 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 helm/sim/templates/configmap-branding.yaml

diff --git a/helm/sim/templates/configmap-branding.yaml b/helm/sim/templates/configmap-branding.yaml
new file mode 100644
index 000000000..4e22d3a2b
--- /dev/null
+++ b/helm/sim/templates/configmap-branding.yaml
@@ -0,0 +1,25 @@
+{{- if .Values.branding.enabled }}
+---
+# Branding ConfigMap
+# Mounts custom branding assets (logos, CSS, etc.) into the application
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "sim.fullname" . }}-branding
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "sim.labels" . | nindent 4 }}
+    app.kubernetes.io/component: branding
+{{- if .Values.branding.files }}
+data:
+  {{- range $key, $value := .Values.branding.files }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
+{{- if .Values.branding.binaryFiles }}
+binaryData:
+  {{- range $key, $value := .Values.branding.binaryFiles }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/helm/sim/templates/deployment-app.yaml b/helm/sim/templates/deployment-app.yaml
index 6b1d63289..5362dd43e 100644
--- a/helm/sim/templates/deployment-app.yaml
+++ b/helm/sim/templates/deployment-app.yaml
@@ -110,8 +110,13 @@ spec:
           {{- end }}
           {{- include "sim.resources" .Values.app | nindent 10 }}
           {{- include "sim.securityContext" .Values.app | nindent 10 }}
-          {{- if or .Values.extraVolumeMounts .Values.app.extraVolumeMounts }}
+          {{- if or .Values.branding.enabled .Values.extraVolumeMounts .Values.app.extraVolumeMounts }}
           volumeMounts:
+            {{- if .Values.branding.enabled }}
+            - name: branding
+              mountPath: {{ .Values.branding.mountPath | default "/app/public/branding" }}
+              readOnly: true
+            {{- end }}
             {{- with .Values.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -119,8 +124,13 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           {{- end }}
-      {{- if or .Values.extraVolumes .Values.app.extraVolumes }}
+      {{- if or .Values.branding.enabled .Values.extraVolumes .Values.app.extraVolumes }}
       volumes:
+        {{- if .Values.branding.enabled }}
+        - name: branding
+          configMap:
+            name: {{ include "sim.fullname" . }}-branding
+        {{- end }}
         {{- with .Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/helm/sim/values.yaml b/helm/sim/values.yaml
index f0def91cf..dc09a9ce2 100644
--- a/helm/sim/values.yaml
+++ b/helm/sim/values.yaml
@@ -738,6 +738,32 @@ sharedStorage:
 extraVolumes: []
 extraVolumeMounts: []
 
+# Branding configuration
+# Use this to inject custom branding assets (logos, CSS, etc.) into the application
+branding:
+  # Enable/disable branding ConfigMap
+  enabled: false
+
+  # Mount path in the container where branding files will be available
+  mountPath: "/app/public/branding"
+
+  # Text files (CSS, JSON, HTML, etc.) - values are plain text
+  # Example:
+  #   files:
+  #     custom.css: |
+  #       .logo { background-color: #ff0000; }
+  #     config.json: |
+  #       {"theme": "dark"}
+  files: {}
+
+  # Binary files (PNG, JPG, ICO, etc.) - values must be base64 encoded
+  # Generate base64 with: base64 -i logo.png | tr -d '\n'
+  # Example:
+  #   binaryFiles:
+  #     logo.png: "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk..."
+  #     favicon.ico: "AAABAAEAEBAAAAEAIABoBAAAFgAAAA..."
+  binaryFiles: {}
+
 # Additional environment variables for custom integrations
 extraEnvVars: []
 

From 12495ef89c9ab0af7b9492c2a999da249b9c2e29 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 13:28:59 -0800
Subject: [PATCH 04/18] feat(ci): auto-create github releases and add workflow
 permissions (#3009)

---
 .github/workflows/ci.yml                 | 30 ++++++++++++++++++++++++
 .github/workflows/docs-embeddings.yml    |  3 +++
 .github/workflows/migrations.yml         |  3 +++
 .github/workflows/publish-cli.yml        |  3 +++
 .github/workflows/publish-python-sdk.yml |  3 +++
 .github/workflows/publish-ts-sdk.yml     |  3 +++
 .github/workflows/test-build.yml         |  3 +++
 scripts/create-single-release.ts         | 21 ++++++++++++++++-
 8 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3b95c834..73e5e852f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,9 @@ concurrency:
   group: ci-${{ github.ref }}
   cancel-in-progress: false
 
+permissions:
+  contents: read
+
 jobs:
   test-build:
     name: Test and Build
@@ -278,3 +281,30 @@ 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 }}
diff --git a/.github/workflows/docs-embeddings.yml b/.github/workflows/docs-embeddings.yml
index cb936519a..1a359b533 100644
--- a/.github/workflows/docs-embeddings.yml
+++ b/.github/workflows/docs-embeddings.yml
@@ -4,6 +4,9 @@ on:
   workflow_call:
   workflow_dispatch: # Allow manual triggering
 
+permissions:
+  contents: read
+
 jobs:
   process-docs-embeddings:
     name: Process Documentation Embeddings
diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml
index 185e1e59e..6bce8fa4a 100644
--- a/.github/workflows/migrations.yml
+++ b/.github/workflows/migrations.yml
@@ -4,6 +4,9 @@ on:
   workflow_call:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   migrate:
     name: Apply Database Migrations
diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 1a2985253..cc22caa82 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -6,6 +6,9 @@ on:
     paths:
       - 'packages/cli/**'
 
+permissions:
+  contents: read
+
 jobs:
   publish-npm:
     runs-on: blacksmith-4vcpu-ubuntu-2404
diff --git a/.github/workflows/publish-python-sdk.yml b/.github/workflows/publish-python-sdk.yml
index f5c1181f1..a44d5a342 100644
--- a/.github/workflows/publish-python-sdk.yml
+++ b/.github/workflows/publish-python-sdk.yml
@@ -6,6 +6,9 @@ on:
     paths:
       - 'packages/python-sdk/**'
 
+permissions:
+  contents: write
+
 jobs:
   publish-pypi:
     runs-on: blacksmith-4vcpu-ubuntu-2404
diff --git a/.github/workflows/publish-ts-sdk.yml b/.github/workflows/publish-ts-sdk.yml
index c15c342a6..96ff35251 100644
--- a/.github/workflows/publish-ts-sdk.yml
+++ b/.github/workflows/publish-ts-sdk.yml
@@ -6,6 +6,9 @@ on:
     paths:
       - 'packages/ts-sdk/**'
 
+permissions:
+  contents: write
+
 jobs:
   publish-npm:
     runs-on: blacksmith-4vcpu-ubuntu-2404
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index fdf21d76f..56c56c943 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -4,6 +4,9 @@ on:
   workflow_call:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   test-build:
     name: Test and Build
diff --git a/scripts/create-single-release.ts b/scripts/create-single-release.ts
index b49777cec..bb6f79df1 100755
--- a/scripts/create-single-release.ts
+++ b/scripts/create-single-release.ts
@@ -197,7 +197,7 @@ async function getCommitsBetweenVersions(
     const commitEntries = gitLog.split('\n').filter((line) => line.trim())
 
     const nonVersionCommits = commitEntries.filter((line) => {
-      const [hash, message] = line.split('|')
+      const [, message] = line.split('|')
       const isVersionCommit = message.match(/^v\d+\.\d+/)
       if (isVersionCommit) {
         console.log(`⏭️ Skipping version commit: ${message.substring(0, 50)}...`)
@@ -369,6 +369,25 @@ async function main() {
       console.log(`ℹ️ No previous version found (this might be the first release)`)
     }
 
+    try {
+      const existingRelease = await octokit.rest.repos.getReleaseByTag({
+        owner: REPO_OWNER,
+        repo: REPO_NAME,
+        tag: targetVersion,
+      })
+      if (existingRelease.data) {
+        console.log(`ℹ️ Release ${targetVersion} already exists, skipping creation`)
+        console.log(
+          `🔗 View release: https://github.com/${REPO_OWNER}/${REPO_NAME}/releases/tag/${targetVersion}`
+        )
+        return
+      }
+    } catch (error: any) {
+      if (error.status !== 404) {
+        throw error
+      }
+    }
+
     const releaseBody = await generateReleaseBody(versionCommit, previousCommit || undefined)
 
     console.log(`🚀 Creating GitHub release for ${targetVersion}...`)

From ebf2852733d085138105a14181c594cfd04a6347 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 13:54:01 -0800
Subject: [PATCH 05/18] fix(copilot): reliable zoom to changed blocks after
 diff applied (#3011)

---
 .../[workspaceId]/w/[workflowId]/workflow.tsx | 83 ++++++++++++-------
 apps/sim/hooks/use-canvas-viewport.ts         |  5 +-
 2 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index 77a1b7953..030781c4e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -1641,51 +1641,36 @@ const WorkflowContent = React.memo(() => {
   }, [screenToFlowPosition, handleToolbarDrop])
 
   /**
-   * Focus canvas on changed blocks when diff appears
-   * Focuses on new/edited blocks rather than fitting the entire workflow
+   * Focus canvas on changed blocks when diff appears.
    */
+  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) {
-        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 })
-          })
-        }
+        pendingZoomBlockIdsRef.current = new Set(changedBlockIds)
       } else {
-        logger.info('Diff ready - no changed blocks, fitting all')
+        // No specific blocks to focus on, fit all after a frame
+        pendingZoomBlockIdsRef.current = null
         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, getNodes])
+  }, [isDiffReady, diffAnalysis, fitViewToBounds])
 
   /** Displays trigger warning notifications. */
   useEffect(() => {
@@ -2093,6 +2078,48 @@ 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) => {
diff --git a/apps/sim/hooks/use-canvas-viewport.ts b/apps/sim/hooks/use-canvas-viewport.ts
index ad570d8e0..1e1cfba51 100644
--- a/apps/sim/hooks/use-canvas-viewport.ts
+++ b/apps/sim/hooks/use-canvas-viewport.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 import type { Node, ReactFlowInstance } from 'reactflow'
+import { BLOCK_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
 
 interface VisibleBounds {
   width: number
@@ -139,8 +140,8 @@ export function useCanvasViewport(reactFlowInstance: ReactFlowInstance | null) {
       let maxY = Number.NEGATIVE_INFINITY
 
       nodes.forEach((node) => {
-        const nodeWidth = node.width ?? 200
-        const nodeHeight = node.height ?? 100
+        const nodeWidth = node.width ?? BLOCK_DIMENSIONS.FIXED_WIDTH
+        const nodeHeight = node.height ?? BLOCK_DIMENSIONS.MIN_HEIGHT
 
         minX = Math.min(minX, node.position.x)
         minY = Math.min(minY, node.position.y)

From 36945deaa56f309683cf9cb90dde4f179b104f3e Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 14:56:06 -0800
Subject: [PATCH 06/18] improvement(preview): consolidate block rendering and
 fix handle configurations (#3013)

* improvement(preview): consolidate block rendering and fix handle configurations

* refactor(preview): extract SubflowContainerProps interface
---
 .../templates/components/template-card.tsx    |   1 +
 .../templates/components/template-card.tsx    |   1 +
 .../components/template/template.tsx          |   1 +
 .../panel/components/editor/editor.tsx        |   1 +
 .../w/components/preview/components/block.tsx | 317 +++++++++++++++---
 .../components/preview/components/subflow.tsx | 113 -------
 .../w/components/preview/preview.tsx          | 140 ++++----
 7 files changed, 339 insertions(+), 235 deletions(-)
 delete mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/subflow.tsx

diff --git a/apps/sim/app/templates/components/template-card.tsx b/apps/sim/app/templates/components/template-card.tsx
index 0be5079e0..3c1c32a41 100644
--- a/apps/sim/app/templates/components/template-card.tsx
+++ b/apps/sim/app/templates/components/template-card.tsx
@@ -207,6 +207,7 @@ function TemplateCardInner({
             isPannable={false}
             defaultZoom={0.8}
             fitPadding={0.2}
+            lightweight
           />
         ) : (
           <div className='h-full w-full bg-[var(--surface-4)]' />
diff --git a/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx b/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
index b32db3ff9..5bb5886d1 100644
--- a/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
@@ -214,6 +214,7 @@ 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)]' />
diff --git 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
index 415c830f0..6ff75f6f6 100644
--- 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
@@ -446,6 +446,7 @@ const OGCaptureContainer = forwardRef<HTMLDivElement>((_, ref) => {
         isPannable={false}
         defaultZoom={0.8}
         fitPadding={0.2}
+        lightweight
       />
     </div>
   )
diff --git 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
index 762ad1f2d..cc124bdd6 100644
--- 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
@@ -466,6 +466,7 @@ export function Editor() {
                               defaultZoom={0.6}
                               fitPadding={0.15}
                               cursorStyle='grab'
+                              lightweight
                             />
                           </div>
                           <Tooltip.Root>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx
index a56e881de..84f53b415 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx
@@ -1,6 +1,7 @@
 'use client'
 
 import { memo, useMemo } from 'react'
+import { RepeatIcon, SplitIcon } from 'lucide-react'
 import { Handle, type NodeProps, Position } from 'reactflow'
 import { HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
 import {
@@ -10,14 +11,12 @@ import {
   isSubBlockVisibleForMode,
 } from '@/lib/workflows/subblocks/visibility'
 import { getDisplayValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
+import type { ExecutionStatus } from '@/app/workspace/[workspaceId]/w/components/preview/preview'
 import { getBlock } from '@/blocks'
 import { SELECTOR_TYPES_HYDRATION_REQUIRED, type SubBlockConfig } from '@/blocks/types'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
-/** Execution status for blocks in preview mode */
-type ExecutionStatus = 'success' | 'error' | 'not-executed'
-
 /** Subblock value structure matching workflow state */
 interface SubBlockValueEntry {
   value: unknown
@@ -35,6 +34,16 @@ interface WorkflowPreviewBlockData {
   executionStatus?: ExecutionStatus
   /** Subblock values from the workflow state */
   subBlockValues?: Record<string, SubBlockValueEntry | unknown>
+  /** Skips expensive subblock computations for thumbnails */
+  lightweight?: boolean
+  /** Whether this is a subflow container (loop/parallel) */
+  isSubflow?: boolean
+  /** Type of subflow container */
+  subflowKind?: 'loop' | 'parallel'
+  /** Width of subflow container */
+  width?: number
+  /** Height of subflow container */
+  height?: number
 }
 
 /**
@@ -204,21 +213,16 @@ 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)
 
@@ -242,11 +246,115 @@ function SubBlockRow({ title, value, subBlock, rawValue }: SubBlockRowProps) {
   )
 }
 
+interface SubflowContainerProps {
+  name: string
+  width?: number
+  height?: number
+  kind: 'loop' | 'parallel'
+  isPreviewSelected?: boolean
+}
+
+/**
+ * Renders a subflow container (loop/parallel) for preview mode.
+ */
+function SubflowContainer({
+  name,
+  width = 500,
+  height = 300,
+  kind,
+  isPreviewSelected = false,
+}: SubflowContainerProps) {
+  const isLoop = kind === 'loop'
+  const BlockIcon = isLoop ? RepeatIcon : SplitIcon
+  const blockIconBg = isLoop ? '#2FB3FF' : '#FEE12B'
+  const blockName = name || (isLoop ? 'Loop' : 'Parallel')
+
+  const startHandleId = isLoop ? 'loop-start-source' : 'parallel-start-source'
+  const endHandleId = isLoop ? 'loop-end-source' : 'parallel-end-source'
+
+  const leftHandleClass =
+    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-l-[2px] !rounded-r-none'
+  const rightHandleClass =
+    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none'
+
+  return (
+    <div
+      className='relative select-none rounded-[8px] border border-[var(--border-1)]'
+      style={{ width, height }}
+    >
+      {/* Selection ring overlay */}
+      {isPreviewSelected && (
+        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--brand-secondary)]' />
+      )}
+
+      {/* Target handle on left (input to the subflow) */}
+      <Handle
+        type='target'
+        position={Position.Left}
+        id='target'
+        className={leftHandleClass}
+        style={{
+          left: '-8px',
+          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
+          transform: 'translateY(-50%)',
+        }}
+      />
+
+      {/* Header - matches actual subflow header structure */}
+      <div className='flex items-center justify-between rounded-t-[8px] border-[var(--border)] border-b bg-[var(--surface-2)] py-[8px] pr-[12px] pl-[8px]'>
+        <div className='flex min-w-0 flex-1 items-center gap-[10px]'>
+          <div
+            className='flex h-[24px] w-[24px] flex-shrink-0 items-center justify-center rounded-[6px]'
+            style={{ backgroundColor: blockIconBg }}
+          >
+            <BlockIcon className='h-[16px] w-[16px] text-white' />
+          </div>
+          <span className='font-medium text-[16px]' title={blockName}>
+            {blockName}
+          </span>
+        </div>
+      </div>
+
+      {/* Content area - matches workflow structure */}
+      <div
+        className='h-[calc(100%-50px)] pt-[16px] pr-[80px] pb-[16px] pl-[16px]'
+        style={{ position: 'relative' }}
+      >
+        {/* Subflow Start - connects to first block in subflow */}
+        <div className='absolute top-[16px] left-[16px] flex items-center justify-center rounded-[8px] border border-[var(--border-1)] bg-[var(--surface-2)] px-[12px] py-[6px]'>
+          <span className='font-medium text-[14px] text-[var(--text-primary)]'>Start</span>
+          <Handle
+            type='source'
+            position={Position.Right}
+            id={startHandleId}
+            className={rightHandleClass}
+            style={{ right: '-8px', top: '50%', transform: 'translateY(-50%)' }}
+          />
+        </div>
+      </div>
+
+      {/* End source handle on right (output from the subflow) */}
+      <Handle
+        type='source'
+        position={Position.Right}
+        id={endHandleId}
+        className={rightHandleClass}
+        style={{
+          right: '-8px',
+          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
+          transform: 'translateY(-50%)',
+        }}
+      />
+    </div>
+  )
+}
+
 /**
  * Preview block component for workflow visualization.
  * Renders block header, subblock values, and handles without
  * hooks, store subscriptions, or interactive features.
  * Matches the visual structure of WorkflowBlock exactly.
+ * Also handles subflow containers (loop/parallel) when isSubflow is true.
  */
 function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>) {
   const {
@@ -258,53 +366,84 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
     isPreviewSelected = false,
     executionStatus,
     subBlockValues,
+    lightweight = false,
+    isSubflow = false,
+    subflowKind,
+    width,
+    height,
   } = data
 
+  if (isSubflow && subflowKind) {
+    return (
+      <SubflowContainer
+        name={name}
+        width={width}
+        height={height}
+        kind={subflowKind}
+        isPreviewSelected={isPreviewSelected}
+      />
+    )
+  }
+
   const blockConfig = getBlock(type)
 
   const canonicalIndex = useMemo(
-    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks]
+    () =>
+      lightweight
+        ? { groupsById: {}, canonicalIdBySubBlockId: {} }
+        : buildCanonicalIndex(blockConfig?.subBlocks || []),
+    [blockConfig?.subBlocks, lightweight]
   )
 
   const rawValues = useMemo(() => {
-    if (!subBlockValues) return {}
+    if (lightweight || !subBlockValues) return {}
     return Object.entries(subBlockValues).reduce<Record<string, unknown>>((acc, [key, entry]) => {
       acc[key] = extractValue(entry)
       return acc
     }, {})
-  }, [subBlockValues])
+  }, [subBlockValues, lightweight])
 
   const visibleSubBlocks = useMemo(() => {
-    if (!blockConfig?.subBlocks) return []
+    if (lightweight || !blockConfig?.subBlocks) return []
 
-    const isStarterOrTrigger =
-      blockConfig.category === 'triggers' || type === 'starter' || isTrigger
+    const isPureTriggerBlock = blockConfig.triggers?.enabled && blockConfig.category === 'triggers'
+
+    const effectiveTrigger = isTrigger || type === 'starter'
 
     return blockConfig.subBlocks.filter((subBlock) => {
       if (subBlock.hidden) return false
       if (subBlock.hideFromPreview) return false
       if (!isSubBlockFeatureEnabled(subBlock)) return false
 
-      // Handle trigger mode visibility
-      if (subBlock.mode === 'trigger' && !isStarterOrTrigger) 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
+      }
 
-      // 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)
     })
-  }, [blockConfig?.subBlocks, blockConfig?.category, type, isTrigger, canonicalIndex, rawValues])
+  }, [
+    lightweight,
+    blockConfig?.subBlocks,
+    blockConfig?.category,
+    blockConfig?.triggers?.enabled,
+    type,
+    isTrigger,
+    canonicalIndex,
+    rawValues,
+  ])
 
-  /**
-   * Compute condition rows for condition blocks
-   */
   const conditionRows = useMemo(() => {
-    if (type !== 'condition') return []
+    if (lightweight || type !== 'condition') return []
 
     const conditionsValue = rawValues.conditions
     const raw = typeof conditionsValue === 'string' ? conditionsValue : undefined
@@ -332,13 +471,10 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
       { id: 'if', title: 'if', value: '' },
       { id: 'else', title: 'else', value: '' },
     ]
-  }, [type, rawValues])
+  }, [lightweight, type, rawValues])
 
-  /**
-   * Compute router rows for router_v2 blocks
-   */
   const routerRows = useMemo(() => {
-    if (type !== 'router_v2') return []
+    if (lightweight || type !== 'router_v2') return []
 
     const routesValue = rawValues.routes
     const raw = typeof routesValue === 'string' ? routesValue : undefined
@@ -361,7 +497,7 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
     }
 
     return [{ id: 'route1', value: '' }]
-  }, [type, rawValues])
+  }, [lightweight, type, rawValues])
 
   if (!blockConfig) {
     return null
@@ -439,12 +575,10 @@ 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={getDisplayValue(cond.value)} />
             ))
           ) : type === 'router_v2' ? (
-            // Router block: render context + route rows
             <>
               <SubBlockRow
                 key='context'
@@ -460,7 +594,6 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
               ))}
             </>
           ) : (
-            // Standard blocks: render visible subblocks
             visibleSubBlocks.map((subBlock) => {
               const rawValue = rawValues[subBlock.id]
               return (
@@ -479,18 +612,102 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         </div>
       )}
 
-      {/* 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%)' }
-        }
-      />
+      {/* Condition block handles - one per condition branch + error */}
+      {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={horizontalHandleClass}
+                style={{ right: '-7px', top: `${topOffset}px`, transform: 'translateY(-50%)' }}
+              />
+            )
+          })}
+          <Handle
+            type='source'
+            position={Position.Right}
+            id='error'
+            className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
+            style={{
+              right: '-7px',
+              top: 'auto',
+              bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
+              transform: 'translateY(50%)',
+            }}
+          />
+        </>
+      )}
+
+      {/* Router block handles - one per route + error */}
+      {type === 'router_v2' && (
+        <>
+          {routerRows.map((route, routeIndex) => {
+            // +1 row offset for context row at the top
+            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={horizontalHandleClass}
+                style={{ right: '-7px', top: `${topOffset}px`, transform: 'translateY(-50%)' }}
+              />
+            )
+          })}
+          <Handle
+            type='source'
+            position={Position.Right}
+            id='error'
+            className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
+            style={{
+              right: '-7px',
+              top: 'auto',
+              bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
+              transform: 'translateY(50%)',
+            }}
+          />
+        </>
+      )}
+
+      {/* Standard block handles - source + error (not for condition, router, or response) */}
+      {type !== 'condition' && type !== 'router_v2' && type !== 'response' && (
+        <>
+          <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%)' }
+            }
+          />
+          {shouldShowDefaultHandles && (
+            <Handle
+              type='source'
+              position={Position.Right}
+              id='error'
+              className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
+              style={{
+                right: '-7px',
+                top: 'auto',
+                bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
+                transform: 'translateY(50%)',
+              }}
+            />
+          )}
+        </>
+      )}
     </div>
   )
 }
@@ -499,7 +716,6 @@ 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 ||
@@ -508,12 +724,16 @@ 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.executionStatus !== nextProps.data.executionStatus ||
+    prevProps.data.lightweight !== nextProps.data.lightweight ||
+    prevProps.data.isSubflow !== nextProps.data.isSubflow ||
+    prevProps.data.subflowKind !== nextProps.data.subflowKind ||
+    prevProps.data.width !== nextProps.data.width ||
+    prevProps.data.height !== nextProps.data.height
   ) {
     return false
   }
 
-  // Compare subBlockValues by reference first
   const prevValues = prevProps.data.subBlockValues
   const nextValues = nextProps.data.subBlockValues
 
@@ -525,7 +745,6 @@ function shouldSkipPreviewBlockRender(
     return false
   }
 
-  // Shallow compare keys and values
   const prevKeys = Object.keys(prevValues)
   const nextKeys = Object.keys(nextValues)
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/subflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/subflow.tsx
deleted file mode 100644
index a9aa913a2..000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/subflow.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-'use client'
-
-import { memo } from 'react'
-import { RepeatIcon, SplitIcon } from 'lucide-react'
-import { Handle, type NodeProps, Position } from 'reactflow'
-import { HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
-
-interface WorkflowPreviewSubflowData {
-  name: string
-  width?: number
-  height?: number
-  kind: 'loop' | 'parallel'
-  /** Whether this subflow is selected in preview mode */
-  isPreviewSelected?: boolean
-}
-
-/**
- * Preview subflow component for workflow visualization.
- * Renders loop/parallel containers without hooks, store subscriptions,
- * or interactive features.
- */
-function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowData>) {
-  const { name, width = 500, height = 300, kind, isPreviewSelected = false } = data
-
-  const isLoop = kind === 'loop'
-  const BlockIcon = isLoop ? RepeatIcon : SplitIcon
-  const blockIconBg = isLoop ? '#2FB3FF' : '#FEE12B'
-  const blockName = name || (isLoop ? 'Loop' : 'Parallel')
-
-  const startHandleId = isLoop ? 'loop-start-source' : 'parallel-start-source'
-  const endHandleId = isLoop ? 'loop-end-source' : 'parallel-end-source'
-
-  const leftHandleClass =
-    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-l-[2px] !rounded-r-none'
-  const rightHandleClass =
-    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none'
-
-  return (
-    <div
-      className='relative select-none rounded-[8px] border border-[var(--border-1)]'
-      style={{
-        width,
-        height,
-      }}
-    >
-      {/* Selection ring overlay */}
-      {isPreviewSelected && (
-        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--brand-secondary)]' />
-      )}
-
-      {/* Target handle on left (input to the subflow) */}
-      <Handle
-        type='target'
-        position={Position.Left}
-        id='target'
-        className={leftHandleClass}
-        style={{
-          left: '-8px',
-          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
-          transform: 'translateY(-50%)',
-        }}
-      />
-
-      {/* Header - matches actual subflow header structure */}
-      <div className='flex items-center justify-between rounded-t-[8px] border-[var(--border)] border-b bg-[var(--surface-2)] py-[8px] pr-[12px] pl-[8px]'>
-        <div className='flex min-w-0 flex-1 items-center gap-[10px]'>
-          <div
-            className='flex h-[24px] w-[24px] flex-shrink-0 items-center justify-center rounded-[6px]'
-            style={{ backgroundColor: blockIconBg }}
-          >
-            <BlockIcon className='h-[16px] w-[16px] text-white' />
-          </div>
-          <span className='font-medium text-[16px]' title={blockName}>
-            {blockName}
-          </span>
-        </div>
-      </div>
-
-      {/* Content area - matches workflow structure */}
-      <div
-        className='h-[calc(100%-50px)] pt-[16px] pr-[80px] pb-[16px] pl-[16px]'
-        style={{ position: 'relative' }}
-      >
-        {/* Subflow Start - connects to first block in subflow */}
-        <div className='absolute top-[16px] left-[16px] flex items-center justify-center rounded-[8px] border border-[var(--border-1)] bg-[var(--surface-2)] px-[12px] py-[6px]'>
-          <span className='font-medium text-[14px] text-[var(--text-primary)]'>Start</span>
-          <Handle
-            type='source'
-            position={Position.Right}
-            id={startHandleId}
-            className={rightHandleClass}
-            style={{ right: '-8px', top: '50%', transform: 'translateY(-50%)' }}
-          />
-        </div>
-      </div>
-
-      {/* End source handle on right (output from the subflow) */}
-      <Handle
-        type='source'
-        position={Position.Right}
-        id={endHandleId}
-        className={rightHandleClass}
-        style={{
-          right: '-8px',
-          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
-          transform: 'translateY(-50%)',
-        }}
-      />
-    </div>
-  )
-}
-
-export const WorkflowPreviewSubflow = memo(WorkflowPreviewSubflowInner)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
index a9d56c794..ec00e2c38 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
@@ -18,7 +18,6 @@ import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/b
 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'
 
 const logger = createLogger('WorkflowPreview')
@@ -53,13 +52,12 @@ function getPreviewBlockDimensions(block: BlockState): { width: number; height:
 /**
  * Calculates container dimensions based on child block positions and sizes.
  * Mirrors the logic from useNodeUtilities.calculateLoopDimensions.
+ * Accepts pre-filtered childBlocks for O(1) lookup instead of filtering all blocks.
  */
-function calculateContainerDimensions(
-  containerId: string,
-  blocks: Record<string, BlockState>
-): { width: number; height: number } {
-  const childBlocks = Object.values(blocks).filter((block) => block?.data?.parentId === containerId)
-
+function calculateContainerDimensions(childBlocks: BlockState[]): {
+  width: number
+  height: number
+} {
   if (childBlocks.length === 0) {
     return {
       width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
@@ -113,8 +111,34 @@ export function getLeftmostBlockId(workflowState: WorkflowState | null | undefin
   return leftmostId
 }
 
+/**
+ * Recursively calculates the absolute position of a block,
+ * accounting for parent container offsets.
+ */
+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: ${block.id}`)
+    return block.position
+  }
+
+  const parentAbsolutePosition = calculateAbsolutePosition(parentBlock, blocks)
+
+  return {
+    x: parentAbsolutePosition.x + block.position.x,
+    y: parentAbsolutePosition.y + block.position.y,
+  }
+}
+
 /** Execution status for edges/nodes in the preview */
-type ExecutionStatus = 'success' | 'error' | 'not-executed'
+export type ExecutionStatus = 'success' | 'error' | 'not-executed'
 
 interface WorkflowPreviewProps {
   workflowState: WorkflowState
@@ -136,6 +160,8 @@ interface WorkflowPreviewProps {
   executedBlocks?: Record<string, { status: string }>
   /** Currently selected block ID for highlighting */
   selectedBlockId?: string | null
+  /** Skips expensive computations for thumbnails/template previews */
+  lightweight?: boolean
 }
 
 /**
@@ -144,8 +170,6 @@ interface WorkflowPreviewProps {
  */
 const previewNodeTypes: NodeTypes = {
   workflowBlock: WorkflowPreviewBlock,
-  noteBlock: WorkflowPreviewBlock,
-  subflowNode: WorkflowPreviewSubflow,
 }
 
 // Define edge types
@@ -221,64 +245,30 @@ export function WorkflowPreview({
   cursorStyle = 'grab',
   executedBlocks,
   selectedBlockId,
+  lightweight = false,
 }: 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(','),
-    }
-  }, [workflowState.blocks, isValidWorkflowState])
+  const workflowStructureIds = useMemo(() => {
+    if (!isValidWorkflowState) return ''
+    const blockIds = Object.keys(workflowState.blocks || {})
+    const edgeIds = (workflowState.edges || []).map((e) => e.id)
+    return [...blockIds, ...edgeIds].join(',')
+  }, [workflowState.blocks, workflowState.edges, isValidWorkflowState])
 
-  const loopsStructure = useMemo(() => {
-    if (!isValidWorkflowState) return { count: 0, ids: '' }
-    return {
-      count: Object.keys(workflowState.loops || {}).length,
-      ids: Object.keys(workflowState.loops || {}).join(','),
+  // Pre-compute parent-child relationships for O(1) lookups in container dimension calculations
+  const containerChildIndex = useMemo(() => {
+    const index: Record<string, BlockState[]> = {}
+    for (const block of Object.values(workflowState.blocks || {})) {
+      if (block?.data?.parentId) {
+        const parentId = block.data.parentId
+        if (!index[parentId]) index[parentId] = []
+        index[parentId].push(block)
+      }
     }
-  }, [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])
-
-  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 calculateAbsolutePosition = (
-    block: any,
-    blocks: Record<string, any>
-  ): { 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: ${block.id}`)
-      return block.position
-    }
-
-    const parentAbsolutePosition = calculateAbsolutePosition(parentBlock, blocks)
-
-    return {
-      x: parentAbsolutePosition.x + block.position.x,
-      y: parentAbsolutePosition.y + block.position.y,
-    }
-  }
+    return index
+  }, [workflowState.blocks])
 
   const nodes: Node[] = useMemo(() => {
     if (!isValidWorkflowState) return []
@@ -293,21 +283,24 @@ export function WorkflowPreview({
 
       const absolutePosition = calculateAbsolutePosition(block, workflowState.blocks)
 
-      // Handle loop/parallel containers
+      // Handle loop/parallel containers - use unified workflowBlock with isSubflow flag
       if (block.type === 'loop' || block.type === 'parallel') {
         const isSelected = selectedBlockId === blockId
-        const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
+        const childBlocks = containerChildIndex[blockId] || []
+        const dimensions = calculateContainerDimensions(childBlocks)
         nodeArray.push({
           id: blockId,
-          type: 'subflowNode',
+          type: 'workflowBlock',
           position: absolutePosition,
           draggable: false,
           data: {
+            type: block.type,
             name: block.name,
+            isPreviewSelected: isSelected,
+            isSubflow: true,
+            subflowKind: block.type as 'loop' | 'parallel',
             width: dimensions.width,
             height: dimensions.height,
-            kind: block.type as 'loop' | 'parallel',
-            isPreviewSelected: isSelected,
           },
         })
         return
@@ -348,19 +341,20 @@ export function WorkflowPreview({
           isPreviewSelected: isSelected,
           executionStatus,
           subBlockValues: block.subBlocks,
+          lightweight,
         },
       })
     })
 
     return nodeArray
   }, [
-    blocksStructure,
-    loopsStructure,
-    parallelsStructure,
+    workflowStructureIds,
     workflowState.blocks,
+    containerChildIndex,
     isValidWorkflowState,
     executedBlocks,
     selectedBlockId,
+    lightweight,
   ])
 
   const edges: Edge[] = useMemo(() => {
@@ -395,7 +389,7 @@ export function WorkflowPreview({
         zIndex: executionStatus === 'success' ? 10 : 0,
       }
     })
-  }, [edgesStructure, workflowState.edges, isValidWorkflowState, executedBlocks])
+  }, [workflowStructureIds, workflowState.edges, isValidWorkflowState, executedBlocks])
 
   if (!isValidWorkflowState) {
     return (
@@ -449,7 +443,7 @@ export function WorkflowPreview({
         <ReactFlow
           nodes={nodes}
           edges={edges}
-          nodeTypes={nodeTypes}
+          nodeTypes={previewNodeTypes}
           edgeTypes={edgeTypes}
           connectionLineType={ConnectionLineType.SmoothStep}
           fitView
@@ -489,7 +483,7 @@ export function WorkflowPreview({
           onPaneClick={onPaneClick}
         />
         <FitViewOnChange
-          nodeIds={blocksStructure.ids}
+          nodeIds={workflowStructureIds}
           fitPadding={fitPadding}
           containerRef={containerRef}
         />

From 3ccbee187d859cb3ed21552272ea5f64fd67254c Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 15:49:23 -0800
Subject: [PATCH 07/18] improvement(docs): updated logo, added lightbox to
 action media, fixed minor styling inconsistencies between themes (#3014)

* improvement(docs): updated logo, added lightbox to action media, fixed minor styling inconsistencies between themes

* updated og image

* ack comments
---
 apps/docs/app/[lang]/[[...slug]]/page.tsx     |   5 -
 apps/docs/app/[lang]/layout.tsx               |  13 +-
 apps/docs/app/api/og/route.tsx                | 121 ++++++++----------
 apps/docs/app/global.css                      |  74 +++++++----
 .../docs-layout/sidebar-components.tsx        |   6 +-
 .../components/docs-layout/toc-footer.tsx     |   2 +-
 apps/docs/components/navbar/navbar.tsx        |  10 +-
 apps/docs/components/ui/action-media.tsx      |  81 +++++++++---
 apps/docs/components/ui/language-dropdown.tsx |  69 ++++++----
 apps/docs/components/ui/sim-logo.tsx          | 108 ++++++++++++++++
 10 files changed, 325 insertions(+), 164 deletions(-)
 create mode 100644 apps/docs/components/ui/sim-logo.tsx

diff --git a/apps/docs/app/[lang]/[[...slug]]/page.tsx b/apps/docs/app/[lang]/[[...slug]]/page.tsx
index 228bf6da1..025df8093 100644
--- a/apps/docs/app/[lang]/[[...slug]]/page.tsx
+++ b/apps/docs/app/[lang]/[[...slug]]/page.tsx
@@ -185,11 +185,6 @@ 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,
         }}
diff --git a/apps/docs/app/[lang]/layout.tsx b/apps/docs/app/[lang]/layout.tsx
index 4dbd3d5a4..2563b9d4b 100644
--- 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,16 +102,7 @@ export default async function Layout({ children, params }: LayoutProps) {
           <DocsLayout
             tree={source.pageTree[lang]}
             nav={{
-              title: (
-                <Image
-                  src='/static/logo.png'
-                  alt='Sim'
-                  width={72}
-                  height={28}
-                  className='h-7 w-auto'
-                  priority
-                />
-              ),
+              title: <SimLogoFull className='h-7 w-auto' />,
             }}
             sidebar={{
               defaultOpenLevel: 0,
diff --git a/apps/docs/app/api/og/route.tsx b/apps/docs/app/api/og/route.tsx
index 9fec7a4b5..7481224d6 100644
--- a/apps/docs/app/api/og/route.tsx
+++ b/apps/docs/app/api/og/route.tsx
@@ -33,15 +33,41 @@ 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)
 
@@ -52,84 +78,39 @@ export async function GET(request: NextRequest) {
         width: '100%',
         display: 'flex',
         flexDirection: 'column',
-        background: '#0c0c0c',
-        position: 'relative',
+        justifyContent: 'space-between',
+        padding: '56px 64px',
+        background: '#121212', // Dark mode background matching docs (hsla 0, 0%, 7%)
         fontFamily: 'Geist',
       }}
     >
-      {/* Base gradient layer - subtle purple tint across the entire image */}
-      <div
+      {/* Title at top */}
+      <span
         style={{
-          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',
-        }}
-      />
-
-      {/* 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',
+          fontSize: getTitleFontSize(title),
+          fontWeight: 500,
+          color: '#fafafa', // Light text matching docs
+          lineHeight: 1.2,
+          letterSpacing: '-0.02em',
         }}
       >
-        {/* Logo */}
-        <img src={`${baseUrl}/static/logo.png`} alt='sim' height={32} />
+        {title}
+      </span>
 
-        {/* Title */}
-        <span
-          style={{
-            fontSize: getTitleFontSize(title),
-            fontWeight: 600,
-            color: '#ffffff',
-            lineHeight: 1.1,
-            letterSpacing: '-0.02em',
-          }}
-        >
-          {title}
-        </span>
-
-        {/* Footer */}
+      {/* Footer: icon left, domain right */}
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          width: '100%',
+        }}
+      >
+        <SimLogoFull />
         <span
           style={{
             fontSize: 20,
-            fontWeight: 500,
+            fontWeight: 400,
             color: '#71717a',
           }}
         >
diff --git a/apps/docs/app/global.css b/apps/docs/app/global.css
index 53bc8db7f..656b946cd 100644
--- a/apps/docs/app/global.css
+++ b/apps/docs/app/global.css
@@ -9,11 +9,20 @@ body {
 }
 
 @theme {
-  --color-fd-primary: #802fff; /* Purple from control-bar component */
+  --color-fd-primary: #33c482; /* Green from Sim logo */
   --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,
@@ -34,7 +43,7 @@ body {
 :root {
   --fd-border: transparent !important;
   --fd-border-sidebar: transparent !important;
-  --fd-nav-height: 64px; /* Custom navbar height (h-16 = 4rem = 64px) */
+  --fd-nav-height: 65px; /* Custom navbar height (h-16 = 64px + 1px border) */
   /* Content container width used to center main content */
   --spacing-fd-container: 1400px;
   /* Edge gutter = leftover space on each side of centered container */
@@ -136,11 +145,11 @@ aside#nd-sidebar {
 /* On mobile, let fumadocs handle the layout natively */
 @media (min-width: 1024px) {
   :root {
-    --fd-banner-height: 64px !important;
+    --fd-banner-height: 65px !important; /* 64px navbar + 1px border */
   }
 
   #nd-docs-layout {
-    --fd-docs-height: calc(100dvh - 64px) !important;
+    --fd-docs-height: calc(100dvh - 65px) !important; /* 64px navbar + 1px border */
     --fd-sidebar-width: 300px !important;
     margin-left: var(--sidebar-offset) !important;
     margin-right: var(--toc-offset) !important;
@@ -227,19 +236,19 @@ html:not(.dark) #nd-sidebar button:not([aria-label*="ollapse"]):not([aria-label*
   letter-spacing: 0.05em !important;
 }
 
-/* Override active state (NO PURPLE) */
+/* Override active state */
 #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 purple classes */
+/* Override custom sidebar green classes */
   #nd-sidebar
-  a.bg-purple-50\/80,
-#nd-sidebar a.text-purple-600,
-#nd-sidebar a[class*="bg-purple"],
-#nd-sidebar a[class*="text-purple"] {
+  a.bg-emerald-50\/80,
+#nd-sidebar a.text-emerald-600,
+#nd-sidebar a[class*="bg-emerald"],
+#nd-sidebar a[class*="text-emerald"] {
   background-image: none !important;
 }
 
@@ -250,10 +259,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-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"] {
+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"] {
   background-color: rgba(255, 255, 255, 0.15) !important;
   color: rgba(255, 255, 255, 1) !important;
 }
@@ -265,10 +274,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-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"] {
+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"] {
   background-color: rgba(0, 0, 0, 0.07) !important;
   color: rgba(0, 0, 0, 0.9) !important;
 }
@@ -286,8 +295,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-purple-50\/80:hover,
-html.dark #nd-sidebar a[class*="bg-purple"]: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[data-active="true"]:hover,
 html.dark #nd-sidebar button[data-active="true"]:hover {
   background-color: rgba(255, 255, 255, 0.15) !important;
@@ -295,8 +304,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-purple-50\/80:hover,
-html:not(.dark) #nd-sidebar a[class*="bg-purple"]: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[data-active="true"]:hover,
 html:not(.dark) #nd-sidebar button[data-active="true"]:hover {
   background-color: rgba(0, 0, 0, 0.07) !important;
@@ -368,16 +377,22 @@ 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 */
+    #nd-sidebar
+    a[href="/"],
+  #nd-sidebar a[href="/"] img,
+  #nd-sidebar a[href="/"] svg,
+  #nd-sidebar > a:first-child,
+  #nd-sidebar > div:first-child > a:first-child,
+  #nd-sidebar img[alt="Sim"],
+  #nd-sidebar svg[aria-label="Sim"],
   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"],
   [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"],
   /* Hide theme toggle at bottom of sidebar on desktop */
     #nd-sidebar
     > footer,
@@ -515,6 +530,15 @@ 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;
diff --git a/apps/docs/components/docs-layout/sidebar-components.tsx b/apps/docs/components/docs-layout/sidebar-components.tsx
index e5fb882fb..e6fbe18cd 100644
--- 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-purple-50/80 lg:font-normal lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
+          'lg:bg-emerald-50/80 lg:font-normal lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-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-purple-50/80 lg:font-normal lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
+            'lg:bg-emerald-50/80 lg:font-normal lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-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-purple-50/80 lg:text-purple-600 lg:dark:bg-purple-900/15 lg:dark:text-purple-400'
+                'lg:bg-emerald-50/80 lg:text-emerald-600 lg:dark:bg-emerald-900/15 lg:dark:text-emerald-400'
             )}
           >
             {item.name}
diff --git a/apps/docs/components/docs-layout/toc-footer.tsx b/apps/docs/components/docs-layout/toc-footer.tsx
index cd62bd6c7..01eb5d81a 100644
--- 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-[#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'
+          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'
           aria-label='Get started with Sim - Sign up for free'
         >
           <span>Get started</span>
diff --git a/apps/docs/components/navbar/navbar.tsx b/apps/docs/components/navbar/navbar.tsx
index bbddf45e6..12bf9f7be 100644
--- 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,13 +27,7 @@ export function Navbar() {
           {/* Left cluster: logo */}
           <div className='flex items-center'>
             <Link href='/' className='flex min-w-[100px] items-center'>
-              <Image
-                src='/static/logo.png'
-                alt='Sim'
-                width={72}
-                height={28}
-                className='h-7 w-auto'
-              />
+              <SimLogoFull className='h-7 w-auto' />
             </Link>
           </div>
 
diff --git a/apps/docs/components/ui/action-media.tsx b/apps/docs/components/ui/action-media.tsx
index 1f187fb90..629716b66 100644
--- a/apps/docs/components/ui/action-media.tsx
+++ b/apps/docs/components/ui/action-media.tsx
@@ -1,38 +1,87 @@
 'use client'
 
-import { getAssetUrl } from '@/lib/utils'
+import { useState } from 'react'
+import { cn, getAssetUrl } from '@/lib/utils'
+import { Lightbox } from './lightbox'
 
 interface ActionImageProps {
   src: string
   alt: string
+  enableLightbox?: boolean
 }
 
 interface ActionVideoProps {
   src: string
   alt: string
+  enableLightbox?: boolean
 }
 
-export function ActionImage({ src, alt }: ActionImageProps) {
+export function ActionImage({ src, alt, enableLightbox = true }: ActionImageProps) {
+  const [isLightboxOpen, setIsLightboxOpen] = useState(false)
+
+  const handleClick = () => {
+    if (enableLightbox) {
+      setIsLightboxOpen(true)
+    }
+  }
+
   return (
-    <img
-      src={src}
-      alt={alt}
-      className='inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700'
-    />
+    <>
+      <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'
+        />
+      )}
+    </>
   )
 }
 
-export function ActionVideo({ src, alt }: ActionVideoProps) {
+export function ActionVideo({ src, alt, enableLightbox = true }: ActionVideoProps) {
+  const [isLightboxOpen, setIsLightboxOpen] = useState(false)
   const resolvedSrc = getAssetUrl(src)
 
+  const handleClick = () => {
+    if (enableLightbox) {
+      setIsLightboxOpen(true)
+    }
+  }
+
   return (
-    <video
-      src={resolvedSrc}
-      autoPlay
-      loop
-      muted
-      playsInline
-      className='inline-block w-full max-w-[200px] rounded border border-neutral-200 dark:border-neutral-700'
-    />
+    <>
+      <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'
+        />
+      )}
+    </>
   )
 }
diff --git a/apps/docs/components/ui/language-dropdown.tsx b/apps/docs/components/ui/language-dropdown.tsx
index a34be00d4..20231c811 100644
--- a/apps/docs/components/ui/language-dropdown.tsx
+++ b/apps/docs/components/ui/language-dropdown.tsx
@@ -1,8 +1,9 @@
 'use client'
 
 import { useEffect, useState } from 'react'
-import { Check, ChevronRight } from 'lucide-react'
+import { Check, ChevronDown } from 'lucide-react'
 import { useParams, usePathname, useRouter } from 'next/navigation'
+import { cn } from '@/lib/utils'
 
 const languages = {
   en: { name: 'English', flag: '🇺🇸' },
@@ -15,6 +16,7 @@ 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()
@@ -71,6 +73,15 @@ 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
@@ -82,14 +93,14 @@ export function LanguageDropdown() {
         aria-haspopup='listbox'
         aria-expanded={isOpen}
         aria-controls='language-menu'
-        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'
+        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'
         style={{
           fontFamily:
             '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif',
         }}
       >
         <span>{languages[currentLang as keyof typeof languages]?.name}</span>
-        <ChevronRight className='h-3.5 w-3.5' />
+        <ChevronDown className={cn('h-3.5 w-3.5 transition-transform', isOpen && 'rotate-180')} />
       </button>
 
       {isOpen && (
@@ -98,29 +109,37 @@ export function LanguageDropdown() {
           <div
             id='language-menu'
             role='listbox'
-            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'
+            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'
           >
-            {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>
-            ))}
+            {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>
+              )
+            })}
           </div>
         </>
       )}
diff --git a/apps/docs/components/ui/sim-logo.tsx b/apps/docs/components/ui/sim-logo.tsx
new file mode 100644
index 000000000..06cc0d95d
--- /dev/null
+++ b/apps/docs/components/ui/sim-logo.tsx
@@ -0,0 +1,108 @@
+'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>
+  )
+}

From 3cc9b1ae560fbfb8355799d4d271096d66b065a7 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 16:04:19 -0800
Subject: [PATCH 08/18] fix(input-format): resolution for blocks with input
 format fields (#3012)

* fix input format

* fix tests

* address bugbot comment
---
 apps/sim/executor/constants.ts                | 20 +++++
 apps/sim/executor/execution/block-executor.ts |  8 +-
 .../handlers/trigger/trigger-handler.ts       | 12 +--
 apps/sim/executor/utils/block-data.ts         | 63 ++++++++++++++--
 .../lib/workflows/comparison/compare.test.ts  | 73 +++++++++++++++++--
 .../workflows/comparison/normalize.test.ts    |  9 ++-
 .../sim/lib/workflows/comparison/normalize.ts |  6 +-
 7 files changed, 153 insertions(+), 38 deletions(-)

diff --git a/apps/sim/executor/constants.ts b/apps/sim/executor/constants.ts
index 387f560c4..ba2c2fc23 100644
--- a/apps/sim/executor/constants.ts
+++ b/apps/sim/executor/constants.ts
@@ -275,6 +275,26 @@ 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)
diff --git a/apps/sim/executor/execution/block-executor.ts b/apps/sim/executor/execution/block-executor.ts
index 5e2ec09cc..b26f2175b 100644
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -11,6 +11,7 @@ import {
   DEFAULTS,
   EDGE,
   isSentinelBlockType,
+  isTriggerBehavior,
 } from '@/executor/constants'
 import type { DAGNode } from '@/executor/dag/builder'
 import { ChildWorkflowError } from '@/executor/errors/child-workflow-error'
@@ -346,12 +347,7 @@ export class BlockExecutor {
       return filtered
     }
 
-    const isTrigger =
-      block.metadata?.category === 'triggers' ||
-      block.config?.params?.triggerMode === true ||
-      block.metadata?.id === BlockType.STARTER
-
-    if (isTrigger) {
+    if (isTriggerBehavior(block)) {
       const filtered: NormalizedBlockOutput = {}
       const internalKeys = ['webhook', 'workflowId']
       for (const [key, value] of Object.entries(output)) {
diff --git a/apps/sim/executor/handlers/trigger/trigger-handler.ts b/apps/sim/executor/handlers/trigger/trigger-handler.ts
index fd0508f7c..d9be91d23 100644
--- 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 } from '@/executor/constants'
+import { BlockType, isTriggerBehavior } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext } from '@/executor/types'
 import type { SerializedBlock } from '@/serializer/types'
 
@@ -7,15 +7,7 @@ const logger = createLogger('TriggerBlockHandler')
 
 export class TriggerBlockHandler implements BlockHandler {
   canHandle(block: SerializedBlock): boolean {
-    if (block.metadata?.id === BlockType.STARTER) {
-      return true
-    }
-
-    const isTriggerCategory = block.metadata?.category === 'triggers'
-
-    const hasTriggerMode = block.config?.params?.triggerMode === true
-
-    return isTriggerCategory || hasTriggerMode
+    return isTriggerBehavior(block)
   }
 
   async execute(
diff --git a/apps/sim/executor/utils/block-data.ts b/apps/sim/executor/utils/block-data.ts
index 0c7ec4bd1..c6fc1c185 100644
--- a/apps/sim/executor/utils/block-data.ts
+++ b/apps/sim/executor/utils/block-data.ts
@@ -1,4 +1,5 @@
-import { normalizeName } from '@/executor/constants'
+import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
+import { isTriggerBehavior, normalizeName } from '@/executor/constants'
 import type { ExecutionContext } from '@/executor/types'
 import type { OutputSchema } from '@/executor/utils/block-reference'
 import type { SerializedBlock } from '@/serializer/types'
@@ -11,25 +12,73 @@ 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 isTrigger =
-    block.metadata?.category === 'triggers' ||
-    (block.config?.params as Record<string, unknown> | undefined)?.triggerMode === true
+  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)
 
-  // 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
   }
diff --git a/apps/sim/lib/workflows/comparison/compare.test.ts b/apps/sim/lib/workflows/comparison/compare.test.ts
index 31af020e3..db4fb6fd0 100644
--- a/apps/sim/lib/workflows/comparison/compare.test.ts
+++ b/apps/sim/lib/workflows/comparison/compare.test.ts
@@ -557,7 +557,8 @@ describe('hasWorkflowChanged', () => {
   })
 
   describe('InputFormat SubBlock Special Handling', () => {
-    it.concurrent('should ignore value and collapsed fields in inputFormat', () => {
+    it.concurrent('should ignore collapsed field but detect value changes in inputFormat', () => {
+      // Only collapsed changes - should NOT detect as change
       const state1 = createWorkflowState({
         blocks: {
           block1: createBlock('block1', {
@@ -578,8 +579,8 @@ describe('hasWorkflowChanged', () => {
             subBlocks: {
               inputFormat: {
                 value: [
-                  { id: 'input1', name: 'Name', value: 'Jane', collapsed: false },
-                  { id: 'input2', name: 'Age', value: 30, collapsed: true },
+                  { id: 'input1', name: 'Name', value: 'John', collapsed: false },
+                  { id: 'input2', name: 'Age', value: 25, collapsed: true },
                 ],
               },
             },
@@ -589,6 +590,32 @@ 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: {
@@ -1712,15 +1739,15 @@ describe('hasWorkflowChanged', () => {
   })
 
   describe('Input Format Field Scenarios', () => {
-    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
+    it.concurrent('should not detect change when only inputFormat collapsed changes', () => {
+      // The "collapsed" 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: '', collapsed: false },
+                  { id: 'field1', name: 'Name', type: 'string', value: 'test', collapsed: false },
                 ],
               },
             },
@@ -1738,7 +1765,7 @@ describe('hasWorkflowChanged', () => {
                     id: 'field1',
                     name: 'Name',
                     type: 'string',
-                    value: 'typed then cleared',
+                    value: 'test',
                     collapsed: true,
                   },
                 ],
@@ -1748,10 +1775,40 @@ describe('hasWorkflowChanged', () => {
         },
       })
 
-      // value and collapsed are UI-only fields - should NOT detect as change
+      // collapsed is UI-only field - 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: {
diff --git a/apps/sim/lib/workflows/comparison/normalize.test.ts b/apps/sim/lib/workflows/comparison/normalize.test.ts
index ca2220587..66bf52f34 100644
--- 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 value and collapsed fields', () => {
+    it.concurrent('should remove collapsed field but keep value', () => {
       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' },
-        { id: 'input2', name: 'Age' },
+        { id: 'input1', name: 'Name', value: 'John' },
+        { id: 'input2', name: 'Age', value: 25 },
         { id: 'input3', name: 'Email' },
       ])
     })
 
-    it.concurrent('should preserve all other fields', () => {
+    it.concurrent('should preserve all other fields including value', () => {
       const inputFormat = [
         {
           id: 'input1',
@@ -402,6 +402,7 @@ 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 },
diff --git a/apps/sim/lib/workflows/comparison/normalize.ts b/apps/sim/lib/workflows/comparison/normalize.ts
index 571f20113..c467f73e0 100644
--- 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> & { value?: unknown; collapsed?: boolean }
+type InputFormatItem = Record<string, unknown> & { collapsed?: boolean }
 
 /**
- * Sanitizes inputFormat array by removing UI-only fields like value and collapsed
+ * Sanitizes inputFormat array by removing UI-only fields like 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 { value, collapsed, ...rest } = item as InputFormatItem
+      const { collapsed, ...rest } = item as InputFormatItem
       return rest
     }
     return item as Record<string, unknown>

From 37900988eb44d20146b492d258e7e86f85718e73 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 16:27:07 -0800
Subject: [PATCH 09/18] fix(kb): workspace id required for creation (#3001)

* fix(kb): workspace id required for creation

* fix tests
---
 apps/sim/app/api/knowledge/route.test.ts      | 21 ++++++++++++++++++-
 apps/sim/app/api/knowledge/route.ts           |  2 +-
 .../tools/server/knowledge/knowledge-base.ts  |  7 +++++++
 apps/sim/lib/copilot/tools/shared/schemas.ts  |  2 +-
 apps/sim/lib/knowledge/service.ts             | 12 +++++------
 apps/sim/lib/knowledge/types.ts               |  2 +-
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/apps/sim/app/api/knowledge/route.test.ts b/apps/sim/app/api/knowledge/route.test.ts
index 2a59f4540..bd93fab3b 100644
--- a/apps/sim/app/api/knowledge/route.test.ts
+++ b/apps/sim/app/api/knowledge/route.test.ts
@@ -16,6 +16,10 @@ mockKnowledgeSchemas()
 mockDrizzleOrm()
 mockConsoleLogger()
 
+vi.mock('@/lib/workspaces/permissions/utils', () => ({
+  getUserEntityPermissions: vi.fn().mockResolvedValue({ role: 'owner' }),
+}))
+
 describe('Knowledge Base API Route', () => {
   const mockAuth$ = mockAuth()
 
@@ -86,6 +90,7 @@ describe('Knowledge Base API Route', () => {
     const validKnowledgeBaseData = {
       name: 'Test Knowledge Base',
       description: 'Test description',
+      workspaceId: 'test-workspace-id',
       chunkingConfig: {
         maxSize: 1024,
         minSize: 100,
@@ -133,11 +138,25 @@ 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)
@@ -157,7 +176,7 @@ describe('Knowledge Base API Route', () => {
     it('should use default values for optional fields', async () => {
       mockAuth$.mockAuthenticatedUser()
 
-      const minimalData = { name: 'Test KB' }
+      const minimalData = { name: 'Test KB', workspaceId: 'test-workspace-id' }
       const req = createMockRequest('POST', minimalData)
       const { POST } = await import('@/app/api/knowledge/route')
       const response = await POST(req)
diff --git a/apps/sim/app/api/knowledge/route.ts b/apps/sim/app/api/knowledge/route.ts
index 07d439fe8..9aaf52b5a 100644
--- 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().optional(),
+  workspaceId: z.string().min(1, 'Workspace ID is required'),
   embeddingModel: z.literal('text-embedding-3-small').default('text-embedding-3-small'),
   embeddingDimension: z.literal(1536).default(1536),
   chunkingConfig: z
diff --git a/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts b/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
index 853638d89..d6d5af7ba 100644
--- a/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
+++ b/apps/sim/lib/copilot/tools/server/knowledge/knowledge-base.ts
@@ -37,6 +37,13 @@ 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(
             {
diff --git a/apps/sim/lib/copilot/tools/shared/schemas.ts b/apps/sim/lib/copilot/tools/shared/schemas.ts
index 31fed5417..2377aecf7 100644
--- 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 (optional for create/list) */
+      /** Workspace ID to associate with (required for create, optional for list) */
       workspaceId: z.string().optional(),
       /** Knowledge base ID (required for get, query) */
       knowledgeBaseId: z.string().optional(),
diff --git a/apps/sim/lib/knowledge/service.ts b/apps/sim/lib/knowledge/service.ts
index 6b2572a2f..d065ed569 100644
--- a/apps/sim/lib/knowledge/service.ts
+++ b/apps/sim/lib/knowledge/service.ts
@@ -86,18 +86,16 @@ export async function createKnowledgeBase(
   const kbId = randomUUID()
   const now = new Date()
 
-  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 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 ?? null,
+    workspaceId: data.workspaceId,
     userId: data.userId,
     tokenCount: 0,
     embeddingModel: data.embeddingModel,
@@ -122,7 +120,7 @@ export async function createKnowledgeBase(
     chunkingConfig: data.chunkingConfig,
     createdAt: now,
     updatedAt: now,
-    workspaceId: data.workspaceId ?? null,
+    workspaceId: data.workspaceId,
     docCount: 0,
   }
 }
diff --git a/apps/sim/lib/knowledge/types.ts b/apps/sim/lib/knowledge/types.ts
index 8516b6e70..f962a65fb 100644
--- 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

From 5189473e06bbadae3aca72562009e5549eea2753 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 17:05:33 -0800
Subject: [PATCH 10/18] fix(max-tokens): anthropic models streaming vs
 non-streaming (#2999)

* fix(max-tokens): anthropic models streaming vs non-streaming

* default max inc

* update the docs
---
 apps/docs/content/docs/en/blocks/agent.mdx |  4 ++
 apps/sim/blocks/blocks/agent.ts            |  7 ++++
 apps/sim/providers/anthropic/index.ts      |  5 ++-
 apps/sim/providers/bedrock/index.ts        | 10 ++++-
 apps/sim/providers/models.ts               | 46 ++++++++++++++++++++++
 apps/sim/providers/utils.ts                | 13 ++++++
 apps/sim/tools/browser_use/run_task.ts     |  2 +-
 7 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/apps/docs/content/docs/en/blocks/agent.mdx b/apps/docs/content/docs/en/blocks/agent.mdx
index 205d9b1dd..377cb8c1c 100644
--- a/apps/docs/content/docs/en/blocks/agent.mdx
+++ b/apps/docs/content/docs/en/blocks/agent.mdx
@@ -56,6 +56,10 @@ 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.
diff --git a/apps/sim/blocks/blocks/agent.ts b/apps/sim/blocks/blocks/agent.ts
index 9af1c7fcc..6b4fd0efb 100644
--- a/apps/sim/blocks/blocks/agent.ts
+++ b/apps/sim/blocks/blocks/agent.ts
@@ -513,6 +513,12 @@ 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',
@@ -754,6 +760,7 @@ 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' },
diff --git a/apps/sim/providers/anthropic/index.ts b/apps/sim/providers/anthropic/index.ts
index d597557fb..29e277825 100644
--- a/apps/sim/providers/anthropic/index.ts
+++ b/apps/sim/providers/anthropic/index.ts
@@ -9,6 +9,7 @@ import {
   generateToolUseId,
 } from '@/providers/anthropic/utils'
 import {
+  getMaxOutputTokensForModel,
   getProviderDefaultModel,
   getProviderModels,
   supportsNativeStructuredOutputs,
@@ -178,7 +179,9 @@ export const anthropicProvider: ProviderConfig = {
       model: request.model,
       messages,
       system: systemPrompt,
-      max_tokens: Number.parseInt(String(request.maxTokens)) || 1024,
+      max_tokens:
+        Number.parseInt(String(request.maxTokens)) ||
+        getMaxOutputTokensForModel(request.model, request.stream ?? false),
       temperature: Number.parseFloat(String(request.temperature ?? 0.7)),
     }
 
diff --git a/apps/sim/providers/bedrock/index.ts b/apps/sim/providers/bedrock/index.ts
index 4e614b8c2..1edee08d8 100644
--- a/apps/sim/providers/bedrock/index.ts
+++ b/apps/sim/providers/bedrock/index.ts
@@ -20,7 +20,11 @@ import {
   generateToolUseId,
   getBedrockInferenceProfileId,
 } from '@/providers/bedrock/utils'
-import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import {
+  getMaxOutputTokensForModel,
+  getProviderDefaultModel,
+  getProviderModels,
+} from '@/providers/models'
 import type {
   ProviderConfig,
   ProviderRequest,
@@ -259,7 +263,9 @@ export const bedrockProvider: ProviderConfig = {
 
     const inferenceConfig = {
       temperature: Number.parseFloat(String(request.temperature ?? 0.7)),
-      maxTokens: Number.parseInt(String(request.maxTokens)) || 4096,
+      maxTokens:
+        Number.parseInt(String(request.maxTokens)) ||
+        getMaxOutputTokensForModel(request.model, request.stream ?? false),
     }
 
     const shouldStreamToolCalls = request.streamToolCalls ?? false
diff --git a/apps/sim/providers/models.ts b/apps/sim/providers/models.ts
index eb655e66f..06ee14ae6 100644
--- a/apps/sim/providers/models.ts
+++ b/apps/sim/providers/models.ts
@@ -34,6 +34,12 @@ 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[]
   }
@@ -613,6 +619,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -627,6 +634,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -640,6 +648,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         },
         capabilities: {
           temperature: { min: 0, max: 1 },
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -654,6 +663,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -668,6 +678,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -681,6 +692,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         },
         capabilities: {
           temperature: { min: 0, max: 1 },
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -695,6 +707,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           computerUse: true,
+          maxOutputTokens: { max: 8192, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -709,6 +722,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           computerUse: true,
+          maxOutputTokens: { max: 8192, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -1655,6 +1669,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -1668,6 +1683,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -1681,6 +1697,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -1694,6 +1711,7 @@ export const PROVIDER_DEFINITIONS: Record<string, ProviderDefinition> = {
         capabilities: {
           temperature: { min: 0, max: 1 },
           nativeStructuredOutputs: true,
+          maxOutputTokens: { max: 64000, default: 8192 },
         },
         contextWindow: 200000,
       },
@@ -2333,3 +2351,31 @@ 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
+}
diff --git a/apps/sim/providers/utils.ts b/apps/sim/providers/utils.ts
index def15fbb5..b064b4220 100644
--- a/apps/sim/providers/utils.ts
+++ b/apps/sim/providers/utils.ts
@@ -8,6 +8,7 @@ import {
   getComputerUseModels,
   getEmbeddingModelPricing,
   getHostedModels as getHostedModelsFromDefinitions,
+  getMaxOutputTokensForModel as getMaxOutputTokensForModelFromDefinitions,
   getMaxTemperature as getMaxTempFromDefinitions,
   getModelPricing as getModelPricingFromDefinitions,
   getModelsWithReasoningEffort,
@@ -992,6 +993,18 @@ 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
  */
diff --git a/apps/sim/tools/browser_use/run_task.ts b/apps/sim/tools/browser_use/run_task.ts
index e5a6f5381..9dbeeb5b6 100644
--- 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 = 180000
+const MAX_POLL_TIME_MS = 600000 // 10 minutes
 const MAX_CONSECUTIVE_ERRORS = 3
 
 async function createSessionWithProfile(

From 9dbf56f9cd451a7b9fb3da31e7ebe36dad8d4915 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 17:22:44 -0800
Subject: [PATCH 11/18] feat(note-block): expand media embed support with tuned
 aspect ratios (#3016)

* feat(note-block): expand media embed support with tuned aspect ratios

* fix(note-block): add artist parameter to Bandcamp embed URLs

Include the artist subdomain in Bandcamp track and album embed URLs
to ensure proper embed resolution.

* fix(note-block): add required src attribute to track elements

HTML spec requires track elements to have a src attribute.

* fix(note-block): address embed URL matching issues

- Fix YouTube regex to handle v= anywhere in query params
- Fix Twitch channel match to exclude /clip/ URLs
- Remove Mux support (HLS not supported in most browsers)
- Remove Bandcamp support (requires numeric IDs, not slugs)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../components/note-block/note-block.tsx      | 363 ++++++++++++++++--
 1 file changed, 335 insertions(+), 28 deletions(-)

diff --git 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
index 25242087c..cf2ff7b7b 100644
--- 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,18 +25,277 @@ 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'
+}
+
 /**
- * Extract YouTube video ID from various YouTube URL formats
+ * Get embed info for supported media platforms
  */
-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]
+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' }
   }
+
+  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
 }
 
@@ -108,29 +367,57 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
           )
         },
         a: ({ href, children }: any) => {
-          const videoId = href ? getYouTubeVideoId(href) : null
-          if (videoId) {
+          const embedInfo = href ? getEmbedInfo(href) : null
+          if (embedInfo) {
             return (
-              <span className='inline'>
+              <span className='my-2 block w-full'>
                 <a
                   href={href}
                   target='_blank'
                   rel='noopener noreferrer'
-                  className='text-[var(--brand-secondary)] underline-offset-2 hover:underline'
+                  className='mb-1 block break-all text-[var(--brand-secondary)] underline-offset-2 hover:underline'
                 >
                   {children}
                 </a>
-                <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 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>
               </span>
             )
@@ -140,7 +427,7 @@ const NoteMarkdown = memo(function NoteMarkdown({ content }: { content: string }
               href={href}
               target='_blank'
               rel='noopener noreferrer'
-              className='text-[var(--brand-secondary)] underline-offset-2 hover:underline'
+              className='break-all text-[var(--brand-secondary)] underline-offset-2 hover:underline'
             >
               {children}
             </a>
@@ -159,6 +446,26 @@ 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}
@@ -171,7 +478,7 @@ export const NoteBlock = memo(function NoteBlock({
   data,
   selected,
 }: NodeProps<NoteBlockNodeData>) {
-  const { type, config, name } = data
+  const { type, name } = data
 
   const { activeWorkflowId, isEnabled, handleClick, hasRing, ringStyles } = useBlockVisual({
     blockId: id,
@@ -248,8 +555,8 @@ export const NoteBlock = memo(function NoteBlock({
           </div>
         </div>
 
-        <div className='relative p-[8px]'>
-          <div className='relative break-words'>
+        <div className='relative overflow-hidden p-[8px]'>
+          <div className='relative max-w-full break-all'>
             {isEmpty ? (
               <p className='text-[#868686] text-sm'>Add note...</p>
             ) : (

From cb650132c75c3434dd69d21232c60c5ce3e12fab Mon Sep 17 00:00:00 2001
From: Siddharth Ganesan <33737564+Sg312@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:25:09 -0800
Subject: [PATCH 12/18] fix(executor): fix. convergent error edges (#3015)

---
 .../executor/execution/edge-manager.test.ts   | 170 ++++++++++++++++++
 apps/sim/executor/execution/edge-manager.ts   |  29 ++-
 2 files changed, 198 insertions(+), 1 deletion(-)

diff --git a/apps/sim/executor/execution/edge-manager.test.ts b/apps/sim/executor/execution/edge-manager.test.ts
index f78bb8cf2..f7b332792 100644
--- a/apps/sim/executor/execution/edge-manager.test.ts
+++ b/apps/sim/executor/execution/edge-manager.test.ts
@@ -773,6 +773,176 @@ 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'
diff --git a/apps/sim/executor/execution/edge-manager.ts b/apps/sim/executor/execution/edge-manager.ts
index 28416333c..f0ac33fa7 100644
--- a/apps/sim/executor/execution/edge-manager.ts
+++ b/apps/sim/executor/execution/edge-manager.ts
@@ -8,6 +8,7 @@ const logger = createLogger('EdgeManager')
 
 export class EdgeManager {
   private deactivatedEdges = new Set<string>()
+  private nodesWithActivatedEdge = new Set<string>()
 
   constructor(private dag: DAG) {}
 
@@ -35,6 +36,11 @@ 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)
@@ -71,6 +77,18 @@ 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
   }
 
@@ -90,6 +108,7 @@ export class EdgeManager {
 
   clearDeactivatedEdges(): void {
     this.deactivatedEdges.clear()
+    this.nodesWithActivatedEdge.clear()
   }
 
   /**
@@ -108,6 +127,10 @@ 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 {
@@ -210,7 +233,11 @@ export class EdgeManager {
       cascadeTargets?.add(targetId)
     }
 
-    if (this.hasActiveIncomingEdges(targetNode, edgeKey)) {
+    // Don't cascade if node has active incoming edges OR has received an activated edge
+    if (
+      this.hasActiveIncomingEdges(targetNode, edgeKey) ||
+      this.nodesWithActivatedEdge.has(targetId)
+    ) {
       return
     }
 

From 9cba8eee488f9d713373de1c81cbe762af9dfab0 Mon Sep 17 00:00:00 2001
From: Emir Karabeg <78010029+emir-karabeg@users.noreply.github.com>
Date: Mon, 26 Jan 2026 17:57:48 -0800
Subject: [PATCH 13/18] improvement(preview): error paths, loops, workflow
 (#3010)

* improvement(switch): dark styling

* improvement(settings): change deployed MCPs to MCPs servers

* improvement(preview): added error paths, loop logic

* improvement(preview): nested workflows preview

* feat(preview): lightweight param

* improvement(preview): staging changes integrated
---
 apps/docs/app/global.css                      |  18 +-
 .../content/docs/de/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/de/mcp/index.mdx       |   2 +-
 .../content/docs/en/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/en/mcp/index.mdx       |   2 +-
 .../content/docs/es/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/es/mcp/index.mdx       |   2 +-
 .../content/docs/fr/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/fr/mcp/index.mdx       |   2 +-
 .../content/docs/ja/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/ja/mcp/index.mdx       |   2 +-
 .../content/docs/zh/mcp/deploy-workflows.mdx  |   4 +-
 apps/docs/content/docs/zh/mcp/index.mdx       |   2 +-
 apps/sim/app/templates/[id]/template.tsx      |   4 +-
 .../templates/components/template-card.tsx    |   4 +-
 .../execution-snapshot/execution-snapshot.tsx | 144 +---
 .../templates/components/template-card.tsx    |   4 +-
 .../components/general/general.tsx            |  62 +-
 .../deploy-modal/components/mcp/mcp.tsx       |   2 +-
 .../components/template/template.tsx          |   6 +-
 .../panel/components/editor/editor.tsx        |   4 +-
 .../workflow-edge/workflow-edge.tsx           |  17 +-
 .../components/preview-context-menu/index.ts  |   1 +
 .../preview-context-menu.tsx                  |  97 +++
 .../components/preview-editor/index.ts        |   1 +
 .../{ => preview-editor}/preview-editor.tsx   | 412 ++++++-----
 .../components/block}/block.tsx               | 328 +++------
 .../components/block/index.ts                 |   1 +
 .../components/subflow/index.ts               |   1 +
 .../components/subflow/subflow.tsx            | 131 ++++
 .../components/preview-workflow/index.ts      |   1 +
 .../preview-workflow/preview-workflow.tsx     | 613 +++++++++++++++
 .../w/components/preview/index.ts             |   6 +-
 .../w/components/preview/preview.tsx          | 695 +++++++-----------
 .../settings-modal/settings-modal.tsx         |   2 +-
 .../emcn/components/switch/switch.tsx         |  17 +-
 bun.lock                                      |   2 +-
 37 files changed, 1543 insertions(+), 1066 deletions(-)
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/index.ts
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/preview-context-menu.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/index.ts
 rename apps/sim/app/workspace/[workspaceId]/w/components/preview/components/{ => preview-editor}/preview-editor.tsx (79%)
 rename apps/sim/app/workspace/[workspaceId]/w/components/preview/components/{ => preview-workflow/components/block}/block.tsx (69%)
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/index.ts
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/index.ts
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/subflow.tsx
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/index.ts
 create mode 100644 apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx

diff --git a/apps/docs/app/global.css b/apps/docs/app/global.css
index 656b946cd..95eebe1e8 100644
--- a/apps/docs/app/global.css
+++ b/apps/docs/app/global.css
@@ -377,6 +377,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,
@@ -385,14 +395,6 @@ aside[data-sidebar] > *:not([data-sidebar-viewport]) {
   #nd-sidebar > div:first-child > a:first-child,
   #nd-sidebar img[alt="Sim"],
   #nd-sidebar svg[aria-label="Sim"],
-  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"],
-  [data-sidebar-header],
-  [data-sidebar] [data-title],
   /* Hide theme toggle at bottom of sidebar on desktop */
     #nd-sidebar
     > footer,
diff --git a/apps/docs/content/docs/de/mcp/deploy-workflows.mdx b/apps/docs/content/docs/de/mcp/deploy-workflows.mdx
index a782869af..595c58113 100644
--- 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 → Bereitgestellte MCPs**
+1. Navigieren Sie zu **Einstellungen → MCP-Server**
 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 → Bereitgestellte MCPs** können Sie:
+In der Server-Detailansicht unter **Einstellungen → MCP-Server** können Sie:
 
 - **Tools anzeigen**: Alle Workflows sehen, die einem Server hinzugefügt wurden
 - **URL kopieren**: Die Server-URL für MCP-Clients abrufen
diff --git a/apps/docs/content/docs/de/mcp/index.mdx b/apps/docs/content/docs/de/mcp/index.mdx
index 77edb5b72..12d5713bd 100644
--- 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 **Bereitgestellte MCPs**
+2. Gehen Sie zum Abschnitt **MCP-Server**
 3. Klicken Sie auf **MCP-Server hinzufügen**
 4. Geben Sie die Server-Konfigurationsdetails ein
 5. Speichern Sie die Konfiguration
diff --git a/apps/docs/content/docs/en/mcp/deploy-workflows.mdx b/apps/docs/content/docs/en/mcp/deploy-workflows.mdx
index 54a928c3a..f7ece9e96 100644
--- 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 → Deployed MCPs**
+1. Navigate to **Settings → MCP Servers**
 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 → Deployed MCPs**, you can:
+From the server detail view in **Settings → MCP Servers**, you can:
 
 - **View tools**: See all workflows added to a server
 - **Copy URL**: Get the server URL for MCP clients
diff --git a/apps/docs/content/docs/en/mcp/index.mdx b/apps/docs/content/docs/en/mcp/index.mdx
index c38f5d95d..8975c4f39 100644
--- 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 **Deployed MCPs** section
+2. Go to the **MCP Servers** section
 3. Click **Add MCP Server**
 4. Enter the server configuration details
 5. Save the configuration
diff --git a/apps/docs/content/docs/es/mcp/deploy-workflows.mdx b/apps/docs/content/docs/es/mcp/deploy-workflows.mdx
index 5e2c6c51a..39490d7c7 100644
--- 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 → MCP implementados**
+1. Navega a **Configuración → Servidores MCP**
 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 → MCP implementados**, puedes:
+Desde la vista de detalles del servidor en **Configuración → Servidores MCP**, 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
diff --git a/apps/docs/content/docs/es/mcp/index.mdx b/apps/docs/content/docs/es/mcp/index.mdx
index b6f92b43f..913a17467 100644
--- 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 **MCP implementados**
+2. Ve a la sección **Servidores MCP**
 3. Haz clic en **Añadir servidor MCP**
 4. Introduce los detalles de configuración del servidor
 5. Guarda la configuración
diff --git a/apps/docs/content/docs/fr/mcp/deploy-workflows.mdx b/apps/docs/content/docs/fr/mcp/deploy-workflows.mdx
index 117f47e0e..77f3c0137 100644
--- 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 → MCP déployés**
+1. Accédez à **Paramètres → Serveurs MCP**
 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 → MCP déployés**, vous pouvez :
+Depuis la vue détaillée du serveur dans **Paramètres → Serveurs MCP**, 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
diff --git a/apps/docs/content/docs/fr/mcp/index.mdx b/apps/docs/content/docs/fr/mcp/index.mdx
index b29218669..e05259960 100644
--- 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 **MCP déployés**
+2. Allez dans la section **Serveurs MCP**
 3. Cliquez sur **Ajouter un serveur MCP**
 4. Saisissez les détails de configuration du serveur
 5. Enregistrez la configuration
diff --git a/apps/docs/content/docs/ja/mcp/deploy-workflows.mdx b/apps/docs/content/docs/ja/mcp/deploy-workflows.mdx
index 3b14430e2..815cfdffa 100644
--- 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を取得
diff --git a/apps/docs/content/docs/ja/mcp/index.mdx b/apps/docs/content/docs/ja/mcp/index.mdx
index 6b2a49c42..be0fc699c 100644
--- 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. 設定を保存します
diff --git a/apps/docs/content/docs/zh/mcp/deploy-workflows.mdx b/apps/docs/content/docs/zh/mcp/deploy-workflows.mdx
index b5d20de93..94373c0ee 100644
--- 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. 进入 **设置 → 已部署的 MCPs**
+1. 进入 **设置 → MCP 服务器**
 2. 点击 **创建服务器**
 3. 输入名称和可选描述
 4. 复制服务器 URL 以在你的 MCP 客户端中使用
@@ -78,7 +78,7 @@ MCP 服务器用于将您的工作流工具进行分组。您可以在工作区
 
 ## 服务器管理
 
-在 **设置 → 已部署的 MCPs** 的服务器详情页，你可以：
+在 **设置 → MCP 服务器** 的服务器详情页，你可以：
 
 - **查看工具**：查看添加到服务器的所有工作流
 - **复制 URL**：获取 MCP 客户端的服务器 URL
diff --git a/apps/docs/content/docs/zh/mcp/index.mdx b/apps/docs/content/docs/zh/mcp/index.mdx
index 98e72d450..b81792ceb 100644
--- 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. 前往 **Deployed MCPs** 部分
+2. 前往 **MCP Servers** 部分
 3. 点击 **Add MCP Server**
 4. 输入服务器配置信息
 5. 保存配置
diff --git a/apps/sim/app/templates/[id]/template.tsx b/apps/sim/app/templates/[id]/template.tsx
index ac09e5af9..afdf0e6bb 100644
--- 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 { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { PreviewWorkflow } 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 (
-        <WorkflowPreview
+        <PreviewWorkflow
           workflowState={template.state}
           height='100%'
           width='100%'
diff --git a/apps/sim/app/templates/components/template-card.tsx b/apps/sim/app/templates/components/template-card.tsx
index 3c1c32a41..6663b1de5 100644
--- 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 { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { PreviewWorkflow } 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,7 +200,7 @@ function TemplateCardInner({
         className='pointer-events-none h-[180px] w-full cursor-pointer overflow-hidden rounded-[6px]'
       >
         {normalizedState && isInView ? (
-          <WorkflowPreview
+          <PreviewWorkflow
             workflowState={normalizedState}
             height={180}
             width='100%'
diff --git 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
index a0f2a7376..f883a96fb 100644
--- 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, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { AlertCircle, Loader2 } from 'lucide-react'
 import { createPortal } from 'react-dom'
 import {
@@ -13,13 +13,8 @@ import {
   PopoverContent,
   PopoverItem,
 } from '@/components/emcn'
-import { redactApiKeys } from '@/lib/core/security/redaction'
 import { cn } from '@/lib/core/utils/cn'
-import {
-  getLeftmostBlockId,
-  PreviewEditor,
-  WorkflowPreview,
-} from '@/app/workspace/[workspaceId]/w/components/preview'
+import { Preview } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useExecutionSnapshot } from '@/hooks/queries/logs'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
@@ -32,13 +27,6 @@ interface TraceSpan {
   children?: TraceSpan[]
 }
 
-interface BlockExecutionData {
-  input: unknown
-  output: unknown
-  status: string
-  durationMs: number
-}
-
 interface MigratedWorkflowState extends WorkflowState {
   _migrated: true
   _note?: string
@@ -70,98 +58,35 @@ export function ExecutionSnapshot({
   onClose = () => {},
 }: ExecutionSnapshotProps) {
   const { data, isLoading, error } = useExecutionSnapshot(executionId)
-  const [pinnedBlockId, setPinnedBlockId] = useState<string | null>(null)
-  const autoSelectedForExecutionRef = useRef<string | null>(null)
+  const lastExecutionIdRef = 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
 
-  // 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])
+  // Track execution ID changes for key reset
+  const executionKey = executionId !== lastExecutionIdRef.current ? executionId : undefined
+  if (executionId !== lastExecutionIdRef.current) {
+    lastExecutionIdRef.current = executionId
+  }
 
   const renderContent = () => {
     if (isLoading) {
@@ -226,44 +151,17 @@ export function ExecutionSnapshot({
     }
 
     return (
-      <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>
+      <Preview
+        key={executionKey}
+        workflowState={workflowState}
+        traceSpans={traceSpans}
+        className={className}
+        height={height}
+        width={width}
+        onCanvasContextMenu={handleCanvasContextMenu}
+        showBorder={!isModal}
+        autoSelectLeftmost
+      />
     )
   }
 
@@ -287,9 +185,6 @@ 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>,
@@ -304,7 +199,6 @@ export function ExecutionSnapshot({
           open={isOpen}
           onOpenChange={(open) => {
             if (!open) {
-              setPinnedBlockId(null)
               onClose()
             }
           }}
diff --git a/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx b/apps/sim/app/workspace/[workspaceId]/templates/components/template-card.tsx
index 5bb5886d1..5e7e112f6 100644
--- 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 { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { PreviewWorkflow } 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 ? (
-          <WorkflowPreview
+          <PreviewWorkflow
             workflowState={normalizedState}
             height={180}
             width='100%'
diff --git 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
index 06a19c89c..339aa023e 100644
--- 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, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import {
   Button,
@@ -17,11 +17,7 @@ import {
 } from '@/components/emcn'
 import { Skeleton } from '@/components/ui'
 import type { WorkflowDeploymentVersionResponse } from '@/lib/workflows/persistence/utils'
-import {
-  getLeftmostBlockId,
-  PreviewEditor,
-  WorkflowPreview,
-} from '@/app/workspace/[workspaceId]/w/components/preview'
+import { Preview, PreviewWorkflow } 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'
@@ -59,8 +55,6 @@ 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)
 
@@ -135,19 +129,6 @@ 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]'>
@@ -205,7 +186,7 @@ export function GeneralDeploy({
             {workflowToShow ? (
               <>
                 <div className='[&_*]:!cursor-default h-full w-full cursor-default'>
-                  <WorkflowPreview
+                  <PreviewWorkflow
                     workflowState={workflowToShow}
                     height='100%'
                     width='100%'
@@ -306,46 +287,15 @@ export function GeneralDeploy({
       </Modal>
 
       {workflowToShow && (
-        <Modal
-          open={showExpandedPreview}
-          onOpenChange={(open) => {
-            if (!open) {
-              setExpandedSelectedBlockId(null)
-            }
-            setShowExpandedPreview(open)
-          }}
-        >
+        <Modal open={showExpandedPreview} onOpenChange={setShowExpandedPreview}>
           <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'>
-              <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 className='!p-0 min-h-0 flex-1 overflow-hidden'>
+              <Preview workflowState={workflowToShow} autoSelectLeftmost />
             </ModalBody>
           </ModalContent>
         </Modal>
diff --git 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
index c18727a5b..aae1322eb 100644
--- 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 → Deployed MCPs first.
+          Create an MCP Server in Settings → MCP Servers first.
         </p>
         <Button
           variant='tertiary'
diff --git 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
index 6ff75f6f6..c134f63f1 100644
--- 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 { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { PreviewWorkflow } from '@/app/workspace/[workspaceId]/w/components/preview'
 import { useCreatorProfiles } from '@/hooks/queries/creator-profile'
 import {
   useCreateTemplate,
@@ -439,7 +439,7 @@ const OGCaptureContainer = forwardRef<HTMLDivElement>((_, ref) => {
       }}
       aria-hidden='true'
     >
-      <WorkflowPreview
+      <PreviewWorkflow
         workflowState={workflowState}
         height='100%'
         width='100%'
@@ -478,7 +478,7 @@ function TemplatePreviewContent({ existingTemplate }: TemplatePreviewContentProp
   }
 
   return (
-    <WorkflowPreview
+    <PreviewWorkflow
       key={`template-preview-${existingTemplate.id}`}
       workflowState={workflowState}
       height='100%'
diff --git 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
index cc124bdd6..a951af1fa 100644
--- 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 { WorkflowPreview } from '@/app/workspace/[workspaceId]/w/components/preview'
+import { PreviewWorkflow } 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'>
-                            <WorkflowPreview
+                            <PreviewWorkflow
                               workflowState={childWorkflowState}
                               height={160}
                               width='100%'
diff --git 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
index bb3569e21..5f1dc70f8 100644
--- 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,6 +6,7 @@ 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
@@ -90,15 +91,17 @@ 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) {
@@ -151,4 +154,14 @@ 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)
diff --git 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
new file mode 100644
index 000000000..e5892340b
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/index.ts
@@ -0,0 +1 @@
+export { PreviewContextMenu } from './preview-context-menu'
diff --git 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
new file mode 100644
index 000000000..2e84146c3
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-context-menu/preview-context-menu.tsx
@@ -0,0 +1,97 @@
+'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
+  )
+}
diff --git 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
new file mode 100644
index 000000000..ab4ad275a
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/index.ts
@@ -0,0 +1 @@
+export { PreviewEditor } from './preview-editor'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
similarity index 79%
rename from apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
index 863aa1731..b6a01a646 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
@@ -6,12 +6,24 @@ 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 } from '@/components/emcn'
+import {
+  Badge,
+  Button,
+  ChevronDown,
+  Code,
+  Combobox,
+  Input,
+  Label,
+  Tooltip,
+} from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { formatDuration } from '@/lib/core/utils/formatting'
 import { extractReferencePrefixes } from '@/lib/workflows/sanitization/references'
@@ -22,15 +34,42 @@ 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 } from '@/stores/workflows/workflow/types'
+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;
+  }
+`
 
 /**
  * Format a value for display as JSON string
@@ -123,44 +162,31 @@ function formatInlineValue(value: unknown): string {
   return String(value)
 }
 
-interface ExecutionDataSectionProps {
+interface CollapsibleSectionProps {
   title: string
-  data: unknown
+  defaultExpanded?: boolean
+  children: React.ReactNode
+  isEmpty?: boolean
+  emptyMessage?: string
+  /** Whether this section represents an error state (styles title red) */
   isError?: boolean
-  wrapText?: boolean
-  searchQuery?: string
-  currentMatchIndex?: number
-  onMatchCountChange?: (count: number) => void
-  contentRef?: React.RefObject<HTMLDivElement | null>
-  onContextMenu?: (e: React.MouseEvent) => void
 }
 
 /**
- * Collapsible section for execution data (input/output)
- * Uses Code.Viewer for proper syntax highlighting matching the logs UI
+ * Collapsible section wrapper for organizing preview editor content
  */
-function ExecutionDataSection({
+function CollapsibleSection({
   title,
-  data,
+  defaultExpanded = false,
+  children,
+  isEmpty = false,
+  emptyMessage = 'No data',
   isError = false,
-  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 === ''
+}: CollapsibleSectionProps) {
+  const [isExpanded, setIsExpanded] = useState(defaultExpanded)
 
   return (
-    <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden'>
+    <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden border-[var(--border)] border-b px-[12px] py-[10px]'>
       <div
         className='group flex cursor-pointer items-center justify-between'
         onClick={() => setIsExpanded(!isExpanded)}
@@ -199,20 +225,10 @@ function ExecutionDataSection({
         <>
           {isEmpty ? (
             <div className='rounded-[6px] bg-[var(--surface-3)] px-[10px] py-[8px]'>
-              <span className='text-[12px] text-[var(--text-tertiary)]'>No data</span>
+              <span className='text-[12px] text-[var(--text-tertiary)]'>{emptyMessage}</span>
             </div>
           ) : (
-            <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>
+            children
           )}
         </>
       )}
@@ -261,9 +277,12 @@ 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(connections.map((c) => c.blockId)))
-  }, [connections])
+    setExpandedBlocks(new Set(connectionIds.split(',').filter(Boolean)))
+  }, [connectionIds])
 
   const hasContent = connections.length > 0 || workflowVars.length > 0 || envVars.length > 0
 
@@ -549,27 +568,22 @@ 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') {
@@ -589,7 +603,6 @@ 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`
@@ -601,7 +614,7 @@ function SubflowConfigDisplay({ block, loop, parallel }: SubflowConfigDisplayPro
   }
 
   return (
-    <div className='flex-1 overflow-y-auto overflow-x-hidden pt-[5px] pb-[8px]'>
+    <div className='flex-1 overflow-y-auto overflow-x-hidden pt-[8px] pb-[8px]'>
       {/* Type Selection - matches SubflowEditor */}
       <div>
         <Label className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'>
@@ -703,6 +716,8 @@ 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) */
@@ -725,8 +740,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)
@@ -735,10 +750,39 @@ 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)
@@ -846,10 +890,8 @@ function PreviewEditorContent({
     if (!isResizing) return
 
     const handleMouseMove = (e: MouseEvent) => {
-      const deltaY = startYRef.current - e.clientY // Inverted because we're resizing from bottom up
+      const deltaY = startYRef.current - e.clientY
       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)
     }
@@ -871,7 +913,6 @@ function PreviewEditorContent({
     }
   }, [isResizing])
 
-  // Determine if connections are at minimum height (collapsed state)
   const isConnectionsAtMinHeight = connectionsHeight <= MIN_CONNECTIONS_HEIGHT + 5
 
   const blockNameToId = useMemo(() => {
@@ -891,7 +932,7 @@ function PreviewEditorContent({
       if (!allBlockExecutions || !workflowBlocks) return undefined
       if (!reference.startsWith('<') || !reference.endsWith('>')) return undefined
 
-      const inner = reference.slice(1, -1) // Remove < and >
+      const inner = reference.slice(1, -1)
       const parts = inner.split('.')
       if (parts.length < 1) return undefined
 
@@ -1007,12 +1048,10 @@ 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
@@ -1043,27 +1082,7 @@ 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]'>
-              {/* 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>
+              <style>{READONLY_PREVIEW_STYLES}</style>
               <SubflowConfigDisplay block={block} loop={loopConfig} parallel={parallelConfig} />
             </div>
           </div>
@@ -1095,8 +1114,6 @@ 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 (
@@ -1145,7 +1162,7 @@ function PreviewEditorContent({
 
       {/* Content area */}
       <div className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
-        {/* Subblocks Section */}
+        {/* Main content sections */}
         <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 */}
@@ -1159,91 +1176,154 @@ function PreviewEditorContent({
               </div>
             )}
 
-            {/* 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>
+            {/* 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>
                 )}
-
-                {/* 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}
-                  />
-                )}
-
-                {/* 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}
-                  />
+                {executionData.durationMs !== undefined && (
+                  <span className='font-medium text-[12px] text-[var(--text-tertiary)]'>
+                    {formatDuration(executionData.durationMs, { precision: 2 })}
+                  </span>
                 )}
               </div>
-            ) : null}
+            )}
+
+            {/* 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]'
+                    wrapText={wrapText}
+                    searchQuery={isSearchActive ? searchQuery : undefined}
+                    currentMatchIndex={currentMatchIndex}
+                    onMatchCountChange={handleMatchCountChange}
+                  />
+                </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)]'
+                    )}
+                    wrapText={wrapText}
+                    searchQuery={isSearchActive ? searchQuery : undefined}
+                    currentMatchIndex={currentMatchIndex}
+                    onMatchCountChange={handleMatchCountChange}
+                  />
+                </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>
+            )}
 
             {/* Subblock Values - Using SubBlock components in preview mode */}
-            <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>
+            <div className='readonly-preview px-[8px] pt-[12px] pb-[8px]'>
+              <style>{READONLY_PREVIEW_STYLES}</style>
               {visibleSubBlocks.length > 0 ? (
                 <div className='flex flex-col'>
                   {visibleSubBlocks.map((subBlockConfig, index) => (
@@ -1349,7 +1429,7 @@ function PreviewEditorContent({
       )}
 
       {/* Context Menu */}
-      <SnapshotContextMenu
+      <PreviewContextMenu
         isOpen={isContextMenuOpen}
         position={contextMenuPosition}
         menuRef={contextMenuRef}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
similarity index 69%
rename from apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
index 84f53b415..ca0c3ed5d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/block.tsx
@@ -1,7 +1,6 @@
 'use client'
 
-import { memo, useMemo } from 'react'
-import { RepeatIcon, SplitIcon } from 'lucide-react'
+import { type CSSProperties, memo, useMemo } from 'react'
 import { Handle, type NodeProps, Position } from 'reactflow'
 import { HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
 import {
@@ -11,17 +10,40 @@ import {
   isSubBlockVisibleForMode,
 } from '@/lib/workflows/subblocks/visibility'
 import { getDisplayValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
-import type { ExecutionStatus } from '@/app/workspace/[workspaceId]/w/components/preview/preview'
 import { getBlock } from '@/blocks'
 import { SELECTOR_TYPES_HYDRATION_REQUIRED, type SubBlockConfig } from '@/blocks/types'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
+/** Execution status for blocks in preview mode */
+type ExecutionStatus = 'success' | 'error' | 'not-executed'
+
 /** Subblock value structure matching workflow state */
 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
@@ -34,16 +56,8 @@ interface WorkflowPreviewBlockData {
   executionStatus?: ExecutionStatus
   /** Subblock values from the workflow state */
   subBlockValues?: Record<string, SubBlockValueEntry | unknown>
-  /** Skips expensive subblock computations for thumbnails */
+  /** Skips expensive subblock computations for thumbnails/template previews */
   lightweight?: boolean
-  /** Whether this is a subflow container (loop/parallel) */
-  isSubflow?: boolean
-  /** Type of subflow container */
-  subflowKind?: 'loop' | 'parallel'
-  /** Width of subflow container */
-  width?: number
-  /** Height of subflow container */
-  height?: number
 }
 
 /**
@@ -166,21 +180,17 @@ 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' &&
@@ -246,115 +256,11 @@ function SubBlockRow({ title, value, subBlock, rawValue }: SubBlockRowProps) {
   )
 }
 
-interface SubflowContainerProps {
-  name: string
-  width?: number
-  height?: number
-  kind: 'loop' | 'parallel'
-  isPreviewSelected?: boolean
-}
-
-/**
- * Renders a subflow container (loop/parallel) for preview mode.
- */
-function SubflowContainer({
-  name,
-  width = 500,
-  height = 300,
-  kind,
-  isPreviewSelected = false,
-}: SubflowContainerProps) {
-  const isLoop = kind === 'loop'
-  const BlockIcon = isLoop ? RepeatIcon : SplitIcon
-  const blockIconBg = isLoop ? '#2FB3FF' : '#FEE12B'
-  const blockName = name || (isLoop ? 'Loop' : 'Parallel')
-
-  const startHandleId = isLoop ? 'loop-start-source' : 'parallel-start-source'
-  const endHandleId = isLoop ? 'loop-end-source' : 'parallel-end-source'
-
-  const leftHandleClass =
-    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-l-[2px] !rounded-r-none'
-  const rightHandleClass =
-    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-r-[2px] !rounded-l-none'
-
-  return (
-    <div
-      className='relative select-none rounded-[8px] border border-[var(--border-1)]'
-      style={{ width, height }}
-    >
-      {/* Selection ring overlay */}
-      {isPreviewSelected && (
-        <div className='pointer-events-none absolute inset-0 z-40 rounded-[8px] ring-[1.75px] ring-[var(--brand-secondary)]' />
-      )}
-
-      {/* Target handle on left (input to the subflow) */}
-      <Handle
-        type='target'
-        position={Position.Left}
-        id='target'
-        className={leftHandleClass}
-        style={{
-          left: '-8px',
-          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
-          transform: 'translateY(-50%)',
-        }}
-      />
-
-      {/* Header - matches actual subflow header structure */}
-      <div className='flex items-center justify-between rounded-t-[8px] border-[var(--border)] border-b bg-[var(--surface-2)] py-[8px] pr-[12px] pl-[8px]'>
-        <div className='flex min-w-0 flex-1 items-center gap-[10px]'>
-          <div
-            className='flex h-[24px] w-[24px] flex-shrink-0 items-center justify-center rounded-[6px]'
-            style={{ backgroundColor: blockIconBg }}
-          >
-            <BlockIcon className='h-[16px] w-[16px] text-white' />
-          </div>
-          <span className='font-medium text-[16px]' title={blockName}>
-            {blockName}
-          </span>
-        </div>
-      </div>
-
-      {/* Content area - matches workflow structure */}
-      <div
-        className='h-[calc(100%-50px)] pt-[16px] pr-[80px] pb-[16px] pl-[16px]'
-        style={{ position: 'relative' }}
-      >
-        {/* Subflow Start - connects to first block in subflow */}
-        <div className='absolute top-[16px] left-[16px] flex items-center justify-center rounded-[8px] border border-[var(--border-1)] bg-[var(--surface-2)] px-[12px] py-[6px]'>
-          <span className='font-medium text-[14px] text-[var(--text-primary)]'>Start</span>
-          <Handle
-            type='source'
-            position={Position.Right}
-            id={startHandleId}
-            className={rightHandleClass}
-            style={{ right: '-8px', top: '50%', transform: 'translateY(-50%)' }}
-          />
-        </div>
-      </div>
-
-      {/* End source handle on right (output from the subflow) */}
-      <Handle
-        type='source'
-        position={Position.Right}
-        id={endHandleId}
-        className={rightHandleClass}
-        style={{
-          right: '-8px',
-          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
-          transform: 'translateY(-50%)',
-        }}
-      />
-    </div>
-  )
-}
-
 /**
  * Preview block component for workflow visualization.
  * Renders block header, subblock values, and handles without
  * hooks, store subscriptions, or interactive features.
  * Matches the visual structure of WorkflowBlock exactly.
- * Also handles subflow containers (loop/parallel) when isSubflow is true.
  */
 function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>) {
   const {
@@ -367,32 +273,13 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
     executionStatus,
     subBlockValues,
     lightweight = false,
-    isSubflow = false,
-    subflowKind,
-    width,
-    height,
   } = data
 
-  if (isSubflow && subflowKind) {
-    return (
-      <SubflowContainer
-        name={name}
-        width={width}
-        height={height}
-        kind={subflowKind}
-        isPreviewSelected={isPreviewSelected}
-      />
-    )
-  }
-
   const blockConfig = getBlock(type)
 
   const canonicalIndex = useMemo(
-    () =>
-      lightweight
-        ? { groupsById: {}, canonicalIdBySubBlockId: {} }
-        : buildCanonicalIndex(blockConfig?.subBlocks || []),
-    [blockConfig?.subBlocks, lightweight]
+    () => buildCanonicalIndex(blockConfig?.subBlocks || []),
+    [blockConfig?.subBlocks]
   )
 
   const rawValues = useMemo(() => {
@@ -404,10 +291,9 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
   }, [subBlockValues, lightweight])
 
   const visibleSubBlocks = useMemo(() => {
-    if (lightweight || !blockConfig?.subBlocks) return []
+    if (!blockConfig?.subBlocks) return []
 
     const isPureTriggerBlock = blockConfig.triggers?.enabled && blockConfig.category === 'triggers'
-
     const effectiveTrigger = isTrigger || type === 'starter'
 
     return blockConfig.subBlocks.filter((subBlock) => {
@@ -424,26 +310,40 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         if (subBlock.mode === 'trigger') return false
       }
 
+      /** Skip value-dependent visibility checks in lightweight mode */
+      if (lightweight) return !subBlock.condition
+
       if (!isSubBlockVisibleForMode(subBlock, false, canonicalIndex, rawValues, undefined)) {
         return false
       }
-
       if (!subBlock.condition) return true
       return evaluateSubBlockCondition(subBlock.condition, rawValues)
     })
   }, [
     lightweight,
     blockConfig?.subBlocks,
-    blockConfig?.category,
     blockConfig?.triggers?.enabled,
+    blockConfig?.category,
     type,
     isTrigger,
     canonicalIndex,
     rawValues,
   ])
 
+  /**
+   * Compute condition rows for condition blocks.
+   * In lightweight mode, returns default structure without parsing values.
+   */
   const conditionRows = useMemo(() => {
-    if (lightweight || type !== 'condition') return []
+    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
@@ -464,17 +364,23 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         }
       }
     } catch {
-      // Failed to parse, use fallback
+      /* empty */
     }
 
-    return [
-      { id: 'if', title: 'if', value: '' },
-      { id: 'else', title: 'else', value: '' },
-    ]
-  }, [lightweight, type, rawValues])
+    return defaultRows
+  }, [type, rawValues, lightweight])
 
+  /**
+   * Compute router rows for router_v2 blocks.
+   * In lightweight mode, returns default structure without parsing values.
+   */
   const routerRows = useMemo(() => {
-    if (lightweight || type !== 'router_v2') return []
+    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
@@ -493,11 +399,11 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         }
       }
     } catch {
-      // Failed to parse, use fallback
+      /* empty */
     }
 
-    return [{ id: 'route1', value: '' }]
-  }, [lightweight, type, rawValues])
+    return defaultRows
+  }, [type, rawValues, lightweight])
 
   if (!blockConfig) {
     return null
@@ -515,9 +421,6 @@ 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'
 
@@ -542,7 +445,7 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
           type='target'
           position={horizontalHandles ? Position.Left : Position.Top}
           id='target'
-          className={horizontalHandles ? horizontalHandleClass : verticalHandleClass}
+          className={horizontalHandles ? HANDLE_STYLES.horizontal : HANDLE_STYLES.vertical}
           style={
             horizontalHandles
               ? { left: '-7px', top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px` }
@@ -576,32 +479,36 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         <div className='flex flex-col gap-[8px] p-[8px]'>
           {type === 'condition' ? (
             conditionRows.map((cond) => (
-              <SubBlockRow key={cond.id} title={cond.title} value={getDisplayValue(cond.value)} />
+              <SubBlockRow
+                key={cond.id}
+                title={cond.title}
+                value={lightweight ? undefined : getDisplayValue(cond.value)}
+              />
             ))
           ) : type === 'router_v2' ? (
             <>
               <SubBlockRow
                 key='context'
                 title='Context'
-                value={getDisplayValue(rawValues.context)}
+                value={lightweight ? undefined : getDisplayValue(rawValues.context)}
               />
               {routerRows.map((route, index) => (
                 <SubBlockRow
                   key={route.id}
                   title={`Route ${index + 1}`}
-                  value={getDisplayValue(route.value)}
+                  value={lightweight ? undefined : getDisplayValue(route.value)}
                 />
               ))}
             </>
           ) : (
             visibleSubBlocks.map((subBlock) => {
-              const rawValue = rawValues[subBlock.id]
+              const rawValue = lightweight ? undefined : rawValues[subBlock.id]
               return (
                 <SubBlockRow
                   key={subBlock.id}
                   title={subBlock.title ?? subBlock.id}
-                  value={getDisplayValue(rawValue)}
-                  subBlock={subBlock}
+                  value={lightweight ? undefined : getDisplayValue(rawValue)}
+                  subBlock={lightweight ? undefined : subBlock}
                   rawValue={rawValue}
                 />
               )
@@ -612,7 +519,7 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
         </div>
       )}
 
-      {/* Condition block handles - one per condition branch + error */}
+      {/* Condition block handles */}
       {type === 'condition' && (
         <>
           {conditionRows.map((cond, condIndex) => {
@@ -624,8 +531,8 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
                 type='source'
                 position={Position.Right}
                 id={`condition-${cond.id}`}
-                className={horizontalHandleClass}
-                style={{ right: '-7px', top: `${topOffset}px`, transform: 'translateY(-50%)' }}
+                className={HANDLE_STYLES.right}
+                style={{ top: `${topOffset}px`, right: '-7px', transform: 'translateY(-50%)' }}
               />
             )
           })}
@@ -633,22 +540,16 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
             type='source'
             position={Position.Right}
             id='error'
-            className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
-            style={{
-              right: '-7px',
-              top: 'auto',
-              bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
-              transform: 'translateY(50%)',
-            }}
+            className={HANDLE_STYLES.error}
+            style={ERROR_HANDLE_STYLE}
           />
         </>
       )}
 
-      {/* Router block handles - one per route + error */}
+      {/* Router block handles */}
       {type === 'router_v2' && (
         <>
           {routerRows.map((route, routeIndex) => {
-            // +1 row offset for context row at the top
             const topOffset =
               HANDLE_POSITIONS.CONDITION_START_Y +
               (routeIndex + 1) * HANDLE_POSITIONS.CONDITION_ROW_HEIGHT
@@ -658,8 +559,8 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
                 type='source'
                 position={Position.Right}
                 id={`router-${route.id}`}
-                className={horizontalHandleClass}
-                style={{ right: '-7px', top: `${topOffset}px`, transform: 'translateY(-50%)' }}
+                className={HANDLE_STYLES.right}
+                style={{ top: `${topOffset}px`, right: '-7px', transform: 'translateY(-50%)' }}
               />
             )
           })}
@@ -667,25 +568,20 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
             type='source'
             position={Position.Right}
             id='error'
-            className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
-            style={{
-              right: '-7px',
-              top: 'auto',
-              bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
-              transform: 'translateY(50%)',
-            }}
+            className={HANDLE_STYLES.error}
+            style={ERROR_HANDLE_STYLE}
           />
         </>
       )}
 
-      {/* Standard block handles - source + error (not for condition, router, or response) */}
+      {/* 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 ? horizontalHandleClass : verticalHandleClass}
+            className={horizontalHandles ? HANDLE_STYLES.right : HANDLE_STYLES.vertical}
             style={
               horizontalHandles
                 ? { right: '-7px', top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px` }
@@ -697,13 +593,8 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
               type='source'
               position={Position.Right}
               id='error'
-              className='!border-none !bg-[var(--text-error)] !h-5 !w-[7px] !rounded-[2px]'
-              style={{
-                right: '-7px',
-                top: 'auto',
-                bottom: `${HANDLE_POSITIONS.ERROR_BOTTOM_OFFSET}px`,
-                transform: 'translateY(50%)',
-              }}
+              className={HANDLE_STYLES.error}
+              style={ERROR_HANDLE_STYLE}
             />
           )}
         </>
@@ -712,6 +603,13 @@ function WorkflowPreviewBlockInner({ data }: NodeProps<WorkflowPreviewBlockData>
   )
 }
 
+/**
+ * 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>
@@ -725,40 +623,40 @@ function shouldSkipPreviewBlockRender(
     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.isSubflow !== nextProps.data.isSubflow ||
-    prevProps.data.subflowKind !== nextProps.data.subflowKind ||
-    prevProps.data.width !== nextProps.data.width ||
-    prevProps.data.height !== nextProps.data.height
+    prevProps.data.lightweight !== nextProps.data.lightweight
   ) {
     return false
   }
 
+  /** Skip subBlockValues comparison in lightweight mode */
+  if (nextProps.data.lightweight) return true
+
   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
 
   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
 }
 
-export const WorkflowPreviewBlock = memo(WorkflowPreviewBlockInner, shouldSkipPreviewBlockRender)
+/**
+ * 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)
diff --git 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
new file mode 100644
index 000000000..bd6475e11
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/block/index.ts
@@ -0,0 +1 @@
+export { PreviewBlock } from './block'
diff --git 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
new file mode 100644
index 000000000..ee99f14c6
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/index.ts
@@ -0,0 +1 @@
+export { PreviewSubflow } from './subflow'
diff --git 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
new file mode 100644
index 000000000..848e93c7f
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/components/subflow/subflow.tsx
@@ -0,0 +1,131 @@
+'use client'
+
+import { memo } from 'react'
+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
+  height?: number
+  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
+}
+
+/**
+ * Preview subflow component for workflow visualization.
+ * Renders loop/parallel containers without hooks, store subscriptions,
+ * or interactive features.
+ */
+function WorkflowPreviewSubflowInner({ data }: NodeProps<WorkflowPreviewSubflowData>) {
+  const { name, width = 500, height = 300, kind, isPreviewSelected = false, executionStatus } = data
+
+  const isLoop = kind === 'loop'
+  const BlockIcon = isLoop ? RepeatIcon : SplitIcon
+  const blockIconBg = isLoop ? '#2FB3FF' : '#FEE12B'
+  const blockName = name || (isLoop ? 'Loop' : 'Parallel')
+
+  const startHandleId = isLoop ? 'loop-start-source' : 'parallel-start-source'
+  const endHandleId = isLoop ? 'loop-end-source' : 'parallel-end-source'
+
+  const leftHandleClass =
+    '!z-[10] !border-none !bg-[var(--workflow-edge)] !h-5 !w-[7px] !rounded-l-[2px] !rounded-r-none'
+  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)]'
+      style={{
+        width,
+        height,
+      }}
+    >
+      {/* Selection ring overlay (takes priority over execution rings) */}
+      {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
+        type='target'
+        position={Position.Left}
+        id='target'
+        className={leftHandleClass}
+        style={{
+          left: '-8px',
+          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
+          transform: 'translateY(-50%)',
+        }}
+      />
+
+      {/* Header - matches actual subflow header structure */}
+      <div className='flex items-center justify-between rounded-t-[8px] border-[var(--border)] border-b bg-[var(--surface-2)] py-[8px] pr-[12px] pl-[8px]'>
+        <div className='flex min-w-0 flex-1 items-center gap-[10px]'>
+          <div
+            className='flex h-[24px] w-[24px] flex-shrink-0 items-center justify-center rounded-[6px]'
+            style={{ backgroundColor: blockIconBg }}
+          >
+            <BlockIcon className='h-[16px] w-[16px] text-white' />
+          </div>
+          <span className='font-medium text-[16px]' title={blockName}>
+            {blockName}
+          </span>
+        </div>
+      </div>
+
+      {/* Content area - matches workflow structure */}
+      <div
+        className='h-[calc(100%-50px)] pt-[16px] pr-[80px] pb-[16px] pl-[16px]'
+        style={{ position: 'relative' }}
+      >
+        {/* Subflow Start - connects to first block in subflow */}
+        <div className='absolute top-[16px] left-[16px] flex items-center justify-center rounded-[8px] border border-[var(--border-1)] bg-[var(--surface-2)] px-[12px] py-[6px]'>
+          <span className='font-medium text-[14px] text-[var(--text-primary)]'>Start</span>
+          <Handle
+            type='source'
+            position={Position.Right}
+            id={startHandleId}
+            className={rightHandleClass}
+            style={{ right: '-8px', top: '50%', transform: 'translateY(-50%)' }}
+          />
+        </div>
+      </div>
+
+      {/* End source handle on right (output from the subflow) */}
+      <Handle
+        type='source'
+        position={Position.Right}
+        id={endHandleId}
+        className={rightHandleClass}
+        style={{
+          right: '-8px',
+          top: `${HANDLE_POSITIONS.DEFAULT_Y_OFFSET}px`,
+          transform: 'translateY(-50%)',
+        }}
+      />
+    </div>
+  )
+}
+
+export const PreviewSubflow = memo(WorkflowPreviewSubflowInner)
diff --git 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
new file mode 100644
index 000000000..cd15990bf
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/index.ts
@@ -0,0 +1 @@
+export { getLeftmostBlockId, PreviewWorkflow } from './preview-workflow'
diff --git 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
new file mode 100644
index 000000000..d77363245
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx
@@ -0,0 +1,613 @@
+'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>
+  )
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts b/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts
index d64f8979c..2abd6a9be 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/index.ts
@@ -1,2 +1,6 @@
+export { PreviewContextMenu } from './components/preview-context-menu'
 export { PreviewEditor } from './components/preview-editor'
-export { getLeftmostBlockId, WorkflowPreview } from './preview'
+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'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
index ec00e2c38..8780c6317 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
@@ -1,493 +1,292 @@
 '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 { 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 { 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 { WorkflowPreviewBlock } from '@/app/workspace/[workspaceId]/w/components/preview/components/block'
-import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
+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'
 
-const logger = createLogger('WorkflowPreview')
-
-/**
- * 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)
+interface TraceSpan {
+  blockId?: string
+  input?: unknown
+  output?: unknown
+  status?: string
+  duration?: number
+  children?: TraceSpan[]
 }
 
-/**
- * Calculates container dimensions based on child block positions and sizes.
- * Mirrors the logic from useNodeUtilities.calculateLoopDimensions.
- * Accepts pre-filtered childBlocks for O(1) lookup instead of filtering all blocks.
- */
-function calculateContainerDimensions(childBlocks: BlockState[]): {
-  width: number
-  height: number
-} {
-  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 }
+interface BlockExecutionData {
+  input: unknown
+  output: unknown
+  status: string
+  durationMs: number
+  /** Child trace spans for nested workflow blocks */
+  children?: TraceSpan[]
 }
 
-/**
- * Finds the leftmost block ID from a workflow state.
- * Returns the block with the smallest x position, excluding subflow containers (loop/parallel).
- */
-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
-}
-
-/**
- * Recursively calculates the absolute position of a block,
- * accounting for parent container offsets.
- */
-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: ${block.id}`)
-    return block.position
-  }
-
-  const parentAbsolutePosition = calculateAbsolutePosition(parentBlock, blocks)
-
-  return {
-    x: parentAbsolutePosition.x + block.position.x,
-    y: parentAbsolutePosition.y + block.position.y,
-  }
-}
-
-/** Execution status for edges/nodes in the preview */
-export type ExecutionStatus = 'success' | 'error' | 'not-executed'
-
-interface WorkflowPreviewProps {
+/** Represents a level in the workflow navigation stack */
+interface WorkflowStackEntry {
   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 computations for thumbnails/template previews */
-  lightweight?: boolean
+  traceSpans: TraceSpan[]
+  blockExecutions: Record<string, BlockExecutionData>
 }
 
 /**
- * Preview node types using minimal components without hooks or store subscriptions.
- * This prevents interaction issues while allowing canvas panning and node clicking.
+ * 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.
  */
-const previewNodeTypes: NodeTypes = {
-  workflowBlock: WorkflowPreviewBlock,
-}
+function extractChildTraceSpans(blockExecution: BlockExecutionData | undefined): TraceSpan[] {
+  if (!blockExecution) return []
 
-// Define edge types
-const edgeTypes: EdgeTypes = {
-  default: WorkflowEdge,
-  workflowEdge: WorkflowEdge, // Keep for backward compatibility
-}
+  if (Array.isArray(blockExecution.children) && blockExecution.children.length > 0) {
+    return blockExecution.children
+  }
 
-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()
+  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[]
     }
-  }, [containerRef, fitPadding, fitView])
+  }
 
-  return null
+  return []
 }
 
-export function WorkflowPreview({
-  workflowState,
+/**
+ * Builds block execution data from trace spans
+ */
+export function buildBlockExecutions(spans: TraceSpan[]): Record<string, BlockExecutionData> {
+  const blockExecutionMap: Record<string, BlockExecutionData> = {}
+
+  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
+  }
+
+  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,
+      }
+    }
+  }
+
+  return blockExecutionMap
+}
+
+interface PreviewProps {
+  /** The workflow state to display */
+  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 */
+  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
+}
+
+/**
+ * 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
+ */
+export function Preview({
+  workflowState: rootWorkflowState,
+  traceSpans: rootTraceSpans,
+  blockExecutions: providedBlockExecutions,
   className,
   height = '100%',
   width = '100%',
-  isPannable = true,
-  defaultPosition,
-  defaultZoom = 0.8,
-  fitPadding = 0.25,
-  onNodeClick,
+  onCanvasContextMenu,
   onNodeContextMenu,
-  onPaneClick,
-  cursorStyle = 'grab',
-  executedBlocks,
-  selectedBlockId,
-  lightweight = false,
-}: WorkflowPreviewProps) {
-  const containerRef = useRef<HTMLDivElement>(null)
-  const isValidWorkflowState = workflowState?.blocks && workflowState.edges
-
-  const workflowStructureIds = useMemo(() => {
-    if (!isValidWorkflowState) return ''
-    const blockIds = Object.keys(workflowState.blocks || {})
-    const edgeIds = (workflowState.edges || []).map((e) => e.id)
-    return [...blockIds, ...edgeIds].join(',')
-  }, [workflowState.blocks, workflowState.edges, isValidWorkflowState])
-
-  // Pre-compute parent-child relationships for O(1) lookups in container dimension calculations
-  const containerChildIndex = useMemo(() => {
-    const index: Record<string, BlockState[]> = {}
-    for (const block of Object.values(workflowState.blocks || {})) {
-      if (block?.data?.parentId) {
-        const parentId = block.data.parentId
-        if (!index[parentId]) index[parentId] = []
-        index[parentId].push(block)
-      }
+  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)
     }
-    return index
-  }, [workflowState.blocks])
+    return null
+  })
 
-  const nodes: Node[] = useMemo(() => {
-    if (!isValidWorkflowState) return []
+  /** Stack for nested workflow navigation. Empty means we're at the root level. */
+  const [workflowStack, setWorkflowStack] = useState<WorkflowStackEntry[]>([])
 
-    const nodeArray: Node[] = []
+  /** Block executions for the root level */
+  const rootBlockExecutions = useMemo(() => {
+    if (providedBlockExecutions) return providedBlockExecutions
+    if (!rootTraceSpans || !Array.isArray(rootTraceSpans)) return {}
+    return buildBlockExecutions(rootTraceSpans)
+  }, [providedBlockExecutions, rootTraceSpans])
 
-    Object.entries(workflowState.blocks || {}).forEach(([blockId, block]) => {
-      if (!block || !block.type) {
-        logger.warn(`Skipping invalid block: ${blockId}`)
-        return
-      }
+  /** Current block executions - either from stack or root */
+  const blockExecutions = useMemo(() => {
+    if (workflowStack.length > 0) {
+      return workflowStack[workflowStack.length - 1].blockExecutions
+    }
+    return rootBlockExecutions
+  }, [workflowStack, rootBlockExecutions])
 
-      const absolutePosition = calculateAbsolutePosition(block, workflowState.blocks)
+  /** Current workflow state - either from stack or root */
+  const workflowState = useMemo(() => {
+    if (workflowStack.length > 0) {
+      return workflowStack[workflowStack.length - 1].workflowState
+    }
+    return rootWorkflowState
+  }, [workflowStack, rootWorkflowState])
 
-      // Handle loop/parallel containers - use unified workflowBlock with isSubflow flag
-      if (block.type === 'loop' || block.type === 'parallel') {
-        const isSelected = selectedBlockId === blockId
-        const childBlocks = containerChildIndex[blockId] || []
-        const dimensions = calculateContainerDimensions(childBlocks)
-        nodeArray.push({
-          id: blockId,
-          type: 'workflowBlock',
-          position: absolutePosition,
-          draggable: false,
-          data: {
-            type: block.type,
-            name: block.name,
-            isPreviewSelected: isSelected,
-            isSubflow: true,
-            subflowKind: block.type as 'loop' | 'parallel',
-            width: dimensions.width,
-            height: dimensions.height,
-          },
-        })
-        return
-      }
+  /** Whether we're in execution mode (have trace spans/block executions) */
+  const isExecutionMode = useMemo(() => {
+    return Object.keys(blockExecutions).length > 0
+  }, [blockExecutions])
 
-      // Handle regular blocks
-      const isSelected = selectedBlockId === blockId
+  /** 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)
 
-      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,
-          lightweight,
+      setWorkflowStack((prev) => [
+        ...prev,
+        {
+          workflowState: childWorkflowState,
+          traceSpans: childTraceSpans,
+          blockExecutions: childBlockExecutions,
         },
-      })
-    })
+      ])
 
-    return nodeArray
-  }, [
-    workflowStructureIds,
-    workflowState.blocks,
-    containerChildIndex,
-    isValidWorkflowState,
-    executedBlocks,
-    selectedBlockId,
-    lightweight,
-  ])
+      /** Set pinned block synchronously to avoid double fitView from sidebar resize */
+      const leftmostId = getLeftmostBlockId(childWorkflowState)
+      setPinnedBlockId(leftmostId)
+    },
+    [blockExecutions]
+  )
 
-  const edges: Edge[] = useMemo(() => {
-    if (!isValidWorkflowState) return []
+  /** Handler to go back up the stack */
+  const handleGoBack = useCallback(() => {
+    setWorkflowStack((prev) => prev.slice(0, -1))
+    setPinnedBlockId(null)
+  }, [])
 
-    return (workflowState.edges || []).map((edge) => {
-      let executionStatus: ExecutionStatus | undefined
-      if (executedBlocks) {
-        const sourceExecuted = executedBlocks[edge.source]
-        const targetExecuted = executedBlocks[edge.target]
+  /** Handlers for node interactions - memoized to prevent unnecessary re-renders */
+  const handleNodeClick = useCallback((blockId: string) => {
+    setPinnedBlockId(blockId)
+  }, [])
 
-        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 handlePaneClick = 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,
-      }
-    })
-  }, [workflowStructureIds, workflowState.edges, isValidWorkflowState, executedBlocks])
+  const handleEditorClose = useCallback(() => {
+    setPinnedBlockId(null)
+  }, [])
 
-  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>
-    )
-  }
+  useEffect(() => {
+    setWorkflowStack([])
+  }, [rootWorkflowState])
+
+  const isNested = workflowStack.length > 0
 
   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}; }
+    <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>
+      )}
 
-          /* 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={previewNodeTypes}
-          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={workflowStructureIds}
-          fitPadding={fitPadding}
-          containerRef={containerRef}
+      <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}
         />
       </div>
-    </ReactFlowProvider>
+
+      {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>
   )
 }
diff --git 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
index f862a1290..d2a72a998 100644
--- 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: 'Deployed MCPs', icon: Server, section: 'system' },
+  { id: 'workflow-mcp-servers', label: 'MCP Servers', icon: Server, section: 'system' },
   {
     id: 'byok',
     label: 'BYOK',
diff --git a/apps/sim/components/emcn/components/switch/switch.tsx b/apps/sim/components/emcn/components/switch/switch.tsx
index c9fc42261..118eb6f63 100644
--- a/apps/sim/components/emcn/components/switch/switch.tsx
+++ b/apps/sim/components/emcn/components/switch/switch.tsx
@@ -5,9 +5,8 @@ import * as SwitchPrimitives from '@radix-ui/react-switch'
 import { cn } from '@/lib/core/utils/cn'
 
 /**
- * Custom switch component with thin track design.
- * Track: 28px width, 6px height, 20px border-radius
- * Thumb: 14px diameter circle that overlaps the track
+ * Switch component styled to match Sim's design system.
+ * Uses brand color for checked state, neutral border for unchecked.
  */
 const Switch = React.forwardRef<
   React.ElementRef<typeof SwitchPrimitives.Root>,
@@ -16,21 +15,13 @@ const Switch = React.forwardRef<
   <SwitchPrimitives.Root
     disabled={disabled}
     className={cn(
-      '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)]',
+      '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',
       className
     )}
     {...props}
     ref={ref}
   >
-    <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.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.Root>
 ))
 
diff --git a/bun.lock b/bun.lock
index f1df7669e..c76b5b453 100644
--- a/bun.lock
+++ b/bun.lock
@@ -291,7 +291,7 @@
     },
     "packages/ts-sdk": {
       "name": "simstudio-ts-sdk",
-      "version": "0.1.1",
+      "version": "0.1.2",
       "dependencies": {
         "node-fetch": "^3.3.2",
       },

From 9ee5dfe18548b7251ed86beba1db21b3eb75a2f3 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 18:47:35 -0800
Subject: [PATCH 14/18] improvement(workflow): hide raw json childworkflow span
 (#3019)

---
 apps/sim/executor/execution/block-executor.ts | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/apps/sim/executor/execution/block-executor.ts b/apps/sim/executor/execution/block-executor.ts
index b26f2175b..2cc37a77e 100644
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -12,6 +12,7 @@ import {
   EDGE,
   isSentinelBlockType,
   isTriggerBehavior,
+  isWorkflowBlockType,
 } from '@/executor/constants'
 import type { DAGNode } from '@/executor/dag/builder'
 import { ChildWorkflowError } from '@/executor/errors/child-workflow-error'
@@ -154,8 +155,8 @@ export class BlockExecutor {
       this.state.setBlockOutput(node.id, normalizedOutput, duration)
 
       if (!isSentinel) {
-        const filteredOutput = this.filterOutputForLog(block, normalizedOutput)
-        this.callOnBlockComplete(ctx, node, block, resolvedInputs, filteredOutput, duration)
+        const displayOutput = this.filterOutputForDisplay(block, normalizedOutput)
+        this.callOnBlockComplete(ctx, node, block, resolvedInputs, displayOutput, duration)
       }
 
       return normalizedOutput
@@ -245,7 +246,8 @@ export class BlockExecutor {
     )
 
     if (!isSentinel) {
-      this.callOnBlockComplete(ctx, node, block, input, errorOutput, duration)
+      const displayOutput = this.filterOutputForDisplay(block, errorOutput)
+      this.callOnBlockComplete(ctx, node, block, input, displayOutput, duration)
     }
 
     const hasErrorPort = this.hasErrorPortEdge(node)
@@ -337,7 +339,9 @@ export class BlockExecutor {
     block: SerializedBlock,
     output: NormalizedBlockOutput
   ): NormalizedBlockOutput {
-    if (block.metadata?.id === BlockType.HUMAN_IN_THE_LOOP) {
+    const blockType = block.metadata?.id
+
+    if (blockType === BlockType.HUMAN_IN_THE_LOOP) {
       const filtered: NormalizedBlockOutput = {}
       for (const [key, value] of Object.entries(output)) {
         if (key.startsWith('_')) continue
@@ -360,6 +364,22 @@ 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

From 51891daf9a56da87c8f536053df9a64417a67010 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Mon, 26 Jan 2026 19:40:40 -0800
Subject: [PATCH 15/18] feat(code): undo-redo state (#3018)

* feat(code): undo-redo state

* address greptile

* address bugbot comments

* fix debounce flush

* inc debounce time

* fix wand case

* address comments
---
 .../sub-block/components/code/code.tsx        |  56 +++-
 apps/sim/hooks/use-code-undo-redo.ts          | 239 ++++++++++++++++++
 apps/sim/hooks/use-collaborative-workflow.ts  |   6 +-
 apps/sim/stores/undo-redo/code-storage.ts     |  36 +++
 apps/sim/stores/undo-redo/code-store.ts       | 151 +++++++++++
 apps/sim/stores/undo-redo/index.ts            |   1 +
 6 files changed, 477 insertions(+), 12 deletions(-)
 create mode 100644 apps/sim/hooks/use-code-undo-redo.ts
 create mode 100644 apps/sim/stores/undo-redo/code-storage.ts
 create mode 100644 apps/sim/stores/undo-redo/code-store.ts

diff --git 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
index c67cb5528..6c43b2e30 100644
--- 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,6 +39,8 @@ 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')
 
@@ -212,7 +214,6 @@ 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
 
@@ -220,8 +221,12 @@ 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 =
@@ -296,6 +301,15 @@ 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: () => {
@@ -347,9 +361,10 @@ export const Code = memo(function Code({
       setCode(generatedCode)
       if (!isPreview && !disabled) {
         setStoreValue(generatedCode)
+        recordReplace(generatedCode)
       }
     }
-  }, [isPreview, disabled, setStoreValue])
+  }, [disabled, isPreview, recordReplace, setStoreValue])
 
   useEffect(() => {
     if (!editorRef.current) return
@@ -492,7 +507,7 @@ export const Code = memo(function Code({
 
       setCode(newValue)
       setStoreValue(newValue)
-      hasEditedSinceFocusRef.current = true
+      recordChange(newValue)
       const newCursorPosition = dropPosition + 1
       setCursorPosition(newCursorPosition)
 
@@ -521,7 +536,7 @@ export const Code = memo(function Code({
     if (!isPreview && !readOnly) {
       setCode(newValue)
       emitTagSelection(newValue)
-      hasEditedSinceFocusRef.current = true
+      recordChange(newValue)
     }
     setShowTags(false)
     setActiveSourceBlockId(null)
@@ -539,7 +554,7 @@ export const Code = memo(function Code({
     if (!isPreview && !readOnly) {
       setCode(newValue)
       emitTagSelection(newValue)
-      hasEditedSinceFocusRef.current = true
+      recordChange(newValue)
     }
     setShowEnvVars(false)
 
@@ -625,9 +640,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) {
@@ -646,7 +661,7 @@ export const Code = memo(function Code({
         }
       }
     },
-    [isAiStreaming, isPreview, disabled, readOnly, setStoreValue]
+    [isAiStreaming, isPreview, disabled, readOnly, recordChange, setStoreValue]
   )
 
   const handleKeyDown = useCallback(
@@ -657,21 +672,39 @@ export const Code = memo(function Code({
       }
       if (isAiStreaming) {
         e.preventDefault()
+        return
       }
-      if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !hasEditedSinceFocusRef.current) {
+      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) {
         e.preventDefault()
+        e.stopPropagation()
+        undo()
+        return
+      }
+      if (isRedo) {
+        e.preventDefault()
+        e.stopPropagation()
+        redo()
       }
     },
-    [isAiStreaming]
+    [isAiStreaming, isFunctionCode, redo, undo]
   )
 
   const handleEditorFocus = useCallback(() => {
-    hasEditedSinceFocusRef.current = false
+    startSession(codeRef.current)
     if (!isPreview && !disabled && !readOnly && codeRef.current.trim() === '') {
       setShowTags(true)
       setCursorPosition(0)
     }
-  }, [isPreview, disabled, readOnly])
+  }, [disabled, isPreview, readOnly, startSession])
+
+  const handleEditorBlur = useCallback(() => {
+    flushPending()
+  }, [flushPending])
 
   /**
    * Renders the line numbers, aligned with wrapped visual lines and highlighting the active line.
@@ -791,6 +824,7 @@ export const Code = memo(function Code({
             onValueChange={handleValueChange}
             onKeyDown={handleKeyDown}
             onFocus={handleEditorFocus}
+            onBlur={handleEditorBlur}
             highlight={highlightCode}
             {...getCodeEditorProps({ isStreaming: isAiStreaming, isPreview, disabled })}
           />
diff --git a/apps/sim/hooks/use-code-undo-redo.ts b/apps/sim/hooks/use-code-undo-redo.ts
new file mode 100644
index 000000000..d0edbb535
--- /dev/null
+++ b/apps/sim/hooks/use-code-undo-redo.ts
@@ -0,0 +1,239 @@
+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,
+  }
+}
diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts
index 89aff1d12..5f5721549 100644
--- 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 { useUndoRedoStore } from '@/stores/undo-redo'
+import { useCodeUndoRedoStore, 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,6 +449,10 @@ 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 {
diff --git a/apps/sim/stores/undo-redo/code-storage.ts b/apps/sim/stores/undo-redo/code-storage.ts
new file mode 100644
index 000000000..05f86c82b
--- /dev/null
+++ b/apps/sim/stores/undo-redo/code-storage.ts
@@ -0,0 +1,36 @@
+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 })
+    }
+  },
+}
diff --git a/apps/sim/stores/undo-redo/code-store.ts b/apps/sim/stores/undo-redo/code-store.ts
new file mode 100644
index 000000000..c421126d5
--- /dev/null
+++ b/apps/sim/stores/undo-redo/code-store.ts
@@ -0,0 +1,151 @@
+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' }
+  )
+)
diff --git a/apps/sim/stores/undo-redo/index.ts b/apps/sim/stores/undo-redo/index.ts
index d97adabaf..5c9d815fc 100644
--- a/apps/sim/stores/undo-redo/index.ts
+++ b/apps/sim/stores/undo-redo/index.ts
@@ -1,3 +1,4 @@
+export { useCodeUndoRedoStore } from './code-store'
 export { runWithUndoRedoRecordingSuspended, useUndoRedoStore } from './store'
 export * from './types'
 export * from './utils'

From d8df08d3d36c556a2289dc191caf11a365ec6faf Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 19:54:27 -0800
Subject: [PATCH 16/18] improvement(mcp): remove mcp-remote for cursor config
 (#3020)

---
 .../workflow-mcp-servers.tsx                  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git 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
index 53fdf533d..bf52b1c0b 100644
--- 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,6 +185,16 @@ 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']
@@ -265,14 +275,8 @@ function ServerDetailView({ workspaceId, serverId, onBack }: ServerDetailViewPro
         .replace(/[^a-z0-9-]/g, '')
 
       const config = isPublic
-        ? {
-            command: 'npx',
-            args: ['-y', 'mcp-remote', mcpServerUrl],
-          }
-        : {
-            command: 'npx',
-            args: ['-y', 'mcp-remote', mcpServerUrl, '--header', 'X-API-Key:$SIM_API_KEY'],
-          }
+        ? { url: mcpServerUrl }
+        : { url: mcpServerUrl, headers: { '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)}`

From 077e702dd8294bada4664c5bdd94c94276f6ad98 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 21:01:33 -0800
Subject: [PATCH 17/18] improvement(tools): updated kalshi and polymarket tools
 and blocks (#3021)

---
 apps/docs/components/ui/icon-mapping.ts       |    4 +-
 .../content/docs/en/tools/browser_use.mdx     |    1 +
 apps/docs/content/docs/en/tools/kalshi.mdx    |  327 +++-
 apps/docs/content/docs/en/tools/meta.json     |    1 -
 .../docs/content/docs/en/tools/polymarket.mdx |  338 +++-
 apps/docs/content/docs/en/tools/spotify.mdx   | 1551 -----------------
 apps/docs/content/docs/en/tools/supabase.mdx  |    4 +-
 apps/sim/blocks/blocks/kalshi.ts              |  154 +-
 apps/sim/blocks/blocks/polymarket.ts          |  456 ++++-
 apps/sim/blocks/registry.ts                   |    3 +-
 apps/sim/tools/kalshi/amend_order.ts          |  297 ++++
 apps/sim/tools/kalshi/cancel_order.ts         |  190 ++
 apps/sim/tools/kalshi/create_order.ts         |  341 ++++
 apps/sim/tools/kalshi/get_balance.ts          |   75 +
 apps/sim/tools/kalshi/get_candlesticks.ts     |  243 +++
 apps/sim/tools/kalshi/get_event.ts            |  176 ++
 apps/sim/tools/kalshi/get_events.ts           |  194 +++
 apps/sim/tools/kalshi/get_exchange_status.ts  |   71 +
 apps/sim/tools/kalshi/get_fills.ts            |  195 +++
 apps/sim/tools/kalshi/get_market.ts           |  216 +++
 apps/sim/tools/kalshi/get_markets.ts          |  338 ++++
 apps/sim/tools/kalshi/get_order.ts            |  175 ++
 apps/sim/tools/kalshi/get_orderbook.ts        |  132 ++
 apps/sim/tools/kalshi/get_orders.ts           |  247 +++
 apps/sim/tools/kalshi/get_positions.ts        |  192 ++
 apps/sim/tools/kalshi/get_series_by_ticker.ts |  138 ++
 apps/sim/tools/kalshi/get_trades.ts           |  135 ++
 apps/sim/tools/kalshi/index.ts                |   34 +-
 apps/sim/tools/polymarket/get_activity.ts     |  206 +++
 apps/sim/tools/polymarket/get_event.ts        |   20 +
 apps/sim/tools/polymarket/get_events.ts       |   35 +-
 apps/sim/tools/polymarket/get_holders.ts      |  132 ++
 .../tools/polymarket/get_last_trade_price.ts  |    8 +-
 apps/sim/tools/polymarket/get_leaderboard.ts  |  143 ++
 apps/sim/tools/polymarket/get_market.ts       |   24 +
 apps/sim/tools/polymarket/get_markets.ts      |   34 +-
 apps/sim/tools/polymarket/get_orderbook.ts    |   45 +-
 apps/sim/tools/polymarket/get_positions.ts    |  140 +-
 .../sim/tools/polymarket/get_price_history.ts |    9 +-
 apps/sim/tools/polymarket/get_series.ts       |   20 +
 apps/sim/tools/polymarket/get_series_by_id.ts |   19 +
 apps/sim/tools/polymarket/get_spread.ts       |    9 +-
 apps/sim/tools/polymarket/get_tags.ts         |   12 +-
 apps/sim/tools/polymarket/get_trades.ts       |  108 +-
 apps/sim/tools/polymarket/index.ts            |    3 +
 apps/sim/tools/polymarket/search.ts           |  120 +-
 apps/sim/tools/polymarket/types.ts            |  133 +-
 apps/sim/tools/registry.ts                    |   40 +
 48 files changed, 5779 insertions(+), 1709 deletions(-)
 delete mode 100644 apps/docs/content/docs/en/tools/spotify.mdx
 create mode 100644 apps/sim/tools/polymarket/get_activity.ts
 create mode 100644 apps/sim/tools/polymarket/get_holders.ts
 create mode 100644 apps/sim/tools/polymarket/get_leaderboard.ts

diff --git a/apps/docs/components/ui/icon-mapping.ts b/apps/docs/components/ui/icon-mapping.ts
index 4011e9340..fd1cbbd18 100644
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -101,7 +101,6 @@ import {
   ShopifyIcon,
   SlackIcon,
   SmtpIcon,
-  SpotifyIcon,
   SQSIcon,
   SshIcon,
   STTIcon,
@@ -182,7 +181,7 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   jina: JinaAIIcon,
   jira: JiraIcon,
   jira_service_management: JiraServiceManagementIcon,
-  kalshi: KalshiIcon,
+  kalshi_v2: KalshiIcon,
   knowledge: PackageSearchIcon,
   langsmith: LangsmithIcon,
   lemlist: LemlistIcon,
@@ -229,7 +228,6 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
   shopify: ShopifyIcon,
   slack: SlackIcon,
   smtp: SmtpIcon,
-  spotify: SpotifyIcon,
   sqs: SQSIcon,
   ssh: SshIcon,
   stagehand: StagehandIcon,
diff --git a/apps/docs/content/docs/en/tools/browser_use.mdx b/apps/docs/content/docs/en/tools/browser_use.mdx
index ebcb3ec5d..d0cee8903 100644
--- a/apps/docs/content/docs/en/tools/browser_use.mdx
+++ b/apps/docs/content/docs/en/tools/browser_use.mdx
@@ -47,6 +47,7 @@ Runs a browser automation task using BrowserUse
 | `save_browser_data` | boolean | No | Whether to save browser data |
 | `model` | string | No | LLM model to use \(default: gpt-4o\) |
 | `apiKey` | string | Yes | API key for BrowserUse API |
+| `profile_id` | string | No | Browser profile ID for persistent sessions \(cookies, login state\) |
 
 #### Output
 
diff --git a/apps/docs/content/docs/en/tools/kalshi.mdx b/apps/docs/content/docs/en/tools/kalshi.mdx
index 0757348b1..bae619d79 100644
--- a/apps/docs/content/docs/en/tools/kalshi.mdx
+++ b/apps/docs/content/docs/en/tools/kalshi.mdx
@@ -6,7 +6,7 @@ description: Access prediction markets and trade on Kalshi
 import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
-  type="kalshi"
+  type="kalshi_v2"
   color="#09C285"
 />
 
@@ -36,7 +36,7 @@ Integrate Kalshi prediction markets into the workflow. Can get markets, market,
 
 ### `kalshi_get_markets`
 
-Retrieve a list of prediction markets from Kalshi with optional filtering
+Retrieve a list of prediction markets from Kalshi with all filtering options (V2 - full API response)
 
 #### Input
 
@@ -52,12 +52,12 @@ Retrieve a list of prediction markets from Kalshi with optional filtering
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `markets` | array | Array of market objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `markets` | array | Array of market objects with all API fields |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_market`
 
-Retrieve details of a specific prediction market by ticker
+Retrieve details of a specific prediction market by ticker (V2 - full API response)
 
 #### Input
 
@@ -69,11 +69,62 @@ Retrieve details of a specific prediction market by ticker
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `market` | object | Market object with details |
+| `market` | object | Market object with all API fields |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `event_ticker` | string | Event ticker |
+| ↳ `market_type` | string | Market type |
+| ↳ `title` | string | Market title |
+| ↳ `subtitle` | string | Market subtitle |
+| ↳ `yes_sub_title` | string | Yes outcome subtitle |
+| ↳ `no_sub_title` | string | No outcome subtitle |
+| ↳ `open_time` | string | Market open time |
+| ↳ `close_time` | string | Market close time |
+| ↳ `expected_expiration_time` | string | Expected expiration time |
+| ↳ `expiration_time` | string | Expiration time |
+| ↳ `latest_expiration_time` | string | Latest expiration time |
+| ↳ `settlement_timer_seconds` | number | Settlement timer in seconds |
+| ↳ `status` | string | Market status |
+| ↳ `response_price_units` | string | Response price units |
+| ↳ `notional_value` | number | Notional value |
+| ↳ `tick_size` | number | Tick size |
+| ↳ `yes_bid` | number | Current yes bid price |
+| ↳ `yes_ask` | number | Current yes ask price |
+| ↳ `no_bid` | number | Current no bid price |
+| ↳ `no_ask` | number | Current no ask price |
+| ↳ `last_price` | number | Last trade price |
+| ↳ `previous_yes_bid` | number | Previous yes bid |
+| ↳ `previous_yes_ask` | number | Previous yes ask |
+| ↳ `previous_price` | number | Previous price |
+| ↳ `volume` | number | Total volume |
+| ↳ `volume_24h` | number | 24-hour volume |
+| ↳ `liquidity` | number | Market liquidity |
+| ↳ `open_interest` | number | Open interest |
+| ↳ `result` | string | Market result |
+| ↳ `cap_strike` | number | Cap strike |
+| ↳ `floor_strike` | number | Floor strike |
+| ↳ `can_close_early` | boolean | Can close early |
+| ↳ `expiration_value` | string | Expiration value |
+| ↳ `category` | string | Market category |
+| ↳ `risk_limit_cents` | number | Risk limit in cents |
+| ↳ `strike_type` | string | Strike type |
+| ↳ `rules_primary` | string | Primary rules |
+| ↳ `rules_secondary` | string | Secondary rules |
+| ↳ `settlement_source_url` | string | Settlement source URL |
+| ↳ `custom_strike` | object | Custom strike object |
+| ↳ `underlying` | string | Underlying asset |
+| ↳ `settlement_value` | number | Settlement value |
+| ↳ `cfd_contract_size` | number | CFD contract size |
+| ↳ `yes_fee_fp` | number | Yes fee \(fixed-point\) |
+| ↳ `no_fee_fp` | number | No fee \(fixed-point\) |
+| ↳ `last_price_fp` | number | Last price \(fixed-point\) |
+| ↳ `yes_bid_fp` | number | Yes bid \(fixed-point\) |
+| ↳ `yes_ask_fp` | number | Yes ask \(fixed-point\) |
+| ↳ `no_bid_fp` | number | No bid \(fixed-point\) |
+| ↳ `no_ask_fp` | number | No ask \(fixed-point\) |
 
 ### `kalshi_get_events`
 
-Retrieve a list of events from Kalshi with optional filtering
+Retrieve a list of events from Kalshi with optional filtering (V2 - exact API response)
 
 #### Input
 
@@ -90,11 +141,12 @@ Retrieve a list of events from Kalshi with optional filtering
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `events` | array | Array of event objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `milestones` | array | Array of milestone objects \(if requested\) |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_event`
 
-Retrieve details of a specific event by ticker
+Retrieve details of a specific event by ticker (V2 - exact API response)
 
 #### Input
 
@@ -107,11 +159,23 @@ Retrieve details of a specific event by ticker
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `event` | object | Event object with details |
+| `event` | object | Event object with full details matching Kalshi API response |
+| ↳ `event_ticker` | string | Event ticker |
+| ↳ `series_ticker` | string | Series ticker |
+| ↳ `title` | string | Event title |
+| ↳ `sub_title` | string | Event subtitle |
+| ↳ `mutually_exclusive` | boolean | Mutually exclusive markets |
+| ↳ `category` | string | Event category |
+| ↳ `collateral_return_type` | string | Collateral return type |
+| ↳ `strike_date` | string | Strike date |
+| ↳ `strike_period` | string | Strike period |
+| ↳ `available_on_brokers` | boolean | Available on brokers |
+| ↳ `product_metadata` | object | Product metadata |
+| ↳ `markets` | array | Nested markets \(if requested\) |
 
 ### `kalshi_get_balance`
 
-Retrieve your account balance and portfolio value from Kalshi
+Retrieve your account balance and portfolio value from Kalshi (V2 - exact API response)
 
 #### Input
 
@@ -125,11 +189,12 @@ Retrieve your account balance and portfolio value from Kalshi
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `balance` | number | Account balance in cents |
-| `portfolioValue` | number | Portfolio value in cents |
+| `portfolio_value` | number | Portfolio value in cents |
+| `updated_ts` | number | Unix timestamp of last update \(milliseconds\) |
 
 ### `kalshi_get_positions`
 
-Retrieve your open positions from Kalshi
+Retrieve your open positions from Kalshi (V2 - exact API response)
 
 #### Input
 
@@ -147,12 +212,13 @@ Retrieve your open positions from Kalshi
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `positions` | array | Array of position objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `market_positions` | array | Array of market position objects |
+| `event_positions` | array | Array of event position objects |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_orders`
 
-Retrieve your orders from Kalshi with optional filtering
+Retrieve your orders from Kalshi with optional filtering (V2 with full API response)
 
 #### Input
 
@@ -170,12 +236,12 @@ Retrieve your orders from Kalshi with optional filtering
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `orders` | array | Array of order objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `orders` | array | Array of order objects with full API response fields |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_order`
 
-Retrieve details of a specific order by ID from Kalshi
+Retrieve details of a specific order by ID from Kalshi (V2 with full API response)
 
 #### Input
 
@@ -189,11 +255,44 @@ Retrieve details of a specific order by ID from Kalshi
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `order` | object | Order object with details |
+| `order` | object | Order object with full API response fields |
+| ↳ `order_id` | string | Order ID |
+| ↳ `user_id` | string | User ID |
+| ↳ `client_order_id` | string | Client order ID |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `side` | string | Order side \(yes/no\) |
+| ↳ `action` | string | Action \(buy/sell\) |
+| ↳ `type` | string | Order type \(limit/market\) |
+| ↳ `status` | string | Order status \(resting/canceled/executed\) |
+| ↳ `yes_price` | number | Yes price in cents |
+| ↳ `no_price` | number | No price in cents |
+| ↳ `yes_price_dollars` | string | Yes price in dollars |
+| ↳ `no_price_dollars` | string | No price in dollars |
+| ↳ `fill_count` | number | Filled contract count |
+| ↳ `fill_count_fp` | string | Filled count \(fixed-point\) |
+| ↳ `remaining_count` | number | Remaining contracts |
+| ↳ `remaining_count_fp` | string | Remaining count \(fixed-point\) |
+| ↳ `initial_count` | number | Initial contract count |
+| ↳ `initial_count_fp` | string | Initial count \(fixed-point\) |
+| ↳ `taker_fees` | number | Taker fees in cents |
+| ↳ `maker_fees` | number | Maker fees in cents |
+| ↳ `taker_fees_dollars` | string | Taker fees in dollars |
+| ↳ `maker_fees_dollars` | string | Maker fees in dollars |
+| ↳ `taker_fill_cost` | number | Taker fill cost in cents |
+| ↳ `maker_fill_cost` | number | Maker fill cost in cents |
+| ↳ `taker_fill_cost_dollars` | string | Taker fill cost in dollars |
+| ↳ `maker_fill_cost_dollars` | string | Maker fill cost in dollars |
+| ↳ `queue_position` | number | Queue position \(deprecated\) |
+| ↳ `expiration_time` | string | Order expiration time |
+| ↳ `created_time` | string | Order creation time |
+| ↳ `last_update_time` | string | Last update time |
+| ↳ `self_trade_prevention_type` | string | Self-trade prevention type |
+| ↳ `order_group_id` | string | Order group ID |
+| ↳ `cancel_order_on_pause` | boolean | Cancel on market pause |
 
 ### `kalshi_get_orderbook`
 
-Retrieve the orderbook (yes and no bids) for a specific market
+Retrieve the orderbook (yes and no bids) for a specific market (V2 - includes depth and fp fields)
 
 #### Input
 
@@ -205,11 +304,18 @@ Retrieve the orderbook (yes and no bids) for a specific market
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `orderbook` | object | Orderbook with yes/no bids and asks |
+| `orderbook` | object | Orderbook with yes/no bids \(legacy integer counts\) |
+| ↳ `yes` | array | Yes side bids as tuples \[price_cents, count\] |
+| ↳ `no` | array | No side bids as tuples \[price_cents, count\] |
+| ↳ `yes_dollars` | array | Yes side bids as tuples \[dollars_string, count\] |
+| ↳ `no_dollars` | array | No side bids as tuples \[dollars_string, count\] |
+| `orderbook_fp` | object | Orderbook with fixed-point counts \(preferred\) |
+| ↳ `yes_dollars` | array | Yes side bids as tuples \[dollars_string, fp_count_string\] |
+| ↳ `no_dollars` | array | No side bids as tuples \[dollars_string, fp_count_string\] |
 
 ### `kalshi_get_trades`
 
-Retrieve recent trades across all markets
+Retrieve recent trades with additional filtering options (V2 - includes trade_id and count_fp)
 
 #### Input
 
@@ -222,12 +328,12 @@ Retrieve recent trades across all markets
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `trades` | array | Array of trade objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `trades` | array | Array of trade objects with trade_id and count_fp |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_candlesticks`
 
-Retrieve OHLC candlestick data for a specific market
+Retrieve OHLC candlestick data for a specific market (V2 - full API response)
 
 #### Input
 
@@ -243,7 +349,8 @@ Retrieve OHLC candlestick data for a specific market
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `candlesticks` | array | Array of OHLC candlestick data |
+| `ticker` | string | Market ticker |
+| `candlesticks` | array | Array of OHLC candlestick data with nested bid/ask/price objects |
 
 ### `kalshi_get_fills`
 
@@ -266,12 +373,12 @@ Retrieve your portfolio
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `fills` | array | Array of fill/trade objects |
-| `paging` | object | Pagination cursor for fetching more results |
+| `fills` | array | Array of fill/trade objects with all API fields |
+| `cursor` | string | Pagination cursor for fetching more results |
 
 ### `kalshi_get_series_by_ticker`
 
-Retrieve details of a specific market series by ticker
+Retrieve details of a specific market series by ticker (V2 - exact API response)
 
 #### Input
 
@@ -283,11 +390,25 @@ Retrieve details of a specific market series by ticker
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `series` | object | Series object with details |
+| `series` | object | Series object with full details matching Kalshi API response |
+| ↳ `ticker` | string | Series ticker |
+| ↳ `title` | string | Series title |
+| ↳ `frequency` | string | Event frequency |
+| ↳ `category` | string | Series category |
+| ↳ `tags` | array | Series tags |
+| ↳ `settlement_sources` | array | Settlement sources |
+| ↳ `contract_url` | string | Contract URL |
+| ↳ `contract_terms_url` | string | Contract terms URL |
+| ↳ `fee_type` | string | Fee type |
+| ↳ `fee_multiplier` | number | Fee multiplier |
+| ↳ `additional_prohibitions` | array | Additional prohibitions |
+| ↳ `product_metadata` | object | Product metadata |
+| ↳ `volume` | number | Series volume |
+| ↳ `volume_fp` | number | Volume \(fixed-point\) |
 
 ### `kalshi_get_exchange_status`
 
-Retrieve the current status of the Kalshi exchange (trading and exchange activity)
+Retrieve the current status of the Kalshi exchange (V2 - exact API response)
 
 #### Input
 
@@ -298,11 +419,13 @@ Retrieve the current status of the Kalshi exchange (trading and exchange activit
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `status` | object | Exchange status with trading_active and exchange_active flags |
+| `exchange_active` | boolean | Whether the exchange is active |
+| `trading_active` | boolean | Whether trading is active |
+| `exchange_estimated_resume_time` | string | Estimated time when exchange will resume \(if inactive\) |
 
 ### `kalshi_create_order`
 
-Create a new order on a Kalshi prediction market
+Create a new order on a Kalshi prediction market (V2 with full API response)
 
 #### Input
 
@@ -332,11 +455,44 @@ Create a new order on a Kalshi prediction market
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `order` | object | The created order object |
+| `order` | object | The created order object with full API response fields |
+| ↳ `order_id` | string | Order ID |
+| ↳ `user_id` | string | User ID |
+| ↳ `client_order_id` | string | Client order ID |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `side` | string | Order side \(yes/no\) |
+| ↳ `action` | string | Action \(buy/sell\) |
+| ↳ `type` | string | Order type \(limit/market\) |
+| ↳ `status` | string | Order status \(resting/canceled/executed\) |
+| ↳ `yes_price` | number | Yes price in cents |
+| ↳ `no_price` | number | No price in cents |
+| ↳ `yes_price_dollars` | string | Yes price in dollars |
+| ↳ `no_price_dollars` | string | No price in dollars |
+| ↳ `fill_count` | number | Filled contract count |
+| ↳ `fill_count_fp` | string | Filled count \(fixed-point\) |
+| ↳ `remaining_count` | number | Remaining contracts |
+| ↳ `remaining_count_fp` | string | Remaining count \(fixed-point\) |
+| ↳ `initial_count` | number | Initial contract count |
+| ↳ `initial_count_fp` | string | Initial count \(fixed-point\) |
+| ↳ `taker_fees` | number | Taker fees in cents |
+| ↳ `maker_fees` | number | Maker fees in cents |
+| ↳ `taker_fees_dollars` | string | Taker fees in dollars |
+| ↳ `maker_fees_dollars` | string | Maker fees in dollars |
+| ↳ `taker_fill_cost` | number | Taker fill cost in cents |
+| ↳ `maker_fill_cost` | number | Maker fill cost in cents |
+| ↳ `taker_fill_cost_dollars` | string | Taker fill cost in dollars |
+| ↳ `maker_fill_cost_dollars` | string | Maker fill cost in dollars |
+| ↳ `queue_position` | number | Queue position \(deprecated\) |
+| ↳ `expiration_time` | string | Order expiration time |
+| ↳ `created_time` | string | Order creation time |
+| ↳ `last_update_time` | string | Last update time |
+| ↳ `self_trade_prevention_type` | string | Self-trade prevention type |
+| ↳ `order_group_id` | string | Order group ID |
+| ↳ `cancel_order_on_pause` | boolean | Cancel on market pause |
 
 ### `kalshi_cancel_order`
 
-Cancel an existing order on Kalshi
+Cancel an existing order on Kalshi (V2 with full API response)
 
 #### Input
 
@@ -350,12 +506,46 @@ Cancel an existing order on Kalshi
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `order` | object | The canceled order object |
-| `reducedBy` | number | Number of contracts canceled |
+| `order` | object | The canceled order object with full API response fields |
+| ↳ `order_id` | string | Order ID |
+| ↳ `user_id` | string | User ID |
+| ↳ `client_order_id` | string | Client order ID |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `side` | string | Order side \(yes/no\) |
+| ↳ `action` | string | Action \(buy/sell\) |
+| ↳ `type` | string | Order type \(limit/market\) |
+| ↳ `status` | string | Order status \(resting/canceled/executed\) |
+| ↳ `yes_price` | number | Yes price in cents |
+| ↳ `no_price` | number | No price in cents |
+| ↳ `yes_price_dollars` | string | Yes price in dollars |
+| ↳ `no_price_dollars` | string | No price in dollars |
+| ↳ `fill_count` | number | Filled contract count |
+| ↳ `fill_count_fp` | string | Filled count \(fixed-point\) |
+| ↳ `remaining_count` | number | Remaining contracts |
+| ↳ `remaining_count_fp` | string | Remaining count \(fixed-point\) |
+| ↳ `initial_count` | number | Initial contract count |
+| ↳ `initial_count_fp` | string | Initial count \(fixed-point\) |
+| ↳ `taker_fees` | number | Taker fees in cents |
+| ↳ `maker_fees` | number | Maker fees in cents |
+| ↳ `taker_fees_dollars` | string | Taker fees in dollars |
+| ↳ `maker_fees_dollars` | string | Maker fees in dollars |
+| ↳ `taker_fill_cost` | number | Taker fill cost in cents |
+| ↳ `maker_fill_cost` | number | Maker fill cost in cents |
+| ↳ `taker_fill_cost_dollars` | string | Taker fill cost in dollars |
+| ↳ `maker_fill_cost_dollars` | string | Maker fill cost in dollars |
+| ↳ `queue_position` | number | Queue position \(deprecated\) |
+| ↳ `expiration_time` | string | Order expiration time |
+| ↳ `created_time` | string | Order creation time |
+| ↳ `last_update_time` | string | Last update time |
+| ↳ `self_trade_prevention_type` | string | Self-trade prevention type |
+| ↳ `order_group_id` | string | Order group ID |
+| ↳ `cancel_order_on_pause` | boolean | Cancel on market pause |
+| `reduced_by` | number | Number of contracts canceled |
+| `reduced_by_fp` | string | Number of contracts canceled in fixed-point format |
 
 ### `kalshi_amend_order`
 
-Modify the price or quantity of an existing order on Kalshi
+Modify the price or quantity of an existing order on Kalshi (V2 with full API response)
 
 #### Input
 
@@ -379,6 +569,63 @@ Modify the price or quantity of an existing order on Kalshi
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `order` | object | The amended order object |
+| `old_order` | object | The original order object before amendment |
+| ↳ `order_id` | string | Order ID |
+| ↳ `user_id` | string | User ID |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `event_ticker` | string | Event ticker |
+| ↳ `status` | string | Order status |
+| ↳ `side` | string | Order side \(yes/no\) |
+| ↳ `type` | string | Order type \(limit/market\) |
+| ↳ `yes_price` | number | Yes price in cents |
+| ↳ `no_price` | number | No price in cents |
+| ↳ `action` | string | Action \(buy/sell\) |
+| ↳ `count` | number | Number of contracts |
+| ↳ `remaining_count` | number | Remaining contracts |
+| ↳ `created_time` | string | Order creation time |
+| ↳ `expiration_time` | string | Order expiration time |
+| ↳ `order_group_id` | string | Order group ID |
+| ↳ `client_order_id` | string | Client order ID |
+| ↳ `place_count` | number | Place count |
+| ↳ `decrease_count` | number | Decrease count |
+| ↳ `queue_position` | number | Queue position |
+| ↳ `maker_fill_count` | number | Maker fill count |
+| ↳ `taker_fill_count` | number | Taker fill count |
+| ↳ `maker_fees` | number | Maker fees |
+| ↳ `taker_fees` | number | Taker fees |
+| ↳ `last_update_time` | string | Last update time |
+| ↳ `take_profit_order_id` | string | Take profit order ID |
+| ↳ `stop_loss_order_id` | string | Stop loss order ID |
+| ↳ `amend_count` | number | Amend count |
+| ↳ `amend_taker_fill_count` | number | Amend taker fill count |
+| `order` | object | The amended order object with full API response fields |
+| ↳ `order_id` | string | Order ID |
+| ↳ `user_id` | string | User ID |
+| ↳ `ticker` | string | Market ticker |
+| ↳ `event_ticker` | string | Event ticker |
+| ↳ `status` | string | Order status |
+| ↳ `side` | string | Order side \(yes/no\) |
+| ↳ `type` | string | Order type \(limit/market\) |
+| ↳ `yes_price` | number | Yes price in cents |
+| ↳ `no_price` | number | No price in cents |
+| ↳ `action` | string | Action \(buy/sell\) |
+| ↳ `count` | number | Number of contracts |
+| ↳ `remaining_count` | number | Remaining contracts |
+| ↳ `created_time` | string | Order creation time |
+| ↳ `expiration_time` | string | Order expiration time |
+| ↳ `order_group_id` | string | Order group ID |
+| ↳ `client_order_id` | string | Client order ID |
+| ↳ `place_count` | number | Place count |
+| ↳ `decrease_count` | number | Decrease count |
+| ↳ `queue_position` | number | Queue position |
+| ↳ `maker_fill_count` | number | Maker fill count |
+| ↳ `taker_fill_count` | number | Taker fill count |
+| ↳ `maker_fees` | number | Maker fees |
+| ↳ `taker_fees` | number | Taker fees |
+| ↳ `last_update_time` | string | Last update time |
+| ↳ `take_profit_order_id` | string | Take profit order ID |
+| ↳ `stop_loss_order_id` | string | Stop loss order ID |
+| ↳ `amend_count` | number | Amend count |
+| ↳ `amend_taker_fill_count` | number | Amend taker fill count |
 
 
diff --git a/apps/docs/content/docs/en/tools/meta.json b/apps/docs/content/docs/en/tools/meta.json
index f7db7e1be..28bd45545 100644
--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -97,7 +97,6 @@
     "shopify",
     "slack",
     "smtp",
-    "spotify",
     "sqs",
     "ssh",
     "stagehand",
diff --git a/apps/docs/content/docs/en/tools/polymarket.mdx b/apps/docs/content/docs/en/tools/polymarket.mdx
index 6a6d17852..9370b5031 100644
--- a/apps/docs/content/docs/en/tools/polymarket.mdx
+++ b/apps/docs/content/docs/en/tools/polymarket.mdx
@@ -29,7 +29,7 @@ By using these documented API endpoints, you can seamlessly integrate Polymarket
 
 ## Usage Instructions
 
-Integrate Polymarket prediction markets into the workflow. Can get markets, market, events, event, tags, series, orderbook, price, midpoint, price history, last trade price, spread, tick size, positions, trades, and search.
+Integrate Polymarket prediction markets into the workflow. Can get markets, market, events, event, tags, series, orderbook, price, midpoint, price history, last trade price, spread, tick size, positions, trades, activity, leaderboard, holders, and search.
 
 
 
@@ -43,7 +43,7 @@ Retrieve a list of prediction markets from Polymarket with optional filtering
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `closed` | string | No | Filter by closed status \(true/false\). Use false for active markets only. |
+| `closed` | string | No | Filter by closed status \(true/false\). Use false for open markets only. |
 | `order` | string | No | Sort field \(e.g., volumeNum, liquidityNum, startDate, endDate, createdAt\) |
 | `ascending` | string | No | Sort direction \(true for ascending, false for descending\) |
 | `tagId` | string | No | Filter by tag ID |
@@ -55,6 +55,21 @@ Retrieve a list of prediction markets from Polymarket with optional filtering
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `markets` | array | Array of market objects |
+|   ↳ `id` | string | Market ID |
+|   ↳ `question` | string | Market question |
+|   ↳ `conditionId` | string | Condition ID |
+|   ↳ `slug` | string | Market slug |
+|   ↳ `endDate` | string | End date |
+|   ↳ `image` | string | Market image URL |
+|   ↳ `outcomes` | string | Outcomes JSON string |
+|   ↳ `outcomePrices` | string | Outcome prices JSON string |
+|   ↳ `volume` | string | Total volume |
+|   ↳ `liquidity` | string | Total liquidity |
+|   ↳ `active` | boolean | Whether market is active |
+|   ↳ `closed` | boolean | Whether market is closed |
+|   ↳ `volumeNum` | number | Volume as number |
+|   ↳ `liquidityNum` | number | Liquidity as number |
+|   ↳ `clobTokenIds` | array | CLOB token IDs |
 
 ### `polymarket_get_market`
 
@@ -72,6 +87,28 @@ Retrieve details of a specific prediction market by ID or slug
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `market` | object | Market object with details |
+| ↳ `id` | string | Market ID |
+| ↳ `question` | string | Market question |
+| ↳ `conditionId` | string | Condition ID |
+| ↳ `slug` | string | Market slug |
+| ↳ `resolutionSource` | string | Resolution source |
+| ↳ `endDate` | string | End date |
+| ↳ `startDate` | string | Start date |
+| ↳ `image` | string | Market image URL |
+| ↳ `icon` | string | Market icon URL |
+| ↳ `description` | string | Market description |
+| ↳ `outcomes` | string | Outcomes JSON string |
+| ↳ `outcomePrices` | string | Outcome prices JSON string |
+| ↳ `volume` | string | Total volume |
+| ↳ `liquidity` | string | Total liquidity |
+| ↳ `active` | boolean | Whether market is active |
+| ↳ `closed` | boolean | Whether market is closed |
+| ↳ `archived` | boolean | Whether market is archived |
+| ↳ `volumeNum` | number | Volume as number |
+| ↳ `liquidityNum` | number | Liquidity as number |
+| ↳ `clobTokenIds` | array | CLOB token IDs |
+| ↳ `acceptingOrders` | boolean | Whether accepting orders |
+| ↳ `negRisk` | boolean | Whether negative risk |
 
 ### `polymarket_get_events`
 
@@ -81,7 +118,7 @@ Retrieve a list of events from Polymarket with optional filtering
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `closed` | string | No | Filter by closed status \(true/false\). Use false for active events only. |
+| `closed` | string | No | Filter by closed status \(true/false\). Use false for open events only. |
 | `order` | string | No | Sort field \(e.g., volume, liquidity, startDate, endDate, createdAt\) |
 | `ascending` | string | No | Sort direction \(true for ascending, false for descending\) |
 | `tagId` | string | No | Filter by tag ID |
@@ -93,6 +130,21 @@ Retrieve a list of events from Polymarket with optional filtering
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `events` | array | Array of event objects |
+|   ↳ `id` | string | Event ID |
+|   ↳ `ticker` | string | Event ticker |
+|   ↳ `slug` | string | Event slug |
+|   ↳ `title` | string | Event title |
+|   ↳ `description` | string | Event description |
+|   ↳ `startDate` | string | Start date |
+|   ↳ `endDate` | string | End date |
+|   ↳ `image` | string | Event image URL |
+|   ↳ `icon` | string | Event icon URL |
+|   ↳ `active` | boolean | Whether event is active |
+|   ↳ `closed` | boolean | Whether event is closed |
+|   ↳ `archived` | boolean | Whether event is archived |
+|   ↳ `liquidity` | number | Total liquidity |
+|   ↳ `volume` | number | Total volume |
+|   ↳ `markets` | array | Array of markets in this event |
 
 ### `polymarket_get_event`
 
@@ -110,6 +162,24 @@ Retrieve details of a specific event by ID or slug
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `event` | object | Event object with details |
+| ↳ `id` | string | Event ID |
+| ↳ `ticker` | string | Event ticker |
+| ↳ `slug` | string | Event slug |
+| ↳ `title` | string | Event title |
+| ↳ `description` | string | Event description |
+| ↳ `startDate` | string | Start date |
+| ↳ `creationDate` | string | Creation date |
+| ↳ `endDate` | string | End date |
+| ↳ `image` | string | Event image URL |
+| ↳ `icon` | string | Event icon URL |
+| ↳ `active` | boolean | Whether event is active |
+| ↳ `closed` | boolean | Whether event is closed |
+| ↳ `archived` | boolean | Whether event is archived |
+| ↳ `liquidity` | number | Total liquidity |
+| ↳ `volume` | number | Total volume |
+| ↳ `openInterest` | number | Open interest |
+| ↳ `commentCount` | number | Comment count |
+| ↳ `markets` | array | Array of markets in this event |
 
 ### `polymarket_get_tags`
 
@@ -126,7 +196,12 @@ Retrieve available tags for filtering markets from Polymarket
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `tags` | array | Array of tag objects with id, label, and slug |
+| `tags` | array | Array of tag objects |
+|   ↳ `id` | string | Tag ID |
+|   ↳ `label` | string | Tag label |
+|   ↳ `slug` | string | Tag slug |
+|   ↳ `createdAt` | string | Creation timestamp |
+|   ↳ `updatedAt` | string | Last update timestamp |
 
 ### `polymarket_search`
 
@@ -138,13 +213,28 @@ Search for markets, events, and profiles on Polymarket
 | --------- | ---- | -------- | ----------- |
 | `query` | string | Yes | Search query term |
 | `limit` | string | No | Number of results per page \(max 50\) |
-| `offset` | string | No | Pagination offset |
+| `page` | string | No | Page number for pagination \(1-indexed\) |
+| `cache` | string | No | Enable caching \(true/false\) |
+| `eventsStatus` | string | No | Filter events by status |
+| `limitPerType` | string | No | Limit results per type \(markets, events, profiles\) |
+| `eventsTag` | string | No | Filter by event tags \(comma-separated\) |
+| `sort` | string | No | Sort field |
+| `ascending` | string | No | Sort direction \(true for ascending, false for descending\) |
+| `searchTags` | string | No | Include tags in search results \(true/false\) |
+| `searchProfiles` | string | No | Include profiles in search results \(true/false\) |
+| `recurrence` | string | No | Filter by recurrence type |
+| `excludeTagId` | string | No | Exclude events with these tag IDs \(comma-separated\) |
+| `keepClosedMarkets` | string | No | Include closed markets in results \(0 or 1\) |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `results` | object | Search results containing markets, events, and profiles arrays |
+| `results` | object | Search results containing markets, events, tags, and profiles arrays |
+| ↳ `markets` | array | Array of matching market objects |
+| ↳ `events` | array | Array of matching event objects |
+| ↳ `tags` | array | Array of matching tag objects |
+| ↳ `profiles` | array | Array of matching profile objects |
 
 ### `polymarket_get_series`
 
@@ -162,6 +252,21 @@ Retrieve series (related market groups) from Polymarket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `series` | array | Array of series objects |
+|   ↳ `id` | string | Series ID |
+|   ↳ `ticker` | string | Series ticker |
+|   ↳ `slug` | string | Series slug |
+|   ↳ `title` | string | Series title |
+|   ↳ `seriesType` | string | Series type |
+|   ↳ `recurrence` | string | Recurrence pattern |
+|   ↳ `image` | string | Series image URL |
+|   ↳ `icon` | string | Series icon URL |
+|   ↳ `active` | boolean | Whether series is active |
+|   ↳ `closed` | boolean | Whether series is closed |
+|   ↳ `archived` | boolean | Whether series is archived |
+|   ↳ `featured` | boolean | Whether series is featured |
+|   ↳ `volume` | number | Total volume |
+|   ↳ `liquidity` | number | Total liquidity |
+|   ↳ `eventCount` | number | Number of events in series |
 
 ### `polymarket_get_series_by_id`
 
@@ -178,6 +283,23 @@ Retrieve a specific series (related market group) by ID from Polymarket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `series` | object | Series object with details |
+| ↳ `id` | string | Series ID |
+| ↳ `ticker` | string | Series ticker |
+| ↳ `slug` | string | Series slug |
+| ↳ `title` | string | Series title |
+| ↳ `seriesType` | string | Series type |
+| ↳ `recurrence` | string | Recurrence pattern |
+| ↳ `image` | string | Series image URL |
+| ↳ `icon` | string | Series icon URL |
+| ↳ `active` | boolean | Whether series is active |
+| ↳ `closed` | boolean | Whether series is closed |
+| ↳ `archived` | boolean | Whether series is archived |
+| ↳ `featured` | boolean | Whether series is featured |
+| ↳ `volume` | number | Total volume |
+| ↳ `liquidity` | number | Total liquidity |
+| ↳ `commentCount` | number | Comment count |
+| ↳ `eventCount` | number | Number of events in series |
+| ↳ `events` | array | Array of events in this series |
 
 ### `polymarket_get_orderbook`
 
@@ -194,6 +316,21 @@ Retrieve the order book summary for a specific token
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `orderbook` | object | Order book with bids and asks arrays |
+| ↳ `market` | string | Market identifier |
+| ↳ `asset_id` | string | Asset token ID |
+| ↳ `hash` | string | Order book hash |
+| ↳ `timestamp` | string | Timestamp |
+| ↳ `bids` | array | Bid orders |
+|   ↳ `price` | string | Bid price |
+|   ↳ `size` | string | Bid size |
+| ↳ `price` | string | Ask price |
+| ↳ `size` | string | Ask size |
+| ↳ `asks` | array | Ask orders |
+|   ↳ `price` | string | Ask price |
+|   ↳ `size` | string | Ask size |
+| ↳ `min_order_size` | string | Minimum order size |
+| ↳ `tick_size` | string | Tick size |
+| ↳ `neg_risk` | boolean | Whether negative risk |
 
 ### `polymarket_get_price`
 
@@ -246,7 +383,9 @@ Retrieve historical price data for a specific market token
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `history` | array | Array of price history entries with timestamp \(t\) and price \(p\) |
+| `history` | array | Array of price history entries |
+|   ↳ `t` | number | Unix timestamp |
+|   ↳ `p` | number | Price at timestamp |
 
 ### `polymarket_get_last_trade_price`
 
@@ -263,6 +402,7 @@ Retrieve the last trade price for a specific token
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `price` | string | Last trade price |
+| `side` | string | Side of the last trade \(BUY or SELL\) |
 
 ### `polymarket_get_spread`
 
@@ -278,7 +418,8 @@ Retrieve the bid-ask spread for a specific token
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `spread` | object | Bid-ask spread with bid and ask prices |
+| `spread` | object | Spread value between bid and ask |
+| ↳ `spread` | string | The spread value |
 
 ### `polymarket_get_tick_size`
 
@@ -305,13 +446,47 @@ Retrieve user positions from Polymarket
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `user` | string | Yes | User wallet address |
-| `market` | string | No | Optional market ID to filter positions |
+| `market` | string | No | Condition IDs to filter positions \(comma-separated, mutually exclusive with eventId\) |
+| `eventId` | string | No | Event ID to filter positions \(mutually exclusive with market\) |
+| `sizeThreshold` | string | No | Minimum position size threshold \(default: 1\) |
+| `redeemable` | string | No | Filter for redeemable positions only \(true/false\) |
+| `mergeable` | string | No | Filter for mergeable positions only \(true/false\) |
+| `sortBy` | string | No | Sort field \(TOKENS, CURRENT, INITIAL, CASHPNL, PERCENTPNL, TITLE, RESOLVING, PRICE, AVGPRICE\) |
+| `sortDirection` | string | No | Sort direction \(ASC or DESC\) |
+| `title` | string | No | Search filter by title |
+| `limit` | string | No | Number of results per page |
+| `offset` | string | No | Pagination offset |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `positions` | array | Array of position objects |
+|   ↳ `proxyWallet` | string | Proxy wallet address |
+|   ↳ `asset` | string | Asset token ID |
+|   ↳ `conditionId` | string | Condition ID |
+|   ↳ `size` | number | Position size |
+|   ↳ `avgPrice` | number | Average price |
+|   ↳ `initialValue` | number | Initial value |
+|   ↳ `currentValue` | number | Current value |
+|   ↳ `cashPnl` | number | Cash profit/loss |
+|   ↳ `percentPnl` | number | Percent profit/loss |
+|   ↳ `totalBought` | number | Total bought |
+|   ↳ `realizedPnl` | number | Realized profit/loss |
+|   ↳ `percentRealizedPnl` | number | Percent realized profit/loss |
+|   ↳ `curPrice` | number | Current price |
+|   ↳ `redeemable` | boolean | Whether position is redeemable |
+|   ↳ `mergeable` | boolean | Whether position is mergeable |
+|   ↳ `title` | string | Market title |
+|   ↳ `slug` | string | Market slug |
+|   ↳ `icon` | string | Market icon URL |
+|   ↳ `eventSlug` | string | Event slug |
+|   ↳ `outcome` | string | Outcome name |
+|   ↳ `outcomeIndex` | number | Outcome index |
+|   ↳ `oppositeOutcome` | string | Opposite outcome name |
+|   ↳ `oppositeAsset` | string | Opposite asset token ID |
+|   ↳ `endDate` | string | End date |
+|   ↳ `negativeRisk` | boolean | Whether negative risk |
 
 ### `polymarket_get_trades`
 
@@ -322,8 +497,13 @@ Retrieve trade history from Polymarket
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `user` | string | No | User wallet address to filter trades |
-| `market` | string | No | Market ID to filter trades |
-| `limit` | string | No | Number of results per page \(max 50\) |
+| `market` | string | No | Market/condition ID to filter trades \(mutually exclusive with eventId\) |
+| `eventId` | string | No | Event ID to filter trades \(mutually exclusive with market\) |
+| `side` | string | No | Trade direction filter \(BUY or SELL\) |
+| `takerOnly` | string | No | Filter for taker trades only \(true/false, default: true\) |
+| `filterType` | string | No | Filter type \(CASH or TOKENS\) - requires filterAmount |
+| `filterAmount` | string | No | Filter amount threshold - requires filterType |
+| `limit` | string | No | Number of results per page \(default: 100, max: 10000\) |
 | `offset` | string | No | Pagination offset \(skip this many results\) |
 
 #### Output
@@ -331,5 +511,141 @@ Retrieve trade history from Polymarket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `trades` | array | Array of trade objects |
+|   ↳ `proxyWallet` | string | Proxy wallet address |
+|   ↳ `side` | string | Trade side \(BUY or SELL\) |
+|   ↳ `asset` | string | Asset token ID |
+|   ↳ `conditionId` | string | Condition ID |
+|   ↳ `size` | number | Trade size |
+|   ↳ `price` | number | Trade price |
+|   ↳ `timestamp` | number | Unix timestamp |
+|   ↳ `title` | string | Market title |
+|   ↳ `slug` | string | Market slug |
+|   ↳ `icon` | string | Market icon URL |
+|   ↳ `eventSlug` | string | Event slug |
+|   ↳ `outcome` | string | Outcome name |
+|   ↳ `outcomeIndex` | number | Outcome index |
+|   ↳ `name` | string | Trader name |
+|   ↳ `pseudonym` | string | Trader pseudonym |
+|   ↳ `bio` | string | Trader bio |
+|   ↳ `profileImage` | string | Profile image URL |
+|   ↳ `profileImageOptimized` | string | Optimized profile image URL |
+|   ↳ `transactionHash` | string | Transaction hash |
+
+### `polymarket_get_activity`
+
+Retrieve on-chain activity for a user including trades, splits, merges, redemptions, rewards, and conversions
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `user` | string | Yes | User wallet address \(0x-prefixed\) |
+| `limit` | string | No | Maximum results \(default: 100, max: 500\) |
+| `offset` | string | No | Pagination offset \(default: 0, max: 10000\) |
+| `market` | string | No | Comma-separated condition IDs \(mutually exclusive with eventId\) |
+| `eventId` | string | No | Comma-separated event IDs \(mutually exclusive with market\) |
+| `type` | string | No | Activity type filter: TRADE, SPLIT, MERGE, REDEEM, REWARD, CONVERSION, MAKER_REBATE |
+| `start` | number | No | Start timestamp \(Unix seconds\) |
+| `end` | number | No | End timestamp \(Unix seconds\) |
+| `sortBy` | string | No | Sort field: TIMESTAMP, TOKENS, or CASH \(default: TIMESTAMP\) |
+| `sortDirection` | string | No | Sort direction: ASC or DESC \(default: DESC\) |
+| `side` | string | No | Trade side filter: BUY or SELL \(only applies to trades\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `activity` | array | Array of activity entries |
+|   ↳ `proxyWallet` | string | User proxy wallet address |
+|   ↳ `timestamp` | number | Unix timestamp of activity |
+|   ↳ `conditionId` | string | Market condition ID |
+|   ↳ `type` | string | Activity type \(TRADE, SPLIT, MERGE, REDEEM, REWARD, CONVERSION\) |
+|   ↳ `size` | number | Size in tokens |
+|   ↳ `usdcSize` | number | Size in USDC |
+|   ↳ `transactionHash` | string | Blockchain transaction hash |
+|   ↳ `price` | number | Price \(for trades\) |
+|   ↳ `asset` | string | Asset/token ID |
+|   ↳ `side` | string | Trade side \(BUY/SELL\) |
+|   ↳ `outcomeIndex` | number | Outcome index |
+|   ↳ `title` | string | Market title |
+|   ↳ `slug` | string | Market slug |
+|   ↳ `icon` | string | Market icon URL |
+|   ↳ `eventSlug` | string | Event slug |
+|   ↳ `outcome` | string | Outcome name |
+|   ↳ `name` | string | User display name |
+|   ↳ `pseudonym` | string | User pseudonym |
+|   ↳ `bio` | string | User bio |
+|   ↳ `profileImage` | string | User profile image URL |
+|   ↳ `profileImageOptimized` | string | Optimized profile image URL |
+
+### `polymarket_get_leaderboard`
+
+Retrieve trader leaderboard rankings by profit/loss or volume
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `category` | string | No | Category filter: OVERALL, POLITICS, SPORTS, CRYPTO, CULTURE, MENTIONS, WEATHER, ECONOMICS, TECH, FINANCE \(default: OVERALL\) |
+| `timePeriod` | string | No | Time period: DAY, WEEK, MONTH, ALL \(default: DAY\) |
+| `orderBy` | string | No | Order by: PNL or VOL \(default: PNL\) |
+| `limit` | string | No | Number of results \(1-50, default: 25\) |
+| `offset` | string | No | Pagination offset \(0-1000, default: 0\) |
+| `user` | string | No | Filter by specific user wallet address |
+| `userName` | string | No | Filter by username |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `leaderboard` | array | Array of leaderboard entries |
+|   ↳ `rank` | string | Leaderboard rank position |
+|   ↳ `proxyWallet` | string | User proxy wallet address |
+|   ↳ `userName` | string | User display name |
+|   ↳ `vol` | number | Trading volume |
+|   ↳ `pnl` | number | Profit and loss |
+|   ↳ `profileImage` | string | User profile image URL |
+|   ↳ `xUsername` | string | Twitter/X username |
+|   ↳ `verifiedBadge` | boolean | Whether user has verified badge |
+
+### `polymarket_get_holders`
+
+Retrieve top holders of a specific market token
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `market` | string | Yes | Comma-separated list of condition IDs |
+| `limit` | string | No | Number of holders to return \(0-20, default: 20\) |
+| `minBalance` | string | No | Minimum balance threshold \(default: 1\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `holders` | array | Array of market holder groups by token |
+|   ↳ `token` | string | Token/asset ID |
+|   ↳ `holders` | array | Array of holders for this token |
+|   ↳ `proxyWallet` | string | Holder wallet address |
+|   ↳ `bio` | string | Holder bio |
+|   ↳ `asset` | string | Asset ID |
+|   ↳ `pseudonym` | string | Holder pseudonym |
+|   ↳ `amount` | number | Amount held |
+|   ↳ `displayUsernamePublic` | boolean | Whether username is publicly displayed |
+|   ↳ `outcomeIndex` | number | Outcome index |
+|   ↳ `name` | string | Holder display name |
+|   ↳ `profileImage` | string | Profile image URL |
+|   ↳ `profileImageOptimized` | string | Optimized profile image URL |
+|   ↳ `proxyWallet` | string | Holder wallet address |
+|   ↳ `bio` | string | Holder bio |
+|   ↳ `asset` | string | Asset ID |
+|   ↳ `pseudonym` | string | Holder pseudonym |
+|   ↳ `amount` | number | Amount held |
+|   ↳ `displayUsernamePublic` | boolean | Whether username is publicly displayed |
+|   ↳ `outcomeIndex` | number | Outcome index |
+|   ↳ `name` | string | Holder display name |
+|   ↳ `profileImage` | string | Profile image URL |
+|   ↳ `profileImageOptimized` | string | Optimized profile image URL |
 
 
diff --git a/apps/docs/content/docs/en/tools/spotify.mdx b/apps/docs/content/docs/en/tools/spotify.mdx
deleted file mode 100644
index a9d797433..000000000
--- a/apps/docs/content/docs/en/tools/spotify.mdx
+++ /dev/null
@@ -1,1551 +0,0 @@
----
-title: Spotify
-description: Search music, manage playlists, control playback, and access your library
----
-
-import { BlockInfoCard } from "@/components/ui/block-info-card"
-
-<BlockInfoCard 
-  type="spotify"
-  color="#000000"
-/>
-
-{/* MANUAL-CONTENT-START:intro */}
-Effortlessly discover, play, and organize music with **Spotify**—the ultimate streaming platform millions rely on for their music, podcasts, and audiobooks. Integrate Spotify into your workflows to control your musical experience and manage your library with ease.
-
-With the Spotify integration, you can:
-
-- **Search & explore:** Instantly search the Spotify catalog for tracks, albums, artists, or playlists to find exactly what you’re looking for.
-- **Manage playlists:** Create and modify playlists, add or remove tracks, and organize your favorite music collections on the go.
-- **Control playback:** Play, pause, skip tracks, adjust volume, and switch playback devices seamlessly within your workflow.
-- **Access your library:** Retrieve and browse your saved tracks, liked albums, and followed artists at any time.
-- **Fetch detailed track info:** Get in-depth details on any track, album, or artist, including popularity, duration, and preview audio.
-- **Seamlessly integrate music into automation:** Trigger specific music actions or updates based on events or other app workflows.
-
-Spotify empowers music lovers, curators, and creators to personalize their audio experience, automate routine tasks, and spend more time enjoying and sharing what they love. Enhance your productivity and add a soundtrack to your day—connect Spotify to your automated workflows now!
-{/* MANUAL-CONTENT-END */}
-
-
-## Usage Instructions
-
-Integrate Spotify into your workflow. Search for tracks, albums, artists, and playlists. Manage playlists, access your library, control playback, browse podcasts and audiobooks.
-
-
-
-## Tools
-
-### `spotify_search`
-
-Search for tracks, albums, artists, or playlists on Spotify. Returns matching results based on the query.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `query` | string | Yes | Search query \(e.g., "Bohemian Rhapsody", "artist:Queen", "genre:rock"\) |
-| `type` | string | No | Type of results: track, album, artist, playlist, or comma-separated \(e.g., "track,artist"\) |
-| `limit` | number | No | Maximum number of results to return \(1-50\) |
-| `offset` | number | No | Index of the first result to return for pagination |
-| `market` | string | No | ISO 3166-1 alpha-2 country code to filter results \(e.g., "US", "GB"\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | List of matching tracks |
-|   ↳ `id` | string | Spotify track ID |
-|   ↳ `name` | string | Track name |
-|   ↳ `artists` | array | List of artist names |
-|   ↳ `album` | string | Album name |
-|   ↳ `duration_ms` | number | Track duration in milliseconds |
-|   ↳ `popularity` | number | Popularity score \(0-100\) |
-|   ↳ `preview_url` | string | URL to 30-second preview |
-|   ↳ `external_url` | string | Spotify URL |
-| `artists` | array | List of matching artists |
-| `albums` | array | List of matching albums |
-| `playlists` | array | List of matching playlists |
-
-### `spotify_get_track`
-
-Get detailed information about a specific track on Spotify by its ID.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `trackId` | string | Yes | The Spotify ID of the track |
-| `market` | string | No | ISO 3166-1 alpha-2 country code for track availability |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify track ID |
-| `name` | string | Track name |
-| `artists` | array | List of artists |
-| `album` | object | Album information |
-| `duration_ms` | number | Track duration in milliseconds |
-| `explicit` | boolean | Whether the track has explicit content |
-| `popularity` | number | Popularity score \(0-100\) |
-| `preview_url` | string | URL to 30-second preview |
-| `external_url` | string | Spotify URL |
-| `uri` | string | Spotify URI for the track |
-
-### `spotify_get_tracks`
-
-Get detailed information about multiple tracks on Spotify by their IDs (up to 50).
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `trackIds` | string | Yes | Comma-separated list of Spotify track IDs \(max 50\) |
-| `market` | string | No | ISO 3166-1 alpha-2 country code for track availability |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | List of tracks |
-|   ↳ `id` | string | Spotify track ID |
-|   ↳ `name` | string | Track name |
-|   ↳ `artists` | array | List of artists |
-|   ↳ `album` | object | Album information |
-|   ↳ `duration_ms` | number | Track duration in milliseconds |
-|   ↳ `explicit` | boolean | Whether the track has explicit content |
-|   ↳ `popularity` | number | Popularity score \(0-100\) |
-|   ↳ `preview_url` | string | URL to 30-second preview |
-|   ↳ `external_url` | string | Spotify URL |
-
-### `spotify_get_album`
-
-Get detailed information about an album on Spotify by its ID, including track listing.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumId` | string | Yes | The Spotify ID of the album |
-| `market` | string | No | ISO 3166-1 alpha-2 country code for track availability |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify album ID |
-| `name` | string | Album name |
-| `artists` | array | List of artists |
-| `album_type` | string | Type of album \(album, single, compilation\) |
-| `total_tracks` | number | Total number of tracks |
-| `release_date` | string | Release date |
-| `label` | string | Record label |
-| `popularity` | number | Popularity score \(0-100\) |
-| `genres` | array | List of genres |
-| `image_url` | string | Album cover image URL |
-| `tracks` | array | List of tracks on the album |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_albums`
-
-Get details for multiple albums by their IDs.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumIds` | string | Yes | Comma-separated album IDs \(max 20\) |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `albums` | json | List of albums |
-
-### `spotify_get_album_tracks`
-
-Get the tracks from an album.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumId` | string | Yes | The Spotify album ID |
-| `limit` | number | No | Number of tracks to return \(1-50\) |
-| `offset` | number | No | Index of first track to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | json | List of tracks |
-| `total` | number | Total number of tracks |
-| `next` | string | URL for next page |
-
-### `spotify_get_saved_albums`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of albums to return \(1-50\) |
-| `offset` | number | No | Index of first album to return |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `albums` | json | List of saved albums |
-| `total` | number | Total saved albums |
-| `next` | string | URL for next page |
-
-### `spotify_save_albums`
-
-Save albums to the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumIds` | string | Yes | Comma-separated album IDs \(max 20\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether albums were saved |
-
-### `spotify_remove_saved_albums`
-
-Remove albums from the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumIds` | string | Yes | Comma-separated album IDs \(max 20\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether albums were removed |
-
-### `spotify_check_saved_albums`
-
-Check if albums are saved in library.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `albumIds` | string | Yes | Comma-separated album IDs \(max 20\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each album |
-
-### `spotify_get_artist`
-
-Get detailed information about an artist on Spotify by their ID.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistId` | string | Yes | The Spotify ID of the artist |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify artist ID |
-| `name` | string | Artist name |
-| `genres` | array | List of genres associated with the artist |
-| `popularity` | number | Popularity score \(0-100\) |
-| `followers` | number | Number of followers |
-| `image_url` | string | Artist image URL |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_artists`
-
-Get details for multiple artists by their IDs.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistIds` | string | Yes | Comma-separated artist IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `artists` | json | List of artists |
-
-### `spotify_get_artist_albums`
-
-Get albums by an artist on Spotify. Can filter by album type.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistId` | string | Yes | The Spotify ID of the artist |
-| `include_groups` | string | No | Filter by album type: album, single, appears_on, compilation \(comma-separated\) |
-| `limit` | number | No | Maximum number of albums to return \(1-50\) |
-| `offset` | number | No | Index of the first album to return |
-| `market` | string | No | ISO 3166-1 alpha-2 country code |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `albums` | array | Artist |
-|   ↳ `id` | string | Spotify album ID |
-|   ↳ `name` | string | Album name |
-|   ↳ `album_type` | string | Type \(album, single, compilation\) |
-|   ↳ `total_tracks` | number | Number of tracks |
-|   ↳ `release_date` | string | Release date |
-|   ↳ `image_url` | string | Album cover URL |
-|   ↳ `external_url` | string | Spotify URL |
-| `total` | number | Total number of albums available |
-| `next` | string | URL for next page of results |
-
-### `spotify_get_artist_top_tracks`
-
-Get the top 10 most popular tracks by an artist on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistId` | string | Yes | The Spotify ID of the artist |
-| `market` | string | No | ISO 3166-1 alpha-2 country code \(required for this endpoint\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | Artist |
-|   ↳ `id` | string | Spotify track ID |
-|   ↳ `name` | string | Track name |
-|   ↳ `album` | object | Album information |
-|   ↳ `duration_ms` | number | Track duration in milliseconds |
-|   ↳ `popularity` | number | Popularity score \(0-100\) |
-|   ↳ `preview_url` | string | URL to 30-second preview |
-|   ↳ `external_url` | string | Spotify URL |
-
-### `spotify_follow_artists`
-
-Follow one or more artists.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistIds` | string | Yes | Comma-separated artist IDs to follow \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether artists were followed successfully |
-
-### `spotify_unfollow_artists`
-
-Unfollow one or more artists.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `artistIds` | string | Yes | Comma-separated artist IDs to unfollow \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether artists were unfollowed successfully |
-
-### `spotify_get_followed_artists`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of artists to return \(1-50\) |
-| `after` | string | No | Cursor for pagination \(last artist ID from previous request\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `artists` | json | List of followed artists |
-| `total` | number | Total number of followed artists |
-| `next` | string | Cursor for next page |
-
-### `spotify_check_following`
-
-Check if the user follows artists or users.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `type` | string | Yes | Type to check: "artist" or "user" |
-| `ids` | string | Yes | Comma-separated artist or user IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each ID |
-
-### `spotify_get_show`
-
-Get details for a podcast show.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showId` | string | Yes | The Spotify show ID |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Show ID |
-| `name` | string | Show name |
-| `description` | string | Show description |
-| `publisher` | string | Publisher name |
-| `total_episodes` | number | Total episodes |
-| `explicit` | boolean | Contains explicit content |
-| `languages` | json | Languages |
-| `image_url` | string | Cover image URL |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_shows`
-
-Get details for multiple podcast shows.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showIds` | string | Yes | Comma-separated show IDs \(max 50\) |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `shows` | json | List of shows |
-
-### `spotify_get_show_episodes`
-
-Get episodes from a podcast show.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showId` | string | Yes | The Spotify show ID |
-| `limit` | number | No | Number of episodes to return \(1-50\) |
-| `offset` | number | No | Index of first episode to return |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `episodes` | json | List of episodes |
-| `total` | number | Total episodes |
-| `next` | string | URL for next page |
-
-### `spotify_get_saved_shows`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of shows to return \(1-50\) |
-| `offset` | number | No | Index of first show to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `shows` | json | List of saved shows |
-| `total` | number | Total saved shows |
-| `next` | string | URL for next page |
-
-### `spotify_save_shows`
-
-Save podcast shows to the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showIds` | string | Yes | Comma-separated show IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether shows were saved |
-
-### `spotify_remove_saved_shows`
-
-Remove podcast shows from the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showIds` | string | Yes | Comma-separated show IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether shows were removed |
-
-### `spotify_check_saved_shows`
-
-Check if shows are saved in library.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `showIds` | string | Yes | Comma-separated show IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each show |
-
-### `spotify_get_episode`
-
-Get details for a podcast episode.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `episodeId` | string | Yes | The Spotify episode ID |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Episode ID |
-| `name` | string | Episode name |
-| `description` | string | Episode description |
-| `duration_ms` | number | Duration in ms |
-| `release_date` | string | Release date |
-| `explicit` | boolean | Contains explicit content |
-| `show` | json | Parent show info |
-| `image_url` | string | Cover image URL |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_episodes`
-
-Get details for multiple podcast episodes.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `episodeIds` | string | Yes | Comma-separated episode IDs \(max 50\) |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `episodes` | json | List of episodes |
-
-### `spotify_get_saved_episodes`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of episodes to return \(1-50\) |
-| `offset` | number | No | Index of first episode to return |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `episodes` | json | List of saved episodes |
-| `total` | number | Total saved episodes |
-| `next` | string | URL for next page |
-
-### `spotify_save_episodes`
-
-Save podcast episodes to the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `episodeIds` | string | Yes | Comma-separated episode IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether episodes were saved |
-
-### `spotify_remove_saved_episodes`
-
-Remove podcast episodes from the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `episodeIds` | string | Yes | Comma-separated episode IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether episodes were removed |
-
-### `spotify_check_saved_episodes`
-
-Check if episodes are saved in library.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `episodeIds` | string | Yes | Comma-separated episode IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each episode |
-
-### `spotify_get_audiobook`
-
-Get details for an audiobook.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookId` | string | Yes | The Spotify audiobook ID |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Audiobook ID |
-| `name` | string | Audiobook name |
-| `authors` | json | Authors |
-| `narrators` | json | Narrators |
-| `publisher` | string | Publisher |
-| `description` | string | Description |
-| `total_chapters` | number | Total chapters |
-| `languages` | json | Languages |
-| `image_url` | string | Cover image URL |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_audiobooks`
-
-Get details for multiple audiobooks.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookIds` | string | Yes | Comma-separated audiobook IDs \(max 50\) |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `audiobooks` | json | List of audiobooks |
-
-### `spotify_get_audiobook_chapters`
-
-Get chapters from an audiobook.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookId` | string | Yes | The Spotify audiobook ID |
-| `limit` | number | No | Number of chapters to return \(1-50\) |
-| `offset` | number | No | Index of first chapter to return |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `chapters` | json | List of chapters |
-| `total` | number | Total chapters |
-| `next` | string | URL for next page |
-
-### `spotify_get_saved_audiobooks`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of audiobooks to return \(1-50\) |
-| `offset` | number | No | Index of first audiobook to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `audiobooks` | json | List of saved audiobooks |
-| `total` | number | Total saved audiobooks |
-| `next` | string | URL for next page |
-
-### `spotify_save_audiobooks`
-
-Save audiobooks to the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookIds` | string | Yes | Comma-separated audiobook IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether audiobooks were saved |
-
-### `spotify_remove_saved_audiobooks`
-
-Remove audiobooks from the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookIds` | string | Yes | Comma-separated audiobook IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether audiobooks were removed |
-
-### `spotify_check_saved_audiobooks`
-
-Check if audiobooks are saved in library.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `audiobookIds` | string | Yes | Comma-separated audiobook IDs \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each audiobook |
-
-### `spotify_get_playlist`
-
-Get detailed information about a playlist on Spotify by its ID.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify ID of the playlist |
-| `market` | string | No | ISO 3166-1 alpha-2 country code for track availability |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify playlist ID |
-| `name` | string | Playlist name |
-| `description` | string | Playlist description |
-| `public` | boolean | Whether the playlist is public |
-| `collaborative` | boolean | Whether the playlist is collaborative |
-| `owner` | object | Playlist owner information |
-| `image_url` | string | Playlist cover image URL |
-| `total_tracks` | number | Total number of tracks |
-| `snapshot_id` | string | Playlist snapshot ID for versioning |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_playlist_tracks`
-
-Get the tracks in a Spotify playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify ID of the playlist |
-| `limit` | number | No | Maximum number of tracks to return \(1-100\) |
-| `offset` | number | No | Index of the first track to return |
-| `market` | string | No | ISO 3166-1 alpha-2 country code for track availability |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | List of tracks in the playlist |
-|   ↳ `added_at` | string | When the track was added |
-|   ↳ `added_by` | string | User ID who added the track |
-|   ↳ `track` | object | Track information |
-| `total` | number | Total number of tracks in playlist |
-| `next` | string | URL for next page of results |
-
-### `spotify_get_playlist_cover`
-
-Get a playlist
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `images` | json | List of cover images |
-
-### `spotify_get_user_playlists`
-
-Get the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Maximum number of playlists to return \(1-50\) |
-| `offset` | number | No | Index of the first playlist to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `playlists` | array | User |
-|   ↳ `id` | string | Spotify playlist ID |
-|   ↳ `name` | string | Playlist name |
-|   ↳ `description` | string | Playlist description |
-|   ↳ `public` | boolean | Whether public |
-|   ↳ `collaborative` | boolean | Whether collaborative |
-|   ↳ `owner` | string | Owner display name |
-|   ↳ `total_tracks` | number | Number of tracks |
-|   ↳ `image_url` | string | Cover image URL |
-|   ↳ `external_url` | string | Spotify URL |
-| `total` | number | Total number of playlists |
-| `next` | string | URL for next page |
-
-### `spotify_create_playlist`
-
-Create a new playlist for the current user on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `name` | string | Yes | Name for the new playlist |
-| `description` | string | No | Description for the playlist |
-| `public` | boolean | No | Whether the playlist should be public |
-| `collaborative` | boolean | No | Whether the playlist should be collaborative \(requires public to be false\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify playlist ID |
-| `name` | string | Playlist name |
-| `description` | string | Playlist description |
-| `public` | boolean | Whether the playlist is public |
-| `collaborative` | boolean | Whether collaborative |
-| `snapshot_id` | string | Playlist snapshot ID |
-| `external_url` | string | Spotify URL |
-
-### `spotify_update_playlist`
-
-Update a playlist
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `name` | string | No | New name for the playlist |
-| `description` | string | No | New description for the playlist |
-| `public` | boolean | No | Whether the playlist should be public |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether update succeeded |
-
-### `spotify_add_playlist_cover`
-
-Upload a custom cover image for a playlist. Image must be JPEG and under 256KB.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `imageBase64` | string | Yes | Base64-encoded JPEG image \(max 256KB\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether upload succeeded |
-
-### `spotify_add_tracks_to_playlist`
-
-Add one or more tracks to a Spotify playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify ID of the playlist |
-| `uris` | string | Yes | Comma-separated Spotify URIs \(e.g., "spotify:track:xxx,spotify:track:yyy"\) |
-| `position` | number | No | Position to insert tracks \(0-based\). If omitted, tracks are appended. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `snapshot_id` | string | New playlist snapshot ID after modification |
-
-### `spotify_remove_tracks_from_playlist`
-
-Remove one or more tracks from a Spotify playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify ID of the playlist |
-| `uris` | string | Yes | Comma-separated Spotify URIs to remove \(e.g., "spotify:track:xxx,spotify:track:yyy"\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `snapshot_id` | string | New playlist snapshot ID after modification |
-
-### `spotify_reorder_playlist_items`
-
-Move tracks to a different position in a playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `range_start` | number | Yes | Start index of items to reorder |
-| `insert_before` | number | Yes | Index to insert items before |
-| `range_length` | number | No | Number of items to reorder |
-| `snapshot_id` | string | No | Playlist snapshot ID for concurrency control |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `snapshot_id` | string | New playlist snapshot ID |
-
-### `spotify_replace_playlist_items`
-
-Replace all items in a playlist with new tracks.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `uris` | string | Yes | Comma-separated Spotify URIs \(max 100\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `snapshot_id` | string | New playlist snapshot ID |
-
-### `spotify_follow_playlist`
-
-Follow (save) a playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `public` | boolean | No | Whether the playlist will be in public playlists |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether follow succeeded |
-
-### `spotify_unfollow_playlist`
-
-Unfollow (unsave) a playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether unfollow succeeded |
-
-### `spotify_check_playlist_followers`
-
-Check if users follow a playlist.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `playlistId` | string | Yes | The Spotify playlist ID |
-| `userIds` | string | Yes | Comma-separated user IDs to check \(max 5\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of booleans for each user |
-
-### `spotify_get_current_user`
-
-Get the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | Spotify user ID |
-| `display_name` | string | Display name |
-| `email` | string | Email address |
-| `country` | string | Country code |
-| `product` | string | Subscription level \(free, premium\) |
-| `followers` | number | Number of followers |
-| `image_url` | string | Profile image URL |
-| `external_url` | string | Spotify profile URL |
-
-### `spotify_get_user_profile`
-
-Get a user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `userId` | string | Yes | The Spotify user ID |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `id` | string | User ID |
-| `display_name` | string | Display name |
-| `followers` | number | Number of followers |
-| `image_url` | string | Profile image URL |
-| `external_url` | string | Spotify URL |
-
-### `spotify_get_top_tracks`
-
-Get the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `time_range` | string | No | Time range: short_term \(~4 weeks\), medium_term \(~6 months\), long_term \(years\) |
-| `limit` | number | No | Number of tracks to return \(1-50\) |
-| `offset` | number | No | Index of the first track to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | User |
-|   ↳ `id` | string | Spotify track ID |
-|   ↳ `name` | string | Track name |
-|   ↳ `artists` | array | List of artists |
-|   ↳ `album` | object | Album information |
-|   ↳ `duration_ms` | number | Duration in milliseconds |
-|   ↳ `popularity` | number | Popularity score |
-|   ↳ `external_url` | string | Spotify URL |
-| `total` | number | Total number of top tracks |
-| `next` | string | URL for next page |
-
-### `spotify_get_top_artists`
-
-Get the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `time_range` | string | No | Time range: short_term \(~4 weeks\), medium_term \(~6 months\), long_term \(years\) |
-| `limit` | number | No | Number of artists to return \(1-50\) |
-| `offset` | number | No | Index of the first artist to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `artists` | array | User |
-|   ↳ `id` | string | Spotify artist ID |
-|   ↳ `name` | string | Artist name |
-|   ↳ `genres` | array | List of genres |
-|   ↳ `popularity` | number | Popularity score |
-|   ↳ `followers` | number | Number of followers |
-|   ↳ `image_url` | string | Artist image URL |
-|   ↳ `external_url` | string | Spotify URL |
-| `total` | number | Total number of top artists |
-| `next` | string | URL for next page |
-
-### `spotify_get_saved_tracks`
-
-Get the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of tracks to return \(1-50\) |
-| `offset` | number | No | Index of the first track to return |
-| `market` | string | No | ISO 3166-1 alpha-2 country code |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `tracks` | array | User |
-|   ↳ `added_at` | string | When the track was saved |
-|   ↳ `track` | object | Track information |
-| `total` | number | Total number of saved tracks |
-| `next` | string | URL for next page |
-
-### `spotify_save_tracks`
-
-Save tracks to the current user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `trackIds` | string | Yes | Comma-separated Spotify track IDs to save \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether the tracks were saved successfully |
-
-### `spotify_remove_saved_tracks`
-
-Remove tracks from the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `trackIds` | string | Yes | Comma-separated track IDs to remove \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether tracks were removed successfully |
-
-### `spotify_check_saved_tracks`
-
-Check if one or more tracks are saved in the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `trackIds` | string | Yes | Comma-separated track IDs to check \(max 50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | json | Array of track IDs with saved status |
-| `all_saved` | boolean | Whether all tracks are saved |
-| `none_saved` | boolean | Whether no tracks are saved |
-
-### `spotify_get_recently_played`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `limit` | number | No | Number of tracks to return \(1-50\) |
-| `after` | number | No | Unix timestamp in milliseconds. Returns items after this cursor. |
-| `before` | number | No | Unix timestamp in milliseconds. Returns items before this cursor. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `items` | array | Recently played tracks |
-|   ↳ `played_at` | string | When the track was played |
-|   ↳ `track` | object | Track information |
-| `next` | string | URL for next page |
-
-### `spotify_get_new_releases`
-
-Get a list of new album releases featured in Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `country` | string | No | ISO 3166-1 alpha-2 country code \(e.g., "US", "GB"\) |
-| `limit` | number | No | Number of releases to return \(1-50\) |
-| `offset` | number | No | Index of first release to return |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `albums` | json | List of new releases |
-| `total` | number | Total number of new releases |
-| `next` | string | URL for next page |
-
-### `spotify_get_categories`
-
-Get a list of browse categories used to tag items in Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `country` | string | No | ISO 3166-1 alpha-2 country code \(e.g., "US", "GB"\) |
-| `locale` | string | No | Locale code \(e.g., "en_US", "es_MX"\) |
-| `limit` | number | No | Number of categories to return \(1-50\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `categories` | json | List of browse categories |
-| `total` | number | Total number of categories |
-
-### `spotify_get_markets`
-
-Get the list of markets where Spotify is available.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `markets` | json | List of ISO country codes |
-
-### `spotify_get_playback_state`
-
-Get the current playback state including device, track, and progress.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `market` | string | No | ISO 3166-1 alpha-2 country code |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `is_playing` | boolean | Whether playback is active |
-| `device` | object | Active device information |
-| `progress_ms` | number | Progress in milliseconds |
-| `currently_playing_type` | string | Type of content playing |
-| `shuffle_state` | boolean | Whether shuffle is enabled |
-| `repeat_state` | string | Repeat mode \(off, track, context\) |
-| `track` | object | Currently playing track |
-
-### `spotify_get_currently_playing`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `market` | string | No | ISO country code for market |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `is_playing` | boolean | Whether playback is active |
-| `progress_ms` | number | Current position in track \(ms\) |
-| `track` | json | Currently playing track |
-
-### `spotify_get_devices`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `devices` | array | Available playback devices |
-|   ↳ `id` | string | Device ID |
-|   ↳ `is_active` | boolean | Whether device is active |
-|   ↳ `is_private_session` | boolean | Whether in private session |
-|   ↳ `is_restricted` | boolean | Whether device is restricted |
-|   ↳ `name` | string | Device name |
-|   ↳ `type` | string | Device type \(Computer, Smartphone, etc.\) |
-|   ↳ `volume_percent` | number | Current volume \(0-100\) |
-
-### `spotify_get_queue`
-
-Get the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `currently_playing` | json | Currently playing track |
-| `queue` | json | Upcoming tracks in queue |
-
-### `spotify_play`
-
-Start or resume playback on Spotify. Can play specific tracks, albums, or playlists.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `device_id` | string | No | Device ID to play on. If not provided, plays on active device. |
-| `context_uri` | string | No | Spotify URI of album, artist, or playlist to play \(e.g., "spotify:album:xxx"\) |
-| `uris` | string | No | Comma-separated track URIs to play \(e.g., "spotify:track:xxx,spotify:track:yyy"\) |
-| `offset` | number | No | Position in context to start playing \(0-based index\) |
-| `position_ms` | number | No | Position in track to start from \(in milliseconds\) |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether playback started successfully |
-
-### `spotify_pause`
-
-Pause playback on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `device_id` | string | No | Device ID to pause. If not provided, pauses active device. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether playback was paused |
-
-### `spotify_skip_next`
-
-Skip to the next track on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `device_id` | string | No | Device ID. If not provided, uses active device. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether skip was successful |
-
-### `spotify_skip_previous`
-
-Skip to the previous track on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `device_id` | string | No | Device ID. If not provided, uses active device. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether skip was successful |
-
-### `spotify_seek`
-
-Seek to a position in the currently playing track.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `position_ms` | number | Yes | Position in milliseconds to seek to |
-| `device_id` | string | No | Device ID to target |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether seek was successful |
-
-### `spotify_add_to_queue`
-
-Add a track to the user
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `uri` | string | Yes | Spotify URI of the track to add \(e.g., "spotify:track:xxx"\) |
-| `device_id` | string | No | Device ID. If not provided, uses active device. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether track was added to queue |
-
-### `spotify_set_volume`
-
-Set the playback volume on Spotify.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `volume_percent` | number | Yes | Volume level \(0 to 100\) |
-| `device_id` | string | No | Device ID. If not provided, uses active device. |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether volume was set |
-
-### `spotify_set_repeat`
-
-Set the repeat mode for playback.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `state` | string | Yes | Repeat mode: "off", "track", or "context" |
-| `device_id` | string | No | Device ID to target |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether repeat mode was set successfully |
-
-### `spotify_set_shuffle`
-
-Turn shuffle on or off.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `state` | boolean | Yes | true for shuffle on, false for off |
-| `device_id` | string | No | Device ID to target |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether shuffle was set successfully |
-
-### `spotify_transfer_playback`
-
-Transfer playback to a different device.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `device_id` | string | Yes | Device ID to transfer playback to |
-| `play` | boolean | No | Whether to start playing on the new device |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `success` | boolean | Whether transfer was successful |
-
-
diff --git a/apps/docs/content/docs/en/tools/supabase.mdx b/apps/docs/content/docs/en/tools/supabase.mdx
index a97307d95..3d7914e84 100644
--- a/apps/docs/content/docs/en/tools/supabase.mdx
+++ b/apps/docs/content/docs/en/tools/supabase.mdx
@@ -299,7 +299,7 @@ Upload a file to a Supabase storage bucket
 | `bucket` | string | Yes | The name of the storage bucket |
 | `fileName` | string | Yes | The name of the file \(e.g., "document.pdf", "image.jpg"\) |
 | `path` | string | No | Optional folder path \(e.g., "folder/subfolder/"\) |
-| `fileContent` | string | Yes | The file content \(base64 encoded for binary files, or plain text\) |
+| `fileData` | json | Yes | File to upload - UserFile object \(basic mode\) or string content \(advanced mode: base64 or plain text\). Supports data URLs. |
 | `contentType` | string | No | MIME type of the file \(e.g., "image/jpeg", "text/plain"\) |
 | `upsert` | boolean | No | If true, overwrites existing file \(default: false\) |
 | `apiKey` | string | Yes | Your Supabase service role secret key |
@@ -309,7 +309,7 @@ Upload a file to a Supabase storage bucket
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `message` | string | Operation status message |
-| `results` | object | Upload result including file path and metadata |
+| `results` | object | Upload result including file path, bucket, and public URL |
 
 ### `supabase_storage_download`
 
diff --git a/apps/sim/blocks/blocks/kalshi.ts b/apps/sim/blocks/blocks/kalshi.ts
index a594e61a3..d075867ce 100644
--- a/apps/sim/blocks/blocks/kalshi.ts
+++ b/apps/sim/blocks/blocks/kalshi.ts
@@ -1,16 +1,18 @@
 import { KalshiIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 
 export const KalshiBlock: BlockConfig = {
   type: 'kalshi',
-  name: 'Kalshi',
+  name: 'Kalshi (Legacy)',
   description: 'Access prediction markets and trade on Kalshi',
   longDescription:
     'Integrate Kalshi prediction markets into the workflow. Can get markets, market, events, event, balance, positions, orders, orderbook, trades, candlesticks, fills, series, exchange status, and place/cancel/amend trades.',
   docsLink: 'https://docs.sim.ai/tools/kalshi',
   authMode: AuthMode.ApiKey,
   category: 'tools',
+  hideFromToolbar: true,
   bgColor: '#09C285',
   icon: KalshiIcon,
   subBlocks: [
@@ -349,8 +351,14 @@ Return ONLY the numeric timestamp (seconds since Unix epoch) - no explanations,
       id: 'count',
       title: 'Contracts',
       type: 'short-input',
-      placeholder: 'Number of contracts',
-      required: true,
+      placeholder: 'Number of contracts (or use countFp)',
+      condition: { field: 'operation', value: ['create_order'] },
+    },
+    {
+      id: 'countFp',
+      title: 'Contracts (Fixed-Point)',
+      type: 'short-input',
+      placeholder: 'Fixed-point count (e.g., "10.50")',
       condition: { field: 'operation', value: ['create_order'] },
     },
     {
@@ -674,3 +682,143 @@ Return ONLY the numeric timestamp (seconds since Unix epoch) - no explanations,
     paging: { type: 'json', description: 'Pagination cursor for fetching more results' },
   },
 }
+
+export const KalshiV2Block: BlockConfig = {
+  ...KalshiBlock,
+  type: 'kalshi_v2',
+  name: 'Kalshi',
+  description: 'Access prediction markets and trade on Kalshi',
+  longDescription:
+    'Integrate Kalshi prediction markets into the workflow. Can get markets, market, events, event, balance, positions, orders, orderbook, trades, candlesticks, fills, series, exchange status, and place/cancel/amend trades.',
+  hideFromToolbar: false,
+  tools: {
+    ...KalshiBlock.tools,
+    access: [
+      'kalshi_get_markets_v2',
+      'kalshi_get_market_v2',
+      'kalshi_get_events_v2',
+      'kalshi_get_event_v2',
+      'kalshi_get_balance_v2',
+      'kalshi_get_positions_v2',
+      'kalshi_get_orders_v2',
+      'kalshi_get_order_v2',
+      'kalshi_get_orderbook_v2',
+      'kalshi_get_trades_v2',
+      'kalshi_get_candlesticks_v2',
+      'kalshi_get_fills_v2',
+      'kalshi_get_series_by_ticker_v2',
+      'kalshi_get_exchange_status_v2',
+      'kalshi_create_order_v2',
+      'kalshi_cancel_order_v2',
+      'kalshi_amend_order_v2',
+    ],
+    config: {
+      ...KalshiBlock.tools!.config,
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => {
+          switch (params.operation) {
+            case 'get_markets':
+              return 'kalshi_get_markets'
+            case 'get_market':
+              return 'kalshi_get_market'
+            case 'get_events':
+              return 'kalshi_get_events'
+            case 'get_event':
+              return 'kalshi_get_event'
+            case 'get_balance':
+              return 'kalshi_get_balance'
+            case 'get_positions':
+              return 'kalshi_get_positions'
+            case 'get_orders':
+              return 'kalshi_get_orders'
+            case 'get_order':
+              return 'kalshi_get_order'
+            case 'get_orderbook':
+              return 'kalshi_get_orderbook'
+            case 'get_trades':
+              return 'kalshi_get_trades'
+            case 'get_candlesticks':
+              return 'kalshi_get_candlesticks'
+            case 'get_fills':
+              return 'kalshi_get_fills'
+            case 'get_series_by_ticker':
+              return 'kalshi_get_series_by_ticker'
+            case 'get_exchange_status':
+              return 'kalshi_get_exchange_status'
+            case 'create_order':
+              return 'kalshi_create_order'
+            case 'cancel_order':
+              return 'kalshi_cancel_order'
+            case 'amend_order':
+              return 'kalshi_amend_order'
+            default:
+              return 'kalshi_get_markets'
+          }
+        },
+        suffix: '_v2',
+        fallbackToolId: 'kalshi_get_markets_v2',
+      }),
+    },
+  },
+  outputs: {
+    // List operations (V2 uses snake_case and flat cursor)
+    markets: { type: 'json', description: 'Array of market objects (get_markets)' },
+    events: { type: 'json', description: 'Array of event objects (get_events)' },
+    orders: { type: 'json', description: 'Array of order objects (get_orders)' },
+    market_positions: {
+      type: 'json',
+      description: 'Array of market position objects (get_positions)',
+    },
+    event_positions: {
+      type: 'json',
+      description: 'Array of event position objects (get_positions)',
+    },
+    fills: { type: 'json', description: 'Array of fill objects (get_fills)' },
+    trades: { type: 'json', description: 'Array of trade objects (get_trades)' },
+    candlesticks: {
+      type: 'json',
+      description: 'Array of candlestick data with yes_bid/yes_ask/price nested objects',
+    },
+    milestones: {
+      type: 'json',
+      description: 'Array of milestone objects (get_events with milestones)',
+    },
+    // Single item operations
+    market: { type: 'json', description: 'Single market object (get_market)' },
+    event: { type: 'json', description: 'Single event object (get_event)' },
+    order: {
+      type: 'json',
+      description: 'Order object with _dollars and _fp fields (get_order, create_order, etc.)',
+    },
+    series: { type: 'json', description: 'Series object (get_series_by_ticker)' },
+    // Account operations
+    balance: { type: 'number', description: 'Account balance in cents (get_balance)' },
+    portfolio_value: { type: 'number', description: 'Portfolio value in cents (get_balance)' },
+    updated_ts: { type: 'number', description: 'Unix timestamp of last update (get_balance)' },
+    // Orderbook (V2 uses tuple arrays)
+    orderbook: {
+      type: 'json',
+      description: 'Orderbook with yes/no/yes_dollars/no_dollars tuple arrays',
+    },
+    orderbook_fp: {
+      type: 'json',
+      description: 'Fixed-point orderbook with yes_dollars/no_dollars tuple arrays',
+    },
+    // Exchange status
+    exchange_status: {
+      type: 'string',
+      description: 'Exchange status string (get_exchange_status)',
+    },
+    trading_active: { type: 'boolean', description: 'Trading active flag (get_exchange_status)' },
+    // Cancel order specific
+    reduced_by: { type: 'number', description: 'Number of contracts reduced (cancel_order)' },
+    reduced_by_fp: {
+      type: 'string',
+      description: 'Contracts reduced in fixed-point (cancel_order)',
+    },
+    // Candlesticks ticker
+    ticker: { type: 'string', description: 'Market ticker (get_candlesticks)' },
+    // Pagination (flat cursor instead of nested paging object)
+    cursor: { type: 'string', description: 'Pagination cursor for fetching more results' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/polymarket.ts b/apps/sim/blocks/blocks/polymarket.ts
index 5ecfdb02d..b953fc44a 100644
--- a/apps/sim/blocks/blocks/polymarket.ts
+++ b/apps/sim/blocks/blocks/polymarket.ts
@@ -6,7 +6,7 @@ export const PolymarketBlock: BlockConfig = {
   name: 'Polymarket',
   description: 'Access prediction markets data from Polymarket',
   longDescription:
-    'Integrate Polymarket prediction markets into the workflow. Can get markets, market, events, event, tags, series, orderbook, price, midpoint, price history, last trade price, spread, tick size, positions, trades, and search.',
+    'Integrate Polymarket prediction markets into the workflow. Can get markets, market, events, event, tags, series, orderbook, price, midpoint, price history, last trade price, spread, tick size, positions, trades, activity, leaderboard, holders, and search.',
   docsLink: 'https://docs.sim.ai/tools/polymarket',
   category: 'tools',
   bgColor: '#4C82FB',
@@ -34,6 +34,9 @@ export const PolymarketBlock: BlockConfig = {
         { label: 'Get Tick Size', id: 'get_tick_size' },
         { label: 'Get Positions', id: 'get_positions' },
         { label: 'Get Trades', id: 'get_trades' },
+        { label: 'Get Activity', id: 'get_activity' },
+        { label: 'Get Leaderboard', id: 'get_leaderboard' },
+        { label: 'Get Market Holders', id: 'get_holders' },
       ],
       value: () => 'get_markets',
     },
@@ -101,14 +104,281 @@ export const PolymarketBlock: BlockConfig = {
       placeholder: 'Wallet address (optional filter)',
       condition: { field: 'operation', value: ['get_trades'] },
     },
-    // Market filter for positions and trades
+    // Market/Event filter for positions and trades
     {
       id: 'market',
-      title: 'Market ID',
+      title: 'Condition ID',
       type: 'short-input',
-      placeholder: 'Market ID (optional filter)',
+      placeholder: 'Condition ID filter (comma-separated)',
       condition: { field: 'operation', value: ['get_positions', 'get_trades'] },
     },
+    {
+      id: 'positionEventId',
+      title: 'Event ID',
+      type: 'short-input',
+      placeholder: 'Event ID filter (alternative to Condition ID)',
+      condition: { field: 'operation', value: ['get_positions', 'get_trades'] },
+    },
+    // Positions-specific filters
+    {
+      id: 'sizeThreshold',
+      title: 'Size Threshold',
+      type: 'short-input',
+      placeholder: 'Minimum position size (default: 1)',
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    {
+      id: 'redeemable',
+      title: 'Redeemable',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Redeemable Only', id: 'true' },
+        { label: 'Non-Redeemable Only', id: 'false' },
+      ],
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    {
+      id: 'mergeable',
+      title: 'Mergeable',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Mergeable Only', id: 'true' },
+        { label: 'Non-Mergeable Only', id: 'false' },
+      ],
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    {
+      id: 'positionSortBy',
+      title: 'Sort By',
+      type: 'dropdown',
+      options: [
+        { label: 'Default', id: '' },
+        { label: 'Tokens', id: 'TOKENS' },
+        { label: 'Current Value', id: 'CURRENT' },
+        { label: 'Initial Value', id: 'INITIAL' },
+        { label: 'Cash P&L', id: 'CASHPNL' },
+        { label: 'Percent P&L', id: 'PERCENTPNL' },
+        { label: 'Title', id: 'TITLE' },
+        { label: 'Price', id: 'PRICE' },
+        { label: 'Avg Price', id: 'AVGPRICE' },
+      ],
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    {
+      id: 'positionSortDirection',
+      title: 'Sort Direction',
+      type: 'dropdown',
+      options: [
+        { label: 'Descending', id: 'DESC' },
+        { label: 'Ascending', id: 'ASC' },
+      ],
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    {
+      id: 'positionTitle',
+      title: 'Title Filter',
+      type: 'short-input',
+      placeholder: 'Search by title',
+      condition: { field: 'operation', value: ['get_positions'] },
+    },
+    // Trades-specific filters
+    {
+      id: 'tradeSide',
+      title: 'Trade Side',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Buy', id: 'BUY' },
+        { label: 'Sell', id: 'SELL' },
+      ],
+      condition: { field: 'operation', value: ['get_trades'] },
+    },
+    {
+      id: 'takerOnly',
+      title: 'Taker Only',
+      type: 'dropdown',
+      options: [
+        { label: 'Yes (default)', id: 'true' },
+        { label: 'No', id: 'false' },
+      ],
+      condition: { field: 'operation', value: ['get_trades'] },
+    },
+    {
+      id: 'filterType',
+      title: 'Filter Type',
+      type: 'dropdown',
+      options: [
+        { label: 'None', id: '' },
+        { label: 'Cash', id: 'CASH' },
+        { label: 'Tokens', id: 'TOKENS' },
+      ],
+      condition: { field: 'operation', value: ['get_trades'] },
+    },
+    {
+      id: 'filterAmount',
+      title: 'Filter Amount',
+      type: 'short-input',
+      placeholder: 'Minimum amount threshold',
+      condition: { field: 'operation', value: ['get_trades'] },
+    },
+    // Activity-specific fields
+    {
+      id: 'activityUser',
+      title: 'User Wallet Address',
+      type: 'short-input',
+      placeholder: 'Wallet address (0x-prefixed)',
+      required: true,
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activityType',
+      title: 'Activity Type',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Trade', id: 'TRADE' },
+        { label: 'Split', id: 'SPLIT' },
+        { label: 'Merge', id: 'MERGE' },
+        { label: 'Redeem', id: 'REDEEM' },
+        { label: 'Reward', id: 'REWARD' },
+        { label: 'Conversion', id: 'CONVERSION' },
+        { label: 'Maker Rebate', id: 'MAKER_REBATE' },
+      ],
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activityMarket',
+      title: 'Condition ID',
+      type: 'short-input',
+      placeholder: 'Condition ID filter (comma-separated)',
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activityEventId',
+      title: 'Event ID',
+      type: 'short-input',
+      placeholder: 'Event ID filter (comma-separated)',
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activitySide',
+      title: 'Trade Side',
+      type: 'dropdown',
+      options: [
+        { label: 'All', id: '' },
+        { label: 'Buy', id: 'BUY' },
+        { label: 'Sell', id: 'SELL' },
+      ],
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activitySortBy',
+      title: 'Sort By',
+      type: 'dropdown',
+      options: [
+        { label: 'Timestamp', id: 'TIMESTAMP' },
+        { label: 'Tokens', id: 'TOKENS' },
+        { label: 'Cash', id: 'CASH' },
+      ],
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activitySortDirection',
+      title: 'Sort Direction',
+      type: 'dropdown',
+      options: [
+        { label: 'Descending', id: 'DESC' },
+        { label: 'Ascending', id: 'ASC' },
+      ],
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activityStart',
+      title: 'Start Timestamp',
+      type: 'short-input',
+      placeholder: 'Unix timestamp (seconds)',
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    {
+      id: 'activityEnd',
+      title: 'End Timestamp',
+      type: 'short-input',
+      placeholder: 'Unix timestamp (seconds)',
+      condition: { field: 'operation', value: ['get_activity'] },
+    },
+    // Leaderboard-specific fields
+    {
+      id: 'leaderboardCategory',
+      title: 'Category',
+      type: 'dropdown',
+      options: [
+        { label: 'Overall', id: 'OVERALL' },
+        { label: 'Politics', id: 'POLITICS' },
+        { label: 'Sports', id: 'SPORTS' },
+        { label: 'Crypto', id: 'CRYPTO' },
+        { label: 'Culture', id: 'CULTURE' },
+        { label: 'Mentions', id: 'MENTIONS' },
+        { label: 'Weather', id: 'WEATHER' },
+        { label: 'Economics', id: 'ECONOMICS' },
+        { label: 'Tech', id: 'TECH' },
+        { label: 'Finance', id: 'FINANCE' },
+      ],
+      condition: { field: 'operation', value: ['get_leaderboard'] },
+    },
+    {
+      id: 'leaderboardTimePeriod',
+      title: 'Time Period',
+      type: 'dropdown',
+      options: [
+        { label: 'Day', id: 'DAY' },
+        { label: 'Week', id: 'WEEK' },
+        { label: 'Month', id: 'MONTH' },
+        { label: 'All Time', id: 'ALL' },
+      ],
+      condition: { field: 'operation', value: ['get_leaderboard'] },
+    },
+    {
+      id: 'leaderboardOrderBy',
+      title: 'Order By',
+      type: 'dropdown',
+      options: [
+        { label: 'Profit/Loss', id: 'PNL' },
+        { label: 'Volume', id: 'VOL' },
+      ],
+      condition: { field: 'operation', value: ['get_leaderboard'] },
+    },
+    {
+      id: 'leaderboardUser',
+      title: 'User Address',
+      type: 'short-input',
+      placeholder: 'Filter by specific user wallet',
+      condition: { field: 'operation', value: ['get_leaderboard'] },
+    },
+    {
+      id: 'leaderboardUserName',
+      title: 'Username',
+      type: 'short-input',
+      placeholder: 'Filter by username',
+      condition: { field: 'operation', value: ['get_leaderboard'] },
+    },
+    // Market Holders-specific fields
+    {
+      id: 'holdersMarket',
+      title: 'Condition ID',
+      type: 'short-input',
+      placeholder: 'Condition ID (comma-separated)',
+      required: true,
+      condition: { field: 'operation', value: ['get_holders'] },
+    },
+    {
+      id: 'holdersMinBalance',
+      title: 'Min Balance',
+      type: 'short-input',
+      placeholder: 'Minimum balance threshold (default: 1)',
+      condition: { field: 'operation', value: ['get_holders'] },
+    },
     // Token ID for CLOB operations
     {
       id: 'tokenId',
@@ -205,11 +475,11 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
     // Filters for list operations
     {
       id: 'closed',
-      title: 'Status',
+      title: 'Closed Status',
       type: 'dropdown',
       options: [
         { label: 'All', id: '' },
-        { label: 'Active Only', id: 'false' },
+        { label: 'Open Only', id: 'false' },
         { label: 'Closed Only', id: 'true' },
       ],
       condition: { field: 'operation', value: ['get_markets', 'get_events'] },
@@ -269,7 +539,18 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
       placeholder: 'Number of results (max 50)',
       condition: {
         field: 'operation',
-        value: ['get_markets', 'get_events', 'get_tags', 'search', 'get_series', 'get_trades'],
+        value: [
+          'get_markets',
+          'get_events',
+          'get_tags',
+          'search',
+          'get_series',
+          'get_trades',
+          'get_positions',
+          'get_activity',
+          'get_leaderboard',
+          'get_holders',
+        ],
       },
     },
     {
@@ -279,9 +560,25 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
       placeholder: 'Pagination offset',
       condition: {
         field: 'operation',
-        value: ['get_markets', 'get_events', 'get_tags', 'search', 'get_series', 'get_trades'],
+        value: [
+          'get_markets',
+          'get_events',
+          'get_tags',
+          'get_series',
+          'get_trades',
+          'get_positions',
+          'get_activity',
+          'get_leaderboard',
+        ],
       },
     },
+    {
+      id: 'page',
+      title: 'Page',
+      type: 'short-input',
+      placeholder: 'Page number (1-indexed)',
+      condition: { field: 'operation', value: ['search'] },
+    },
   ],
   tools: {
     access: [
@@ -302,6 +599,9 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
       'polymarket_get_tick_size',
       'polymarket_get_positions',
       'polymarket_get_trades',
+      'polymarket_get_activity',
+      'polymarket_get_leaderboard',
+      'polymarket_get_holders',
     ],
     config: {
       tool: (params) => {
@@ -340,12 +640,49 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
             return 'polymarket_get_positions'
           case 'get_trades':
             return 'polymarket_get_trades'
+          case 'get_activity':
+            return 'polymarket_get_activity'
+          case 'get_leaderboard':
+            return 'polymarket_get_leaderboard'
+          case 'get_holders':
+            return 'polymarket_get_holders'
           default:
             return 'polymarket_get_markets'
         }
       },
       params: (params) => {
-        const { operation, marketSlug, eventSlug, orderEvents, order, ...rest } = params
+        const {
+          operation,
+          marketSlug,
+          eventSlug,
+          orderEvents,
+          order,
+          positionEventId,
+          tradeSide,
+          positionSortBy,
+          positionSortDirection,
+          positionTitle,
+          // Activity params
+          activityUser,
+          activityType,
+          activityMarket,
+          activityEventId,
+          activitySide,
+          activitySortBy,
+          activitySortDirection,
+          activityStart,
+          activityEnd,
+          // Leaderboard params
+          leaderboardCategory,
+          leaderboardTimePeriod,
+          leaderboardOrderBy,
+          leaderboardUser,
+          leaderboardUserName,
+          // Holders params
+          holdersMarket,
+          holdersMinBalance,
+          ...rest
+        } = params
         const cleanParams: Record<string, any> = {}
 
         // Map marketSlug to slug for get_market
@@ -365,6 +702,51 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
           cleanParams.order = orderEvents
         }
 
+        // Map positionEventId to eventId for positions and trades
+        if ((operation === 'get_positions' || operation === 'get_trades') && positionEventId) {
+          cleanParams.eventId = positionEventId
+        }
+
+        // Map tradeSide to side for trades
+        if (operation === 'get_trades' && tradeSide) {
+          cleanParams.side = tradeSide
+        }
+
+        // Map position-specific fields
+        if (operation === 'get_positions') {
+          if (positionSortBy) cleanParams.sortBy = positionSortBy
+          if (positionSortDirection) cleanParams.sortDirection = positionSortDirection
+          if (positionTitle) cleanParams.title = positionTitle
+        }
+
+        // Map activity-specific fields
+        if (operation === 'get_activity') {
+          if (activityUser) cleanParams.user = activityUser
+          if (activityType) cleanParams.type = activityType
+          if (activityMarket) cleanParams.market = activityMarket
+          if (activityEventId) cleanParams.eventId = activityEventId
+          if (activitySide) cleanParams.side = activitySide
+          if (activitySortBy) cleanParams.sortBy = activitySortBy
+          if (activitySortDirection) cleanParams.sortDirection = activitySortDirection
+          if (activityStart) cleanParams.start = Number(activityStart)
+          if (activityEnd) cleanParams.end = Number(activityEnd)
+        }
+
+        // Map leaderboard-specific fields
+        if (operation === 'get_leaderboard') {
+          if (leaderboardCategory) cleanParams.category = leaderboardCategory
+          if (leaderboardTimePeriod) cleanParams.timePeriod = leaderboardTimePeriod
+          if (leaderboardOrderBy) cleanParams.orderBy = leaderboardOrderBy
+          if (leaderboardUser) cleanParams.user = leaderboardUser
+          if (leaderboardUserName) cleanParams.userName = leaderboardUserName
+        }
+
+        // Map holders-specific fields
+        if (operation === 'get_holders') {
+          if (holdersMarket) cleanParams.market = holdersMarket
+          if (holdersMinBalance) cleanParams.minBalance = holdersMinBalance
+        }
+
         // Convert numeric fields from string to number for get_price_history
         if (operation === 'get_price_history') {
           if (rest.fidelity) cleanParams.fidelity = Number(rest.fidelity)
@@ -394,13 +776,55 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
     seriesId: { type: 'string', description: 'Series ID' },
     query: { type: 'string', description: 'Search query' },
     user: { type: 'string', description: 'User wallet address' },
-    market: { type: 'string', description: 'Market ID filter' },
+    market: { type: 'string', description: 'Condition ID filter' },
+    positionEventId: { type: 'string', description: 'Event ID filter for positions/trades' },
     tokenId: { type: 'string', description: 'CLOB Token ID' },
     side: { type: 'string', description: 'Order side (buy/sell)' },
     interval: { type: 'string', description: 'Price history interval' },
     fidelity: { type: 'number', description: 'Data resolution in minutes' },
     startTs: { type: 'number', description: 'Start timestamp (Unix)' },
     endTs: { type: 'number', description: 'End timestamp (Unix)' },
+    // Positions-specific inputs
+    sizeThreshold: { type: 'string', description: 'Minimum position size threshold' },
+    redeemable: { type: 'string', description: 'Filter by redeemable status' },
+    mergeable: { type: 'string', description: 'Filter by mergeable status' },
+    positionSortBy: { type: 'string', description: 'Sort positions by field' },
+    positionSortDirection: { type: 'string', description: 'Sort direction (ASC/DESC)' },
+    positionTitle: { type: 'string', description: 'Filter positions by title' },
+    // Trades-specific inputs
+    tradeSide: { type: 'string', description: 'Filter trades by side (BUY/SELL)' },
+    takerOnly: { type: 'string', description: 'Filter to taker trades only' },
+    filterType: { type: 'string', description: 'Trade filter type (CASH/TOKENS)' },
+    filterAmount: { type: 'string', description: 'Minimum trade amount threshold' },
+    // List operation filters
+    closed: { type: 'string', description: 'Filter by closed status' },
+    order: { type: 'string', description: 'Sort field for markets' },
+    orderEvents: { type: 'string', description: 'Sort field for events' },
+    ascending: { type: 'string', description: 'Sort order (true/false)' },
+    tagId: { type: 'string', description: 'Filter by tag ID' },
+    // Pagination
+    limit: { type: 'string', description: 'Number of results per page' },
+    offset: { type: 'string', description: 'Pagination offset' },
+    page: { type: 'string', description: 'Page number for search' },
+    // Activity-specific inputs
+    activityUser: { type: 'string', description: 'User wallet address for activity' },
+    activityType: { type: 'string', description: 'Activity type filter' },
+    activityMarket: { type: 'string', description: 'Condition ID filter for activity' },
+    activityEventId: { type: 'string', description: 'Event ID filter for activity' },
+    activitySide: { type: 'string', description: 'Trade side filter for activity' },
+    activitySortBy: { type: 'string', description: 'Sort field for activity' },
+    activitySortDirection: { type: 'string', description: 'Sort direction for activity' },
+    activityStart: { type: 'string', description: 'Start timestamp for activity' },
+    activityEnd: { type: 'string', description: 'End timestamp for activity' },
+    // Leaderboard-specific inputs
+    leaderboardCategory: { type: 'string', description: 'Leaderboard category' },
+    leaderboardTimePeriod: { type: 'string', description: 'Leaderboard time period' },
+    leaderboardOrderBy: { type: 'string', description: 'Leaderboard order by field' },
+    leaderboardUser: { type: 'string', description: 'Filter leaderboard by user' },
+    leaderboardUserName: { type: 'string', description: 'Filter leaderboard by username' },
+    // Holders-specific inputs
+    holdersMarket: { type: 'string', description: 'Condition ID for holders lookup' },
+    holdersMinBalance: { type: 'string', description: 'Minimum balance threshold' },
   },
   outputs: {
     // List operations
@@ -422,11 +846,19 @@ Return ONLY the Unix timestamp as a number - no explanations, no quotes, no extr
       description: 'Search results with markets, events, profiles (search)',
     },
     // CLOB operations
-    orderbook: { type: 'json', description: 'Order book with bids and asks (get_orderbook)' },
+    orderbook: {
+      type: 'json',
+      description: 'Order book with bids and asks (get_orderbook)',
+    },
     price: { type: 'string', description: 'Market price (get_price, get_last_trade_price)' },
+    side: { type: 'string', description: 'Last trade side - BUY or SELL (get_last_trade_price)' },
     midpoint: { type: 'string', description: 'Midpoint price (get_midpoint)' },
     history: { type: 'json', description: 'Price history entries (get_price_history)' },
-    spread: { type: 'json', description: 'Bid-ask spread (get_spread)' },
+    spread: { type: 'json', description: 'Spread value object (get_spread)' },
     tickSize: { type: 'string', description: 'Minimum tick size (get_tick_size)' },
+    // Data API operations
+    activity: { type: 'json', description: 'Array of user activity entries (get_activity)' },
+    leaderboard: { type: 'json', description: 'Array of leaderboard entries (get_leaderboard)' },
+    holders: { type: 'json', description: 'Array of market holder groups (get_holders)' },
   },
 }
diff --git a/apps/sim/blocks/registry.ts b/apps/sim/blocks/registry.ts
index e28ca604e..6138a4072 100644
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -58,7 +58,7 @@ import { IntercomBlock, IntercomV2Block } from '@/blocks/blocks/intercom'
 import { JinaBlock } from '@/blocks/blocks/jina'
 import { JiraBlock } from '@/blocks/blocks/jira'
 import { JiraServiceManagementBlock } from '@/blocks/blocks/jira_service_management'
-import { KalshiBlock } from '@/blocks/blocks/kalshi'
+import { KalshiBlock, KalshiV2Block } from '@/blocks/blocks/kalshi'
 import { KnowledgeBlock } from '@/blocks/blocks/knowledge'
 import { LangsmithBlock } from '@/blocks/blocks/langsmith'
 import { LemlistBlock } from '@/blocks/blocks/lemlist'
@@ -222,6 +222,7 @@ export const registry: Record<string, BlockConfig> = {
   jira: JiraBlock,
   jira_service_management: JiraServiceManagementBlock,
   kalshi: KalshiBlock,
+  kalshi_v2: KalshiV2Block,
   knowledge: KnowledgeBlock,
   langsmith: LangsmithBlock,
   lemlist: LemlistBlock,
diff --git a/apps/sim/tools/kalshi/amend_order.ts b/apps/sim/tools/kalshi/amend_order.ts
index 360104a2e..8c5955eac 100644
--- a/apps/sim/tools/kalshi/amend_order.ts
+++ b/apps/sim/tools/kalshi/amend_order.ts
@@ -158,3 +158,300 @@ export const kalshiAmendOrderTool: ToolConfig<KalshiAmendOrderParams, KalshiAmen
     },
   },
 }
+
+export interface KalshiAmendOrderV2Params extends KalshiAuthParams {
+  orderId: string // Order ID to amend (required)
+  ticker: string // Market ticker (required)
+  side: string // 'yes' or 'no' (required)
+  action: string // 'buy' or 'sell' (required)
+  clientOrderId?: string // Original client order ID (optional in V2)
+  updatedClientOrderId?: string // New client order ID (optional in V2)
+  count?: string // Updated quantity
+  yesPrice?: string // Updated yes price in cents (1-99)
+  noPrice?: string // Updated no price in cents (1-99)
+  yesPriceDollars?: string // Updated yes price in dollars
+  noPriceDollars?: string // Updated no price in dollars
+  countFp?: string // Count in fixed-point for fractional contracts
+}
+
+export interface KalshiAmendOrderV2Order {
+  order_id: string
+  user_id: string | null
+  ticker: string
+  event_ticker: string
+  status: string
+  side: string
+  type: string
+  yes_price: number | null
+  no_price: number | null
+  action: string
+  count: number
+  remaining_count: number
+  created_time: string
+  expiration_time: string | null
+  order_group_id: string | null
+  client_order_id: string | null
+  place_count: number | null
+  decrease_count: number | null
+  queue_position: number | null
+  maker_fill_count: number | null
+  taker_fill_count: number | null
+  maker_fees: number | null
+  taker_fees: number | null
+  last_update_time: string | null
+  take_profit_order_id: string | null
+  stop_loss_order_id: string | null
+  amend_count: number | null
+  amend_taker_fill_count: number | null
+}
+
+export interface KalshiAmendOrderV2Response {
+  success: boolean
+  output: {
+    old_order: KalshiAmendOrderV2Order
+    order: KalshiAmendOrderV2Order
+  }
+}
+
+export const kalshiAmendOrderV2Tool: ToolConfig<
+  KalshiAmendOrderV2Params,
+  KalshiAmendOrderV2Response
+> = {
+  id: 'kalshi_amend_order_v2',
+  name: 'Amend Order on Kalshi V2',
+  description:
+    'Modify the price or quantity of an existing order on Kalshi (V2 with full API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    orderId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The order ID to amend',
+    },
+    ticker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Market ticker',
+    },
+    side: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: "Side of the order: 'yes' or 'no'",
+    },
+    action: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: "Action type: 'buy' or 'sell'",
+    },
+    clientOrderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The original client-specified order ID',
+    },
+    updatedClientOrderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The new client-specified order ID after amendment',
+    },
+    count: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Updated quantity for the order',
+    },
+    yesPrice: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Updated yes price in cents (1-99)',
+    },
+    noPrice: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Updated no price in cents (1-99)',
+    },
+    yesPriceDollars: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Updated yes price in dollars (e.g., "0.56")',
+    },
+    noPriceDollars: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Updated no price in dollars (e.g., "0.56")',
+    },
+    countFp: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Count in fixed-point for fractional contracts',
+    },
+  },
+
+  request: {
+    url: (params) => buildKalshiUrl(`/portfolio/orders/${params.orderId}/amend`),
+    method: 'POST',
+    headers: (params) => {
+      const path = `/trade-api/v2/portfolio/orders/${params.orderId}/amend`
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'POST', path)
+    },
+    body: (params) => {
+      const body: Record<string, any> = {
+        ticker: params.ticker,
+        side: params.side.toLowerCase(),
+        action: params.action.toLowerCase(),
+      }
+
+      if (params.clientOrderId) body.client_order_id = params.clientOrderId
+      if (params.updatedClientOrderId) body.updated_client_order_id = params.updatedClientOrderId
+      if (params.count) body.count = Number.parseInt(params.count, 10)
+      if (params.yesPrice) body.yes_price = Number.parseInt(params.yesPrice, 10)
+      if (params.noPrice) body.no_price = Number.parseInt(params.noPrice, 10)
+      if (params.yesPriceDollars) body.yes_price_dollars = params.yesPriceDollars
+      if (params.noPriceDollars) body.no_price_dollars = params.noPriceDollars
+      if (params.countFp) body.count_fp = params.countFp
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'amend_order_v2')
+    }
+
+    const mapOrder = (order: any): KalshiAmendOrderV2Order => ({
+      order_id: order.order_id ?? null,
+      user_id: order.user_id ?? null,
+      ticker: order.ticker ?? null,
+      event_ticker: order.event_ticker ?? null,
+      status: order.status ?? null,
+      side: order.side ?? null,
+      type: order.type ?? null,
+      yes_price: order.yes_price ?? null,
+      no_price: order.no_price ?? null,
+      action: order.action ?? null,
+      count: order.count ?? null,
+      remaining_count: order.remaining_count ?? null,
+      created_time: order.created_time ?? null,
+      expiration_time: order.expiration_time ?? null,
+      order_group_id: order.order_group_id ?? null,
+      client_order_id: order.client_order_id ?? null,
+      place_count: order.place_count ?? null,
+      decrease_count: order.decrease_count ?? null,
+      queue_position: order.queue_position ?? null,
+      maker_fill_count: order.maker_fill_count ?? null,
+      taker_fill_count: order.taker_fill_count ?? null,
+      maker_fees: order.maker_fees ?? null,
+      taker_fees: order.taker_fees ?? null,
+      last_update_time: order.last_update_time ?? null,
+      take_profit_order_id: order.take_profit_order_id ?? null,
+      stop_loss_order_id: order.stop_loss_order_id ?? null,
+      amend_count: order.amend_count ?? null,
+      amend_taker_fill_count: order.amend_taker_fill_count ?? null,
+    })
+
+    return {
+      success: true,
+      output: {
+        old_order: mapOrder(data.old_order || {}),
+        order: mapOrder(data.order || {}),
+      },
+    }
+  },
+
+  outputs: {
+    old_order: {
+      type: 'object',
+      description: 'The original order object before amendment',
+      properties: {
+        order_id: { type: 'string', description: 'Order ID' },
+        user_id: { type: 'string', description: 'User ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        status: { type: 'string', description: 'Order status' },
+        side: { type: 'string', description: 'Order side (yes/no)' },
+        type: { type: 'string', description: 'Order type (limit/market)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        count: { type: 'number', description: 'Number of contracts' },
+        remaining_count: { type: 'number', description: 'Remaining contracts' },
+        created_time: { type: 'string', description: 'Order creation time' },
+        expiration_time: { type: 'string', description: 'Order expiration time' },
+        order_group_id: { type: 'string', description: 'Order group ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        place_count: { type: 'number', description: 'Place count' },
+        decrease_count: { type: 'number', description: 'Decrease count' },
+        queue_position: { type: 'number', description: 'Queue position' },
+        maker_fill_count: { type: 'number', description: 'Maker fill count' },
+        taker_fill_count: { type: 'number', description: 'Taker fill count' },
+        maker_fees: { type: 'number', description: 'Maker fees' },
+        taker_fees: { type: 'number', description: 'Taker fees' },
+        last_update_time: { type: 'string', description: 'Last update time' },
+        take_profit_order_id: { type: 'string', description: 'Take profit order ID' },
+        stop_loss_order_id: { type: 'string', description: 'Stop loss order ID' },
+        amend_count: { type: 'number', description: 'Amend count' },
+        amend_taker_fill_count: { type: 'number', description: 'Amend taker fill count' },
+      },
+    },
+    order: {
+      type: 'object',
+      description: 'The amended order object with full API response fields',
+      properties: {
+        order_id: { type: 'string', description: 'Order ID' },
+        user_id: { type: 'string', description: 'User ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        status: { type: 'string', description: 'Order status' },
+        side: { type: 'string', description: 'Order side (yes/no)' },
+        type: { type: 'string', description: 'Order type (limit/market)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        count: { type: 'number', description: 'Number of contracts' },
+        remaining_count: { type: 'number', description: 'Remaining contracts' },
+        created_time: { type: 'string', description: 'Order creation time' },
+        expiration_time: { type: 'string', description: 'Order expiration time' },
+        order_group_id: { type: 'string', description: 'Order group ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        place_count: { type: 'number', description: 'Place count' },
+        decrease_count: { type: 'number', description: 'Decrease count' },
+        queue_position: { type: 'number', description: 'Queue position' },
+        maker_fill_count: { type: 'number', description: 'Maker fill count' },
+        taker_fill_count: { type: 'number', description: 'Taker fill count' },
+        maker_fees: { type: 'number', description: 'Maker fees' },
+        taker_fees: { type: 'number', description: 'Taker fees' },
+        last_update_time: { type: 'string', description: 'Last update time' },
+        take_profit_order_id: { type: 'string', description: 'Take profit order ID' },
+        stop_loss_order_id: { type: 'string', description: 'Stop loss order ID' },
+        amend_count: { type: 'number', description: 'Amend count' },
+        amend_taker_fill_count: { type: 'number', description: 'Amend taker fill count' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/cancel_order.ts b/apps/sim/tools/kalshi/cancel_order.ts
index d5f8d7843..5d443f108 100644
--- a/apps/sim/tools/kalshi/cancel_order.ts
+++ b/apps/sim/tools/kalshi/cancel_order.ts
@@ -78,3 +78,193 @@ export const kalshiCancelOrderTool: ToolConfig<KalshiCancelOrderParams, KalshiCa
       },
     },
   }
+
+export interface KalshiCancelOrderV2Params extends KalshiAuthParams {
+  orderId: string // Order ID to cancel (required)
+}
+
+export interface KalshiCancelOrderV2Response {
+  success: boolean
+  output: {
+    order: {
+      order_id: string
+      user_id: string | null
+      client_order_id: string | null
+      ticker: string
+      side: string
+      action: string
+      type: string
+      status: string
+      yes_price: number | null
+      no_price: number | null
+      yes_price_dollars: string | null
+      no_price_dollars: string | null
+      fill_count: number | null
+      fill_count_fp: string | null
+      remaining_count: number | null
+      remaining_count_fp: string | null
+      initial_count: number | null
+      initial_count_fp: string | null
+      taker_fees: number | null
+      maker_fees: number | null
+      taker_fees_dollars: string | null
+      maker_fees_dollars: string | null
+      taker_fill_cost: number | null
+      maker_fill_cost: number | null
+      taker_fill_cost_dollars: string | null
+      maker_fill_cost_dollars: string | null
+      queue_position: number | null
+      expiration_time: string | null
+      created_time: string | null
+      last_update_time: string | null
+      self_trade_prevention_type: string | null
+      order_group_id: string | null
+      cancel_order_on_pause: boolean | null
+    }
+    reduced_by: number
+    reduced_by_fp: string | null
+  }
+}
+
+export const kalshiCancelOrderV2Tool: ToolConfig<
+  KalshiCancelOrderV2Params,
+  KalshiCancelOrderV2Response
+> = {
+  id: 'kalshi_cancel_order_v2',
+  name: 'Cancel Order on Kalshi V2',
+  description: 'Cancel an existing order on Kalshi (V2 with full API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    orderId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The order ID to cancel',
+    },
+  },
+
+  request: {
+    url: (params) => buildKalshiUrl(`/portfolio/orders/${params.orderId}`),
+    method: 'DELETE',
+    headers: (params) => {
+      const path = `/trade-api/v2/portfolio/orders/${params.orderId}`
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'DELETE', path)
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'cancel_order_v2')
+    }
+
+    const order = data.order || {}
+
+    return {
+      success: true,
+      output: {
+        order: {
+          order_id: order.order_id ?? null,
+          user_id: order.user_id ?? null,
+          client_order_id: order.client_order_id ?? null,
+          ticker: order.ticker ?? null,
+          side: order.side ?? null,
+          action: order.action ?? null,
+          type: order.type ?? null,
+          status: order.status ?? null,
+          yes_price: order.yes_price ?? null,
+          no_price: order.no_price ?? null,
+          yes_price_dollars: order.yes_price_dollars ?? null,
+          no_price_dollars: order.no_price_dollars ?? null,
+          fill_count: order.fill_count ?? null,
+          fill_count_fp: order.fill_count_fp ?? null,
+          remaining_count: order.remaining_count ?? null,
+          remaining_count_fp: order.remaining_count_fp ?? null,
+          initial_count: order.initial_count ?? null,
+          initial_count_fp: order.initial_count_fp ?? null,
+          taker_fees: order.taker_fees ?? null,
+          maker_fees: order.maker_fees ?? null,
+          taker_fees_dollars: order.taker_fees_dollars ?? null,
+          maker_fees_dollars: order.maker_fees_dollars ?? null,
+          taker_fill_cost: order.taker_fill_cost ?? null,
+          maker_fill_cost: order.maker_fill_cost ?? null,
+          taker_fill_cost_dollars: order.taker_fill_cost_dollars ?? null,
+          maker_fill_cost_dollars: order.maker_fill_cost_dollars ?? null,
+          queue_position: order.queue_position ?? null,
+          expiration_time: order.expiration_time ?? null,
+          created_time: order.created_time ?? null,
+          last_update_time: order.last_update_time ?? null,
+          self_trade_prevention_type: order.self_trade_prevention_type ?? null,
+          order_group_id: order.order_group_id ?? null,
+          cancel_order_on_pause: order.cancel_order_on_pause ?? null,
+        },
+        reduced_by: data.reduced_by ?? 0,
+        reduced_by_fp: data.reduced_by_fp ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    order: {
+      type: 'object',
+      description: 'The canceled order object with full API response fields',
+      properties: {
+        order_id: { type: 'string', description: 'Order ID' },
+        user_id: { type: 'string', description: 'User ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        side: { type: 'string', description: 'Order side (yes/no)' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        type: { type: 'string', description: 'Order type (limit/market)' },
+        status: { type: 'string', description: 'Order status (resting/canceled/executed)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        yes_price_dollars: { type: 'string', description: 'Yes price in dollars' },
+        no_price_dollars: { type: 'string', description: 'No price in dollars' },
+        fill_count: { type: 'number', description: 'Filled contract count' },
+        fill_count_fp: { type: 'string', description: 'Filled count (fixed-point)' },
+        remaining_count: { type: 'number', description: 'Remaining contracts' },
+        remaining_count_fp: { type: 'string', description: 'Remaining count (fixed-point)' },
+        initial_count: { type: 'number', description: 'Initial contract count' },
+        initial_count_fp: { type: 'string', description: 'Initial count (fixed-point)' },
+        taker_fees: { type: 'number', description: 'Taker fees in cents' },
+        maker_fees: { type: 'number', description: 'Maker fees in cents' },
+        taker_fees_dollars: { type: 'string', description: 'Taker fees in dollars' },
+        maker_fees_dollars: { type: 'string', description: 'Maker fees in dollars' },
+        taker_fill_cost: { type: 'number', description: 'Taker fill cost in cents' },
+        maker_fill_cost: { type: 'number', description: 'Maker fill cost in cents' },
+        taker_fill_cost_dollars: { type: 'string', description: 'Taker fill cost in dollars' },
+        maker_fill_cost_dollars: { type: 'string', description: 'Maker fill cost in dollars' },
+        queue_position: { type: 'number', description: 'Queue position (deprecated)' },
+        expiration_time: { type: 'string', description: 'Order expiration time' },
+        created_time: { type: 'string', description: 'Order creation time' },
+        last_update_time: { type: 'string', description: 'Last update time' },
+        self_trade_prevention_type: { type: 'string', description: 'Self-trade prevention type' },
+        order_group_id: { type: 'string', description: 'Order group ID' },
+        cancel_order_on_pause: { type: 'boolean', description: 'Cancel on market pause' },
+      },
+    },
+    reduced_by: {
+      type: 'number',
+      description: 'Number of contracts canceled',
+    },
+    reduced_by_fp: {
+      type: 'string',
+      description: 'Number of contracts canceled in fixed-point format',
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/create_order.ts b/apps/sim/tools/kalshi/create_order.ts
index 551807882..e0fa1e9f1 100644
--- a/apps/sim/tools/kalshi/create_order.ts
+++ b/apps/sim/tools/kalshi/create_order.ts
@@ -209,3 +209,344 @@ export const kalshiCreateOrderTool: ToolConfig<KalshiCreateOrderParams, KalshiCr
       },
     },
   }
+
+export interface KalshiCreateOrderV2Params extends KalshiAuthParams {
+  ticker: string // Market ticker (required)
+  side: string // 'yes' or 'no' (required)
+  action: string // 'buy' or 'sell' (required)
+  count?: string // Number of contracts (optional - provide count or countFp)
+  type?: string // 'limit' or 'market' (default: limit)
+  yesPrice?: string // Yes price in cents (1-99)
+  noPrice?: string // No price in cents (1-99)
+  yesPriceDollars?: string // Yes price in dollars (e.g., "0.56")
+  noPriceDollars?: string // No price in dollars (e.g., "0.56")
+  clientOrderId?: string // Custom order identifier
+  expirationTs?: string // Unix timestamp expiration
+  timeInForce?: string // 'fill_or_kill', 'good_till_canceled', 'immediate_or_cancel'
+  buyMaxCost?: string // Maximum cost in cents
+  postOnly?: string // 'true' or 'false' - maker-only orders
+  reduceOnly?: string // 'true' or 'false' - position reduction only
+  selfTradePreventionType?: string // 'taker_at_cross' or 'maker'
+  orderGroupId?: string // Associated order group
+  countFp?: string // Count in fixed-point (for fractional contracts)
+  cancelOrderOnPause?: string // 'true' or 'false' - cancel on market pause
+  subaccount?: string // Subaccount to use for the order
+}
+
+export interface KalshiCreateOrderV2Response {
+  success: boolean
+  output: {
+    order: {
+      order_id: string
+      user_id: string | null
+      client_order_id: string | null
+      ticker: string
+      side: string
+      action: string
+      type: string
+      status: string
+      yes_price: number | null
+      no_price: number | null
+      yes_price_dollars: string | null
+      no_price_dollars: string | null
+      fill_count: number | null
+      fill_count_fp: string | null
+      remaining_count: number | null
+      remaining_count_fp: string | null
+      initial_count: number | null
+      initial_count_fp: string | null
+      taker_fees: number | null
+      maker_fees: number | null
+      taker_fees_dollars: string | null
+      maker_fees_dollars: string | null
+      taker_fill_cost: number | null
+      maker_fill_cost: number | null
+      taker_fill_cost_dollars: string | null
+      maker_fill_cost_dollars: string | null
+      queue_position: number | null
+      expiration_time: string | null
+      created_time: string | null
+      last_update_time: string | null
+      self_trade_prevention_type: string | null
+      order_group_id: string | null
+      cancel_order_on_pause: boolean | null
+    }
+  }
+}
+
+export const kalshiCreateOrderV2Tool: ToolConfig<
+  KalshiCreateOrderV2Params,
+  KalshiCreateOrderV2Response
+> = {
+  id: 'kalshi_create_order_v2',
+  name: 'Create Order on Kalshi V2',
+  description: 'Create a new order on a Kalshi prediction market (V2 with full API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    ticker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Market ticker (e.g., KXBTC-24DEC31)',
+    },
+    side: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: "Side of the order: 'yes' or 'no'",
+    },
+    action: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: "Action type: 'buy' or 'sell'",
+    },
+    count: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of contracts (provide count or countFp)',
+    },
+    type: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Order type: 'limit' or 'market' (default: limit)",
+    },
+    yesPrice: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Yes price in cents (1-99)',
+    },
+    noPrice: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'No price in cents (1-99)',
+    },
+    yesPriceDollars: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Yes price in dollars (e.g., "0.56")',
+    },
+    noPriceDollars: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'No price in dollars (e.g., "0.56")',
+    },
+    clientOrderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom order identifier',
+    },
+    expirationTs: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Unix timestamp for order expiration',
+    },
+    timeInForce: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Time in force: 'fill_or_kill', 'good_till_canceled', 'immediate_or_cancel'",
+    },
+    buyMaxCost: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum cost in cents (auto-enables fill_or_kill)',
+    },
+    postOnly: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Set to 'true' for maker-only orders",
+    },
+    reduceOnly: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Set to 'true' for position reduction only",
+    },
+    selfTradePreventionType: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Self-trade prevention: 'taker_at_cross' or 'maker'",
+    },
+    orderGroupId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Associated order group ID',
+    },
+    countFp: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Count in fixed-point for fractional contracts',
+    },
+    cancelOrderOnPause: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "Set to 'true' to cancel order on market pause",
+    },
+    subaccount: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Subaccount to use for the order',
+    },
+  },
+
+  request: {
+    url: () => buildKalshiUrl('/portfolio/orders'),
+    method: 'POST',
+    headers: (params) => {
+      const path = '/trade-api/v2/portfolio/orders'
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'POST', path)
+    },
+    body: (params) => {
+      const body: Record<string, any> = {
+        ticker: params.ticker,
+        side: params.side.toLowerCase(),
+        action: params.action.toLowerCase(),
+      }
+
+      // count or count_fp must be provided (but not both required)
+      if (params.count) body.count = Number.parseInt(params.count, 10)
+      if (params.countFp) body.count_fp = params.countFp
+      if (params.type) body.type = params.type.toLowerCase()
+      if (params.yesPrice) body.yes_price = Number.parseInt(params.yesPrice, 10)
+      if (params.noPrice) body.no_price = Number.parseInt(params.noPrice, 10)
+      if (params.yesPriceDollars) body.yes_price_dollars = params.yesPriceDollars
+      if (params.noPriceDollars) body.no_price_dollars = params.noPriceDollars
+      if (params.clientOrderId) body.client_order_id = params.clientOrderId
+      if (params.expirationTs) body.expiration_ts = Number.parseInt(params.expirationTs, 10)
+      if (params.timeInForce) body.time_in_force = params.timeInForce
+      if (params.buyMaxCost) body.buy_max_cost = Number.parseInt(params.buyMaxCost, 10)
+      if (params.postOnly) body.post_only = params.postOnly === 'true'
+      if (params.reduceOnly) body.reduce_only = params.reduceOnly === 'true'
+      if (params.selfTradePreventionType)
+        body.self_trade_prevention_type = params.selfTradePreventionType
+      if (params.orderGroupId) body.order_group_id = params.orderGroupId
+      if (params.cancelOrderOnPause)
+        body.cancel_order_on_pause = params.cancelOrderOnPause === 'true'
+      if (params.subaccount) body.subaccount = params.subaccount
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'create_order_v2')
+    }
+
+    const order = data.order || {}
+
+    return {
+      success: true,
+      output: {
+        order: {
+          order_id: order.order_id ?? null,
+          user_id: order.user_id ?? null,
+          client_order_id: order.client_order_id ?? null,
+          ticker: order.ticker ?? null,
+          side: order.side ?? null,
+          action: order.action ?? null,
+          type: order.type ?? null,
+          status: order.status ?? null,
+          yes_price: order.yes_price ?? null,
+          no_price: order.no_price ?? null,
+          yes_price_dollars: order.yes_price_dollars ?? null,
+          no_price_dollars: order.no_price_dollars ?? null,
+          fill_count: order.fill_count ?? null,
+          fill_count_fp: order.fill_count_fp ?? null,
+          remaining_count: order.remaining_count ?? null,
+          remaining_count_fp: order.remaining_count_fp ?? null,
+          initial_count: order.initial_count ?? null,
+          initial_count_fp: order.initial_count_fp ?? null,
+          taker_fees: order.taker_fees ?? null,
+          maker_fees: order.maker_fees ?? null,
+          taker_fees_dollars: order.taker_fees_dollars ?? null,
+          maker_fees_dollars: order.maker_fees_dollars ?? null,
+          taker_fill_cost: order.taker_fill_cost ?? null,
+          maker_fill_cost: order.maker_fill_cost ?? null,
+          taker_fill_cost_dollars: order.taker_fill_cost_dollars ?? null,
+          maker_fill_cost_dollars: order.maker_fill_cost_dollars ?? null,
+          queue_position: order.queue_position ?? null,
+          expiration_time: order.expiration_time ?? null,
+          created_time: order.created_time ?? null,
+          last_update_time: order.last_update_time ?? null,
+          self_trade_prevention_type: order.self_trade_prevention_type ?? null,
+          order_group_id: order.order_group_id ?? null,
+          cancel_order_on_pause: order.cancel_order_on_pause ?? null,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    order: {
+      type: 'object',
+      description: 'The created order object with full API response fields',
+      properties: {
+        order_id: { type: 'string', description: 'Order ID' },
+        user_id: { type: 'string', description: 'User ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        side: { type: 'string', description: 'Order side (yes/no)' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        type: { type: 'string', description: 'Order type (limit/market)' },
+        status: { type: 'string', description: 'Order status (resting/canceled/executed)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        yes_price_dollars: { type: 'string', description: 'Yes price in dollars' },
+        no_price_dollars: { type: 'string', description: 'No price in dollars' },
+        fill_count: { type: 'number', description: 'Filled contract count' },
+        fill_count_fp: { type: 'string', description: 'Filled count (fixed-point)' },
+        remaining_count: { type: 'number', description: 'Remaining contracts' },
+        remaining_count_fp: { type: 'string', description: 'Remaining count (fixed-point)' },
+        initial_count: { type: 'number', description: 'Initial contract count' },
+        initial_count_fp: { type: 'string', description: 'Initial count (fixed-point)' },
+        taker_fees: { type: 'number', description: 'Taker fees in cents' },
+        maker_fees: { type: 'number', description: 'Maker fees in cents' },
+        taker_fees_dollars: { type: 'string', description: 'Taker fees in dollars' },
+        maker_fees_dollars: { type: 'string', description: 'Maker fees in dollars' },
+        taker_fill_cost: { type: 'number', description: 'Taker fill cost in cents' },
+        maker_fill_cost: { type: 'number', description: 'Maker fill cost in cents' },
+        taker_fill_cost_dollars: { type: 'string', description: 'Taker fill cost in dollars' },
+        maker_fill_cost_dollars: { type: 'string', description: 'Maker fill cost in dollars' },
+        queue_position: { type: 'number', description: 'Queue position (deprecated)' },
+        expiration_time: { type: 'string', description: 'Order expiration time' },
+        created_time: { type: 'string', description: 'Order creation time' },
+        last_update_time: { type: 'string', description: 'Last update time' },
+        self_trade_prevention_type: { type: 'string', description: 'Self-trade prevention type' },
+        order_group_id: { type: 'string', description: 'Order group ID' },
+        cancel_order_on_pause: { type: 'boolean', description: 'Cancel on market pause' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_balance.ts b/apps/sim/tools/kalshi/get_balance.ts
index 1ebcd9437..716d9b6fe 100644
--- a/apps/sim/tools/kalshi/get_balance.ts
+++ b/apps/sim/tools/kalshi/get_balance.ts
@@ -66,3 +66,78 @@ export const kalshiGetBalanceTool: ToolConfig<KalshiGetBalanceParams, KalshiGetB
     portfolioValue: { type: 'number', description: 'Portfolio value in cents' },
   },
 }
+
+/**
+ * V2 Params for Get Balance
+ */
+export interface KalshiGetBalanceV2Params extends KalshiAuthParams {}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetBalanceV2Response {
+  success: boolean
+  output: {
+    balance: number
+    portfolio_value: number
+    updated_ts: number | null
+  }
+}
+
+export const kalshiGetBalanceV2Tool: ToolConfig<
+  KalshiGetBalanceV2Params,
+  KalshiGetBalanceV2Response
+> = {
+  id: 'kalshi_get_balance_v2',
+  name: 'Get Balance from Kalshi V2',
+  description:
+    'Retrieve your account balance and portfolio value from Kalshi (V2 - exact API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+  },
+
+  request: {
+    url: () => buildKalshiUrl('/portfolio/balance'),
+    method: 'GET',
+    headers: (params) => {
+      const path = '/trade-api/v2/portfolio/balance'
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'GET', path)
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_balance_v2')
+    }
+
+    return {
+      success: true,
+      output: {
+        balance: data.balance ?? 0,
+        portfolio_value: data.portfolio_value ?? 0,
+        updated_ts: data.updated_ts ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    balance: { type: 'number', description: 'Account balance in cents' },
+    portfolio_value: { type: 'number', description: 'Portfolio value in cents' },
+    updated_ts: { type: 'number', description: 'Unix timestamp of last update (milliseconds)' },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_candlesticks.ts b/apps/sim/tools/kalshi/get_candlesticks.ts
index 6a140d3cd..34428d2a2 100644
--- a/apps/sim/tools/kalshi/get_candlesticks.ts
+++ b/apps/sim/tools/kalshi/get_candlesticks.ts
@@ -102,3 +102,246 @@ export const kalshiGetCandlesticksTool: ToolConfig<
     },
   },
 }
+
+/**
+ * BidAskDistribution - OHLC data for yes_bid and yes_ask
+ */
+export interface BidAskDistribution {
+  open: number | null
+  open_dollars: string | null
+  low: number | null
+  low_dollars: string | null
+  high: number | null
+  high_dollars: string | null
+  close: number | null
+  close_dollars: string | null
+}
+
+/**
+ * PriceDistribution - Extended OHLC data for price field
+ */
+export interface PriceDistribution {
+  open: number | null
+  open_dollars: string | null
+  low: number | null
+  low_dollars: string | null
+  high: number | null
+  high_dollars: string | null
+  close: number | null
+  close_dollars: string | null
+  mean: number | null
+  mean_dollars: string | null
+  previous: number | null
+  previous_dollars: string | null
+  min: number | null
+  min_dollars: string | null
+  max: number | null
+  max_dollars: string | null
+}
+
+/**
+ * V2 Get Candlesticks Tool - Returns exact Kalshi API response structure
+ */
+export interface KalshiGetCandlesticksV2Response {
+  success: boolean
+  output: {
+    ticker: string
+    candlesticks: Array<{
+      end_period_ts: number | null
+      yes_bid: BidAskDistribution
+      yes_ask: BidAskDistribution
+      price: PriceDistribution
+      volume: number | null
+      volume_fp: string | null
+      open_interest: number | null
+      open_interest_fp: string | null
+    }>
+  }
+}
+
+export const kalshiGetCandlesticksV2Tool: ToolConfig<
+  KalshiGetCandlesticksParams,
+  KalshiGetCandlesticksV2Response
+> = {
+  id: 'kalshi_get_candlesticks_v2',
+  name: 'Get Market Candlesticks from Kalshi V2',
+  description: 'Retrieve OHLC candlestick data for a specific market (V2 - full API response)',
+  version: '2.0.0',
+
+  params: {
+    seriesTicker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Series ticker',
+    },
+    ticker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Market ticker (e.g., KXBTC-24DEC31)',
+    },
+    startTs: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Start timestamp (Unix seconds)',
+    },
+    endTs: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'End timestamp (Unix seconds)',
+    },
+    periodInterval: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Period interval: 1 (1min), 60 (1hour), or 1440 (1day)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      queryParams.append('start_ts', params.startTs.toString())
+      queryParams.append('end_ts', params.endTs.toString())
+      queryParams.append('period_interval', params.periodInterval.toString())
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl(
+        `/series/${params.seriesTicker}/markets/${params.ticker}/candlesticks`
+      )
+      return `${url}?${query}`
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_candlesticks_v2')
+    }
+
+    const mapBidAsk = (obj: Record<string, unknown> | null): BidAskDistribution => ({
+      open: (obj?.open as number) ?? null,
+      open_dollars: (obj?.open_dollars as string) ?? null,
+      low: (obj?.low as number) ?? null,
+      low_dollars: (obj?.low_dollars as string) ?? null,
+      high: (obj?.high as number) ?? null,
+      high_dollars: (obj?.high_dollars as string) ?? null,
+      close: (obj?.close as number) ?? null,
+      close_dollars: (obj?.close_dollars as string) ?? null,
+    })
+
+    const mapPrice = (obj: Record<string, unknown> | null): PriceDistribution => ({
+      open: (obj?.open as number) ?? null,
+      open_dollars: (obj?.open_dollars as string) ?? null,
+      low: (obj?.low as number) ?? null,
+      low_dollars: (obj?.low_dollars as string) ?? null,
+      high: (obj?.high as number) ?? null,
+      high_dollars: (obj?.high_dollars as string) ?? null,
+      close: (obj?.close as number) ?? null,
+      close_dollars: (obj?.close_dollars as string) ?? null,
+      mean: (obj?.mean as number) ?? null,
+      mean_dollars: (obj?.mean_dollars as string) ?? null,
+      previous: (obj?.previous as number) ?? null,
+      previous_dollars: (obj?.previous_dollars as string) ?? null,
+      min: (obj?.min as number) ?? null,
+      min_dollars: (obj?.min_dollars as string) ?? null,
+      max: (obj?.max as number) ?? null,
+      max_dollars: (obj?.max_dollars as string) ?? null,
+    })
+
+    const candlesticks = (data.candlesticks || []).map((c: Record<string, unknown>) => ({
+      end_period_ts: (c.end_period_ts as number) ?? null,
+      yes_bid: mapBidAsk(c.yes_bid as Record<string, unknown> | null),
+      yes_ask: mapBidAsk(c.yes_ask as Record<string, unknown> | null),
+      price: mapPrice(c.price as Record<string, unknown> | null),
+      volume: (c.volume as number) ?? null,
+      volume_fp: (c.volume_fp as string) ?? null,
+      open_interest: (c.open_interest as number) ?? null,
+      open_interest_fp: (c.open_interest_fp as string) ?? null,
+    }))
+
+    return {
+      success: true,
+      output: {
+        ticker: data.ticker ?? null,
+        candlesticks,
+      },
+    }
+  },
+
+  outputs: {
+    ticker: {
+      type: 'string',
+      description: 'Market ticker',
+    },
+    candlesticks: {
+      type: 'array',
+      description: 'Array of OHLC candlestick data with nested bid/ask/price objects',
+      properties: {
+        end_period_ts: { type: 'number', description: 'End period timestamp (Unix)' },
+        yes_bid: {
+          type: 'object',
+          description: 'Yes bid OHLC data',
+          properties: {
+            open: { type: 'number', description: 'Open price (cents)' },
+            open_dollars: { type: 'string', description: 'Open price (dollars)' },
+            low: { type: 'number', description: 'Low price (cents)' },
+            low_dollars: { type: 'string', description: 'Low price (dollars)' },
+            high: { type: 'number', description: 'High price (cents)' },
+            high_dollars: { type: 'string', description: 'High price (dollars)' },
+            close: { type: 'number', description: 'Close price (cents)' },
+            close_dollars: { type: 'string', description: 'Close price (dollars)' },
+          },
+        },
+        yes_ask: {
+          type: 'object',
+          description: 'Yes ask OHLC data',
+          properties: {
+            open: { type: 'number', description: 'Open price (cents)' },
+            open_dollars: { type: 'string', description: 'Open price (dollars)' },
+            low: { type: 'number', description: 'Low price (cents)' },
+            low_dollars: { type: 'string', description: 'Low price (dollars)' },
+            high: { type: 'number', description: 'High price (cents)' },
+            high_dollars: { type: 'string', description: 'High price (dollars)' },
+            close: { type: 'number', description: 'Close price (cents)' },
+            close_dollars: { type: 'string', description: 'Close price (dollars)' },
+          },
+        },
+        price: {
+          type: 'object',
+          description: 'Trade price OHLC data with additional statistics',
+          properties: {
+            open: { type: 'number', description: 'Open price (cents)' },
+            open_dollars: { type: 'string', description: 'Open price (dollars)' },
+            low: { type: 'number', description: 'Low price (cents)' },
+            low_dollars: { type: 'string', description: 'Low price (dollars)' },
+            high: { type: 'number', description: 'High price (cents)' },
+            high_dollars: { type: 'string', description: 'High price (dollars)' },
+            close: { type: 'number', description: 'Close price (cents)' },
+            close_dollars: { type: 'string', description: 'Close price (dollars)' },
+            mean: { type: 'number', description: 'Mean price (cents)' },
+            mean_dollars: { type: 'string', description: 'Mean price (dollars)' },
+            previous: { type: 'number', description: 'Previous price (cents)' },
+            previous_dollars: { type: 'string', description: 'Previous price (dollars)' },
+            min: { type: 'number', description: 'Min price (cents)' },
+            min_dollars: { type: 'string', description: 'Min price (dollars)' },
+            max: { type: 'number', description: 'Max price (cents)' },
+            max_dollars: { type: 'string', description: 'Max price (dollars)' },
+          },
+        },
+        volume: { type: 'number', description: 'Volume (contracts)' },
+        volume_fp: { type: 'string', description: 'Volume (fixed-point string)' },
+        open_interest: { type: 'number', description: 'Open interest (contracts)' },
+        open_interest_fp: { type: 'string', description: 'Open interest (fixed-point string)' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_event.ts b/apps/sim/tools/kalshi/get_event.ts
index ec32965a9..a0428454a 100644
--- a/apps/sim/tools/kalshi/get_event.ts
+++ b/apps/sim/tools/kalshi/get_event.ts
@@ -73,3 +73,179 @@ export const kalshiGetEventTool: ToolConfig<KalshiGetEventParams, KalshiGetEvent
     },
   },
 }
+
+/**
+ * V2 Params for Get Event
+ */
+export interface KalshiGetEventV2Params {
+  eventTicker: string
+  withNestedMarkets?: string
+}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetEventV2Response {
+  success: boolean
+  output: {
+    event: {
+      event_ticker: string
+      series_ticker: string
+      title: string
+      sub_title: string | null
+      mutually_exclusive: boolean
+      category: string
+      collateral_return_type: string | null
+      strike_date: string | null
+      strike_period: string | null
+      available_on_brokers: boolean | null
+      product_metadata: Record<string, unknown> | null
+      markets: Array<{
+        ticker: string
+        event_ticker: string
+        market_type: string
+        title: string
+        subtitle: string | null
+        yes_sub_title: string | null
+        no_sub_title: string | null
+        open_time: string
+        close_time: string
+        expiration_time: string
+        status: string
+        yes_bid: number
+        yes_ask: number
+        no_bid: number
+        no_ask: number
+        last_price: number
+        previous_yes_bid: number | null
+        previous_yes_ask: number | null
+        previous_price: number | null
+        volume: number
+        volume_24h: number
+        liquidity: number | null
+        open_interest: number | null
+        result: string | null
+        cap_strike: number | null
+        floor_strike: number | null
+      }> | null
+    }
+  }
+}
+
+export const kalshiGetEventV2Tool: ToolConfig<KalshiGetEventV2Params, KalshiGetEventV2Response> = {
+  id: 'kalshi_get_event_v2',
+  name: 'Get Event from Kalshi V2',
+  description: 'Retrieve details of a specific event by ticker (V2 - exact API response)',
+  version: '2.0.0',
+
+  params: {
+    eventTicker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The event ticker',
+    },
+    withNestedMarkets: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Include nested markets in response (true/false)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.withNestedMarkets)
+        queryParams.append('with_nested_markets', params.withNestedMarkets)
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl(`/events/${params.eventTicker}`)
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_event_v2')
+    }
+
+    const event = data.event || {}
+    const markets =
+      event.markets?.map((m: Record<string, unknown>) => ({
+        ticker: m.ticker ?? null,
+        event_ticker: m.event_ticker ?? null,
+        market_type: m.market_type ?? null,
+        title: m.title ?? null,
+        subtitle: m.subtitle ?? null,
+        yes_sub_title: m.yes_sub_title ?? null,
+        no_sub_title: m.no_sub_title ?? null,
+        open_time: m.open_time ?? null,
+        close_time: m.close_time ?? null,
+        expiration_time: m.expiration_time ?? null,
+        status: m.status ?? null,
+        yes_bid: m.yes_bid ?? 0,
+        yes_ask: m.yes_ask ?? 0,
+        no_bid: m.no_bid ?? 0,
+        no_ask: m.no_ask ?? 0,
+        last_price: m.last_price ?? 0,
+        previous_yes_bid: m.previous_yes_bid ?? null,
+        previous_yes_ask: m.previous_yes_ask ?? null,
+        previous_price: m.previous_price ?? null,
+        volume: m.volume ?? 0,
+        volume_24h: m.volume_24h ?? 0,
+        liquidity: m.liquidity ?? null,
+        open_interest: m.open_interest ?? null,
+        result: m.result ?? null,
+        cap_strike: m.cap_strike ?? null,
+        floor_strike: m.floor_strike ?? null,
+      })) ?? null
+
+    return {
+      success: true,
+      output: {
+        event: {
+          event_ticker: event.event_ticker ?? null,
+          series_ticker: event.series_ticker ?? null,
+          title: event.title ?? null,
+          sub_title: event.sub_title ?? null,
+          mutually_exclusive: event.mutually_exclusive ?? false,
+          category: event.category ?? null,
+          collateral_return_type: event.collateral_return_type ?? null,
+          strike_date: event.strike_date ?? null,
+          strike_period: event.strike_period ?? null,
+          available_on_brokers: event.available_on_brokers ?? null,
+          product_metadata: event.product_metadata ?? null,
+          markets,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    event: {
+      type: 'object',
+      description: 'Event object with full details matching Kalshi API response',
+      properties: {
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        series_ticker: { type: 'string', description: 'Series ticker' },
+        title: { type: 'string', description: 'Event title' },
+        sub_title: { type: 'string', description: 'Event subtitle' },
+        mutually_exclusive: { type: 'boolean', description: 'Mutually exclusive markets' },
+        category: { type: 'string', description: 'Event category' },
+        collateral_return_type: { type: 'string', description: 'Collateral return type' },
+        strike_date: { type: 'string', description: 'Strike date' },
+        strike_period: { type: 'string', description: 'Strike period' },
+        available_on_brokers: { type: 'boolean', description: 'Available on brokers' },
+        product_metadata: { type: 'object', description: 'Product metadata' },
+        markets: { type: 'array', description: 'Nested markets (if requested)' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_events.ts b/apps/sim/tools/kalshi/get_events.ts
index 4ed5c29e4..0b6c4fcc2 100644
--- a/apps/sim/tools/kalshi/get_events.ts
+++ b/apps/sim/tools/kalshi/get_events.ts
@@ -106,3 +106,197 @@ export const kalshiGetEventsTool: ToolConfig<KalshiGetEventsParams, KalshiGetEve
     },
   },
 }
+
+/**
+ * V2 Params for Get Events
+ */
+export interface KalshiGetEventsV2Params extends KalshiPaginationParams {
+  status?: string
+  seriesTicker?: string
+  withNestedMarkets?: string
+  withMilestones?: string
+  minCloseTs?: number
+}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetEventsV2Response {
+  success: boolean
+  output: {
+    events: Array<{
+      event_ticker: string
+      series_ticker: string
+      title: string
+      sub_title: string | null
+      mutually_exclusive: boolean
+      category: string
+      collateral_return_type: string | null
+      strike_date: string | null
+      strike_period: string | null
+      available_on_brokers: boolean | null
+      product_metadata: Record<string, unknown> | null
+      markets: Array<Record<string, unknown>> | null
+    }>
+    milestones: Array<{
+      event_ticker: string
+      milestone_type: string
+      milestone_date: string
+      milestone_title: string | null
+    }> | null
+    cursor: string | null
+  }
+}
+
+export const kalshiGetEventsV2Tool: ToolConfig<KalshiGetEventsV2Params, KalshiGetEventsV2Response> =
+  {
+    id: 'kalshi_get_events_v2',
+    name: 'Get Events from Kalshi V2',
+    description:
+      'Retrieve a list of events from Kalshi with optional filtering (V2 - exact API response)',
+    version: '2.0.0',
+
+    params: {
+      status: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by status (open, closed, settled)',
+      },
+      seriesTicker: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by series ticker',
+      },
+      withNestedMarkets: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Include nested markets in response (true/false)',
+      },
+      withMilestones: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Include milestones in response (true/false)',
+      },
+      minCloseTs: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Minimum close timestamp (Unix seconds)',
+      },
+      limit: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Number of results (1-200, default: 200)',
+      },
+      cursor: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Pagination cursor for next page',
+      },
+    },
+
+    request: {
+      url: (params) => {
+        const queryParams = new URLSearchParams()
+        if (params.status) queryParams.append('status', params.status)
+        if (params.seriesTicker) queryParams.append('series_ticker', params.seriesTicker)
+        if (params.withNestedMarkets)
+          queryParams.append('with_nested_markets', params.withNestedMarkets)
+        if (params.withMilestones) queryParams.append('with_milestones', params.withMilestones)
+        if (params.minCloseTs !== undefined)
+          queryParams.append('min_close_ts', params.minCloseTs.toString())
+        if (params.limit) queryParams.append('limit', params.limit)
+        if (params.cursor) queryParams.append('cursor', params.cursor)
+
+        const query = queryParams.toString()
+        const url = buildKalshiUrl('/events')
+        return query ? `${url}?${query}` : url
+      },
+      method: 'GET',
+      headers: () => ({
+        'Content-Type': 'application/json',
+      }),
+    },
+
+    transformResponse: async (response: Response) => {
+      const data = await response.json()
+
+      if (!response.ok) {
+        handleKalshiError(data, response.status, 'get_events_v2')
+      }
+
+      const events = (data.events || []).map((e: Record<string, unknown>) => ({
+        event_ticker: e.event_ticker ?? null,
+        series_ticker: e.series_ticker ?? null,
+        title: e.title ?? null,
+        sub_title: e.sub_title ?? null,
+        mutually_exclusive: e.mutually_exclusive ?? false,
+        category: e.category ?? null,
+        collateral_return_type: e.collateral_return_type ?? null,
+        strike_date: e.strike_date ?? null,
+        strike_period: e.strike_period ?? null,
+        available_on_brokers: e.available_on_brokers ?? null,
+        product_metadata: e.product_metadata ?? null,
+        markets: e.markets ?? null,
+      }))
+
+      const milestones = data.milestones
+        ? (data.milestones as Array<Record<string, unknown>>).map((m) => ({
+            event_ticker: (m.event_ticker as string) ?? '',
+            milestone_type: (m.milestone_type as string) ?? '',
+            milestone_date: (m.milestone_date as string) ?? '',
+            milestone_title: (m.milestone_title as string | null) ?? null,
+          }))
+        : null
+
+      return {
+        success: true,
+        output: {
+          events,
+          milestones,
+          cursor: data.cursor ?? null,
+        },
+      }
+    },
+
+    outputs: {
+      events: {
+        type: 'array',
+        description: 'Array of event objects',
+        properties: {
+          event_ticker: { type: 'string', description: 'Event ticker' },
+          series_ticker: { type: 'string', description: 'Series ticker' },
+          title: { type: 'string', description: 'Event title' },
+          sub_title: { type: 'string', description: 'Event subtitle' },
+          mutually_exclusive: { type: 'boolean', description: 'Mutually exclusive markets' },
+          category: { type: 'string', description: 'Event category' },
+          collateral_return_type: { type: 'string', description: 'Collateral return type' },
+          strike_date: { type: 'string', description: 'Strike date' },
+          strike_period: { type: 'string', description: 'Strike period' },
+          available_on_brokers: { type: 'boolean', description: 'Available on brokers' },
+          product_metadata: { type: 'object', description: 'Product metadata' },
+          markets: { type: 'array', description: 'Nested markets (if requested)' },
+        },
+      },
+      milestones: {
+        type: 'array',
+        description: 'Array of milestone objects (if requested)',
+        properties: {
+          event_ticker: { type: 'string', description: 'Event ticker' },
+          milestone_type: { type: 'string', description: 'Milestone type' },
+          milestone_date: { type: 'string', description: 'Milestone date' },
+          milestone_title: { type: 'string', description: 'Milestone title' },
+        },
+      },
+      cursor: {
+        type: 'string',
+        description: 'Pagination cursor for fetching more results',
+      },
+    },
+  }
diff --git a/apps/sim/tools/kalshi/get_exchange_status.ts b/apps/sim/tools/kalshi/get_exchange_status.ts
index 545a0ea7c..7348d6b29 100644
--- a/apps/sim/tools/kalshi/get_exchange_status.ts
+++ b/apps/sim/tools/kalshi/get_exchange_status.ts
@@ -59,3 +59,74 @@ export const kalshiGetExchangeStatusTool: ToolConfig<
     },
   },
 }
+
+/**
+ * V2 Params for Get Exchange Status
+ */
+export type KalshiGetExchangeStatusV2Params = Record<string, never>
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetExchangeStatusV2Response {
+  success: boolean
+  output: {
+    exchange_active: boolean
+    trading_active: boolean
+    exchange_estimated_resume_time: string | null
+  }
+}
+
+export const kalshiGetExchangeStatusV2Tool: ToolConfig<
+  KalshiGetExchangeStatusV2Params,
+  KalshiGetExchangeStatusV2Response
+> = {
+  id: 'kalshi_get_exchange_status_v2',
+  name: 'Get Exchange Status from Kalshi V2',
+  description: 'Retrieve the current status of the Kalshi exchange (V2 - exact API response)',
+  version: '2.0.0',
+
+  params: {},
+
+  request: {
+    url: () => {
+      return buildKalshiUrl('/exchange/status')
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_exchange_status_v2')
+    }
+
+    return {
+      success: true,
+      output: {
+        exchange_active: data.exchange_active ?? false,
+        trading_active: data.trading_active ?? false,
+        exchange_estimated_resume_time: data.exchange_estimated_resume_time ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    exchange_active: {
+      type: 'boolean',
+      description: 'Whether the exchange is active',
+    },
+    trading_active: {
+      type: 'boolean',
+      description: 'Whether trading is active',
+    },
+    exchange_estimated_resume_time: {
+      type: 'string',
+      description: 'Estimated time when exchange will resume (if inactive)',
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_fills.ts b/apps/sim/tools/kalshi/get_fills.ts
index 1ca8b8898..3ae429aab 100644
--- a/apps/sim/tools/kalshi/get_fills.ts
+++ b/apps/sim/tools/kalshi/get_fills.ts
@@ -131,3 +131,198 @@ export const kalshiGetFillsTool: ToolConfig<KalshiGetFillsParams, KalshiGetFills
     },
   },
 }
+
+/**
+ * V2 Params for Get Fills - fixes limit max to 200, adds subaccount
+ */
+export interface KalshiGetFillsV2Params extends KalshiAuthParams, KalshiPaginationParams {
+  ticker?: string
+  orderId?: string
+  minTs?: number
+  maxTs?: number
+  subaccount?: string
+}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetFillsV2Response {
+  success: boolean
+  output: {
+    fills: Array<{
+      fill_id: string
+      trade_id: string
+      order_id: string
+      client_order_id: string | null
+      ticker: string
+      market_ticker: string
+      side: string
+      action: string
+      count: number
+      count_fp: string | null
+      price: number | null
+      yes_price: number
+      no_price: number
+      yes_price_fixed: string | null
+      no_price_fixed: string | null
+      is_taker: boolean
+      created_time: string | null
+      ts: number | null
+    }>
+    cursor: string | null
+  }
+}
+
+export const kalshiGetFillsV2Tool: ToolConfig<KalshiGetFillsV2Params, KalshiGetFillsV2Response> = {
+  id: 'kalshi_get_fills_v2',
+  name: 'Get Fills from Kalshi V2',
+  description: "Retrieve your portfolio's fills/trades from Kalshi (V2 - exact API response)",
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    ticker: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by market ticker',
+    },
+    orderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by order ID',
+    },
+    minTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum timestamp (Unix milliseconds)',
+    },
+    maxTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum timestamp (Unix milliseconds)',
+    },
+    subaccount: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Subaccount to get fills for',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of results (1-200, default: 100)',
+    },
+    cursor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Pagination cursor for next page',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.ticker) queryParams.append('ticker', params.ticker)
+      if (params.orderId) queryParams.append('order_id', params.orderId)
+      if (params.minTs !== undefined) queryParams.append('min_ts', params.minTs.toString())
+      if (params.maxTs !== undefined) queryParams.append('max_ts', params.maxTs.toString())
+      if (params.subaccount) queryParams.append('subaccount', params.subaccount)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.cursor) queryParams.append('cursor', params.cursor)
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl('/portfolio/fills')
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: (params) => {
+      const path = '/trade-api/v2/portfolio/fills'
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'GET', path)
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_fills_v2')
+    }
+
+    const fills = (data.fills || []).map((f: Record<string, unknown>) => ({
+      fill_id: f.fill_id ?? null,
+      trade_id: f.trade_id ?? null,
+      order_id: f.order_id ?? null,
+      client_order_id: f.client_order_id ?? null,
+      ticker: f.ticker ?? null,
+      market_ticker: f.market_ticker ?? null,
+      side: f.side ?? null,
+      action: f.action ?? null,
+      count: f.count ?? 0,
+      count_fp: f.count_fp ?? null,
+      price: f.price ?? null,
+      yes_price: f.yes_price ?? 0,
+      no_price: f.no_price ?? 0,
+      yes_price_fixed: f.yes_price_fixed ?? null,
+      no_price_fixed: f.no_price_fixed ?? null,
+      is_taker: f.is_taker ?? false,
+      created_time: f.created_time ?? null,
+      ts: f.ts ?? null,
+    }))
+
+    return {
+      success: true,
+      output: {
+        fills,
+        cursor: data.cursor ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    fills: {
+      type: 'array',
+      description: 'Array of fill/trade objects with all API fields',
+      properties: {
+        fill_id: { type: 'string', description: 'Fill ID' },
+        trade_id: { type: 'string', description: 'Trade ID (same as fill_id)' },
+        order_id: { type: 'string', description: 'Order ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        market_ticker: { type: 'string', description: 'Market ticker (legacy)' },
+        side: { type: 'string', description: 'Side (yes/no)' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        count: { type: 'number', description: 'Number of contracts' },
+        count_fp: { type: 'string', description: 'Count (fixed-point)' },
+        price: { type: 'number', description: 'Price (deprecated)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        yes_price_fixed: { type: 'string', description: 'Yes price in dollars' },
+        no_price_fixed: { type: 'string', description: 'No price in dollars' },
+        is_taker: { type: 'boolean', description: 'Whether fill was taker' },
+        created_time: { type: 'string', description: 'Fill creation time' },
+        ts: { type: 'number', description: 'Unix timestamp (milliseconds)' },
+      },
+    },
+    cursor: {
+      type: 'string',
+      description: 'Pagination cursor for fetching more results',
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_market.ts b/apps/sim/tools/kalshi/get_market.ts
index b54971502..12d735e50 100644
--- a/apps/sim/tools/kalshi/get_market.ts
+++ b/apps/sim/tools/kalshi/get_market.ts
@@ -58,3 +58,219 @@ export const kalshiGetMarketTool: ToolConfig<KalshiGetMarketParams, KalshiGetMar
     },
   },
 }
+
+/**
+ * V2 Get Market Tool - Returns exact Kalshi API response structure
+ */
+export interface KalshiGetMarketV2Response {
+  success: boolean
+  output: {
+    market: {
+      ticker: string
+      event_ticker: string
+      market_type: string
+      title: string
+      subtitle: string | null
+      yes_sub_title: string | null
+      no_sub_title: string | null
+      open_time: string | null
+      close_time: string | null
+      expected_expiration_time: string | null
+      expiration_time: string | null
+      latest_expiration_time: string | null
+      settlement_timer_seconds: number | null
+      status: string
+      response_price_units: string | null
+      notional_value: number | null
+      tick_size: number | null
+      yes_bid: number | null
+      yes_ask: number | null
+      no_bid: number | null
+      no_ask: number | null
+      last_price: number | null
+      previous_yes_bid: number | null
+      previous_yes_ask: number | null
+      previous_price: number | null
+      volume: number | null
+      volume_24h: number | null
+      liquidity: number | null
+      open_interest: number | null
+      result: string | null
+      cap_strike: number | null
+      floor_strike: number | null
+      can_close_early: boolean | null
+      expiration_value: string | null
+      category: string | null
+      risk_limit_cents: number | null
+      strike_type: string | null
+      rules_primary: string | null
+      rules_secondary: string | null
+      settlement_source_url: string | null
+      custom_strike: object | null
+      underlying: string | null
+      settlement_value: number | null
+      cfd_contract_size: number | null
+      yes_fee_fp: number | null
+      no_fee_fp: number | null
+      last_price_fp: number | null
+      yes_bid_fp: number | null
+      yes_ask_fp: number | null
+      no_bid_fp: number | null
+      no_ask_fp: number | null
+    }
+  }
+}
+
+export const kalshiGetMarketV2Tool: ToolConfig<KalshiGetMarketParams, KalshiGetMarketV2Response> = {
+  id: 'kalshi_get_market_v2',
+  name: 'Get Market from Kalshi V2',
+  description:
+    'Retrieve details of a specific prediction market by ticker (V2 - full API response)',
+  version: '2.0.0',
+
+  params: {
+    ticker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The market ticker (e.g., "KXBTC-24DEC31")',
+    },
+  },
+
+  request: {
+    url: (params) => buildKalshiUrl(`/markets/${params.ticker}`),
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_market_v2')
+    }
+
+    const m = data.market || {}
+
+    return {
+      success: true,
+      output: {
+        market: {
+          ticker: m.ticker ?? null,
+          event_ticker: m.event_ticker ?? null,
+          market_type: m.market_type ?? null,
+          title: m.title ?? null,
+          subtitle: m.subtitle ?? null,
+          yes_sub_title: m.yes_sub_title ?? null,
+          no_sub_title: m.no_sub_title ?? null,
+          open_time: m.open_time ?? null,
+          close_time: m.close_time ?? null,
+          expected_expiration_time: m.expected_expiration_time ?? null,
+          expiration_time: m.expiration_time ?? null,
+          latest_expiration_time: m.latest_expiration_time ?? null,
+          settlement_timer_seconds: m.settlement_timer_seconds ?? null,
+          status: m.status ?? null,
+          response_price_units: m.response_price_units ?? null,
+          notional_value: m.notional_value ?? null,
+          tick_size: m.tick_size ?? null,
+          yes_bid: m.yes_bid ?? null,
+          yes_ask: m.yes_ask ?? null,
+          no_bid: m.no_bid ?? null,
+          no_ask: m.no_ask ?? null,
+          last_price: m.last_price ?? null,
+          previous_yes_bid: m.previous_yes_bid ?? null,
+          previous_yes_ask: m.previous_yes_ask ?? null,
+          previous_price: m.previous_price ?? null,
+          volume: m.volume ?? null,
+          volume_24h: m.volume_24h ?? null,
+          liquidity: m.liquidity ?? null,
+          open_interest: m.open_interest ?? null,
+          result: m.result ?? null,
+          cap_strike: m.cap_strike ?? null,
+          floor_strike: m.floor_strike ?? null,
+          can_close_early: m.can_close_early ?? null,
+          expiration_value: m.expiration_value ?? null,
+          category: m.category ?? null,
+          risk_limit_cents: m.risk_limit_cents ?? null,
+          strike_type: m.strike_type ?? null,
+          rules_primary: m.rules_primary ?? null,
+          rules_secondary: m.rules_secondary ?? null,
+          settlement_source_url: m.settlement_source_url ?? null,
+          custom_strike: m.custom_strike ?? null,
+          underlying: m.underlying ?? null,
+          settlement_value: m.settlement_value ?? null,
+          cfd_contract_size: m.cfd_contract_size ?? null,
+          yes_fee_fp: m.yes_fee_fp ?? null,
+          no_fee_fp: m.no_fee_fp ?? null,
+          last_price_fp: m.last_price_fp ?? null,
+          yes_bid_fp: m.yes_bid_fp ?? null,
+          yes_ask_fp: m.yes_ask_fp ?? null,
+          no_bid_fp: m.no_bid_fp ?? null,
+          no_ask_fp: m.no_ask_fp ?? null,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    market: {
+      type: 'object',
+      description: 'Market object with all API fields',
+      properties: {
+        ticker: { type: 'string', description: 'Market ticker' },
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        market_type: { type: 'string', description: 'Market type' },
+        title: { type: 'string', description: 'Market title' },
+        subtitle: { type: 'string', description: 'Market subtitle' },
+        yes_sub_title: { type: 'string', description: 'Yes outcome subtitle' },
+        no_sub_title: { type: 'string', description: 'No outcome subtitle' },
+        open_time: { type: 'string', description: 'Market open time' },
+        close_time: { type: 'string', description: 'Market close time' },
+        expected_expiration_time: { type: 'string', description: 'Expected expiration time' },
+        expiration_time: { type: 'string', description: 'Expiration time' },
+        latest_expiration_time: { type: 'string', description: 'Latest expiration time' },
+        settlement_timer_seconds: { type: 'number', description: 'Settlement timer in seconds' },
+        status: { type: 'string', description: 'Market status' },
+        response_price_units: { type: 'string', description: 'Response price units' },
+        notional_value: { type: 'number', description: 'Notional value' },
+        tick_size: { type: 'number', description: 'Tick size' },
+        yes_bid: { type: 'number', description: 'Current yes bid price' },
+        yes_ask: { type: 'number', description: 'Current yes ask price' },
+        no_bid: { type: 'number', description: 'Current no bid price' },
+        no_ask: { type: 'number', description: 'Current no ask price' },
+        last_price: { type: 'number', description: 'Last trade price' },
+        previous_yes_bid: { type: 'number', description: 'Previous yes bid' },
+        previous_yes_ask: { type: 'number', description: 'Previous yes ask' },
+        previous_price: { type: 'number', description: 'Previous price' },
+        volume: { type: 'number', description: 'Total volume' },
+        volume_24h: { type: 'number', description: '24-hour volume' },
+        liquidity: { type: 'number', description: 'Market liquidity' },
+        open_interest: { type: 'number', description: 'Open interest' },
+        result: { type: 'string', description: 'Market result' },
+        cap_strike: { type: 'number', description: 'Cap strike' },
+        floor_strike: { type: 'number', description: 'Floor strike' },
+        can_close_early: { type: 'boolean', description: 'Can close early' },
+        expiration_value: { type: 'string', description: 'Expiration value' },
+        category: { type: 'string', description: 'Market category' },
+        risk_limit_cents: { type: 'number', description: 'Risk limit in cents' },
+        strike_type: { type: 'string', description: 'Strike type' },
+        rules_primary: { type: 'string', description: 'Primary rules' },
+        rules_secondary: { type: 'string', description: 'Secondary rules' },
+        settlement_source_url: { type: 'string', description: 'Settlement source URL' },
+        custom_strike: { type: 'object', description: 'Custom strike object' },
+        underlying: { type: 'string', description: 'Underlying asset' },
+        settlement_value: { type: 'number', description: 'Settlement value' },
+        cfd_contract_size: { type: 'number', description: 'CFD contract size' },
+        yes_fee_fp: { type: 'number', description: 'Yes fee (fixed-point)' },
+        no_fee_fp: { type: 'number', description: 'No fee (fixed-point)' },
+        last_price_fp: { type: 'number', description: 'Last price (fixed-point)' },
+        yes_bid_fp: { type: 'number', description: 'Yes bid (fixed-point)' },
+        yes_ask_fp: { type: 'number', description: 'Yes ask (fixed-point)' },
+        no_bid_fp: { type: 'number', description: 'No bid (fixed-point)' },
+        no_ask_fp: { type: 'number', description: 'No ask (fixed-point)' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_markets.ts b/apps/sim/tools/kalshi/get_markets.ts
index c8b743c28..5c2ea31eb 100644
--- a/apps/sim/tools/kalshi/get_markets.ts
+++ b/apps/sim/tools/kalshi/get_markets.ts
@@ -105,3 +105,341 @@ export const kalshiGetMarketsTool: ToolConfig<KalshiGetMarketsParams, KalshiGetM
     },
   },
 }
+
+/**
+ * V2 Get Markets Tool - Returns exact Kalshi API response structure with all params
+ */
+export interface KalshiGetMarketsV2Params extends KalshiPaginationParams {
+  status?: string // unopened, open, closed, settled
+  seriesTicker?: string
+  eventTicker?: string
+  minCreatedTs?: number
+  maxCreatedTs?: number
+  minUpdatedTs?: number
+  minCloseTs?: number
+  maxCloseTs?: number
+  minSettledTs?: number
+  maxSettledTs?: number
+  tickers?: string // comma-separated list
+  mveFilter?: string // display or all
+}
+
+export interface KalshiGetMarketsV2Response {
+  success: boolean
+  output: {
+    markets: Array<{
+      ticker: string
+      event_ticker: string
+      market_type: string
+      title: string
+      subtitle: string | null
+      yes_sub_title: string | null
+      no_sub_title: string | null
+      open_time: string | null
+      close_time: string | null
+      expected_expiration_time: string | null
+      expiration_time: string | null
+      latest_expiration_time: string | null
+      settlement_timer_seconds: number | null
+      status: string
+      response_price_units: string | null
+      notional_value: number | null
+      tick_size: number | null
+      yes_bid: number | null
+      yes_ask: number | null
+      no_bid: number | null
+      no_ask: number | null
+      last_price: number | null
+      previous_yes_bid: number | null
+      previous_yes_ask: number | null
+      previous_price: number | null
+      volume: number | null
+      volume_24h: number | null
+      liquidity: number | null
+      open_interest: number | null
+      result: string | null
+      cap_strike: number | null
+      floor_strike: number | null
+      can_close_early: boolean | null
+      expiration_value: string | null
+      category: string | null
+      risk_limit_cents: number | null
+      strike_type: string | null
+      rules_primary: string | null
+      rules_secondary: string | null
+      settlement_source_url: string | null
+      custom_strike: object | null
+      underlying: string | null
+      settlement_value: number | null
+      cfd_contract_size: number | null
+      yes_fee_fp: number | null
+      no_fee_fp: number | null
+      last_price_fp: number | null
+      yes_bid_fp: number | null
+      yes_ask_fp: number | null
+      no_bid_fp: number | null
+      no_ask_fp: number | null
+    }>
+    cursor: string | null
+  }
+}
+
+export const kalshiGetMarketsV2Tool: ToolConfig<
+  KalshiGetMarketsV2Params,
+  KalshiGetMarketsV2Response
+> = {
+  id: 'kalshi_get_markets_v2',
+  name: 'Get Markets from Kalshi V2',
+  description:
+    'Retrieve a list of prediction markets from Kalshi with all filtering options (V2 - full API response)',
+  version: '2.0.0',
+
+  params: {
+    status: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by status (unopened, open, closed, settled)',
+    },
+    seriesTicker: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by series ticker',
+    },
+    eventTicker: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by event ticker',
+    },
+    minCreatedTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum created timestamp (Unix seconds)',
+    },
+    maxCreatedTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum created timestamp (Unix seconds)',
+    },
+    minUpdatedTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum updated timestamp (Unix seconds)',
+    },
+    minCloseTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum close timestamp (Unix seconds)',
+    },
+    maxCloseTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum close timestamp (Unix seconds)',
+    },
+    minSettledTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Minimum settled timestamp (Unix seconds)',
+    },
+    maxSettledTs: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum settled timestamp (Unix seconds)',
+    },
+    tickers: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated list of tickers to filter',
+    },
+    mveFilter: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'MVE filter (display or all)',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of results (1-1000, default: 100)',
+    },
+    cursor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Pagination cursor for next page',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.status) queryParams.append('status', params.status)
+      if (params.seriesTicker) queryParams.append('series_ticker', params.seriesTicker)
+      if (params.eventTicker) queryParams.append('event_ticker', params.eventTicker)
+      if (params.minCreatedTs) queryParams.append('min_created_ts', params.minCreatedTs.toString())
+      if (params.maxCreatedTs) queryParams.append('max_created_ts', params.maxCreatedTs.toString())
+      if (params.minUpdatedTs) queryParams.append('min_updated_ts', params.minUpdatedTs.toString())
+      if (params.minCloseTs) queryParams.append('min_close_ts', params.minCloseTs.toString())
+      if (params.maxCloseTs) queryParams.append('max_close_ts', params.maxCloseTs.toString())
+      if (params.minSettledTs) queryParams.append('min_settled_ts', params.minSettledTs.toString())
+      if (params.maxSettledTs) queryParams.append('max_settled_ts', params.maxSettledTs.toString())
+      if (params.tickers) queryParams.append('tickers', params.tickers)
+      if (params.mveFilter) queryParams.append('mve_filter', params.mveFilter)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.cursor) queryParams.append('cursor', params.cursor)
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl('/markets')
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_markets_v2')
+    }
+
+    const markets = (data.markets || []).map((m: Record<string, unknown>) => ({
+      ticker: m.ticker ?? null,
+      event_ticker: m.event_ticker ?? null,
+      market_type: m.market_type ?? null,
+      title: m.title ?? null,
+      subtitle: m.subtitle ?? null,
+      yes_sub_title: m.yes_sub_title ?? null,
+      no_sub_title: m.no_sub_title ?? null,
+      open_time: m.open_time ?? null,
+      close_time: m.close_time ?? null,
+      expected_expiration_time: m.expected_expiration_time ?? null,
+      expiration_time: m.expiration_time ?? null,
+      latest_expiration_time: m.latest_expiration_time ?? null,
+      settlement_timer_seconds: m.settlement_timer_seconds ?? null,
+      status: m.status ?? null,
+      response_price_units: m.response_price_units ?? null,
+      notional_value: m.notional_value ?? null,
+      tick_size: m.tick_size ?? null,
+      yes_bid: m.yes_bid ?? null,
+      yes_ask: m.yes_ask ?? null,
+      no_bid: m.no_bid ?? null,
+      no_ask: m.no_ask ?? null,
+      last_price: m.last_price ?? null,
+      previous_yes_bid: m.previous_yes_bid ?? null,
+      previous_yes_ask: m.previous_yes_ask ?? null,
+      previous_price: m.previous_price ?? null,
+      volume: m.volume ?? null,
+      volume_24h: m.volume_24h ?? null,
+      liquidity: m.liquidity ?? null,
+      open_interest: m.open_interest ?? null,
+      result: m.result ?? null,
+      cap_strike: m.cap_strike ?? null,
+      floor_strike: m.floor_strike ?? null,
+      can_close_early: m.can_close_early ?? null,
+      expiration_value: m.expiration_value ?? null,
+      category: m.category ?? null,
+      risk_limit_cents: m.risk_limit_cents ?? null,
+      strike_type: m.strike_type ?? null,
+      rules_primary: m.rules_primary ?? null,
+      rules_secondary: m.rules_secondary ?? null,
+      settlement_source_url: m.settlement_source_url ?? null,
+      custom_strike: m.custom_strike ?? null,
+      underlying: m.underlying ?? null,
+      settlement_value: m.settlement_value ?? null,
+      cfd_contract_size: m.cfd_contract_size ?? null,
+      yes_fee_fp: m.yes_fee_fp ?? null,
+      no_fee_fp: m.no_fee_fp ?? null,
+      last_price_fp: m.last_price_fp ?? null,
+      yes_bid_fp: m.yes_bid_fp ?? null,
+      yes_ask_fp: m.yes_ask_fp ?? null,
+      no_bid_fp: m.no_bid_fp ?? null,
+      no_ask_fp: m.no_ask_fp ?? null,
+    }))
+
+    return {
+      success: true,
+      output: {
+        markets,
+        cursor: data.cursor ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    markets: {
+      type: 'array',
+      description: 'Array of market objects with all API fields',
+      properties: {
+        ticker: { type: 'string', description: 'Market ticker' },
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        market_type: { type: 'string', description: 'Market type' },
+        title: { type: 'string', description: 'Market title' },
+        subtitle: { type: 'string', description: 'Market subtitle' },
+        yes_sub_title: { type: 'string', description: 'Yes outcome subtitle' },
+        no_sub_title: { type: 'string', description: 'No outcome subtitle' },
+        open_time: { type: 'string', description: 'Market open time' },
+        close_time: { type: 'string', description: 'Market close time' },
+        expected_expiration_time: { type: 'string', description: 'Expected expiration time' },
+        expiration_time: { type: 'string', description: 'Expiration time' },
+        latest_expiration_time: { type: 'string', description: 'Latest expiration time' },
+        settlement_timer_seconds: { type: 'number', description: 'Settlement timer in seconds' },
+        status: { type: 'string', description: 'Market status' },
+        response_price_units: { type: 'string', description: 'Response price units' },
+        notional_value: { type: 'number', description: 'Notional value' },
+        tick_size: { type: 'number', description: 'Tick size' },
+        yes_bid: { type: 'number', description: 'Current yes bid price' },
+        yes_ask: { type: 'number', description: 'Current yes ask price' },
+        no_bid: { type: 'number', description: 'Current no bid price' },
+        no_ask: { type: 'number', description: 'Current no ask price' },
+        last_price: { type: 'number', description: 'Last trade price' },
+        previous_yes_bid: { type: 'number', description: 'Previous yes bid' },
+        previous_yes_ask: { type: 'number', description: 'Previous yes ask' },
+        previous_price: { type: 'number', description: 'Previous price' },
+        volume: { type: 'number', description: 'Total volume' },
+        volume_24h: { type: 'number', description: '24-hour volume' },
+        liquidity: { type: 'number', description: 'Market liquidity' },
+        open_interest: { type: 'number', description: 'Open interest' },
+        result: { type: 'string', description: 'Market result' },
+        cap_strike: { type: 'number', description: 'Cap strike' },
+        floor_strike: { type: 'number', description: 'Floor strike' },
+        can_close_early: { type: 'boolean', description: 'Can close early' },
+        expiration_value: { type: 'string', description: 'Expiration value' },
+        category: { type: 'string', description: 'Market category' },
+        risk_limit_cents: { type: 'number', description: 'Risk limit in cents' },
+        strike_type: { type: 'string', description: 'Strike type' },
+        rules_primary: { type: 'string', description: 'Primary rules' },
+        rules_secondary: { type: 'string', description: 'Secondary rules' },
+        settlement_source_url: { type: 'string', description: 'Settlement source URL' },
+        custom_strike: { type: 'object', description: 'Custom strike object' },
+        underlying: { type: 'string', description: 'Underlying asset' },
+        settlement_value: { type: 'number', description: 'Settlement value' },
+        cfd_contract_size: { type: 'number', description: 'CFD contract size' },
+        yes_fee_fp: { type: 'number', description: 'Yes fee (fixed-point)' },
+        no_fee_fp: { type: 'number', description: 'No fee (fixed-point)' },
+        last_price_fp: { type: 'number', description: 'Last price (fixed-point)' },
+        yes_bid_fp: { type: 'number', description: 'Yes bid (fixed-point)' },
+        yes_ask_fp: { type: 'number', description: 'Yes ask (fixed-point)' },
+        no_bid_fp: { type: 'number', description: 'No bid (fixed-point)' },
+        no_ask_fp: { type: 'number', description: 'No ask (fixed-point)' },
+      },
+    },
+    cursor: {
+      type: 'string',
+      description: 'Pagination cursor for fetching more results',
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_order.ts b/apps/sim/tools/kalshi/get_order.ts
index ed6a4c9f4..12411de6e 100644
--- a/apps/sim/tools/kalshi/get_order.ts
+++ b/apps/sim/tools/kalshi/get_order.ts
@@ -71,3 +71,178 @@ export const kalshiGetOrderTool: ToolConfig<KalshiGetOrderParams, KalshiGetOrder
     },
   },
 }
+
+export interface KalshiGetOrderV2Params extends KalshiAuthParams {
+  orderId: string // Order ID to retrieve (required)
+}
+
+export interface KalshiGetOrderV2Response {
+  success: boolean
+  output: {
+    order: {
+      order_id: string
+      user_id: string | null
+      client_order_id: string | null
+      ticker: string
+      side: string
+      action: string
+      type: string
+      status: string
+      yes_price: number | null
+      no_price: number | null
+      yes_price_dollars: string | null
+      no_price_dollars: string | null
+      fill_count: number | null
+      fill_count_fp: string | null
+      remaining_count: number | null
+      remaining_count_fp: string | null
+      initial_count: number | null
+      initial_count_fp: string | null
+      taker_fees: number | null
+      maker_fees: number | null
+      taker_fees_dollars: string | null
+      maker_fees_dollars: string | null
+      taker_fill_cost: number | null
+      maker_fill_cost: number | null
+      taker_fill_cost_dollars: string | null
+      maker_fill_cost_dollars: string | null
+      queue_position: number | null
+      expiration_time: string | null
+      created_time: string | null
+      last_update_time: string | null
+      self_trade_prevention_type: string | null
+      order_group_id: string | null
+      cancel_order_on_pause: boolean | null
+    }
+  }
+}
+
+export const kalshiGetOrderV2Tool: ToolConfig<KalshiGetOrderV2Params, KalshiGetOrderV2Response> = {
+  id: 'kalshi_get_order_v2',
+  name: 'Get Order from Kalshi V2',
+  description: 'Retrieve details of a specific order by ID from Kalshi (V2 with full API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    orderId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The order ID to retrieve',
+    },
+  },
+
+  request: {
+    url: (params) => buildKalshiUrl(`/portfolio/orders/${params.orderId}`),
+    method: 'GET',
+    headers: (params) => {
+      const path = `/trade-api/v2/portfolio/orders/${params.orderId}`
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'GET', path)
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_order_v2')
+    }
+
+    const order = data.order || {}
+
+    return {
+      success: true,
+      output: {
+        order: {
+          order_id: order.order_id ?? null,
+          user_id: order.user_id ?? null,
+          client_order_id: order.client_order_id ?? null,
+          ticker: order.ticker ?? null,
+          side: order.side ?? null,
+          action: order.action ?? null,
+          type: order.type ?? null,
+          status: order.status ?? null,
+          yes_price: order.yes_price ?? null,
+          no_price: order.no_price ?? null,
+          yes_price_dollars: order.yes_price_dollars ?? null,
+          no_price_dollars: order.no_price_dollars ?? null,
+          fill_count: order.fill_count ?? null,
+          fill_count_fp: order.fill_count_fp ?? null,
+          remaining_count: order.remaining_count ?? null,
+          remaining_count_fp: order.remaining_count_fp ?? null,
+          initial_count: order.initial_count ?? null,
+          initial_count_fp: order.initial_count_fp ?? null,
+          taker_fees: order.taker_fees ?? null,
+          maker_fees: order.maker_fees ?? null,
+          taker_fees_dollars: order.taker_fees_dollars ?? null,
+          maker_fees_dollars: order.maker_fees_dollars ?? null,
+          taker_fill_cost: order.taker_fill_cost ?? null,
+          maker_fill_cost: order.maker_fill_cost ?? null,
+          taker_fill_cost_dollars: order.taker_fill_cost_dollars ?? null,
+          maker_fill_cost_dollars: order.maker_fill_cost_dollars ?? null,
+          queue_position: order.queue_position ?? null,
+          expiration_time: order.expiration_time ?? null,
+          created_time: order.created_time ?? null,
+          last_update_time: order.last_update_time ?? null,
+          self_trade_prevention_type: order.self_trade_prevention_type ?? null,
+          order_group_id: order.order_group_id ?? null,
+          cancel_order_on_pause: order.cancel_order_on_pause ?? null,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    order: {
+      type: 'object',
+      description: 'Order object with full API response fields',
+      properties: {
+        order_id: { type: 'string', description: 'Order ID' },
+        user_id: { type: 'string', description: 'User ID' },
+        client_order_id: { type: 'string', description: 'Client order ID' },
+        ticker: { type: 'string', description: 'Market ticker' },
+        side: { type: 'string', description: 'Order side (yes/no)' },
+        action: { type: 'string', description: 'Action (buy/sell)' },
+        type: { type: 'string', description: 'Order type (limit/market)' },
+        status: { type: 'string', description: 'Order status (resting/canceled/executed)' },
+        yes_price: { type: 'number', description: 'Yes price in cents' },
+        no_price: { type: 'number', description: 'No price in cents' },
+        yes_price_dollars: { type: 'string', description: 'Yes price in dollars' },
+        no_price_dollars: { type: 'string', description: 'No price in dollars' },
+        fill_count: { type: 'number', description: 'Filled contract count' },
+        fill_count_fp: { type: 'string', description: 'Filled count (fixed-point)' },
+        remaining_count: { type: 'number', description: 'Remaining contracts' },
+        remaining_count_fp: { type: 'string', description: 'Remaining count (fixed-point)' },
+        initial_count: { type: 'number', description: 'Initial contract count' },
+        initial_count_fp: { type: 'string', description: 'Initial count (fixed-point)' },
+        taker_fees: { type: 'number', description: 'Taker fees in cents' },
+        maker_fees: { type: 'number', description: 'Maker fees in cents' },
+        taker_fees_dollars: { type: 'string', description: 'Taker fees in dollars' },
+        maker_fees_dollars: { type: 'string', description: 'Maker fees in dollars' },
+        taker_fill_cost: { type: 'number', description: 'Taker fill cost in cents' },
+        maker_fill_cost: { type: 'number', description: 'Maker fill cost in cents' },
+        taker_fill_cost_dollars: { type: 'string', description: 'Taker fill cost in dollars' },
+        maker_fill_cost_dollars: { type: 'string', description: 'Maker fill cost in dollars' },
+        queue_position: { type: 'number', description: 'Queue position (deprecated)' },
+        expiration_time: { type: 'string', description: 'Order expiration time' },
+        created_time: { type: 'string', description: 'Order creation time' },
+        last_update_time: { type: 'string', description: 'Last update time' },
+        self_trade_prevention_type: { type: 'string', description: 'Self-trade prevention type' },
+        order_group_id: { type: 'string', description: 'Order group ID' },
+        cancel_order_on_pause: { type: 'boolean', description: 'Cancel on market pause' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_orderbook.ts b/apps/sim/tools/kalshi/get_orderbook.ts
index 4f6ff0303..642c67f2d 100644
--- a/apps/sim/tools/kalshi/get_orderbook.ts
+++ b/apps/sim/tools/kalshi/get_orderbook.ts
@@ -63,3 +63,135 @@ export const kalshiGetOrderbookTool: ToolConfig<
     },
   },
 }
+
+/**
+ * V2 Get Orderbook Tool - Returns exact Kalshi API response structure with depth param
+ * API returns tuple arrays: [price, count] for orderbook, [dollars_string, count] for _dollars variants
+ */
+export interface KalshiGetOrderbookV2Params {
+  ticker: string
+  depth?: number // Number of price levels to return
+}
+
+export interface KalshiGetOrderbookV2Response {
+  success: boolean
+  output: {
+    orderbook: {
+      yes: Array<[number, number]> // [price_in_cents, count]
+      no: Array<[number, number]> // [price_in_cents, count]
+      yes_dollars: Array<[string, number]> // [dollars_string, count]
+      no_dollars: Array<[string, number]> // [dollars_string, count]
+    }
+    orderbook_fp: {
+      yes_dollars: Array<[string, string]> // [dollars_string, fp_count_string]
+      no_dollars: Array<[string, string]> // [dollars_string, fp_count_string]
+    }
+  }
+}
+
+export const kalshiGetOrderbookV2Tool: ToolConfig<
+  KalshiGetOrderbookV2Params,
+  KalshiGetOrderbookV2Response
+> = {
+  id: 'kalshi_get_orderbook_v2',
+  name: 'Get Market Orderbook from Kalshi V2',
+  description:
+    'Retrieve the orderbook (yes and no bids) for a specific market (V2 - includes depth and fp fields)',
+  version: '2.0.0',
+
+  params: {
+    ticker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Market ticker (e.g., KXBTC-24DEC31)',
+    },
+    depth: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of price levels to return (default: all)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.depth) queryParams.append('depth', params.depth.toString())
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl(`/markets/${params.ticker}/orderbook`)
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_orderbook_v2')
+    }
+
+    const orderbook = data.orderbook || {}
+    const orderbookFp = data.orderbook_fp || {}
+
+    return {
+      success: true,
+      output: {
+        orderbook: {
+          yes: orderbook.yes ?? [],
+          no: orderbook.no ?? [],
+          yes_dollars: orderbook.yes_dollars ?? [],
+          no_dollars: orderbook.no_dollars ?? [],
+        },
+        orderbook_fp: {
+          yes_dollars: orderbookFp.yes_dollars ?? [],
+          no_dollars: orderbookFp.no_dollars ?? [],
+        },
+      },
+    }
+  },
+
+  outputs: {
+    orderbook: {
+      type: 'object',
+      description: 'Orderbook with yes/no bids (legacy integer counts)',
+      properties: {
+        yes: {
+          type: 'array',
+          description: 'Yes side bids as tuples [price_cents, count]',
+        },
+        no: {
+          type: 'array',
+          description: 'No side bids as tuples [price_cents, count]',
+        },
+        yes_dollars: {
+          type: 'array',
+          description: 'Yes side bids as tuples [dollars_string, count]',
+        },
+        no_dollars: {
+          type: 'array',
+          description: 'No side bids as tuples [dollars_string, count]',
+        },
+      },
+    },
+    orderbook_fp: {
+      type: 'object',
+      description: 'Orderbook with fixed-point counts (preferred)',
+      properties: {
+        yes_dollars: {
+          type: 'array',
+          description: 'Yes side bids as tuples [dollars_string, fp_count_string]',
+        },
+        no_dollars: {
+          type: 'array',
+          description: 'No side bids as tuples [dollars_string, fp_count_string]',
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_orders.ts b/apps/sim/tools/kalshi/get_orders.ts
index 25f0a0243..e18d8f3fc 100644
--- a/apps/sim/tools/kalshi/get_orders.ts
+++ b/apps/sim/tools/kalshi/get_orders.ts
@@ -123,3 +123,250 @@ export const kalshiGetOrdersTool: ToolConfig<KalshiGetOrdersParams, KalshiGetOrd
     },
   },
 }
+
+export interface KalshiGetOrdersV2Params extends KalshiAuthParams, KalshiPaginationParams {
+  ticker?: string
+  eventTicker?: string
+  status?: string // resting, canceled, executed
+  minTs?: string // Minimum timestamp filter (Unix timestamp)
+  maxTs?: string // Maximum timestamp filter (Unix timestamp)
+  subaccount?: string // Subaccount to filter orders
+}
+
+export interface KalshiOrderV2 {
+  order_id: string
+  user_id: string | null
+  client_order_id: string | null
+  ticker: string
+  side: string
+  action: string
+  type: string
+  status: string
+  yes_price: number | null
+  no_price: number | null
+  yes_price_dollars: string | null
+  no_price_dollars: string | null
+  fill_count: number | null
+  fill_count_fp: string | null
+  remaining_count: number | null
+  remaining_count_fp: string | null
+  initial_count: number | null
+  initial_count_fp: string | null
+  taker_fees: number | null
+  maker_fees: number | null
+  taker_fees_dollars: string | null
+  maker_fees_dollars: string | null
+  taker_fill_cost: number | null
+  maker_fill_cost: number | null
+  taker_fill_cost_dollars: string | null
+  maker_fill_cost_dollars: string | null
+  queue_position: number | null
+  expiration_time: string | null
+  created_time: string | null
+  last_update_time: string | null
+  self_trade_prevention_type: string | null
+  order_group_id: string | null
+  cancel_order_on_pause: boolean | null
+}
+
+export interface KalshiGetOrdersV2Response {
+  success: boolean
+  output: {
+    orders: KalshiOrderV2[]
+    cursor: string | null
+  }
+}
+
+export const kalshiGetOrdersV2Tool: ToolConfig<KalshiGetOrdersV2Params, KalshiGetOrdersV2Response> =
+  {
+    id: 'kalshi_get_orders_v2',
+    name: 'Get Orders from Kalshi V2',
+    description:
+      'Retrieve your orders from Kalshi with optional filtering (V2 with full API response)',
+    version: '2.0.0',
+
+    params: {
+      keyId: {
+        type: 'string',
+        required: true,
+        visibility: 'user-only',
+        description: 'Your Kalshi API Key ID',
+      },
+      privateKey: {
+        type: 'string',
+        required: true,
+        visibility: 'user-only',
+        description: 'Your RSA Private Key (PEM format)',
+      },
+      ticker: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by market ticker',
+      },
+      eventTicker: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by event ticker (max 10 comma-separated)',
+      },
+      status: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by status (resting, canceled, executed)',
+      },
+      minTs: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Minimum timestamp filter (Unix timestamp)',
+      },
+      maxTs: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Maximum timestamp filter (Unix timestamp)',
+      },
+      subaccount: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Subaccount to filter orders',
+      },
+      limit: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Number of results (1-200, default: 100)',
+      },
+      cursor: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Pagination cursor for next page',
+      },
+    },
+
+    request: {
+      url: (params) => {
+        const queryParams = new URLSearchParams()
+        if (params.ticker) queryParams.append('ticker', params.ticker)
+        if (params.eventTicker) queryParams.append('event_ticker', params.eventTicker)
+        if (params.status) queryParams.append('status', params.status)
+        if (params.minTs) queryParams.append('min_ts', params.minTs)
+        if (params.maxTs) queryParams.append('max_ts', params.maxTs)
+        if (params.subaccount) queryParams.append('subaccount', params.subaccount)
+        if (params.limit) queryParams.append('limit', params.limit)
+        if (params.cursor) queryParams.append('cursor', params.cursor)
+
+        const query = queryParams.toString()
+        const url = buildKalshiUrl('/portfolio/orders')
+        return query ? `${url}?${query}` : url
+      },
+      method: 'GET',
+      headers: (params) => {
+        const path = '/trade-api/v2/portfolio/orders'
+        return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'GET', path)
+      },
+    },
+
+    transformResponse: async (response: Response) => {
+      const data = await response.json()
+
+      if (!response.ok) {
+        handleKalshiError(data, response.status, 'get_orders_v2')
+      }
+
+      const rawOrders = data.orders || []
+      const orders: KalshiOrderV2[] = rawOrders.map((order: any) => ({
+        order_id: order.order_id ?? null,
+        user_id: order.user_id ?? null,
+        client_order_id: order.client_order_id ?? null,
+        ticker: order.ticker ?? null,
+        side: order.side ?? null,
+        action: order.action ?? null,
+        type: order.type ?? null,
+        status: order.status ?? null,
+        yes_price: order.yes_price ?? null,
+        no_price: order.no_price ?? null,
+        yes_price_dollars: order.yes_price_dollars ?? null,
+        no_price_dollars: order.no_price_dollars ?? null,
+        fill_count: order.fill_count ?? null,
+        fill_count_fp: order.fill_count_fp ?? null,
+        remaining_count: order.remaining_count ?? null,
+        remaining_count_fp: order.remaining_count_fp ?? null,
+        initial_count: order.initial_count ?? null,
+        initial_count_fp: order.initial_count_fp ?? null,
+        taker_fees: order.taker_fees ?? null,
+        maker_fees: order.maker_fees ?? null,
+        taker_fees_dollars: order.taker_fees_dollars ?? null,
+        maker_fees_dollars: order.maker_fees_dollars ?? null,
+        taker_fill_cost: order.taker_fill_cost ?? null,
+        maker_fill_cost: order.maker_fill_cost ?? null,
+        taker_fill_cost_dollars: order.taker_fill_cost_dollars ?? null,
+        maker_fill_cost_dollars: order.maker_fill_cost_dollars ?? null,
+        queue_position: order.queue_position ?? null,
+        expiration_time: order.expiration_time ?? null,
+        created_time: order.created_time ?? null,
+        last_update_time: order.last_update_time ?? null,
+        self_trade_prevention_type: order.self_trade_prevention_type ?? null,
+        order_group_id: order.order_group_id ?? null,
+        cancel_order_on_pause: order.cancel_order_on_pause ?? null,
+      }))
+
+      return {
+        success: true,
+        output: {
+          orders,
+          cursor: data.cursor ?? null,
+        },
+      }
+    },
+
+    outputs: {
+      orders: {
+        type: 'array',
+        description: 'Array of order objects with full API response fields',
+        properties: {
+          order_id: { type: 'string', description: 'Order ID' },
+          user_id: { type: 'string', description: 'User ID' },
+          client_order_id: { type: 'string', description: 'Client order ID' },
+          ticker: { type: 'string', description: 'Market ticker' },
+          side: { type: 'string', description: 'Order side (yes/no)' },
+          action: { type: 'string', description: 'Action (buy/sell)' },
+          type: { type: 'string', description: 'Order type (limit/market)' },
+          status: { type: 'string', description: 'Order status (resting/canceled/executed)' },
+          yes_price: { type: 'number', description: 'Yes price in cents' },
+          no_price: { type: 'number', description: 'No price in cents' },
+          yes_price_dollars: { type: 'string', description: 'Yes price in dollars' },
+          no_price_dollars: { type: 'string', description: 'No price in dollars' },
+          fill_count: { type: 'number', description: 'Filled contract count' },
+          fill_count_fp: { type: 'string', description: 'Filled count (fixed-point)' },
+          remaining_count: { type: 'number', description: 'Remaining contracts' },
+          remaining_count_fp: { type: 'string', description: 'Remaining count (fixed-point)' },
+          initial_count: { type: 'number', description: 'Initial contract count' },
+          initial_count_fp: { type: 'string', description: 'Initial count (fixed-point)' },
+          taker_fees: { type: 'number', description: 'Taker fees in cents' },
+          maker_fees: { type: 'number', description: 'Maker fees in cents' },
+          taker_fees_dollars: { type: 'string', description: 'Taker fees in dollars' },
+          maker_fees_dollars: { type: 'string', description: 'Maker fees in dollars' },
+          taker_fill_cost: { type: 'number', description: 'Taker fill cost in cents' },
+          maker_fill_cost: { type: 'number', description: 'Maker fill cost in cents' },
+          taker_fill_cost_dollars: { type: 'string', description: 'Taker fill cost in dollars' },
+          maker_fill_cost_dollars: { type: 'string', description: 'Maker fill cost in dollars' },
+          queue_position: { type: 'number', description: 'Queue position (deprecated)' },
+          expiration_time: { type: 'string', description: 'Order expiration time' },
+          created_time: { type: 'string', description: 'Order creation time' },
+          last_update_time: { type: 'string', description: 'Last update time' },
+          self_trade_prevention_type: { type: 'string', description: 'Self-trade prevention type' },
+          order_group_id: { type: 'string', description: 'Order group ID' },
+          cancel_order_on_pause: { type: 'boolean', description: 'Cancel on market pause' },
+        },
+      },
+      cursor: {
+        type: 'string',
+        description: 'Pagination cursor for fetching more results',
+      },
+    },
+  }
diff --git a/apps/sim/tools/kalshi/get_positions.ts b/apps/sim/tools/kalshi/get_positions.ts
index 4dfa1573a..3cae27ef6 100644
--- a/apps/sim/tools/kalshi/get_positions.ts
+++ b/apps/sim/tools/kalshi/get_positions.ts
@@ -126,3 +126,195 @@ export const kalshiGetPositionsTool: ToolConfig<
     },
   },
 }
+
+/**
+ * V2 Params for Get Positions - removes invalid settlementStatus, adds countFilter and subaccount
+ */
+export interface KalshiGetPositionsV2Params extends KalshiAuthParams, KalshiPaginationParams {
+  ticker?: string
+  eventTicker?: string
+  countFilter?: string
+  subaccount?: string
+}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetPositionsV2Response {
+  success: boolean
+  output: {
+    market_positions: Array<{
+      ticker: string
+      event_ticker: string
+      event_title: string | null
+      market_title: string | null
+      position: number
+      market_exposure: number | null
+      realized_pnl: number | null
+      total_traded: number | null
+      resting_orders_count: number | null
+      fees_paid: number | null
+    }>
+    event_positions: Array<{
+      event_ticker: string
+      event_exposure: number
+      realized_pnl: number | null
+      total_cost: number | null
+    }> | null
+    cursor: string | null
+  }
+}
+
+export const kalshiGetPositionsV2Tool: ToolConfig<
+  KalshiGetPositionsV2Params,
+  KalshiGetPositionsV2Response
+> = {
+  id: 'kalshi_get_positions_v2',
+  name: 'Get Positions from Kalshi V2',
+  description: 'Retrieve your open positions from Kalshi (V2 - exact API response)',
+  version: '2.0.0',
+
+  params: {
+    keyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your Kalshi API Key ID',
+    },
+    privateKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Your RSA Private Key (PEM format)',
+    },
+    ticker: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by market ticker',
+    },
+    eventTicker: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by event ticker (max 10 comma-separated)',
+    },
+    countFilter: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by count (all, positive, negative). Default: all',
+    },
+    subaccount: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Subaccount to get positions for',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Number of results (1-1000, default: 100)',
+    },
+    cursor: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Pagination cursor for next page',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.ticker) queryParams.append('ticker', params.ticker)
+      if (params.eventTicker) queryParams.append('event_ticker', params.eventTicker)
+      if (params.countFilter) queryParams.append('count_filter', params.countFilter)
+      if (params.subaccount) queryParams.append('subaccount', params.subaccount)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.cursor) queryParams.append('cursor', params.cursor)
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl('/portfolio/positions')
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: (params) => {
+      const path = '/trade-api/v2/portfolio/positions'
+      return buildKalshiAuthHeaders(params.keyId, params.privateKey, 'GET', path)
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_positions_v2')
+    }
+
+    const marketPositions = (data.market_positions || []).map((p: Record<string, unknown>) => ({
+      ticker: p.ticker ?? null,
+      event_ticker: p.event_ticker ?? null,
+      event_title: p.event_title ?? null,
+      market_title: p.market_title ?? null,
+      position: p.position ?? 0,
+      market_exposure: p.market_exposure ?? null,
+      realized_pnl: p.realized_pnl ?? null,
+      total_traded: p.total_traded ?? null,
+      resting_orders_count: p.resting_orders_count ?? null,
+      fees_paid: p.fees_paid ?? null,
+    }))
+
+    const eventPositions = data.event_positions
+      ? (data.event_positions as Array<Record<string, unknown>>).map((p) => ({
+          event_ticker: (p.event_ticker as string) ?? '',
+          event_exposure: (p.event_exposure as number) ?? 0,
+          realized_pnl: (p.realized_pnl as number | null) ?? null,
+          total_cost: (p.total_cost as number | null) ?? null,
+        }))
+      : null
+
+    return {
+      success: true,
+      output: {
+        market_positions: marketPositions,
+        event_positions: eventPositions,
+        cursor: data.cursor ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    market_positions: {
+      type: 'array',
+      description: 'Array of market position objects',
+      properties: {
+        ticker: { type: 'string', description: 'Market ticker' },
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        event_title: { type: 'string', description: 'Event title' },
+        market_title: { type: 'string', description: 'Market title' },
+        position: { type: 'number', description: 'Position size' },
+        market_exposure: { type: 'number', description: 'Market exposure' },
+        realized_pnl: { type: 'number', description: 'Realized P&L' },
+        total_traded: { type: 'number', description: 'Total traded' },
+        resting_orders_count: { type: 'number', description: 'Resting orders count' },
+        fees_paid: { type: 'number', description: 'Fees paid' },
+      },
+    },
+    event_positions: {
+      type: 'array',
+      description: 'Array of event position objects',
+      properties: {
+        event_ticker: { type: 'string', description: 'Event ticker' },
+        event_exposure: { type: 'number', description: 'Event exposure' },
+        realized_pnl: { type: 'number', description: 'Realized P&L' },
+        total_cost: { type: 'number', description: 'Total cost' },
+      },
+    },
+    cursor: {
+      type: 'string',
+      description: 'Pagination cursor for fetching more results',
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_series_by_ticker.ts b/apps/sim/tools/kalshi/get_series_by_ticker.ts
index 781a48116..bbf070374 100644
--- a/apps/sim/tools/kalshi/get_series_by_ticker.ts
+++ b/apps/sim/tools/kalshi/get_series_by_ticker.ts
@@ -65,3 +65,141 @@ export const kalshiGetSeriesByTickerTool: ToolConfig<
     },
   },
 }
+
+/**
+ * V2 Params for Get Series by Ticker
+ */
+export interface KalshiGetSeriesByTickerV2Params {
+  seriesTicker: string
+  includeVolume?: string
+}
+
+/**
+ * V2 Response matching Kalshi API exactly
+ */
+export interface KalshiGetSeriesByTickerV2Response {
+  success: boolean
+  output: {
+    series: {
+      ticker: string
+      title: string
+      frequency: string
+      category: string
+      tags: string[] | null
+      settlement_sources: Array<{
+        name: string
+        url: string
+      }> | null
+      contract_url: string | null
+      contract_terms_url: string | null
+      fee_type: string | null
+      fee_multiplier: number | null
+      additional_prohibitions: string[] | null
+      product_metadata: Record<string, unknown> | null
+      volume: number | null
+      volume_fp: number | null
+    }
+  }
+}
+
+export const kalshiGetSeriesByTickerV2Tool: ToolConfig<
+  KalshiGetSeriesByTickerV2Params,
+  KalshiGetSeriesByTickerV2Response
+> = {
+  id: 'kalshi_get_series_by_ticker_v2',
+  name: 'Get Series by Ticker from Kalshi V2',
+  description: 'Retrieve details of a specific market series by ticker (V2 - exact API response)',
+  version: '2.0.0',
+
+  params: {
+    seriesTicker: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Series ticker',
+    },
+    includeVolume: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Include volume data in response (true/false)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.includeVolume) queryParams.append('include_volume', params.includeVolume)
+
+      const query = queryParams.toString()
+      const url = buildKalshiUrl(`/series/${params.seriesTicker}`)
+      return query ? `${url}?${query}` : url
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handleKalshiError(data, response.status, 'get_series_by_ticker_v2')
+    }
+
+    const series = data.series || data
+
+    const settlementSources = series.settlement_sources
+      ? (series.settlement_sources as Array<Record<string, unknown>>).map((s) => ({
+          name: (s.name as string) ?? null,
+          url: (s.url as string) ?? null,
+        }))
+      : null
+
+    return {
+      success: true,
+      output: {
+        series: {
+          ticker: series.ticker ?? null,
+          title: series.title ?? null,
+          frequency: series.frequency ?? null,
+          category: series.category ?? null,
+          tags: series.tags ?? null,
+          settlement_sources: settlementSources,
+          contract_url: series.contract_url ?? null,
+          contract_terms_url: series.contract_terms_url ?? null,
+          fee_type: series.fee_type ?? null,
+          fee_multiplier: series.fee_multiplier ?? null,
+          additional_prohibitions: series.additional_prohibitions ?? null,
+          product_metadata: series.product_metadata ?? null,
+          volume: series.volume ?? null,
+          volume_fp: series.volume_fp ?? null,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    series: {
+      type: 'object',
+      description: 'Series object with full details matching Kalshi API response',
+      properties: {
+        ticker: { type: 'string', description: 'Series ticker' },
+        title: { type: 'string', description: 'Series title' },
+        frequency: { type: 'string', description: 'Event frequency' },
+        category: { type: 'string', description: 'Series category' },
+        tags: { type: 'array', description: 'Series tags' },
+        settlement_sources: { type: 'array', description: 'Settlement sources' },
+        contract_url: { type: 'string', description: 'Contract URL' },
+        contract_terms_url: { type: 'string', description: 'Contract terms URL' },
+        fee_type: { type: 'string', description: 'Fee type' },
+        fee_multiplier: { type: 'number', description: 'Fee multiplier' },
+        additional_prohibitions: { type: 'array', description: 'Additional prohibitions' },
+        product_metadata: { type: 'object', description: 'Product metadata' },
+        volume: { type: 'number', description: 'Series volume' },
+        volume_fp: { type: 'number', description: 'Volume (fixed-point)' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/kalshi/get_trades.ts b/apps/sim/tools/kalshi/get_trades.ts
index 30fc268ae..5066e2d48 100644
--- a/apps/sim/tools/kalshi/get_trades.ts
+++ b/apps/sim/tools/kalshi/get_trades.ts
@@ -80,3 +80,138 @@ export const kalshiGetTradesTool: ToolConfig<KalshiGetTradesParams, KalshiGetTra
     },
   },
 }
+
+/**
+ * V2 Get Trades Tool - Returns exact Kalshi API response structure with additional params
+ */
+export interface KalshiGetTradesV2Params extends KalshiPaginationParams {
+  ticker?: string // Filter by market ticker
+  minTs?: number // Minimum timestamp (Unix seconds)
+  maxTs?: number // Maximum timestamp (Unix seconds)
+}
+
+export interface KalshiGetTradesV2Response {
+  success: boolean
+  output: {
+    trades: Array<{
+      trade_id: string | null
+      ticker: string
+      yes_price: number | null
+      no_price: number | null
+      count: number | null
+      count_fp: number | null
+      created_time: string | null
+      taker_side: string | null
+    }>
+    cursor: string | null
+  }
+}
+
+export const kalshiGetTradesV2Tool: ToolConfig<KalshiGetTradesV2Params, KalshiGetTradesV2Response> =
+  {
+    id: 'kalshi_get_trades_v2',
+    name: 'Get Trades from Kalshi V2',
+    description:
+      'Retrieve recent trades with additional filtering options (V2 - includes trade_id and count_fp)',
+    version: '2.0.0',
+
+    params: {
+      ticker: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Filter by market ticker',
+      },
+      minTs: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Minimum timestamp (Unix seconds)',
+      },
+      maxTs: {
+        type: 'number',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Maximum timestamp (Unix seconds)',
+      },
+      limit: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Number of results (1-1000, default: 100)',
+      },
+      cursor: {
+        type: 'string',
+        required: false,
+        visibility: 'user-or-llm',
+        description: 'Pagination cursor for next page',
+      },
+    },
+
+    request: {
+      url: (params) => {
+        const queryParams = new URLSearchParams()
+        if (params.ticker) queryParams.append('ticker', params.ticker)
+        if (params.minTs) queryParams.append('min_ts', params.minTs.toString())
+        if (params.maxTs) queryParams.append('max_ts', params.maxTs.toString())
+        if (params.limit) queryParams.append('limit', params.limit)
+        if (params.cursor) queryParams.append('cursor', params.cursor)
+
+        const query = queryParams.toString()
+        const url = buildKalshiUrl('/markets/trades')
+        return query ? `${url}?${query}` : url
+      },
+      method: 'GET',
+      headers: () => ({
+        'Content-Type': 'application/json',
+      }),
+    },
+
+    transformResponse: async (response: Response) => {
+      const data = await response.json()
+
+      if (!response.ok) {
+        handleKalshiError(data, response.status, 'get_trades_v2')
+      }
+
+      const trades = (data.trades || []).map((t: Record<string, unknown>) => ({
+        trade_id: t.trade_id ?? null,
+        ticker: t.ticker ?? null,
+        yes_price: t.yes_price ?? null,
+        no_price: t.no_price ?? null,
+        count: t.count ?? null,
+        count_fp: t.count_fp ?? null,
+        created_time: t.created_time ?? null,
+        taker_side: t.taker_side ?? null,
+      }))
+
+      return {
+        success: true,
+        output: {
+          trades,
+          cursor: data.cursor ?? null,
+        },
+      }
+    },
+
+    outputs: {
+      trades: {
+        type: 'array',
+        description: 'Array of trade objects with trade_id and count_fp',
+        properties: {
+          trade_id: { type: 'string', description: 'Trade ID' },
+          ticker: { type: 'string', description: 'Market ticker' },
+          yes_price: { type: 'number', description: 'Yes price' },
+          no_price: { type: 'number', description: 'No price' },
+          count: { type: 'number', description: 'Number of contracts' },
+          count_fp: { type: 'number', description: 'Count (fixed-point)' },
+          created_time: { type: 'string', description: 'Trade creation time' },
+          taker_side: { type: 'string', description: 'Taker side (yes/no)' },
+        },
+      },
+      cursor: {
+        type: 'string',
+        description: 'Pagination cursor for fetching more results',
+      },
+    },
+  }
diff --git a/apps/sim/tools/kalshi/index.ts b/apps/sim/tools/kalshi/index.ts
index 3b6cc2a17..122cee6fd 100644
--- a/apps/sim/tools/kalshi/index.ts
+++ b/apps/sim/tools/kalshi/index.ts
@@ -1,17 +1,17 @@
-export { kalshiAmendOrderTool } from './amend_order'
-export { kalshiCancelOrderTool } from './cancel_order'
-export { kalshiCreateOrderTool } from './create_order'
-export { kalshiGetBalanceTool } from './get_balance'
-export { kalshiGetCandlesticksTool } from './get_candlesticks'
-export { kalshiGetEventTool } from './get_event'
-export { kalshiGetEventsTool } from './get_events'
-export { kalshiGetExchangeStatusTool } from './get_exchange_status'
-export { kalshiGetFillsTool } from './get_fills'
-export { kalshiGetMarketTool } from './get_market'
-export { kalshiGetMarketsTool } from './get_markets'
-export { kalshiGetOrderTool } from './get_order'
-export { kalshiGetOrderbookTool } from './get_orderbook'
-export { kalshiGetOrdersTool } from './get_orders'
-export { kalshiGetPositionsTool } from './get_positions'
-export { kalshiGetSeriesByTickerTool } from './get_series_by_ticker'
-export { kalshiGetTradesTool } from './get_trades'
+export { kalshiAmendOrderTool, kalshiAmendOrderV2Tool } from './amend_order'
+export { kalshiCancelOrderTool, kalshiCancelOrderV2Tool } from './cancel_order'
+export { kalshiCreateOrderTool, kalshiCreateOrderV2Tool } from './create_order'
+export { kalshiGetBalanceTool, kalshiGetBalanceV2Tool } from './get_balance'
+export { kalshiGetCandlesticksTool, kalshiGetCandlesticksV2Tool } from './get_candlesticks'
+export { kalshiGetEventTool, kalshiGetEventV2Tool } from './get_event'
+export { kalshiGetEventsTool, kalshiGetEventsV2Tool } from './get_events'
+export { kalshiGetExchangeStatusTool, kalshiGetExchangeStatusV2Tool } from './get_exchange_status'
+export { kalshiGetFillsTool, kalshiGetFillsV2Tool } from './get_fills'
+export { kalshiGetMarketTool, kalshiGetMarketV2Tool } from './get_market'
+export { kalshiGetMarketsTool, kalshiGetMarketsV2Tool } from './get_markets'
+export { kalshiGetOrderTool, kalshiGetOrderV2Tool } from './get_order'
+export { kalshiGetOrderbookTool, kalshiGetOrderbookV2Tool } from './get_orderbook'
+export { kalshiGetOrdersTool, kalshiGetOrdersV2Tool } from './get_orders'
+export { kalshiGetPositionsTool, kalshiGetPositionsV2Tool } from './get_positions'
+export { kalshiGetSeriesByTickerTool, kalshiGetSeriesByTickerV2Tool } from './get_series_by_ticker'
+export { kalshiGetTradesTool, kalshiGetTradesV2Tool } from './get_trades'
diff --git a/apps/sim/tools/polymarket/get_activity.ts b/apps/sim/tools/polymarket/get_activity.ts
new file mode 100644
index 000000000..33a4daa34
--- /dev/null
+++ b/apps/sim/tools/polymarket/get_activity.ts
@@ -0,0 +1,206 @@
+import type { ToolConfig } from '@/tools/types'
+import type { PolymarketActivity } from './types'
+import { buildDataUrl, handlePolymarketError } from './types'
+
+export interface PolymarketGetActivityParams {
+  user: string
+  limit?: string
+  offset?: string
+  market?: string
+  eventId?: string
+  type?: string
+  start?: number
+  end?: number
+  sortBy?: string
+  sortDirection?: string
+  side?: string
+}
+
+export interface PolymarketGetActivityResponse {
+  success: boolean
+  output: {
+    activity: PolymarketActivity[]
+  }
+}
+
+export const polymarketGetActivityTool: ToolConfig<
+  PolymarketGetActivityParams,
+  PolymarketGetActivityResponse
+> = {
+  id: 'polymarket_get_activity',
+  name: 'Get Activity from Polymarket',
+  description:
+    'Retrieve on-chain activity for a user including trades, splits, merges, redemptions, rewards, and conversions',
+  version: '1.0.0',
+
+  params: {
+    user: {
+      type: 'string',
+      required: true,
+      description: 'User wallet address (0x-prefixed)',
+      visibility: 'user-or-llm',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      description: 'Maximum results (default: 100, max: 500)',
+      visibility: 'user-or-llm',
+    },
+    offset: {
+      type: 'string',
+      required: false,
+      description: 'Pagination offset (default: 0, max: 10000)',
+      visibility: 'user-or-llm',
+    },
+    market: {
+      type: 'string',
+      required: false,
+      description: 'Comma-separated condition IDs (mutually exclusive with eventId)',
+      visibility: 'user-or-llm',
+    },
+    eventId: {
+      type: 'string',
+      required: false,
+      description: 'Comma-separated event IDs (mutually exclusive with market)',
+      visibility: 'user-or-llm',
+    },
+    type: {
+      type: 'string',
+      required: false,
+      description:
+        'Activity type filter: TRADE, SPLIT, MERGE, REDEEM, REWARD, CONVERSION, MAKER_REBATE',
+      visibility: 'user-or-llm',
+    },
+    start: {
+      type: 'number',
+      required: false,
+      description: 'Start timestamp (Unix seconds)',
+      visibility: 'user-or-llm',
+    },
+    end: {
+      type: 'number',
+      required: false,
+      description: 'End timestamp (Unix seconds)',
+      visibility: 'user-or-llm',
+    },
+    sortBy: {
+      type: 'string',
+      required: false,
+      description: 'Sort field: TIMESTAMP, TOKENS, or CASH (default: TIMESTAMP)',
+      visibility: 'user-or-llm',
+    },
+    sortDirection: {
+      type: 'string',
+      required: false,
+      description: 'Sort direction: ASC or DESC (default: DESC)',
+      visibility: 'user-or-llm',
+    },
+    side: {
+      type: 'string',
+      required: false,
+      description: 'Trade side filter: BUY or SELL (only applies to trades)',
+      visibility: 'user-or-llm',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      queryParams.append('user', params.user)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.offset) queryParams.append('offset', params.offset)
+      if (params.market) queryParams.append('market', params.market)
+      if (params.eventId) queryParams.append('eventId', params.eventId)
+      if (params.type) queryParams.append('type', params.type)
+      if (params.start != null && !Number.isNaN(params.start))
+        queryParams.append('start', String(params.start))
+      if (params.end != null && !Number.isNaN(params.end))
+        queryParams.append('end', String(params.end))
+      if (params.sortBy) queryParams.append('sortBy', params.sortBy)
+      if (params.sortDirection) queryParams.append('sortDirection', params.sortDirection)
+      if (params.side) queryParams.append('side', params.side)
+      return `${buildDataUrl('/activity')}?${queryParams.toString()}`
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handlePolymarketError(data, response.status, 'get_activity')
+    }
+
+    const activityList = Array.isArray(data) ? data : []
+
+    const activity: PolymarketActivity[] = activityList.map((a: any) => ({
+      proxyWallet: a.proxyWallet ?? null,
+      timestamp: a.timestamp ?? 0,
+      conditionId: a.conditionId ?? '',
+      type: a.type ?? '',
+      size: a.size ?? 0,
+      usdcSize: a.usdcSize ?? 0,
+      transactionHash: a.transactionHash ?? null,
+      price: a.price ?? null,
+      asset: a.asset ?? null,
+      side: a.side ?? null,
+      outcomeIndex: a.outcomeIndex ?? null,
+      title: a.title ?? null,
+      slug: a.slug ?? null,
+      icon: a.icon ?? null,
+      eventSlug: a.eventSlug ?? null,
+      outcome: a.outcome ?? null,
+      name: a.name ?? null,
+      pseudonym: a.pseudonym ?? null,
+      bio: a.bio ?? null,
+      profileImage: a.profileImage ?? null,
+      profileImageOptimized: a.profileImageOptimized ?? null,
+    }))
+
+    return {
+      success: true,
+      output: {
+        activity,
+      },
+    }
+  },
+
+  outputs: {
+    activity: {
+      type: 'array',
+      description: 'Array of activity entries',
+      items: {
+        type: 'object',
+        properties: {
+          proxyWallet: { type: 'string', description: 'User proxy wallet address' },
+          timestamp: { type: 'number', description: 'Unix timestamp of activity' },
+          conditionId: { type: 'string', description: 'Market condition ID' },
+          type: {
+            type: 'string',
+            description: 'Activity type (TRADE, SPLIT, MERGE, REDEEM, REWARD, CONVERSION)',
+          },
+          size: { type: 'number', description: 'Size in tokens' },
+          usdcSize: { type: 'number', description: 'Size in USDC' },
+          transactionHash: { type: 'string', description: 'Blockchain transaction hash' },
+          price: { type: 'number', description: 'Price (for trades)' },
+          asset: { type: 'string', description: 'Asset/token ID' },
+          side: { type: 'string', description: 'Trade side (BUY/SELL)' },
+          outcomeIndex: { type: 'number', description: 'Outcome index' },
+          title: { type: 'string', description: 'Market title' },
+          slug: { type: 'string', description: 'Market slug' },
+          icon: { type: 'string', description: 'Market icon URL' },
+          eventSlug: { type: 'string', description: 'Event slug' },
+          outcome: { type: 'string', description: 'Outcome name' },
+          name: { type: 'string', description: 'User display name' },
+          pseudonym: { type: 'string', description: 'User pseudonym' },
+          bio: { type: 'string', description: 'User bio' },
+          profileImage: { type: 'string', description: 'User profile image URL' },
+          profileImageOptimized: { type: 'string', description: 'Optimized profile image URL' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/polymarket/get_event.ts b/apps/sim/tools/polymarket/get_event.ts
index c1dd86512..037f22687 100644
--- a/apps/sim/tools/polymarket/get_event.ts
+++ b/apps/sim/tools/polymarket/get_event.ts
@@ -71,6 +71,26 @@ export const polymarketGetEventTool: ToolConfig<
     event: {
       type: 'object',
       description: 'Event object with details',
+      properties: {
+        id: { type: 'string', description: 'Event ID' },
+        ticker: { type: 'string', description: 'Event ticker' },
+        slug: { type: 'string', description: 'Event slug' },
+        title: { type: 'string', description: 'Event title' },
+        description: { type: 'string', description: 'Event description' },
+        startDate: { type: 'string', description: 'Start date' },
+        creationDate: { type: 'string', description: 'Creation date' },
+        endDate: { type: 'string', description: 'End date' },
+        image: { type: 'string', description: 'Event image URL' },
+        icon: { type: 'string', description: 'Event icon URL' },
+        active: { type: 'boolean', description: 'Whether event is active' },
+        closed: { type: 'boolean', description: 'Whether event is closed' },
+        archived: { type: 'boolean', description: 'Whether event is archived' },
+        liquidity: { type: 'number', description: 'Total liquidity' },
+        volume: { type: 'number', description: 'Total volume' },
+        openInterest: { type: 'number', description: 'Open interest' },
+        commentCount: { type: 'number', description: 'Comment count' },
+        markets: { type: 'array', description: 'Array of markets in this event' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_events.ts b/apps/sim/tools/polymarket/get_events.ts
index b603948ff..8eb9e5d92 100644
--- a/apps/sim/tools/polymarket/get_events.ts
+++ b/apps/sim/tools/polymarket/get_events.ts
@@ -3,10 +3,10 @@ import type { PolymarketEvent, PolymarketPaginationParams } from './types'
 import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetEventsParams extends PolymarketPaginationParams {
-  closed?: string // 'true' or 'false' - filter for closed/active events
-  order?: string // sort field (e.g., 'volume', 'liquidity', 'startDate', 'endDate')
-  ascending?: string // 'true' or 'false' - sort direction
-  tagId?: string // filter by tag ID
+  closed?: string
+  order?: string
+  ascending?: string
+  tagId?: string
 }
 
 export interface PolymarketGetEventsResponse {
@@ -29,7 +29,7 @@ export const polymarketGetEventsTool: ToolConfig<
     closed: {
       type: 'string',
       required: false,
-      description: 'Filter by closed status (true/false). Use false for active events only.',
+      description: 'Filter by closed status (true/false). Use false for open events only.',
       visibility: 'user-or-llm',
     },
     order: {
@@ -71,13 +71,11 @@ export const polymarketGetEventsTool: ToolConfig<
       if (params.order) queryParams.append('order', params.order)
       if (params.ascending) queryParams.append('ascending', params.ascending)
       if (params.tagId) queryParams.append('tag_id', params.tagId)
-      // Default limit to 50 to prevent browser crashes from large data sets
       queryParams.append('limit', params.limit || '50')
       if (params.offset) queryParams.append('offset', params.offset)
 
-      const query = queryParams.toString()
       const url = buildGammaUrl('/events')
-      return `${url}?${query}`
+      return `${url}?${queryParams.toString()}`
     },
     method: 'GET',
     headers: () => ({
@@ -92,7 +90,6 @@ export const polymarketGetEventsTool: ToolConfig<
       handlePolymarketError(data, response.status, 'get_events')
     }
 
-    // Response is an array of events
     const events = Array.isArray(data) ? data : []
 
     return {
@@ -107,6 +104,26 @@ export const polymarketGetEventsTool: ToolConfig<
     events: {
       type: 'array',
       description: 'Array of event objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Event ID' },
+          ticker: { type: 'string', description: 'Event ticker' },
+          slug: { type: 'string', description: 'Event slug' },
+          title: { type: 'string', description: 'Event title' },
+          description: { type: 'string', description: 'Event description' },
+          startDate: { type: 'string', description: 'Start date' },
+          endDate: { type: 'string', description: 'End date' },
+          image: { type: 'string', description: 'Event image URL' },
+          icon: { type: 'string', description: 'Event icon URL' },
+          active: { type: 'boolean', description: 'Whether event is active' },
+          closed: { type: 'boolean', description: 'Whether event is closed' },
+          archived: { type: 'boolean', description: 'Whether event is archived' },
+          liquidity: { type: 'number', description: 'Total liquidity' },
+          volume: { type: 'number', description: 'Total volume' },
+          markets: { type: 'array', description: 'Array of markets in this event' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_holders.ts b/apps/sim/tools/polymarket/get_holders.ts
new file mode 100644
index 000000000..197ea2a22
--- /dev/null
+++ b/apps/sim/tools/polymarket/get_holders.ts
@@ -0,0 +1,132 @@
+import type { ToolConfig } from '@/tools/types'
+import type { PolymarketMarketHolders } from './types'
+import { buildDataUrl, handlePolymarketError } from './types'
+
+export interface PolymarketGetHoldersParams {
+  market: string
+  limit?: string
+  minBalance?: string
+}
+
+export interface PolymarketGetHoldersResponse {
+  success: boolean
+  output: {
+    holders: PolymarketMarketHolders[]
+  }
+}
+
+export const polymarketGetHoldersTool: ToolConfig<
+  PolymarketGetHoldersParams,
+  PolymarketGetHoldersResponse
+> = {
+  id: 'polymarket_get_holders',
+  name: 'Get Market Holders from Polymarket',
+  description: 'Retrieve top holders of a specific market token',
+  version: '1.0.0',
+
+  params: {
+    market: {
+      type: 'string',
+      required: true,
+      description: 'Comma-separated list of condition IDs',
+      visibility: 'user-or-llm',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      description: 'Number of holders to return (0-20, default: 20)',
+      visibility: 'user-or-llm',
+    },
+    minBalance: {
+      type: 'string',
+      required: false,
+      description: 'Minimum balance threshold (default: 1)',
+      visibility: 'user-or-llm',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      queryParams.append('market', params.market)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.minBalance) queryParams.append('minBalance', params.minBalance)
+      return `${buildDataUrl('/holders')}?${queryParams.toString()}`
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handlePolymarketError(data, response.status, 'get_holders')
+    }
+
+    const marketHolders = Array.isArray(data) ? data : []
+
+    const holders: PolymarketMarketHolders[] = marketHolders.map((mh: any) => ({
+      token: mh.token ?? '',
+      holders: (mh.holders ?? []).map((h: any) => ({
+        proxyWallet: h.proxyWallet ?? '',
+        bio: h.bio ?? null,
+        asset: h.asset ?? '',
+        pseudonym: h.pseudonym ?? null,
+        amount: h.amount ?? 0,
+        displayUsernamePublic: h.displayUsernamePublic ?? false,
+        outcomeIndex: h.outcomeIndex ?? 0,
+        name: h.name ?? null,
+        profileImage: h.profileImage ?? null,
+        profileImageOptimized: h.profileImageOptimized ?? null,
+      })),
+    }))
+
+    return {
+      success: true,
+      output: {
+        holders,
+      },
+    }
+  },
+
+  outputs: {
+    holders: {
+      type: 'array',
+      description: 'Array of market holder groups by token',
+      items: {
+        type: 'object',
+        properties: {
+          token: { type: 'string', description: 'Token/asset ID' },
+          holders: {
+            type: 'array',
+            description: 'Array of holders for this token',
+            items: {
+              type: 'object',
+              properties: {
+                proxyWallet: { type: 'string', description: 'Holder wallet address' },
+                bio: { type: 'string', description: 'Holder bio' },
+                asset: { type: 'string', description: 'Asset ID' },
+                pseudonym: { type: 'string', description: 'Holder pseudonym' },
+                amount: { type: 'number', description: 'Amount held' },
+                displayUsernamePublic: {
+                  type: 'boolean',
+                  description: 'Whether username is publicly displayed',
+                },
+                outcomeIndex: { type: 'number', description: 'Outcome index' },
+                name: { type: 'string', description: 'Holder display name' },
+                profileImage: { type: 'string', description: 'Profile image URL' },
+                profileImageOptimized: {
+                  type: 'string',
+                  description: 'Optimized profile image URL',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/polymarket/get_last_trade_price.ts b/apps/sim/tools/polymarket/get_last_trade_price.ts
index 3280e0f03..d429bec08 100644
--- a/apps/sim/tools/polymarket/get_last_trade_price.ts
+++ b/apps/sim/tools/polymarket/get_last_trade_price.ts
@@ -9,6 +9,7 @@ export interface PolymarketGetLastTradePriceResponse {
   success: boolean
   output: {
     price: string
+    side: string
   }
 }
 
@@ -52,7 +53,8 @@ export const polymarketGetLastTradePriceTool: ToolConfig<
     return {
       success: true,
       output: {
-        price: typeof data === 'string' ? data : data.price || '',
+        price: data.price ?? '',
+        side: data.side ?? '',
       },
     }
   },
@@ -62,5 +64,9 @@ export const polymarketGetLastTradePriceTool: ToolConfig<
       type: 'string',
       description: 'Last trade price',
     },
+    side: {
+      type: 'string',
+      description: 'Side of the last trade (BUY or SELL)',
+    },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_leaderboard.ts b/apps/sim/tools/polymarket/get_leaderboard.ts
new file mode 100644
index 000000000..039f3e83e
--- /dev/null
+++ b/apps/sim/tools/polymarket/get_leaderboard.ts
@@ -0,0 +1,143 @@
+import type { ToolConfig } from '@/tools/types'
+import type { PolymarketLeaderboardEntry } from './types'
+import { buildDataUrl, handlePolymarketError } from './types'
+
+export interface PolymarketGetLeaderboardParams {
+  category?: string
+  timePeriod?: string
+  orderBy?: string
+  limit?: string
+  offset?: string
+  user?: string
+  userName?: string
+}
+
+export interface PolymarketGetLeaderboardResponse {
+  success: boolean
+  output: {
+    leaderboard: PolymarketLeaderboardEntry[]
+  }
+}
+
+export const polymarketGetLeaderboardTool: ToolConfig<
+  PolymarketGetLeaderboardParams,
+  PolymarketGetLeaderboardResponse
+> = {
+  id: 'polymarket_get_leaderboard',
+  name: 'Get Leaderboard from Polymarket',
+  description: 'Retrieve trader leaderboard rankings by profit/loss or volume',
+  version: '1.0.0',
+
+  params: {
+    category: {
+      type: 'string',
+      required: false,
+      description:
+        'Category filter: OVERALL, POLITICS, SPORTS, CRYPTO, CULTURE, MENTIONS, WEATHER, ECONOMICS, TECH, FINANCE (default: OVERALL)',
+      visibility: 'user-or-llm',
+    },
+    timePeriod: {
+      type: 'string',
+      required: false,
+      description: 'Time period: DAY, WEEK, MONTH, ALL (default: DAY)',
+      visibility: 'user-or-llm',
+    },
+    orderBy: {
+      type: 'string',
+      required: false,
+      description: 'Order by: PNL or VOL (default: PNL)',
+      visibility: 'user-or-llm',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      description: 'Number of results (1-50, default: 25)',
+      visibility: 'user-or-llm',
+    },
+    offset: {
+      type: 'string',
+      required: false,
+      description: 'Pagination offset (0-1000, default: 0)',
+      visibility: 'user-or-llm',
+    },
+    user: {
+      type: 'string',
+      required: false,
+      description: 'Filter by specific user wallet address',
+      visibility: 'user-or-llm',
+    },
+    userName: {
+      type: 'string',
+      required: false,
+      description: 'Filter by username',
+      visibility: 'user-or-llm',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const queryParams = new URLSearchParams()
+      if (params.category) queryParams.append('category', params.category)
+      if (params.timePeriod) queryParams.append('timePeriod', params.timePeriod)
+      if (params.orderBy) queryParams.append('orderBy', params.orderBy)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.offset) queryParams.append('offset', params.offset)
+      if (params.user) queryParams.append('user', params.user)
+      if (params.userName) queryParams.append('userName', params.userName)
+      const query = queryParams.toString()
+      return query ? `${buildDataUrl('/v1/leaderboard')}?${query}` : buildDataUrl('/v1/leaderboard')
+    },
+    method: 'GET',
+    headers: () => ({
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      handlePolymarketError(data, response.status, 'get_leaderboard')
+    }
+
+    const entries = Array.isArray(data) ? data : []
+
+    const leaderboard: PolymarketLeaderboardEntry[] = entries.map((entry: any) => ({
+      rank: entry.rank ?? '',
+      proxyWallet: entry.proxyWallet ?? '',
+      userName: entry.userName ?? null,
+      vol: entry.vol ?? 0,
+      pnl: entry.pnl ?? 0,
+      profileImage: entry.profileImage ?? null,
+      xUsername: entry.xUsername ?? null,
+      verifiedBadge: entry.verifiedBadge ?? false,
+    }))
+
+    return {
+      success: true,
+      output: {
+        leaderboard,
+      },
+    }
+  },
+
+  outputs: {
+    leaderboard: {
+      type: 'array',
+      description: 'Array of leaderboard entries',
+      items: {
+        type: 'object',
+        properties: {
+          rank: { type: 'string', description: 'Leaderboard rank position' },
+          proxyWallet: { type: 'string', description: 'User proxy wallet address' },
+          userName: { type: 'string', description: 'User display name' },
+          vol: { type: 'number', description: 'Trading volume' },
+          pnl: { type: 'number', description: 'Profit and loss' },
+          profileImage: { type: 'string', description: 'User profile image URL' },
+          xUsername: { type: 'string', description: 'Twitter/X username' },
+          verifiedBadge: { type: 'boolean', description: 'Whether user has verified badge' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/polymarket/get_market.ts b/apps/sim/tools/polymarket/get_market.ts
index 1c4e9c27b..606bff4f6 100644
--- a/apps/sim/tools/polymarket/get_market.ts
+++ b/apps/sim/tools/polymarket/get_market.ts
@@ -71,6 +71,30 @@ export const polymarketGetMarketTool: ToolConfig<
     market: {
       type: 'object',
       description: 'Market object with details',
+      properties: {
+        id: { type: 'string', description: 'Market ID' },
+        question: { type: 'string', description: 'Market question' },
+        conditionId: { type: 'string', description: 'Condition ID' },
+        slug: { type: 'string', description: 'Market slug' },
+        resolutionSource: { type: 'string', description: 'Resolution source' },
+        endDate: { type: 'string', description: 'End date' },
+        startDate: { type: 'string', description: 'Start date' },
+        image: { type: 'string', description: 'Market image URL' },
+        icon: { type: 'string', description: 'Market icon URL' },
+        description: { type: 'string', description: 'Market description' },
+        outcomes: { type: 'string', description: 'Outcomes JSON string' },
+        outcomePrices: { type: 'string', description: 'Outcome prices JSON string' },
+        volume: { type: 'string', description: 'Total volume' },
+        liquidity: { type: 'string', description: 'Total liquidity' },
+        active: { type: 'boolean', description: 'Whether market is active' },
+        closed: { type: 'boolean', description: 'Whether market is closed' },
+        archived: { type: 'boolean', description: 'Whether market is archived' },
+        volumeNum: { type: 'number', description: 'Volume as number' },
+        liquidityNum: { type: 'number', description: 'Liquidity as number' },
+        clobTokenIds: { type: 'array', description: 'CLOB token IDs' },
+        acceptingOrders: { type: 'boolean', description: 'Whether accepting orders' },
+        negRisk: { type: 'boolean', description: 'Whether negative risk' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_markets.ts b/apps/sim/tools/polymarket/get_markets.ts
index 2183113ed..9a480e0a4 100644
--- a/apps/sim/tools/polymarket/get_markets.ts
+++ b/apps/sim/tools/polymarket/get_markets.ts
@@ -3,10 +3,10 @@ import type { PolymarketMarket, PolymarketPaginationParams } from './types'
 import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetMarketsParams extends PolymarketPaginationParams {
-  closed?: string // 'true' or 'false' - filter for closed/active markets
-  order?: string // sort field - use camelCase (e.g., 'volumeNum', 'liquidityNum', 'startDate', 'endDate')
-  ascending?: string // 'true' or 'false' - sort direction
-  tagId?: string // filter by tag ID
+  closed?: string
+  order?: string
+  ascending?: string
+  tagId?: string
 }
 
 export interface PolymarketGetMarketsResponse {
@@ -29,7 +29,7 @@ export const polymarketGetMarketsTool: ToolConfig<
     closed: {
       type: 'string',
       required: false,
-      description: 'Filter by closed status (true/false). Use false for active markets only.',
+      description: 'Filter by closed status (true/false). Use false for open markets only.',
       visibility: 'user-or-llm',
     },
     order: {
@@ -71,13 +71,11 @@ export const polymarketGetMarketsTool: ToolConfig<
       if (params.order) queryParams.append('order', params.order)
       if (params.ascending) queryParams.append('ascending', params.ascending)
       if (params.tagId) queryParams.append('tag_id', params.tagId)
-      // Default limit to 50 to prevent browser crashes from large data sets
       queryParams.append('limit', params.limit || '50')
       if (params.offset) queryParams.append('offset', params.offset)
 
-      const query = queryParams.toString()
       const url = buildGammaUrl('/markets')
-      return `${url}?${query}`
+      return `${url}?${queryParams.toString()}`
     },
     method: 'GET',
     headers: () => ({
@@ -107,6 +105,26 @@ export const polymarketGetMarketsTool: ToolConfig<
     markets: {
       type: 'array',
       description: 'Array of market objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Market ID' },
+          question: { type: 'string', description: 'Market question' },
+          conditionId: { type: 'string', description: 'Condition ID' },
+          slug: { type: 'string', description: 'Market slug' },
+          endDate: { type: 'string', description: 'End date' },
+          image: { type: 'string', description: 'Market image URL' },
+          outcomes: { type: 'string', description: 'Outcomes JSON string' },
+          outcomePrices: { type: 'string', description: 'Outcome prices JSON string' },
+          volume: { type: 'string', description: 'Total volume' },
+          liquidity: { type: 'string', description: 'Total liquidity' },
+          active: { type: 'boolean', description: 'Whether market is active' },
+          closed: { type: 'boolean', description: 'Whether market is closed' },
+          volumeNum: { type: 'number', description: 'Volume as number' },
+          liquidityNum: { type: 'number', description: 'Liquidity as number' },
+          clobTokenIds: { type: 'array', description: 'CLOB token IDs' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_orderbook.ts b/apps/sim/tools/polymarket/get_orderbook.ts
index 90a95d9b6..6bd400fe6 100644
--- a/apps/sim/tools/polymarket/get_orderbook.ts
+++ b/apps/sim/tools/polymarket/get_orderbook.ts
@@ -50,10 +50,22 @@ export const polymarketGetOrderbookTool: ToolConfig<
       handlePolymarketError(data, response.status, 'get_orderbook')
     }
 
+    const orderbook: PolymarketOrderBook = {
+      market: data.market ?? '',
+      asset_id: data.asset_id ?? '',
+      hash: data.hash ?? '',
+      timestamp: data.timestamp ?? '',
+      bids: data.bids ?? [],
+      asks: data.asks ?? [],
+      min_order_size: data.min_order_size ?? '0',
+      tick_size: data.tick_size ?? '0',
+      neg_risk: data.neg_risk ?? false,
+    }
+
     return {
       success: true,
       output: {
-        orderbook: data,
+        orderbook,
       },
     }
   },
@@ -62,6 +74,37 @@ export const polymarketGetOrderbookTool: ToolConfig<
     orderbook: {
       type: 'object',
       description: 'Order book with bids and asks arrays',
+      properties: {
+        market: { type: 'string', description: 'Market identifier' },
+        asset_id: { type: 'string', description: 'Asset token ID' },
+        hash: { type: 'string', description: 'Order book hash' },
+        timestamp: { type: 'string', description: 'Timestamp' },
+        bids: {
+          type: 'array',
+          description: 'Bid orders',
+          items: {
+            type: 'object',
+            properties: {
+              price: { type: 'string', description: 'Bid price' },
+              size: { type: 'string', description: 'Bid size' },
+            },
+          },
+        },
+        asks: {
+          type: 'array',
+          description: 'Ask orders',
+          items: {
+            type: 'object',
+            properties: {
+              price: { type: 'string', description: 'Ask price' },
+              size: { type: 'string', description: 'Ask size' },
+            },
+          },
+        },
+        min_order_size: { type: 'string', description: 'Minimum order size' },
+        tick_size: { type: 'string', description: 'Tick size' },
+        neg_risk: { type: 'boolean', description: 'Whether negative risk' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_positions.ts b/apps/sim/tools/polymarket/get_positions.ts
index bbeda1909..0968b59b2 100644
--- a/apps/sim/tools/polymarket/get_positions.ts
+++ b/apps/sim/tools/polymarket/get_positions.ts
@@ -3,8 +3,17 @@ import type { PolymarketPosition } from './types'
 import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetPositionsParams {
-  user: string // Wallet address (required)
-  market?: string // Optional market filter
+  user: string
+  market?: string
+  eventId?: string
+  sizeThreshold?: string
+  redeemable?: string
+  mergeable?: string
+  sortBy?: string
+  sortDirection?: string
+  title?: string
+  limit?: string
+  offset?: string
 }
 
 export interface PolymarketGetPositionsResponse {
@@ -33,7 +42,63 @@ export const polymarketGetPositionsTool: ToolConfig<
     market: {
       type: 'string',
       required: false,
-      description: 'Optional market ID to filter positions',
+      description:
+        'Condition IDs to filter positions (comma-separated, mutually exclusive with eventId)',
+      visibility: 'user-or-llm',
+    },
+    eventId: {
+      type: 'string',
+      required: false,
+      description: 'Event ID to filter positions (mutually exclusive with market)',
+      visibility: 'user-or-llm',
+    },
+    sizeThreshold: {
+      type: 'string',
+      required: false,
+      description: 'Minimum position size threshold (default: 1)',
+      visibility: 'user-or-llm',
+    },
+    redeemable: {
+      type: 'string',
+      required: false,
+      description: 'Filter for redeemable positions only (true/false)',
+      visibility: 'user-or-llm',
+    },
+    mergeable: {
+      type: 'string',
+      required: false,
+      description: 'Filter for mergeable positions only (true/false)',
+      visibility: 'user-or-llm',
+    },
+    sortBy: {
+      type: 'string',
+      required: false,
+      description:
+        'Sort field (TOKENS, CURRENT, INITIAL, CASHPNL, PERCENTPNL, TITLE, RESOLVING, PRICE, AVGPRICE)',
+      visibility: 'user-or-llm',
+    },
+    sortDirection: {
+      type: 'string',
+      required: false,
+      description: 'Sort direction (ASC or DESC)',
+      visibility: 'user-or-llm',
+    },
+    title: {
+      type: 'string',
+      required: false,
+      description: 'Search filter by title',
+      visibility: 'user-or-llm',
+    },
+    limit: {
+      type: 'string',
+      required: false,
+      description: 'Number of results per page',
+      visibility: 'user-or-llm',
+    },
+    offset: {
+      type: 'string',
+      required: false,
+      description: 'Pagination offset',
       visibility: 'user-or-llm',
     },
   },
@@ -43,6 +108,15 @@ export const polymarketGetPositionsTool: ToolConfig<
       const queryParams = new URLSearchParams()
       queryParams.append('user', params.user)
       if (params.market) queryParams.append('market', params.market)
+      if (params.eventId) queryParams.append('eventId', params.eventId)
+      if (params.sizeThreshold) queryParams.append('sizeThreshold', params.sizeThreshold)
+      if (params.redeemable) queryParams.append('redeemable', params.redeemable)
+      if (params.mergeable) queryParams.append('mergeable', params.mergeable)
+      if (params.sortBy) queryParams.append('sortBy', params.sortBy)
+      if (params.sortDirection) queryParams.append('sortDirection', params.sortDirection)
+      if (params.title) queryParams.append('title', params.title)
+      if (params.limit) queryParams.append('limit', params.limit)
+      if (params.offset) queryParams.append('offset', params.offset)
 
       return `${buildDataUrl('/positions')}?${queryParams.toString()}`
     },
@@ -59,8 +133,34 @@ export const polymarketGetPositionsTool: ToolConfig<
       handlePolymarketError(data, response.status, 'get_positions')
     }
 
-    // Response is an array of positions
-    const positions = Array.isArray(data) ? data : []
+    const rawPositions = Array.isArray(data) ? data : []
+    const positions: PolymarketPosition[] = rawPositions.map((p: Record<string, unknown>) => ({
+      proxyWallet: (p.proxyWallet as string) ?? null,
+      asset: (p.asset as string) ?? '',
+      conditionId: (p.conditionId as string) ?? '',
+      size: (p.size as number) ?? 0,
+      avgPrice: (p.avgPrice as number) ?? 0,
+      initialValue: (p.initialValue as number) ?? 0,
+      currentValue: (p.currentValue as number) ?? 0,
+      cashPnl: (p.cashPnl as number) ?? 0,
+      percentPnl: (p.percentPnl as number) ?? 0,
+      totalBought: (p.totalBought as number) ?? 0,
+      realizedPnl: (p.realizedPnl as number) ?? 0,
+      percentRealizedPnl: (p.percentRealizedPnl as number) ?? 0,
+      curPrice: (p.curPrice as number) ?? 0,
+      redeemable: (p.redeemable as boolean) ?? false,
+      mergeable: (p.mergeable as boolean) ?? false,
+      title: (p.title as string) ?? null,
+      slug: (p.slug as string) ?? null,
+      icon: (p.icon as string) ?? null,
+      eventSlug: (p.eventSlug as string) ?? null,
+      outcome: (p.outcome as string) ?? null,
+      outcomeIndex: (p.outcomeIndex as number) ?? null,
+      oppositeOutcome: (p.oppositeOutcome as string) ?? null,
+      oppositeAsset: (p.oppositeAsset as string) ?? null,
+      endDate: (p.endDate as string) ?? null,
+      negativeRisk: (p.negativeRisk as boolean) ?? false,
+    }))
 
     return {
       success: true,
@@ -74,6 +174,36 @@ export const polymarketGetPositionsTool: ToolConfig<
     positions: {
       type: 'array',
       description: 'Array of position objects',
+      items: {
+        type: 'object',
+        properties: {
+          proxyWallet: { type: 'string', description: 'Proxy wallet address' },
+          asset: { type: 'string', description: 'Asset token ID' },
+          conditionId: { type: 'string', description: 'Condition ID' },
+          size: { type: 'number', description: 'Position size' },
+          avgPrice: { type: 'number', description: 'Average price' },
+          initialValue: { type: 'number', description: 'Initial value' },
+          currentValue: { type: 'number', description: 'Current value' },
+          cashPnl: { type: 'number', description: 'Cash profit/loss' },
+          percentPnl: { type: 'number', description: 'Percent profit/loss' },
+          totalBought: { type: 'number', description: 'Total bought' },
+          realizedPnl: { type: 'number', description: 'Realized profit/loss' },
+          percentRealizedPnl: { type: 'number', description: 'Percent realized profit/loss' },
+          curPrice: { type: 'number', description: 'Current price' },
+          redeemable: { type: 'boolean', description: 'Whether position is redeemable' },
+          mergeable: { type: 'boolean', description: 'Whether position is mergeable' },
+          title: { type: 'string', description: 'Market title' },
+          slug: { type: 'string', description: 'Market slug' },
+          icon: { type: 'string', description: 'Market icon URL' },
+          eventSlug: { type: 'string', description: 'Event slug' },
+          outcome: { type: 'string', description: 'Outcome name' },
+          outcomeIndex: { type: 'number', description: 'Outcome index' },
+          oppositeOutcome: { type: 'string', description: 'Opposite outcome name' },
+          oppositeAsset: { type: 'string', description: 'Opposite asset token ID' },
+          endDate: { type: 'string', description: 'End date' },
+          negativeRisk: { type: 'boolean', description: 'Whether negative risk' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_price_history.ts b/apps/sim/tools/polymarket/get_price_history.ts
index e7ed1b330..0c258cda4 100644
--- a/apps/sim/tools/polymarket/get_price_history.ts
+++ b/apps/sim/tools/polymarket/get_price_history.ts
@@ -99,7 +99,14 @@ export const polymarketGetPriceHistoryTool: ToolConfig<
   outputs: {
     history: {
       type: 'array',
-      description: 'Array of price history entries with timestamp (t) and price (p)',
+      description: 'Array of price history entries',
+      items: {
+        type: 'object',
+        properties: {
+          t: { type: 'number', description: 'Unix timestamp' },
+          p: { type: 'number', description: 'Price at timestamp' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_series.ts b/apps/sim/tools/polymarket/get_series.ts
index a3d528ecc..1c61fe1d2 100644
--- a/apps/sim/tools/polymarket/get_series.ts
+++ b/apps/sim/tools/polymarket/get_series.ts
@@ -97,6 +97,26 @@ export const polymarketGetSeriesTool: ToolConfig<
     series: {
       type: 'array',
       description: 'Array of series objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Series ID' },
+          ticker: { type: 'string', description: 'Series ticker' },
+          slug: { type: 'string', description: 'Series slug' },
+          title: { type: 'string', description: 'Series title' },
+          seriesType: { type: 'string', description: 'Series type' },
+          recurrence: { type: 'string', description: 'Recurrence pattern' },
+          image: { type: 'string', description: 'Series image URL' },
+          icon: { type: 'string', description: 'Series icon URL' },
+          active: { type: 'boolean', description: 'Whether series is active' },
+          closed: { type: 'boolean', description: 'Whether series is closed' },
+          archived: { type: 'boolean', description: 'Whether series is archived' },
+          featured: { type: 'boolean', description: 'Whether series is featured' },
+          volume: { type: 'number', description: 'Total volume' },
+          liquidity: { type: 'number', description: 'Total liquidity' },
+          eventCount: { type: 'number', description: 'Number of events in series' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_series_by_id.ts b/apps/sim/tools/polymarket/get_series_by_id.ts
index 4904a46f5..f1a1101a3 100644
--- a/apps/sim/tools/polymarket/get_series_by_id.ts
+++ b/apps/sim/tools/polymarket/get_series_by_id.ts
@@ -58,6 +58,25 @@ export const polymarketGetSeriesByIdTool: ToolConfig<
     series: {
       type: 'object',
       description: 'Series object with details',
+      properties: {
+        id: { type: 'string', description: 'Series ID' },
+        ticker: { type: 'string', description: 'Series ticker' },
+        slug: { type: 'string', description: 'Series slug' },
+        title: { type: 'string', description: 'Series title' },
+        seriesType: { type: 'string', description: 'Series type' },
+        recurrence: { type: 'string', description: 'Recurrence pattern' },
+        image: { type: 'string', description: 'Series image URL' },
+        icon: { type: 'string', description: 'Series icon URL' },
+        active: { type: 'boolean', description: 'Whether series is active' },
+        closed: { type: 'boolean', description: 'Whether series is closed' },
+        archived: { type: 'boolean', description: 'Whether series is archived' },
+        featured: { type: 'boolean', description: 'Whether series is featured' },
+        volume: { type: 'number', description: 'Total volume' },
+        liquidity: { type: 'number', description: 'Total liquidity' },
+        commentCount: { type: 'number', description: 'Comment count' },
+        eventCount: { type: 'number', description: 'Number of events in series' },
+        events: { type: 'array', description: 'Array of events in this series' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_spread.ts b/apps/sim/tools/polymarket/get_spread.ts
index 80c2c5519..73a210352 100644
--- a/apps/sim/tools/polymarket/get_spread.ts
+++ b/apps/sim/tools/polymarket/get_spread.ts
@@ -53,7 +53,9 @@ export const polymarketGetSpreadTool: ToolConfig<
     return {
       success: true,
       output: {
-        spread: data,
+        spread: {
+          spread: data.spread ?? '',
+        },
       },
     }
   },
@@ -61,7 +63,10 @@ export const polymarketGetSpreadTool: ToolConfig<
   outputs: {
     spread: {
       type: 'object',
-      description: 'Bid-ask spread with bid and ask prices',
+      description: 'Spread value between bid and ask',
+      properties: {
+        spread: { type: 'string', description: 'The spread value' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/get_tags.ts b/apps/sim/tools/polymarket/get_tags.ts
index 1b492eaba..a2af8ddf9 100644
--- a/apps/sim/tools/polymarket/get_tags.ts
+++ b/apps/sim/tools/polymarket/get_tags.ts
@@ -71,7 +71,17 @@ export const polymarketGetTagsTool: ToolConfig<PolymarketGetTagsParams, Polymark
     outputs: {
       tags: {
         type: 'array',
-        description: 'Array of tag objects with id, label, and slug',
+        description: 'Array of tag objects',
+        items: {
+          type: 'object',
+          properties: {
+            id: { type: 'string', description: 'Tag ID' },
+            label: { type: 'string', description: 'Tag label' },
+            slug: { type: 'string', description: 'Tag slug' },
+            createdAt: { type: 'string', description: 'Creation timestamp' },
+            updatedAt: { type: 'string', description: 'Last update timestamp' },
+          },
+        },
       },
     },
   }
diff --git a/apps/sim/tools/polymarket/get_trades.ts b/apps/sim/tools/polymarket/get_trades.ts
index b3ff0160c..fe0f7893d 100644
--- a/apps/sim/tools/polymarket/get_trades.ts
+++ b/apps/sim/tools/polymarket/get_trades.ts
@@ -1,10 +1,17 @@
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPaginationParams, PolymarketTrade } from './types'
+import type { PolymarketTrade } from './types'
 import { buildDataUrl, handlePolymarketError } from './types'
 
-export interface PolymarketGetTradesParams extends PolymarketPaginationParams {
-  user?: string // Optional user wallet address
-  market?: string // Optional market filter
+export interface PolymarketGetTradesParams {
+  user?: string
+  market?: string
+  eventId?: string
+  side?: string
+  takerOnly?: string
+  filterType?: string
+  filterAmount?: string
+  limit?: string
+  offset?: string
 }
 
 export interface PolymarketGetTradesResponse {
@@ -33,13 +40,43 @@ export const polymarketGetTradesTool: ToolConfig<
     market: {
       type: 'string',
       required: false,
-      description: 'Market ID to filter trades',
+      description: 'Market/condition ID to filter trades (mutually exclusive with eventId)',
+      visibility: 'user-or-llm',
+    },
+    eventId: {
+      type: 'string',
+      required: false,
+      description: 'Event ID to filter trades (mutually exclusive with market)',
+      visibility: 'user-or-llm',
+    },
+    side: {
+      type: 'string',
+      required: false,
+      description: 'Trade direction filter (BUY or SELL)',
+      visibility: 'user-or-llm',
+    },
+    takerOnly: {
+      type: 'string',
+      required: false,
+      description: 'Filter for taker trades only (true/false, default: true)',
+      visibility: 'user-or-llm',
+    },
+    filterType: {
+      type: 'string',
+      required: false,
+      description: 'Filter type (CASH or TOKENS) - requires filterAmount',
+      visibility: 'user-or-llm',
+    },
+    filterAmount: {
+      type: 'string',
+      required: false,
+      description: 'Filter amount threshold - requires filterType',
       visibility: 'user-or-llm',
     },
     limit: {
       type: 'string',
       required: false,
-      description: 'Number of results per page (max 50)',
+      description: 'Number of results per page (default: 100, max: 10000)',
       visibility: 'user-or-llm',
     },
     offset: {
@@ -55,13 +92,16 @@ export const polymarketGetTradesTool: ToolConfig<
       const queryParams = new URLSearchParams()
       if (params.user) queryParams.append('user', params.user)
       if (params.market) queryParams.append('market', params.market)
-      // Default limit to 50 to prevent browser crashes from large data sets
-      queryParams.append('limit', params.limit || '50')
+      if (params.eventId) queryParams.append('eventId', params.eventId)
+      if (params.side) queryParams.append('side', params.side.toUpperCase())
+      if (params.takerOnly) queryParams.append('takerOnly', params.takerOnly)
+      if (params.filterType) queryParams.append('filterType', params.filterType.toUpperCase())
+      if (params.filterAmount) queryParams.append('filterAmount', params.filterAmount)
+      if (params.limit) queryParams.append('limit', params.limit)
       if (params.offset) queryParams.append('offset', params.offset)
 
-      const query = queryParams.toString()
       const url = buildDataUrl('/trades')
-      return `${url}?${query}`
+      return `${url}?${queryParams.toString()}`
     },
     method: 'GET',
     headers: () => ({
@@ -76,8 +116,28 @@ export const polymarketGetTradesTool: ToolConfig<
       handlePolymarketError(data, response.status, 'get_trades')
     }
 
-    // Response is an array of trades
-    const trades = Array.isArray(data) ? data : []
+    const rawTrades = Array.isArray(data) ? data : []
+    const trades: PolymarketTrade[] = rawTrades.map((t: Record<string, unknown>) => ({
+      proxyWallet: (t.proxyWallet as string) ?? null,
+      side: (t.side as string) ?? '',
+      asset: (t.asset as string) ?? '',
+      conditionId: (t.conditionId as string) ?? '',
+      size: (t.size as number) ?? 0,
+      price: (t.price as number) ?? 0,
+      timestamp: (t.timestamp as number) ?? 0,
+      title: (t.title as string) ?? null,
+      slug: (t.slug as string) ?? null,
+      icon: (t.icon as string) ?? null,
+      eventSlug: (t.eventSlug as string) ?? null,
+      outcome: (t.outcome as string) ?? null,
+      outcomeIndex: (t.outcomeIndex as number) ?? null,
+      name: (t.name as string) ?? null,
+      pseudonym: (t.pseudonym as string) ?? null,
+      bio: (t.bio as string) ?? null,
+      profileImage: (t.profileImage as string) ?? null,
+      profileImageOptimized: (t.profileImageOptimized as string) ?? null,
+      transactionHash: (t.transactionHash as string) ?? null,
+    }))
 
     return {
       success: true,
@@ -91,6 +151,30 @@ export const polymarketGetTradesTool: ToolConfig<
     trades: {
       type: 'array',
       description: 'Array of trade objects',
+      items: {
+        type: 'object',
+        properties: {
+          proxyWallet: { type: 'string', description: 'Proxy wallet address' },
+          side: { type: 'string', description: 'Trade side (BUY or SELL)' },
+          asset: { type: 'string', description: 'Asset token ID' },
+          conditionId: { type: 'string', description: 'Condition ID' },
+          size: { type: 'number', description: 'Trade size' },
+          price: { type: 'number', description: 'Trade price' },
+          timestamp: { type: 'number', description: 'Unix timestamp' },
+          title: { type: 'string', description: 'Market title' },
+          slug: { type: 'string', description: 'Market slug' },
+          icon: { type: 'string', description: 'Market icon URL' },
+          eventSlug: { type: 'string', description: 'Event slug' },
+          outcome: { type: 'string', description: 'Outcome name' },
+          outcomeIndex: { type: 'number', description: 'Outcome index' },
+          name: { type: 'string', description: 'Trader name' },
+          pseudonym: { type: 'string', description: 'Trader pseudonym' },
+          bio: { type: 'string', description: 'Trader bio' },
+          profileImage: { type: 'string', description: 'Profile image URL' },
+          profileImageOptimized: { type: 'string', description: 'Optimized profile image URL' },
+          transactionHash: { type: 'string', description: 'Transaction hash' },
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/index.ts b/apps/sim/tools/polymarket/index.ts
index a52e9ac37..80727214a 100644
--- a/apps/sim/tools/polymarket/index.ts
+++ b/apps/sim/tools/polymarket/index.ts
@@ -1,6 +1,9 @@
+export * from './get_activity'
 export * from './get_event'
 export * from './get_events'
+export * from './get_holders'
 export * from './get_last_trade_price'
+export * from './get_leaderboard'
 export * from './get_market'
 export * from './get_markets'
 export * from './get_midpoint'
diff --git a/apps/sim/tools/polymarket/search.ts b/apps/sim/tools/polymarket/search.ts
index 87a03ca41..c3b9c48aa 100644
--- a/apps/sim/tools/polymarket/search.ts
+++ b/apps/sim/tools/polymarket/search.ts
@@ -1,9 +1,22 @@
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPaginationParams, PolymarketSearchResult } from './types'
+import type { PolymarketSearchResult } from './types'
 import { buildGammaUrl, handlePolymarketError } from './types'
 
-export interface PolymarketSearchParams extends PolymarketPaginationParams {
-  query: string // Search term (required)
+export interface PolymarketSearchParams {
+  query: string
+  limit?: string
+  page?: string
+  cache?: string
+  eventsStatus?: string
+  limitPerType?: string
+  eventsTag?: string
+  sort?: string
+  ascending?: string
+  searchTags?: string
+  searchProfiles?: string
+  recurrence?: string
+  excludeTagId?: string
+  keepClosedMarkets?: string
 }
 
 export interface PolymarketSearchResponse {
@@ -32,10 +45,76 @@ export const polymarketSearchTool: ToolConfig<PolymarketSearchParams, Polymarket
       description: 'Number of results per page (max 50)',
       visibility: 'user-or-llm',
     },
-    offset: {
+    page: {
       type: 'string',
       required: false,
-      description: 'Pagination offset',
+      description: 'Page number for pagination (1-indexed)',
+      visibility: 'user-or-llm',
+    },
+    cache: {
+      type: 'string',
+      required: false,
+      description: 'Enable caching (true/false)',
+      visibility: 'user-or-llm',
+    },
+    eventsStatus: {
+      type: 'string',
+      required: false,
+      description: 'Filter events by status',
+      visibility: 'user-or-llm',
+    },
+    limitPerType: {
+      type: 'string',
+      required: false,
+      description: 'Limit results per type (markets, events, profiles)',
+      visibility: 'user-or-llm',
+    },
+    eventsTag: {
+      type: 'string',
+      required: false,
+      description: 'Filter by event tags (comma-separated)',
+      visibility: 'user-or-llm',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      description: 'Sort field',
+      visibility: 'user-or-llm',
+    },
+    ascending: {
+      type: 'string',
+      required: false,
+      description: 'Sort direction (true for ascending, false for descending)',
+      visibility: 'user-or-llm',
+    },
+    searchTags: {
+      type: 'string',
+      required: false,
+      description: 'Include tags in search results (true/false)',
+      visibility: 'user-or-llm',
+    },
+    searchProfiles: {
+      type: 'string',
+      required: false,
+      description: 'Include profiles in search results (true/false)',
+      visibility: 'user-or-llm',
+    },
+    recurrence: {
+      type: 'string',
+      required: false,
+      description: 'Filter by recurrence type',
+      visibility: 'user-or-llm',
+    },
+    excludeTagId: {
+      type: 'string',
+      required: false,
+      description: 'Exclude events with these tag IDs (comma-separated)',
+      visibility: 'user-or-llm',
+    },
+    keepClosedMarkets: {
+      type: 'string',
+      required: false,
+      description: 'Include closed markets in results (0 or 1)',
       visibility: 'user-or-llm',
     },
   },
@@ -44,9 +123,20 @@ export const polymarketSearchTool: ToolConfig<PolymarketSearchParams, Polymarket
     url: (params) => {
       const queryParams = new URLSearchParams()
       queryParams.append('q', params.query)
-      // Default limit to 50 to prevent browser crashes from large data sets
       queryParams.append('limit', params.limit || '50')
-      if (params.offset) queryParams.append('offset', params.offset)
+      if (params.page) queryParams.append('page', params.page)
+      if (params.cache) queryParams.append('cache', params.cache)
+      if (params.eventsStatus) queryParams.append('events_status', params.eventsStatus)
+      if (params.limitPerType) queryParams.append('limit_per_type', params.limitPerType)
+      if (params.eventsTag) queryParams.append('events_tag', params.eventsTag)
+      if (params.sort) queryParams.append('sort', params.sort)
+      if (params.ascending) queryParams.append('ascending', params.ascending)
+      if (params.searchTags) queryParams.append('search_tags', params.searchTags)
+      if (params.searchProfiles) queryParams.append('search_profiles', params.searchProfiles)
+      if (params.recurrence) queryParams.append('recurrence', params.recurrence)
+      if (params.excludeTagId) queryParams.append('exclude_tag_id', params.excludeTagId)
+      if (params.keepClosedMarkets)
+        queryParams.append('keep_closed_markets', params.keepClosedMarkets)
 
       return `${buildGammaUrl('/public-search')}?${queryParams.toString()}`
     },
@@ -63,11 +153,11 @@ export const polymarketSearchTool: ToolConfig<PolymarketSearchParams, Polymarket
       handlePolymarketError(data, response.status, 'search')
     }
 
-    // Response contains markets, events, and profiles arrays
     const results: PolymarketSearchResult = {
-      markets: data.markets || [],
-      events: data.events || [],
-      profiles: data.profiles || [],
+      markets: data.markets ?? [],
+      events: data.events ?? [],
+      tags: data.tags ?? [],
+      profiles: data.profiles ?? [],
     }
 
     return {
@@ -81,7 +171,13 @@ export const polymarketSearchTool: ToolConfig<PolymarketSearchParams, Polymarket
   outputs: {
     results: {
       type: 'object',
-      description: 'Search results containing markets, events, and profiles arrays',
+      description: 'Search results containing markets, events, tags, and profiles arrays',
+      properties: {
+        markets: { type: 'array', description: 'Array of matching market objects' },
+        events: { type: 'array', description: 'Array of matching event objects' },
+        tags: { type: 'array', description: 'Array of matching tag objects' },
+        profiles: { type: 'array', description: 'Array of matching profile objects' },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/polymarket/types.ts b/apps/sim/tools/polymarket/types.ts
index 63c5e5d55..5842aec78 100644
--- a/apps/sim/tools/polymarket/types.ts
+++ b/apps/sim/tools/polymarket/types.ts
@@ -92,6 +92,11 @@ export interface PolymarketTag {
   id: string
   label: string
   slug: string
+  createdAt?: string
+  updatedAt?: string
+  forceShow?: boolean
+  forceHide?: boolean
+  isCarousel?: boolean
 }
 
 export interface PolymarketOrderBookEntry {
@@ -106,11 +111,13 @@ export interface PolymarketOrderBook {
   timestamp: string
   bids: PolymarketOrderBookEntry[]
   asks: PolymarketOrderBookEntry[]
+  min_order_size: string
+  tick_size: string
+  neg_risk: boolean
 }
 
 export interface PolymarketPrice {
   price: string
-  side: string
 }
 
 export interface PolymarketPriceHistoryEntry {
@@ -143,31 +150,125 @@ export interface PolymarketSeries {
 export interface PolymarketSearchResult {
   markets: PolymarketMarket[]
   events: PolymarketEvent[]
-  profiles: any[]
+  tags: PolymarketTag[]
+  profiles: PolymarketProfile[]
+}
+
+export interface PolymarketProfile {
+  id: string
+  name: string | null
+  pseudonym: string | null
+  bio: string | null
+  profileImage: string | null
+  profileImageOptimized: string | null
+  walletAddress: string
 }
 
 export interface PolymarketSpread {
-  bid: string
-  ask: string
+  spread: string
 }
 
 export interface PolymarketPosition {
-  market: string
-  asset_id: string
-  size: string
-  value: string
+  proxyWallet: string | null
+  asset: string
+  conditionId: string
+  size: number
+  avgPrice: number
+  initialValue: number
+  currentValue: number
+  cashPnl: number
+  percentPnl: number
+  totalBought: number
+  realizedPnl: number
+  percentRealizedPnl: number
+  curPrice: number
+  redeemable: boolean
+  mergeable: boolean
+  title: string | null
+  slug: string | null
+  icon: string | null
+  eventSlug: string | null
+  outcome: string | null
+  outcomeIndex: number | null
+  oppositeOutcome: string | null
+  oppositeAsset: string | null
+  endDate: string | null
+  negativeRisk: boolean
 }
 
 export interface PolymarketTrade {
-  id: string
-  market: string
-  asset_id: string
+  proxyWallet: string | null
   side: string
-  size: string
-  price: string
-  timestamp: string
-  maker: string
-  taker: string
+  asset: string
+  conditionId: string
+  size: number
+  price: number
+  timestamp: number
+  title: string | null
+  slug: string | null
+  icon: string | null
+  eventSlug: string | null
+  outcome: string | null
+  outcomeIndex: number | null
+  name: string | null
+  pseudonym: string | null
+  bio: string | null
+  profileImage: string | null
+  profileImageOptimized: string | null
+  transactionHash: string | null
+}
+
+export interface PolymarketActivity {
+  proxyWallet: string | null
+  timestamp: number
+  conditionId: string
+  type: string
+  size: number
+  usdcSize: number
+  transactionHash: string | null
+  price: number | null
+  asset: string | null
+  side: string | null
+  outcomeIndex: number | null
+  title: string | null
+  slug: string | null
+  icon: string | null
+  eventSlug: string | null
+  outcome: string | null
+  name: string | null
+  pseudonym: string | null
+  bio: string | null
+  profileImage: string | null
+  profileImageOptimized: string | null
+}
+
+export interface PolymarketLeaderboardEntry {
+  rank: string
+  proxyWallet: string
+  userName: string | null
+  vol: number
+  pnl: number
+  profileImage: string | null
+  xUsername: string | null
+  verifiedBadge: boolean
+}
+
+export interface PolymarketHolder {
+  proxyWallet: string
+  bio: string | null
+  asset: string
+  pseudonym: string | null
+  amount: number
+  displayUsernamePublic: boolean
+  outcomeIndex: number
+  name: string | null
+  profileImage: string | null
+  profileImageOptimized: string | null
+}
+
+export interface PolymarketMarketHolders {
+  token: string
+  holders: PolymarketHolder[]
 }
 
 export function handlePolymarketError(data: any, status: number, operation: string): never {
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index c8a51881e..30665b721 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -746,22 +746,39 @@ import {
 } from '@/tools/jsm'
 import {
   kalshiAmendOrderTool,
+  kalshiAmendOrderV2Tool,
   kalshiCancelOrderTool,
+  kalshiCancelOrderV2Tool,
   kalshiCreateOrderTool,
+  kalshiCreateOrderV2Tool,
   kalshiGetBalanceTool,
+  kalshiGetBalanceV2Tool,
   kalshiGetCandlesticksTool,
+  kalshiGetCandlesticksV2Tool,
   kalshiGetEventsTool,
+  kalshiGetEventsV2Tool,
   kalshiGetEventTool,
+  kalshiGetEventV2Tool,
   kalshiGetExchangeStatusTool,
+  kalshiGetExchangeStatusV2Tool,
   kalshiGetFillsTool,
+  kalshiGetFillsV2Tool,
   kalshiGetMarketsTool,
+  kalshiGetMarketsV2Tool,
   kalshiGetMarketTool,
+  kalshiGetMarketV2Tool,
   kalshiGetOrderbookTool,
+  kalshiGetOrderbookV2Tool,
   kalshiGetOrdersTool,
+  kalshiGetOrdersV2Tool,
   kalshiGetOrderTool,
+  kalshiGetOrderV2Tool,
   kalshiGetPositionsTool,
+  kalshiGetPositionsV2Tool,
   kalshiGetSeriesByTickerTool,
+  kalshiGetSeriesByTickerV2Tool,
   kalshiGetTradesTool,
+  kalshiGetTradesV2Tool,
 } from '@/tools/kalshi'
 import {
   knowledgeCreateDocumentTool,
@@ -1072,9 +1089,12 @@ import {
   pipedriveUpdateLeadTool,
 } from '@/tools/pipedrive'
 import {
+  polymarketGetActivityTool,
   polymarketGetEventsTool,
   polymarketGetEventTool,
+  polymarketGetHoldersTool,
   polymarketGetLastTradePriceTool,
+  polymarketGetLeaderboardTool,
   polymarketGetMarketsTool,
   polymarketGetMarketTool,
   polymarketGetMidpointTool,
@@ -1815,22 +1835,39 @@ export const tools: Record<string, ToolConfig> = {
   jsm_get_approvals: jsmGetApprovalsTool,
   jsm_answer_approval: jsmAnswerApprovalTool,
   kalshi_get_markets: kalshiGetMarketsTool,
+  kalshi_get_markets_v2: kalshiGetMarketsV2Tool,
   kalshi_get_market: kalshiGetMarketTool,
+  kalshi_get_market_v2: kalshiGetMarketV2Tool,
   kalshi_get_events: kalshiGetEventsTool,
+  kalshi_get_events_v2: kalshiGetEventsV2Tool,
   kalshi_get_event: kalshiGetEventTool,
+  kalshi_get_event_v2: kalshiGetEventV2Tool,
   kalshi_get_balance: kalshiGetBalanceTool,
+  kalshi_get_balance_v2: kalshiGetBalanceV2Tool,
   kalshi_get_positions: kalshiGetPositionsTool,
+  kalshi_get_positions_v2: kalshiGetPositionsV2Tool,
   kalshi_get_orders: kalshiGetOrdersTool,
+  kalshi_get_orders_v2: kalshiGetOrdersV2Tool,
   kalshi_get_order: kalshiGetOrderTool,
+  kalshi_get_order_v2: kalshiGetOrderV2Tool,
   kalshi_get_orderbook: kalshiGetOrderbookTool,
+  kalshi_get_orderbook_v2: kalshiGetOrderbookV2Tool,
   kalshi_get_trades: kalshiGetTradesTool,
+  kalshi_get_trades_v2: kalshiGetTradesV2Tool,
   kalshi_get_candlesticks: kalshiGetCandlesticksTool,
+  kalshi_get_candlesticks_v2: kalshiGetCandlesticksV2Tool,
   kalshi_get_fills: kalshiGetFillsTool,
+  kalshi_get_fills_v2: kalshiGetFillsV2Tool,
   kalshi_get_series_by_ticker: kalshiGetSeriesByTickerTool,
+  kalshi_get_series_by_ticker_v2: kalshiGetSeriesByTickerV2Tool,
   kalshi_get_exchange_status: kalshiGetExchangeStatusTool,
+  kalshi_get_exchange_status_v2: kalshiGetExchangeStatusV2Tool,
   kalshi_create_order: kalshiCreateOrderTool,
+  kalshi_create_order_v2: kalshiCreateOrderV2Tool,
   kalshi_cancel_order: kalshiCancelOrderTool,
+  kalshi_cancel_order_v2: kalshiCancelOrderV2Tool,
   kalshi_amend_order: kalshiAmendOrderTool,
+  kalshi_amend_order_v2: kalshiAmendOrderV2Tool,
   polymarket_get_markets: polymarketGetMarketsTool,
   polymarket_get_market: polymarketGetMarketTool,
   polymarket_get_events: polymarketGetEventsTool,
@@ -1848,6 +1885,9 @@ export const tools: Record<string, ToolConfig> = {
   polymarket_get_tick_size: polymarketGetTickSizeTool,
   polymarket_get_positions: polymarketGetPositionsTool,
   polymarket_get_trades: polymarketGetTradesTool,
+  polymarket_get_activity: polymarketGetActivityTool,
+  polymarket_get_leaderboard: polymarketGetLeaderboardTool,
+  polymarket_get_holders: polymarketGetHoldersTool,
   slack_message: slackMessageTool,
   slack_message_reader: slackMessageReaderTool,
   slack_list_channels: slackListChannelsTool,

From 46ba3157017bde65e832e28eea38d276b9befd04 Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Mon, 26 Jan 2026 21:41:44 -0800
Subject: [PATCH 18/18] feat(tools): added more intercom tools (#3022)

---
 apps/docs/content/docs/en/tools/intercom.mdx  | 372 ++++++++++
 .../execution-snapshot/execution-snapshot.tsx |   9 +-
 apps/sim/blocks/blocks/intercom.ts            | 683 +++++++++++++++++-
 .../sim/tools/intercom/assign_conversation.ts | 146 ++++
 .../intercom/attach_contact_to_company.ts     | 115 +++
 apps/sim/tools/intercom/close_conversation.ts | 129 ++++
 apps/sim/tools/intercom/create_company.ts     |   4 +-
 apps/sim/tools/intercom/create_contact.ts     |   4 +-
 apps/sim/tools/intercom/create_event.ts       | 148 ++++
 apps/sim/tools/intercom/create_message.ts     |   4 +-
 apps/sim/tools/intercom/create_note.ts        | 131 ++++
 apps/sim/tools/intercom/create_tag.ts         |  97 +++
 apps/sim/tools/intercom/create_ticket.ts      |   4 +-
 apps/sim/tools/intercom/delete_contact.ts     |   4 +-
 .../intercom/detach_contact_from_company.ts   | 101 +++
 apps/sim/tools/intercom/get_company.ts        |   4 +-
 apps/sim/tools/intercom/get_contact.ts        |   4 +-
 apps/sim/tools/intercom/get_conversation.ts   |   4 +-
 apps/sim/tools/intercom/get_ticket.ts         |   4 +-
 apps/sim/tools/intercom/index.ts              |  21 +-
 apps/sim/tools/intercom/list_admins.ts        | 125 ++++
 apps/sim/tools/intercom/list_companies.ts     |   4 +-
 apps/sim/tools/intercom/list_contacts.ts      |   4 +-
 apps/sim/tools/intercom/list_conversations.ts |   4 +-
 apps/sim/tools/intercom/list_tags.ts          |  86 +++
 apps/sim/tools/intercom/open_conversation.ts  | 114 +++
 apps/sim/tools/intercom/reply_conversation.ts |   4 +-
 apps/sim/tools/intercom/search_contacts.ts    |   4 +-
 .../tools/intercom/search_conversations.ts    |   4 +-
 .../sim/tools/intercom/snooze_conversation.ts | 124 ++++
 apps/sim/tools/intercom/tag_contact.ts        |  89 +++
 apps/sim/tools/intercom/tag_conversation.ts   |  97 +++
 apps/sim/tools/intercom/types.ts              |   7 +-
 apps/sim/tools/intercom/untag_contact.ts      |  87 +++
 apps/sim/tools/intercom/update_contact.ts     |   4 +-
 apps/sim/tools/intercom/update_ticket.ts      | 193 +++++
 apps/sim/tools/polymarket/get_activity.ts     |   4 +-
 apps/sim/tools/polymarket/get_event.ts        |   4 +-
 apps/sim/tools/polymarket/get_events.ts       |   4 +-
 apps/sim/tools/polymarket/get_holders.ts      |   4 +-
 .../tools/polymarket/get_last_trade_price.ts  |   2 +-
 apps/sim/tools/polymarket/get_leaderboard.ts  |   4 +-
 apps/sim/tools/polymarket/get_market.ts       |   4 +-
 apps/sim/tools/polymarket/get_markets.ts      |   4 +-
 apps/sim/tools/polymarket/get_midpoint.ts     |   2 +-
 apps/sim/tools/polymarket/get_orderbook.ts    |   4 +-
 apps/sim/tools/polymarket/get_positions.ts    |   4 +-
 apps/sim/tools/polymarket/get_price.ts        |   2 +-
 .../sim/tools/polymarket/get_price_history.ts |   4 +-
 apps/sim/tools/polymarket/get_series.ts       |   4 +-
 apps/sim/tools/polymarket/get_series_by_id.ts |   4 +-
 apps/sim/tools/polymarket/get_spread.ts       |   4 +-
 apps/sim/tools/polymarket/get_tags.ts         |   4 +-
 apps/sim/tools/polymarket/get_tick_size.ts    |   2 +-
 apps/sim/tools/polymarket/get_trades.ts       |   4 +-
 apps/sim/tools/polymarket/index.ts            |  41 +-
 apps/sim/tools/polymarket/search.ts           |   4 +-
 apps/sim/tools/registry.ts                    |  30 +
 58 files changed, 2966 insertions(+), 115 deletions(-)
 create mode 100644 apps/sim/tools/intercom/assign_conversation.ts
 create mode 100644 apps/sim/tools/intercom/attach_contact_to_company.ts
 create mode 100644 apps/sim/tools/intercom/close_conversation.ts
 create mode 100644 apps/sim/tools/intercom/create_event.ts
 create mode 100644 apps/sim/tools/intercom/create_note.ts
 create mode 100644 apps/sim/tools/intercom/create_tag.ts
 create mode 100644 apps/sim/tools/intercom/detach_contact_from_company.ts
 create mode 100644 apps/sim/tools/intercom/list_admins.ts
 create mode 100644 apps/sim/tools/intercom/list_tags.ts
 create mode 100644 apps/sim/tools/intercom/open_conversation.ts
 create mode 100644 apps/sim/tools/intercom/snooze_conversation.ts
 create mode 100644 apps/sim/tools/intercom/tag_contact.ts
 create mode 100644 apps/sim/tools/intercom/tag_conversation.ts
 create mode 100644 apps/sim/tools/intercom/untag_contact.ts
 create mode 100644 apps/sim/tools/intercom/update_ticket.ts

diff --git a/apps/docs/content/docs/en/tools/intercom.mdx b/apps/docs/content/docs/en/tools/intercom.mdx
index 2b21d1cba..f79707472 100644
--- a/apps/docs/content/docs/en/tools/intercom.mdx
+++ b/apps/docs/content/docs/en/tools/intercom.mdx
@@ -647,6 +647,42 @@ Retrieve a single ticket by ID from Intercom. Returns API-aligned fields only.
 | `ticketId` | string | ID of the retrieved ticket |
 | `success` | boolean | Operation success status |
 
+### `intercom_update_ticket`
+
+Update a ticket in Intercom (change state, assignment, attributes)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `ticketId` | string | Yes | The ID of the ticket to update |
+| `ticket_attributes` | string | No | JSON object with ticket attributes \(e.g., \{"_default_title_":"New Title","_default_description_":"Updated description"\}\) |
+| `open` | boolean | No | Set to false to close the ticket, true to keep it open |
+| `is_shared` | boolean | No | Whether the ticket is visible to users |
+| `snoozed_until` | number | No | Unix timestamp for when the ticket should reopen |
+| `admin_id` | string | No | The ID of the admin performing the update \(needed for workflows and attribution\) |
+| `assignee_id` | string | No | The ID of the admin or team to assign the ticket to. Set to "0" to unassign. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `ticket` | object | The updated ticket object |
+| ↳ `id` | string | Unique identifier for the ticket |
+| ↳ `type` | string | Object type \(ticket\) |
+| ↳ `ticket_id` | string | Ticket ID shown in Intercom UI |
+| ↳ `ticket_state` | string | State of the ticket |
+| ↳ `ticket_attributes` | object | Attributes of the ticket |
+| ↳ `open` | boolean | Whether the ticket is open |
+| ↳ `is_shared` | boolean | Whether the ticket is visible to users |
+| ↳ `snoozed_until` | number | Unix timestamp when ticket will reopen |
+| ↳ `admin_assignee_id` | string | ID of assigned admin |
+| ↳ `team_assignee_id` | string | ID of assigned team |
+| ↳ `created_at` | number | Unix timestamp when ticket was created |
+| ↳ `updated_at` | number | Unix timestamp when ticket was last updated |
+| `ticketId` | string | ID of the updated ticket |
+| `ticket_state` | string | Current state of the ticket |
+
 ### `intercom_create_message`
 
 Create and send a new admin-initiated message in Intercom. Returns API-aligned fields only.
@@ -680,4 +716,340 @@ Create and send a new admin-initiated message in Intercom. Returns API-aligned f
 | `messageId` | string | ID of the created message |
 | `success` | boolean | Operation success status |
 
+### `intercom_list_admins`
+
+Fetch a list of all admins for the workspace
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `admins` | array | Array of admin objects |
+|   ↳ `id` | string | Unique identifier for the admin |
+|   ↳ `type` | string | Object type \(admin\) |
+|   ↳ `name` | string | Name of the admin |
+|   ↳ `email` | string | Email of the admin |
+|   ↳ `job_title` | string | Job title of the admin |
+|   ↳ `away_mode_enabled` | boolean | Whether admin is in away mode |
+|   ↳ `away_mode_reassign` | boolean | Whether to reassign conversations when away |
+|   ↳ `has_inbox_seat` | boolean | Whether admin has a paid inbox seat |
+|   ↳ `team_ids` | array | List of team IDs the admin belongs to |
+|   ↳ `avatar` | object | Avatar information |
+|   ↳ `email_verified` | boolean | Whether email is verified |
+| `type` | string | Object type \(admin.list\) |
+
+### `intercom_close_conversation`
+
+Close a conversation in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `conversationId` | string | Yes | The ID of the conversation to close |
+| `admin_id` | string | Yes | The ID of the admin performing the action |
+| `body` | string | No | Optional closing message to add to the conversation |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `conversation` | object | The closed conversation object |
+| ↳ `id` | string | Unique identifier for the conversation |
+| ↳ `type` | string | Object type \(conversation\) |
+| ↳ `state` | string | State of the conversation \(closed\) |
+| ↳ `open` | boolean | Whether the conversation is open \(false\) |
+| ↳ `read` | boolean | Whether the conversation has been read |
+| ↳ `created_at` | number | Unix timestamp when conversation was created |
+| ↳ `updated_at` | number | Unix timestamp when conversation was last updated |
+| `conversationId` | string | ID of the closed conversation |
+| `state` | string | State of the conversation \(closed\) |
+
+### `intercom_open_conversation`
+
+Open a closed or snoozed conversation in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `conversationId` | string | Yes | The ID of the conversation to open |
+| `admin_id` | string | Yes | The ID of the admin performing the action |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `conversation` | object | The opened conversation object |
+| ↳ `id` | string | Unique identifier for the conversation |
+| ↳ `type` | string | Object type \(conversation\) |
+| ↳ `state` | string | State of the conversation \(open\) |
+| ↳ `open` | boolean | Whether the conversation is open \(true\) |
+| ↳ `read` | boolean | Whether the conversation has been read |
+| ↳ `created_at` | number | Unix timestamp when conversation was created |
+| ↳ `updated_at` | number | Unix timestamp when conversation was last updated |
+| `conversationId` | string | ID of the opened conversation |
+| `state` | string | State of the conversation \(open\) |
+
+### `intercom_snooze_conversation`
+
+Snooze a conversation to reopen at a future time
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `conversationId` | string | Yes | The ID of the conversation to snooze |
+| `admin_id` | string | Yes | The ID of the admin performing the action |
+| `snoozed_until` | number | Yes | Unix timestamp for when the conversation should reopen |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `conversation` | object | The snoozed conversation object |
+| ↳ `id` | string | Unique identifier for the conversation |
+| ↳ `type` | string | Object type \(conversation\) |
+| ↳ `state` | string | State of the conversation \(snoozed\) |
+| ↳ `open` | boolean | Whether the conversation is open |
+| ↳ `snoozed_until` | number | Unix timestamp when conversation will reopen |
+| ↳ `created_at` | number | Unix timestamp when conversation was created |
+| ↳ `updated_at` | number | Unix timestamp when conversation was last updated |
+| `conversationId` | string | ID of the snoozed conversation |
+| `state` | string | State of the conversation \(snoozed\) |
+| `snoozed_until` | number | Unix timestamp when conversation will reopen |
+
+### `intercom_assign_conversation`
+
+Assign a conversation to an admin or team in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `conversationId` | string | Yes | The ID of the conversation to assign |
+| `admin_id` | string | Yes | The ID of the admin performing the assignment |
+| `assignee_id` | string | Yes | The ID of the admin or team to assign the conversation to. Set to "0" to unassign. |
+| `body` | string | No | Optional message to add when assigning \(e.g., "Passing to the support team"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `conversation` | object | The assigned conversation object |
+| ↳ `id` | string | Unique identifier for the conversation |
+| ↳ `type` | string | Object type \(conversation\) |
+| ↳ `state` | string | State of the conversation |
+| ↳ `open` | boolean | Whether the conversation is open |
+| ↳ `admin_assignee_id` | number | ID of the assigned admin |
+| ↳ `team_assignee_id` | string | ID of the assigned team |
+| ↳ `created_at` | number | Unix timestamp when conversation was created |
+| ↳ `updated_at` | number | Unix timestamp when conversation was last updated |
+| `conversationId` | string | ID of the assigned conversation |
+| `admin_assignee_id` | number | ID of the assigned admin |
+| `team_assignee_id` | string | ID of the assigned team |
+
+### `intercom_list_tags`
+
+Fetch a list of all tags in the workspace
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `tags` | array | Array of tag objects |
+|   ↳ `id` | string | Unique identifier for the tag |
+|   ↳ `type` | string | Object type \(tag\) |
+|   ↳ `name` | string | Name of the tag |
+| `type` | string | Object type \(list\) |
+
+### `intercom_create_tag`
+
+Create a new tag or update an existing tag name
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `name` | string | Yes | The name of the tag. Will create a new tag if not found, or update the name if id is provided. |
+| `id` | string | No | The ID of an existing tag to update. Omit to create a new tag. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique identifier for the tag |
+| `name` | string | Name of the tag |
+| `type` | string | Object type \(tag\) |
+
+### `intercom_tag_contact`
+
+Add a tag to a specific contact
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `contactId` | string | Yes | The ID of the contact to tag |
+| `tagId` | string | Yes | The ID of the tag to apply |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique identifier for the tag |
+| `name` | string | Name of the tag |
+| `type` | string | Object type \(tag\) |
+
+### `intercom_untag_contact`
+
+Remove a tag from a specific contact
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `contactId` | string | Yes | The ID of the contact to untag |
+| `tagId` | string | Yes | The ID of the tag to remove |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique identifier for the tag that was removed |
+| `name` | string | Name of the tag that was removed |
+| `type` | string | Object type \(tag\) |
+
+### `intercom_tag_conversation`
+
+Add a tag to a specific conversation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `conversationId` | string | Yes | The ID of the conversation to tag |
+| `tagId` | string | Yes | The ID of the tag to apply |
+| `admin_id` | string | Yes | The ID of the admin applying the tag |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique identifier for the tag |
+| `name` | string | Name of the tag |
+| `type` | string | Object type \(tag\) |
+
+### `intercom_create_note`
+
+Add a note to a specific contact
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `contactId` | string | Yes | The ID of the contact to add the note to |
+| `body` | string | Yes | The text content of the note |
+| `admin_id` | string | No | The ID of the admin creating the note |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique identifier for the note |
+| `body` | string | The text content of the note |
+| `created_at` | number | Unix timestamp when the note was created |
+| `type` | string | Object type \(note\) |
+| `author` | object | The admin who created the note |
+| ↳ `type` | string | Author type \(admin\) |
+| ↳ `id` | string | Author ID |
+| ↳ `name` | string | Author name |
+| ↳ `email` | string | Author email |
+| `contact` | object | The contact the note was created for |
+| ↳ `type` | string | Contact type |
+| ↳ `id` | string | Contact ID |
+
+### `intercom_create_event`
+
+Track a custom event for a contact in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `event_name` | string | Yes | The name of the event \(e.g., "order-completed"\). Use past-tense verb-noun format for readability. |
+| `created_at` | number | No | Unix timestamp for when the event occurred. Strongly recommended for uniqueness. |
+| `user_id` | string | No | Your identifier for the user \(external_id\) |
+| `email` | string | No | Email address of the user. Use only if your app uses email to uniquely identify users. |
+| `id` | string | No | The Intercom contact ID |
+| `metadata` | string | No | JSON object with up to 10 metadata key-value pairs about the event \(e.g., \{"order_value": 99.99\}\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `accepted` | boolean | Whether the event was accepted \(202 Accepted\) |
+
+### `intercom_attach_contact_to_company`
+
+Attach a contact to a company in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `contactId` | string | Yes | The ID of the contact to attach to the company |
+| `companyId` | string | Yes | The ID of the company to attach the contact to |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `company` | object | The company object the contact was attached to |
+| ↳ `id` | string | Unique identifier for the company |
+| ↳ `type` | string | Object type \(company\) |
+| ↳ `company_id` | string | The company_id you defined |
+| ↳ `name` | string | Name of the company |
+| ↳ `created_at` | number | Unix timestamp when company was created |
+| ↳ `updated_at` | number | Unix timestamp when company was updated |
+| ↳ `user_count` | number | Number of users in the company |
+| ↳ `session_count` | number | Number of sessions |
+| ↳ `monthly_spend` | number | Monthly spend amount |
+| ↳ `plan` | object | Company plan details |
+| `companyId` | string | ID of the company |
+| `name` | string | Name of the company |
+
+### `intercom_detach_contact_from_company`
+
+Remove a contact from a company in Intercom
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `contactId` | string | Yes | The ID of the contact to detach from the company |
+| `companyId` | string | Yes | The ID of the company to detach the contact from |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `company` | object | The company object the contact was detached from |
+| ↳ `id` | string | Unique identifier for the company |
+| ↳ `type` | string | Object type \(company\) |
+| ↳ `company_id` | string | The company_id you defined |
+| ↳ `name` | string | Name of the company |
+| `companyId` | string | ID of the company |
+| `name` | string | Name of the company |
+
 
diff --git 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
index f883a96fb..ec52e6bce 100644
--- 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
@@ -58,7 +58,6 @@ export function ExecutionSnapshot({
   onClose = () => {},
 }: ExecutionSnapshotProps) {
   const { data, isLoading, error } = useExecutionSnapshot(executionId)
-  const lastExecutionIdRef = useRef<string | null>(null)
 
   const [isMenuOpen, setIsMenuOpen] = useState(false)
   const [menuPosition, setMenuPosition] = useState({ x: 0, y: 0 })
@@ -82,12 +81,6 @@ export function ExecutionSnapshot({
 
   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
-  }
-
   const renderContent = () => {
     if (isLoading) {
       return (
@@ -152,7 +145,7 @@ export function ExecutionSnapshot({
 
     return (
       <Preview
-        key={executionKey}
+        key={executionId}
         workflowState={workflowState}
         traceSpans={traceSpans}
         className={className}
diff --git a/apps/sim/blocks/blocks/intercom.ts b/apps/sim/blocks/blocks/intercom.ts
index efbc8e876..6919679b6 100644
--- a/apps/sim/blocks/blocks/intercom.ts
+++ b/apps/sim/blocks/blocks/intercom.ts
@@ -36,7 +36,22 @@ export const IntercomBlock: BlockConfig = {
         { label: 'Search Conversations', id: 'search_conversations' },
         { label: 'Create Ticket', id: 'create_ticket' },
         { label: 'Get Ticket', id: 'get_ticket' },
+        { label: 'Update Ticket', id: 'update_ticket' },
         { label: 'Create Message', id: 'create_message' },
+        { label: 'List Admins', id: 'list_admins' },
+        { label: 'Close Conversation', id: 'close_conversation' },
+        { label: 'Open Conversation', id: 'open_conversation' },
+        { label: 'Snooze Conversation', id: 'snooze_conversation' },
+        { label: 'Assign Conversation', id: 'assign_conversation' },
+        { label: 'List Tags', id: 'list_tags' },
+        { label: 'Create Tag', id: 'create_tag' },
+        { label: 'Tag Contact', id: 'tag_contact' },
+        { label: 'Untag Contact', id: 'untag_contact' },
+        { label: 'Tag Conversation', id: 'tag_conversation' },
+        { label: 'Create Note', id: 'create_note' },
+        { label: 'Create Event', id: 'create_event' },
+        { label: 'Attach Contact to Company', id: 'attach_contact_to_company' },
+        { label: 'Detach Contact from Company', id: 'detach_contact_from_company' },
       ],
       value: () => 'create_contact',
     },
@@ -384,7 +399,15 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
       required: true,
       condition: {
         field: 'operation',
-        value: ['get_conversation', 'reply_conversation'],
+        value: [
+          'get_conversation',
+          'reply_conversation',
+          'close_conversation',
+          'open_conversation',
+          'snooze_conversation',
+          'assign_conversation',
+          'tag_conversation',
+        ],
       },
     },
     {
@@ -477,11 +500,20 @@ Return ONLY the message text - no explanations.`,
       id: 'admin_id',
       title: 'Admin ID',
       type: 'short-input',
-      placeholder: 'ID of the admin sending the message',
+      placeholder: 'ID of the admin performing the action',
       required: true,
       condition: {
         field: 'operation',
-        value: ['reply_conversation'],
+        value: [
+          'reply_conversation',
+          'close_conversation',
+          'open_conversation',
+          'snooze_conversation',
+          'assign_conversation',
+          'tag_conversation',
+          'create_note',
+          'update_ticket',
+        ],
       },
     },
     {
@@ -526,7 +558,7 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
       required: true,
       condition: {
         field: 'operation',
-        value: ['get_ticket'],
+        value: ['get_ticket', 'update_ticket'],
       },
     },
     {
@@ -799,6 +831,307 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
         value: ['list_companies'],
       },
     },
+    // Close/Open conversation body
+    {
+      id: 'close_body',
+      title: 'Closing Message',
+      type: 'long-input',
+      placeholder: 'Optional message to add when closing',
+      condition: {
+        field: 'operation',
+        value: ['close_conversation'],
+      },
+    },
+    // Snooze conversation
+    {
+      id: 'snoozed_until',
+      title: 'Snooze Until',
+      type: 'short-input',
+      placeholder: 'Unix timestamp when conversation should reopen',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['snooze_conversation'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Unix timestamp in seconds based on the user's description.
+The timestamp should be a Unix epoch time in seconds (10 digits).
+Examples:
+- "tomorrow" -> Tomorrow at 09:00:00 as Unix timestamp
+- "in 2 hours" -> Current time plus 7200 seconds
+- "next Monday" -> Next Monday at 09:00:00 as Unix timestamp
+
+Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe when to unsnooze (e.g., "tomorrow", "in 2 hours")...',
+        generationType: 'timestamp',
+      },
+    },
+    // Assign conversation
+    {
+      id: 'assignee_id',
+      title: 'Assignee ID',
+      type: 'short-input',
+      placeholder: 'Admin or team ID to assign to (0 to unassign)',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['assign_conversation'],
+      },
+    },
+    {
+      id: 'assign_body',
+      title: 'Assignment Message',
+      type: 'long-input',
+      placeholder: 'Optional message when assigning',
+      condition: {
+        field: 'operation',
+        value: ['assign_conversation'],
+      },
+    },
+    // Update ticket fields
+    {
+      id: 'update_ticket_attributes',
+      title: 'Ticket Attributes',
+      type: 'long-input',
+      placeholder: 'JSON object with ticket attributes to update',
+      condition: {
+        field: 'operation',
+        value: ['update_ticket'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON object for Intercom ticket attributes based on the user's description.
+Example: {"_default_title_": "Updated title", "_default_description_": "Updated description"}
+
+Return ONLY the JSON object - no explanations or markdown formatting.`,
+        placeholder: 'Describe the ticket updates (e.g., "change title to Bug Fixed")...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'ticket_open',
+      title: 'Ticket Open',
+      type: 'dropdown',
+      options: [
+        { label: 'Keep Open', id: 'true' },
+        { label: 'Close Ticket', id: 'false' },
+      ],
+      condition: {
+        field: 'operation',
+        value: ['update_ticket'],
+      },
+    },
+    {
+      id: 'ticket_is_shared',
+      title: 'Ticket Visible to Users',
+      type: 'dropdown',
+      options: [
+        { label: 'Yes', id: 'true' },
+        { label: 'No', id: 'false' },
+      ],
+      condition: {
+        field: 'operation',
+        value: ['update_ticket'],
+      },
+    },
+    {
+      id: 'ticket_snoozed_until',
+      title: 'Snooze Ticket Until',
+      type: 'short-input',
+      placeholder: 'Unix timestamp when ticket should reopen',
+      condition: {
+        field: 'operation',
+        value: ['update_ticket'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Unix timestamp in seconds based on the user's description.
+Examples:
+- "tomorrow" -> Tomorrow at 09:00:00 as Unix timestamp
+- "next week" -> 7 days from now
+
+Return ONLY the numeric timestamp.`,
+        placeholder: 'Describe when to unsnooze (e.g., "tomorrow")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'ticket_assignee_id',
+      title: 'Ticket Assignee ID',
+      type: 'short-input',
+      placeholder: 'Admin or team ID to assign to (0 to unassign)',
+      condition: {
+        field: 'operation',
+        value: ['update_ticket'],
+      },
+    },
+    // Tag fields
+    {
+      id: 'tagId',
+      title: 'Tag ID',
+      type: 'short-input',
+      placeholder: 'ID of the tag',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['tag_contact', 'untag_contact', 'tag_conversation'],
+      },
+    },
+    {
+      id: 'tag_name',
+      title: 'Tag Name',
+      type: 'short-input',
+      placeholder: 'Name of the tag to create',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['create_tag'],
+      },
+    },
+    {
+      id: 'tag_id_update',
+      title: 'Tag ID (for update)',
+      type: 'short-input',
+      placeholder: 'ID of existing tag to update (leave empty to create new)',
+      condition: {
+        field: 'operation',
+        value: ['create_tag'],
+      },
+    },
+    // Contact ID for tag/untag/note operations
+    {
+      id: 'tag_contact_id',
+      title: 'Contact ID',
+      type: 'short-input',
+      placeholder: 'ID of the contact',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: [
+          'tag_contact',
+          'untag_contact',
+          'create_note',
+          'attach_contact_to_company',
+          'detach_contact_from_company',
+        ],
+      },
+    },
+    // Note fields
+    {
+      id: 'note_body',
+      title: 'Note Content',
+      type: 'long-input',
+      placeholder: 'Text content of the note',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['create_note'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a note for Intercom based on the user's description.
+The note should be clear, professional, and capture the key information.
+
+Return ONLY the note text - no explanations.`,
+        placeholder: 'Describe the note content (e.g., "customer requested callback")...',
+      },
+    },
+    // Event fields
+    {
+      id: 'event_name',
+      title: 'Event Name',
+      type: 'short-input',
+      placeholder: 'Event name (e.g., order-completed)',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+    },
+    {
+      id: 'event_user_id',
+      title: 'User ID',
+      type: 'short-input',
+      placeholder: 'Your identifier for the user',
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+    },
+    {
+      id: 'event_email',
+      title: 'User Email',
+      type: 'short-input',
+      placeholder: 'Email address of the user',
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+    },
+    {
+      id: 'event_contact_id',
+      title: 'Contact ID',
+      type: 'short-input',
+      placeholder: 'Intercom contact ID',
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+    },
+    {
+      id: 'event_metadata',
+      title: 'Event Metadata',
+      type: 'long-input',
+      placeholder: 'JSON object with event metadata (max 10 keys)',
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON object for Intercom event metadata based on the user's description.
+The object should contain key-value pairs (max 10 keys).
+Example: {"order_value": 99.99, "items": 3, "coupon_used": true}
+
+Return ONLY the JSON object - no explanations or markdown formatting.`,
+        placeholder: 'Describe the event data (e.g., "order value $50, 2 items")...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'event_created_at',
+      title: 'Event Time',
+      type: 'short-input',
+      placeholder: 'Unix timestamp when event occurred',
+      condition: {
+        field: 'operation',
+        value: ['create_event'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Unix timestamp in seconds based on the user's description.
+Examples:
+- "now" -> Current Unix timestamp
+- "5 minutes ago" -> Current time minus 300 seconds
+
+Return ONLY the numeric timestamp.`,
+        placeholder: 'Describe when the event occurred (e.g., "now")...',
+        generationType: 'timestamp',
+      },
+    },
+    // Company attachment fields
+    {
+      id: 'attach_company_id',
+      title: 'Company ID',
+      type: 'short-input',
+      placeholder: 'ID of the company to attach/detach',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['attach_contact_to_company', 'detach_contact_from_company'],
+      },
+    },
   ],
   tools: {
     access: [
@@ -818,6 +1151,21 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
       'intercom_create_ticket',
       'intercom_get_ticket',
       'intercom_create_message',
+      'intercom_update_ticket_v2',
+      'intercom_list_admins_v2',
+      'intercom_close_conversation_v2',
+      'intercom_open_conversation_v2',
+      'intercom_snooze_conversation_v2',
+      'intercom_assign_conversation_v2',
+      'intercom_list_tags_v2',
+      'intercom_create_tag_v2',
+      'intercom_tag_contact_v2',
+      'intercom_untag_contact_v2',
+      'intercom_tag_conversation_v2',
+      'intercom_create_note_v2',
+      'intercom_create_event_v2',
+      'intercom_attach_contact_to_company_v2',
+      'intercom_detach_contact_from_company_v2',
     ],
     config: {
       tool: (params) => {
@@ -854,6 +1202,36 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
             return 'intercom_get_ticket'
           case 'create_message':
             return 'intercom_create_message'
+          case 'update_ticket':
+            return 'intercom_update_ticket_v2'
+          case 'list_admins':
+            return 'intercom_list_admins_v2'
+          case 'close_conversation':
+            return 'intercom_close_conversation_v2'
+          case 'open_conversation':
+            return 'intercom_open_conversation_v2'
+          case 'snooze_conversation':
+            return 'intercom_snooze_conversation_v2'
+          case 'assign_conversation':
+            return 'intercom_assign_conversation_v2'
+          case 'list_tags':
+            return 'intercom_list_tags_v2'
+          case 'create_tag':
+            return 'intercom_create_tag_v2'
+          case 'tag_contact':
+            return 'intercom_tag_contact_v2'
+          case 'untag_contact':
+            return 'intercom_untag_contact_v2'
+          case 'tag_conversation':
+            return 'intercom_tag_conversation_v2'
+          case 'create_note':
+            return 'intercom_create_note_v2'
+          case 'create_event':
+            return 'intercom_create_event_v2'
+          case 'attach_contact_to_company':
+            return 'intercom_attach_contact_to_company_v2'
+          case 'detach_contact_from_company':
+            return 'intercom_detach_contact_from_company_v2'
           default:
             throw new Error(`Unknown operation: ${params.operation}`)
         }
@@ -870,6 +1248,23 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
           message_created_at,
           include_translations,
           disable_notifications,
+          close_body,
+          assign_body,
+          tag_contact_id,
+          attach_company_id,
+          update_ticket_attributes,
+          ticket_open,
+          ticket_is_shared,
+          ticket_snoozed_until,
+          ticket_assignee_id,
+          tag_name,
+          tag_id_update,
+          note_body,
+          event_user_id,
+          event_email,
+          event_contact_id,
+          event_metadata,
+          event_created_at,
           ...rest
         } = params
         const cleanParams: Record<string, any> = {}
@@ -897,7 +1292,7 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
           cleanParams.created_at = Number(reply_created_at)
         }
 
-        // Map ticket fields
+        // Map ticket fields for create_ticket
         if (operation === 'create_ticket') {
           if (ticket_company_id) cleanParams.company_id = ticket_company_id
           if (ticket_created_at) cleanParams.created_at = Number(ticket_created_at)
@@ -920,6 +1315,71 @@ Return ONLY the numeric timestamp - no explanations, no quotes, no extra text.`,
           cleanParams.include_translations = include_translations === 'true'
         }
 
+        // Map close_body to body for close_conversation
+        if (operation === 'close_conversation' && close_body) {
+          cleanParams.body = close_body
+        }
+
+        // Map assign_body to body for assign_conversation
+        if (operation === 'assign_conversation' && assign_body) {
+          cleanParams.body = assign_body
+        }
+
+        // Map tag_contact_id to contactId for tag/note/company attachment operations
+        if (
+          [
+            'tag_contact',
+            'untag_contact',
+            'create_note',
+            'attach_contact_to_company',
+            'detach_contact_from_company',
+          ].includes(operation) &&
+          tag_contact_id
+        ) {
+          cleanParams.contactId = tag_contact_id
+        }
+
+        // Map attach_company_id to companyId for company attachment operations
+        if (
+          ['attach_contact_to_company', 'detach_contact_from_company'].includes(operation) &&
+          attach_company_id
+        ) {
+          cleanParams.companyId = attach_company_id
+        }
+
+        // Map update_ticket fields
+        if (operation === 'update_ticket') {
+          if (update_ticket_attributes) cleanParams.ticket_attributes = update_ticket_attributes
+          if (ticket_open !== undefined && ticket_open !== '') {
+            cleanParams.open = ticket_open === 'true'
+          }
+          if (ticket_is_shared !== undefined && ticket_is_shared !== '') {
+            cleanParams.is_shared = ticket_is_shared === 'true'
+          }
+          if (ticket_snoozed_until) cleanParams.snoozed_until = Number(ticket_snoozed_until)
+          if (ticket_assignee_id) cleanParams.assignee_id = ticket_assignee_id
+        }
+
+        // Map tag fields for create_tag
+        if (operation === 'create_tag') {
+          if (tag_name) cleanParams.name = tag_name
+          if (tag_id_update) cleanParams.id = tag_id_update
+        }
+
+        // Map note_body to body for create_note
+        if (operation === 'create_note' && note_body) {
+          cleanParams.body = note_body
+        }
+
+        // Map event fields for create_event
+        if (operation === 'create_event') {
+          if (event_user_id) cleanParams.user_id = event_user_id
+          if (event_email) cleanParams.email = event_email
+          if (event_contact_id) cleanParams.id = event_contact_id
+          if (event_metadata) cleanParams.metadata = event_metadata
+          if (event_created_at) cleanParams.created_at = Number(event_created_at)
+        }
+
         Object.entries(rest).forEach(([key, value]) => {
           if (value !== undefined && value !== null && value !== '') {
             cleanParams[key] = value
@@ -963,7 +1423,22 @@ export const IntercomV2Block: BlockConfig = {
       'intercom_search_conversations_v2',
       'intercom_create_ticket_v2',
       'intercom_get_ticket_v2',
+      'intercom_update_ticket_v2',
       'intercom_create_message_v2',
+      'intercom_list_admins_v2',
+      'intercom_close_conversation_v2',
+      'intercom_open_conversation_v2',
+      'intercom_snooze_conversation_v2',
+      'intercom_assign_conversation_v2',
+      'intercom_list_tags_v2',
+      'intercom_create_tag_v2',
+      'intercom_tag_contact_v2',
+      'intercom_untag_contact_v2',
+      'intercom_tag_conversation_v2',
+      'intercom_create_note_v2',
+      'intercom_create_event_v2',
+      'intercom_attach_contact_to_company_v2',
+      'intercom_detach_contact_from_company_v2',
     ],
     config: {
       tool: createVersionedToolSelector({
@@ -999,8 +1474,38 @@ export const IntercomV2Block: BlockConfig = {
               return 'intercom_create_ticket'
             case 'get_ticket':
               return 'intercom_get_ticket'
+            case 'update_ticket':
+              return 'intercom_update_ticket'
             case 'create_message':
               return 'intercom_create_message'
+            case 'list_admins':
+              return 'intercom_list_admins'
+            case 'close_conversation':
+              return 'intercom_close_conversation'
+            case 'open_conversation':
+              return 'intercom_open_conversation'
+            case 'snooze_conversation':
+              return 'intercom_snooze_conversation'
+            case 'assign_conversation':
+              return 'intercom_assign_conversation'
+            case 'list_tags':
+              return 'intercom_list_tags'
+            case 'create_tag':
+              return 'intercom_create_tag'
+            case 'tag_contact':
+              return 'intercom_tag_contact'
+            case 'untag_contact':
+              return 'intercom_untag_contact'
+            case 'tag_conversation':
+              return 'intercom_tag_conversation'
+            case 'create_note':
+              return 'intercom_create_note'
+            case 'create_event':
+              return 'intercom_create_event'
+            case 'attach_contact_to_company':
+              return 'intercom_attach_contact_to_company'
+            case 'detach_contact_from_company':
+              return 'intercom_detach_contact_from_company'
             default:
               return 'intercom_create_contact'
           }
@@ -1008,7 +1513,158 @@ export const IntercomV2Block: BlockConfig = {
         suffix: '_v2',
         fallbackToolId: 'intercom_create_contact_v2',
       }),
-      params: IntercomBlock.tools!.config!.params,
+      params: (params) => {
+        const {
+          operation,
+          message_type_msg,
+          company_name,
+          contact_company_id,
+          reply_created_at,
+          ticket_company_id,
+          ticket_created_at,
+          message_created_at,
+          include_translations,
+          disable_notifications,
+          close_body,
+          assign_body,
+          tag_contact_id,
+          attach_company_id,
+          update_ticket_attributes,
+          ticket_open,
+          ticket_is_shared,
+          ticket_snoozed_until,
+          ticket_assignee_id,
+          tag_name,
+          tag_id_update,
+          note_body,
+          event_user_id,
+          event_email,
+          event_contact_id,
+          event_metadata,
+          event_created_at,
+          ...rest
+        } = params
+        const cleanParams: Record<string, any> = {}
+
+        // Special mapping for message_type in create_message
+        if (operation === 'create_message' && message_type_msg) {
+          cleanParams.message_type = message_type_msg
+        }
+
+        // Special mapping for company name
+        if (operation === 'create_company' && company_name) {
+          cleanParams.name = company_name
+        }
+
+        // Map contact_company_id to company_id for contact operations
+        if (
+          (operation === 'create_contact' || operation === 'update_contact') &&
+          contact_company_id
+        ) {
+          cleanParams.company_id = contact_company_id
+        }
+
+        // Map reply_created_at to created_at for reply_conversation
+        if (operation === 'reply_conversation' && reply_created_at) {
+          cleanParams.created_at = Number(reply_created_at)
+        }
+
+        // Map ticket fields for create_ticket
+        if (operation === 'create_ticket') {
+          if (ticket_company_id) cleanParams.company_id = ticket_company_id
+          if (ticket_created_at) cleanParams.created_at = Number(ticket_created_at)
+          if (disable_notifications !== undefined && disable_notifications !== '') {
+            cleanParams.disable_notifications = disable_notifications === 'true'
+          }
+        }
+
+        // Map message_created_at to created_at for create_message
+        if (operation === 'create_message' && message_created_at) {
+          cleanParams.created_at = Number(message_created_at)
+        }
+
+        // Convert include_translations string to boolean for get_conversation
+        if (
+          operation === 'get_conversation' &&
+          include_translations !== undefined &&
+          include_translations !== ''
+        ) {
+          cleanParams.include_translations = include_translations === 'true'
+        }
+
+        // Map close_body to body for close_conversation
+        if (operation === 'close_conversation' && close_body) {
+          cleanParams.body = close_body
+        }
+
+        // Map assign_body to body for assign_conversation
+        if (operation === 'assign_conversation' && assign_body) {
+          cleanParams.body = assign_body
+        }
+
+        // Map tag_contact_id to contactId for tag/note/company attachment operations
+        if (
+          [
+            'tag_contact',
+            'untag_contact',
+            'create_note',
+            'attach_contact_to_company',
+            'detach_contact_from_company',
+          ].includes(operation) &&
+          tag_contact_id
+        ) {
+          cleanParams.contactId = tag_contact_id
+        }
+
+        // Map attach_company_id to companyId for company attachment operations
+        if (
+          ['attach_contact_to_company', 'detach_contact_from_company'].includes(operation) &&
+          attach_company_id
+        ) {
+          cleanParams.companyId = attach_company_id
+        }
+
+        // Map update_ticket fields
+        if (operation === 'update_ticket') {
+          if (update_ticket_attributes) cleanParams.ticket_attributes = update_ticket_attributes
+          if (ticket_open !== undefined && ticket_open !== '') {
+            cleanParams.open = ticket_open === 'true'
+          }
+          if (ticket_is_shared !== undefined && ticket_is_shared !== '') {
+            cleanParams.is_shared = ticket_is_shared === 'true'
+          }
+          if (ticket_snoozed_until) cleanParams.snoozed_until = Number(ticket_snoozed_until)
+          if (ticket_assignee_id) cleanParams.assignee_id = ticket_assignee_id
+        }
+
+        // Map tag fields for create_tag
+        if (operation === 'create_tag') {
+          if (tag_name) cleanParams.name = tag_name
+          if (tag_id_update) cleanParams.id = tag_id_update
+        }
+
+        // Map note_body to body for create_note
+        if (operation === 'create_note' && note_body) {
+          cleanParams.body = note_body
+        }
+
+        // Map event fields for create_event
+        if (operation === 'create_event') {
+          if (event_user_id) cleanParams.user_id = event_user_id
+          if (event_email) cleanParams.email = event_email
+          if (event_contact_id) cleanParams.id = event_contact_id
+          if (event_metadata) cleanParams.metadata = event_metadata
+          if (event_created_at) cleanParams.created_at = Number(event_created_at)
+        }
+
+        Object.entries(rest).forEach(([key, value]) => {
+          if (value !== undefined && value !== null && value !== '') {
+            cleanParams[key] = value
+          }
+        })
+
+        return cleanParams
+      },
     },
   },
   outputs: {
@@ -1031,10 +1687,23 @@ export const IntercomV2Block: BlockConfig = {
       type: 'array',
       description: 'Array of conversations (for list/search operations)',
     },
+    state: { type: 'string', description: 'Conversation state (for close/open/snooze operations)' },
     ticket: { type: 'json', description: 'Ticket object with id, ticket_id, ticket_state' },
-    ticketId: { type: 'string', description: 'ID of the ticket (for create operations)' },
+    ticketId: { type: 'string', description: 'ID of the ticket (for create/update operations)' },
+    ticket_state: { type: 'string', description: 'Ticket state (for update_ticket operation)' },
     message: { type: 'json', description: 'Message object with id, type' },
     messageId: { type: 'string', description: 'ID of the message (for create operations)' },
+    admins: { type: 'array', description: 'Array of admin objects (for list_admins operation)' },
+    tags: { type: 'array', description: 'Array of tag objects (for list_tags operation)' },
+    tag: { type: 'json', description: 'Tag object with id and name (for tag operations)' },
+    tagId: { type: 'string', description: 'ID of the tag (for create_tag operation)' },
+    note: { type: 'json', description: 'Note object with id and body (for create_note operation)' },
+    noteId: { type: 'string', description: 'ID of the note (for create_note operation)' },
+    event_name: {
+      type: 'string',
+      description: 'Name of the tracked event (for create_event operation)',
+    },
+    name: { type: 'string', description: 'Name of the resource (for various operations)' },
     total_count: { type: 'number', description: 'Total count (for list/search operations)' },
     pages: { type: 'json', description: 'Pagination info with page, per_page, total_pages' },
     id: { type: 'string', description: 'ID of the deleted item (for delete operations)' },
diff --git a/apps/sim/tools/intercom/assign_conversation.ts b/apps/sim/tools/intercom/assign_conversation.ts
new file mode 100644
index 000000000..1780c52c9
--- /dev/null
+++ b/apps/sim/tools/intercom/assign_conversation.ts
@@ -0,0 +1,146 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomAssignConversationParams {
+  accessToken: string
+  conversationId: string
+  admin_id: string
+  assignee_id: string
+  body?: string
+}
+
+export interface IntercomAssignConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    conversationId: string
+    admin_assignee_id: number | null
+    team_assignee_id: string | null
+  }
+}
+
+const assignConversationBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    conversationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the conversation to assign',
+    },
+    admin_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin performing the assignment',
+    },
+    assignee_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The ID of the admin or team to assign the conversation to. Set to "0" to unassign.',
+    },
+    body: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional message to add when assigning (e.g., "Passing to the support team")',
+    },
+  },
+
+  request: {
+    url: (params: IntercomAssignConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/parts`),
+    method: 'POST',
+    headers: (params: IntercomAssignConversationParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomAssignConversationParams) => {
+      const payload: any = {
+        message_type: 'assignment',
+        type: 'admin',
+        admin_id: params.admin_id,
+        assignee_id: params.assignee_id,
+      }
+
+      if (params.body) {
+        payload.body = params.body
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomAssignConversationParams, any>, 'params' | 'request'>
+
+export const intercomAssignConversationV2Tool: ToolConfig<
+  IntercomAssignConversationParams,
+  IntercomAssignConversationV2Response
+> = {
+  ...assignConversationBase,
+  id: 'intercom_assign_conversation_v2',
+  name: 'Assign Conversation in Intercom',
+  description: 'Assign a conversation to an admin or team in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'assign_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: data,
+        conversationId: data.id,
+        admin_assignee_id: data.admin_assignee_id ?? null,
+        team_assignee_id: data.team_assignee_id ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'The assigned conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        state: { type: 'string', description: 'State of the conversation' },
+        open: { type: 'boolean', description: 'Whether the conversation is open' },
+        admin_assignee_id: {
+          type: 'number',
+          description: 'ID of the assigned admin',
+          optional: true,
+        },
+        team_assignee_id: {
+          type: 'string',
+          description: 'ID of the assigned team',
+          optional: true,
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+      },
+    },
+    conversationId: { type: 'string', description: 'ID of the assigned conversation' },
+    admin_assignee_id: {
+      type: 'number',
+      description: 'ID of the assigned admin',
+      optional: true,
+    },
+    team_assignee_id: { type: 'string', description: 'ID of the assigned team', optional: true },
+  },
+}
diff --git a/apps/sim/tools/intercom/attach_contact_to_company.ts b/apps/sim/tools/intercom/attach_contact_to_company.ts
new file mode 100644
index 000000000..9f6cf834b
--- /dev/null
+++ b/apps/sim/tools/intercom/attach_contact_to_company.ts
@@ -0,0 +1,115 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomAttachContactToCompanyParams {
+  accessToken: string
+  contactId: string
+  companyId: string
+}
+
+export interface IntercomAttachContactToCompanyV2Response {
+  success: boolean
+  output: {
+    company: any
+    companyId: string
+    name: string | null
+  }
+}
+
+const attachContactToCompanyBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the contact to attach to the company',
+    },
+    companyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the company to attach the contact to',
+    },
+  },
+
+  request: {
+    url: (params: IntercomAttachContactToCompanyParams) =>
+      buildIntercomUrl(`/contacts/${params.contactId}/companies`),
+    method: 'POST',
+    headers: (params: IntercomAttachContactToCompanyParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomAttachContactToCompanyParams) => ({
+      id: params.companyId,
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomAttachContactToCompanyParams, any>, 'params' | 'request'>
+
+export const intercomAttachContactToCompanyV2Tool: ToolConfig<
+  IntercomAttachContactToCompanyParams,
+  IntercomAttachContactToCompanyV2Response
+> = {
+  ...attachContactToCompanyBase,
+  id: 'intercom_attach_contact_to_company_v2',
+  name: 'Attach Contact to Company in Intercom',
+  description: 'Attach a contact to a company in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'attach_contact_to_company')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        company: {
+          id: data.id,
+          type: data.type ?? 'company',
+          company_id: data.company_id ?? null,
+          name: data.name ?? null,
+          created_at: data.created_at ?? null,
+          updated_at: data.updated_at ?? null,
+          user_count: data.user_count ?? null,
+          session_count: data.session_count ?? null,
+          monthly_spend: data.monthly_spend ?? null,
+          plan: data.plan ?? null,
+        },
+        companyId: data.id,
+        name: data.name ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    company: {
+      type: 'object',
+      description: 'The company object the contact was attached to',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the company' },
+        type: { type: 'string', description: 'Object type (company)' },
+        company_id: { type: 'string', description: 'The company_id you defined' },
+        name: { type: 'string', description: 'Name of the company' },
+        created_at: { type: 'number', description: 'Unix timestamp when company was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when company was updated' },
+        user_count: { type: 'number', description: 'Number of users in the company' },
+        session_count: { type: 'number', description: 'Number of sessions' },
+        monthly_spend: { type: 'number', description: 'Monthly spend amount' },
+        plan: { type: 'object', description: 'Company plan details' },
+      },
+    },
+    companyId: { type: 'string', description: 'ID of the company' },
+    name: { type: 'string', description: 'Name of the company', optional: true },
+  },
+}
diff --git a/apps/sim/tools/intercom/close_conversation.ts b/apps/sim/tools/intercom/close_conversation.ts
new file mode 100644
index 000000000..424b5aa63
--- /dev/null
+++ b/apps/sim/tools/intercom/close_conversation.ts
@@ -0,0 +1,129 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomCloseConversationParams {
+  accessToken: string
+  conversationId: string
+  admin_id: string
+  body?: string
+}
+
+export interface IntercomCloseConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    conversationId: string
+    state: string
+  }
+}
+
+const closeConversationBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    conversationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the conversation to close',
+    },
+    admin_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin performing the action',
+    },
+    body: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Optional closing message to add to the conversation',
+    },
+  },
+
+  request: {
+    url: (params: IntercomCloseConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/parts`),
+    method: 'POST',
+    headers: (params: IntercomCloseConversationParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomCloseConversationParams) => {
+      const payload: any = {
+        message_type: 'close',
+        type: 'admin',
+        admin_id: params.admin_id,
+      }
+
+      if (params.body) {
+        payload.body = params.body
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomCloseConversationParams, any>, 'params' | 'request'>
+
+export const intercomCloseConversationV2Tool: ToolConfig<
+  IntercomCloseConversationParams,
+  IntercomCloseConversationV2Response
+> = {
+  ...closeConversationBase,
+  id: 'intercom_close_conversation_v2',
+  name: 'Close Conversation in Intercom',
+  description: 'Close a conversation in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'close_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: {
+          id: data.id,
+          type: data.type ?? 'conversation',
+          state: data.state ?? 'closed',
+          open: data.open ?? false,
+          read: data.read ?? false,
+          created_at: data.created_at ?? null,
+          updated_at: data.updated_at ?? null,
+        },
+        conversationId: data.id,
+        state: data.state ?? 'closed',
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'The closed conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        state: { type: 'string', description: 'State of the conversation (closed)' },
+        open: { type: 'boolean', description: 'Whether the conversation is open (false)' },
+        read: { type: 'boolean', description: 'Whether the conversation has been read' },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+      },
+    },
+    conversationId: { type: 'string', description: 'ID of the closed conversation' },
+    state: { type: 'string', description: 'State of the conversation (closed)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_company.ts b/apps/sim/tools/intercom/create_company.ts
index 5795afce3..f8848868a 100644
--- a/apps/sim/tools/intercom/create_company.ts
+++ b/apps/sim/tools/intercom/create_company.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomCreateCompany')
 
@@ -60,7 +60,7 @@ const createCompanyBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     company_id: {
diff --git a/apps/sim/tools/intercom/create_contact.ts b/apps/sim/tools/intercom/create_contact.ts
index 6e9a15a99..9d8aded58 100644
--- a/apps/sim/tools/intercom/create_contact.ts
+++ b/apps/sim/tools/intercom/create_contact.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomCreateContact')
 
@@ -88,7 +88,7 @@ const intercomCreateContactBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     role: {
diff --git a/apps/sim/tools/intercom/create_event.ts b/apps/sim/tools/intercom/create_event.ts
new file mode 100644
index 000000000..016ade9d2
--- /dev/null
+++ b/apps/sim/tools/intercom/create_event.ts
@@ -0,0 +1,148 @@
+import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('IntercomCreateEvent')
+
+export interface IntercomCreateEventParams {
+  accessToken: string
+  event_name: string
+  created_at?: number
+  user_id?: string
+  email?: string
+  id?: string
+  metadata?: string
+}
+
+export interface IntercomCreateEventV2Response {
+  success: boolean
+  output: {
+    accepted: boolean
+  }
+}
+
+const createEventBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    event_name: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The name of the event (e.g., "order-completed"). Use past-tense verb-noun format for readability.',
+    },
+    created_at: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Unix timestamp for when the event occurred. Strongly recommended for uniqueness.',
+    },
+    user_id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Your identifier for the user (external_id)',
+    },
+    email: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Email address of the user. Use only if your app uses email to uniquely identify users.',
+    },
+    id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The Intercom contact ID',
+    },
+    metadata: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'JSON object with up to 10 metadata key-value pairs about the event (e.g., {"order_value": 99.99})',
+    },
+  },
+
+  request: {
+    url: () => buildIntercomUrl('/events'),
+    method: 'POST',
+    headers: (params: IntercomCreateEventParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomCreateEventParams) => {
+      const payload: any = {
+        event_name: params.event_name,
+      }
+
+      if (params.created_at) {
+        payload.created_at = params.created_at
+      } else {
+        payload.created_at = Math.floor(Date.now() / 1000)
+      }
+
+      if (params.user_id) {
+        payload.user_id = params.user_id
+      }
+
+      if (params.email) {
+        payload.email = params.email
+      }
+
+      if (params.id) {
+        payload.id = params.id
+      }
+
+      if (params.metadata) {
+        try {
+          payload.metadata = JSON.parse(params.metadata)
+        } catch (error) {
+          logger.warn('Failed to parse metadata, ignoring', { error })
+        }
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomCreateEventParams, any>, 'params' | 'request'>
+
+export const intercomCreateEventV2Tool: ToolConfig<
+  IntercomCreateEventParams,
+  IntercomCreateEventV2Response
+> = {
+  ...createEventBase,
+  id: 'intercom_create_event_v2',
+  name: 'Create Event in Intercom',
+  description: 'Track a custom event for a contact in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_event')
+    }
+
+    return {
+      success: true,
+      output: {
+        accepted: true,
+      },
+    }
+  },
+
+  outputs: {
+    accepted: {
+      type: 'boolean',
+      description: 'Whether the event was accepted (202 Accepted)',
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_message.ts b/apps/sim/tools/intercom/create_message.ts
index 2cea1ce07..0b6ef2fc5 100644
--- a/apps/sim/tools/intercom/create_message.ts
+++ b/apps/sim/tools/intercom/create_message.ts
@@ -1,5 +1,5 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 export interface IntercomCreateMessageParams {
   accessToken: string
@@ -40,7 +40,7 @@ const createMessageBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     message_type: {
diff --git a/apps/sim/tools/intercom/create_note.ts b/apps/sim/tools/intercom/create_note.ts
new file mode 100644
index 000000000..56fa3df26
--- /dev/null
+++ b/apps/sim/tools/intercom/create_note.ts
@@ -0,0 +1,131 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomCreateNoteParams {
+  accessToken: string
+  contactId: string
+  body: string
+  admin_id?: string
+}
+
+export interface IntercomCreateNoteV2Response {
+  success: boolean
+  output: {
+    id: string
+    body: string
+    created_at: number
+    type: string
+    author: any | null
+    contact: any | null
+  }
+}
+
+const createNoteBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the contact to add the note to',
+    },
+    body: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The text content of the note',
+    },
+    admin_id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin creating the note',
+    },
+  },
+
+  request: {
+    url: (params: IntercomCreateNoteParams) =>
+      buildIntercomUrl(`/contacts/${params.contactId}/notes`),
+    method: 'POST',
+    headers: (params: IntercomCreateNoteParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomCreateNoteParams) => {
+      const payload: any = {
+        body: params.body,
+      }
+
+      if (params.admin_id) {
+        payload.admin_id = params.admin_id
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomCreateNoteParams, any>, 'params' | 'request'>
+
+export const intercomCreateNoteV2Tool: ToolConfig<
+  IntercomCreateNoteParams,
+  IntercomCreateNoteV2Response
+> = {
+  ...createNoteBase,
+  id: 'intercom_create_note_v2',
+  name: 'Create Note in Intercom',
+  description: 'Add a note to a specific contact',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_note')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        body: data.body,
+        created_at: data.created_at,
+        type: data.type ?? 'note',
+        author: data.author ?? null,
+        contact: data.contact ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique identifier for the note' },
+    body: { type: 'string', description: 'The text content of the note' },
+    created_at: { type: 'number', description: 'Unix timestamp when the note was created' },
+    type: { type: 'string', description: 'Object type (note)' },
+    author: {
+      type: 'object',
+      description: 'The admin who created the note',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Author type (admin)' },
+        id: { type: 'string', description: 'Author ID' },
+        name: { type: 'string', description: 'Author name' },
+        email: { type: 'string', description: 'Author email' },
+      },
+    },
+    contact: {
+      type: 'object',
+      description: 'The contact the note was created for',
+      optional: true,
+      properties: {
+        type: { type: 'string', description: 'Contact type' },
+        id: { type: 'string', description: 'Contact ID' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_tag.ts b/apps/sim/tools/intercom/create_tag.ts
new file mode 100644
index 000000000..85561f180
--- /dev/null
+++ b/apps/sim/tools/intercom/create_tag.ts
@@ -0,0 +1,97 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomCreateTagParams {
+  accessToken: string
+  name: string
+  id?: string
+}
+
+export interface IntercomCreateTagV2Response {
+  success: boolean
+  output: {
+    id: string
+    name: string
+    type: string
+  }
+}
+
+const createTagBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    name: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The name of the tag. Will create a new tag if not found, or update the name if id is provided.',
+    },
+    id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The ID of an existing tag to update. Omit to create a new tag.',
+    },
+  },
+
+  request: {
+    url: () => buildIntercomUrl('/tags'),
+    method: 'POST',
+    headers: (params: IntercomCreateTagParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomCreateTagParams) => {
+      const payload: any = {
+        name: params.name,
+      }
+
+      if (params.id) {
+        payload.id = params.id
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomCreateTagParams, any>, 'params' | 'request'>
+
+export const intercomCreateTagV2Tool: ToolConfig<
+  IntercomCreateTagParams,
+  IntercomCreateTagV2Response
+> = {
+  ...createTagBase,
+  id: 'intercom_create_tag_v2',
+  name: 'Create Tag in Intercom',
+  description: 'Create a new tag or update an existing tag name',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'create_tag')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        type: data.type ?? 'tag',
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique identifier for the tag' },
+    name: { type: 'string', description: 'Name of the tag' },
+    type: { type: 'string', description: 'Object type (tag)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/create_ticket.ts b/apps/sim/tools/intercom/create_ticket.ts
index 34fae4838..cdcf83375 100644
--- a/apps/sim/tools/intercom/create_ticket.ts
+++ b/apps/sim/tools/intercom/create_ticket.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomCreateTicket')
 
@@ -41,7 +41,7 @@ const createTicketBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     ticket_type_id: {
diff --git a/apps/sim/tools/intercom/delete_contact.ts b/apps/sim/tools/intercom/delete_contact.ts
index 5b5bd9432..87e01e3cf 100644
--- a/apps/sim/tools/intercom/delete_contact.ts
+++ b/apps/sim/tools/intercom/delete_contact.ts
@@ -1,5 +1,5 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 export interface IntercomDeleteContactParams {
   accessToken: string
@@ -23,7 +23,7 @@ const intercomDeleteContactBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     contactId: {
diff --git a/apps/sim/tools/intercom/detach_contact_from_company.ts b/apps/sim/tools/intercom/detach_contact_from_company.ts
new file mode 100644
index 000000000..df18e4998
--- /dev/null
+++ b/apps/sim/tools/intercom/detach_contact_from_company.ts
@@ -0,0 +1,101 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomDetachContactFromCompanyParams {
+  accessToken: string
+  contactId: string
+  companyId: string
+}
+
+export interface IntercomDetachContactFromCompanyV2Response {
+  success: boolean
+  output: {
+    company: any
+    companyId: string
+    name: string | null
+  }
+}
+
+const detachContactFromCompanyBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the contact to detach from the company',
+    },
+    companyId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the company to detach the contact from',
+    },
+  },
+
+  request: {
+    url: (params: IntercomDetachContactFromCompanyParams) =>
+      buildIntercomUrl(`/contacts/${params.contactId}/companies/${params.companyId}`),
+    method: 'DELETE',
+    headers: (params: IntercomDetachContactFromCompanyParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomDetachContactFromCompanyParams, any>, 'params' | 'request'>
+
+export const intercomDetachContactFromCompanyV2Tool: ToolConfig<
+  IntercomDetachContactFromCompanyParams,
+  IntercomDetachContactFromCompanyV2Response
+> = {
+  ...detachContactFromCompanyBase,
+  id: 'intercom_detach_contact_from_company_v2',
+  name: 'Detach Contact from Company in Intercom',
+  description: 'Remove a contact from a company in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'detach_contact_from_company')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        company: {
+          id: data.id,
+          type: data.type ?? 'company',
+          company_id: data.company_id ?? null,
+          name: data.name ?? null,
+        },
+        companyId: data.id,
+        name: data.name ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    company: {
+      type: 'object',
+      description: 'The company object the contact was detached from',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the company' },
+        type: { type: 'string', description: 'Object type (company)' },
+        company_id: { type: 'string', description: 'The company_id you defined' },
+        name: { type: 'string', description: 'Name of the company' },
+      },
+    },
+    companyId: { type: 'string', description: 'ID of the company' },
+    name: { type: 'string', description: 'Name of the company', optional: true },
+  },
+}
diff --git a/apps/sim/tools/intercom/get_company.ts b/apps/sim/tools/intercom/get_company.ts
index ae311a074..1d2474d02 100644
--- a/apps/sim/tools/intercom/get_company.ts
+++ b/apps/sim/tools/intercom/get_company.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomGetCompany')
 
@@ -25,7 +25,7 @@ const getCompanyBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     companyId: {
diff --git a/apps/sim/tools/intercom/get_contact.ts b/apps/sim/tools/intercom/get_contact.ts
index bcba2d892..1090116ed 100644
--- a/apps/sim/tools/intercom/get_contact.ts
+++ b/apps/sim/tools/intercom/get_contact.ts
@@ -1,5 +1,5 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 export interface IntercomGetContactParams {
   accessToken: string
@@ -22,7 +22,7 @@ const intercomGetContactBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     contactId: {
diff --git a/apps/sim/tools/intercom/get_conversation.ts b/apps/sim/tools/intercom/get_conversation.ts
index b5f708fd9..21413b226 100644
--- a/apps/sim/tools/intercom/get_conversation.ts
+++ b/apps/sim/tools/intercom/get_conversation.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomGetConversation')
 
@@ -27,7 +27,7 @@ const getConversationBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     conversationId: {
diff --git a/apps/sim/tools/intercom/get_ticket.ts b/apps/sim/tools/intercom/get_ticket.ts
index da111a6bf..1febb2b7e 100644
--- a/apps/sim/tools/intercom/get_ticket.ts
+++ b/apps/sim/tools/intercom/get_ticket.ts
@@ -1,5 +1,5 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 export interface IntercomGetTicketParams {
   accessToken: string
@@ -31,7 +31,7 @@ const getTicketBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     ticketId: {
diff --git a/apps/sim/tools/intercom/index.ts b/apps/sim/tools/intercom/index.ts
index 626c93cff..143bca0c6 100644
--- a/apps/sim/tools/intercom/index.ts
+++ b/apps/sim/tools/intercom/index.ts
@@ -1,24 +1,28 @@
-// Contact tools
-
-// Company tools
+export { intercomAssignConversationV2Tool } from './assign_conversation'
+export { intercomAttachContactToCompanyV2Tool } from './attach_contact_to_company'
+export { intercomCloseConversationV2Tool } from './close_conversation'
 export { intercomCreateCompanyTool, intercomCreateCompanyV2Tool } from './create_company'
 export { intercomCreateContactTool, intercomCreateContactV2Tool } from './create_contact'
-// Message tools
+export { intercomCreateEventV2Tool } from './create_event'
 export { intercomCreateMessageTool, intercomCreateMessageV2Tool } from './create_message'
-// Ticket tools
+export { intercomCreateNoteV2Tool } from './create_note'
+export { intercomCreateTagV2Tool } from './create_tag'
 export { intercomCreateTicketTool, intercomCreateTicketV2Tool } from './create_ticket'
 export { intercomDeleteContactTool, intercomDeleteContactV2Tool } from './delete_contact'
+export { intercomDetachContactFromCompanyV2Tool } from './detach_contact_from_company'
 export { intercomGetCompanyTool, intercomGetCompanyV2Tool } from './get_company'
 export { intercomGetContactTool, intercomGetContactV2Tool } from './get_contact'
-// Conversation tools
 export { intercomGetConversationTool, intercomGetConversationV2Tool } from './get_conversation'
 export { intercomGetTicketTool, intercomGetTicketV2Tool } from './get_ticket'
+export { intercomListAdminsV2Tool } from './list_admins'
 export { intercomListCompaniesTool, intercomListCompaniesV2Tool } from './list_companies'
 export { intercomListContactsTool, intercomListContactsV2Tool } from './list_contacts'
 export {
   intercomListConversationsTool,
   intercomListConversationsV2Tool,
 } from './list_conversations'
+export { intercomListTagsV2Tool } from './list_tags'
+export { intercomOpenConversationV2Tool } from './open_conversation'
 export {
   intercomReplyConversationTool,
   intercomReplyConversationV2Tool,
@@ -28,4 +32,9 @@ export {
   intercomSearchConversationsTool,
   intercomSearchConversationsV2Tool,
 } from './search_conversations'
+export { intercomSnoozeConversationV2Tool } from './snooze_conversation'
+export { intercomTagContactV2Tool } from './tag_contact'
+export { intercomTagConversationV2Tool } from './tag_conversation'
+export { intercomUntagContactV2Tool } from './untag_contact'
 export { intercomUpdateContactTool, intercomUpdateContactV2Tool } from './update_contact'
+export { intercomUpdateTicketV2Tool } from './update_ticket'
diff --git a/apps/sim/tools/intercom/list_admins.ts b/apps/sim/tools/intercom/list_admins.ts
new file mode 100644
index 000000000..d6ce5c81e
--- /dev/null
+++ b/apps/sim/tools/intercom/list_admins.ts
@@ -0,0 +1,125 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomListAdminsParams {
+  accessToken: string
+}
+
+interface IntercomAdmin {
+  type: string
+  id: string
+  name: string
+  email: string
+  job_title: string | null
+  away_mode_enabled: boolean
+  away_mode_reassign: boolean
+  has_inbox_seat: boolean
+  team_ids: number[]
+  avatar: {
+    type: string
+    image_url: string | null
+  } | null
+  email_verified: boolean | null
+}
+
+export interface IntercomListAdminsV2Response {
+  success: boolean
+  output: {
+    admins: IntercomAdmin[]
+    type: string
+  }
+}
+
+const listAdminsBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+  },
+
+  request: {
+    url: () => buildIntercomUrl('/admins'),
+    method: 'GET',
+    headers: (params: IntercomListAdminsParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomListAdminsParams, any>, 'params' | 'request'>
+
+export const intercomListAdminsV2Tool: ToolConfig<
+  IntercomListAdminsParams,
+  IntercomListAdminsV2Response
+> = {
+  ...listAdminsBase,
+  id: 'intercom_list_admins_v2',
+  name: 'List Admins from Intercom',
+  description: 'Fetch a list of all admins for the workspace',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'list_admins')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        admins: data.admins ?? [],
+        type: data.type ?? 'admin.list',
+      },
+    }
+  },
+
+  outputs: {
+    admins: {
+      type: 'array',
+      description: 'Array of admin objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the admin' },
+          type: { type: 'string', description: 'Object type (admin)' },
+          name: { type: 'string', description: 'Name of the admin' },
+          email: { type: 'string', description: 'Email of the admin' },
+          job_title: { type: 'string', description: 'Job title of the admin', optional: true },
+          away_mode_enabled: {
+            type: 'boolean',
+            description: 'Whether admin is in away mode',
+          },
+          away_mode_reassign: {
+            type: 'boolean',
+            description: 'Whether to reassign conversations when away',
+          },
+          has_inbox_seat: {
+            type: 'boolean',
+            description: 'Whether admin has a paid inbox seat',
+          },
+          team_ids: {
+            type: 'array',
+            description: 'List of team IDs the admin belongs to',
+          },
+          avatar: {
+            type: 'object',
+            description: 'Avatar information',
+            optional: true,
+          },
+          email_verified: {
+            type: 'boolean',
+            description: 'Whether email is verified',
+            optional: true,
+          },
+        },
+      },
+    },
+    type: { type: 'string', description: 'Object type (admin.list)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/list_companies.ts b/apps/sim/tools/intercom/list_companies.ts
index d06030405..10f95ac10 100644
--- a/apps/sim/tools/intercom/list_companies.ts
+++ b/apps/sim/tools/intercom/list_companies.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomListCompanies')
 
@@ -29,7 +29,7 @@ const listCompaniesBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     per_page: {
diff --git a/apps/sim/tools/intercom/list_contacts.ts b/apps/sim/tools/intercom/list_contacts.ts
index 44d7b5c06..b3f483788 100644
--- a/apps/sim/tools/intercom/list_contacts.ts
+++ b/apps/sim/tools/intercom/list_contacts.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomListContacts')
 
@@ -28,7 +28,7 @@ const listContactsBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     per_page: {
diff --git a/apps/sim/tools/intercom/list_conversations.ts b/apps/sim/tools/intercom/list_conversations.ts
index 50542515d..92b52060c 100644
--- a/apps/sim/tools/intercom/list_conversations.ts
+++ b/apps/sim/tools/intercom/list_conversations.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomListConversations')
 
@@ -30,7 +30,7 @@ const listConversationsBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     per_page: {
diff --git a/apps/sim/tools/intercom/list_tags.ts b/apps/sim/tools/intercom/list_tags.ts
new file mode 100644
index 000000000..c59fc2899
--- /dev/null
+++ b/apps/sim/tools/intercom/list_tags.ts
@@ -0,0 +1,86 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomListTagsParams {
+  accessToken: string
+}
+
+interface IntercomTag {
+  type: string
+  id: string
+  name: string
+}
+
+export interface IntercomListTagsV2Response {
+  success: boolean
+  output: {
+    tags: IntercomTag[]
+    type: string
+  }
+}
+
+const listTagsBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+  },
+
+  request: {
+    url: () => buildIntercomUrl('/tags'),
+    method: 'GET',
+    headers: (params: IntercomListTagsParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomListTagsParams, any>, 'params' | 'request'>
+
+export const intercomListTagsV2Tool: ToolConfig<
+  IntercomListTagsParams,
+  IntercomListTagsV2Response
+> = {
+  ...listTagsBase,
+  id: 'intercom_list_tags_v2',
+  name: 'List Tags from Intercom',
+  description: 'Fetch a list of all tags in the workspace',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'list_tags')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        tags: data.tags ?? [],
+        type: data.type ?? 'tag.list',
+      },
+    }
+  },
+
+  outputs: {
+    tags: {
+      type: 'array',
+      description: 'Array of tag objects',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique identifier for the tag' },
+          type: { type: 'string', description: 'Object type (tag)' },
+          name: { type: 'string', description: 'Name of the tag' },
+        },
+      },
+    },
+    type: { type: 'string', description: 'Object type (list)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/open_conversation.ts b/apps/sim/tools/intercom/open_conversation.ts
new file mode 100644
index 000000000..243d889b3
--- /dev/null
+++ b/apps/sim/tools/intercom/open_conversation.ts
@@ -0,0 +1,114 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomOpenConversationParams {
+  accessToken: string
+  conversationId: string
+  admin_id: string
+}
+
+export interface IntercomOpenConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    conversationId: string
+    state: string
+  }
+}
+
+const openConversationBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    conversationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the conversation to open',
+    },
+    admin_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin performing the action',
+    },
+  },
+
+  request: {
+    url: (params: IntercomOpenConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/parts`),
+    method: 'POST',
+    headers: (params: IntercomOpenConversationParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomOpenConversationParams) => ({
+      message_type: 'open',
+      type: 'admin',
+      admin_id: params.admin_id,
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomOpenConversationParams, any>, 'params' | 'request'>
+
+export const intercomOpenConversationV2Tool: ToolConfig<
+  IntercomOpenConversationParams,
+  IntercomOpenConversationV2Response
+> = {
+  ...openConversationBase,
+  id: 'intercom_open_conversation_v2',
+  name: 'Open Conversation in Intercom',
+  description: 'Open a closed or snoozed conversation in Intercom',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'open_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: {
+          id: data.id,
+          type: data.type ?? 'conversation',
+          state: data.state ?? 'open',
+          open: data.open ?? true,
+          read: data.read ?? false,
+          created_at: data.created_at ?? null,
+          updated_at: data.updated_at ?? null,
+        },
+        conversationId: data.id,
+        state: data.state ?? 'open',
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'The opened conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        state: { type: 'string', description: 'State of the conversation (open)' },
+        open: { type: 'boolean', description: 'Whether the conversation is open (true)' },
+        read: { type: 'boolean', description: 'Whether the conversation has been read' },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+      },
+    },
+    conversationId: { type: 'string', description: 'ID of the opened conversation' },
+    state: { type: 'string', description: 'State of the conversation (open)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/reply_conversation.ts b/apps/sim/tools/intercom/reply_conversation.ts
index a6f8cb18f..bf6304af8 100644
--- a/apps/sim/tools/intercom/reply_conversation.ts
+++ b/apps/sim/tools/intercom/reply_conversation.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomReplyConversation')
 
@@ -31,7 +31,7 @@ const replyConversationBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     conversationId: {
diff --git a/apps/sim/tools/intercom/search_contacts.ts b/apps/sim/tools/intercom/search_contacts.ts
index 5c4d7788c..32d314523 100644
--- a/apps/sim/tools/intercom/search_contacts.ts
+++ b/apps/sim/tools/intercom/search_contacts.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomSearchContacts')
 
@@ -87,7 +87,7 @@ const searchContactsBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     query: {
diff --git a/apps/sim/tools/intercom/search_conversations.ts b/apps/sim/tools/intercom/search_conversations.ts
index 8ab9c8f71..4b2c36752 100644
--- a/apps/sim/tools/intercom/search_conversations.ts
+++ b/apps/sim/tools/intercom/search_conversations.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomSearchConversations')
 
@@ -41,7 +41,7 @@ const searchConversationsBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     query: {
diff --git a/apps/sim/tools/intercom/snooze_conversation.ts b/apps/sim/tools/intercom/snooze_conversation.ts
new file mode 100644
index 000000000..717e821e8
--- /dev/null
+++ b/apps/sim/tools/intercom/snooze_conversation.ts
@@ -0,0 +1,124 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomSnoozeConversationParams {
+  accessToken: string
+  conversationId: string
+  admin_id: string
+  snoozed_until: number
+}
+
+export interface IntercomSnoozeConversationV2Response {
+  success: boolean
+  output: {
+    conversation: any
+    conversationId: string
+    state: string
+    snoozed_until: number | null
+  }
+}
+
+const snoozeConversationBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    conversationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the conversation to snooze',
+    },
+    admin_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin performing the action',
+    },
+    snoozed_until: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Unix timestamp for when the conversation should reopen',
+    },
+  },
+
+  request: {
+    url: (params: IntercomSnoozeConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/reply`),
+    method: 'POST',
+    headers: (params: IntercomSnoozeConversationParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomSnoozeConversationParams) => ({
+      message_type: 'snoozed',
+      admin_id: params.admin_id,
+      snoozed_until: params.snoozed_until,
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomSnoozeConversationParams, any>, 'params' | 'request'>
+
+export const intercomSnoozeConversationV2Tool: ToolConfig<
+  IntercomSnoozeConversationParams,
+  IntercomSnoozeConversationV2Response
+> = {
+  ...snoozeConversationBase,
+  id: 'intercom_snooze_conversation_v2',
+  name: 'Snooze Conversation in Intercom',
+  description: 'Snooze a conversation to reopen at a future time',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'snooze_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        conversation: data,
+        conversationId: data.id,
+        state: data.state ?? 'snoozed',
+        snoozed_until: data.snoozed_until ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    conversation: {
+      type: 'object',
+      description: 'The snoozed conversation object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the conversation' },
+        type: { type: 'string', description: 'Object type (conversation)' },
+        state: { type: 'string', description: 'State of the conversation (snoozed)' },
+        open: { type: 'boolean', description: 'Whether the conversation is open' },
+        snoozed_until: {
+          type: 'number',
+          description: 'Unix timestamp when conversation will reopen',
+          optional: true,
+        },
+        created_at: { type: 'number', description: 'Unix timestamp when conversation was created' },
+        updated_at: {
+          type: 'number',
+          description: 'Unix timestamp when conversation was last updated',
+        },
+      },
+    },
+    conversationId: { type: 'string', description: 'ID of the snoozed conversation' },
+    state: { type: 'string', description: 'State of the conversation (snoozed)' },
+    snoozed_until: {
+      type: 'number',
+      description: 'Unix timestamp when conversation will reopen',
+      optional: true,
+    },
+  },
+}
diff --git a/apps/sim/tools/intercom/tag_contact.ts b/apps/sim/tools/intercom/tag_contact.ts
new file mode 100644
index 000000000..c2a2628a2
--- /dev/null
+++ b/apps/sim/tools/intercom/tag_contact.ts
@@ -0,0 +1,89 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomTagContactParams {
+  accessToken: string
+  contactId: string
+  tagId: string
+}
+
+export interface IntercomTagContactV2Response {
+  success: boolean
+  output: {
+    id: string
+    name: string
+    type: string
+  }
+}
+
+const tagContactBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the contact to tag',
+    },
+    tagId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the tag to apply',
+    },
+  },
+
+  request: {
+    url: (params: IntercomTagContactParams) =>
+      buildIntercomUrl(`/contacts/${params.contactId}/tags`),
+    method: 'POST',
+    headers: (params: IntercomTagContactParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomTagContactParams) => ({
+      id: params.tagId,
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomTagContactParams, any>, 'params' | 'request'>
+
+export const intercomTagContactV2Tool: ToolConfig<
+  IntercomTagContactParams,
+  IntercomTagContactV2Response
+> = {
+  ...tagContactBase,
+  id: 'intercom_tag_contact_v2',
+  name: 'Tag Contact in Intercom',
+  description: 'Add a tag to a specific contact',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'tag_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        type: data.type ?? 'tag',
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique identifier for the tag' },
+    name: { type: 'string', description: 'Name of the tag' },
+    type: { type: 'string', description: 'Object type (tag)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/tag_conversation.ts b/apps/sim/tools/intercom/tag_conversation.ts
new file mode 100644
index 000000000..18485f74f
--- /dev/null
+++ b/apps/sim/tools/intercom/tag_conversation.ts
@@ -0,0 +1,97 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomTagConversationParams {
+  accessToken: string
+  conversationId: string
+  tagId: string
+  admin_id: string
+}
+
+export interface IntercomTagConversationV2Response {
+  success: boolean
+  output: {
+    id: string
+    name: string
+    type: string
+  }
+}
+
+const tagConversationBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    conversationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the conversation to tag',
+    },
+    tagId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the tag to apply',
+    },
+    admin_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin applying the tag',
+    },
+  },
+
+  request: {
+    url: (params: IntercomTagConversationParams) =>
+      buildIntercomUrl(`/conversations/${params.conversationId}/tags`),
+    method: 'POST',
+    headers: (params: IntercomTagConversationParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomTagConversationParams) => ({
+      id: params.tagId,
+      admin_id: params.admin_id,
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomTagConversationParams, any>, 'params' | 'request'>
+
+export const intercomTagConversationV2Tool: ToolConfig<
+  IntercomTagConversationParams,
+  IntercomTagConversationV2Response
+> = {
+  ...tagConversationBase,
+  id: 'intercom_tag_conversation_v2',
+  name: 'Tag Conversation in Intercom',
+  description: 'Add a tag to a specific conversation',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'tag_conversation')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        type: data.type ?? 'tag',
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique identifier for the tag' },
+    name: { type: 'string', description: 'Name of the tag' },
+    type: { type: 'string', description: 'Object type (tag)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/types.ts b/apps/sim/tools/intercom/types.ts
index d15940d3f..c2a17b787 100644
--- a/apps/sim/tools/intercom/types.ts
+++ b/apps/sim/tools/intercom/types.ts
@@ -2,14 +2,13 @@ import { createLogger } from '@sim/logger'
 
 const logger = createLogger('Intercom')
 
-// Base params for Intercom API
 export interface IntercomBaseParams {
-  accessToken: string // OAuth token or API token (hidden)
+  accessToken: string
 }
 
 export interface IntercomPaginationParams {
   per_page?: number
-  starting_after?: string // Cursor for pagination
+  starting_after?: string
 }
 
 export interface IntercomPagingInfo {
@@ -33,12 +32,10 @@ export interface IntercomResponse<T> {
   }
 }
 
-// Helper function to build Intercom API URLs
 export function buildIntercomUrl(path: string): string {
   return `https://api.intercom.io${path}`
 }
 
-// Helper function for consistent error handling
 export function handleIntercomError(data: any, status: number, operation: string): never {
   logger.error(`Intercom API request failed for ${operation}`, { data, status })
 
diff --git a/apps/sim/tools/intercom/untag_contact.ts b/apps/sim/tools/intercom/untag_contact.ts
new file mode 100644
index 000000000..c5e8cc351
--- /dev/null
+++ b/apps/sim/tools/intercom/untag_contact.ts
@@ -0,0 +1,87 @@
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+export interface IntercomUntagContactParams {
+  accessToken: string
+  contactId: string
+  tagId: string
+}
+
+export interface IntercomUntagContactV2Response {
+  success: boolean
+  output: {
+    id: string
+    name: string
+    type: string
+  }
+}
+
+const untagContactBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    contactId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the contact to untag',
+    },
+    tagId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the tag to remove',
+    },
+  },
+
+  request: {
+    url: (params: IntercomUntagContactParams) =>
+      buildIntercomUrl(`/contacts/${params.contactId}/tags/${params.tagId}`),
+    method: 'DELETE',
+    headers: (params: IntercomUntagContactParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+  },
+} satisfies Pick<ToolConfig<IntercomUntagContactParams, any>, 'params' | 'request'>
+
+export const intercomUntagContactV2Tool: ToolConfig<
+  IntercomUntagContactParams,
+  IntercomUntagContactV2Response
+> = {
+  ...untagContactBase,
+  id: 'intercom_untag_contact_v2',
+  name: 'Untag Contact in Intercom',
+  description: 'Remove a tag from a specific contact',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'untag_contact')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        name: data.name,
+        type: data.type ?? 'tag',
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique identifier for the tag that was removed' },
+    name: { type: 'string', description: 'Name of the tag that was removed' },
+    type: { type: 'string', description: 'Object type (tag)' },
+  },
+}
diff --git a/apps/sim/tools/intercom/update_contact.ts b/apps/sim/tools/intercom/update_contact.ts
index 7ac467d9f..9a5ce7e9e 100644
--- a/apps/sim/tools/intercom/update_contact.ts
+++ b/apps/sim/tools/intercom/update_contact.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildIntercomUrl, handleIntercomError } from './types'
 
 const logger = createLogger('IntercomUpdateContact')
 
@@ -38,7 +38,7 @@ const intercomUpdateContactBase = {
     accessToken: {
       type: 'string',
       required: true,
-      visibility: 'hidden',
+      visibility: 'user-only',
       description: 'Intercom API access token',
     },
     contactId: {
diff --git a/apps/sim/tools/intercom/update_ticket.ts b/apps/sim/tools/intercom/update_ticket.ts
new file mode 100644
index 000000000..6f8bc1f66
--- /dev/null
+++ b/apps/sim/tools/intercom/update_ticket.ts
@@ -0,0 +1,193 @@
+import { createLogger } from '@sim/logger'
+import { buildIntercomUrl, handleIntercomError } from '@/tools/intercom/types'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('IntercomUpdateTicket')
+
+export interface IntercomUpdateTicketParams {
+  accessToken: string
+  ticketId: string
+  ticket_attributes?: string
+  open?: boolean
+  is_shared?: boolean
+  snoozed_until?: number
+  admin_id?: string
+  assignee_id?: string
+}
+
+export interface IntercomUpdateTicketV2Response {
+  success: boolean
+  output: {
+    ticket: any
+    ticketId: string
+    ticket_state: string
+  }
+}
+
+const updateTicketBase = {
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Intercom API access token',
+    },
+    ticketId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the ticket to update',
+    },
+    ticket_attributes: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'JSON object with ticket attributes (e.g., {"_default_title_":"New Title","_default_description_":"Updated description"})',
+    },
+    open: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Set to false to close the ticket, true to keep it open',
+    },
+    is_shared: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the ticket is visible to users',
+    },
+    snoozed_until: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Unix timestamp for when the ticket should reopen',
+    },
+    admin_id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The ID of the admin performing the update (needed for workflows and attribution)',
+    },
+    assignee_id: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The ID of the admin or team to assign the ticket to. Set to "0" to unassign.',
+    },
+  },
+
+  request: {
+    url: (params: IntercomUpdateTicketParams) => buildIntercomUrl(`/tickets/${params.ticketId}`),
+    method: 'PUT',
+    headers: (params: IntercomUpdateTicketParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+      'Intercom-Version': '2.14',
+    }),
+    body: (params: IntercomUpdateTicketParams) => {
+      const payload: any = {}
+
+      if (params.ticket_attributes) {
+        try {
+          payload.ticket_attributes = JSON.parse(params.ticket_attributes)
+        } catch (error) {
+          logger.error('Failed to parse ticket_attributes', { error })
+          throw new Error('ticket_attributes must be a valid JSON object')
+        }
+      }
+
+      if (params.open !== undefined) {
+        payload.open = params.open
+      }
+
+      if (params.is_shared !== undefined) {
+        payload.is_shared = params.is_shared
+      }
+
+      if (params.snoozed_until !== undefined) {
+        payload.snoozed_until = params.snoozed_until
+      }
+
+      if (params.admin_id) {
+        payload.admin_id = params.admin_id
+      }
+
+      if (params.assignee_id) {
+        payload.assignee_id = params.assignee_id
+      }
+
+      return payload
+    },
+  },
+} satisfies Pick<ToolConfig<IntercomUpdateTicketParams, any>, 'params' | 'request'>
+
+export const intercomUpdateTicketV2Tool: ToolConfig<
+  IntercomUpdateTicketParams,
+  IntercomUpdateTicketV2Response
+> = {
+  ...updateTicketBase,
+  id: 'intercom_update_ticket_v2',
+  name: 'Update Ticket in Intercom',
+  description: 'Update a ticket in Intercom (change state, assignment, attributes)',
+  version: '2.0.0',
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      handleIntercomError(data, response.status, 'update_ticket')
+    }
+
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        ticket: {
+          id: data.id,
+          type: data.type ?? 'ticket',
+          ticket_id: data.ticket_id ?? null,
+          ticket_state: data.ticket_state ?? null,
+          ticket_attributes: data.ticket_attributes ?? null,
+          open: data.open ?? null,
+          is_shared: data.is_shared ?? null,
+          snoozed_until: data.snoozed_until ?? null,
+          admin_assignee_id: data.admin_assignee_id ?? null,
+          team_assignee_id: data.team_assignee_id ?? null,
+          created_at: data.created_at ?? null,
+          updated_at: data.updated_at ?? null,
+        },
+        ticketId: data.id,
+        ticket_state: data.ticket_state ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    ticket: {
+      type: 'object',
+      description: 'The updated ticket object',
+      properties: {
+        id: { type: 'string', description: 'Unique identifier for the ticket' },
+        type: { type: 'string', description: 'Object type (ticket)' },
+        ticket_id: { type: 'string', description: 'Ticket ID shown in Intercom UI' },
+        ticket_state: { type: 'string', description: 'State of the ticket' },
+        ticket_attributes: { type: 'object', description: 'Attributes of the ticket' },
+        open: { type: 'boolean', description: 'Whether the ticket is open' },
+        is_shared: { type: 'boolean', description: 'Whether the ticket is visible to users' },
+        snoozed_until: {
+          type: 'number',
+          description: 'Unix timestamp when ticket will reopen',
+          optional: true,
+        },
+        admin_assignee_id: { type: 'string', description: 'ID of assigned admin', optional: true },
+        team_assignee_id: { type: 'string', description: 'ID of assigned team', optional: true },
+        created_at: { type: 'number', description: 'Unix timestamp when ticket was created' },
+        updated_at: { type: 'number', description: 'Unix timestamp when ticket was last updated' },
+      },
+    },
+    ticketId: { type: 'string', description: 'ID of the updated ticket' },
+    ticket_state: { type: 'string', description: 'Current state of the ticket' },
+  },
+}
diff --git a/apps/sim/tools/polymarket/get_activity.ts b/apps/sim/tools/polymarket/get_activity.ts
index 33a4daa34..5f04d5976 100644
--- a/apps/sim/tools/polymarket/get_activity.ts
+++ b/apps/sim/tools/polymarket/get_activity.ts
@@ -1,6 +1,6 @@
+import type { PolymarketActivity } from '@/tools/polymarket/types'
+import { buildDataUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketActivity } from './types'
-import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetActivityParams {
   user: string
diff --git a/apps/sim/tools/polymarket/get_event.ts b/apps/sim/tools/polymarket/get_event.ts
index 037f22687..e957f6dd2 100644
--- a/apps/sim/tools/polymarket/get_event.ts
+++ b/apps/sim/tools/polymarket/get_event.ts
@@ -1,6 +1,6 @@
+import type { PolymarketEvent } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketEvent } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetEventParams {
   eventId?: string // Event ID
diff --git a/apps/sim/tools/polymarket/get_events.ts b/apps/sim/tools/polymarket/get_events.ts
index 8eb9e5d92..8b030f46f 100644
--- a/apps/sim/tools/polymarket/get_events.ts
+++ b/apps/sim/tools/polymarket/get_events.ts
@@ -1,6 +1,6 @@
+import type { PolymarketEvent, PolymarketPaginationParams } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketEvent, PolymarketPaginationParams } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetEventsParams extends PolymarketPaginationParams {
   closed?: string
diff --git a/apps/sim/tools/polymarket/get_holders.ts b/apps/sim/tools/polymarket/get_holders.ts
index 197ea2a22..8fe772a92 100644
--- a/apps/sim/tools/polymarket/get_holders.ts
+++ b/apps/sim/tools/polymarket/get_holders.ts
@@ -1,6 +1,6 @@
+import type { PolymarketMarketHolders } from '@/tools/polymarket/types'
+import { buildDataUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketMarketHolders } from './types'
-import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetHoldersParams {
   market: string
diff --git a/apps/sim/tools/polymarket/get_last_trade_price.ts b/apps/sim/tools/polymarket/get_last_trade_price.ts
index d429bec08..92f4e52b0 100644
--- a/apps/sim/tools/polymarket/get_last_trade_price.ts
+++ b/apps/sim/tools/polymarket/get_last_trade_price.ts
@@ -1,5 +1,5 @@
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetLastTradePriceParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_leaderboard.ts b/apps/sim/tools/polymarket/get_leaderboard.ts
index 039f3e83e..0fb0485e7 100644
--- a/apps/sim/tools/polymarket/get_leaderboard.ts
+++ b/apps/sim/tools/polymarket/get_leaderboard.ts
@@ -1,6 +1,6 @@
+import type { PolymarketLeaderboardEntry } from '@/tools/polymarket/types'
+import { buildDataUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketLeaderboardEntry } from './types'
-import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetLeaderboardParams {
   category?: string
diff --git a/apps/sim/tools/polymarket/get_market.ts b/apps/sim/tools/polymarket/get_market.ts
index 606bff4f6..493a1bbec 100644
--- a/apps/sim/tools/polymarket/get_market.ts
+++ b/apps/sim/tools/polymarket/get_market.ts
@@ -1,6 +1,6 @@
+import type { PolymarketMarket } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketMarket } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetMarketParams {
   marketId?: string // Market ID
diff --git a/apps/sim/tools/polymarket/get_markets.ts b/apps/sim/tools/polymarket/get_markets.ts
index 9a480e0a4..d4215bf50 100644
--- a/apps/sim/tools/polymarket/get_markets.ts
+++ b/apps/sim/tools/polymarket/get_markets.ts
@@ -1,6 +1,6 @@
+import type { PolymarketMarket, PolymarketPaginationParams } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketMarket, PolymarketPaginationParams } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetMarketsParams extends PolymarketPaginationParams {
   closed?: string
diff --git a/apps/sim/tools/polymarket/get_midpoint.ts b/apps/sim/tools/polymarket/get_midpoint.ts
index 7ea9abc1a..17723163e 100644
--- a/apps/sim/tools/polymarket/get_midpoint.ts
+++ b/apps/sim/tools/polymarket/get_midpoint.ts
@@ -1,5 +1,5 @@
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetMidpointParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_orderbook.ts b/apps/sim/tools/polymarket/get_orderbook.ts
index 6bd400fe6..0bd792443 100644
--- a/apps/sim/tools/polymarket/get_orderbook.ts
+++ b/apps/sim/tools/polymarket/get_orderbook.ts
@@ -1,6 +1,6 @@
+import type { PolymarketOrderBook } from '@/tools/polymarket/types'
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketOrderBook } from './types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetOrderbookParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_positions.ts b/apps/sim/tools/polymarket/get_positions.ts
index 0968b59b2..cc2d66e7a 100644
--- a/apps/sim/tools/polymarket/get_positions.ts
+++ b/apps/sim/tools/polymarket/get_positions.ts
@@ -1,6 +1,6 @@
+import type { PolymarketPosition } from '@/tools/polymarket/types'
+import { buildDataUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPosition } from './types'
-import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetPositionsParams {
   user: string
diff --git a/apps/sim/tools/polymarket/get_price.ts b/apps/sim/tools/polymarket/get_price.ts
index 8506c5101..4bae1f67f 100644
--- a/apps/sim/tools/polymarket/get_price.ts
+++ b/apps/sim/tools/polymarket/get_price.ts
@@ -1,5 +1,5 @@
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetPriceParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_price_history.ts b/apps/sim/tools/polymarket/get_price_history.ts
index 0c258cda4..deb4f362c 100644
--- a/apps/sim/tools/polymarket/get_price_history.ts
+++ b/apps/sim/tools/polymarket/get_price_history.ts
@@ -1,6 +1,6 @@
+import type { PolymarketPriceHistoryEntry } from '@/tools/polymarket/types'
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPriceHistoryEntry } from './types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetPriceHistoryParams {
   tokenId: string
diff --git a/apps/sim/tools/polymarket/get_series.ts b/apps/sim/tools/polymarket/get_series.ts
index 1c61fe1d2..c209dfbb5 100644
--- a/apps/sim/tools/polymarket/get_series.ts
+++ b/apps/sim/tools/polymarket/get_series.ts
@@ -1,6 +1,6 @@
+import type { PolymarketPaginationParams, PolymarketSeries } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPaginationParams, PolymarketSeries } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetSeriesParams extends PolymarketPaginationParams {}
 
diff --git a/apps/sim/tools/polymarket/get_series_by_id.ts b/apps/sim/tools/polymarket/get_series_by_id.ts
index f1a1101a3..790d7ab4e 100644
--- a/apps/sim/tools/polymarket/get_series_by_id.ts
+++ b/apps/sim/tools/polymarket/get_series_by_id.ts
@@ -1,6 +1,6 @@
+import type { PolymarketSeries } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketSeries } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetSeriesByIdParams {
   seriesId: string // Series ID (required)
diff --git a/apps/sim/tools/polymarket/get_spread.ts b/apps/sim/tools/polymarket/get_spread.ts
index 73a210352..0eff8c44c 100644
--- a/apps/sim/tools/polymarket/get_spread.ts
+++ b/apps/sim/tools/polymarket/get_spread.ts
@@ -1,6 +1,6 @@
+import type { PolymarketSpread } from '@/tools/polymarket/types'
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketSpread } from './types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetSpreadParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_tags.ts b/apps/sim/tools/polymarket/get_tags.ts
index a2af8ddf9..8dba40c10 100644
--- a/apps/sim/tools/polymarket/get_tags.ts
+++ b/apps/sim/tools/polymarket/get_tags.ts
@@ -1,6 +1,6 @@
+import type { PolymarketPaginationParams, PolymarketTag } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketPaginationParams, PolymarketTag } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetTagsParams extends PolymarketPaginationParams {}
 
diff --git a/apps/sim/tools/polymarket/get_tick_size.ts b/apps/sim/tools/polymarket/get_tick_size.ts
index 956c44930..e869c5cac 100644
--- a/apps/sim/tools/polymarket/get_tick_size.ts
+++ b/apps/sim/tools/polymarket/get_tick_size.ts
@@ -1,5 +1,5 @@
+import { buildClobUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import { buildClobUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetTickSizeParams {
   tokenId: string // The token ID (CLOB token ID from market)
diff --git a/apps/sim/tools/polymarket/get_trades.ts b/apps/sim/tools/polymarket/get_trades.ts
index fe0f7893d..2bdeb9f15 100644
--- a/apps/sim/tools/polymarket/get_trades.ts
+++ b/apps/sim/tools/polymarket/get_trades.ts
@@ -1,6 +1,6 @@
+import type { PolymarketTrade } from '@/tools/polymarket/types'
+import { buildDataUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketTrade } from './types'
-import { buildDataUrl, handlePolymarketError } from './types'
 
 export interface PolymarketGetTradesParams {
   user?: string
diff --git a/apps/sim/tools/polymarket/index.ts b/apps/sim/tools/polymarket/index.ts
index 80727214a..bc85dc348 100644
--- a/apps/sim/tools/polymarket/index.ts
+++ b/apps/sim/tools/polymarket/index.ts
@@ -1,21 +1,20 @@
-export * from './get_activity'
-export * from './get_event'
-export * from './get_events'
-export * from './get_holders'
-export * from './get_last_trade_price'
-export * from './get_leaderboard'
-export * from './get_market'
-export * from './get_markets'
-export * from './get_midpoint'
-export * from './get_orderbook'
-export * from './get_positions'
-export * from './get_price'
-export * from './get_price_history'
-export * from './get_series'
-export * from './get_series_by_id'
-export * from './get_spread'
-export * from './get_tags'
-export * from './get_tick_size'
-export * from './get_trades'
-export * from './search'
-export * from './types'
+export { polymarketGetActivityTool } from './get_activity'
+export { polymarketGetEventTool } from './get_event'
+export { polymarketGetEventsTool } from './get_events'
+export { polymarketGetHoldersTool } from './get_holders'
+export { polymarketGetLastTradePriceTool } from './get_last_trade_price'
+export { polymarketGetLeaderboardTool } from './get_leaderboard'
+export { polymarketGetMarketTool } from './get_market'
+export { polymarketGetMarketsTool } from './get_markets'
+export { polymarketGetMidpointTool } from './get_midpoint'
+export { polymarketGetOrderbookTool } from './get_orderbook'
+export { polymarketGetPositionsTool } from './get_positions'
+export { polymarketGetPriceTool } from './get_price'
+export { polymarketGetPriceHistoryTool } from './get_price_history'
+export { polymarketGetSeriesTool } from './get_series'
+export { polymarketGetSeriesByIdTool } from './get_series_by_id'
+export { polymarketGetSpreadTool } from './get_spread'
+export { polymarketGetTagsTool } from './get_tags'
+export { polymarketGetTickSizeTool } from './get_tick_size'
+export { polymarketGetTradesTool } from './get_trades'
+export { polymarketSearchTool } from './search'
diff --git a/apps/sim/tools/polymarket/search.ts b/apps/sim/tools/polymarket/search.ts
index c3b9c48aa..342185824 100644
--- a/apps/sim/tools/polymarket/search.ts
+++ b/apps/sim/tools/polymarket/search.ts
@@ -1,6 +1,6 @@
+import type { PolymarketSearchResult } from '@/tools/polymarket/types'
+import { buildGammaUrl, handlePolymarketError } from '@/tools/polymarket/types'
 import type { ToolConfig } from '@/tools/types'
-import type { PolymarketSearchResult } from './types'
-import { buildGammaUrl, handlePolymarketError } from './types'
 
 export interface PolymarketSearchParams {
   query: string
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index 30665b721..ac477b5ed 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -663,16 +663,23 @@ import {
   incidentioWorkflowsUpdateTool,
 } from '@/tools/incidentio'
 import {
+  intercomAssignConversationV2Tool,
+  intercomAttachContactToCompanyV2Tool,
+  intercomCloseConversationV2Tool,
   intercomCreateCompanyTool,
   intercomCreateCompanyV2Tool,
   intercomCreateContactTool,
   intercomCreateContactV2Tool,
+  intercomCreateEventV2Tool,
   intercomCreateMessageTool,
   intercomCreateMessageV2Tool,
+  intercomCreateNoteV2Tool,
+  intercomCreateTagV2Tool,
   intercomCreateTicketTool,
   intercomCreateTicketV2Tool,
   intercomDeleteContactTool,
   intercomDeleteContactV2Tool,
+  intercomDetachContactFromCompanyV2Tool,
   intercomGetCompanyTool,
   intercomGetCompanyV2Tool,
   intercomGetContactTool,
@@ -681,20 +688,28 @@ import {
   intercomGetConversationV2Tool,
   intercomGetTicketTool,
   intercomGetTicketV2Tool,
+  intercomListAdminsV2Tool,
   intercomListCompaniesTool,
   intercomListCompaniesV2Tool,
   intercomListContactsTool,
   intercomListContactsV2Tool,
   intercomListConversationsTool,
   intercomListConversationsV2Tool,
+  intercomListTagsV2Tool,
+  intercomOpenConversationV2Tool,
   intercomReplyConversationTool,
   intercomReplyConversationV2Tool,
   intercomSearchContactsTool,
   intercomSearchContactsV2Tool,
   intercomSearchConversationsTool,
   intercomSearchConversationsV2Tool,
+  intercomSnoozeConversationV2Tool,
+  intercomTagContactV2Tool,
+  intercomTagConversationV2Tool,
+  intercomUntagContactV2Tool,
   intercomUpdateContactTool,
   intercomUpdateContactV2Tool,
+  intercomUpdateTicketV2Tool,
 } from '@/tools/intercom'
 import { jinaReadUrlTool, jinaSearchTool } from '@/tools/jina'
 import {
@@ -3126,8 +3141,23 @@ export const tools: Record<string, ToolConfig> = {
   intercom_create_ticket_v2: intercomCreateTicketV2Tool,
   intercom_get_ticket: intercomGetTicketTool,
   intercom_get_ticket_v2: intercomGetTicketV2Tool,
+  intercom_update_ticket_v2: intercomUpdateTicketV2Tool,
   intercom_create_message: intercomCreateMessageTool,
   intercom_create_message_v2: intercomCreateMessageV2Tool,
+  intercom_list_admins_v2: intercomListAdminsV2Tool,
+  intercom_close_conversation_v2: intercomCloseConversationV2Tool,
+  intercom_open_conversation_v2: intercomOpenConversationV2Tool,
+  intercom_snooze_conversation_v2: intercomSnoozeConversationV2Tool,
+  intercom_assign_conversation_v2: intercomAssignConversationV2Tool,
+  intercom_list_tags_v2: intercomListTagsV2Tool,
+  intercom_create_tag_v2: intercomCreateTagV2Tool,
+  intercom_tag_contact_v2: intercomTagContactV2Tool,
+  intercom_untag_contact_v2: intercomUntagContactV2Tool,
+  intercom_tag_conversation_v2: intercomTagConversationV2Tool,
+  intercom_create_note_v2: intercomCreateNoteV2Tool,
+  intercom_create_event_v2: intercomCreateEventV2Tool,
+  intercom_attach_contact_to_company_v2: intercomAttachContactToCompanyV2Tool,
+  intercom_detach_contact_from_company_v2: intercomDetachContactFromCompanyV2Tool,
   sentry_issues_list: listIssuesTool,
   sentry_issues_get: getIssueTool,
   sentry_issues_update: updateIssueTool,