diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 5f51aca438..40d1324323 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -374,7 +374,7 @@ In addition, you will need to update the registries:
    Add your block to the blocks registry (`/apps/sim/blocks/registry.ts`):
 
    ```typescript:/apps/sim/blocks/registry.ts
-   import { PineconeBlock } from './blocks/pinecone'
+   import { PineconeBlock } from '@/blocks/blocks/pinecone'
 
    // Registry of all available blocks
    export const registry: Record<string, BlockConfig> = {
diff --git a/apps/docs/components/ui/block-info-card.tsx b/apps/docs/components/ui/block-info-card.tsx
index b9d034898f..6474f24acc 100644
--- a/apps/docs/components/ui/block-info-card.tsx
+++ b/apps/docs/components/ui/block-info-card.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type * as React from 'react'
-import { blockTypeToIconMap } from './icon-mapping'
+import { blockTypeToIconMap } from '@/components/ui/icon-mapping'
 
 interface BlockInfoCardProps {
   type: string
diff --git a/apps/docs/components/ui/image.tsx b/apps/docs/components/ui/image.tsx
index 88864af923..6cf9f2d478 100644
--- a/apps/docs/components/ui/image.tsx
+++ b/apps/docs/components/ui/image.tsx
@@ -2,8 +2,8 @@
 
 import { useState } from 'react'
 import NextImage, { type ImageProps as NextImageProps } from 'next/image'
+import { Lightbox } from '@/components/ui/lightbox'
 import { cn } from '@/lib/utils'
-import { Lightbox } from './lightbox'
 
 interface ImageProps extends Omit<NextImageProps, 'className'> {
   className?: string
diff --git a/apps/sim/app/(auth)/components/auth-background.tsx b/apps/sim/app/(auth)/components/auth-background.tsx
index 0f522c521d..ec12774a19 100644
--- a/apps/sim/app/(auth)/components/auth-background.tsx
+++ b/apps/sim/app/(auth)/components/auth-background.tsx
@@ -1,5 +1,5 @@
 import { cn } from '@/lib/utils'
-import AuthBackgroundSVG from './auth-background-svg'
+import AuthBackgroundSVG from '@/app/(auth)/components/auth-background-svg'
 
 type AuthBackgroundProps = {
   className?: string
diff --git a/apps/sim/app/(auth)/components/social-login-buttons.tsx b/apps/sim/app/(auth)/components/social-login-buttons.tsx
index 12efe9a6af..19d2a8cb5c 100644
--- a/apps/sim/app/(auth)/components/social-login-buttons.tsx
+++ b/apps/sim/app/(auth)/components/social-login-buttons.tsx
@@ -4,7 +4,7 @@ import { type ReactNode, useEffect, useState } from 'react'
 import { GithubIcon, GoogleIcon } from '@/components/icons'
 import { Button } from '@/components/ui/button'
 import { client } from '@/lib/auth-client'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface SocialLoginButtonsProps {
   githubAvailable: boolean
diff --git a/apps/sim/app/(auth)/layout.tsx b/apps/sim/app/(auth)/layout.tsx
index 3a8131337f..aaa76e0bf1 100644
--- a/apps/sim/app/(auth)/layout.tsx
+++ b/apps/sim/app/(auth)/layout.tsx
@@ -1,8 +1,8 @@
 'use client'
 
 import { useEffect } from 'react'
+import AuthBackground from '@/app/(auth)/components/auth-background'
 import Nav from '@/app/(landing)/components/nav/nav'
-import AuthBackground from './components/auth-background'
 
 // Helper to detect if a color is dark
 function isColorDark(hexColor: string): boolean {
diff --git a/apps/sim/app/(auth)/login/login-form.tsx b/apps/sim/app/(auth)/login/login-form.tsx
index b37ae78647..37a948f4f9 100644
--- a/apps/sim/app/(auth)/login/login-form.tsx
+++ b/apps/sim/app/(auth)/login/login-form.tsx
@@ -20,10 +20,10 @@ import { getEnv, isFalsy, isTruthy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBaseUrl } from '@/lib/urls/utils'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('LoginForm')
 
diff --git a/apps/sim/app/(auth)/reset-password/page.tsx b/apps/sim/app/(auth)/reset-password/page.tsx
index f70c372887..e1d2112645 100644
--- a/apps/sim/app/(auth)/reset-password/page.tsx
+++ b/apps/sim/app/(auth)/reset-password/page.tsx
@@ -4,9 +4,9 @@ import { Suspense, useEffect, useState } from 'react'
 import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { createLogger } from '@/lib/logs/console/logger'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { SetNewPasswordForm } from '@/app/(auth)/reset-password/reset-password-form'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('ResetPasswordPage')
 
diff --git a/apps/sim/app/(auth)/reset-password/reset-password-form.tsx b/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
index 8d22e54838..5c8a30e842 100644
--- a/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
+++ b/apps/sim/app/(auth)/reset-password/reset-password-form.tsx
@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/utils'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface RequestResetFormProps {
   email: string
diff --git a/apps/sim/app/(auth)/signup/signup-form.tsx b/apps/sim/app/(auth)/signup/signup-form.tsx
index 4dbc4cb0ab..c908d006a9 100644
--- a/apps/sim/app/(auth)/signup/signup-form.tsx
+++ b/apps/sim/app/(auth)/signup/signup-form.tsx
@@ -12,10 +12,10 @@ import { quickValidateEmail } from '@/lib/email/validation'
 import { getEnv, isFalsy, isTruthy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 import { SSOLoginButton } from '@/app/(auth)/components/sso-login-button'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('SignupForm')
 
diff --git a/apps/sim/app/(auth)/sso/page.tsx b/apps/sim/app/(auth)/sso/page.tsx
index 4ecb92f9bf..ba8b82d022 100644
--- a/apps/sim/app/(auth)/sso/page.tsx
+++ b/apps/sim/app/(auth)/sso/page.tsx
@@ -1,6 +1,6 @@
 import { redirect } from 'next/navigation'
 import { getEnv, isTruthy } from '@/lib/env'
-import SSOForm from './sso-form'
+import SSOForm from '@/app/(auth)/sso/sso-form'
 
 export const dynamic = 'force-dynamic'
 
diff --git a/apps/sim/app/(auth)/sso/sso-form.tsx b/apps/sim/app/(auth)/sso/sso-form.tsx
index 1fb6544487..497a4d8c27 100644
--- a/apps/sim/app/(auth)/sso/sso-form.tsx
+++ b/apps/sim/app/(auth)/sso/sso-form.tsx
@@ -11,8 +11,8 @@ import { quickValidateEmail } from '@/lib/email/validation'
 import { env, isFalsy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 
 const logger = createLogger('SSOForm')
 
diff --git a/apps/sim/app/(auth)/verify/verify-content.tsx b/apps/sim/app/(auth)/verify/verify-content.tsx
index 2ebdb4944f..d622f4257d 100644
--- a/apps/sim/app/(auth)/verify/verify-content.tsx
+++ b/apps/sim/app/(auth)/verify/verify-content.tsx
@@ -5,9 +5,9 @@ import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { InputOTP, InputOTPGroup, InputOTPSlot } from '@/components/ui/input-otp'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { useVerification } from '@/app/(auth)/verify/use-verification'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 interface VerifyContentProps {
   hasEmailService: boolean
diff --git a/apps/sim/app/(landing)/careers/page.tsx b/apps/sim/app/(landing)/careers/page.tsx
index 15640865bd..f531615264 100644
--- a/apps/sim/app/(landing)/careers/page.tsx
+++ b/apps/sim/app/(landing)/careers/page.tsx
@@ -17,9 +17,9 @@ import { quickValidateEmail } from '@/lib/email/validation'
 import { isHosted } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('CareersPage')
 
diff --git a/apps/sim/app/(landing)/components/footer/footer.tsx b/apps/sim/app/(landing)/components/footer/footer.tsx
index acccebef0e..11a7446175 100644
--- a/apps/sim/app/(landing)/components/footer/footer.tsx
+++ b/apps/sim/app/(landing)/components/footer/footer.tsx
@@ -7,7 +7,7 @@ import {
   LinkedInIcon,
   xIcon as XIcon,
 } from '@/components/icons'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 const blocks = [
   'Agent',
diff --git a/apps/sim/app/(landing)/components/hero/components/index.ts b/apps/sim/app/(landing)/components/hero/components/index.ts
index 067f6bdcb5..6bda3e756c 100644
--- a/apps/sim/app/(landing)/components/hero/components/index.ts
+++ b/apps/sim/app/(landing)/components/hero/components/index.ts
@@ -1,11 +1,9 @@
-// Hero Components
 export { IconButton } from './icon-button'
 export { DotPattern } from './landing-canvas/dot-pattern'
 export type {
   LandingBlockProps,
   LandingCardData,
 } from './landing-canvas/landing-block/landing-block'
-// Landing Block
 export { LandingBlock } from './landing-canvas/landing-block/landing-block'
 export type { LoopNodeData } from './landing-canvas/landing-block/landing-loop-node'
 export { LandingLoopNode } from './landing-canvas/landing-block/landing-loop-node'
@@ -22,9 +20,7 @@ export type {
   LandingManualBlock,
   LandingViewportApi,
 } from './landing-canvas/landing-canvas'
-// Landing Canvas
 export { CARD_HEIGHT, CARD_WIDTH, LandingCanvas } from './landing-canvas/landing-canvas'
-// Landing Edge
 export { LandingEdge } from './landing-canvas/landing-edge/landing-edge'
 export type { LandingFlowProps } from './landing-canvas/landing-flow'
 export { LandingFlow } from './landing-canvas/landing-flow'
diff --git a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block.tsx b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block.tsx
index eb6212cb8c..7233eeed30 100644
--- a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block.tsx
@@ -1,6 +1,9 @@
 import React from 'react'
 import { BookIcon } from 'lucide-react'
-import { Tag, type TagProps } from './tag'
+import {
+  Tag,
+  type TagProps,
+} from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/tag'
 
 /**
  * Data structure for a landing card component
diff --git a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-loop-node.tsx b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-loop-node.tsx
index 1cdcaa3b95..af5f19dc18 100644
--- a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-loop-node.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-loop-node.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import React from 'react'
-import { LoopBlock } from './loop-block'
+import { LoopBlock } from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/loop-block'
 
 /**
  * Data structure for the loop node
diff --git a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-node.tsx b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-node.tsx
index 7ca7e4df3b..3ef3eb9878 100644
--- a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-node.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-node.tsx
@@ -2,7 +2,10 @@
 
 import React from 'react'
 import { Handle, Position } from 'reactflow'
-import { LandingBlock, type LandingCardData } from './landing-block'
+import {
+  LandingBlock,
+  type LandingCardData,
+} from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block'
 
 /**
  * React Flow node component for the landing canvas
diff --git a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-canvas.tsx b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-canvas.tsx
index 1f7dad539d..0cb2f41e10 100644
--- a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-canvas.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-canvas.tsx
@@ -3,9 +3,9 @@
 import React from 'react'
 import type { Edge, Node } from 'reactflow'
 import { ReactFlowProvider } from 'reactflow'
-import { DotPattern } from './dot-pattern'
-import type { LandingCardData } from './landing-block/landing-block'
-import { LandingFlow } from './landing-flow'
+import { DotPattern } from '@/app/(landing)/components/hero/components/landing-canvas/dot-pattern'
+import type { LandingCardData } from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-block'
+import { LandingFlow } from '@/app/(landing)/components/hero/components/landing-canvas/landing-flow'
 
 /**
  * Visual constants for landing node dimensions
diff --git a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-flow.tsx b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-flow.tsx
index 5f856f6eb6..c63cba043a 100644
--- a/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-flow.tsx
+++ b/apps/sim/app/(landing)/components/hero/components/landing-canvas/landing-flow.tsx
@@ -3,10 +3,13 @@
 import React from 'react'
 import ReactFlow, { applyNodeChanges, type NodeChange, useReactFlow } from 'reactflow'
 import 'reactflow/dist/style.css'
-import { LandingLoopNode } from './landing-block/landing-loop-node'
-import { LandingNode } from './landing-block/landing-node'
-import { CARD_WIDTH, type LandingCanvasProps } from './landing-canvas'
-import { LandingEdge } from './landing-edge/landing-edge'
+import { LandingLoopNode } from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-loop-node'
+import { LandingNode } from '@/app/(landing)/components/hero/components/landing-canvas/landing-block/landing-node'
+import {
+  CARD_WIDTH,
+  type LandingCanvasProps,
+} from '@/app/(landing)/components/hero/components/landing-canvas/landing-canvas'
+import { LandingEdge } from '@/app/(landing)/components/hero/components/landing-canvas/landing-edge/landing-edge'
 
 /**
  * Props for the LandingFlow component
diff --git a/apps/sim/app/(landing)/components/hero/hero.tsx b/apps/sim/app/(landing)/components/hero/hero.tsx
index 1b274ea33b..c925147e6f 100644
--- a/apps/sim/app/(landing)/components/hero/hero.tsx
+++ b/apps/sim/app/(landing)/components/hero/hero.tsx
@@ -33,7 +33,7 @@ import {
   SupabaseIcon,
 } from '@/components/icons'
 import { LandingPromptStorage } from '@/lib/browser-storage'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import {
   CARD_WIDTH,
   IconButton,
@@ -41,7 +41,7 @@ import {
   type LandingGroupData,
   type LandingManualBlock,
   type LandingViewportApi,
-} from './components'
+} from '@/app/(landing)/components/hero/components'
 
 /**
  * Service-specific template messages for the hero input
diff --git a/apps/sim/app/(landing)/components/integrations/integrations.tsx b/apps/sim/app/(landing)/components/integrations/integrations.tsx
index df29c8d975..5da1786bb2 100644
--- a/apps/sim/app/(landing)/components/integrations/integrations.tsx
+++ b/apps/sim/app/(landing)/components/integrations/integrations.tsx
@@ -1,5 +1,5 @@
 import * as Icons from '@/components/icons'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 const modelProviderIcons = [
   { icon: Icons.OpenAIIcon, label: 'OpenAI' },
diff --git a/apps/sim/app/(landing)/components/landing-pricing/landing-pricing.tsx b/apps/sim/app/(landing)/components/landing-pricing/landing-pricing.tsx
index 647688f16e..012f5b6de7 100644
--- a/apps/sim/app/(landing)/components/landing-pricing/landing-pricing.tsx
+++ b/apps/sim/app/(landing)/components/landing-pricing/landing-pricing.tsx
@@ -14,7 +14,7 @@ import {
 import { useRouter } from 'next/navigation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 import {
   ENTERPRISE_PLAN_FEATURES,
   PRO_PLAN_FEATURES,
diff --git a/apps/sim/app/(landing)/components/landing-templates/components/landing-template-preview.tsx b/apps/sim/app/(landing)/components/landing-templates/components/landing-template-preview.tsx
index 287a6d060e..4acf9fbd52 100644
--- a/apps/sim/app/(landing)/components/landing-templates/components/landing-template-preview.tsx
+++ b/apps/sim/app/(landing)/components/landing-templates/components/landing-template-preview.tsx
@@ -1,4 +1,4 @@
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface LandingTemplatePreviewProps {
   previewImage: string
diff --git a/apps/sim/app/(landing)/components/landing-templates/landing-templates.tsx b/apps/sim/app/(landing)/components/landing-templates/landing-templates.tsx
index 91c047ea4e..343511b27f 100644
--- a/apps/sim/app/(landing)/components/landing-templates/landing-templates.tsx
+++ b/apps/sim/app/(landing)/components/landing-templates/landing-templates.tsx
@@ -1,7 +1,6 @@
-import { inter } from '@/app/fonts/inter/inter'
-import LandingTemplatePreview from './components/landing-template-preview'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import LandingTemplatePreview from '@/app/(landing)/components/landing-templates/components/landing-template-preview'
 
-// Mock data for templates
 const templates = [
   {
     id: 1,
diff --git a/apps/sim/app/(landing)/components/legal-layout.tsx b/apps/sim/app/(landing)/components/legal-layout.tsx
index 203eaeb637..d817fd60f5 100644
--- a/apps/sim/app/(landing)/components/legal-layout.tsx
+++ b/apps/sim/app/(landing)/components/legal-layout.tsx
@@ -1,9 +1,9 @@
 'use client'
 
 import { isHosted } from '@/lib/environment'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 interface LegalLayoutProps {
   title: string
diff --git a/apps/sim/app/(landing)/components/nav/nav.tsx b/apps/sim/app/(landing)/components/nav/nav.tsx
index dbf722e488..cb5010a4ab 100644
--- a/apps/sim/app/(landing)/components/nav/nav.tsx
+++ b/apps/sim/app/(landing)/components/nav/nav.tsx
@@ -9,8 +9,8 @@ import { GithubIcon } from '@/components/icons'
 import { useBrandConfig } from '@/lib/branding/branding'
 import { isHosted } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console/logger'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('nav')
 
diff --git a/apps/sim/app/(landing)/components/structured-data.tsx b/apps/sim/app/(landing)/components/structured-data.tsx
index e83f81e02d..5afc2caa57 100644
--- a/apps/sim/app/(landing)/components/structured-data.tsx
+++ b/apps/sim/app/(landing)/components/structured-data.tsx
@@ -38,7 +38,7 @@ export default function StructuredData() {
         url: 'https://sim.ai',
         name: 'Sim - AI Agent Workflow Builder',
         description:
-          'Open-source AI agent workflow builder. 50,000+ developers build and deploy agentic workflows. SOC2 and HIPAA compliant.',
+          'Open-source AI agent workflow builder. 60,000+ developers build and deploy agentic workflows. SOC2 and HIPAA compliant.',
         publisher: {
           '@id': 'https://sim.ai/#organization',
         },
@@ -98,7 +98,7 @@ export default function StructuredData() {
         '@id': 'https://sim.ai/#software',
         name: 'Sim - AI Agent Workflow Builder',
         description:
-          'Open-source AI agent workflow builder used by 50,000+ developers. Build agentic workflows with visual drag-and-drop interface. SOC2 and HIPAA compliant. Integrate with 100+ apps.',
+          'Open-source AI agent workflow builder used by 60,000+ developers. Build agentic workflows with visual drag-and-drop interface. SOC2 and HIPAA compliant. Integrate with 100+ apps.',
         applicationCategory: 'DeveloperApplication',
         applicationSubCategory: 'AI Development Tools',
         operatingSystem: 'Web, Windows, macOS, Linux',
@@ -198,7 +198,7 @@ export default function StructuredData() {
             name: 'What is Sim?',
             acceptedAnswer: {
               '@type': 'Answer',
-              text: 'Sim is an open-source AI agent workflow builder used by 50,000+ developers at trail-blazing startups to Fortune 500 companies. It provides a visual drag-and-drop interface for building and deploying agentic workflows. Sim is SOC2 and HIPAA compliant.',
+              text: 'Sim is an open-source AI agent workflow builder used by 60,000+ developers at trail-blazing startups to Fortune 500 companies. It provides a visual drag-and-drop interface for building and deploying agentic workflows. Sim is SOC2 and HIPAA compliant.',
             },
           },
           {
diff --git a/apps/sim/app/(landing)/components/testimonials/testimonials.tsx b/apps/sim/app/(landing)/components/testimonials/testimonials.tsx
index 359924613d..3542e20332 100644
--- a/apps/sim/app/(landing)/components/testimonials/testimonials.tsx
+++ b/apps/sim/app/(landing)/components/testimonials/testimonials.tsx
@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from 'react'
 import Image from 'next/image'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface Testimonial {
   text: string
diff --git a/apps/sim/app/(landing)/studio/[slug]/page.tsx b/apps/sim/app/(landing)/studio/[slug]/page.tsx
index 85b8043bce..db5092b297 100644
--- a/apps/sim/app/(landing)/studio/[slug]/page.tsx
+++ b/apps/sim/app/(landing)/studio/[slug]/page.tsx
@@ -5,7 +5,7 @@ import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
 import { FAQ } from '@/lib/blog/faq'
 import { getAllPostMeta, getPostBySlug, getRelatedPosts } from '@/lib/blog/registry'
 import { buildArticleJsonLd, buildBreadcrumbJsonLd, buildPostMetadata } from '@/lib/blog/seo'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 
 export async function generateStaticParams() {
   const posts = await getAllPostMeta()
diff --git a/apps/sim/app/(landing)/studio/authors/[id]/page.tsx b/apps/sim/app/(landing)/studio/authors/[id]/page.tsx
index 0a6b0fe529..6a4f0c9b33 100644
--- a/apps/sim/app/(landing)/studio/authors/[id]/page.tsx
+++ b/apps/sim/app/(landing)/studio/authors/[id]/page.tsx
@@ -1,7 +1,7 @@
 import Image from 'next/image'
 import Link from 'next/link'
 import { getAllPostMeta } from '@/lib/blog/registry'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 
 export const revalidate = 3600
 
diff --git a/apps/sim/app/(landing)/studio/page.tsx b/apps/sim/app/(landing)/studio/page.tsx
index 4acd4d48b9..76c51fc83d 100644
--- a/apps/sim/app/(landing)/studio/page.tsx
+++ b/apps/sim/app/(landing)/studio/page.tsx
@@ -2,7 +2,7 @@ import Image from 'next/image'
 import Link from 'next/link'
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
 import { getAllPostMeta } from '@/lib/blog/registry'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 
 export const revalidate = 3600
 
diff --git a/apps/sim/app/hydration-error-handler.tsx b/apps/sim/app/_shell/hydration-error-handler.tsx
similarity index 100%
rename from apps/sim/app/hydration-error-handler.tsx
rename to apps/sim/app/_shell/hydration-error-handler.tsx
diff --git a/apps/sim/lib/posthog/provider.tsx b/apps/sim/app/_shell/providers/posthog-provider.tsx
similarity index 96%
rename from apps/sim/lib/posthog/provider.tsx
rename to apps/sim/app/_shell/providers/posthog-provider.tsx
index b2cc8c0619..01261cbeba 100644
--- a/apps/sim/lib/posthog/provider.tsx
+++ b/apps/sim/app/_shell/providers/posthog-provider.tsx
@@ -3,7 +3,7 @@
 import { useEffect } from 'react'
 import posthog from 'posthog-js'
 import { PostHogProvider as PHProvider } from 'posthog-js/react'
-import { getEnv, isTruthy } from '../env'
+import { getEnv, isTruthy } from '../../../lib/env'
 
 export function PostHogProvider({ children }: { children: React.ReactNode }) {
   useEffect(() => {
diff --git a/apps/sim/app/providers/query-client-provider.tsx b/apps/sim/app/_shell/providers/query-provider.tsx
similarity index 100%
rename from apps/sim/app/providers/query-client-provider.tsx
rename to apps/sim/app/_shell/providers/query-provider.tsx
diff --git a/apps/sim/lib/session/session-context.tsx b/apps/sim/app/_shell/providers/session-provider.tsx
similarity index 100%
rename from apps/sim/lib/session/session-context.tsx
rename to apps/sim/app/_shell/providers/session-provider.tsx
diff --git a/apps/sim/app/theme-provider.tsx b/apps/sim/app/_shell/providers/theme-provider.tsx
similarity index 100%
rename from apps/sim/app/theme-provider.tsx
rename to apps/sim/app/_shell/providers/theme-provider.tsx
diff --git a/apps/sim/app/zoom-prevention.tsx b/apps/sim/app/_shell/zoom-prevention.tsx
similarity index 100%
rename from apps/sim/app/zoom-prevention.tsx
rename to apps/sim/app/_shell/zoom-prevention.tsx
diff --git a/apps/sim/app/fonts/inter/inter.ts b/apps/sim/app/_styles/fonts/inter/inter.ts
similarity index 100%
rename from apps/sim/app/fonts/inter/inter.ts
rename to apps/sim/app/_styles/fonts/inter/inter.ts
diff --git a/apps/sim/app/fonts/season/SeasonSans-Bold.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-Bold.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Bold.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Bold.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-Bold.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-Bold.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Bold.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Bold.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSans-Heavy.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-Heavy.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Heavy.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Heavy.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-Heavy.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-Heavy.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Heavy.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Heavy.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSans-Light.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-Light.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Light.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Light.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-Light.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-Light.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Light.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Light.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSans-Medium.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-Medium.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Medium.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Medium.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-Medium.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-Medium.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Medium.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Medium.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSans-Regular.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-Regular.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Regular.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Regular.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-Regular.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-Regular.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-Regular.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-Regular.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSans-SemiBold.woff b/apps/sim/app/_styles/fonts/season/SeasonSans-SemiBold.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-SemiBold.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSans-SemiBold.woff
diff --git a/apps/sim/app/fonts/season/SeasonSans-SemiBold.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSans-SemiBold.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSans-SemiBold.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSans-SemiBold.woff2
diff --git a/apps/sim/app/fonts/season/SeasonSansUprightsVF.woff b/apps/sim/app/_styles/fonts/season/SeasonSansUprightsVF.woff
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSansUprightsVF.woff
rename to apps/sim/app/_styles/fonts/season/SeasonSansUprightsVF.woff
diff --git a/apps/sim/app/fonts/season/SeasonSansUprightsVF.woff2 b/apps/sim/app/_styles/fonts/season/SeasonSansUprightsVF.woff2
similarity index 100%
rename from apps/sim/app/fonts/season/SeasonSansUprightsVF.woff2
rename to apps/sim/app/_styles/fonts/season/SeasonSansUprightsVF.woff2
diff --git a/apps/sim/app/fonts/season/season.ts b/apps/sim/app/_styles/fonts/season/season.ts
similarity index 100%
rename from apps/sim/app/fonts/season/season.ts
rename to apps/sim/app/_styles/fonts/season/season.ts
diff --git a/apps/sim/app/fonts/soehne/soehne-buch-kursiv.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-buch-kursiv.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-buch-kursiv.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-buch-kursiv.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-buch.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-buch.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-buch.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-buch.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-dreiviertelfett-kursiv.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-dreiviertelfett-kursiv.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-dreiviertelfett-kursiv.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-dreiviertelfett-kursiv.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-dreiviertelfett.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-dreiviertelfett.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-dreiviertelfett.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-dreiviertelfett.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-halbfett-kursiv.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-halbfett-kursiv.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-halbfett-kursiv.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-halbfett-kursiv.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-halbfett.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-halbfett.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-halbfett.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-halbfett.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-kraftig-kursiv.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-kraftig-kursiv.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-kraftig-kursiv.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-kraftig-kursiv.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-kraftig.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-kraftig.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-kraftig.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-kraftig.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-leicht-kursiv.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-leicht-kursiv.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-leicht-kursiv.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-leicht-kursiv.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne-leicht.woff2 b/apps/sim/app/_styles/fonts/soehne/soehne-leicht.woff2
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne-leicht.woff2
rename to apps/sim/app/_styles/fonts/soehne/soehne-leicht.woff2
diff --git a/apps/sim/app/fonts/soehne/soehne.ts b/apps/sim/app/_styles/fonts/soehne/soehne.ts
similarity index 100%
rename from apps/sim/app/fonts/soehne/soehne.ts
rename to apps/sim/app/_styles/fonts/soehne/soehne.ts
diff --git a/apps/sim/app/globals.css b/apps/sim/app/_styles/globals.css
similarity index 100%
rename from apps/sim/app/globals.css
rename to apps/sim/app/_styles/globals.css
diff --git a/apps/sim/types/creator-profile.ts b/apps/sim/app/_types/creator-profile.ts
similarity index 100%
rename from apps/sim/types/creator-profile.ts
rename to apps/sim/app/_types/creator-profile.ts
diff --git a/apps/sim/app/api/creator-profiles/route.ts b/apps/sim/app/api/creator-profiles/route.ts
index db0dfa63e2..f6f67ea3d5 100644
--- a/apps/sim/app/api/creator-profiles/route.ts
+++ b/apps/sim/app/api/creator-profiles/route.ts
@@ -7,7 +7,7 @@ import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateRequestId } from '@/lib/utils'
-import type { CreatorProfileDetails } from '@/types/creator-profile'
+import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 
 const logger = createLogger('CreatorProfilesAPI')
 
diff --git a/apps/sim/app/api/files/utils.test.ts b/apps/sim/app/api/files/utils.test.ts
index b3deae47bd..a31c7ca42f 100644
--- a/apps/sim/app/api/files/utils.test.ts
+++ b/apps/sim/app/api/files/utils.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { createFileResponse, extractFilename, findLocalFile } from './utils'
+import { createFileResponse, extractFilename, findLocalFile } from '@/app/api/files/utils'
 
 describe('extractFilename', () => {
   describe('legitimate file paths', () => {
diff --git a/apps/sim/app/api/knowledge/search/route.ts b/apps/sim/app/api/knowledge/search/route.ts
index 6f97c68e31..645ecd040c 100644
--- a/apps/sim/app/api/knowledge/search/route.ts
+++ b/apps/sim/app/api/knowledge/search/route.ts
@@ -6,8 +6,6 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { estimateTokenCount } from '@/lib/tokenization/estimators'
 import { generateRequestId } from '@/lib/utils'
 import { getUserId } from '@/app/api/auth/oauth/utils'
-import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'
-import { calculateCost } from '@/providers/utils'
 import {
   generateSearchEmbedding,
   getDocumentNamesByIds,
@@ -16,7 +14,9 @@ import {
   handleTagOnlySearch,
   handleVectorOnlySearch,
   type SearchResult,
-} from './utils'
+} from '@/app/api/knowledge/search/utils'
+import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'
+import { calculateCost } from '@/providers/utils'
 
 const logger = createLogger('VectorSearchAPI')
 
diff --git a/apps/sim/app/api/knowledge/search/utils.test.ts b/apps/sim/app/api/knowledge/search/utils.test.ts
index f3fae93ee2..c95a07fceb 100644
--- a/apps/sim/app/api/knowledge/search/utils.test.ts
+++ b/apps/sim/app/api/knowledge/search/utils.test.ts
@@ -42,7 +42,7 @@ import {
   handleTagAndVectorSearch,
   handleTagOnlySearch,
   handleVectorOnlySearch,
-} from './utils'
+} from '@/app/api/knowledge/search/utils'
 
 describe('Knowledge Search Utils', () => {
   beforeEach(() => {
diff --git a/apps/sim/app/api/v1/middleware.ts b/apps/sim/app/api/v1/middleware.ts
index ebf27a489b..32b31fb390 100644
--- a/apps/sim/app/api/v1/middleware.ts
+++ b/apps/sim/app/api/v1/middleware.ts
@@ -1,8 +1,8 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { createLogger } from '@/lib/logs/console/logger'
+import { authenticateV1Request } from '@/app/api/v1/auth'
 import { RateLimiter } from '@/services/queue/RateLimiter'
-import { authenticateV1Request } from './auth'
 
 const logger = createLogger('V1Middleware')
 const rateLimiter = new RateLimiter()
diff --git a/apps/sim/app/api/workflows/route.ts b/apps/sim/app/api/workflows/route.ts
index e7b603c7c3..d89af62d51 100644
--- a/apps/sim/app/api/workflows/route.ts
+++ b/apps/sim/app/api/workflows/route.ts
@@ -7,7 +7,7 @@ import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { generateRequestId } from '@/lib/utils'
-import { verifyWorkspaceMembership } from './utils'
+import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
 
 const logger = createLogger('WorkflowAPI')
 
diff --git a/apps/sim/app/changelog/components/changelog-content.tsx b/apps/sim/app/changelog/components/changelog-content.tsx
index 60390eedb2..36c817e7f1 100644
--- a/apps/sim/app/changelog/components/changelog-content.tsx
+++ b/apps/sim/app/changelog/components/changelog-content.tsx
@@ -1,8 +1,8 @@
 import { BookOpen, Github, Rss } from 'lucide-react'
 import Link from 'next/link'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
-import ChangelogList from './timeline-list'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
+import ChangelogList from '@/app/changelog/components/timeline-list'
 
 export interface ChangelogEntry {
   tag: string
diff --git a/apps/sim/app/changelog/components/timeline-list.tsx b/apps/sim/app/changelog/components/timeline-list.tsx
index e73b3ff142..9e2b81a03a 100644
--- a/apps/sim/app/changelog/components/timeline-list.tsx
+++ b/apps/sim/app/changelog/components/timeline-list.tsx
@@ -3,9 +3,9 @@
 import React from 'react'
 import ReactMarkdown from 'react-markdown'
 import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
-import type { ChangelogEntry } from './changelog-content'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
+import type { ChangelogEntry } from '@/app/changelog/components/changelog-content'
 
 type Props = { initialEntries: ChangelogEntry[] }
 
diff --git a/apps/sim/app/changelog/page.tsx b/apps/sim/app/changelog/page.tsx
index 39dbfeaa79..c94b650667 100644
--- a/apps/sim/app/changelog/page.tsx
+++ b/apps/sim/app/changelog/page.tsx
@@ -1,5 +1,5 @@
 import type { Metadata } from 'next'
-import ChangelogContent from './components/changelog-content'
+import ChangelogContent from '@/app/changelog/components/changelog-content'
 
 export const metadata: Metadata = {
   title: 'Changelog',
diff --git a/apps/sim/app/chat/components/auth/email/email-auth.tsx b/apps/sim/app/chat/components/auth/email/email-auth.tsx
index f16199bf2b..d8161e5b33 100644
--- a/apps/sim/app/chat/components/auth/email/email-auth.tsx
+++ b/apps/sim/app/chat/components/auth/email/email-auth.tsx
@@ -9,9 +9,9 @@ import { Label } from '@/components/ui/label'
 import { quickValidateEmail } from '@/lib/email/validation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('EmailAuth')
 
diff --git a/apps/sim/app/chat/components/auth/password/password-auth.tsx b/apps/sim/app/chat/components/auth/password/password-auth.tsx
index b82880e872..5820ceefcb 100644
--- a/apps/sim/app/chat/components/auth/password/password-auth.tsx
+++ b/apps/sim/app/chat/components/auth/password/password-auth.tsx
@@ -7,9 +7,9 @@ import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('PasswordAuth')
 
diff --git a/apps/sim/app/chat/components/auth/sso/sso-auth.tsx b/apps/sim/app/chat/components/auth/sso/sso-auth.tsx
index ad2bf5e97d..80da21f5d8 100644
--- a/apps/sim/app/chat/components/auth/sso/sso-auth.tsx
+++ b/apps/sim/app/chat/components/auth/sso/sso-auth.tsx
@@ -8,9 +8,9 @@ import { Label } from '@/components/ui/label'
 import { quickValidateEmail } from '@/lib/email/validation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 const logger = createLogger('SSOAuth')
 
diff --git a/apps/sim/app/chat/components/error-state/error-state.tsx b/apps/sim/app/chat/components/error-state/error-state.tsx
index bc43f4c6a9..0f222beb00 100644
--- a/apps/sim/app/chat/components/error-state/error-state.tsx
+++ b/apps/sim/app/chat/components/error-state/error-state.tsx
@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { useBrandConfig } from '@/lib/branding/branding'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 interface ChatErrorStateProps {
   error: string
diff --git a/apps/sim/app/chat/components/header/header.tsx b/apps/sim/app/chat/components/header/header.tsx
index 0f742f1e57..049421c7e4 100644
--- a/apps/sim/app/chat/components/header/header.tsx
+++ b/apps/sim/app/chat/components/header/header.tsx
@@ -4,7 +4,7 @@ import Image from 'next/image'
 import Link from 'next/link'
 import { GithubIcon } from '@/components/icons'
 import { useBrandConfig } from '@/lib/branding/branding'
-import { inter } from '@/app/fonts/inter/inter'
+import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface ChatHeaderProps {
   chatConfig: {
diff --git a/apps/sim/app/chat/components/message/message.tsx b/apps/sim/app/chat/components/message/message.tsx
index 7147688205..3955285e62 100644
--- a/apps/sim/app/chat/components/message/message.tsx
+++ b/apps/sim/app/chat/components/message/message.tsx
@@ -3,7 +3,7 @@
 import { memo, useMemo, useState } from 'react'
 import { Check, Copy, File as FileIcon, FileText, Image as ImageIcon } from 'lucide-react'
 import { Tooltip } from '@/components/emcn'
-import MarkdownRenderer from './components/markdown-renderer'
+import MarkdownRenderer from '@/app/chat/components/message/components/markdown-renderer'
 
 export interface ChatAttachment {
   id: string
diff --git a/apps/sim/app/fonts/temp/SeasonSansBold.otf b/apps/sim/app/fonts/temp/SeasonSansBold.otf
deleted file mode 100644
index f728de699f..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBold.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansBold.ttf b/apps/sim/app/fonts/temp/SeasonSansBold.ttf
deleted file mode 100644
index af9f722f3c..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBold.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansBold.woff2 b/apps/sim/app/fonts/temp/SeasonSansBold.woff2
deleted file mode 100644
index b8d4759db8..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBold.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.otf b/apps/sim/app/fonts/temp/SeasonSansBoldItalic.otf
deleted file mode 100644
index 5bc78a9219..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansBoldItalic.ttf
deleted file mode 100644
index 4eeb731bec..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansBoldItalic.woff2
deleted file mode 100644
index 43f7a79955..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansBoldItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavy.otf b/apps/sim/app/fonts/temp/SeasonSansHeavy.otf
deleted file mode 100644
index a2d96d4a02..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavy.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavy.ttf b/apps/sim/app/fonts/temp/SeasonSansHeavy.ttf
deleted file mode 100644
index 94ef71c1ff..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavy.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavy.woff2 b/apps/sim/app/fonts/temp/SeasonSansHeavy.woff2
deleted file mode 100644
index e645f7f1b3..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavy.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.otf b/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.otf
deleted file mode 100644
index 375dc1f893..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.ttf
deleted file mode 100644
index db3e12f062..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.woff2
deleted file mode 100644
index cd29aaef7b..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansHeavyItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLight.otf b/apps/sim/app/fonts/temp/SeasonSansLight.otf
deleted file mode 100644
index 2836789c1a..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLight.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLight.ttf b/apps/sim/app/fonts/temp/SeasonSansLight.ttf
deleted file mode 100644
index 5046aa88af..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLight.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLight.woff2 b/apps/sim/app/fonts/temp/SeasonSansLight.woff2
deleted file mode 100644
index b2ad434fa1..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLight.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLightItalic.otf b/apps/sim/app/fonts/temp/SeasonSansLightItalic.otf
deleted file mode 100644
index 6d26d345d4..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLightItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLightItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansLightItalic.ttf
deleted file mode 100644
index 23c7fcdded..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLightItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansLightItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansLightItalic.woff2
deleted file mode 100644
index cb2deb9078..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansLightItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMedium.otf b/apps/sim/app/fonts/temp/SeasonSansMedium.otf
deleted file mode 100644
index 9555b305a2..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMedium.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMedium.ttf b/apps/sim/app/fonts/temp/SeasonSansMedium.ttf
deleted file mode 100644
index aed9e5129d..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMedium.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMedium.woff2 b/apps/sim/app/fonts/temp/SeasonSansMedium.woff2
deleted file mode 100644
index 29dd441672..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMedium.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.otf b/apps/sim/app/fonts/temp/SeasonSansMediumItalic.otf
deleted file mode 100644
index 9e87e7e9e4..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansMediumItalic.ttf
deleted file mode 100644
index fb34ed6772..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansMediumItalic.woff2
deleted file mode 100644
index b4332ff0f3..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansMediumItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegular.otf b/apps/sim/app/fonts/temp/SeasonSansRegular.otf
deleted file mode 100644
index fa903cc00d..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegular.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegular.ttf b/apps/sim/app/fonts/temp/SeasonSansRegular.ttf
deleted file mode 100644
index 83f023bdc3..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegular.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegular.woff2 b/apps/sim/app/fonts/temp/SeasonSansRegular.woff2
deleted file mode 100644
index 2e73573f09..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegular.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.otf b/apps/sim/app/fonts/temp/SeasonSansRegularItalic.otf
deleted file mode 100644
index 7b1f5e5973..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansRegularItalic.ttf
deleted file mode 100644
index a81ede3316..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansRegularItalic.woff2
deleted file mode 100644
index a00f6e5edb..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansRegularItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBold.otf b/apps/sim/app/fonts/temp/SeasonSansSemiBold.otf
deleted file mode 100644
index cf33e9ec77..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBold.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBold.ttf b/apps/sim/app/fonts/temp/SeasonSansSemiBold.ttf
deleted file mode 100644
index f0bf1af523..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBold.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBold.woff2 b/apps/sim/app/fonts/temp/SeasonSansSemiBold.woff2
deleted file mode 100644
index e8d9743e98..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBold.woff2 and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.otf b/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.otf
deleted file mode 100644
index f1a777fa65..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.otf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.ttf b/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.ttf
deleted file mode 100644
index 1aa17431c7..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.ttf and /dev/null differ
diff --git a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.woff2 b/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.woff2
deleted file mode 100644
index c705f5050f..0000000000
Binary files a/apps/sim/app/fonts/temp/SeasonSansSemiBoldItalic.woff2 and /dev/null differ
diff --git a/apps/sim/app/invite/components/status-card.tsx b/apps/sim/app/invite/components/status-card.tsx
index 4a31a6b3fd..65a2a30dc3 100644
--- a/apps/sim/app/invite/components/status-card.tsx
+++ b/apps/sim/app/invite/components/status-card.tsx
@@ -14,8 +14,8 @@ import {
 import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { useBrandConfig } from '@/lib/branding/branding'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 
 interface InviteStatusCardProps {
   type: 'login' | 'loading' | 'error' | 'success' | 'invitation' | 'warning'
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index 186f6837ea..bb40e8156f 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -3,16 +3,16 @@ import { PublicEnvScript } from 'next-runtime-env'
 import { BrandedLayout } from '@/components/branded-layout'
 import { generateThemeCSS } from '@/lib/branding/inject-theme'
 import { generateBrandedMetadata, generateStructuredData } from '@/lib/branding/metadata'
-import { PostHogProvider } from '@/lib/posthog/provider'
-import '@/app/globals.css'
+import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
+import '@/app/_styles/globals.css'
 
 import { OneDollarStats } from '@/components/analytics/onedollarstats'
-import { SessionProvider } from '@/lib/session/session-context'
-import { season } from '@/app/fonts/season/season'
-import { HydrationErrorHandler } from '@/app/hydration-error-handler'
-import { QueryProvider } from '@/app/providers/query-client-provider'
-import { ThemeProvider } from '@/app/theme-provider'
-import { ZoomPrevention } from '@/app/zoom-prevention'
+import { HydrationErrorHandler } from '@/app/_shell/hydration-error-handler'
+import { QueryProvider } from '@/app/_shell/providers/query-provider'
+import { SessionProvider } from '@/app/_shell/providers/session-provider'
+import { ThemeProvider } from '@/app/_shell/providers/theme-provider'
+import { ZoomPrevention } from '@/app/_shell/zoom-prevention'
+import { season } from '@/app/_styles/fonts/season/season'
 
 export const viewport: Viewport = {
   width: 'device-width',
@@ -42,68 +42,56 @@ export default function RootLayout({ children }: { children: React.ReactNode })
           }}
         />
 
-        {/* Theme CSS Override */}
-        {themeCSS && (
-          <style
-            id='theme-override'
-            dangerouslySetInnerHTML={{
-              __html: themeCSS,
-            }}
-          />
-        )}
-
-        {/* Basic head hints that are not covered by the Metadata API */}
-        <meta name='color-scheme' content='light dark' />
-        <meta name='format-detection' content='telephone=no' />
-        <meta httpEquiv='x-ua-compatible' content='ie=edge' />
-
-        {/* OneDollarStats Analytics */}
-        <script defer src='https://assets.onedollarstats.com/stonks.js' />
-
-        {/* Blocking script to prevent sidebar dimensions flash on page load */}
+        {/* Workspace layout dimensions: set CSS vars before hydration to avoid layout jump */}
         <script
+          id='workspace-layout-dimensions'
           dangerouslySetInnerHTML={{
             __html: `
-              (function() {
+              (function () {
+                try {
+                  var path = window.location.pathname;
+                  if (path.indexOf('/workspace/') === -1) {
+                    return;
+                  }
+                } catch (e) {
+                  return;
+                }
+
+                // Sidebar width
                 try {
                   var stored = localStorage.getItem('sidebar-state');
                   if (stored) {
                     var parsed = JSON.parse(stored);
-                    var state = parsed?.state;
-                    var width = state?.sidebarWidth;
+                    var state = parsed && parsed.state;
+                    var width = state && state.sidebarWidth;
                     var maxSidebarWidth = window.innerWidth * 0.3;
-                    
-                    // Cap stored width at 30% of viewport
+
                     if (width >= 232 && width <= maxSidebarWidth) {
                       document.documentElement.style.setProperty('--sidebar-width', width + 'px');
                     } else if (width > maxSidebarWidth) {
-                      // If stored width exceeds 30%, cap it
                       document.documentElement.style.setProperty('--sidebar-width', maxSidebarWidth + 'px');
                     }
                   }
                 } catch (e) {
                   // Fallback handled by CSS defaults
                 }
-                
-                // Set panel width and active tab
+
+                // Panel width and active tab
                 try {
                   var panelStored = localStorage.getItem('panel-state');
                   if (panelStored) {
                     var panelParsed = JSON.parse(panelStored);
-                    var panelState = panelParsed?.state;
-                    var panelWidth = panelState?.panelWidth;
+                    var panelState = panelParsed && panelParsed.state;
+                    var panelWidth = panelState && panelState.panelWidth;
                     var maxPanelWidth = window.innerWidth * 0.4;
-                    
-                    // Cap stored width at 40% of viewport
+
                     if (panelWidth >= 244 && panelWidth <= maxPanelWidth) {
                       document.documentElement.style.setProperty('--panel-width', panelWidth + 'px');
                     } else if (panelWidth > maxPanelWidth) {
-                      // If stored width exceeds 40%, cap it
                       document.documentElement.style.setProperty('--panel-width', maxPanelWidth + 'px');
                     }
-                    
-                    // Set active tab to prevent flash on hydration
-                    var activeTab = panelState?.activeTab;
+
+                    var activeTab = panelState && panelState.activeTab;
                     if (activeTab) {
                       document.documentElement.setAttribute('data-panel-active-tab', activeTab);
                     }
@@ -111,51 +99,59 @@ export default function RootLayout({ children }: { children: React.ReactNode })
                 } catch (e) {
                   // Fallback handled by CSS defaults
                 }
-                
-                // Set toolbar triggers height
+
+                // Toolbar triggers height
                 try {
                   var toolbarStored = localStorage.getItem('toolbar-state');
                   if (toolbarStored) {
                     var toolbarParsed = JSON.parse(toolbarStored);
-                    var toolbarState = toolbarParsed?.state;
-                    var toolbarTriggersHeight = toolbarState?.toolbarTriggersHeight;
-                    if (toolbarTriggersHeight !== undefined && toolbarTriggersHeight >= 30 && toolbarTriggersHeight <= 800) {
-                      document.documentElement.style.setProperty('--toolbar-triggers-height', toolbarTriggersHeight + 'px');
+                    var toolbarState = toolbarParsed && toolbarParsed.state;
+                    var toolbarTriggersHeight = toolbarState && toolbarState.toolbarTriggersHeight;
+                    if (
+                      toolbarTriggersHeight !== undefined &&
+                      toolbarTriggersHeight >= 30 &&
+                      toolbarTriggersHeight <= 800
+                    ) {
+                      document.documentElement.style.setProperty(
+                        '--toolbar-triggers-height',
+                        toolbarTriggersHeight + 'px'
+                      );
                     }
                   }
                 } catch (e) {
                   // Fallback handled by CSS defaults
                 }
-                
-                // Set editor connections height
+
+                // Editor connections height
                 try {
                   var editorStored = localStorage.getItem('panel-editor-state');
                   if (editorStored) {
                     var editorParsed = JSON.parse(editorStored);
-                    var editorState = editorParsed?.state;
-                    var connectionsHeight = editorState?.connectionsHeight;
+                    var editorState = editorParsed && editorParsed.state;
+                    var connectionsHeight = editorState && editorState.connectionsHeight;
                     if (connectionsHeight !== undefined && connectionsHeight >= 30 && connectionsHeight <= 300) {
-                      document.documentElement.style.setProperty('--editor-connections-height', connectionsHeight + 'px');
+                      document.documentElement.style.setProperty(
+                        '--editor-connections-height',
+                        connectionsHeight + 'px'
+                      );
                     }
                   }
                 } catch (e) {
                   // Fallback handled by CSS defaults
                 }
-                
-                // Set terminal height
+
+                // Terminal height
                 try {
                   var terminalStored = localStorage.getItem('terminal-state');
                   if (terminalStored) {
                     var terminalParsed = JSON.parse(terminalStored);
-                    var terminalState = terminalParsed?.state;
-                    var terminalHeight = terminalState?.terminalHeight;
+                    var terminalState = terminalParsed && terminalParsed.state;
+                    var terminalHeight = terminalState && terminalState.terminalHeight;
                     var maxTerminalHeight = window.innerHeight * 0.7;
-                    
-                    // Cap stored height at 70% of viewport
+
                     if (terminalHeight >= 30 && terminalHeight <= maxTerminalHeight) {
                       document.documentElement.style.setProperty('--terminal-height', terminalHeight + 'px');
                     } else if (terminalHeight > maxTerminalHeight) {
-                      // If stored height exceeds 70%, cap it
                       document.documentElement.style.setProperty('--terminal-height', maxTerminalHeight + 'px');
                     }
                   }
@@ -167,6 +163,24 @@ export default function RootLayout({ children }: { children: React.ReactNode })
           }}
         />
 
+        {/* Theme CSS Override */}
+        {themeCSS && (
+          <style
+            id='theme-override'
+            dangerouslySetInnerHTML={{
+              __html: themeCSS,
+            }}
+          />
+        )}
+
+        {/* Basic head hints that are not covered by the Metadata API */}
+        <meta name='color-scheme' content='light dark' />
+        <meta name='format-detection' content='telephone=no' />
+        <meta httpEquiv='x-ua-compatible' content='ie=edge' />
+
+        {/* OneDollarStats Analytics */}
+        <script defer src='https://assets.onedollarstats.com/stonks.js' />
+
         <PublicEnvScript />
       </head>
       <body className={`${season.variable} font-season`} suppressHydrationWarning>
diff --git a/apps/sim/app/llms.txt/route.ts b/apps/sim/app/llms.txt/route.ts
index 3e68c588d4..655500f2a1 100644
--- a/apps/sim/app/llms.txt/route.ts
+++ b/apps/sim/app/llms.txt/route.ts
@@ -1,38 +1,50 @@
 export async function GET() {
   const llmsContent = `# Sim - AI Agent Workflow Builder
-Sim is an open-source AI agent workflow builder. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform.  
-30,000+ developers are already using Sim to build and deploy AI agent workflows.  
-Sim lets developers integrate with 100+ apps to streamline workflows with AI agents. Sim is SOC2 and HIPAA compliant, ensuring enterprise-level security.
+Sim is an open-source AI agent workflow builder for production workflows. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform. 60,000+ developers already use Sim to build and ship AI automations with 100+ integrations. Sim is SOC2 and HIPAA compliant and is designed for secure, enterprise-grade AI automation.
 
-## Key Features
-- Visual Workflow Builder: Drag-and-drop interface for creating AI agent workflows
-- [Documentation](https://docs.sim.ai): Complete guide to building AI agents
+Website: https://sim.ai
+App: https://sim.ai/workspace
+Docs: https://docs.sim.ai
+GitHub: https://github.com/simstudioai/sim
+Region: global
+Primary language: en
 
-## Use Cases
-- AI Agent Workflow Automation
-- RAG Agents
-- RAG Systesm and Pipline
-- Chatbot Workflows
-- Document Processing Workflows
-- Customer Service Chatbot Workflows
-- Ecommerce Agent Workflows
-- Marketing Agent Workflows
-- Deep Research Workflows
-- Marketing Agent Workflows
-- Real Estate Agent Workflows
-- Financial Planning Agent Workflows
-- Legal Agent Workflows
+## Capabilities
+- Visual workflow builder for multi-step AI agents and tools
+- Orchestration of LLM calls, tools, webhooks, and external APIs
+- Scheduled and event-driven agent executions
+- First-class support for retrieval-augmented generation (RAG)
+- Multi-tenant, workspace-based access model
+
+## Ideal Use Cases
+- AI agent workflow automation
+- RAG agents and retrieval pipelines
+- Chatbot and copilot workflows for SaaS products
+- Document and email processing workflows
+- Customer support, marketing, and growth automations
+- Internal operations automations (ops, finance, legal, sales)
+
+## Key Entities
+- Workspace: container for workflows, data sources, and executions
+- Workflow: directed graph of blocks defining an agentic process
+- Block: individual step (LLM call, tool call, HTTP request, code, etc.)
+- Schedule: time-based trigger for running workflows
+- Execution: a single run of a workflow
 
 ## Getting Started
-- [Quick Start Guide](https://docs.sim.ai/quickstart)
-- [GitHub](https://github.com/simstudioai/sim)
+- Quickstart: https://docs.sim.ai/quickstart
+- Product overview: https://docs.sim.ai
+- Source code: https://github.com/simstudioai/sim
 
-## Resources
-- [GitHub](https://github.com/simstudioai/sim)`
+## Safety & Reliability
+- SOC2 and HIPAA aligned security controls
+- Audit-friendly execution logs and cost tracking
+- Fine-grained control over external tools, APIs, and data sources
+`
 
   return new Response(llmsContent, {
     headers: {
-      'Content-Type': 'text/plain',
+      'Content-Type': 'text/plain; charset=utf-8',
       'Cache-Control': 'public, max-age=86400',
     },
   })
diff --git a/apps/sim/app/manifest.ts b/apps/sim/app/manifest.ts
index ddb651a838..4f2d3ed004 100644
--- a/apps/sim/app/manifest.ts
+++ b/apps/sim/app/manifest.ts
@@ -10,6 +10,7 @@ export default function manifest(): MetadataRoute.Manifest {
     description:
       'Open-source AI agent workflow builder. 30,000+ developers build and deploy agentic workflows on Sim. Visual drag-and-drop interface for creating AI automations. SOC2 and HIPAA compliant.',
     start_url: '/',
+    scope: '/',
     display: 'standalone',
     background_color: '#ffffff',
     theme_color: brand.theme?.primaryColor || '#6F3DFA',
diff --git a/apps/sim/app/not-found.tsx b/apps/sim/app/not-found.tsx
index 7c1f68960f..f57410ef05 100644
--- a/apps/sim/app/not-found.tsx
+++ b/apps/sim/app/not-found.tsx
@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { useBrandConfig } from '@/lib/branding/branding'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 
 export default function NotFound() {
   const [buttonClass, setButtonClass] = useState('auth-button-gradient')
diff --git a/apps/sim/app/page.tsx b/apps/sim/app/page.tsx
index 90e63c67bc..1a6df40d40 100644
--- a/apps/sim/app/page.tsx
+++ b/apps/sim/app/page.tsx
@@ -1,10 +1,14 @@
 import type { Metadata } from 'next'
+import { getBaseUrl } from '@/lib/urls/utils'
 import Landing from '@/app/(landing)/landing'
 
+const baseUrl = getBaseUrl()
+
 export const metadata: Metadata = {
+  metadataBase: new URL(baseUrl),
   title: 'Sim - AI Agent Workflow Builder | Open Source Platform',
   description:
-    'Open-source AI agent workflow builder used by 50,000+ developers. Build and deploy agentic workflows with visual drag-and-drop interface. Connect 100+ apps. SOC2 and HIPAA compliant. Used by startups to Fortune 500 companies.',
+    'Open-source AI agent workflow builder used by 60,000+ developers. Build and deploy agentic workflows with a visual drag-and-drop canvas. Connect 100+ apps and ship SOC2 & HIPAA-ready AI automations from startups to Fortune 500.',
   keywords:
     'AI agent workflow builder, agentic workflows, open source AI, visual workflow builder, AI automation, LLM workflows, AI agents, workflow automation, no-code AI, SOC2 compliant, HIPAA compliant, enterprise AI',
   authors: [{ name: 'Sim Studio' }],
@@ -18,9 +22,9 @@ export const metadata: Metadata = {
   openGraph: {
     title: 'Sim - AI Agent Workflow Builder | Open Source',
     description:
-      'Open-source platform used by 50,000+ developers. Build and deploy agentic workflows with drag-and-drop interface. SOC2 & HIPAA compliant. Connect 100+ apps.',
+      'Open-source platform used by 60,000+ developers. Design, deploy, and monitor agentic workflows with a visual drag-and-drop interface, 100+ integrations, and enterprise-grade security.',
     type: 'website',
-    url: 'https://sim.ai',
+    url: baseUrl,
     siteName: 'Sim',
     locale: 'en_US',
     images: [
@@ -45,16 +49,16 @@ export const metadata: Metadata = {
     creator: '@simdotai',
     title: 'Sim - AI Agent Workflow Builder | Open Source',
     description:
-      'Open-source platform for agentic workflows. 50,000+ developers. Visual builder. 100+ integrations. SOC2 & HIPAA compliant.',
+      'Open-source platform for agentic workflows. 60,000+ developers. Visual builder. 100+ integrations. SOC2 & HIPAA compliant.',
     images: {
       url: '/social/twitter-image.png',
       alt: 'Sim - Visual AI Workflow Builder',
     },
   },
   alternates: {
-    canonical: 'https://sim.ai',
+    canonical: baseUrl,
     languages: {
-      'en-US': 'https://sim.ai',
+      'en-US': baseUrl,
     },
   },
   robots: {
@@ -77,10 +81,12 @@ export const metadata: Metadata = {
   other: {
     'llm:content-type': 'AI workflow builder, visual programming, no-code AI development',
     'llm:use-cases':
-      'email automation, slack bots, discord moderation, data analysis, customer support, content generation',
+      'email automation, Slack bots, Discord moderation, data analysis, customer support, content generation, agentic automations',
     'llm:integrations':
       'OpenAI, Anthropic, Google AI, Slack, Gmail, Discord, Notion, Airtable, Supabase',
     'llm:pricing': 'free tier available, pro $20/month, team $40/month, enterprise custom',
+    'llm:region': 'global',
+    'llm:languages': 'en',
   },
 }
 
diff --git a/apps/sim/app/resume/[workflowId]/[executionId]/page.tsx b/apps/sim/app/resume/[workflowId]/[executionId]/page.tsx
index 0155fd8207..bfd2e2fac2 100644
--- a/apps/sim/app/resume/[workflowId]/[executionId]/page.tsx
+++ b/apps/sim/app/resume/[workflowId]/[executionId]/page.tsx
@@ -1,5 +1,5 @@
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
-import ResumeExecutionPage from './resume-page-client'
+import ResumeExecutionPage from '@/app/resume/[workflowId]/[executionId]/resume-page-client'
 
 export const runtime = 'nodejs'
 export const dynamic = 'force-dynamic'
diff --git a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
index e17bd40361..74b55d955e 100644
--- a/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
+++ b/apps/sim/app/resume/[workflowId]/[executionId]/resume-page-client.tsx
@@ -27,9 +27,9 @@ import {
 import { Separator } from '@/components/ui/separator'
 import { Textarea } from '@/components/ui/textarea'
 import { useBrandConfig } from '@/lib/branding/branding'
+import { inter } from '@/app/_styles/fonts/inter/inter'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Nav from '@/app/(landing)/components/nav/nav'
-import { inter } from '@/app/fonts/inter/inter'
-import { soehne } from '@/app/fonts/soehne/soehne'
 import type { ResumeStatus } from '@/executor/types'
 
 interface ResumeLinks {
diff --git a/apps/sim/app/sitemap.ts b/apps/sim/app/sitemap.ts
index aded7a52fb..cd06767a9b 100644
--- a/apps/sim/app/sitemap.ts
+++ b/apps/sim/app/sitemap.ts
@@ -1,8 +1,9 @@
 import type { MetadataRoute } from 'next'
 import { getAllPostMeta } from '@/lib/blog/registry'
+import { getBaseUrl } from '@/lib/urls/utils'
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  const baseUrl = 'https://sim.ai'
+  const baseUrl = getBaseUrl()
 
   const now = new Date()
 
diff --git a/apps/sim/app/templates/[id]/page.tsx b/apps/sim/app/templates/[id]/page.tsx
index 04792164fc..df0e27fcad 100644
--- a/apps/sim/app/templates/[id]/page.tsx
+++ b/apps/sim/app/templates/[id]/page.tsx
@@ -1,4 +1,4 @@
-import TemplateDetails from './template'
+import TemplateDetails from '@/app/templates/[id]/template'
 
 /**
  * Public template detail page for unauthenticated users.
diff --git a/apps/sim/app/templates/layout-client.tsx b/apps/sim/app/templates/layout-client.tsx
index 7051428881..885db63d61 100644
--- a/apps/sim/app/templates/layout-client.tsx
+++ b/apps/sim/app/templates/layout-client.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { Tooltip } from '@/components/emcn'
-import { season } from '@/app/fonts/season/season'
+import { season } from '@/app/_styles/fonts/season/season'
 
 export default function TemplatesLayoutClient({ children }: { children: React.ReactNode }) {
   return (
diff --git a/apps/sim/app/templates/layout.tsx b/apps/sim/app/templates/layout.tsx
index d1078c0793..8a9df80051 100644
--- a/apps/sim/app/templates/layout.tsx
+++ b/apps/sim/app/templates/layout.tsx
@@ -1,4 +1,4 @@
-import TemplatesLayoutClient from './layout-client'
+import TemplatesLayoutClient from '@/app/templates/layout-client'
 
 /**
  * Templates layout - server component wrapper for client layout.
diff --git a/apps/sim/app/templates/templates.tsx b/apps/sim/app/templates/templates.tsx
index 3c0507c329..45a3e0956d 100644
--- a/apps/sim/app/templates/templates.tsx
+++ b/apps/sim/app/templates/templates.tsx
@@ -7,10 +7,10 @@ import { Button } from '@/components/emcn'
 import { Input } from '@/components/ui/input'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { CredentialRequirement } from '@/lib/workflows/credential-extractor'
+import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 import { TemplateCard, TemplateCardSkeleton } from '@/app/templates/components/template-card'
 import { useDebounce } from '@/hooks/use-debounce'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
-import type { CreatorProfileDetails } from '@/types/creator-profile'
 
 const logger = createLogger('TemplatesPage')
 
diff --git a/apps/sim/app/unsubscribe/page.tsx b/apps/sim/app/unsubscribe/page.tsx
index c9ca1f2693..8f6e6bf688 100644
--- a/apps/sim/app/unsubscribe/page.tsx
+++ b/apps/sim/app/unsubscribe/page.tsx
@@ -1,3 +1,3 @@
-import Unsubscribe from './unsubscribe'
+import Unsubscribe from '@/app/unsubscribe/unsubscribe'
 
 export default Unsubscribe
diff --git a/apps/sim/app/workspace/[workspaceId]/files/[fileId]/view/page.tsx b/apps/sim/app/workspace/[workspaceId]/files/[fileId]/view/page.tsx
index 04d1ae8db3..e82182edb7 100644
--- a/apps/sim/app/workspace/[workspaceId]/files/[fileId]/view/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/files/[fileId]/view/page.tsx
@@ -2,7 +2,7 @@ import { redirect } from 'next/navigation'
 import { getSession } from '@/lib/auth'
 import { getWorkspaceFile } from '@/lib/uploads/contexts/workspace'
 import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
-import { FileViewer } from './file-viewer'
+import { FileViewer } from '@/app/workspace/[workspaceId]/files/[fileId]/view/file-viewer'
 
 interface FileViewerPageProps {
   params: Promise<{
diff --git a/apps/sim/app/workspace/[workspaceId]/layout.tsx b/apps/sim/app/workspace/[workspaceId]/layout.tsx
index 5f8c75a370..18e9d21ce1 100644
--- a/apps/sim/app/workspace/[workspaceId]/layout.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/layout.tsx
@@ -1,13 +1,27 @@
-import Providers from '@/app/workspace/[workspaceId]/providers/providers'
+'use client'
+
+import { Tooltip } from '@/components/emcn'
+import { GlobalCommandsProvider } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { ProviderModelsLoader } from '@/app/workspace/[workspaceId]/providers/provider-models-loader'
+import { SettingsLoader } from '@/app/workspace/[workspaceId]/providers/settings-loader'
+import { WorkspacePermissionsProvider } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { SidebarNew } from '@/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new'
 
 export default function WorkspaceLayout({ children }: { children: React.ReactNode }) {
   return (
-    <Providers>
-      <div className='flex min-h-screen w-full'>
-        <SidebarNew />
-        <div className='flex flex-1 flex-col'>{children}</div>
-      </div>
-    </Providers>
+    <>
+      <SettingsLoader />
+      <ProviderModelsLoader />
+      <GlobalCommandsProvider>
+        <Tooltip.Provider delayDuration={600} skipDelayDuration={0}>
+          <WorkspacePermissionsProvider>
+            <div className='flex min-h-screen w-full'>
+              <SidebarNew />
+              <div className='flex flex-1 flex-col'>{children}</div>
+            </div>
+          </WorkspacePermissionsProvider>
+        </Tooltip.Provider>
+      </GlobalCommandsProvider>
+    </>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/controls.tsx b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/controls.tsx
index 93bfee6b59..57962e59f5 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/dashboard/controls.tsx
@@ -3,7 +3,7 @@ import { ArrowUp, Loader2, RefreshCw, Search } from 'lucide-react'
 import { Button, Tooltip } from '@/components/emcn'
 import { Input } from '@/components/ui/input'
 import { cn } from '@/lib/utils'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Timeline from '@/app/workspace/[workspaceId]/logs/components/filters/components/timeline'
 
 export function Controls({
diff --git a/apps/sim/app/workspace/[workspaceId]/logs/dashboard.tsx b/apps/sim/app/workspace/[workspaceId]/logs/dashboard.tsx
index 7400eb4379..1a0252b938 100644
--- a/apps/sim/app/workspace/[workspaceId]/logs/dashboard.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/dashboard.tsx
@@ -3,7 +3,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Loader2 } from 'lucide-react'
 import { useParams, useRouter, useSearchParams } from 'next/navigation'
-import { soehne } from '@/app/fonts/soehne/soehne'
+import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Controls from '@/app/workspace/[workspaceId]/logs/components/dashboard/controls'
 import KPIs from '@/app/workspace/[workspaceId]/logs/components/dashboard/kpis'
 import WorkflowDetails from '@/app/workspace/[workspaceId]/logs/components/dashboard/workflow-details'
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/providers.tsx b/apps/sim/app/workspace/[workspaceId]/providers/providers.tsx
deleted file mode 100644
index 8633d8b0df..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/providers/providers.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-'use client'
-
-import React from 'react'
-import { Tooltip } from '@/components/emcn'
-import { GlobalCommandsProvider } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
-import { WorkspacePermissionsProvider } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { ProviderModelsLoader } from './provider-models-loader'
-import { SettingsLoader } from './settings-loader'
-
-interface ProvidersProps {
-  children: React.ReactNode
-}
-
-const Providers = React.memo<ProvidersProps>(({ children }) => {
-  return (
-    <>
-      <SettingsLoader />
-      <ProviderModelsLoader />
-      <GlobalCommandsProvider>
-        <Tooltip.Provider delayDuration={600} skipDelayDuration={0}>
-          <WorkspacePermissionsProvider>{children}</WorkspacePermissionsProvider>
-        </Tooltip.Provider>
-      </GlobalCommandsProvider>
-    </>
-  )
-})
-
-Providers.displayName = 'Providers'
-
-export default Providers
diff --git a/apps/sim/app/workspace/[workspaceId]/templates/templates.tsx b/apps/sim/app/workspace/[workspaceId]/templates/templates.tsx
index 46d344354e..5a3b95c53f 100644
--- a/apps/sim/app/workspace/[workspaceId]/templates/templates.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/templates/templates.tsx
@@ -5,13 +5,13 @@ import { Layout, Search } from 'lucide-react'
 import { Button } from '@/components/emcn'
 import { Input } from '@/components/ui/input'
 import { createLogger } from '@/lib/logs/console/logger'
+import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 import {
   TemplateCard,
   TemplateCardSkeleton,
 } from '@/app/workspace/[workspaceId]/templates/components/template-card'
 import { useDebounce } from '@/hooks/use-debounce'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
-import type { CreatorProfileDetails } from '@/types/creator-profile'
 
 const logger = createLogger('TemplatesPage')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts b/apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts
new file mode 100644
index 0000000000..c9d74cced8
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/utils/commands-utils.ts
@@ -0,0 +1,152 @@
+import type { GlobalCommand } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+
+/**
+ * Identifiers for all globally-available commands.
+ *
+ * Components must use these identifiers (via {@link createCommand}) rather than
+ * ad-hoc ids or shortcuts to ensure a single source of truth.
+ */
+export type CommandId =
+  | 'add-agent'
+  | 'goto-templates'
+  | 'goto-logs'
+  | 'open-search'
+  | 'run-workflow'
+  | 'focus-copilot-tab'
+  | 'focus-toolbar-tab'
+  | 'focus-editor-tab'
+  | 'clear-terminal-console'
+  | 'focus-toolbar-search'
+  | 'clear-notifications'
+
+/**
+ * Static metadata for a global command.
+ *
+ * This central registry defines the keyboard shortcut and default behavior
+ * for whether the command is allowed inside editable elements.
+ */
+export interface CommandDefinition {
+  /** Stable identifier for the command. */
+  id: CommandId
+  /** Shortcut string in the form "Mod+Shift+A", "Mod+Enter", etc. */
+  shortcut: string
+  /**
+   * Whether to allow the command inside editable elements such as inputs and
+   * textareas. When omitted, the command provider will default to `true`.
+   */
+  allowInEditable?: boolean
+}
+
+/**
+ * Central mapping from command id to its definition.
+ *
+ * All global commands must be declared here to be usable.
+ */
+export const COMMAND_DEFINITIONS: Record<CommandId, CommandDefinition> = {
+  'add-agent': {
+    id: 'add-agent',
+    shortcut: 'Mod+Shift+A',
+    allowInEditable: true,
+  },
+  'goto-templates': {
+    id: 'goto-templates',
+    shortcut: 'Mod+Y',
+    allowInEditable: true,
+  },
+  'goto-logs': {
+    id: 'goto-logs',
+    shortcut: 'Mod+L',
+    allowInEditable: true,
+  },
+  'open-search': {
+    id: 'open-search',
+    shortcut: 'Mod+K',
+    allowInEditable: true,
+  },
+  'run-workflow': {
+    id: 'run-workflow',
+    shortcut: 'Mod+Enter',
+    allowInEditable: false,
+  },
+  'focus-copilot-tab': {
+    id: 'focus-copilot-tab',
+    shortcut: 'C',
+    allowInEditable: false,
+  },
+  'focus-toolbar-tab': {
+    id: 'focus-toolbar-tab',
+    shortcut: 'T',
+    allowInEditable: false,
+  },
+  'focus-editor-tab': {
+    id: 'focus-editor-tab',
+    shortcut: 'E',
+    allowInEditable: false,
+  },
+  'clear-terminal-console': {
+    id: 'clear-terminal-console',
+    shortcut: 'Mod+D',
+    allowInEditable: false,
+  },
+  'focus-toolbar-search': {
+    id: 'focus-toolbar-search',
+    shortcut: 'Mod+F',
+    allowInEditable: false,
+  },
+  'clear-notifications': {
+    id: 'clear-notifications',
+    shortcut: 'Mod+E',
+    allowInEditable: false,
+  },
+}
+
+/**
+ * Input for creating a concrete command instance from the registry.
+ */
+export interface CreateCommandInput {
+  /** Identifier of the command to materialize. */
+  id: CommandId
+  /**
+   * Handler invoked when the shortcut is matched. This is the only dynamic
+   * part supplied by call sites.
+   */
+  handler: (event: KeyboardEvent) => void
+  /**
+   * Optional overrides for definition defaults. Use sparingly; most behavior
+   * should be configured in {@link COMMAND_DEFINITIONS}.
+   */
+  overrides?: Pick<GlobalCommand, 'allowInEditable'>
+}
+
+/**
+ * Creates a concrete {@link GlobalCommand} from a registry definition.
+ *
+ * This ensures:
+ * - Only commands declared in {@link COMMAND_DEFINITIONS} can be registered.
+ * - Shortcut strings and ids are centralized and consistent.
+ *
+ * @throws Error when the `id` is not present in the registry.
+ */
+export function createCommand(input: CreateCommandInput): GlobalCommand {
+  const definition = COMMAND_DEFINITIONS[input.id]
+  if (!definition) {
+    throw new Error(`Unknown global command id: ${input.id as string}`)
+  }
+
+  return {
+    id: definition.id,
+    shortcut: definition.shortcut,
+    allowInEditable: input.overrides?.allowInEditable ?? definition.allowInEditable,
+    handler: input.handler,
+  }
+}
+
+/**
+ * Convenience helper to create multiple commands from the registry in one call.
+ *
+ * @param inputs - List of command inputs to materialize.
+ * @returns Array of {@link GlobalCommand} instances ready for registration.
+ */
+export function createCommands(inputs: CreateCommandInput[]): GlobalCommand[] {
+  return inputs.map((input) => createCommand(input))
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
index 122ce9cc15..b2dbdaf619 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/chat.tsx
@@ -24,6 +24,16 @@ import { cn } from '@/lib/utils'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format-utils'
 import { StartBlockPath, TriggerUtils } from '@/lib/workflows/triggers'
 import { START_BLOCK_RESERVED_FIELDS } from '@/lib/workflows/types'
+import {
+  ChatMessage,
+  OutputSelect,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components'
+import {
+  useChatBoundarySync,
+  useChatDrag,
+  useChatFileUpload,
+  useChatResize,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/chat/hooks'
 import { useScrollManagement } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
 import type { BlockLog, ExecutionResult } from '@/executor/types'
@@ -34,8 +44,6 @@ import { useTerminalConsoleStore } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import { ChatMessage, OutputSelect } from './components'
-import { useChatBoundarySync, useChatDrag, useChatFileUpload, useChatResize } from './hooks'
 
 const logger = createLogger('FloatingChat')
 
@@ -339,7 +347,14 @@ export function Chat() {
   }, [workflowMessages])
 
   // Scroll management hook - reuse copilot's implementation
-  const { scrollAreaRef, scrollToBottom } = useScrollManagement(messagesForScrollHook, isStreaming)
+  // Use immediate scroll behavior to keep the view pinned to the bottom during streaming
+  const { scrollAreaRef, scrollToBottom } = useScrollManagement(
+    messagesForScrollHook,
+    isStreaming,
+    {
+      behavior: 'auto',
+    }
+  )
 
   // Memoize user messages for performance
   const userMessages = useMemo(() => {
@@ -406,6 +421,7 @@ export function Chat() {
       const reader = stream.getReader()
       const decoder = new TextDecoder()
       let accumulatedContent = ''
+      let buffer = ''
 
       try {
         while (true) {
@@ -415,8 +431,19 @@ export function Chat() {
             break
           }
 
-          const chunk = decoder.decode(value)
-          const lines = chunk.split('\n\n')
+          const chunk = decoder.decode(value, { stream: true })
+          buffer += chunk
+
+          // Process only complete SSE messages; keep any partial trailing data in buffer
+          const separatorIndex = buffer.lastIndexOf('\n\n')
+          if (separatorIndex === -1) {
+            continue
+          }
+
+          const processable = buffer.slice(0, separatorIndex)
+          buffer = buffer.slice(separatorIndex + 2)
+
+          const lines = processable.split('\n\n')
 
           for (const line of lines) {
             if (!line.startsWith('data: ')) continue
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
index d532582c59..ae9c5759ee 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/chat-message/chat-message.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react'
-import { StreamingIndicator } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/smooth-streaming'
+import { StreamingIndicator } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming'
 
 interface ChatAttachment {
   id: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/index.ts
deleted file mode 100644
index 876cbfdaec..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { useChatDeployment } from './use-chat-deployment'
-import { useChatForm } from './use-chat-form'
-import { useImageUpload } from './use-image-upload'
-
-export { useChatDeployment, useChatForm, useImageUpload }
-
-export type { ChatFormData, ChatFormErrors } from './use-chat-form'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-image-upload.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-image-upload.ts
deleted file mode 100644
index a3b6ffcbc1..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-image-upload.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { createLogger } from '@/lib/logs/console/logger'
-
-const logger = createLogger('ImageUpload')
-const MAX_FILE_SIZE = 5 * 1024 * 1024 // 5MB
-const ACCEPTED_IMAGE_TYPES = ['image/png', 'image/jpeg', 'image/jpg']
-
-interface UseImageUploadProps {
-  onUpload?: (url: string | null) => void
-  onError?: (error: string) => void
-  uploadToServer?: boolean
-}
-
-export function useImageUpload({
-  onUpload,
-  onError,
-  uploadToServer = false,
-}: UseImageUploadProps = {}) {
-  const previewRef = useRef<string | null>(null)
-  const fileInputRef = useRef<HTMLInputElement>(null)
-  const [previewUrl, setPreviewUrl] = useState<string | null>(null)
-  const [fileName, setFileName] = useState<string | null>(null)
-  const [isUploading, setIsUploading] = useState(false)
-
-  const validateFile = useCallback((file: File): string | null => {
-    if (file.size > MAX_FILE_SIZE) {
-      return `File "${file.name}" is too large. Maximum size is 5MB.`
-    }
-    if (!ACCEPTED_IMAGE_TYPES.includes(file.type)) {
-      return `File "${file.name}" is not a supported image format. Please use PNG or JPEG.`
-    }
-    return null
-  }, [])
-
-  const handleThumbnailClick = useCallback(() => {
-    fileInputRef.current?.click()
-  }, [])
-
-  const uploadFileToServer = useCallback(async (file: File): Promise<string> => {
-    try {
-      // First, try to get a pre-signed URL for direct upload with chat type
-      const presignedResponse = await fetch('/api/files/presigned?type=chat', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          fileName: file.name,
-          contentType: file.type,
-          fileSize: file.size,
-        }),
-      })
-
-      if (presignedResponse.ok) {
-        // Use direct upload with presigned URL
-        const presignedData = await presignedResponse.json()
-
-        // Log the presigned URL response for debugging
-        logger.info('Presigned URL response:', presignedData)
-
-        // Upload directly to storage provider
-        const uploadHeaders: Record<string, string> = {
-          'Content-Type': file.type,
-        }
-
-        // Add any additional headers from the presigned response (for Azure Blob)
-        if (presignedData.uploadHeaders) {
-          Object.assign(uploadHeaders, presignedData.uploadHeaders)
-        }
-
-        const uploadResponse = await fetch(presignedData.uploadUrl, {
-          method: 'PUT',
-          body: file,
-          headers: uploadHeaders,
-        })
-
-        logger.info(`Upload response status: ${uploadResponse.status}`)
-        logger.info(
-          'Upload response headers:',
-          Object.fromEntries(uploadResponse.headers.entries())
-        )
-
-        if (!uploadResponse.ok) {
-          const responseText = await uploadResponse.text()
-          logger.error(`Direct upload failed: ${uploadResponse.status} - ${responseText}`)
-          throw new Error(`Direct upload failed: ${uploadResponse.status} - ${responseText}`)
-        }
-
-        // Use the file info returned from the presigned URL endpoint
-        const publicUrl = presignedData.fileInfo.path
-        logger.info(`Image uploaded successfully via direct upload: ${publicUrl}`)
-        return publicUrl
-      }
-      // Fallback to traditional upload through API route
-      const formData = new FormData()
-      formData.append('file', file)
-      formData.append('context', 'chat')
-
-      const response = await fetch('/api/files/upload', {
-        method: 'POST',
-        body: formData,
-      })
-
-      if (!response.ok) {
-        const errorData = await response.json().catch(() => ({ error: response.statusText }))
-        throw new Error(errorData.error || `Failed to upload file: ${response.status}`)
-      }
-
-      const data = await response.json()
-      const publicUrl = data.path
-      logger.info(`Image uploaded successfully via server upload: ${publicUrl}`)
-      return publicUrl
-    } catch (error) {
-      throw new Error(error instanceof Error ? error.message : 'Failed to upload image')
-    }
-  }, [])
-
-  const handleFileChange = useCallback(
-    async (event: React.ChangeEvent<HTMLInputElement>) => {
-      const file = event.target.files?.[0]
-      if (file) {
-        // Validate file first
-        const validationError = validateFile(file)
-        if (validationError) {
-          onError?.(validationError)
-          return
-        }
-
-        setFileName(file.name)
-
-        // Always create preview URL
-        const previewUrl = URL.createObjectURL(file)
-        setPreviewUrl(previewUrl)
-        previewRef.current = previewUrl
-
-        if (uploadToServer) {
-          setIsUploading(true)
-          try {
-            const serverUrl = await uploadFileToServer(file)
-            onUpload?.(serverUrl)
-          } catch (error) {
-            const errorMessage = error instanceof Error ? error.message : 'Failed to upload image'
-            onError?.(errorMessage)
-          } finally {
-            setIsUploading(false)
-          }
-        } else {
-          onUpload?.(previewUrl)
-        }
-      }
-    },
-    [onUpload, onError, uploadToServer, uploadFileToServer, validateFile]
-  )
-
-  const handleRemove = useCallback(() => {
-    if (previewUrl) {
-      URL.revokeObjectURL(previewUrl)
-    }
-    setPreviewUrl(null)
-    setFileName(null)
-    previewRef.current = null
-    if (fileInputRef.current) {
-      fileInputRef.current.value = ''
-    }
-    onUpload?.(null) // Notify parent that image was removed
-  }, [previewUrl, onUpload])
-
-  useEffect(() => {
-    return () => {
-      if (previewRef.current) {
-        URL.revokeObjectURL(previewRef.current)
-      }
-    }
-  }, [])
-
-  return {
-    previewUrl,
-    fileName,
-    fileInputRef,
-    handleThumbnailClick,
-    handleFileChange,
-    handleRemove,
-    isUploading,
-  }
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/index.ts
deleted file mode 100644
index e7719805d6..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ApiEndpoint } from './api-endpoint/api-endpoint'
-export { DeployStatus } from './deploy-status/deploy-status'
-export { ExampleCommand } from './example-command/example-command'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/image-selector/image-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/image-selector/image-selector.tsx
deleted file mode 100644
index b17c07074f..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/image-selector/image-selector.tsx
+++ /dev/null
@@ -1,279 +0,0 @@
-'use client'
-
-import { useRef, useState } from 'react'
-import { Image, Loader2, Upload, X } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import { Label } from '@/components/ui/label'
-import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
-
-const logger = createLogger('ImageSelector')
-
-const MAX_FILE_SIZE = 5 * 1024 * 1024 // 5MB
-const ACCEPTED_IMAGE_TYPES = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/webp']
-
-interface ImageSelectorProps {
-  value?: string | null
-  onChange: (imageUrl: string | null) => void
-  disabled?: boolean
-  label?: string
-  placeholder?: string
-  className?: string
-}
-
-export function ImageSelector({
-  value,
-  onChange,
-  disabled = false,
-  label = 'Logo Image',
-  placeholder = 'Upload an image for your chat logo',
-  className,
-}: ImageSelectorProps) {
-  const fileInputRef = useRef<HTMLInputElement>(null)
-  const [isUploading, setIsUploading] = useState(false)
-  const [isDragging, setIsDragging] = useState(false)
-  const [uploadError, setUploadError] = useState<string | null>(null)
-
-  const validateFile = (file: File): string | null => {
-    if (file.size > MAX_FILE_SIZE) {
-      return `File "${file.name}" is too large. Maximum size is 5MB.`
-    }
-    if (!ACCEPTED_IMAGE_TYPES.includes(file.type)) {
-      return `File "${file.name}" is not a supported image format. Please use PNG, JPEG, GIF, or WebP.`
-    }
-    return null
-  }
-
-  const handleFileUpload = async (file: File) => {
-    const error = validateFile(file)
-    if (error) {
-      setUploadError(error)
-      return
-    }
-
-    setIsUploading(true)
-    setUploadError(null)
-
-    try {
-      // First, try to get a pre-signed URL for direct upload with chat type
-      const presignedResponse = await fetch('/api/files/presigned?type=chat', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          fileName: file.name,
-          contentType: file.type,
-          fileSize: file.size,
-        }),
-      })
-
-      if (presignedResponse.ok) {
-        // Use direct upload with presigned URL
-        const presignedData = await presignedResponse.json()
-
-        // Log the presigned URL response for debugging
-        logger.info('Presigned URL response:', presignedData)
-
-        // Upload directly to storage provider
-        const uploadHeaders: Record<string, string> = {
-          'Content-Type': file.type,
-        }
-
-        // Add any additional headers from the presigned response (for Azure Blob)
-        if (presignedData.uploadHeaders) {
-          Object.assign(uploadHeaders, presignedData.uploadHeaders)
-        }
-
-        const uploadResponse = await fetch(presignedData.uploadUrl, {
-          method: 'PUT',
-          body: file,
-          headers: uploadHeaders,
-        })
-
-        logger.info(`Upload response status: ${uploadResponse.status}`)
-        logger.info(
-          'Upload response headers:',
-          Object.fromEntries(uploadResponse.headers.entries())
-        )
-
-        if (!uploadResponse.ok) {
-          const responseText = await uploadResponse.text()
-          logger.error(`Direct upload failed: ${uploadResponse.status} - ${responseText}`)
-          throw new Error(`Direct upload failed: ${uploadResponse.status} - ${responseText}`)
-        }
-
-        // Use the file info returned from the presigned URL endpoint
-        const publicUrl = presignedData.fileInfo.path
-        onChange(publicUrl)
-        logger.info(`Image uploaded successfully via direct upload: ${publicUrl}`)
-      } else {
-        // Fallback to traditional upload through API route
-        const formData = new FormData()
-        formData.append('file', file)
-        formData.append('context', 'chat')
-
-        const response = await fetch('/api/files/upload', {
-          method: 'POST',
-          body: formData,
-        })
-
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({ error: response.statusText }))
-          throw new Error(errorData.error || `Failed to upload file: ${response.status}`)
-        }
-
-        const data = await response.json()
-        const publicUrl = data.path
-        onChange(publicUrl)
-        logger.info(`Image uploaded successfully via server upload: ${publicUrl}`)
-      }
-    } catch (error) {
-      logger.error('Error uploading image:', error)
-      const errorMessage =
-        error instanceof Error ? error.message : 'Failed to upload image. Please try again.'
-      setUploadError(errorMessage)
-    } finally {
-      setIsUploading(false)
-    }
-  }
-
-  const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const file = e.target.files?.[0]
-    if (file) {
-      handleFileUpload(file)
-    }
-  }
-
-  const handleDragOver = (e: React.DragEvent) => {
-    e.preventDefault()
-    e.stopPropagation()
-    if (!disabled) {
-      setIsDragging(true)
-    }
-  }
-
-  const handleDragLeave = (e: React.DragEvent) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setIsDragging(false)
-  }
-
-  const handleDrop = (e: React.DragEvent) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setIsDragging(false)
-
-    if (disabled) return
-
-    const file = e.dataTransfer.files?.[0]
-    if (file) {
-      handleFileUpload(file)
-    }
-  }
-
-  const handleRemove = () => {
-    onChange(null)
-    setUploadError(null)
-    if (fileInputRef.current) {
-      fileInputRef.current.value = ''
-    }
-  }
-
-  const handleClick = () => {
-    if (!disabled && fileInputRef.current) {
-      fileInputRef.current.click()
-    }
-  }
-
-  return (
-    <div className={cn('space-y-2', className)}>
-      <Label className='font-medium text-sm'>{label}</Label>
-
-      {value ? (
-        // Show uploaded image
-        <div className='space-y-2'>
-          <div className='relative inline-block'>
-            <img
-              src={value}
-              alt='Uploaded logo'
-              className='h-20 w-20 rounded-lg border object-cover'
-            />
-            <Button
-              type='button'
-              variant='destructive'
-              size='icon'
-              className='-right-2 -top-2 absolute h-6 w-6 rounded-full'
-              onClick={handleRemove}
-              disabled={disabled || isUploading}
-            >
-              <X className='h-3 w-3' />
-            </Button>
-          </div>
-          <Button
-            type='button'
-            variant='outline'
-            onClick={handleClick}
-            disabled={disabled || isUploading}
-            className='text-sm'
-          >
-            {isUploading ? (
-              <>
-                <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                Uploading...
-              </>
-            ) : (
-              <>
-                <Upload className='mr-2 h-4 w-4' />
-                Replace Image
-              </>
-            )}
-          </Button>
-        </div>
-      ) : (
-        // Show upload area
-        <div
-          onDragOver={handleDragOver}
-          onDragLeave={handleDragLeave}
-          onDrop={handleDrop}
-          onClick={handleClick}
-          className={cn(
-            'relative flex cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-dashed p-6 text-center transition-colors',
-            isDragging
-              ? 'border-primary bg-primary/5'
-              : 'border-muted-foreground/25 hover:border-muted-foreground/40 hover:bg-muted/10',
-            disabled && 'cursor-not-allowed opacity-50'
-          )}
-        >
-          <input
-            ref={fileInputRef}
-            type='file'
-            accept={ACCEPTED_IMAGE_TYPES.join(',')}
-            onChange={handleFileChange}
-            className='hidden'
-            disabled={disabled}
-          />
-
-          {isUploading ? (
-            <div className='space-y-2'>
-              <Loader2 className='mx-auto h-8 w-8 animate-spin text-muted-foreground' />
-              <p className='text-muted-foreground text-sm'>Uploading image...</p>
-            </div>
-          ) : (
-            <div className='space-y-2'>
-              <Image className='mx-auto h-8 w-8 text-muted-foreground' />
-              <div>
-                <p className='font-medium text-sm'>
-                  {isDragging ? 'Drop image here!' : placeholder}
-                </p>
-                <p className='text-muted-foreground text-xs'>PNG, JPEG, GIF, or WebP (max 5MB)</p>
-              </div>
-            </div>
-          )}
-        </div>
-      )}
-
-      {uploadError && <p className='text-destructive text-sm'>{uploadError}</p>}
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/index.ts
deleted file mode 100644
index cfdf33ecd6..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { ChatDeploy } from './chat-deploy/chat-deploy'
-export { DeploymentInfo } from './deployment-info/deployment-info'
-export { ImageSelector } from './image-selector/image-selector'
-export { TemplateDeploy } from './template-deploy/template-deploy'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.test.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.test.ts
deleted file mode 100644
index 596b838b09..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.test.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * Deployment Controls Change Detection Logic Tests
- *
- * This file tests the core logic of how DeploymentControls handles change detection,
- * specifically focusing on the needsRedeployment prop handling and state management.
- */
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mockDeploymentStatus = {
-  isDeployed: false,
-  needsRedeployment: false,
-}
-
-const mockWorkflowRegistry = {
-  getState: vi.fn(() => ({
-    getWorkflowDeploymentStatus: vi.fn((workflowId) => mockDeploymentStatus),
-  })),
-}
-
-vi.mock('@/stores/workflows/registry/store', () => ({
-  useWorkflowRegistry: vi.fn((selector) => {
-    if (typeof selector === 'function') {
-      return selector(mockWorkflowRegistry.getState())
-    }
-    return mockWorkflowRegistry.getState()
-  }),
-}))
-
-describe('DeploymentControls Change Detection Logic', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockDeploymentStatus.isDeployed = false
-    mockDeploymentStatus.needsRedeployment = false
-  })
-
-  afterEach(() => {
-    vi.resetAllMocks()
-  })
-
-  describe('needsRedeployment Priority Logic', () => {
-    it('should prioritize parent needsRedeployment over workflow registry', () => {
-      const parentNeedsRedeployment = true
-      const workflowRegistryNeedsRedeployment = false
-
-      const workflowNeedsRedeployment = parentNeedsRedeployment
-
-      expect(workflowNeedsRedeployment).toBe(true)
-      expect(workflowNeedsRedeployment).not.toBe(workflowRegistryNeedsRedeployment)
-    })
-
-    it('should handle false needsRedeployment correctly', () => {
-      const parentNeedsRedeployment = false
-      const workflowNeedsRedeployment = parentNeedsRedeployment
-
-      expect(workflowNeedsRedeployment).toBe(false)
-    })
-
-    it('should maintain consistency with parent state changes', () => {
-      let parentNeedsRedeployment = false
-      let workflowNeedsRedeployment = parentNeedsRedeployment
-
-      expect(workflowNeedsRedeployment).toBe(false)
-
-      parentNeedsRedeployment = true
-      workflowNeedsRedeployment = parentNeedsRedeployment
-
-      expect(workflowNeedsRedeployment).toBe(true)
-
-      parentNeedsRedeployment = false
-      workflowNeedsRedeployment = parentNeedsRedeployment
-
-      expect(workflowNeedsRedeployment).toBe(false)
-    })
-  })
-
-  describe('Deployment Status Integration', () => {
-    it('should handle deployment status correctly', () => {
-      mockDeploymentStatus.isDeployed = true
-      mockDeploymentStatus.needsRedeployment = false
-
-      const deploymentStatus = mockWorkflowRegistry
-        .getState()
-        .getWorkflowDeploymentStatus('test-id')
-
-      expect(deploymentStatus.isDeployed).toBe(true)
-      expect(deploymentStatus.needsRedeployment).toBe(false)
-    })
-
-    it('should handle missing deployment status', () => {
-      const tempMockRegistry = {
-        getState: vi.fn(() => ({
-          getWorkflowDeploymentStatus: vi.fn(() => null),
-        })),
-      }
-
-      // Temporarily replace the mock
-      const originalMock = mockWorkflowRegistry.getState
-      mockWorkflowRegistry.getState = tempMockRegistry.getState as any
-
-      const deploymentStatus = mockWorkflowRegistry
-        .getState()
-        .getWorkflowDeploymentStatus('test-id')
-
-      expect(deploymentStatus).toBe(null)
-
-      mockWorkflowRegistry.getState = originalMock
-    })
-
-    it('should handle undefined deployment status properties', () => {
-      mockWorkflowRegistry.getState = vi.fn(() => ({
-        getWorkflowDeploymentStatus: vi.fn(() => ({})),
-      })) as any
-
-      const deploymentStatus = mockWorkflowRegistry
-        .getState()
-        .getWorkflowDeploymentStatus('test-id')
-
-      const isDeployed = deploymentStatus?.isDeployed || false
-      expect(isDeployed).toBe(false)
-    })
-  })
-
-  describe('Change Detection Scenarios', () => {
-    it('should handle the redeployment cycle correctly', () => {
-      // Scenario 1: Initial state - deployed, no changes
-      mockDeploymentStatus.isDeployed = true
-      let parentNeedsRedeployment = false
-      let shouldShowIndicator = mockDeploymentStatus.isDeployed && parentNeedsRedeployment
-
-      expect(shouldShowIndicator).toBe(false)
-
-      // Scenario 2: User makes changes
-      parentNeedsRedeployment = true
-      shouldShowIndicator = mockDeploymentStatus.isDeployed && parentNeedsRedeployment
-
-      expect(shouldShowIndicator).toBe(true)
-
-      // Scenario 3: User redeploys
-      parentNeedsRedeployment = false // Reset after redeployment
-      shouldShowIndicator = mockDeploymentStatus.isDeployed && parentNeedsRedeployment
-
-      expect(shouldShowIndicator).toBe(false)
-    })
-
-    it('should not show indicator when workflow is not deployed', () => {
-      mockDeploymentStatus.isDeployed = false
-      const parentNeedsRedeployment = true
-      const shouldShowIndicator = mockDeploymentStatus.isDeployed && parentNeedsRedeployment
-
-      expect(shouldShowIndicator).toBe(false)
-    })
-
-    it('should show correct tooltip messages based on state', () => {
-      const getTooltipMessage = (isDeployed: boolean, needsRedeployment: boolean) => {
-        if (isDeployed && needsRedeployment) {
-          return 'Workflow changes detected'
-        }
-        if (isDeployed) {
-          return 'Deployment Settings'
-        }
-        return 'Deploy as API'
-      }
-
-      // Not deployed
-      expect(getTooltipMessage(false, false)).toBe('Deploy as API')
-      expect(getTooltipMessage(false, true)).toBe('Deploy as API')
-
-      // Deployed, no changes
-      expect(getTooltipMessage(true, false)).toBe('Deployment Settings')
-
-      // Deployed, changes detected
-      expect(getTooltipMessage(true, true)).toBe('Workflow changes detected')
-    })
-  })
-
-  describe('Error Handling', () => {
-    it('should handle null activeWorkflowId gracefully', () => {
-      const deploymentStatus = mockWorkflowRegistry.getState().getWorkflowDeploymentStatus(null)
-
-      expect(deploymentStatus).toBeDefined()
-    })
-  })
-
-  describe('Props Integration', () => {
-    it('should correctly pass needsRedeployment to child components', () => {
-      const parentNeedsRedeployment = true
-      const propsToModal = {
-        needsRedeployment: parentNeedsRedeployment,
-        workflowId: 'test-id',
-      }
-
-      expect(propsToModal.needsRedeployment).toBe(true)
-    })
-
-    it('should maintain prop consistency across re-renders', () => {
-      let needsRedeployment = false
-
-      let componentProps = { needsRedeployment }
-      expect(componentProps.needsRedeployment).toBe(false)
-
-      needsRedeployment = true
-      componentProps = { needsRedeployment }
-      expect(componentProps.needsRedeployment).toBe(true)
-
-      needsRedeployment = false
-      componentProps = { needsRedeployment }
-      expect(componentProps.needsRedeployment).toBe(false)
-    })
-  })
-})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.tsx
deleted file mode 100644
index c0b6cf9018..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/deployment-controls.tsx
+++ /dev/null
@@ -1,179 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { Loader2, Rocket } from 'lucide-react'
-import { Tooltip } from '@/components/emcn'
-import { Button } from '@/components/ui/button'
-import { cn } from '@/lib/utils'
-import { DeployModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components'
-import type { WorkspaceUserPermissions } from '@/hooks/use-user-permissions'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import type { WorkflowState } from '@/stores/workflows/workflow/types'
-
-interface DeploymentControlsProps {
-  activeWorkflowId: string | null
-  needsRedeployment: boolean
-  setNeedsRedeployment: (value: boolean) => void
-  deployedState: WorkflowState | null
-  isLoadingDeployedState: boolean
-  refetchDeployedState: () => Promise<void>
-  userPermissions: WorkspaceUserPermissions
-}
-
-export function DeploymentControls({
-  activeWorkflowId,
-  needsRedeployment,
-  setNeedsRedeployment,
-  deployedState,
-  isLoadingDeployedState,
-  refetchDeployedState,
-  userPermissions,
-}: DeploymentControlsProps) {
-  const deploymentStatus = useWorkflowRegistry((state) =>
-    state.getWorkflowDeploymentStatus(activeWorkflowId)
-  )
-  const isDeployed = deploymentStatus?.isDeployed || false
-
-  const workflowNeedsRedeployment = needsRedeployment
-  const isPreviousVersionActive = isDeployed && workflowNeedsRedeployment
-
-  const [isDeploying, setIsDeploying] = useState(false)
-  const [isModalOpen, setIsModalOpen] = useState(false)
-
-  const lastWorkflowIdRef = useRef<string | null>(null)
-
-  useEffect(() => {
-    if (activeWorkflowId !== lastWorkflowIdRef.current) {
-      lastWorkflowIdRef.current = activeWorkflowId
-    }
-  }, [activeWorkflowId])
-
-  const refetchWithErrorHandling = async () => {
-    if (!activeWorkflowId) return
-
-    try {
-      await refetchDeployedState()
-    } catch (error) {}
-  }
-
-  const canDeploy = userPermissions.canAdmin
-  const isDisabled = isDeploying || !canDeploy
-
-  const handleDeployClick = useCallback(async () => {
-    if (!canDeploy || !activeWorkflowId) return
-
-    // If undeployed, deploy first then open modal
-    if (!isDeployed) {
-      setIsDeploying(true)
-      try {
-        const response = await fetch(`/api/workflows/${activeWorkflowId}/deploy`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            deployChatEnabled: false,
-          }),
-        })
-
-        if (response.ok) {
-          const responseData = await response.json()
-          const setDeploymentStatus = useWorkflowRegistry.getState().setDeploymentStatus
-          const isDeployedStatus = responseData.isDeployed ?? false
-          const deployedAtTime = responseData.deployedAt
-            ? new Date(responseData.deployedAt)
-            : undefined
-          setDeploymentStatus(
-            activeWorkflowId,
-            isDeployedStatus,
-            deployedAtTime,
-            responseData.apiKey || ''
-          )
-          await refetchWithErrorHandling()
-          // Open modal after successful deployment
-          setIsModalOpen(true)
-        }
-      } catch (error) {
-        // On error, still open modal to show error
-        setIsModalOpen(true)
-      } finally {
-        setIsDeploying(false)
-      }
-      return
-    }
-
-    // If already deployed, just open modal
-    setIsModalOpen(true)
-  }, [canDeploy, isDeployed, activeWorkflowId, refetchWithErrorHandling])
-
-  const getTooltipText = () => {
-    if (!canDeploy) {
-      return 'Admin permissions required to deploy workflows'
-    }
-    if (isDeploying) {
-      return 'Deploying...'
-    }
-    if (isDeployed && workflowNeedsRedeployment) {
-      return 'Workflow changes detected'
-    }
-    if (isDeployed) {
-      return 'Deployment Settings'
-    }
-    return 'Deploy Workflow'
-  }
-
-  return (
-    <>
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <div className='relative'>
-            <Button
-              variant='outline'
-              onClick={handleDeployClick}
-              disabled={isDisabled}
-              className={cn(
-                'h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs',
-                'hover:border-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hex)] hover:text-white',
-                'transition-all duration-200',
-                isDeployed && !isPreviousVersionActive && 'text-[var(--brand-primary-hover-hex)]',
-                isPreviousVersionActive &&
-                  'border-purple-500 bg-purple-500/10 text-purple-600 dark:text-purple-400',
-                isDisabled &&
-                  'cursor-not-allowed opacity-50 hover:border hover:bg-card hover:text-card-foreground hover:shadow-xs'
-              )}
-            >
-              {isDeploying ? (
-                <Loader2 className='h-5 w-5 animate-spin' />
-              ) : (
-                <Rocket className='h-5 w-5' />
-              )}
-              <span className='sr-only'>Deploy API</span>
-            </Button>
-
-            {isDeployed && workflowNeedsRedeployment && (
-              <div className='pointer-events-none absolute right-2 bottom-2 flex items-center justify-center'>
-                <div className='relative'>
-                  <div className='absolute inset-0 h-[6px] w-[6px] animate-ping rounded-full bg-amber-500/50' />
-                  <div className='zoom-in fade-in relative h-[6px] w-[6px] animate-in rounded-full bg-amber-500/80 duration-300' />
-                </div>
-                <span className='sr-only'>Needs Redeployment</span>
-              </div>
-            )}
-          </div>
-        </Tooltip.Trigger>
-        <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-      </Tooltip.Root>
-
-      <DeployModal
-        open={isModalOpen}
-        onOpenChange={setIsModalOpen}
-        workflowId={activeWorkflowId}
-        needsRedeployment={workflowNeedsRedeployment}
-        setNeedsRedeployment={setNeedsRedeployment}
-        deployedState={deployedState as WorkflowState}
-        isLoadingDeployedState={isLoadingDeployedState}
-        refetchDeployedState={refetchWithErrorHandling}
-      />
-    </>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/export-controls/export-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/export-controls/export-controls.tsx
deleted file mode 100644
index 87ad8544f3..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/export-controls/export-controls.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { ArrowDownToLine } from 'lucide-react'
-import { Tooltip } from '@/components/emcn'
-import { Button } from '@/components/ui/button'
-import { createLogger } from '@/lib/logs/console/logger'
-import { useWorkflowJsonStore } from '@/stores/workflows/json/store'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-
-const logger = createLogger('ExportControls')
-
-interface ExportControlsProps {
-  disabled?: boolean
-}
-
-export function ExportControls({ disabled = false }: ExportControlsProps) {
-  const [isExporting, setIsExporting] = useState(false)
-  const { workflows, activeWorkflowId } = useWorkflowRegistry()
-  const { getJson } = useWorkflowJsonStore()
-
-  const currentWorkflow = activeWorkflowId ? workflows[activeWorkflowId] : null
-
-  const downloadFile = (content: string, filename: string, mimeType: string) => {
-    try {
-      const blob = new Blob([content], { type: mimeType })
-      const url = URL.createObjectURL(blob)
-      const a = document.createElement('a')
-      a.href = url
-      a.download = filename
-      document.body.appendChild(a)
-      a.click()
-      document.body.removeChild(a)
-      URL.revokeObjectURL(url)
-    } catch (error) {
-      logger.error('Failed to download file:', error)
-    }
-  }
-
-  const handleExportJson = async () => {
-    if (!currentWorkflow || !activeWorkflowId) {
-      logger.warn('No active workflow to export')
-      return
-    }
-
-    setIsExporting(true)
-    try {
-      // Get the JSON from the store
-      const jsonContent = await getJson()
-
-      if (!jsonContent) {
-        throw new Error('Failed to generate JSON')
-      }
-
-      const filename = `${currentWorkflow.name.replace(/[^a-z0-9]/gi, '-')}.json`
-      downloadFile(jsonContent, filename, 'application/json')
-      logger.info('Workflow exported as JSON')
-    } catch (error) {
-      logger.error('Failed to export workflow as JSON:', error)
-    } finally {
-      setIsExporting(false)
-    }
-  }
-
-  const isDisabled = disabled || isExporting || !currentWorkflow
-
-  const getTooltipText = () => {
-    if (disabled) return 'Export not available'
-    if (!currentWorkflow) return 'No workflow to export'
-    if (isExporting) return 'Exporting...'
-    return 'Export workflow as JSON'
-  }
-
-  return (
-    <Tooltip.Root>
-      <Tooltip.Trigger asChild>
-        <Button
-          variant='outline'
-          onClick={handleExportJson}
-          disabled={isDisabled}
-          className='h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary'
-        >
-          <ArrowDownToLine className='h-5 w-5' />
-          <span className='sr-only'>Export</span>
-        </Button>
-      </Tooltip.Trigger>
-      <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-    </Tooltip.Root>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/index.ts
deleted file mode 100644
index 00644cf5ba..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { DeployModal } from './deploy-modal/deploy-modal'
-export { DeploymentControls } from './deployment-controls/deployment-controls'
-export { ExportControls } from './export-controls/export-controls'
-export { WebhookSettings } from './webhook-settings/webhook-settings'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.test.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.test.ts
deleted file mode 100644
index 340e6dd351..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.test.ts
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * @vitest-environment jsdom
- *
- * Control Bar Change Detection Tests
- *
- * This file tests the core change detection logic in the ControlBar component,
- * specifically focusing on the normalizeBlocksForComparison function and
- * semantic comparison of workflow states.
- */
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mockWorkflowStore = {
-  getState: vi.fn(),
-  subscribe: vi.fn(),
-}
-
-const mockSubBlockStore = {
-  getState: vi.fn(),
-  subscribe: vi.fn(),
-}
-
-const mockWorkflowRegistry = {
-  getState: vi.fn(),
-  subscribe: vi.fn(),
-}
-
-vi.mock('@/stores/workflows/workflow/store', () => ({
-  useWorkflowStore: vi.fn((selector) => {
-    if (typeof selector === 'function') {
-      return selector(mockWorkflowStore.getState())
-    }
-    return mockWorkflowStore
-  }),
-}))
-
-vi.mock('@/stores/workflows/subblock/store', () => ({
-  useSubBlockStore: vi.fn((selector) => {
-    if (typeof selector === 'function') {
-      return selector(mockSubBlockStore.getState())
-    }
-    return mockSubBlockStore
-  }),
-}))
-
-vi.mock('@/stores/workflows/registry/store', () => ({
-  useWorkflowRegistry: vi.fn(() => mockWorkflowRegistry.getState()),
-}))
-
-vi.mock('@/stores/workflows/utils', () => ({
-  mergeSubblockState: vi.fn((blocks) => blocks),
-}))
-
-vi.mock('@/lib/logs/console/logger', () => ({
-  createLogger: () => ({
-    error: vi.fn(),
-    info: vi.fn(),
-    warn: vi.fn(),
-    debug: vi.fn(),
-  }),
-}))
-
-const normalizeBlocksForComparison = (blocks: Record<string, any>) => {
-  if (!blocks) return []
-
-  return Object.values(blocks)
-    .map((block: any) => ({
-      type: block.type,
-      name: block.name,
-      subBlocks: block.subBlocks || {},
-    }))
-    .sort((a, b) => {
-      // Sort by type first, then by name for consistent comparison
-      const typeA = a.type || ''
-      const typeB = b.type || ''
-      if (typeA !== typeB) return typeA.localeCompare(typeB)
-      return (a.name || '').localeCompare(b.name || '')
-    })
-}
-
-describe('normalizeBlocksForComparison', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  afterEach(() => {
-    vi.resetAllMocks()
-  })
-
-  it('should extract only functional properties from blocks', () => {
-    const blocks = {
-      'block-1': {
-        id: 'block-1',
-        type: 'agent',
-        name: 'Agent 1',
-        position: { x: 100, y: 200 },
-        height: 668,
-        enabled: true,
-        subBlocks: {
-          systemPrompt: { id: 'systemPrompt', type: 'text', value: 'You are helpful' },
-        },
-      },
-      'block-2': {
-        id: 'block-2',
-        type: 'api',
-        name: 'API 1',
-        position: { x: 300, y: 400 },
-        height: 400,
-        enabled: true,
-        subBlocks: {
-          url: { id: 'url', type: 'short-input', value: 'https://api.example.com' },
-        },
-      },
-    }
-
-    const result = normalizeBlocksForComparison(blocks)
-
-    expect(result).toHaveLength(2)
-
-    result.forEach((block) => {
-      expect(block).toHaveProperty('type')
-      expect(block).toHaveProperty('name')
-      expect(block).toHaveProperty('subBlocks')
-
-      expect(block).not.toHaveProperty('id')
-      expect(block).not.toHaveProperty('position')
-      expect(block).not.toHaveProperty('height')
-      expect(block).not.toHaveProperty('enabled')
-    })
-  })
-
-  it('should sort blocks consistently by type then name', () => {
-    const blocks = {
-      'block-1': { type: 'api', name: 'API 2', subBlocks: {} },
-      'block-2': { type: 'agent', name: 'Agent 1', subBlocks: {} },
-      'block-3': { type: 'api', name: 'API 1', subBlocks: {} },
-      'block-4': { type: 'agent', name: 'Agent 2', subBlocks: {} },
-    }
-
-    const result = normalizeBlocksForComparison(blocks)
-
-    expect(result[0]).toEqual({ type: 'agent', name: 'Agent 1', subBlocks: {} })
-    expect(result[1]).toEqual({ type: 'agent', name: 'Agent 2', subBlocks: {} })
-    expect(result[2]).toEqual({ type: 'api', name: 'API 1', subBlocks: {} })
-    expect(result[3]).toEqual({ type: 'api', name: 'API 2', subBlocks: {} })
-  })
-
-  it('should handle blocks with undefined or null properties', () => {
-    const blocks = {
-      'block-1': {
-        type: undefined,
-        name: null,
-        subBlocks: {
-          field1: { value: 'test' },
-        },
-      },
-      'block-2': {
-        type: 'agent',
-        name: 'Agent 1',
-      },
-    }
-
-    const result = normalizeBlocksForComparison(blocks)
-
-    expect(result).toHaveLength(2)
-    expect(result[0]).toEqual({
-      type: undefined,
-      name: null,
-      subBlocks: { field1: { value: 'test' } },
-    })
-    expect(result[1]).toEqual({
-      type: 'agent',
-      name: 'Agent 1',
-      subBlocks: {},
-    })
-  })
-
-  it('should return empty array for null or undefined input', () => {
-    expect(normalizeBlocksForComparison(null as any)).toEqual([])
-    expect(normalizeBlocksForComparison(undefined as any)).toEqual([])
-    expect(normalizeBlocksForComparison({})).toEqual([])
-  })
-
-  it('should preserve subBlock structure completely', () => {
-    const blocks = {
-      'agent-block': {
-        type: 'agent',
-        name: 'Test Agent',
-        subBlocks: {
-          systemPrompt: {
-            id: 'systemPrompt',
-            type: 'textarea',
-            value: 'You are a helpful assistant',
-          },
-          model: {
-            id: 'model',
-            type: 'dropdown',
-            value: 'gpt-4',
-          },
-          temperature: {
-            id: 'temperature',
-            type: 'slider',
-            value: 0.7,
-          },
-        },
-      },
-    }
-
-    const result = normalizeBlocksForComparison(blocks)
-
-    expect(result[0].subBlocks).toEqual(blocks['agent-block'].subBlocks)
-  })
-})
-
-describe('Change Detection Scenarios', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should detect no changes when blocks are functionally identical', () => {
-    const currentBlocks = {
-      'new-id-123': {
-        id: 'new-id-123',
-        type: 'agent',
-        name: 'Agent 1',
-        position: { x: 100, y: 200 },
-        subBlocks: { systemPrompt: { value: 'Test prompt' } },
-      },
-    }
-
-    const deployedBlocks = {
-      'old-id-456': {
-        id: 'old-id-456',
-        type: 'agent',
-        name: 'Agent 1',
-        position: { x: 300, y: 400 },
-        subBlocks: { systemPrompt: { value: 'Test prompt' } },
-      },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    expect(JSON.stringify(normalizedCurrent)).toBe(JSON.stringify(normalizedDeployed))
-  })
-
-  it('should detect changes when block types differ', () => {
-    const currentBlocks = {
-      'block-1': { type: 'agent', name: 'Block 1', subBlocks: {} },
-    }
-
-    const deployedBlocks = {
-      'block-1': { type: 'api', name: 'Block 1', subBlocks: {} },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    expect(JSON.stringify(normalizedCurrent)).not.toBe(JSON.stringify(normalizedDeployed))
-  })
-
-  it('should detect changes when block names differ', () => {
-    const currentBlocks = {
-      'block-1': { type: 'agent', name: 'Agent Updated', subBlocks: {} },
-    }
-
-    const deployedBlocks = {
-      'block-1': { type: 'agent', name: 'Agent 1', subBlocks: {} },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    expect(JSON.stringify(normalizedCurrent)).not.toBe(JSON.stringify(normalizedDeployed))
-  })
-
-  it('should detect changes when subBlock values differ', () => {
-    const currentBlocks = {
-      'block-1': {
-        type: 'agent',
-        name: 'Agent 1',
-        subBlocks: {
-          systemPrompt: { value: 'Updated prompt' },
-        },
-      },
-    }
-
-    const deployedBlocks = {
-      'block-1': {
-        type: 'agent',
-        name: 'Agent 1',
-        subBlocks: {
-          systemPrompt: { value: 'Original prompt' },
-        },
-      },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    expect(JSON.stringify(normalizedCurrent)).not.toBe(JSON.stringify(normalizedDeployed))
-  })
-
-  it('should detect changes when number of blocks differs', () => {
-    const currentBlocks = {
-      'block-1': { type: 'agent', name: 'Agent 1', subBlocks: {} },
-      'block-2': { type: 'api', name: 'API 1', subBlocks: {} },
-    }
-
-    const deployedBlocks = {
-      'block-1': { type: 'agent', name: 'Agent 1', subBlocks: {} },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    expect(normalizedCurrent).toHaveLength(2)
-    expect(normalizedDeployed).toHaveLength(1)
-    expect(JSON.stringify(normalizedCurrent)).not.toBe(JSON.stringify(normalizedDeployed))
-  })
-
-  it('should ignore position and metadata changes', () => {
-    const currentBlocks = {
-      'block-1': {
-        id: 'new-id',
-        type: 'agent',
-        name: 'Agent 1',
-        position: { x: 500, y: 600 },
-        height: 800,
-        enabled: false,
-        data: { someMetadata: 'changed' },
-        subBlocks: { systemPrompt: { value: 'Test' } },
-      },
-    }
-
-    const deployedBlocks = {
-      'block-1': {
-        id: 'old-id',
-        type: 'agent',
-        name: 'Agent 1',
-        position: { x: 100, y: 200 },
-        height: 600,
-        enabled: true,
-        data: { someMetadata: 'original' },
-        subBlocks: { systemPrompt: { value: 'Test' } },
-      },
-    }
-
-    const normalizedCurrent = normalizeBlocksForComparison(currentBlocks)
-    const normalizedDeployed = normalizeBlocksForComparison(deployedBlocks)
-
-    // Should be identical since only metadata changed
-    expect(JSON.stringify(normalizedCurrent)).toBe(JSON.stringify(normalizedDeployed))
-  })
-})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.tsx
deleted file mode 100644
index fd86952052..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.tsx
+++ /dev/null
@@ -1,1230 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import {
-  Bug,
-  ChevronLeft,
-  Copy,
-  Layers,
-  Play,
-  RefreshCw,
-  SkipForward,
-  StepForward,
-  Trash2,
-  Webhook,
-  WifiOff,
-  X,
-} from 'lucide-react'
-import { useParams, useRouter } from 'next/navigation'
-import { Tooltip } from '@/components/emcn'
-import {
-  AlertDialog,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-  Button,
-} from '@/components/ui'
-import { useSession } from '@/lib/auth-client'
-import { getEnv, isTruthy } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
-import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import {
-  DeploymentControls,
-  ExportControls,
-  WebhookSettings,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components'
-import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
-import { useDebounce } from '@/hooks/use-debounce'
-import { useFolderStore } from '@/stores/folders/store'
-import { useOperationQueueStore } from '@/stores/operation-queue/store'
-import { usePanelStore } from '@/stores/panel/store'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import type { WorkflowState } from '@/stores/workflows/workflow/types'
-
-const logger = createLogger('ControlBar')
-
-// Cache for usage data to prevent excessive API calls
-let usageDataCache: {
-  data: any | null
-  timestamp: number
-  expirationMs: number
-} = {
-  data: null,
-  timestamp: 0,
-  // Cache expires after 1 minute
-  expirationMs: 60 * 1000,
-}
-
-interface ControlBarProps {
-  hasValidationErrors?: boolean
-}
-
-/**
- * Control bar for managing workflows - handles editing, deletion, deployment,
- * history, notifications and execution.
- */
-export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
-  const router = useRouter()
-  const { data: session } = useSession()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  // Store hooks
-  const { lastSaved, setNeedsRedeploymentFlag, blocks } = useWorkflowStore()
-  const { workflows, activeWorkflowId, duplicateWorkflow, hydration } = useWorkflowRegistry()
-  const isRegistryLoading =
-    hydration.phase === 'idle' ||
-    hydration.phase === 'metadata-loading' ||
-    hydration.phase === 'state-loading'
-  const { isExecuting, handleRunWorkflow, handleCancelExecution } = useWorkflowExecution()
-  const { setActiveTab, togglePanel, isOpen } = usePanelStore()
-  const { getFolderTree, expandedFolders } = useFolderStore()
-
-  // User permissions - use stable activeWorkspaceId from registry instead of deriving from currentWorkflow
-  const userPermissions = useUserPermissionsContext()
-
-  // Debug mode state
-  const { isDebugging, pendingBlocks, handleStepDebug, handleCancelDebug, handleResumeDebug } =
-    useWorkflowExecution()
-
-  // Local state
-  const [, setMounted] = useState(false)
-  const [, forceUpdate] = useState({})
-  const [isExpanded, setIsExpanded] = useState(false)
-  const [isWebhookSettingsOpen, setIsWebhookSettingsOpen] = useState(false)
-  const [isAutoLayouting, setIsAutoLayouting] = useState(false)
-
-  // Delete workflow state - grouped for better organization
-  const [deleteState, setDeleteState] = useState({
-    showDialog: false,
-    isDeleting: false,
-    hasPublishedTemplates: false,
-    publishedTemplates: [] as any[],
-    showTemplateChoice: false,
-  })
-
-  // Deployed state management
-  const [deployedState, setDeployedState] = useState<WorkflowState | null>(null)
-  const [isLoadingDeployedState, setIsLoadingDeployedState] = useState<boolean>(false)
-
-  // Change detection state
-  const [changeDetected, setChangeDetected] = useState(false)
-
-  // Usage limit state
-  const [usageExceeded, setUsageExceeded] = useState(false)
-  const [usageData, setUsageData] = useState<{
-    percentUsed: number
-    isWarning: boolean
-    isExceeded: boolean
-    currentUsage: number
-    limit: number
-  } | null>(null)
-
-  // Helper function to open console panel
-  const openConsolePanel = useCallback(() => {
-    setActiveTab('console')
-    if (!isOpen) {
-      togglePanel()
-    }
-  }, [setActiveTab, isOpen, togglePanel])
-
-  // Shared condition for keyboard shortcut and button disabled state
-  const isWorkflowBlocked = isExecuting || hasValidationErrors
-
-  // // Check if the current user is the owner of the published workflow
-  // const isWorkflowOwner = () => {
-  //   const marketplaceData = getMarketplaceData()
-  //   return marketplaceData?.status === 'owner'
-  // }
-
-  // Get deployment status from registry
-  const deploymentStatus = useWorkflowRegistry((state) =>
-    state.getWorkflowDeploymentStatus(activeWorkflowId)
-  )
-  const isDeployed = deploymentStatus?.isDeployed || false
-
-  // Client-side only rendering for the timestamp
-  useEffect(() => {
-    setMounted(true)
-  }, [])
-
-  // Update the time display every minute
-  useEffect(() => {
-    const interval = setInterval(() => forceUpdate({}), 60000)
-    return () => clearInterval(interval)
-  }, [])
-
-  /**
-   * Fetches the deployed state of the workflow from the server
-   * This is the single source of truth for deployed workflow state
-   */
-  const fetchDeployedState = async () => {
-    if (!activeWorkflowId || !isDeployed) {
-      setDeployedState(null)
-      return
-    }
-
-    // Store the workflow ID at the start of the request to prevent race conditions
-    const requestWorkflowId = activeWorkflowId
-
-    // Helper to get current active workflow ID for race condition checks
-    const getCurrentActiveWorkflowId = () => useWorkflowRegistry.getState().activeWorkflowId
-
-    try {
-      setIsLoadingDeployedState(true)
-
-      const response = await fetch(`/api/workflows/${requestWorkflowId}/deployed`)
-
-      // Check if the workflow ID changed during the request (user navigated away)
-      if (requestWorkflowId !== getCurrentActiveWorkflowId()) {
-        logger.debug('Workflow changed during deployed state fetch, ignoring response')
-        return
-      }
-
-      if (!response.ok) {
-        if (response.status === 404) {
-          setDeployedState(null)
-          return
-        }
-        throw new Error(`Failed to fetch deployed state: ${response.statusText}`)
-      }
-
-      const data = await response.json()
-
-      if (requestWorkflowId === getCurrentActiveWorkflowId()) {
-        setDeployedState(data.deployedState || null)
-      } else {
-        logger.debug('Workflow changed after deployed state response, ignoring result')
-      }
-    } catch (error) {
-      logger.error('Error fetching deployed state:', { error })
-      if (requestWorkflowId === getCurrentActiveWorkflowId()) {
-        setDeployedState(null)
-      }
-    } finally {
-      if (requestWorkflowId === getCurrentActiveWorkflowId()) {
-        setIsLoadingDeployedState(false)
-      }
-    }
-  }
-
-  useEffect(() => {
-    if (!activeWorkflowId) {
-      setDeployedState(null)
-      setIsLoadingDeployedState(false)
-      return
-    }
-
-    if (isRegistryLoading) {
-      setDeployedState(null)
-      setIsLoadingDeployedState(false)
-      return
-    }
-
-    if (isDeployed) {
-      setNeedsRedeploymentFlag(false)
-      fetchDeployedState()
-    } else {
-      setDeployedState(null)
-      setIsLoadingDeployedState(false)
-    }
-  }, [activeWorkflowId, isDeployed, setNeedsRedeploymentFlag, isRegistryLoading])
-
-  // Get current store state for change detection
-  const currentBlocks = useWorkflowStore((state) => state.blocks)
-  const currentEdges = useWorkflowStore((state) => state.edges)
-  const subBlockValues = useSubBlockStore((state) =>
-    activeWorkflowId ? state.workflowValues[activeWorkflowId] : null
-  )
-
-  const [blockStructureVersion, setBlockStructureVersion] = useState(0)
-  const [edgeStructureVersion, setEdgeStructureVersion] = useState(0)
-  const [subBlockStructureVersion, setSubBlockStructureVersion] = useState(0)
-
-  useEffect(() => {
-    setBlockStructureVersion((version) => version + 1)
-  }, [currentBlocks])
-
-  useEffect(() => {
-    setEdgeStructureVersion((version) => version + 1)
-  }, [currentEdges])
-
-  useEffect(() => {
-    setSubBlockStructureVersion((version) => version + 1)
-  }, [subBlockValues])
-
-  useEffect(() => {
-    setBlockStructureVersion(0)
-    setEdgeStructureVersion(0)
-    setSubBlockStructureVersion(0)
-  }, [activeWorkflowId])
-
-  const statusCheckTrigger = useMemo(() => {
-    return JSON.stringify({
-      lastSaved: lastSaved ?? 0,
-      blockVersion: blockStructureVersion,
-      edgeVersion: edgeStructureVersion,
-      subBlockVersion: subBlockStructureVersion,
-    })
-  }, [lastSaved, blockStructureVersion, edgeStructureVersion, subBlockStructureVersion])
-
-  const debouncedStatusCheckTrigger = useDebounce(statusCheckTrigger, 500)
-
-  useEffect(() => {
-    // Avoid off-by-one false positives: wait until operation queue is idle
-    const { operations, isProcessing } = useOperationQueueStore.getState()
-    const hasPendingOps =
-      isProcessing || operations.some((op) => op.status === 'pending' || op.status === 'processing')
-
-    if (!activeWorkflowId || !deployedState) {
-      setChangeDetected(false)
-      return
-    }
-
-    if (isLoadingDeployedState || hasPendingOps) {
-      return
-    }
-
-    // Use the workflow status API to get accurate change detection
-    // This uses the same logic as the deployment API (reading from normalized tables)
-    const checkForChanges = async () => {
-      try {
-        const response = await fetch(`/api/workflows/${activeWorkflowId}/status`)
-        if (response.ok) {
-          const data = await response.json()
-          setChangeDetected(data.needsRedeployment || false)
-        } else {
-          logger.error('Failed to fetch workflow status:', response.status, response.statusText)
-          setChangeDetected(false)
-        }
-      } catch (error) {
-        logger.error('Error fetching workflow status:', error)
-        setChangeDetected(false)
-      }
-    }
-
-    checkForChanges()
-  }, [activeWorkflowId, deployedState, debouncedStatusCheckTrigger, isLoadingDeployedState])
-
-  useEffect(() => {
-    if (session?.user?.id && !isRegistryLoading) {
-      checkUserUsage(session.user.id).then((usage) => {
-        if (usage) {
-          setUsageExceeded(usage.isExceeded)
-          setUsageData(usage)
-        }
-      })
-    }
-  }, [session?.user?.id, isRegistryLoading])
-
-  /**
-   * Check user usage limits and cache results
-   */
-  async function checkUserUsage(_userId: string, forceRefresh = false): Promise<any | null> {
-    const now = Date.now()
-    const cacheAge = now - usageDataCache.timestamp
-
-    // Return cached data if still valid and not forcing refresh
-    if (!forceRefresh && usageDataCache.data && cacheAge < usageDataCache.expirationMs) {
-      logger.info('Using cached usage data', {
-        cacheAge: `${Math.round(cacheAge / 1000)}s`,
-      })
-      return usageDataCache.data
-    }
-
-    try {
-      // Primary: call server-side usage check to mirror backend enforcement
-      const res = await fetch('/api/usage?context=user', { cache: 'no-store' })
-      if (res.ok) {
-        const payload = await res.json()
-        const usage = payload?.data
-        // Update cache
-        usageDataCache = { data: usage, timestamp: now, expirationMs: usageDataCache.expirationMs }
-        return usage
-      }
-
-      // No fallback needed anymore - React Query handles this
-      return null
-    } catch (error) {
-      logger.error('Error checking usage limits:', { error })
-      return null
-    }
-  }
-
-  /**
-   * Reset delete state
-   */
-  const resetDeleteState = useCallback(() => {
-    setDeleteState({
-      showDialog: false,
-      isDeleting: false,
-      hasPublishedTemplates: false,
-      publishedTemplates: [],
-      showTemplateChoice: false,
-    })
-  }, [])
-
-  /**
-   * Navigate to next workflow after deletion
-   */
-  const navigateAfterDeletion = useCallback(
-    (currentWorkflowId: string) => {
-      const sidebarWorkflows = getSidebarOrderedWorkflows()
-      const currentIndex = sidebarWorkflows.findIndex((w) => w.id === currentWorkflowId)
-
-      // Find next workflow: try next, then previous
-      let nextWorkflowId: string | null = null
-      if (sidebarWorkflows.length > 1) {
-        if (currentIndex < sidebarWorkflows.length - 1) {
-          nextWorkflowId = sidebarWorkflows[currentIndex + 1].id
-        } else if (currentIndex > 0) {
-          nextWorkflowId = sidebarWorkflows[currentIndex - 1].id
-        }
-      }
-
-      // Navigate to next workflow or workspace home
-      if (nextWorkflowId) {
-        router.push(`/workspace/${workspaceId}/w/${nextWorkflowId}`)
-      } else {
-        router.push(`/workspace/${workspaceId}`)
-      }
-    },
-    [workspaceId, router]
-  )
-
-  /**
-   * Check if workflow has published templates
-   */
-  const checkPublishedTemplates = useCallback(async (workflowId: string) => {
-    const checkResponse = await fetch(`/api/workflows/${workflowId}?check-templates=true`, {
-      method: 'DELETE',
-    })
-
-    if (!checkResponse.ok) {
-      throw new Error(`Failed to check templates: ${checkResponse.statusText}`)
-    }
-
-    return await checkResponse.json()
-  }, [])
-
-  /**
-   * Delete workflow with optional template handling
-   */
-  const deleteWorkflowWithTemplates = useCallback(
-    async (workflowId: string, templateAction?: 'keep' | 'delete') => {
-      const endpoint = templateAction
-        ? `/api/workflows/${workflowId}?deleteTemplates=${templateAction}`
-        : null
-
-      if (endpoint) {
-        // Use custom endpoint for template handling
-        const response = await fetch(endpoint, { method: 'DELETE' })
-        if (!response.ok) {
-          throw new Error(`Failed to delete workflow: ${response.statusText}`)
-        }
-
-        // Manual registry cleanup since we used custom API
-        useWorkflowRegistry.setState((state) => {
-          const newWorkflows = { ...state.workflows }
-          delete newWorkflows[workflowId]
-
-          return {
-            ...state,
-            workflows: newWorkflows,
-            activeWorkflowId: state.activeWorkflowId === workflowId ? null : state.activeWorkflowId,
-          }
-        })
-      } else {
-        // Use registry's built-in deletion (handles database + state)
-        await useWorkflowRegistry.getState().removeWorkflow(workflowId)
-      }
-    },
-    []
-  )
-
-  /**
-   * Handle deleting the current workflow - called after user confirms
-   */
-  const handleDeleteWorkflow = useCallback(async () => {
-    const currentWorkflowId = params.workflowId as string
-    if (!currentWorkflowId || !userPermissions.canEdit) return
-
-    setDeleteState((prev) => ({ ...prev, isDeleting: true }))
-
-    try {
-      // Check if workflow has published templates
-      const checkData = await checkPublishedTemplates(currentWorkflowId)
-
-      if (checkData.hasPublishedTemplates) {
-        setDeleteState((prev) => ({
-          ...prev,
-          hasPublishedTemplates: true,
-          publishedTemplates: checkData.publishedTemplates || [],
-          showTemplateChoice: true,
-          isDeleting: false, // Stop showing "Deleting..." and show template choice
-        }))
-        return
-      }
-
-      // No templates, proceed with standard deletion
-      navigateAfterDeletion(currentWorkflowId)
-      await deleteWorkflowWithTemplates(currentWorkflowId)
-      resetDeleteState()
-    } catch (error) {
-      logger.error('Error deleting workflow:', error)
-      setDeleteState((prev) => ({ ...prev, isDeleting: false }))
-    }
-  }, [
-    params.workflowId,
-    userPermissions.canEdit,
-    checkPublishedTemplates,
-    navigateAfterDeletion,
-    deleteWorkflowWithTemplates,
-    resetDeleteState,
-  ])
-
-  /**
-   * Handle template action selection
-   */
-  const handleTemplateAction = useCallback(
-    async (action: 'keep' | 'delete') => {
-      const currentWorkflowId = params.workflowId as string
-      if (!currentWorkflowId || !userPermissions.canEdit) return
-
-      setDeleteState((prev) => ({ ...prev, isDeleting: true }))
-
-      try {
-        logger.info(`Deleting workflow ${currentWorkflowId} with template action: ${action}`)
-
-        navigateAfterDeletion(currentWorkflowId)
-        await deleteWorkflowWithTemplates(currentWorkflowId, action)
-
-        logger.info(
-          `Successfully deleted workflow ${currentWorkflowId} with template action: ${action}`
-        )
-        resetDeleteState()
-      } catch (error) {
-        logger.error('Error deleting workflow:', error)
-        setDeleteState((prev) => ({ ...prev, isDeleting: false }))
-      }
-    },
-    [
-      params.workflowId,
-      userPermissions.canEdit,
-      navigateAfterDeletion,
-      deleteWorkflowWithTemplates,
-      resetDeleteState,
-    ]
-  )
-
-  // Helper function to open subscription settings
-  const openSubscriptionSettings = () => {
-    if (typeof window !== 'undefined') {
-      window.dispatchEvent(
-        new CustomEvent('open-settings', {
-          detail: { tab: 'subscription' },
-        })
-      )
-    }
-  }
-
-  /**
-   * Handle duplicating the current workflow
-   */
-  const handleDuplicateWorkflow = async () => {
-    if (!activeWorkflowId || !userPermissions.canEdit) return
-
-    try {
-      const newWorkflow = await duplicateWorkflow(activeWorkflowId)
-      if (newWorkflow) {
-        router.push(`/workspace/${workspaceId}/w/${newWorkflow}`)
-      }
-    } catch (error) {
-      logger.error('Error duplicating workflow:', { error })
-    }
-  }
-
-  /**
-   * Render delete workflow button with confirmation dialog
-   */
-  const renderDeleteButton = () => {
-    const canEdit = userPermissions.canEdit
-    const hasMultipleWorkflows = Object.keys(workflows).length > 1
-    const isDisabled = !canEdit || !hasMultipleWorkflows
-
-    const getTooltipText = () => {
-      if (!canEdit) return 'Admin permission required to delete workflows'
-      if (!hasMultipleWorkflows) return 'Cannot delete the last workflow'
-      return 'Delete workflow'
-    }
-
-    if (isDisabled) {
-      return (
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <div className='inline-flex h-12 w-12 cursor-not-allowed items-center justify-center rounded-[11px] border bg-card text-card-foreground opacity-50 shadow-xs transition-colors'>
-              <Trash2 className='h-4 w-4' />
-            </div>
-          </Tooltip.Trigger>
-          <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-        </Tooltip.Root>
-      )
-    }
-
-    return (
-      <AlertDialog
-        open={deleteState.showDialog}
-        onOpenChange={(open) => {
-          if (open) {
-            // Reset all state when opening dialog to ensure clean start
-            setDeleteState({
-              showDialog: true,
-              isDeleting: false,
-              hasPublishedTemplates: false,
-              publishedTemplates: [],
-              showTemplateChoice: false,
-            })
-          } else {
-            resetDeleteState()
-          }
-        }}
-      >
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <AlertDialogTrigger asChild>
-              <Button
-                variant='outline'
-                className={cn(
-                  'h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs',
-                  'hover:border-red-500 hover:bg-red-500 hover:text-white',
-                  'transition-all duration-200'
-                )}
-              >
-                <Trash2 className='h-5 w-5' />
-                <span className='sr-only'>Delete Workflow</span>
-              </Button>
-            </AlertDialogTrigger>
-          </Tooltip.Trigger>
-          <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-        </Tooltip.Root>
-
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>
-              {deleteState.showTemplateChoice ? 'Template Connected' : 'Delete workflow?'}
-            </AlertDialogTitle>
-            {deleteState.showTemplateChoice ? (
-              <div className='space-y-3'>
-                <AlertDialogDescription asChild>
-                  <div className='space-y-2'>
-                    <div>
-                      This workflow is connected to a template:{' '}
-                      <strong>{deleteState.publishedTemplates[0]?.name}</strong>
-                    </div>
-                    <div className='mt-3'>What would you like to do with it?</div>
-                    <div className='mt-2 space-y-1 text-xs'>
-                      <div className='text-muted-foreground'>
-                        <strong>Keep template:</strong> Template remains in the marketplace. You can
-                        reconnect it later by clicking "Edit" on the template.
-                      </div>
-                      <div className='text-muted-foreground'>
-                        <strong>Delete template:</strong> Permanently remove template from the
-                        marketplace.
-                      </div>
-                    </div>
-                  </div>
-                </AlertDialogDescription>
-              </div>
-            ) : (
-              <AlertDialogDescription>
-                Deleting this workflow will permanently remove all associated blocks, executions,
-                and configuration.{' '}
-                <span className='text-red-500 dark:text-red-500'>
-                  This action cannot be undone.
-                </span>
-              </AlertDialogDescription>
-            )}
-          </AlertDialogHeader>
-          <AlertDialogFooter className='flex'>
-            {deleteState.showTemplateChoice ? (
-              <div className='flex w-full gap-2'>
-                <Button
-                  variant='outline'
-                  onClick={() => handleTemplateAction('keep')}
-                  disabled={deleteState.isDeleting}
-                  className='h-9 flex-1 rounded-[8px]'
-                >
-                  Keep template
-                </Button>
-                <Button
-                  onClick={() => handleTemplateAction('delete')}
-                  disabled={deleteState.isDeleting}
-                  className='h-9 flex-1 rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
-                >
-                  {deleteState.isDeleting ? 'Deleting...' : 'Delete template'}
-                </Button>
-              </div>
-            ) : (
-              <>
-                <AlertDialogCancel className='h-9 w-full rounded-[8px]'>Cancel</AlertDialogCancel>
-                <Button
-                  onClick={(e) => {
-                    e.preventDefault()
-                    handleDeleteWorkflow()
-                  }}
-                  disabled={deleteState.isDeleting}
-                  className='h-9 w-full rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
-                >
-                  {deleteState.isDeleting ? 'Deleting...' : 'Delete'}
-                </Button>
-              </>
-            )}
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    )
-  }
-
-  /**
-   * Render deploy button with tooltip
-   */
-  const renderDeployButton = () => (
-    <DeploymentControls
-      activeWorkflowId={activeWorkflowId}
-      needsRedeployment={changeDetected}
-      setNeedsRedeployment={setChangeDetected}
-      deployedState={deployedState}
-      isLoadingDeployedState={isLoadingDeployedState}
-      refetchDeployedState={fetchDeployedState}
-      userPermissions={userPermissions}
-    />
-  )
-
-  /**
-   * Render webhook settings button
-   */
-  const renderWebhookButton = () => {
-    // Only show webhook button if Trigger.dev is enabled
-    const isTriggerEnabled = isTruthy(getEnv('NEXT_PUBLIC_TRIGGER_DEV_ENABLED'))
-    if (!isTriggerEnabled) return null
-
-    const canEdit = userPermissions.canEdit
-    const isDisabled = !canEdit
-
-    const getTooltipText = () => {
-      if (!canEdit) return 'Admin permission required to configure webhooks'
-      return 'Configure webhook notifications'
-    }
-
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <Button
-            variant='outline'
-            size='icon'
-            disabled={isDisabled}
-            onClick={() => setIsWebhookSettingsOpen(true)}
-            className='h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary'
-          >
-            <Webhook className='h-5 w-5' />
-            <span className='sr-only'>Webhook Settings</span>
-          </Button>
-        </Tooltip.Trigger>
-        <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  /**
-   * Render workflow duplicate button
-   */
-  const renderDuplicateButton = () => {
-    const canEdit = userPermissions.canEdit
-    const isDisabled = !canEdit || isDebugging
-
-    const getTooltipText = () => {
-      if (!canEdit) return 'Admin permission required to duplicate workflows'
-      if (isDebugging) return 'Cannot duplicate workflow while debugging'
-      return 'Duplicate workflow'
-    }
-
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          {isDisabled ? (
-            <div className='inline-flex h-12 w-12 cursor-not-allowed items-center justify-center rounded-[11px] border bg-card text-card-foreground opacity-50 shadow-xs transition-colors'>
-              <Copy className='h-4 w-4' />
-            </div>
-          ) : (
-            <Button
-              variant='outline'
-              onClick={handleDuplicateWorkflow}
-              className='h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary'
-            >
-              <Copy className='h-5 w-5' />
-              <span className='sr-only'>Duplicate Workflow</span>
-            </Button>
-          )}
-        </Tooltip.Trigger>
-        <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  /**
-   * Render auto-layout button
-   */
-  const renderAutoLayoutButton = () => {
-    const handleAutoLayoutClick = async () => {
-      if (isExecuting || isDebugging || !userPermissions.canEdit || isAutoLayouting) {
-        return
-      }
-
-      setIsAutoLayouting(true)
-      try {
-        // Use the standalone auto layout utility for immediate frontend updates
-        const { applyAutoLayoutAndUpdateStore } = await import('../../utils')
-
-        const result = await applyAutoLayoutAndUpdateStore(activeWorkflowId!)
-
-        if (result.success) {
-          logger.info('Auto layout completed successfully')
-        } else {
-          logger.error('Auto layout failed:', result.error)
-          // You could add a toast notification here if available
-        }
-      } catch (error) {
-        logger.error('Auto layout error:', error)
-        // You could add a toast notification here if available
-      } finally {
-        setIsAutoLayouting(false)
-      }
-    }
-
-    const canEdit = userPermissions.canEdit
-    const isDisabled = isExecuting || isDebugging || !canEdit || isAutoLayouting
-
-    const getTooltipText = () => {
-      if (!canEdit) return 'Admin permission required to use auto-layout'
-      if (isDebugging) return 'Cannot auto-layout while debugging'
-      if (isExecuting) return 'Cannot auto-layout while workflow is running'
-      if (isAutoLayouting) return 'Applying auto-layout...'
-      return 'Auto layout'
-    }
-
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          {isDisabled ? (
-            <div className='inline-flex h-12 w-12 cursor-not-allowed items-center justify-center rounded-[11px] border bg-card text-card-foreground opacity-50 shadow-xs transition-colors'>
-              {isAutoLayouting ? (
-                <RefreshCw className='h-4 w-4 animate-spin' />
-              ) : (
-                <Layers className='h-4 w-4' />
-              )}
-            </div>
-          ) : (
-            <Button
-              variant='outline'
-              onClick={handleAutoLayoutClick}
-              className='h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary'
-              disabled={isAutoLayouting}
-            >
-              {isAutoLayouting ? (
-                <RefreshCw className='h-5 w-5 animate-spin' />
-              ) : (
-                <Layers className='h-5 w-5' />
-              )}
-              <span className='sr-only'>Auto Layout</span>
-            </Button>
-          )}
-        </Tooltip.Trigger>
-        <Tooltip.Content>
-          {getTooltipText()}
-          {!isDebugging && <span className='ml-1 text-xs opacity-75'>(Shift+L)</span>}
-        </Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  /**
-   * Handles debug mode toggle - starts or stops debugging
-   */
-  const handleDebugToggle = useCallback(() => {
-    if (!userPermissions.canRead) return
-
-    if (isDebugging) {
-      // Stop debugging
-      handleCancelDebug()
-    } else {
-      // Check if there are executable blocks before starting debug mode
-      const hasExecutableBlocks = Object.values(blocks).some(
-        (block) => block.type !== 'starter' && block.enabled !== false
-      )
-
-      if (!hasExecutableBlocks) {
-        return // Do nothing if no executable blocks
-      }
-
-      // Start debugging
-      if (usageExceeded) {
-        openSubscriptionSettings()
-      } else {
-        openConsolePanel()
-        handleRunWorkflow(undefined, true) // Start in debug mode
-      }
-    }
-  }, [
-    userPermissions.canRead,
-    isDebugging,
-    usageExceeded,
-    blocks,
-    handleCancelDebug,
-    handleRunWorkflow,
-    openConsolePanel,
-  ])
-
-  /**
-   * Render debug controls bar (replaces run button when debugging)
-   */
-  const renderDebugControlsBar = () => {
-    const pendingCount = pendingBlocks.length
-    const isControlDisabled = pendingCount === 0
-
-    const debugButtonClass = cn(
-      'h-12 w-12 rounded-[11px] font-medium',
-      'bg-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hover-hex)]',
-      'shadow-[0_0_0_0_var(--brand-primary-hex)] hover:shadow-[0_0_0_4px_rgba(127,47,255,0.15)]]',
-      'text-white transition-all duration-200',
-      'disabled:opacity-50 disabled:hover:bg-[var(--brand-primary-hex)] disabled:hover:shadow-none'
-    )
-
-    return (
-      <div className='flex items-center gap-1'>
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <Button
-              onClick={() => {
-                openConsolePanel()
-                handleStepDebug()
-              }}
-              className={debugButtonClass}
-              disabled={isControlDisabled}
-            >
-              <StepForward className='h-5 w-5' />
-              <span className='sr-only'>Step Forward</span>
-            </Button>
-          </Tooltip.Trigger>
-          <Tooltip.Content>Step Forward</Tooltip.Content>
-        </Tooltip.Root>
-
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <Button
-              onClick={() => {
-                openConsolePanel()
-                handleResumeDebug()
-              }}
-              className={debugButtonClass}
-              disabled={isControlDisabled}
-            >
-              <SkipForward className='h-5 w-5' />
-              <span className='sr-only'>Resume Until End</span>
-            </Button>
-          </Tooltip.Trigger>
-          <Tooltip.Content>Resume Until End</Tooltip.Content>
-        </Tooltip.Root>
-
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <Button
-              onClick={() => {
-                handleCancelDebug()
-              }}
-              className={debugButtonClass}
-            >
-              <X className='h-5 w-5' />
-              <span className='sr-only'>Cancel Debugging</span>
-            </Button>
-          </Tooltip.Trigger>
-          <Tooltip.Content>Cancel Debugging</Tooltip.Content>
-        </Tooltip.Root>
-      </div>
-    )
-  }
-
-  /**
-   * Render debug mode toggle button
-   */
-  const renderDebugModeToggle = () => {
-    const canDebug = userPermissions.canRead
-
-    // Check if there are any meaningful blocks in the workflow (excluding just the starter block)
-    const hasExecutableBlocks = Object.values(blocks).some(
-      (block) => block.type !== 'starter' && block.enabled !== false
-    )
-
-    const isDisabled = isExecuting || !canDebug || !hasExecutableBlocks
-
-    const getTooltipText = () => {
-      if (!canDebug) return 'Read permission required to use debug mode'
-      if (!hasExecutableBlocks) return 'Add blocks to enable debug mode'
-      return isDebugging ? 'Stop debugging' : 'Start debugging'
-    }
-
-    const buttonClass = cn(
-      'h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary',
-      isDebugging && 'text-amber-500'
-    )
-
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          {isDisabled ? (
-            <div
-              className={cn(
-                'inline-flex h-12 w-12 cursor-not-allowed items-center justify-center',
-                'rounded-[11px] border bg-card text-card-foreground opacity-50',
-                'shadow-xs transition-colors',
-                isDebugging && 'text-amber-500'
-              )}
-            >
-              <Bug className='h-4 w-4' />
-            </div>
-          ) : (
-            <Button variant='outline' onClick={handleDebugToggle} className={buttonClass}>
-              <Bug className='h-5 w-5' />
-              <span className='sr-only'>{getTooltipText()}</span>
-            </Button>
-          )}
-        </Tooltip.Trigger>
-        <Tooltip.Content>{getTooltipText()}</Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  /**
-   * Render run workflow button or cancel button when executing
-   */
-  const renderRunButton = () => {
-    const canRun = userPermissions.canRead // Running only requires read permissions
-    const isLoadingPermissions = userPermissions.isLoading
-    const isButtonDisabled =
-      !isExecuting && (isWorkflowBlocked || (!canRun && !isLoadingPermissions))
-
-    // If currently executing, show cancel button
-    if (isExecuting) {
-      return (
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <Button
-              className={cn(
-                'gap-2 font-medium',
-                'bg-red-500 hover:bg-red-600',
-                'shadow-[0_0_0_0_#ef4444] hover:shadow-[0_0_0_4px_rgba(239,68,68,0.15)]',
-                'text-white transition-all duration-200',
-                'h-12 rounded-[11px] px-4 py-2'
-              )}
-              onClick={handleCancelExecution}
-            >
-              <X className={cn('h-3.5 w-3.5')} />
-            </Button>
-          </Tooltip.Trigger>
-          <Tooltip.Content>Cancel execution</Tooltip.Content>
-        </Tooltip.Root>
-      )
-    }
-
-    const getTooltipContent = () => {
-      if (hasValidationErrors) {
-        return (
-          <div className='text-center'>
-            <p className='font-medium text-destructive'>Workflow Has Errors</p>
-            <p className='text-xs'>
-              Nested subflows are not supported. Remove subflow blocks from inside other subflow
-              blocks.
-            </p>
-          </div>
-        )
-      }
-
-      if (!canRun && !isLoadingPermissions) {
-        return 'Read permission required to run workflows'
-      }
-
-      if (usageExceeded) {
-        return (
-          <div className='text-center'>
-            <p className='font-medium text-destructive'>Usage Limit Exceeded</p>
-            <p className='text-xs'>
-              You've used {usageData?.currentUsage?.toFixed(2) || 0}$ of{' '}
-              {usageData?.limit?.toFixed(2) || 0}$ Upgrade your plan to continue.
-            </p>
-          </div>
-        )
-      }
-
-      return 'Run'
-    }
-
-    const handleRunClick = () => {
-      openConsolePanel()
-
-      if (usageExceeded) {
-        openSubscriptionSettings()
-      } else {
-        handleRunWorkflow()
-      }
-    }
-
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <Button
-            className={cn(
-              'gap-2 font-medium',
-              'bg-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hover-hex)]',
-              'shadow-[0_0_0_0_var(--brand-primary-hex)] hover:shadow-[0_0_0_4px_rgba(127,47,255,0.15)]',
-              'text-white transition-all duration-200',
-              'disabled:opacity-50 disabled:hover:bg-[var(--brand-primary-hex)] disabled:hover:shadow-none',
-              'h-12 rounded-[11px] px-4 py-2'
-            )}
-            onClick={handleRunClick}
-            disabled={isButtonDisabled}
-          >
-            <Play className={cn('h-3.5 w-3.5', 'fill-current stroke-current')} />
-          </Button>
-        </Tooltip.Trigger>
-        <Tooltip.Content>{getTooltipContent()}</Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  /**
-   * Get workflows in the exact order they appear in the sidebar
-   */
-  const getSidebarOrderedWorkflows = () => {
-    // Get and sort regular workflows by creation date (newest first) for stable ordering
-    const regularWorkflows = Object.values(workflows)
-      .filter((workflow) => workflow.workspaceId === workspaceId)
-      .sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
-
-    // Group workflows by folder
-    const workflowsByFolder = regularWorkflows.reduce(
-      (acc, workflow) => {
-        const folderId = workflow.folderId || 'root'
-        if (!acc[folderId]) acc[folderId] = []
-        acc[folderId].push(workflow)
-        return acc
-      },
-      {} as Record<string, typeof regularWorkflows>
-    )
-
-    const orderedWorkflows: typeof regularWorkflows = []
-
-    // Recursively collect workflows from expanded folders
-    const collectFromFolders = (folders: ReturnType<typeof getFolderTree>) => {
-      folders.forEach((folder) => {
-        if (expandedFolders.has(folder.id)) {
-          orderedWorkflows.push(...(workflowsByFolder[folder.id] || []))
-          if (folder.children.length > 0) {
-            collectFromFolders(folder.children)
-          }
-        }
-      })
-    }
-
-    // Get workflows from expanded folders first, then root workflows
-    if (workspaceId) collectFromFolders(getFolderTree(workspaceId))
-    orderedWorkflows.push(...(workflowsByFolder.root || []))
-
-    return orderedWorkflows
-  }
-
-  /**
-   * Render disconnection notice
-   */
-  const renderDisconnectionNotice = () => {
-    if (!userPermissions.isOfflineMode) return null
-
-    const handleRefresh = () => {
-      window.location.reload()
-    }
-
-    return (
-      <div className='flex h-12 items-center gap-2 rounded-[11px] border border-red-500 bg-red-500 px-3 text-white shadow-xs'>
-        <Tooltip.Root>
-          <Tooltip.Trigger asChild>
-            <WifiOff className='h-[18px] w-[18px] cursor-help' />
-          </Tooltip.Trigger>
-          <Tooltip.Content className='mt-3'>Connection lost - refresh</Tooltip.Content>
-        </Tooltip.Root>
-        <Button
-          variant='ghost'
-          size='sm'
-          onClick={handleRefresh}
-          className='h-8 bg-white px-2 text-red-500 hover:bg-red-50'
-        >
-          <RefreshCw className='h-3 w-3' />
-        </Button>
-      </div>
-    )
-  }
-
-  /**
-   * Render control bar toggle button
-   */
-  const renderToggleButton = () => {
-    return (
-      <Tooltip.Root>
-        <Tooltip.Trigger asChild>
-          <Button
-            variant='outline'
-            onClick={() => setIsExpanded(!isExpanded)}
-            className='h-12 w-12 rounded-[11px] border bg-card text-card-foreground shadow-xs hover:bg-secondary'
-          >
-            <ChevronLeft
-              className={cn(
-                'h-5 w-5 transition-transform duration-200',
-                isExpanded && 'rotate-180'
-              )}
-            />
-            <span className='sr-only'>{isExpanded ? 'Collapse' : 'Expand'} Control Bar</span>
-          </Button>
-        </Tooltip.Trigger>
-        <Tooltip.Content>{isExpanded ? 'Collapse' : 'Expand'} Control Bar</Tooltip.Content>
-      </Tooltip.Root>
-    )
-  }
-
-  return (
-    <div className='fixed top-4 right-4 z-20 flex items-center gap-1'>
-      {renderDisconnectionNotice()}
-      {renderToggleButton()}
-      {isExpanded && renderWebhookButton()}
-      {isExpanded && <ExportControls />}
-      {isExpanded && renderAutoLayoutButton()}
-      {renderDeleteButton()}
-      {renderDuplicateButton()}
-      {!isDebugging && renderDebugModeToggle()}
-      {renderDeployButton()}
-      {isDebugging ? renderDebugControlsBar() : renderRunButton()}
-
-      {/* Webhook Settings */}
-      {activeWorkflowId && (
-        <WebhookSettings
-          open={isWebhookSettingsOpen}
-          onOpenChange={setIsWebhookSettingsOpen}
-          workflowId={activeWorkflowId}
-        />
-      )}
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/cursors/cursors.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/cursors/cursors.tsx
index 43af9f3737..49b76fed27 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/cursors/cursors.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/cursors/cursors.tsx
@@ -4,7 +4,7 @@ import { memo, useMemo } from 'react'
 import { useViewport } from 'reactflow'
 import { useSession } from '@/lib/auth-client'
 import { getUserColor } from '@/app/workspace/[workspaceId]/w/utils/get-user-color'
-import { useSocket } from '@/contexts/socket-context'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
 
 interface CursorPoint {
   x: number
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
index 99e29530d6..a375ed86e1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/diff-controls/diff-controls.tsx
@@ -2,7 +2,7 @@ import { memo, useCallback } from 'react'
 import { Eye, EyeOff } from 'lucide-react'
 import { Button } from '@/components/emcn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { mergeSubblockState } from '@/stores/workflows/utils'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/error/index.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/error/index.tsx
index 891ddfc51d..420aa5bc3d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/error/index.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/error/index.tsx
@@ -2,7 +2,7 @@
 
 import { Component, type ReactNode, useEffect } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
-import { Panel } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/panel-new'
+import { Panel } from '@/app/workspace/[workspaceId]/w/[workflowId]/components'
 import { SidebarNew } from '@/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new'
 
 const logger = createLogger('ErrorBoundary')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/index.ts
index b313f5d203..9662e63c98 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/index.ts
@@ -1,10 +1,9 @@
 export { CommandList } from './command-list/command-list'
-export { ControlBar } from './control-bar/control-bar'
 export { Cursors } from './cursors/cursors'
 export { DiffControls } from './diff-controls/diff-controls'
 export { ErrorBoundary } from './error/index'
 export { Notifications } from './notifications/notifications'
-export { Panel } from './panel-new/panel-new'
+export { Panel } from './panel/panel'
 export { SkeletonLoading } from './skeleton-loading/skeleton-loading'
 export { SubflowNodeComponent } from './subflows/subflow-node'
 export { Terminal } from './terminal/terminal'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx
index 91ec370bf8..fe40868ed1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/notifications/notifications.tsx
@@ -3,6 +3,8 @@ import { X } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import { Button } from '@/components/emcn'
 import { createLogger } from '@/lib/logs/console/logger'
+import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils'
 import {
   type NotificationAction,
   openCopilotWithMessage,
@@ -25,6 +27,7 @@ export const Notifications = memo(function Notifications() {
     state.notifications.filter((n) => !n.workflowId || n.workflowId === workflowId)
   )
   const removeNotification = useNotificationStore((state) => state.removeNotification)
+  const clearNotifications = useNotificationStore((state) => state.clearNotifications)
   const visibleNotifications = notifications.slice(0, MAX_VISIBLE_NOTIFICATIONS)
 
   /**
@@ -66,6 +69,27 @@ export const Notifications = memo(function Notifications() {
     [removeNotification]
   )
 
+  /**
+   * Register global keyboard shortcut for clearing notifications.
+   *
+   * - Mod+E: Clear all notifications visible in the current workflow (including global ones).
+   *
+   * The command is disabled in editable contexts so it does not interfere with typing.
+   */
+  useRegisterGlobalCommands(() =>
+    createCommands([
+      {
+        id: 'clear-notifications',
+        handler: () => {
+          clearNotifications(workflowId)
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+    ])
+  )
+
   if (visibleNotifications.length === 0) {
     return null
   }
@@ -75,17 +99,22 @@ export const Notifications = memo(function Notifications() {
       {[...visibleNotifications].reverse().map((notification, index, stacked) => {
         const depth = stacked.length - index - 1
         const xOffset = depth * 3
+        const hasAction = Boolean(notification.action)
 
         return (
           <div
             key={notification.id}
             style={{ transform: `translateX(${xOffset}px)` }}
-            className={`relative w-[240px] rounded-[4px] border bg-[#232323] transition-transform duration-200 ${
+            className={`relative h-[78px] w-[240px] overflow-hidden rounded-[4px] border bg-[#232323] transition-transform duration-200 ${
               index > 0 ? '-mt-[78px]' : ''
             }`}
           >
-            <div className='flex flex-col gap-[6px] px-[8px] pt-[6px] pb-[8px]'>
-              <div className='line-clamp-6 font-medium text-[12px] leading-[16px]'>
+            <div className='flex h-full flex-col justify-between px-[8px] pt-[6px] pb-[8px]'>
+              <div
+                className={`font-medium text-[12px] leading-[16px] ${
+                  hasAction ? 'line-clamp-2' : 'line-clamp-4'
+                }`}
+              >
                 <Button
                   variant='ghost'
                   onClick={() => removeNotification(notification.id)}
@@ -99,18 +128,20 @@ export const Notifications = memo(function Notifications() {
                 )}
                 {notification.message}
               </div>
-              {notification.action && (
-                <Button
-                  variant='active'
-                  onClick={() => executeAction(notification.id, notification.action!)}
-                  className='px-[8px] py-[4px] font-medium text-[12px]'
-                >
-                  {notification.action.type === 'copilot'
-                    ? 'Fix in Copilot'
-                    : notification.action.type === 'refresh'
-                      ? 'Refresh'
-                      : 'Take action'}
-                </Button>
+              {hasAction && (
+                <div className='mt-[4px]'>
+                  <Button
+                    variant='active'
+                    onClick={() => executeAction(notification.id, notification.action!)}
+                    className='w-full px-[8px] py-[4px] font-medium text-[12px]'
+                  >
+                    {notification.action!.type === 'copilot'
+                      ? 'Fix in Copilot'
+                      : notification.action!.type === 'refresh'
+                        ? 'Refresh'
+                        : 'Take action'}
+                  </Button>
+                </div>
               )}
             </div>
           </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/index.ts
deleted file mode 100644
index e661875717..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export { Copilot } from './copilot/copilot'
-export { Deploy } from './deploy/deploy'
-export { Editor } from './editor/editor'
-export { Toolbar } from './toolbar/toolbar'
-export { WorkflowControls } from './workflow-controls/workflow-controls'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/panel-new.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/panel-new.tsx
deleted file mode 100644
index 399db7c6ab..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/panel-new.tsx
+++ /dev/null
@@ -1,511 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { Braces, Square } from 'lucide-react'
-import { useParams, useRouter } from 'next/navigation'
-import {
-  BubbleChatPreview,
-  Button,
-  Copy,
-  Layout,
-  Modal,
-  ModalContent,
-  ModalDescription,
-  ModalFooter,
-  ModalHeader,
-  ModalTitle,
-  MoreHorizontal,
-  Play,
-  Popover,
-  PopoverContent,
-  PopoverItem,
-  PopoverTrigger,
-  Trash,
-} from '@/components/emcn'
-import { VariableIcon } from '@/components/icons'
-import { createLogger } from '@/lib/logs/console/logger'
-import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
-import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { Variables } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables'
-import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
-import { useDeleteWorkflow, useImportWorkflow } from '@/app/workspace/[workspaceId]/w/hooks'
-import { useChatStore } from '@/stores/chat/store'
-import { usePanelStore } from '@/stores/panel-new/store'
-import type { PanelTab } from '@/stores/panel-new/types'
-import { DEFAULT_TERMINAL_HEIGHT, MIN_TERMINAL_HEIGHT, useTerminalStore } from '@/stores/terminal'
-import { useVariablesStore } from '@/stores/variables/store'
-import { useWorkflowJsonStore } from '@/stores/workflows/json/store'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import { Copilot, Deploy, Editor, Toolbar } from './components'
-import { usePanelResize, useUsageLimits } from './hooks'
-
-const logger = createLogger('Panel')
-/**
- * Panel component with resizable width and tab navigation that persists across page refreshes.
- *
- * Uses a CSS-based approach to prevent hydration mismatches and flash on load:
- * 1. Width is controlled by CSS variable (--panel-width)
- * 2. Blocking script in layout.tsx sets CSS variable and data-panel-active-tab before React hydrates
- * 3. CSS rules control initial visibility based on data-panel-active-tab attribute
- * 4. React takes over visibility control after hydration completes
- * 5. Store updates CSS variable when width changes
- *
- * This ensures server and client render identical HTML, preventing hydration errors and visual flash.
- *
- * Note: All tabs are kept mounted but hidden to preserve component state during tab switches.
- * This prevents unnecessary remounting which would trigger data reloads and reset state.
- *
- * @returns Panel on the right side of the workflow
- */
-export function Panel() {
-  const router = useRouter()
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const panelRef = useRef<HTMLElement>(null)
-  const fileInputRef = useRef<HTMLInputElement>(null)
-  const { activeTab, setActiveTab, panelWidth, _hasHydrated, setHasHydrated } = usePanelStore()
-  const copilotRef = useRef<{
-    createNewChat: () => void
-    setInputValueAndFocus: (value: string) => void
-  }>(null)
-
-  // State
-  const [isMenuOpen, setIsMenuOpen] = useState(false)
-  const [isAutoLayouting, setIsAutoLayouting] = useState(false)
-  const [isExporting, setIsExporting] = useState(false)
-  const [isDuplicating, setIsDuplicating] = useState(false)
-  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
-
-  // Hooks
-  const userPermissions = useUserPermissionsContext()
-  const { isImporting, handleFileChange } = useImportWorkflow({ workspaceId })
-  const { workflows, activeWorkflowId, duplicateWorkflow, hydration } = useWorkflowRegistry()
-  const isRegistryLoading =
-    hydration.phase === 'idle' ||
-    hydration.phase === 'metadata-loading' ||
-    hydration.phase === 'state-loading'
-  const { getJson } = useWorkflowJsonStore()
-  const { blocks } = useWorkflowStore()
-
-  // Delete workflow hook
-  const { isDeleting, handleDeleteWorkflow } = useDeleteWorkflow({
-    workspaceId,
-    getWorkflowIds: () => activeWorkflowId || '',
-    isActive: true,
-    onSuccess: () => setIsDeleteModalOpen(false),
-  })
-
-  // Usage limits hook
-  const { usageExceeded } = useUsageLimits({
-    context: 'user',
-    autoRefresh: !isRegistryLoading,
-  })
-
-  // Workflow execution hook
-  const { handleRunWorkflow, handleCancelExecution, isExecuting } = useWorkflowExecution()
-
-  // Panel resize hook
-  const { handleMouseDown } = usePanelResize()
-
-  /**
-   * Opens subscription settings modal
-   */
-  const openSubscriptionSettings = () => {
-    if (typeof window !== 'undefined') {
-      window.dispatchEvent(
-        new CustomEvent('open-settings', {
-          detail: { tab: 'subscription' },
-        })
-      )
-    }
-  }
-
-  /**
-   * Runs the workflow with usage limit check
-   */
-  const runWorkflow = useCallback(async () => {
-    if (usageExceeded) {
-      openSubscriptionSettings()
-      return
-    }
-    const { openOnRun, terminalHeight, setTerminalHeight } = useTerminalStore.getState()
-    if (openOnRun && terminalHeight <= MIN_TERMINAL_HEIGHT) {
-      setTerminalHeight(DEFAULT_TERMINAL_HEIGHT)
-    }
-    await handleRunWorkflow()
-  }, [usageExceeded, handleRunWorkflow])
-
-  /**
-   * Cancels the currently executing workflow
-   */
-  const cancelWorkflow = useCallback(async () => {
-    await handleCancelExecution()
-  }, [handleCancelExecution])
-
-  // Chat state
-  const { isChatOpen, setIsChatOpen } = useChatStore()
-  const { isOpen: isVariablesOpen, setIsOpen: setVariablesOpen } = useVariablesStore()
-
-  const currentWorkflow = activeWorkflowId ? workflows[activeWorkflowId] : null
-
-  /**
-   * Mark hydration as complete on mount
-   * This allows React to take over visibility control from CSS
-   */
-  useEffect(() => {
-    setHasHydrated(true)
-  }, [setHasHydrated])
-
-  /**
-   * Handles tab click events
-   */
-  const handleTabClick = (tab: PanelTab) => {
-    setActiveTab(tab)
-  }
-
-  /**
-   * Downloads a file with the given content
-   */
-  const downloadFile = useCallback((content: string, filename: string, mimeType: string) => {
-    try {
-      const blob = new Blob([content], { type: mimeType })
-      const url = URL.createObjectURL(blob)
-      const a = document.createElement('a')
-      a.href = url
-      a.download = filename
-      document.body.appendChild(a)
-      a.click()
-      document.body.removeChild(a)
-      URL.revokeObjectURL(url)
-    } catch (error) {
-      logger.error('Failed to download file:', error)
-    }
-  }, [])
-
-  /**
-   * Handles auto-layout of workflow blocks
-   */
-  const handleAutoLayout = useCallback(async () => {
-    if (isExecuting || !userPermissions.canEdit || isAutoLayouting) {
-      return
-    }
-
-    setIsAutoLayouting(true)
-    try {
-      // Use the standalone auto layout utility for immediate frontend updates
-      const { applyAutoLayoutAndUpdateStore } = await import('../../utils')
-
-      const result = await applyAutoLayoutAndUpdateStore(activeWorkflowId!)
-
-      if (result.success) {
-        logger.info('Auto layout completed successfully')
-      } else {
-        logger.error('Auto layout failed:', result.error)
-      }
-    } catch (error) {
-      logger.error('Auto layout error:', error)
-    } finally {
-      setIsAutoLayouting(false)
-    }
-  }, [isExecuting, userPermissions.canEdit, isAutoLayouting, activeWorkflowId])
-
-  /**
-   * Handles exporting workflow as JSON
-   */
-  const handleExportJson = useCallback(async () => {
-    if (!currentWorkflow || !activeWorkflowId) {
-      logger.warn('No active workflow to export')
-      return
-    }
-
-    setIsExporting(true)
-    try {
-      // Get the JSON from the store
-      const jsonContent = await getJson()
-
-      if (!jsonContent) {
-        throw new Error('Failed to generate JSON')
-      }
-
-      const filename = `${currentWorkflow.name.replace(/[^a-z0-9]/gi, '-')}.json`
-      downloadFile(jsonContent, filename, 'application/json')
-      logger.info('Workflow exported as JSON')
-    } catch (error) {
-      logger.error('Failed to export workflow as JSON:', error)
-    } finally {
-      setIsExporting(false)
-      setIsMenuOpen(false)
-    }
-  }, [currentWorkflow, activeWorkflowId, getJson, downloadFile])
-
-  /**
-   * Handles duplicating the current workflow
-   */
-  const handleDuplicateWorkflow = useCallback(async () => {
-    if (!activeWorkflowId || !userPermissions.canEdit || isDuplicating) {
-      return
-    }
-
-    setIsDuplicating(true)
-    try {
-      const newWorkflow = await duplicateWorkflow(activeWorkflowId)
-      if (newWorkflow) {
-        router.push(`/workspace/${workspaceId}/w/${newWorkflow}`)
-      }
-    } catch (error) {
-      logger.error('Error duplicating workflow:', error)
-    } finally {
-      setIsDuplicating(false)
-      setIsMenuOpen(false)
-    }
-  }, [
-    activeWorkflowId,
-    userPermissions.canEdit,
-    isDuplicating,
-    duplicateWorkflow,
-    router,
-    workspaceId,
-  ])
-
-  // Compute run button state
-  const canRun = userPermissions.canRead // Running only requires read permissions
-  const isLoadingPermissions = userPermissions.isLoading
-  const hasValidationErrors = false // TODO: Add validation logic if needed
-  const isWorkflowBlocked = isExecuting || hasValidationErrors
-  const isButtonDisabled = !isExecuting && (isWorkflowBlocked || (!canRun && !isLoadingPermissions))
-
-  // Register global keyboard shortcuts
-  useRegisterGlobalCommands(() => [
-    {
-      id: 'run-workflow',
-      shortcut: 'Mod+Enter',
-      allowInEditable: false,
-      handler: () => {
-        // Do exactly what the Run button does
-        if (isExecuting) {
-          cancelWorkflow()
-        } else {
-          runWorkflow()
-        }
-      },
-    },
-  ])
-
-  return (
-    <>
-      <aside
-        ref={panelRef}
-        className='panel-container fixed inset-y-0 right-0 z-10 overflow-hidden dark:bg-[var(--surface-1)]'
-        aria-label='Workflow panel'
-      >
-        <div className='flex h-full flex-col border-l pt-[14px] dark:border-[var(--border)]'>
-          {/* Header */}
-          <div className='flex flex-shrink-0 items-center justify-between px-[8px]'>
-            {/* More and Chat */}
-            <div className='flex gap-[4px]'>
-              <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
-                <PopoverTrigger asChild>
-                  <Button className='h-[32px] w-[32px]'>
-                    <MoreHorizontal />
-                  </Button>
-                </PopoverTrigger>
-                <PopoverContent align='start' side='bottom' sideOffset={8}>
-                  <PopoverItem
-                    onClick={handleAutoLayout}
-                    disabled={isExecuting || !userPermissions.canEdit || isAutoLayouting}
-                  >
-                    <Layout className='h-3 w-3' animate={isAutoLayouting} variant='clockwise' />
-                    <span>Auto layout</span>
-                  </PopoverItem>
-                  {
-                    <PopoverItem onClick={() => setVariablesOpen(!isVariablesOpen)}>
-                      <VariableIcon className='h-3 w-3' />
-                      <span>Variables</span>
-                    </PopoverItem>
-                  }
-                  {/* <PopoverItem>
-                    <Bug className='h-3 w-3' />
-                    <span>Debug</span>
-                  </PopoverItem> */}
-                  {/* <PopoverItem onClick={() => setIsMenuOpen(false)}>
-                    <Webhook className='h-3 w-3' />
-                    <span>Log webhook</span>
-                  </PopoverItem> */}
-                  <PopoverItem
-                    onClick={handleExportJson}
-                    disabled={isExporting || !currentWorkflow}
-                  >
-                    <Braces className='h-3 w-3' />
-                    <span>Export workflow</span>
-                  </PopoverItem>
-                  <PopoverItem
-                    onClick={handleDuplicateWorkflow}
-                    disabled={!userPermissions.canEdit || isDuplicating}
-                  >
-                    <Copy className='h-3 w-3' animate={isDuplicating} />
-                    <span>Duplicate workflow</span>
-                  </PopoverItem>
-                  <PopoverItem
-                    onClick={() => {
-                      setIsMenuOpen(false)
-                      setIsDeleteModalOpen(true)
-                    }}
-                    disabled={!userPermissions.canEdit || Object.keys(workflows).length <= 1}
-                  >
-                    <Trash className='h-3 w-3' />
-                    <span>Delete workflow</span>
-                  </PopoverItem>
-                </PopoverContent>
-              </Popover>
-              <Button
-                className='h-[32px] w-[32px]'
-                variant={isChatOpen ? 'active' : 'default'}
-                onClick={() => setIsChatOpen(!isChatOpen)}
-              >
-                <BubbleChatPreview />
-              </Button>
-            </div>
-
-            {/* Deploy and Run */}
-            <div className='flex gap-[4px]'>
-              <Deploy activeWorkflowId={activeWorkflowId} userPermissions={userPermissions} />
-              <Button
-                className='h-[32px] w-[61.5px] gap-[8px]'
-                variant={isExecuting ? 'active' : 'primary'}
-                onClick={isExecuting ? cancelWorkflow : () => runWorkflow()}
-                disabled={!isExecuting && isButtonDisabled}
-              >
-                {isExecuting ? (
-                  <Square className='h-[11.5px] w-[11.5px] fill-current' />
-                ) : (
-                  <Play className='h-[11.5px] w-[11.5px]' />
-                )}
-                Run
-              </Button>
-            </div>
-          </div>
-
-          {/* Tabs */}
-          <div className='flex flex-shrink-0 items-center justify-between px-[8px] pt-[14px]'>
-            <div className='flex gap-[4px]'>
-              <Button
-                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
-                variant={_hasHydrated && activeTab === 'copilot' ? 'active' : 'ghost'}
-                onClick={() => handleTabClick('copilot')}
-                data-tab-button='copilot'
-              >
-                Copilot
-              </Button>
-              <Button
-                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
-                variant={_hasHydrated && activeTab === 'toolbar' ? 'active' : 'ghost'}
-                onClick={() => handleTabClick('toolbar')}
-                data-tab-button='toolbar'
-              >
-                Toolbar
-              </Button>
-              <Button
-                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
-                variant={_hasHydrated && activeTab === 'editor' ? 'active' : 'ghost'}
-                onClick={() => handleTabClick('editor')}
-                data-tab-button='editor'
-              >
-                Editor
-              </Button>
-            </div>
-
-            {/* Workflow Controls (Undo/Redo and Zoom) */}
-            {/* <WorkflowControls /> */}
-          </div>
-
-          {/* Tab Content - Keep all tabs mounted but hidden to preserve state */}
-          <div className='flex-1 overflow-hidden pt-[12px]'>
-            <div
-              className={
-                _hasHydrated && activeTab === 'copilot'
-                  ? 'h-full'
-                  : _hasHydrated
-                    ? 'hidden'
-                    : 'h-full'
-              }
-              data-tab-content='copilot'
-            >
-              <Copilot ref={copilotRef} panelWidth={panelWidth} />
-            </div>
-            <div
-              className={
-                _hasHydrated && activeTab === 'editor'
-                  ? 'h-full'
-                  : _hasHydrated
-                    ? 'hidden'
-                    : 'h-full'
-              }
-              data-tab-content='editor'
-            >
-              <Editor />
-            </div>
-            <div
-              className={
-                _hasHydrated && activeTab === 'toolbar'
-                  ? 'h-full'
-                  : _hasHydrated
-                    ? 'hidden'
-                    : 'h-full'
-              }
-              data-tab-content='toolbar'
-            >
-              <Toolbar isActive={activeTab === 'toolbar'} />
-            </div>
-          </div>
-        </div>
-      </aside>
-
-      {/* Resize Handle */}
-      <div
-        className='fixed top-0 right-[calc(var(--panel-width)-4px)] bottom-0 z-20 w-[8px] cursor-ew-resize'
-        onMouseDown={handleMouseDown}
-        role='separator'
-        aria-orientation='vertical'
-        aria-label='Resize panel'
-      />
-
-      {/* Delete Confirmation Modal */}
-      <Modal open={isDeleteModalOpen} onOpenChange={setIsDeleteModalOpen}>
-        <ModalContent>
-          <ModalHeader>
-            <ModalTitle>Delete workflow?</ModalTitle>
-            <ModalDescription>
-              Deleting this workflow will permanently remove all associated blocks, executions, and
-              configuration.{' '}
-              <span className='text-[var(--text-error)] dark:text-[var(--text-error)]'>
-                This action cannot be undone.
-              </span>
-            </ModalDescription>
-          </ModalHeader>
-          <ModalFooter>
-            <Button
-              className='h-[32px] px-[12px]'
-              variant='outline'
-              onClick={() => setIsDeleteModalOpen(false)}
-              disabled={isDeleting}
-            >
-              Cancel
-            </Button>
-            <Button
-              className='h-[32px] bg-[var(--text-error)] px-[12px] text-[var(--white)] hover:bg-[var(--text-error)] hover:text-[var(--white)] dark:bg-[var(--text-error)] dark:text-[var(--white)] hover:dark:bg-[var(--text-error)] dark:hover:text-[var(--white)]'
-              onClick={handleDeleteWorkflow}
-              disabled={isDeleting}
-            >
-              {isDeleting ? 'Deleting...' : 'Delete'}
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-
-      {/* Floating Variables Modal */}
-      <Variables />
-    </>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/code-display/code-display.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/code-display/code-display.tsx
deleted file mode 100644
index b2bc4b607a..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/code-display/code-display.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Code } from '@/components/emcn'
-
-interface CodeDisplayProps {
-  code: string
-  language?: string
-}
-
-export const CodeDisplay = ({ code, language = 'javascript' }: CodeDisplayProps) => {
-  return <Code.Viewer code={code} showGutter language={language as 'javascript' | 'json'} />
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/console-entry/console-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/console-entry/console-entry.tsx
deleted file mode 100644
index 5b35c282ee..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/console-entry/console-entry.tsx
+++ /dev/null
@@ -1,623 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { format } from 'date-fns'
-import {
-  AlertCircle,
-  AlertTriangle,
-  Check,
-  ChevronDown,
-  ChevronUp,
-  Clipboard,
-  Download,
-  Pause,
-  Play,
-} from 'lucide-react'
-import Image from 'next/image'
-import { Button } from '@/components/ui/button'
-import { createLogger } from '@/lib/logs/console/logger'
-import { redactApiKeys } from '@/lib/utils'
-import {
-  CodeDisplay,
-  JSONView,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components'
-import { getBlock } from '@/blocks'
-import type { ConsoleEntry as ConsoleEntryType } from '@/stores/panel/console/types'
-import { useGeneralStore } from '@/stores/settings/general/store'
-
-const logger = createLogger('ConsoleEntry')
-
-interface ConsoleEntryProps {
-  entry: ConsoleEntryType
-  consoleWidth: number
-}
-
-// Helper function to check if an object contains an audio URL
-const hasAudioData = (obj: any): boolean => {
-  return obj && typeof obj === 'object' && 'audioUrl' in obj && typeof obj.audioUrl === 'string'
-}
-
-// Helper function to check if a string is likely a base64 image
-const isBase64Image = (str: string): boolean => {
-  if (typeof str !== 'string') return false
-  return str.length > 100 && /^[A-Za-z0-9+/=]+$/.test(str)
-}
-
-// Helper function to check if an object contains an image URL
-const hasImageData = (obj: any): boolean => {
-  if (!obj || typeof obj !== 'object') return false
-
-  // Case 1: Has explicit image data (base64)
-  if (
-    'image' in obj &&
-    typeof obj.image === 'string' &&
-    obj.image.length > 0 &&
-    isBase64Image(obj.image)
-  ) {
-    return true
-  }
-
-  // Case 2: Has explicit image type in metadata
-  if (
-    obj.metadata?.type &&
-    typeof obj.metadata.type === 'string' &&
-    obj.metadata.type.toLowerCase() === 'image'
-  ) {
-    return true
-  }
-
-  // Case 3: Content URL points to an image file
-  if (typeof obj.content === 'string' && obj.content.startsWith('http')) {
-    return !!obj.content.toLowerCase().match(/\.(png|jpg|jpeg|gif|webp|svg)(\?|$)/)
-  }
-
-  // Case 4: Has URL property with image extension
-  if ('url' in obj && typeof obj.url === 'string') {
-    if (obj.metadata?.fileType?.startsWith('image/')) {
-      return true
-    }
-    const url = obj.url.toLowerCase()
-    return url.match(/\.(jpg|jpeg|png|gif|webp|svg)(\?|$)/) !== null
-  }
-
-  return false
-}
-
-// Get image URL from object
-const getImageUrl = (obj: any): string | null => {
-  if (!obj || typeof obj !== 'object') return null
-
-  // Try content field first
-  if (typeof obj.content === 'string' && obj.content.startsWith('http')) {
-    return obj.content
-  }
-
-  // Try url field
-  if ('url' in obj && typeof obj.url === 'string') {
-    return obj.url
-  }
-
-  return null
-}
-
-// Get base64 image data from object
-const getImageData = (obj: any): string | null => {
-  if (!obj || typeof obj !== 'object') return null
-
-  if (
-    'image' in obj &&
-    typeof obj.image === 'string' &&
-    obj.image.length > 0 &&
-    isBase64Image(obj.image)
-  ) {
-    return obj.image
-  }
-
-  return null
-}
-
-// Image preview component
-const ImagePreview = ({
-  imageUrl,
-  imageData,
-  isBase64 = false,
-  onLoadError,
-}: {
-  imageUrl?: string
-  imageData?: string
-  isBase64?: boolean
-  onLoadError?: (hasError: boolean) => void
-}) => {
-  const [loadError, setLoadError] = useState(false)
-
-  // Only display image if we have valid data
-  const hasValidData =
-    (isBase64 && imageData && imageData.length > 0) || (imageUrl && imageUrl.length > 0)
-
-  if (!hasValidData) {
-    return null
-  }
-
-  if (loadError) {
-    return null
-  }
-
-  // Determine the source for the image
-  const imageSrc =
-    isBase64 && imageData && imageData.length > 0
-      ? `data:image/png;base64,${imageData}`
-      : imageUrl || ''
-
-  return (
-    <div className='my-2 w-1/2'>
-      <Image
-        src={imageSrc}
-        alt='Generated image'
-        width={400}
-        height={300}
-        className='h-auto w-full rounded-lg border'
-        unoptimized
-        onError={(e) => {
-          logger.error('Image failed to load:', imageSrc)
-          setLoadError(true)
-          onLoadError?.(true)
-        }}
-        onLoad={() => {
-          onLoadError?.(false)
-        }}
-      />
-    </div>
-  )
-}
-
-export function ConsoleEntry({ entry, consoleWidth }: ConsoleEntryProps) {
-  const isConsoleExpandedByDefault = useGeneralStore((state) => state.isConsoleExpandedByDefault)
-  const [isExpanded, setIsExpanded] = useState(isConsoleExpandedByDefault)
-  const [showCopySuccess, setShowCopySuccess] = useState(false)
-  const [showInput, setShowInput] = useState(false) // State for input/output toggle
-  const [isPlaying, setIsPlaying] = useState(false)
-  const [progress, setProgress] = useState(0)
-  const [imageLoadError, setImageLoadError] = useState(false)
-  const audioRef = useRef<HTMLAudioElement | null>(null)
-
-  // Check if entry has audio data
-  const hasAudio = useMemo(() => {
-    return entry.output != null && hasAudioData(entry.output)
-  }, [entry.output])
-
-  // Check if entry has image data
-  const hasImage = useMemo(() => {
-    return entry.output != null && hasImageData(entry.output)
-  }, [entry.output])
-
-  // Only show image download button if image exists and didn't fail to load
-  const showImageDownload = hasImage && !imageLoadError
-
-  const audioUrl = useMemo(() => {
-    return hasAudio && entry.output ? entry.output.audioUrl : null
-  }, [hasAudio, entry.output])
-
-  const imageUrl = useMemo(() => {
-    return hasImage && entry.output ? getImageUrl(entry.output) : null
-  }, [hasImage, entry.output])
-
-  const imageData = useMemo(() => {
-    return hasImage && entry.output ? getImageData(entry.output) : null
-  }, [hasImage, entry.output])
-
-  const isBase64Image = useMemo(() => {
-    return imageData != null && imageData.length > 0
-  }, [imageData])
-
-  // Get the data to display based on the toggle state
-  const displayData = useMemo(() => {
-    return showInput ? entry.input : entry.output
-  }, [showInput, entry.input, entry.output])
-
-  // Check if input data exists
-  const hasInputData = useMemo(() => {
-    return (
-      entry.input != null &&
-      (typeof entry.input === 'object'
-        ? Object.keys(entry.input).length > 0
-        : entry.input !== undefined && entry.input !== null)
-    )
-  }, [entry.input])
-
-  // Check if this is a function block with code input
-  const shouldShowCodeDisplay = useMemo(() => {
-    return (
-      entry.blockType === 'function' &&
-      showInput &&
-      entry.input &&
-      typeof entry.input === 'object' &&
-      'code' in entry.input &&
-      typeof entry.input.code === 'string'
-    )
-  }, [entry.blockType, showInput, entry.input])
-
-  // Audio player logic
-  useEffect(() => {
-    if (!hasAudio || !audioUrl) return
-
-    if (!audioRef.current) {
-      audioRef.current = new Audio(audioUrl)
-      audioRef.current.addEventListener('ended', () => setIsPlaying(false))
-      audioRef.current.addEventListener('pause', () => setIsPlaying(false))
-      audioRef.current.addEventListener('play', () => setIsPlaying(true))
-      audioRef.current.addEventListener('timeupdate', updateProgress)
-    } else {
-      audioRef.current.src = audioUrl
-      setProgress(0)
-    }
-
-    return () => {
-      if (audioRef.current) {
-        audioRef.current.pause()
-        audioRef.current.removeEventListener('ended', () => setIsPlaying(false))
-        audioRef.current.removeEventListener('pause', () => setIsPlaying(false))
-        audioRef.current.removeEventListener('play', () => setIsPlaying(true))
-        audioRef.current.removeEventListener('timeupdate', updateProgress)
-      }
-    }
-  }, [hasAudio, audioUrl])
-
-  const updateProgress = () => {
-    if (audioRef.current) {
-      const value = (audioRef.current.currentTime / audioRef.current.duration) * 100
-      setProgress(Number.isNaN(value) ? 0 : value)
-    }
-  }
-
-  const togglePlay = () => {
-    if (!audioRef.current) return
-
-    if (isPlaying) {
-      audioRef.current.pause()
-    } else {
-      audioRef.current.play()
-    }
-  }
-
-  const downloadAudio = async () => {
-    if (!audioUrl) return
-
-    try {
-      const response = await fetch(audioUrl)
-      const blob = await response.blob()
-
-      const url = URL.createObjectURL(blob)
-      const link = document.createElement('a')
-      link.href = url
-      link.download = `tts-audio-${Date.now()}.mp3`
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link)
-
-      URL.revokeObjectURL(url)
-    } catch (error) {
-      logger.error('Error downloading audio:', error)
-    }
-  }
-
-  const downloadImage = async () => {
-    try {
-      let blob: Blob
-      if (isBase64Image && imageData && imageData.length > 0) {
-        // Convert base64 to blob
-        const byteString = atob(imageData)
-        const arrayBuffer = new ArrayBuffer(byteString.length)
-        const uint8Array = new Uint8Array(arrayBuffer)
-        for (let i = 0; i < byteString.length; i++) {
-          uint8Array[i] = byteString.charCodeAt(i)
-        }
-        blob = new Blob([arrayBuffer], { type: 'image/png' })
-      } else if (imageUrl && imageUrl.length > 0) {
-        // Use proxy endpoint to fetch image
-        const proxyUrl = `/api/proxy/image?url=${encodeURIComponent(imageUrl)}`
-        const response = await fetch(proxyUrl)
-        if (!response.ok) {
-          throw new Error(`Failed to download image: ${response.statusText}`)
-        }
-        blob = await response.blob()
-      } else {
-        throw new Error('No image data or URL provided')
-      }
-
-      // Create object URL and trigger download
-      const url = URL.createObjectURL(blob)
-      const link = document.createElement('a')
-      link.href = url
-      link.download = `generated-image-${Date.now()}.png`
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link)
-
-      // Clean up the URL
-      setTimeout(() => URL.revokeObjectURL(url), 100)
-    } catch (error) {
-      logger.error('Error downloading image:', error)
-      alert('Failed to download image. Please try again later.')
-    }
-  }
-
-  const blockConfig = useMemo(() => {
-    if (!entry.blockType) return null
-    return getBlock(entry.blockType)
-  }, [entry.blockType])
-
-  const handleCopy = () => {
-    let textToCopy: string
-
-    if (shouldShowCodeDisplay) {
-      // For code display, copy just the code string
-      textToCopy = entry.input.code
-    } else {
-      // For regular JSON display, copy the full JSON with redaction applied
-      const dataToCopy = showInput ? entry.input : entry.output
-      const redactedData = redactApiKeys(dataToCopy)
-      textToCopy = JSON.stringify(redactedData, null, 2)
-    }
-
-    navigator.clipboard.writeText(textToCopy)
-    setShowCopySuccess(true)
-  }
-
-  useEffect(() => {
-    if (showCopySuccess) {
-      const timer = setTimeout(() => {
-        setShowCopySuccess(false)
-      }, 2000)
-      return () => clearTimeout(timer)
-    }
-  }, [showCopySuccess])
-
-  // Special handling for serialization errors
-  const BlockIcon = entry.blockType === 'serializer' ? AlertTriangle : blockConfig?.icon
-  const blockColor =
-    entry.blockType === 'serializer' ? '#EF4444' : blockConfig?.bgColor || '#6B7280'
-
-  // Handle image load error callback
-  const handleImageLoadError = (hasError: boolean) => {
-    setImageLoadError(hasError)
-  }
-
-  return (
-    <div className='space-y-3'>
-      {/* Header: Icon | Block name */}
-      <div className='flex items-center gap-2'>
-        {BlockIcon && (
-          <div
-            className='flex h-5 w-5 items-center justify-center rounded-md'
-            style={{ backgroundColor: blockColor }}
-          >
-            <BlockIcon className='h-3 w-3 text-white' />
-          </div>
-        )}
-        <span className='font-normal text-base text-sm leading-normal'>
-          {entry.blockName || 'Unknown Block'}
-        </span>
-      </div>
-
-      {/* Duration tag | Time tag | Input/Output tags */}
-      <div className='flex items-center gap-2'>
-        <div
-          className={`flex h-5 items-center rounded-lg px-2 ${
-            entry.error ? 'bg-[#F6D2D2] dark:bg-[#442929]' : 'bg-secondary'
-          }`}
-        >
-          {entry.error ? (
-            <div className='flex items-center gap-1'>
-              <AlertCircle className='h-3 w-3 text-[#DC2626] dark:text-[#F87171]' />
-              <span className='font-normal text-[#DC2626] text-xs leading-normal dark:text-[#F87171]'>
-                Error
-              </span>
-            </div>
-          ) : (
-            <span className='font-normal text-muted-foreground text-xs leading-normal'>
-              {entry.durationMs ?? 0}ms
-            </span>
-          )}
-        </div>
-        <div className='flex h-5 items-center rounded-lg bg-secondary px-2'>
-          <span className='font-normal text-muted-foreground text-xs leading-normal'>
-            {entry.startedAt ? format(new Date(entry.startedAt), 'HH:mm:ss') : 'N/A'}
-          </span>
-        </div>
-        {/* Iteration tag - only show if iteration context exists */}
-        {entry.iterationCurrent !== undefined && (
-          <div className='flex h-5 items-center rounded-lg bg-secondary px-2'>
-            <span className='font-normal text-muted-foreground text-xs leading-normal'>
-              {entry.iterationTotal !== undefined
-                ? `${entry.iterationCurrent + 1}/${entry.iterationTotal}`
-                : `${entry.iterationCurrent + 1}`}
-            </span>
-          </div>
-        )}
-        {/* Input/Output tags - only show if input data exists */}
-        {hasInputData && (
-          <>
-            <button
-              onClick={() => setShowInput(false)}
-              className={`flex h-5 items-center rounded-lg px-2 transition-colors ${
-                !showInput
-                  ? 'border-[#e5e5e5] bg-[#f5f5f5] text-[#1a1a1a] dark:border-[var(--border-muted)] dark:bg-[#1f1f1f] dark:text-[var(--white)]'
-                  : 'bg-secondary text-muted-foreground hover:bg-secondary hover:text-card-foreground'
-              }`}
-            >
-              <span className='font-normal text-xs leading-normal'>Output</span>
-            </button>
-            <button
-              onClick={() => setShowInput(true)}
-              className={`flex h-5 items-center rounded-lg px-2 transition-colors ${
-                showInput
-                  ? 'border-[#e5e5e5] bg-[#f5f5f5] text-[#1a1a1a] dark:border-[var(--border-muted)] dark:bg-[#1f1f1f] dark:text-[var(--white)]'
-                  : 'bg-secondary text-muted-foreground hover:bg-secondary hover:text-card-foreground'
-              }`}
-            >
-              <span className='font-normal text-xs leading-normal'>Input</span>
-            </button>
-            {/* Copy button for code input - only show when input is selected and it's a function block with code */}
-            {shouldShowCodeDisplay && (
-              <Button
-                variant='ghost'
-                size='sm'
-                className='h-5 w-5 p-0 hover:bg-transparent'
-                onClick={handleCopy}
-              >
-                {showCopySuccess ? (
-                  <Check className='h-3 w-3 text-gray-500' />
-                ) : (
-                  <Clipboard className='h-3 w-3 text-muted-foreground' />
-                )}
-              </Button>
-            )}
-          </>
-        )}
-      </div>
-
-      {/* Response area */}
-      <div className='space-y-2 pb-2'>
-        {/* Error display */}
-        {entry.error && !showInput && (
-          <div className='rounded-lg bg-[#F6D2D2] p-3 dark:bg-[#442929]'>
-            <div className='overflow-hidden whitespace-pre-wrap break-all font-normal text-[#DC2626] text-sm leading-normal dark:text-[#F87171]'>
-              {entry.error instanceof Error ? entry.error.message : entry.error}
-            </div>
-          </div>
-        )}
-
-        {/* Warning display */}
-        {entry.warning && !showInput && (
-          <div className='rounded-lg border-yellow-200 bg-yellow-50 p-3 dark:border-yellow-800/50'>
-            <div className='mb-1 font-normal text-sm text-yellow-800 leading-normal dark:text-yellow-200'>
-              Warning
-            </div>
-            <div className='overflow-hidden whitespace-pre-wrap break-all font-normal text-sm text-yellow-700 leading-normal dark:text-yellow-300'>
-              {entry.warning}
-            </div>
-          </div>
-        )}
-
-        {/* Content display */}
-        {(showInput ? hasInputData : entry.output != null && !entry.error) && (
-          <div className={`rounded-lg bg-secondary/50 ${shouldShowCodeDisplay ? 'p-0' : 'p-3'}`}>
-            {shouldShowCodeDisplay ? (
-              /* Code display - replace entire content */
-              <CodeDisplay code={entry.input.code} />
-            ) : (
-              <div className='relative'>
-                {/* Copy and Expand/Collapse buttons */}
-                <div className='absolute top-[-2.8] right-0 z-10 flex items-center gap-1'>
-                  {/* Audio controls - only show if audio data exists and we're showing output */}
-                  {hasAudio && !showInput && (
-                    <>
-                      <Button
-                        variant='ghost'
-                        size='sm'
-                        className='h-6 w-6 p-0 hover:bg-transparent'
-                        onClick={togglePlay}
-                        aria-label={isPlaying ? 'Pause' : 'Play'}
-                      >
-                        {isPlaying ? (
-                          <Pause className='h-3 w-3 text-muted-foreground' />
-                        ) : (
-                          <Play className='h-3 w-3 text-muted-foreground' />
-                        )}
-                      </Button>
-                      <Button
-                        variant='ghost'
-                        size='sm'
-                        className='h-6 w-6 p-0 hover:bg-transparent'
-                        onClick={downloadAudio}
-                        aria-label='Download audio'
-                      >
-                        <Download className='h-3 w-3 text-muted-foreground' />
-                      </Button>
-                    </>
-                  )}
-                  {/* Image controls - only show if image data exists and didn't fail to load and we're showing output */}
-                  {showImageDownload && !showInput && (
-                    <Button
-                      variant='ghost'
-                      size='sm'
-                      className='h-6 w-6 p-0 hover:bg-transparent'
-                      onClick={downloadImage}
-                      aria-label='Download image'
-                    >
-                      <Download className='h-3 w-3 text-muted-foreground' />
-                    </Button>
-                  )}
-                  <Button
-                    variant='ghost'
-                    size='sm'
-                    className='h-6 w-6 p-0 hover:bg-transparent'
-                    onClick={handleCopy}
-                  >
-                    {showCopySuccess ? (
-                      <Check className='h-3 w-3 text-gray-500' />
-                    ) : (
-                      <Clipboard className='h-3 w-3 text-muted-foreground' />
-                    )}
-                  </Button>
-                  <Button
-                    variant='ghost'
-                    size='sm'
-                    className='h-6 w-6 p-0 hover:bg-transparent'
-                    onClick={() => setIsExpanded(!isExpanded)}
-                  >
-                    {isExpanded ? (
-                      <ChevronUp className='h-3 w-3 text-muted-foreground' />
-                    ) : (
-                      <ChevronDown className='h-3 w-3 text-muted-foreground' />
-                    )}
-                  </Button>
-                </div>
-
-                {/* Image preview - show before JSON content - only for output mode */}
-                {hasImage && !showInput && (
-                  <ImagePreview
-                    imageUrl={imageUrl || undefined}
-                    imageData={imageData || undefined}
-                    isBase64={isBase64Image}
-                    onLoadError={handleImageLoadError}
-                  />
-                )}
-
-                {/* Content */}
-                {isExpanded ? (
-                  <div className='max-w-full overflow-hidden break-all font-mono font-normal text-muted-foreground text-sm leading-normal'>
-                    <JSONView data={displayData} />
-                  </div>
-                ) : (
-                  <div
-                    className='max-w-full cursor-pointer overflow-hidden break-all font-mono font-normal text-muted-foreground text-sm leading-normal'
-                    onClick={() => setIsExpanded(true)}
-                  >
-                    {'{...}'}
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
-        )}
-
-        {/* No output message */}
-        {!showInput && entry.output == null && !entry.error && (
-          <div className='rounded-lg bg-secondary/50 p-3'>
-            <div className='text-center font-normal text-muted-foreground text-sm leading-normal'>
-              No output
-            </div>
-          </div>
-        )}
-
-        {/* No input message */}
-        {showInput && !hasInputData && (
-          <div className='rounded-lg bg-secondary/50 p-3'>
-            <div className='text-center font-normal text-muted-foreground text-sm leading-normal'>
-              No input
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/index.ts
deleted file mode 100644
index c8237364e6..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { CodeDisplay } from './code-display/code-display'
-export { ConsoleEntry } from './console-entry/console-entry'
-export { JSONView } from './json-view/json-view'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/json-view/json-view.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/json-view/json-view.tsx
deleted file mode 100644
index fc282e123d..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/json-view/json-view.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { useEffect, useState } from 'react'
-import { Button } from '@/components/ui/button'
-import { filterForDisplay, redactApiKeys } from '@/lib/utils'
-
-interface JSONViewProps {
-  data: any
-}
-
-const MAX_STRING_LENGTH = 150
-const MAX_OBJECT_KEYS = 10
-const MAX_ARRAY_ITEMS = 20
-
-const TruncatedValue = ({ value }: { value: string }) => {
-  const [isExpanded, setIsExpanded] = useState(false)
-
-  if (value.length <= MAX_STRING_LENGTH) {
-    return (
-      <span className='break-all font-[380] text-muted-foreground leading-normal'>{value}</span>
-    )
-  }
-
-  return (
-    <span className='break-all font-[380] text-muted-foreground leading-normal'>
-      {isExpanded ? value : `${value.slice(0, MAX_STRING_LENGTH)}...`}
-      <Button
-        variant='link'
-        size='sm'
-        className='h-auto px-1 font-[380] text-muted-foreground/70 text-xs hover:text-foreground'
-        onClick={(e) => {
-          e.stopPropagation()
-          setIsExpanded(!isExpanded)
-        }}
-      >
-        {isExpanded ? 'Show less' : 'Show more'}
-      </Button>
-    </span>
-  )
-}
-
-const CollapsibleJSON = ({ data, depth = 0 }: { data: any; depth?: number }) => {
-  const [isExpanded, setIsExpanded] = useState(false)
-
-  if (data === null) {
-    return <span className='break-all font-[380] text-muted-foreground leading-normal'>null</span>
-  }
-
-  if (data === undefined) {
-    return (
-      <span className='break-all font-[380] text-muted-foreground leading-normal'>undefined</span>
-    )
-  }
-
-  if (typeof data === 'string') {
-    return <TruncatedValue value={JSON.stringify(data)} />
-  }
-
-  if (typeof data === 'number' || typeof data === 'boolean') {
-    return (
-      <span className='break-all font-[380] text-muted-foreground leading-normal'>
-        {JSON.stringify(data)}
-      </span>
-    )
-  }
-
-  if (Array.isArray(data)) {
-    const shouldCollapse = depth > 0 && data.length > MAX_ARRAY_ITEMS
-
-    if (shouldCollapse && !isExpanded) {
-      return (
-        <span
-          className='cursor-pointer break-all font-[380] text-muted-foreground/70 text-xs leading-normal'
-          onClick={() => setIsExpanded(true)}
-        >
-          {'[...]'}
-        </span>
-      )
-    }
-
-    return (
-      <span className='break-all font-[380] text-muted-foreground/70 leading-normal'>
-        {'['}
-        {data.length > 0 && (
-          <>
-            {'\n'}
-            {data.map((item, index) => (
-              <span key={index} className='break-all'>
-                {'  '.repeat(depth + 1)}
-                <CollapsibleJSON data={item} depth={depth + 1} />
-                {index < data.length - 1 ? ',' : ''}
-                {'\n'}
-              </span>
-            ))}
-            {'  '.repeat(depth)}
-          </>
-        )}
-        {']'}
-      </span>
-    )
-  }
-
-  if (typeof data === 'object') {
-    const keys = Object.keys(data)
-    const shouldCollapse = depth > 0 && keys.length > MAX_OBJECT_KEYS
-
-    if (shouldCollapse && !isExpanded) {
-      return (
-        <span
-          className='cursor-pointer break-all font-[380] text-muted-foreground/70 text-xs leading-normal'
-          onClick={() => setIsExpanded(true)}
-        >
-          {'{...}'}
-        </span>
-      )
-    }
-
-    return (
-      <span className='break-all font-[380] text-muted-foreground/70 leading-normal'>
-        {'{'}
-        {keys.length > 0 && (
-          <>
-            {'\n'}
-            {keys.map((key, index) => (
-              <span key={key} className='break-all'>
-                {'  '.repeat(depth + 1)}
-                <span className='break-all font-[380] text-foreground leading-normal'>{key}</span>
-                <span className='font-[380] text-muted-foreground/60 leading-normal'>: </span>
-                <CollapsibleJSON data={data[key]} depth={depth + 1} />
-                {index < keys.length - 1 ? ',' : ''}
-                {'\n'}
-              </span>
-            ))}
-            {'  '.repeat(depth)}
-          </>
-        )}
-        {'}'}
-      </span>
-    )
-  }
-
-  return (
-    <span className='break-all font-[380] text-muted-foreground leading-normal'>
-      {JSON.stringify(data)}
-    </span>
-  )
-}
-
-const copyToClipboard = (data: any) => {
-  const stringified = JSON.stringify(data, null, 2)
-  navigator.clipboard.writeText(stringified)
-}
-
-export const JSONView = ({ data }: JSONViewProps) => {
-  const [contextMenuPosition, setContextMenuPosition] = useState<{
-    x: number
-    y: number
-  } | null>(null)
-
-  const filteredData = filterForDisplay(data)
-  const redactedData = redactApiKeys(filteredData)
-
-  const handleContextMenu = (e: React.MouseEvent) => {
-    e.preventDefault()
-    setContextMenuPosition({ x: e.clientX, y: e.clientY })
-  }
-
-  useEffect(() => {
-    const handleClickOutside = () => setContextMenuPosition(null)
-    if (contextMenuPosition) {
-      document.addEventListener('click', handleClickOutside)
-      return () => document.removeEventListener('click', handleClickOutside)
-    }
-  }, [contextMenuPosition])
-
-  if (redactedData === null)
-    return <span className='font-[380] text-muted-foreground leading-normal'>null</span>
-
-  // For non-object data, show simple JSON
-  if (typeof redactedData !== 'object') {
-    const stringValue = JSON.stringify(redactedData)
-    return (
-      <span
-        onContextMenu={handleContextMenu}
-        className='relative max-w-full overflow-hidden break-all font-[380] font-mono text-muted-foreground leading-normal'
-      >
-        {typeof redactedData === 'string' ? (
-          <TruncatedValue value={stringValue} />
-        ) : (
-          <span className='break-all font-[380] text-muted-foreground leading-normal'>
-            {stringValue}
-          </span>
-        )}
-        {contextMenuPosition && (
-          <div
-            className='fixed z-50 min-w-[160px] rounded-md border bg-popover py-1 shadow-md'
-            style={{ left: contextMenuPosition.x, top: contextMenuPosition.y }}
-          >
-            <button
-              className='w-full px-3 py-1.5 text-left font-[380] text-sm hover:bg-accent'
-              onClick={() => copyToClipboard(redactedData)}
-            >
-              Copy value
-            </button>
-          </div>
-        )}
-      </span>
-    )
-  }
-
-  // Default case: show JSON as formatted text with collapsible functionality
-  return (
-    <div onContextMenu={handleContextMenu}>
-      <pre className='max-w-full overflow-hidden whitespace-pre-wrap break-all font-mono'>
-        <CollapsibleJSON data={redactedData} />
-      </pre>
-      {contextMenuPosition && (
-        <div
-          className='fixed z-50 min-w-[160px] rounded-md border bg-popover py-1 shadow-md'
-          style={{ left: contextMenuPosition.x, top: contextMenuPosition.y }}
-        >
-          <button
-            className='w-full px-3 py-1.5 text-left font-[380] text-sm hover:bg-accent'
-            onClick={() => copyToClipboard(redactedData)}
-          >
-            Copy object
-          </button>
-        </div>
-      )}
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/console.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/console.tsx
deleted file mode 100644
index dd95a063e5..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/console.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-'use client'
-
-import { useMemo } from 'react'
-import { ScrollArea } from '@/components/ui/scroll-area'
-import { ConsoleEntry } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components'
-import { useTerminalConsoleStore } from '@/stores/terminal'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-
-interface ConsoleProps {
-  panelWidth: number
-}
-
-export function Console({ panelWidth }: ConsoleProps) {
-  const entries = useTerminalConsoleStore((state) => state.entries)
-  const { activeWorkflowId } = useWorkflowRegistry()
-
-  const filteredEntries = useMemo(() => {
-    return entries.filter((entry) => entry.workflowId === activeWorkflowId)
-  }, [entries, activeWorkflowId])
-
-  return (
-    <div className='h-full pt-2 pl-[1px]'>
-      {filteredEntries.length === 0 ? (
-        <div className='flex h-full items-center justify-center text-muted-foreground text-sm'>
-          No console entries
-        </div>
-      ) : (
-        <ScrollArea className='h-full' hideScrollbar={false}>
-          <div className='space-y-3'>
-            {filteredEntries.map((entry) => (
-              <ConsoleEntry key={entry.id} entry={entry} consoleWidth={panelWidth} />
-            ))}
-          </div>
-        </ScrollArea>
-      )}
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/file-display.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/file-display.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display.tsx
index 7d5572ad0a..6081e8b1c3 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/file-display.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/file-display.tsx
@@ -1,6 +1,6 @@
 import { memo, useState } from 'react'
 import { FileText, Image } from 'lucide-react'
-import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-file-attachments'
+import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
 
 /**
  * File size units for formatting
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/markdown-renderer.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/markdown-renderer.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/smooth-streaming.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/smooth-streaming.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming.tsx
index e275282ce7..71de980ce9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/smooth-streaming.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/smooth-streaming.tsx
@@ -1,5 +1,5 @@
 import { memo, useEffect, useRef, useState } from 'react'
-import CopilotMarkdownRenderer from './markdown-renderer'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
 
 /**
  * Character animation delay in milliseconds
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/thinking-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/thinking-block.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/thinking-block.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/copilot-message.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/copilot-message.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
index eab043d1c3..f78d83edf9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/copilot-message.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/copilot-message.tsx
@@ -3,26 +3,23 @@
 import { type FC, memo, useMemo, useState } from 'react'
 import { Check, Copy, RotateCcw, ThumbsDown, ThumbsUp } from 'lucide-react'
 import { Button } from '@/components/emcn'
-import { createLogger } from '@/lib/logs/console/logger'
-import { InlineToolCall } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components'
+import { InlineToolCall } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components'
 import {
   FileAttachmentDisplay,
   SmoothStreamingText,
   StreamingIndicator,
   ThinkingBlock,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components'
-import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/components/markdown-renderer'
-import { UserInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/user-input'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { CopilotMessage as CopilotMessageType } from '@/stores/panel-new/copilot/types'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components'
+import CopilotMarkdownRenderer from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer'
 import {
   useCheckpointManagement,
   useMessageEditing,
   useMessageFeedback,
   useSuccessTimers,
-} from './hooks'
-
-const logger = createLogger('CopilotMessage')
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks'
+import { UserInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import type { CopilotMessage as CopilotMessageType } from '@/stores/panel/copilot/types'
 
 /**
  * Props for the CopilotMessage component
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
index fe122b3ff5..07c67775d5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-checkpoint-management.ts
@@ -2,8 +2,8 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { CopilotMessage } from '@/stores/panel-new/copilot/types'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import type { CopilotMessage } from '@/stores/panel/copilot/types'
 
 const logger = createLogger('useCheckpointManagement')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-editing.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-editing.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts
index 001f44a7dd..3653cf74c5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-editing.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-editing.ts
@@ -2,8 +2,8 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { CopilotMessage } from '@/stores/panel-new/copilot/types'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import type { CopilotMessage } from '@/stores/panel/copilot/types'
 
 const logger = createLogger('useMessageEditing')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-feedback.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
index c823f9973c..63e753a968 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
@@ -2,9 +2,9 @@
 
 import { useCallback } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
-import { usePreviewStore } from '@/stores/panel-new/copilot/preview-store'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { CopilotMessage } from '@/stores/panel-new/copilot/types'
+import { usePreviewStore } from '@/stores/panel/copilot/preview-store'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import type { CopilotMessage } from '@/stores/panel/copilot/types'
 
 const logger = createLogger('useMessageFeedback')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-success-timers.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-success-timers.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/copilot-message/hooks/use-success-timers.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-success-timers.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/inline-tool-call/inline-tool-call.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/inline-tool-call/inline-tool-call.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/inline-tool-call/inline-tool-call.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/inline-tool-call/inline-tool-call.tsx
index ee68e5f29b..154fc23fcf 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/inline-tool-call/inline-tool-call.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/inline-tool-call/inline-tool-call.tsx
@@ -9,8 +9,8 @@ import { ClientToolCallState } from '@/lib/copilot/tools/client/base-tool'
 import { getClientTool } from '@/lib/copilot/tools/client/manager'
 import { getRegisteredTools } from '@/lib/copilot/tools/client/registry'
 import { getEnv } from '@/lib/env'
-import { CLASS_TOOL_METADATA, useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { CopilotToolCall } from '@/stores/panel-new/copilot/types'
+import { CLASS_TOOL_METADATA, useCopilotStore } from '@/stores/panel/copilot/store'
+import type { CopilotToolCall } from '@/stores/panel/copilot/types'
 
 interface InlineToolCallProps {
   toolCall?: CopilotToolCall
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/todo-list/todo-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/todo-list/todo-list.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/todo-list/todo-list.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/todo-list/todo-list.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/attached-files-display/attached-files-display.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/attached-files-display/attached-files-display.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/attached-files-display/attached-files-display.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/attached-files-display/attached-files-display.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/context-pills/context-pills.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/context-pills/context-pills.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/context-pills/context-pills.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/context-pills/context-pills.tsx
index e40536fa92..8c1da1f472 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/context-pills/context-pills.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/context-pills/context-pills.tsx
@@ -2,7 +2,7 @@
 
 import { X } from 'lucide-react'
 import { Badge } from '@/components/emcn'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 interface ContextPillsProps {
   /** Selected contexts to display as pills */
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mention-menu/mention-menu.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/mode-selector/mode-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mode-selector/mode-selector.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/mode-selector/mode-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/mode-selector/mode-selector.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/model-selector/model-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/model-selector/model-selector.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/components/model-selector/model-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components/model-selector/model-selector.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/constants.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/constants.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/constants.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/constants.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-context-management.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-context-management.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-context-management.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-context-management.ts
index 11ba6efab7..bb10db801e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-context-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-context-management.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 interface UseContextManagementProps {
   /** Current message text */
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-file-attachments.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-file-attachments.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-data.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-data.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts
index 3323501420..ed63df8290 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-insert-handlers.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
-import type { useMentionMenu } from './use-mention-menu'
+import type { useMentionMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 interface UseMentionInsertHandlersProps {
   /** Mention menu hook instance */
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-keyboard.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-keyboard.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-keyboard.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-keyboard.ts
index f12a88e63d..b36e73a286 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-keyboard.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-keyboard.ts
@@ -1,7 +1,7 @@
 import { type KeyboardEvent, useCallback } from 'react'
+import type { useMentionData } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data'
+import type { useMentionMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu'
 import { MENTION_OPTIONS } from '../constants'
-import type { useMentionData } from './use-mention-data'
-import type { useMentionMenu } from './use-mention-menu'
 
 /**
  * Chat item for mention insertion
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-menu.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu.ts
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-menu.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu.ts
index 9d512f9d04..4fcb2ce6d1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-menu.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 import { SCROLL_TOLERANCE } from '../constants'
 
 const logger = createLogger('useMentionMenu')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-tokens.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-tokens.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
index 900a3bb5f5..3d8d73e3a3 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-mention-tokens.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
-import type { useMentionMenu } from './use-mention-menu'
+import type { useMentionMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 interface UseMentionTokensProps {
   /** Current message text */
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-textarea-auto-resize.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-textarea-auto-resize.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-textarea-auto-resize.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-textarea-auto-resize.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/user-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/user-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
index 1615d5e504..f44d084b04 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
@@ -16,16 +16,14 @@ import { Textarea } from '@/components/ui'
 import { useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
 import {
   AttachedFilesDisplay,
   ContextPills,
   MentionMenu,
   ModelSelector,
   ModeSelector,
-} from './components'
-import { NEAR_TOP_THRESHOLD } from './constants'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/components'
+import { NEAR_TOP_THRESHOLD } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/constants'
 import {
   useContextManagement,
   useFileAttachments,
@@ -35,8 +33,10 @@ import {
   useMentionMenu,
   useMentionTokens,
   useTextareaAutoResize,
-} from './hooks'
-import type { MessageFileAttachment } from './hooks/use-file-attachments'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks'
+import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 const logger = createLogger('CopilotUserInput')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/utils.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/utils.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/welcome/welcome.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/welcome.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/welcome/welcome.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/welcome/welcome.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/copilot.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/copilot.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/copilot.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/copilot.tsx
index cfb6f009ed..4522fa8f06 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/copilot.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/copilot.tsx
@@ -19,18 +19,18 @@ import {
   TodoList,
   UserInput,
   Welcome,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components'
-import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/hooks/use-file-attachments'
-import type { UserInputRef } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/components/user-input/user-input'
-import { useScrollManagement } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components'
+import type { MessageFileAttachment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-file-attachments'
+import type { UserInputRef } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input'
 import {
   useChatHistory,
   useCopilotInitialization,
   useLandingPrompt,
   useTodoManagement,
-} from './hooks'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks'
+import { useScrollManagement } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 const logger = createLogger('Copilot')
 
@@ -50,6 +50,8 @@ interface CopilotRef {
   createNewChat: () => void
   /** Sets the input value and focuses the textarea */
   setInputValueAndFocus: (value: string) => void
+  /** Focuses the copilot user input without changing its value */
+  focusInput: () => void
 }
 
 /**
@@ -231,8 +233,9 @@ export const Copilot = forwardRef<CopilotRef, CopilotProps>(({ panelWidth }, ref
     () => ({
       createNewChat: handleStartNewChat,
       setInputValueAndFocus: handleSetInputValueAndFocus,
+      focusInput,
     }),
-    [handleStartNewChat, handleSetInputValueAndFocus]
+    [handleStartNewChat, handleSetInputValueAndFocus, focusInput]
   )
 
   /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-chat-history.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-chat-history.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-chat-history.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-chat-history.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-copilot-initialization.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-copilot-initialization.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-copilot-initialization.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-landing-prompt.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-landing-prompt.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-landing-prompt.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-landing-prompt.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-todo-management.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-todo-management.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/copilot/hooks/use-todo-management.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/hooks/use-todo-management.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/api-endpoint/api-endpoint.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/api-endpoint.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/api-endpoint/api-endpoint.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/api-endpoint.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/auth-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/auth-selector.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/auth-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/auth-selector.tsx
index bc17be6f04..1bd5d72c26 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/auth-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/auth-selector.tsx
@@ -5,7 +5,7 @@ import { Trash } from '@/components/emcn/icons/trash'
 import { Card, CardContent } from '@/components/ui'
 import { getEnv, isTruthy } from '@/lib/env'
 import { cn, generatePassword } from '@/lib/utils'
-import type { AuthType } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-form'
+import type { AuthType } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-form'
 
 interface AuthSelectorProps {
   authType: AuthType
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/chat-deploy.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat-deploy.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/chat-deploy.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat-deploy.tsx
index ce46f7250e..1ed663db4c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/chat-deploy.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat-deploy.tsx
@@ -18,11 +18,11 @@ import { Alert, AlertDescription, Skeleton } from '@/components/ui'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getEmailDomain } from '@/lib/urls/utils'
 import { OutputSelect } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/chat/components/output-select/output-select'
-import { AuthSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/auth-selector'
-import { IdentifierInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/identifier-input'
-import { SuccessView } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/success-view'
-import { useChatDeployment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-deployment'
-import { useChatForm } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-form'
+import { AuthSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/auth-selector'
+import { IdentifierInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/identifier-input'
+import { SuccessView } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/success-view'
+import { useChatDeployment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-deployment'
+import { useChatForm } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-form'
 
 const logger = createLogger('ChatDeploy')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/deploy-status/deploy-status.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deploy-status.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/deploy-status/deploy-status.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deploy-status.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-card.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-card.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-card.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-card.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-modal.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-modal.tsx
index dfb83673a7..ba0beba9cc 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-modal.tsx
@@ -15,7 +15,7 @@ import {
 } from '@/components/ui/alert-dialog'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
 import { createLogger } from '@/lib/logs/console/logger'
-import { DeployedWorkflowCard } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-card'
+import { DeployedWorkflowCard } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-card'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/deployment-info.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployment-info.tsx
similarity index 91%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/deployment-info.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployment-info.tsx
index 9bbee0895f..a5daf5d2c3 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/deployment-info.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployment-info.tsx
@@ -12,12 +12,10 @@ import {
   ModalTitle,
 } from '@/components/emcn'
 import { Skeleton } from '@/components/ui'
-import {
-  ApiEndpoint,
-  DeployStatus,
-  ExampleCommand,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components'
-import { DeployedWorkflowModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal'
+import { ApiEndpoint } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/api-endpoint'
+import { DeployStatus } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deploy-status'
+import { DeployedWorkflowModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-modal'
+import { ExampleCommand } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/example-command'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 interface WorkflowDeploymentInfo {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/example-command/example-command.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/example-command.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/example-command/example-command.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/example-command.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/identifier-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/identifier-input.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/identifier-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/identifier-input.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/success-view.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/success-view.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/components/success-view.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/success-view.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template-deploy.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/template-deploy/template-deploy.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template-deploy.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/deploy-modal.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index f2b6b68606..03884bc9e5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -15,12 +15,10 @@ import { getEnv } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { WorkflowDeploymentVersionResponse } from '@/lib/workflows/db-helpers'
 import { resolveStartCandidates, StartBlockPath } from '@/lib/workflows/triggers'
-import {
-  DeploymentInfo,
-  TemplateDeploy,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components'
-import { ChatDeploy } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/chat-deploy'
-import { DeployedWorkflowModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal'
+import { ChatDeploy } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat-deploy'
+import { DeployedWorkflowModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployed-workflow-modal'
+import { DeploymentInfo } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/deployment-info'
+import { TemplateDeploy } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template-deploy'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/deploy.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/deploy.tsx
similarity index 94%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/deploy.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/deploy.tsx
index 8ddd9424b4..e76ea18fe2 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/deploy.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/deploy.tsx
@@ -3,11 +3,15 @@
 import { useCallback, useState } from 'react'
 import { Loader2 } from 'lucide-react'
 import { Button, Rocket, Tooltip } from '@/components/emcn'
-import { DeployModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components'
+import { DeployModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal'
+import {
+  useChangeDetection,
+  useDeployedState,
+  useDeployment,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow'
 import type { WorkspaceUserPermissions } from '@/hooks/use-user-permissions'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useChangeDetection, useDeployedState, useDeployment } from './hooks'
 
 interface DeployProps {
   activeWorkflowId: string | null
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-deployment.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-deployment.ts
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-deployment.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-deployment.ts
index b99486a9c2..321110c491 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-deployment.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-deployment.ts
@@ -1,7 +1,7 @@
 import { useCallback, useState } from 'react'
 import { z } from 'zod'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { ChatFormData } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-form'
+import type { ChatFormData } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-form'
 import type { OutputConfig } from '@/stores/chat/store'
 
 const logger = createLogger('ChatDeployment')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-form.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-form.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-chat-form.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/hooks/use-chat-form.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-change-detection.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-change-detection.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-change-detection.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-deployed-state.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployed-state.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-deployed-state.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployed-state.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-deployment.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/hooks/use-deployment.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/deploy/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/field-item/field-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/field-item/field-item.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item.tsx
index d650efefe2..1f0276ed7b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/field-item/field-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item.tsx
@@ -5,7 +5,7 @@ import clsx from 'clsx'
 import { ChevronDown } from 'lucide-react'
 import { Badge } from '@/components/emcn'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { ConnectedBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-block-connections'
+import type { ConnectedBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections'
 
 const logger = createLogger('FieldItem')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/connection-blocks.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/connection-blocks.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/connection-blocks.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/connection-blocks.tsx
index 37faa03ef2..1b5920553d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/connection-blocks.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/connection-blocks.tsx
@@ -5,13 +5,17 @@ import clsx from 'clsx'
 import { ChevronDown, RepeatIcon, SplitIcon } from 'lucide-react'
 import { shallow } from 'zustand/shallow'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { ConnectedBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-block-connections'
+import {
+  FieldItem,
+  type SchemaField,
+  TREE_SPACING,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item'
+import type { ConnectedBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections'
 import { useBlockOutputFields } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields'
 import { getBlock } from '@/blocks/registry'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import { FieldItem, type SchemaField, TREE_SPACING } from './components/field-item/field-item'
 
 const logger = createLogger('ConnectionBlocks')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx
similarity index 90%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx
index 95d566f911..63e097a2e0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/channel-selector/channel-selector-input.tsx
@@ -3,10 +3,10 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext } from '@/hooks/selectors/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx
index 47264ca249..407b48388e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/checkbox-list/checkbox-list.tsx
@@ -1,6 +1,6 @@
 import { Checkbox } from '@/components/ui/checkbox'
 import { Label } from '@/components/ui/label'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 
 interface CheckboxListProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/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
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/code/code.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
index 786de33f2f..b18ca98c58 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/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
@@ -24,13 +24,13 @@ import {
 import {
   checkEnvVarTrigger,
   EnvVarDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
-import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
+import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
 import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/wand-prompt-bar/wand-prompt-bar'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/combobox/combobox.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/combobox/combobox.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
index 54ddbb347a..a8e68f47d4 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/combobox/combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
@@ -2,9 +2,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useReactFlow } from 'reactflow'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/condition-input/condition-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/condition-input/condition-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
index 96014130c2..b44f7ccc21 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/condition-input/condition-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -24,12 +24,12 @@ import {
 import {
   checkEnvVarTrigger,
   EnvVarDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/use-tag-selection'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
index 437dccf75f..b275cb0dfe 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
@@ -12,8 +12,8 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { OAuthRequiredModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { OAuthRequiredModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useOAuthCredentialDetail, useOAuthCredentials } from '@/hooks/queries/oauth-credentials'
 import { getMissingRequiredScopes } from '@/hooks/use-oauth-scope-status'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-selector/document-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
similarity index 87%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-selector/document-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
index 84be85bf9f..938b45029e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-selector/document-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
@@ -2,9 +2,9 @@
 
 import { useCallback, useMemo } from 'react'
 import { Tooltip } from '@/components/emcn'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext } from '@/hooks/selectors/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
index 593344dacb..f6b7d2a35a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
@@ -7,10 +7,10 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { MAX_TAG_SLOTS } from '@/lib/knowledge/consts'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/use-knowledge-base-tag-definitions'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/dropdown/dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/dropdown/dropdown.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
index 381ae3c819..5b4c25b716 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/dropdown/dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Badge } from '@/components/emcn'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { ResponseBlockHandler } from '@/executor/handlers/response/response-handler'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/eval-input/eval-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/eval-input/eval-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
index 8f43563dd9..7affdd17dd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/eval-input/eval-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/eval-input/eval-input.tsx
@@ -7,10 +7,10 @@ import { Textarea } from '@/components/emcn/components/textarea/textarea'
 import { Trash } from '@/components/emcn/icons/trash'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 
 interface EvalMetric {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
similarity index 91%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
index 966bbe1f92..14cb4a7fdd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
@@ -3,10 +3,10 @@
 import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock, type SelectorResolution } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-upload/file-upload.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/file-upload/file-upload.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
similarity index 89%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
index 8f53e07a4e..a3d8beb8fe 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
@@ -1,10 +1,10 @@
 'use client'
 
 import { useCallback, useEffect, useMemo, useState } from 'react'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx
index 0762daab39..0b0d382e08 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/grouped-checkbox-list/grouped-checkbox-list.tsx
@@ -11,7 +11,7 @@ import {
   DialogTitle,
   DialogTrigger,
 } from '@/components/ui/dialog'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 
 interface GroupedCheckboxListProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
index ceeddd7099..94ee807068 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
@@ -3,10 +3,10 @@ import { Badge } from '@/components/emcn'
 import { Input } from '@/components/emcn/components/input/input'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx
index 31b4d4b48b..f05b3c8a5d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx
@@ -6,7 +6,7 @@ import { X } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components/combobox/combobox'
 import { PackageSearchIcon } from '@/components/icons'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { fetchKnowledgeBase, knowledgeKeys } from '@/hooks/queries/knowledge'
 import { useKnowledgeBasesList } from '@/hooks/use-knowledge'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
index 062327cee9..dec77c5ad8 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
@@ -6,11 +6,11 @@ import { Trash } from '@/components/emcn/icons/trash'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/use-knowledge-base-tag-definitions'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/long-input/long-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/long-input/long-input.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/long-input/long-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/long-input/long-input.tsx
index fbc57c897f..1ae3e3590b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/long-input/long-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/long-input/long-input.tsx
@@ -12,11 +12,11 @@ import { Textarea } from '@/components/emcn'
 import { Button } from '@/components/ui/button'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
-import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
+import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
 import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/wand-prompt-bar/wand-prompt-bar'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
index 1ac63dc2af..33707f2d0c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
@@ -5,12 +5,12 @@ import { Slider } from '@/components/ui/slider'
 import { Switch } from '@/components/ui/switch'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useMcpTools } from '@/hooks/use-mcp-tools'
 import { formatParameterLabel } from '@/tools/params'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx
index c3ea65cc6a..a177f5c4bd 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-server-selector.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Combobox } from '@/components/emcn/components'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useMcpServers } from '@/hooks/queries/mcp'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
index 1da2c589e1..1605b4f9ba 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
@@ -3,7 +3,7 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Combobox } from '@/components/emcn/components'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useMcpTools } from '@/hooks/use-mcp-tools'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/messages-input/messages-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/messages-input/messages-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
index 5b0ebceaaf..67ca40be54 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/messages-input/messages-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
@@ -3,11 +3,11 @@ import { ChevronDown, ChevronsUpDown, ChevronUp, Plus } from 'lucide-react'
 import { Button, Popover, PopoverContent, PopoverItem, PopoverTrigger } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
 import { cn } from '@/lib/utils'
-import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
similarity index 92%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
index 25f16e2f14..8e9ebcd344 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
@@ -3,10 +3,10 @@
 import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/response/response-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/response/response-format.tsx
similarity index 81%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/response/response-format.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/response/response-format.tsx
index 5072219e68..76086cd12c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/response/response-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/response/response-format.tsx
@@ -1,4 +1,4 @@
-import { ResponseFormat as SharedResponseFormat } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/starter/input-format'
+import { ResponseFormat as SharedResponseFormat } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format'
 
 interface ResponseFormatProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/schedule-save/schedule-save.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/schedule-save/schedule-save.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/schedule-save/schedule-save.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/schedule-save/schedule-save.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
index 6d662ca34f..f72930bdc6 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox.tsx
@@ -1,8 +1,8 @@
 import type React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Combobox as EditableCombobox } from '@/components/emcn/components'
-import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'
 import {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/short-input/short-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/short-input/short-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
index 6a181eecc0..f917cc0eea 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/short-input/short-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
@@ -4,10 +4,10 @@ import { useReactFlow } from 'reactflow'
 import { Input } from '@/components/emcn/components/input/input'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
-import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { SubBlockInputController } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
+import type { WandControlHandlers } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
 import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/wand-prompt-bar/wand-prompt-bar'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/slider-input/slider-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slider-input/slider-input.tsx
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/slider-input/slider-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slider-input/slider-input.tsx
index 182f0fd163..55ece6903c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/slider-input/slider-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slider-input/slider-input.tsx
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { Slider } from '@/components/ui/slider'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 
 interface SliderInputProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/starter/input-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/starter/input-format.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
index ad1e3671c5..3420d6a62b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/starter/input-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
@@ -14,10 +14,10 @@ import {
 import type { ComboboxOption } from '@/components/emcn/components/combobox/combobox'
 import { Label } from '@/components/ui/label'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 
 interface Field {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-dropdowns.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-dropdowns.tsx
similarity index 94%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-dropdowns.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-dropdowns.tsx
index d1473321f2..23ba0c2d3a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-dropdowns.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-dropdowns.tsx
@@ -1,5 +1,5 @@
-import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 
 /**
  * Props for the SubBlockDropdowns component.
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller.tsx
similarity index 93%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller.tsx
index f845720b5b..d6dae9da1b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/sub-block-input-controller.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sub-block-input-controller.tsx
@@ -1,7 +1,7 @@
 import type React from 'react'
-import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useTagSelection } from '@/hooks/use-tag-selection'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/switch/switch.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/switch/switch.tsx
similarity index 93%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/switch/switch.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/switch/switch.tsx
index 57df1a21ee..b93b345e1c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/switch/switch.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/switch/switch.tsx
@@ -1,6 +1,6 @@
 import { Label } from '@/components/ui/label'
 import { Switch as UISwitch } from '@/components/ui/switch'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 
 interface SwitchProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/table/table.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
similarity index 95%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/table/table.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
index 92e8a5113d..a5e3ff5a63 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/table/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/table/table.tsx
@@ -5,11 +5,11 @@ import { Trash } from '@/components/emcn/icons/trash'
 import { Input } from '@/components/ui/input'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
-import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 
 const logger = createLogger('Table')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
index aa42ccd76d..8098fd419e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -16,6 +16,12 @@ import { extractFieldsFromSchema, parseResponseFormatSafely } from '@/lib/respon
 import { cn } from '@/lib/utils'
 import { getBlockOutputPaths, getBlockOutputType } from '@/lib/workflows/block-outputs'
 import { TRIGGER_TYPES } from '@/lib/workflows/triggers'
+import { KeyboardNavigationHandler } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler'
+import type {
+  BlockTagGroup,
+  NestedBlockTagGroup,
+  NestedTag,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { getBlock } from '@/blocks'
 import type { BlockConfig } from '@/blocks/types'
@@ -26,8 +32,6 @@ import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 import { getTool } from '@/tools/utils'
-import { KeyboardNavigationHandler } from './components/keyboard-navigation-handler'
-import type { BlockTagGroup, NestedBlockTagGroup, NestedTag } from './types'
 
 const logger = createLogger('TagDropdown')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/types.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/types.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/text/text.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/text/text.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/text/text.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/time-input/time-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/time-input/time-input.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/time-input/time-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/time-input/time-input.tsx
index 23a996bb26..764f189d23 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/time-input/time-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/time-input/time-input.tsx
@@ -3,7 +3,7 @@
 import * as React from 'react'
 import { Button, Input, Popover, PopoverContent, PopoverTrigger } from '@/components/emcn'
 import { cn } from '@/lib/utils'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 
 interface TimeInputProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
index 0219f575b1..b2d5b11186 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal.tsx
@@ -32,12 +32,12 @@ import { cn } from '@/lib/utils'
 import {
   checkEnvVarTrigger,
   EnvVarDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { CodeEditor } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { CodeEditor } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/code-editor/code-editor'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
 import {
   useCreateCustomTool,
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx
similarity index 92%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx
index 18906eb76d..e3a25fc6d1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list.tsx
@@ -1,6 +1,6 @@
 import type React from 'react'
 import { PopoverSection } from '@/components/emcn'
-import { ToolCommand } from './tool-command/tool-command'
+import { ToolCommand } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command'
 
 const IconComponent = ({ icon: Icon, className }: { icon: any; className?: string }) => {
   if (!Icon) return null
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
index 7dfa814568..7e369cd4b5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector.tsx
@@ -18,7 +18,7 @@ import {
   type OAuthService,
   parseProvider,
 } from '@/lib/oauth'
-import { OAuthRequiredModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal'
+import { OAuthRequiredModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal'
 import { useOAuthCredentialDetail, useOAuthCredentials } from '@/hooks/queries/oauth-credentials'
 import { getMissingRequiredScopes } from '@/hooks/use-oauth-scope-status'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 845112ad3e..a6c21e544c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -40,15 +40,15 @@ import {
   SliderInput,
   Table,
   TimeInput,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
 import {
   type CustomTool,
   CustomToolModal,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal'
-import { McpToolsList } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list'
-import { ToolCommand } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command'
-import { ToolCredentialSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal'
+import { McpToolsList } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/mcp-tools-list'
+import { ToolCommand } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-command/tool-command'
+import { ToolCredentialSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tool-credential-selector'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { getAllBlocks } from '@/blocks'
 import { useCustomTools } from '@/hooks/queries/custom-tools'
 import { useMcpTools } from '@/hooks/use-mcp-tools'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/trigger-save/trigger-save.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/variables-input/variables-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/variables-input/variables-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
index 9113a437bb..48e07c76db 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/variables-input/variables-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/variables-input/variables-input.tsx
@@ -6,12 +6,12 @@ import { Trash } from '@/components/emcn/icons/trash'
 import { Label } from '@/components/ui/label'
 import { Textarea } from '@/components/ui/textarea'
 import { cn } from '@/lib/utils'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import {
   checkTagTrigger,
   TagDropdown,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import type { Variable } from '@/stores/panel/variables/types'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts
index f9ebcb8d08..a29efea49b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-dropdowns.ts
@@ -1,7 +1,7 @@
 import { useCallback, useRef, useState } from 'react'
 import { useParams } from 'next/navigation'
-import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useTagSelection } from '@/hooks/use-tag-selection'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input.ts
index 141296ecf6..2b116f7448 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-input.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { createLogger } from '@/lib/logs/console/logger'
-import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useTagSelection } from '@/hooks/use-tag-selection'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
index cc2b241b8e..80c125f233 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/sub-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
@@ -4,8 +4,6 @@ import { Label, Tooltip } from '@/components/emcn/components'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import type { FieldDiffStatus } from '@/lib/workflows/diff/types'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import type { SubBlockConfig } from '@/blocks/types'
 import {
   ChannelSelectorInput,
   CheckboxList,
@@ -42,7 +40,9 @@ import {
   ToolInput,
   TriggerSave,
   VariablesInput,
-} from './components'
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import type { SubBlockConfig } from '@/blocks/types'
 
 /**
  * Interface for wand control handlers exposed by sub-block inputs
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/subflow-editor/subflow-editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/subflow-editor/subflow-editor.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/subflow-editor/subflow-editor.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/subflow-editor/subflow-editor.tsx
index 52964594be..73aa68867c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/subflow-editor/subflow-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/subflow-editor/subflow-editor.tsx
@@ -3,7 +3,7 @@
 import { ChevronUp } from 'lucide-react'
 import SimpleCodeEditor from 'react-simple-code-editor'
 import { Code as CodeEditor, Combobox, getCodeEditorProps, Input, Label } from '@/components/emcn'
-import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 import type { ConnectedBlock } from '../../hooks/use-block-connections'
 import { useSubflowEditor } from '../../hooks/use-subflow-editor'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/editor.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
index 5d32d3305e..5834b49ab0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
@@ -4,21 +4,25 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { BookOpen, Check, ChevronUp, Pencil, RepeatIcon, Settings, SplitIcon } from 'lucide-react'
 import { Button, Tooltip } from '@/components/emcn'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import {
+  ConnectionBlocks,
+  SubBlock,
+  SubflowEditor,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components'
+import {
+  useBlockConnections,
+  useConnectionsResize,
+  useEditorBlockProperties,
+  useEditorSubblockLayout,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks'
 import { getSubBlockStableKey } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import { getBlock } from '@/blocks/registry'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useFocusOnBlock } from '@/hooks/use-focus-on-block'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { ConnectionBlocks, SubBlock, SubflowEditor } from './components'
-import {
-  useBlockConnections,
-  useConnectionsResize,
-  useEditorBlockProperties,
-  useEditorSubblockLayout,
-} from './hooks'
 
 /**
  * Icon component for rendering block icons.
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-block-connections.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-block-connections.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-connections-resize.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
similarity index 97%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-connections-resize.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
index b62860e182..4bafb1a926 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-connections-resize.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 
 /**
  * Minimum height for the connections section (header only)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-editor-block-properties.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-editor-block-properties.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-editor-subblock-layout.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-editor-subblock-layout.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-subflow-editor.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
similarity index 99%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-subflow-editor.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
index 96516bcc7f..cecc220ffa 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-subflow-editor.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
@@ -5,7 +5,7 @@ import {
   SYSTEM_REFERENCE_PREFIXES,
   splitReferenceSegment,
 } from '@/lib/workflows/references'
-import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
+import { checkTagTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/index.ts
index de111fd6b5..e661875717 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/index.ts
@@ -1,4 +1,5 @@
-export { Chat } from '../../chat/chat'
-export { Copilot } from '../../panel-new/components/copilot/copilot'
-export { Console } from './console/console'
-export { Variables } from './variables/variables'
+export { Copilot } from './copilot/copilot'
+export { Deploy } from './deploy/deploy'
+export { Editor } from './editor/editor'
+export { Toolbar } from './toolbar/toolbar'
+export { WorkflowControls } from './workflow-controls/workflow-controls'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/sub-block/components/file-selector/file-selector-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/sub-block/components/file-selector/file-selector-input.tsx
similarity index 94%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/sub-block/components/file-selector/file-selector-input.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/sub-block/components/file-selector/file-selector-input.tsx
index c5961ce468..a3cd4bfb6c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/sub-block/components/file-selector/file-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/sub-block/components/file-selector/file-selector-input.tsx
@@ -3,10 +3,10 @@
 import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip } from '@/components/emcn'
-import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
-import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-depends-on-gate'
-import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
+import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/components/drag-preview.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/components/drag-preview.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/drag-preview.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/components/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/components/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/components/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/use-toolbar-item-interactions.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/use-toolbar-item-interactions.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/use-toolbar-item-interactions.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/use-toolbar-item-interactions.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/use-toolbar-resize.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/use-toolbar-resize.ts
similarity index 98%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/use-toolbar-resize.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/use-toolbar-resize.ts
index d1d58f3ca8..fa9b57cac5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/hooks/use-toolbar-resize.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks/use-toolbar-resize.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { useToolbarStore } from '@/stores/panel-new/toolbar/store'
+import { useToolbarStore } from '@/stores/panel/toolbar/store'
 
 /**
  * Minimum height for the blocks section (in pixels)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/toolbar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
similarity index 68%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/toolbar.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
index 5c1f0f12f7..1b4269c3a2 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/toolbar/toolbar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
@@ -1,6 +1,14 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
 import clsx from 'clsx'
 import { Search } from 'lucide-react'
 import { Button } from '@/components/emcn'
@@ -9,11 +17,15 @@ import {
   getTriggersForSidebar,
   hasTriggerCapability,
 } from '@/lib/workflows/trigger-utils'
+import {
+  calculateTriggerHeights,
+  useToolbarItemInteractions,
+  useToolbarResize,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/hooks'
 import { LoopTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/loop/loop-config'
 import { ParallelTool } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/parallel/parallel-config'
 import type { BlockConfig } from '@/blocks/types'
-import { useToolbarStore } from '@/stores/panel-new/toolbar/store'
-import { calculateTriggerHeights, useToolbarItemInteractions, useToolbarResize } from './hooks'
+import { useToolbarStore } from '@/stores/panel/toolbar/store'
 
 interface BlockItem {
   name: string
@@ -122,6 +134,16 @@ interface ToolbarProps {
   isActive?: boolean
 }
 
+/**
+ * Imperative handle exposed by the Toolbar component.
+ */
+export interface ToolbarRef {
+  /**
+   * Focuses the search input and ensures search mode is active.
+   */
+  focusSearch: () => void
+}
+
 /**
  * Toolbar component displaying triggers and blocks in a resizable split view.
  * Top half shows triggers, bottom half shows blocks, with a resizable divider between them.
@@ -136,12 +158,18 @@ interface ToolbarProps {
  */
 const TRIGGERS_MIN_THRESHOLD = 50
 
-export function Toolbar({ isActive = true }: ToolbarProps) {
+export const Toolbar = forwardRef<ToolbarRef, ToolbarProps>(function Toolbar(
+  { isActive = true }: ToolbarProps,
+  ref
+) {
+  const rootRef = useRef<HTMLDivElement>(null)
   const containerRef = useRef<HTMLDivElement>(null)
   const triggersContentRef = useRef<HTMLDivElement>(null)
   const triggersHeaderRef = useRef<HTMLDivElement>(null)
   const blocksHeaderRef = useRef<HTMLDivElement>(null)
   const searchInputRef = useRef<HTMLInputElement>(null)
+  const triggerItemRefs = useRef<Array<HTMLDivElement | null>>([])
+  const blockItemRefs = useRef<Array<HTMLDivElement | null>>([])
 
   // Search state
   const [isSearchActive, setIsSearchActive] = useState(false)
@@ -259,12 +287,30 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
   }
 
   /**
-   * Handle search input blur - deactivate search mode if empty
+   * Expose imperative handle for focusing the search input.
+   */
+  useImperativeHandle(
+    ref,
+    () => ({
+      focusSearch: () => {
+        setIsSearchActive(true)
+        setTimeout(() => {
+          searchInputRef.current?.focus()
+        }, 0)
+      },
+    }),
+    []
+  )
+
+  /**
+   * Handle search input blur.
+   *
+   * We intentionally keep search mode active after blur so that ArrowUp/Down
+   * navigation continues to work after the first move from the search input
+   * into the triggers/blocks list (e.g. when initiated via Mod+F).
    */
   const handleSearchBlur = () => {
-    if (!searchQuery.trim()) {
-      setIsSearchActive(false)
-    }
+    // No-op by design
   }
 
   /**
@@ -292,8 +338,154 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
     setIsToggling(false)
   }, [])
 
+  /**
+   * Handle keyboard navigation with ArrowUp / ArrowDown when the toolbar tab
+   * is active and search is open (e.g. after Mod+F). Navigation order:
+   * - From search input or no current focus: first trigger, then subsequent triggers
+   * - After the last trigger: first block
+   * - Within blocks: linear navigation
+   * - ArrowUp from first trigger: moves focus back to search input
+   *
+   * This is designed to work seamlessly when the toolbar is opened via the
+   * Mod+F shortcut, and to take precedence over other global ArrowUp/Down
+   * handlers (e.g. terminal navigation) while the toolbar tab is active.
+   */
+  useEffect(() => {
+    if (!isActive || !isSearchActive) {
+      return
+    }
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
+        return
+      }
+
+      const activeEl = document.activeElement as HTMLElement | null
+
+      // Only handle navigation when focus is currently inside the toolbar UI
+      const toolbarRoot = rootRef.current
+      if (!toolbarRoot || !activeEl || !toolbarRoot.contains(activeEl)) {
+        return
+      }
+
+      const triggers = triggerItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
+      const blocks = blockItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
+
+      type Region = 'search' | 'trigger' | 'block' | 'none'
+      let region: Region = 'none'
+      let index = -1
+
+      if (activeEl && searchInputRef.current && activeEl === searchInputRef.current) {
+        region = 'search'
+      } else if (activeEl) {
+        const triggerIndex = triggers.findIndex((el) => el === activeEl || el.contains(activeEl))
+        if (triggerIndex !== -1) {
+          region = 'trigger'
+          index = triggerIndex
+        } else {
+          const blockIndex = blocks.findIndex((el) => el === activeEl || el.contains(activeEl))
+          if (blockIndex !== -1) {
+            region = 'block'
+            index = blockIndex
+          }
+        }
+      }
+
+      const focusTrigger = (i: number) => {
+        const el = triggers[i]
+        if (el) {
+          event.preventDefault()
+          event.stopPropagation()
+          el.focus()
+        }
+      }
+
+      const focusBlock = (i: number) => {
+        const el = blocks[i]
+        if (el) {
+          event.preventDefault()
+          event.stopPropagation()
+          el.focus()
+        }
+      }
+
+      const focusSearchInput = () => {
+        if (searchInputRef.current) {
+          event.preventDefault()
+          event.stopPropagation()
+          searchInputRef.current.focus()
+        }
+      }
+
+      if (event.key === 'ArrowDown') {
+        if (region === 'none' || region === 'search') {
+          if (triggers.length > 0) {
+            focusTrigger(0)
+            return
+          }
+          if (blocks.length > 0) {
+            focusBlock(0)
+          }
+          return
+        }
+
+        if (region === 'trigger') {
+          if (index < triggers.length - 1) {
+            focusTrigger(index + 1)
+            return
+          }
+          if (index === triggers.length - 1 && blocks.length > 0) {
+            focusBlock(0)
+          }
+          return
+        }
+
+        if (region === 'block') {
+          if (index < blocks.length - 1) {
+            focusBlock(index + 1)
+          }
+          return
+        }
+      } else if (event.key === 'ArrowUp') {
+        if (region === 'block') {
+          if (index > 0) {
+            focusBlock(index - 1)
+            return
+          }
+          if (index === 0 && triggers.length > 0) {
+            focusTrigger(triggers.length - 1)
+          }
+          return
+        }
+
+        if (region === 'trigger') {
+          if (index > 0) {
+            focusTrigger(index - 1)
+            return
+          }
+          if (index === 0) {
+            focusSearchInput()
+          }
+          return
+        }
+
+        if (region === 'none' || region === 'search') {
+          return
+        }
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [isActive, isSearchActive])
+
   return (
-    <div className='flex h-full flex-col'>
+    <div
+      ref={rootRef}
+      data-toolbar-root
+      data-search-active={isSearchActive ? 'true' : 'false'}
+      className='flex h-full flex-col'
+    >
       {/* Header */}
       <div
         className='flex flex-shrink-0 cursor-pointer items-center justify-between rounded-[4px] bg-[#2A2A2A] px-[12px] py-[8px] dark:bg-[#2A2A2A]'
@@ -343,12 +535,16 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
           </div>
           <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
             <div ref={triggersContentRef} className='space-y-[4px] pb-[8px]'>
-              {filteredTriggers.map((trigger) => {
+              {filteredTriggers.map((trigger, index) => {
                 const Icon = trigger.icon
                 const isTriggerCapable = hasTriggerCapability(trigger)
                 return (
                   <div
+                    ref={(el) => {
+                      triggerItemRefs.current[index] = el
+                    }}
                     key={trigger.type}
+                    tabIndex={-1}
                     draggable
                     onDragStart={(e) => {
                       const iconElement = e.currentTarget.querySelector('.toolbar-item-icon')
@@ -361,8 +557,16 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
                     onClick={() => handleItemClick(trigger.type, isTriggerCapable)}
                     className={clsx(
                       'group flex h-[25px] items-center gap-[8px] rounded-[8px] px-[5px] text-[14px]',
-                      'cursor-pointer hover:bg-[var(--border)] active:cursor-grabbing dark:hover:bg-[var(--border)]'
+                      'cursor-pointer hover:bg-[var(--border)] active:cursor-grabbing dark:hover:bg-[var(--border)]',
+                      'focus-visible:bg-[var(--border)] focus-visible:outline-none dark:focus-visible:bg-[var(--border)]'
                     )}
+                    onKeyDown={(event) => {
+                      if (event.key === 'Enter') {
+                        event.preventDefault()
+                        event.stopPropagation()
+                        handleItemClick(trigger.type, isTriggerCapable)
+                      }
+                    }}
                   >
                     <div
                       className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
@@ -381,7 +585,8 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
                     <span
                       className={clsx(
                         'truncate font-medium',
-                        'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)] dark:text-[var(--text-tertiary)] dark:group-hover:text-[var(--text-primary)]'
+                        'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)] dark:text-[var(--text-tertiary)] dark:group-hover:text-[var(--text-primary)]',
+                        'group-focus-visible:text-[var(--text-primary)] dark:group-focus-visible:text-[var(--text-primary)]'
                       )}
                     >
                       {trigger.name}
@@ -412,11 +617,15 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
           </div>
           <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
             <div className='space-y-[4px] pb-[8px]'>
-              {filteredBlocks.map((block) => {
+              {filteredBlocks.map((block, index) => {
                 const Icon = block.icon
                 return (
                   <div
+                    ref={(el) => {
+                      blockItemRefs.current[index] = el
+                    }}
                     key={block.type}
+                    tabIndex={-1}
                     draggable
                     onDragStart={(e) => {
                       // Mark subflow drag explicitly so canvas can reliably detect and suppress highlight
@@ -437,8 +646,16 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
                     onClick={() => handleItemClick(block.type, false)}
                     className={clsx(
                       'group flex h-[25px] items-center gap-[8px] rounded-[8px] px-[5.5px] text-[14px]',
-                      'cursor-pointer hover:bg-[var(--border)] active:cursor-grabbing dark:hover:bg-[var(--border)]'
+                      'cursor-pointer hover:bg-[var(--border)] active:cursor-grabbing dark:hover:bg-[var(--border)]',
+                      'focus-visible:bg-[var(--border)] focus-visible:outline-none dark:focus-visible:bg-[var(--border)]'
                     )}
+                    onKeyDown={(event) => {
+                      if (event.key === 'Enter') {
+                        event.preventDefault()
+                        event.stopPropagation()
+                        handleItemClick(block.type, false)
+                      }
+                    }}
                   >
                     <div
                       className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
@@ -457,7 +674,8 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
                     <span
                       className={clsx(
                         'truncate font-medium',
-                        'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)] dark:text-[var(--text-tertiary)] dark:group-hover:text-[var(--text-primary)]'
+                        'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)] dark:text-[var(--text-tertiary)] dark:group-hover:text-[var(--text-primary)]',
+                        'group-focus-visible:text-[var(--text-primary)] dark:group-focus-visible:text-[var(--text-primary)]'
                       )}
                     >
                       {block.name}
@@ -471,4 +689,4 @@ export function Toolbar({ isActive = true }: ToolbarProps) {
       </div>
     </div>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/variables/variables.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/variables/variables.tsx
deleted file mode 100644
index 8bd192322b..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/variables/variables.tsx
+++ /dev/null
@@ -1,443 +0,0 @@
-'use client'
-
-import { useEffect, useRef, useState } from 'react'
-import {
-  AlertTriangle,
-  ChevronDown,
-  Copy,
-  Maximize2,
-  Minimize2,
-  MoreVertical,
-  Plus,
-  Trash,
-} from 'lucide-react'
-import Editor from 'react-simple-code-editor'
-import { highlight, languages, Tooltip } from '@/components/emcn'
-import {
-  Button,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-  Input,
-  ScrollArea,
-} from '@/components/ui'
-import { createLogger } from '@/lib/logs/console/logger'
-import { cn, validateName } from '@/lib/utils'
-import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
-import { useVariablesStore } from '@/stores/panel/variables/store'
-import type { Variable, VariableType } from '@/stores/panel/variables/types'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-
-const logger = createLogger('Variables')
-
-const TYPE_CONFIG: Record<VariableType, { icon: string; placeholder: string }> = {
-  plain: { icon: 'Abc', placeholder: 'Plain text value' },
-  number: { icon: '123', placeholder: '42' },
-  boolean: { icon: '0/1', placeholder: 'true' },
-  object: { icon: '{}', placeholder: '{\n  "key": "value"\n}' },
-  array: { icon: '[]', placeholder: '[\n  1,\n  2,\n  3\n]' },
-  string: { icon: 'Abc', placeholder: 'Plain text value' },
-}
-
-const VARIABLE_TYPES: Exclude<VariableType, 'string'>[] = [
-  'plain',
-  'number',
-  'boolean',
-  'object',
-  'array',
-]
-
-export function Variables() {
-  const { activeWorkflowId } = useWorkflowRegistry()
-  const { getVariablesByWorkflowId } = useVariablesStore()
-  const {
-    collaborativeUpdateVariable,
-    collaborativeAddVariable,
-    collaborativeDeleteVariable,
-    collaborativeDuplicateVariable,
-  } = useCollaborativeWorkflow()
-
-  const workflowVariables = activeWorkflowId ? getVariablesByWorkflowId(activeWorkflowId) : []
-  const editorRefs = useRef<Record<string, HTMLDivElement | null>>({})
-  const [collapsedById, setCollapsedById] = useState<Record<string, boolean>>({})
-  const [localNames, setLocalNames] = useState<Record<string, string>>({})
-  const [nameErrors, setNameErrors] = useState<Record<string, string>>({})
-
-  const clearLocalState = (variableId: string) => {
-    setLocalNames((prev) => {
-      const updated = { ...prev }
-      delete updated[variableId]
-      return updated
-    })
-    setNameErrors((prev) => {
-      const updated = { ...prev }
-      delete updated[variableId]
-      return updated
-    })
-  }
-
-  const clearError = (variableId: string) => {
-    setNameErrors((prev) => {
-      if (!prev[variableId]) return prev
-      const updated = { ...prev }
-      delete updated[variableId]
-      return updated
-    })
-  }
-
-  const toggleCollapsed = (variableId: string) => {
-    setCollapsedById((prev) => ({
-      ...prev,
-      [variableId]: !prev[variableId],
-    }))
-  }
-
-  const handleVariableNameChange = (variableId: string, newName: string) => {
-    const validatedName = validateName(newName)
-    setLocalNames((prev) => ({
-      ...prev,
-      [variableId]: validatedName,
-    }))
-    clearError(variableId)
-  }
-
-  const isDuplicateName = (variableId: string, name: string): boolean => {
-    if (!name.trim()) return false
-    return workflowVariables.some((v) => v.id !== variableId && v.name === name.trim())
-  }
-
-  const handleVariableNameBlur = (variableId: string) => {
-    const localName = localNames[variableId]
-    if (localName === undefined) return
-
-    const trimmedName = localName.trim()
-
-    if (!trimmedName) {
-      setNameErrors((prev) => ({
-        ...prev,
-        [variableId]: 'Variable name cannot be empty',
-      }))
-      return
-    }
-
-    if (isDuplicateName(variableId, trimmedName)) {
-      setNameErrors((prev) => ({
-        ...prev,
-        [variableId]: 'Two variables cannot have the same name',
-      }))
-      return
-    }
-
-    collaborativeUpdateVariable(variableId, 'name', trimmedName)
-    clearLocalState(variableId)
-  }
-
-  const handleVariableNameKeyDown = (
-    variableId: string,
-    e: React.KeyboardEvent<HTMLInputElement>
-  ) => {
-    if (e.key === 'Enter') {
-      e.currentTarget.blur()
-    }
-  }
-
-  const handleAddVariable = () => {
-    if (!activeWorkflowId) return
-
-    collaborativeAddVariable({
-      name: '',
-      type: 'string',
-      value: '',
-      workflowId: activeWorkflowId,
-    })
-  }
-
-  const getTypeIcon = (type: VariableType) => TYPE_CONFIG[type]?.icon ?? '?'
-  const getPlaceholder = (type: VariableType) => TYPE_CONFIG[type]?.placeholder ?? ''
-
-  const handleEditorChange = (variable: Variable, newValue: string) => {
-    collaborativeUpdateVariable(variable.id, 'value', newValue)
-  }
-
-  const formatValue = (variable: Variable) => {
-    if (variable.value === '') return ''
-    return typeof variable.value === 'string' ? variable.value : JSON.stringify(variable.value)
-  }
-
-  const getValidationStatus = (variable: Variable): string | undefined => {
-    if (variable.value === '') return undefined
-    switch (variable.type) {
-      case 'number':
-        return Number.isNaN(Number(variable.value)) ? 'Not a valid number' : undefined
-      case 'boolean':
-        return !/^(true|false)$/i.test(String(variable.value).trim())
-          ? 'Expected "true" or "false"'
-          : undefined
-      case 'object':
-        try {
-          const valueToEvaluate = String(variable.value).trim()
-
-          if (!valueToEvaluate.startsWith('{') || !valueToEvaluate.endsWith('}')) {
-            return 'Not a valid object format'
-          }
-
-          const parsed = new Function(`return ${valueToEvaluate}`)()
-
-          if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) {
-            return 'Not a valid object'
-          }
-
-          return undefined
-        } catch (e) {
-          logger.info('Object parsing error:', e)
-          return 'Invalid object syntax'
-        }
-      case 'array':
-        try {
-          const valueToEvaluate = String(variable.value).trim()
-
-          if (!valueToEvaluate.startsWith('[') || !valueToEvaluate.endsWith(']')) {
-            return 'Not a valid array format'
-          }
-
-          const parsed = new Function(`return ${valueToEvaluate}`)()
-
-          if (!Array.isArray(parsed)) {
-            return 'Not a valid array'
-          }
-
-          return undefined
-        } catch (e) {
-          logger.info('Array parsing error:', e)
-          return 'Invalid array syntax'
-        }
-      default:
-        return undefined
-    }
-  }
-
-  useEffect(() => {
-    const variableIds = new Set(workflowVariables.map((v) => v.id))
-    Object.keys(editorRefs.current).forEach((id) => {
-      if (!variableIds.has(id)) {
-        delete editorRefs.current[id]
-      }
-    })
-  }, [workflowVariables])
-
-  useEffect(() => {
-    setLocalNames((prev) => {
-      const variableIds = new Set(workflowVariables.map((v) => v.id))
-      const updated = { ...prev }
-      let changed = false
-
-      Object.keys(updated).forEach((id) => {
-        if (!variableIds.has(id)) {
-          delete updated[id]
-          changed = true
-        } else {
-          const variable = workflowVariables.find((v) => v.id === id)
-          if (variable && updated[id] === variable.name) {
-            delete updated[id]
-            changed = true
-          }
-        }
-      })
-
-      return changed ? updated : prev
-    })
-  }, [workflowVariables])
-
-  return (
-    <div className='h-full pt-2'>
-      {workflowVariables.length === 0 ? (
-        <div className='flex h-full items-center justify-center'>
-          <Button
-            onClick={handleAddVariable}
-            className='h-9 rounded-lg border border-[#E5E5E5] bg-[var(--white)] px-3 py-1.5 font-normal text-muted-foreground text-sm shadow-xs transition-colors hover:text-muted-foreground dark:border-[#414141] dark:bg-[var(--surface-elevated)] dark:hover:text-muted-foreground'
-            variant='outline'
-          >
-            <Plus className='h-4 w-4' />
-            Add variable
-          </Button>
-        </div>
-      ) : (
-        <ScrollArea className='h-full' hideScrollbar={false}>
-          <div className='space-y-4'>
-            {workflowVariables.map((variable) => (
-              <div key={variable.id} className='space-y-2'>
-                {/* Header: Variable name | Variable type | Options dropdown */}
-                <div className='space-y-1'>
-                  <div className='flex items-center gap-2'>
-                    <Input
-                      className={cn(
-                        'h-9 flex-1 rounded-lg border-none px-3 font-normal text-sm ring-0 ring-offset-0 placeholder:text-muted-foreground focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0',
-                        nameErrors[variable.id]
-                          ? 'border border-red-500 bg-[#F6D2D2] outline-none ring-0 focus:border-red-500 dark:bg-[#442929]'
-                          : 'bg-secondary/50'
-                      )}
-                      placeholder='Variable name'
-                      value={localNames[variable.id] ?? variable.name}
-                      onChange={(e) => handleVariableNameChange(variable.id, e.target.value)}
-                      onBlur={() => handleVariableNameBlur(variable.id)}
-                      onKeyDown={(e) => handleVariableNameKeyDown(variable.id, e)}
-                    />
-
-                    {/* Type selector */}
-                    <DropdownMenu>
-                      <DropdownMenuTrigger asChild>
-                        <div className='flex h-9 w-16 shrink-0 cursor-pointer items-center justify-center rounded-lg bg-secondary/50 px-3'>
-                          <span className='font-normal text-sm'>{getTypeIcon(variable.type)}</span>
-                          <ChevronDown className='ml-1 h-3 w-3 text-muted-foreground' />
-                        </div>
-                      </DropdownMenuTrigger>
-                      <DropdownMenuContent
-                        align='end'
-                        className='min-w-32 rounded-lg border-[#E5E5E5] bg-[var(--white)] shadow-xs dark:border-[#414141] dark:bg-[var(--surface-elevated)]'
-                      >
-                        {VARIABLE_TYPES.map((type) => (
-                          <DropdownMenuItem
-                            key={type}
-                            onClick={() => collaborativeUpdateVariable(variable.id, 'type', type)}
-                            className='flex cursor-pointer items-center rounded-md px-3 py-2 font-[380] text-card-foreground text-sm hover:bg-secondary/50 focus:bg-secondary/50'
-                          >
-                            <div className='mr-2 w-5 text-center font-[380] text-sm'>
-                              {TYPE_CONFIG[type].icon}
-                            </div>
-                            <span className='font-[380] capitalize'>{type}</span>
-                          </DropdownMenuItem>
-                        ))}
-                      </DropdownMenuContent>
-                    </DropdownMenu>
-
-                    {/* Options dropdown */}
-                    <DropdownMenu>
-                      <DropdownMenuTrigger asChild>
-                        <Button
-                          variant='ghost'
-                          size='sm'
-                          className='h-9 w-9 shrink-0 rounded-lg bg-secondary/50 p-0 text-muted-foreground hover:bg-secondary/70 focus:ring-0 focus:ring-offset-0 focus-visible:ring-0 focus-visible:ring-offset-0'
-                        >
-                          <MoreVertical className='h-4 w-4' />
-                        </Button>
-                      </DropdownMenuTrigger>
-                      <DropdownMenuContent
-                        align='end'
-                        className='min-w-32 rounded-lg border-[#E5E5E5] bg-[var(--white)] shadow-xs dark:border-[#414141] dark:bg-[var(--surface-elevated)]'
-                      >
-                        <DropdownMenuItem
-                          onClick={() => toggleCollapsed(variable.id)}
-                          className='cursor-pointer rounded-md px-3 py-2 font-[380] text-card-foreground text-sm hover:bg-secondary/50 focus:bg-secondary/50'
-                        >
-                          {(collapsedById[variable.id] ?? false) ? (
-                            <Maximize2 className='mr-2 h-4 w-4 text-muted-foreground' />
-                          ) : (
-                            <Minimize2 className='mr-2 h-4 w-4 text-muted-foreground' />
-                          )}
-                          {(collapsedById[variable.id] ?? false) ? 'Expand' : 'Collapse'}
-                        </DropdownMenuItem>
-                        <DropdownMenuItem
-                          onClick={() => collaborativeDuplicateVariable(variable.id)}
-                          className='cursor-pointer rounded-md px-3 py-2 font-[380] text-card-foreground text-sm hover:bg-secondary/50 focus:bg-secondary/50'
-                        >
-                          <Copy className='mr-2 h-4 w-4 text-muted-foreground' />
-                          Duplicate
-                        </DropdownMenuItem>
-                        <DropdownMenuItem
-                          onClick={() => collaborativeDeleteVariable(variable.id)}
-                          className='cursor-pointer rounded-md px-3 py-2 font-[380] text-destructive text-sm hover:bg-destructive/10 focus:bg-destructive/10 focus:text-destructive'
-                        >
-                          <Trash className='mr-2 h-4 w-4' />
-                          Delete
-                        </DropdownMenuItem>
-                      </DropdownMenuContent>
-                    </DropdownMenu>
-                  </div>
-                  {nameErrors[variable.id] && (
-                    <div className='mt-1 text-red-400 text-xs'>{nameErrors[variable.id]}</div>
-                  )}
-                </div>
-
-                {/* Value area */}
-                {!(collapsedById[variable.id] ?? false) && (
-                  <div className='relative rounded-lg bg-secondary/50'>
-                    {/* Validation indicator */}
-                    {variable.value !== '' && getValidationStatus(variable) && (
-                      <div className='absolute top-2 right-2 z-10'>
-                        <Tooltip.Root>
-                          <Tooltip.Trigger asChild>
-                            <div className='cursor-help'>
-                              <AlertTriangle className='h-3 w-3 text-muted-foreground' />
-                            </div>
-                          </Tooltip.Trigger>
-                          <Tooltip.Content side='bottom' className='max-w-xs'>
-                            <p>{getValidationStatus(variable)}</p>
-                          </Tooltip.Content>
-                        </Tooltip.Root>
-                      </div>
-                    )}
-
-                    {/* Editor */}
-                    <div className='relative overflow-hidden'>
-                      <div
-                        className='relative min-h-[36px] w-full max-w-full px-3 py-2 font-normal text-sm'
-                        ref={(el) => {
-                          editorRefs.current[variable.id] = el
-                        }}
-                        style={{ maxWidth: '100%' }}
-                      >
-                        {variable.value === '' && (
-                          <div className='pointer-events-none absolute inset-0 flex select-none items-start justify-start px-3 py-2 font-[380] text-muted-foreground text-sm leading-normal'>
-                            <div style={{ lineHeight: '20px' }}>
-                              {getPlaceholder(variable.type)}
-                            </div>
-                          </div>
-                        )}
-                        <Editor
-                          key={`editor-${variable.id}-${variable.type}`}
-                          value={formatValue(variable)}
-                          onValueChange={(newValue) => handleEditorChange(variable, newValue)}
-                          highlight={(code) =>
-                            // Only apply syntax highlighting for non-basic text types
-                            variable.type === 'plain' || variable.type === 'string'
-                              ? code
-                              : highlight(code, languages.javascript, 'javascript')
-                          }
-                          padding={0}
-                          style={{
-                            fontFamily: 'inherit',
-                            lineHeight: '20px',
-                            width: '100%',
-                            maxWidth: '100%',
-                            whiteSpace: 'pre-wrap',
-                            wordBreak: 'break-all',
-                            overflowWrap: 'break-word',
-                            minHeight: '20px',
-                            overflow: 'hidden',
-                          }}
-                          className='[&>pre]:!max-w-full [&>pre]:!overflow-hidden [&>pre]:!whitespace-pre-wrap [&>pre]:!break-all [&>pre]:!overflow-wrap-break-word [&>textarea]:!max-w-full [&>textarea]:!overflow-hidden [&>textarea]:!whitespace-pre-wrap [&>textarea]:!break-all [&>textarea]:!overflow-wrap-break-word font-[380] text-foreground text-sm leading-normal focus:outline-none'
-                          textareaClassName='focus:outline-none focus:ring-0 bg-transparent resize-none w-full max-w-full whitespace-pre-wrap break-all overflow-wrap-break-word overflow-hidden font-[380] text-foreground'
-                        />
-                      </div>
-                    </div>
-                  </div>
-                )}
-              </div>
-            ))}
-
-            {/* Add Variable Button */}
-            <Button
-              onClick={handleAddVariable}
-              className='mt-2 h-9 w-full rounded-lg border border-[#E5E5E5] bg-[var(--white)] px-3 py-1.5 font-[380] text-muted-foreground text-sm shadow-xs transition-colors hover:text-muted-foreground dark:border-[#414141] dark:bg-[var(--surface-elevated)] dark:hover:text-muted-foreground'
-              variant='outline'
-            >
-              <Plus className='h-4 w-4' />
-              Add variable
-            </Button>
-          </div>
-        </ScrollArea>
-      )}
-    </div>
-  )
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/workflow-controls/workflow-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/workflow-controls/workflow-controls.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/workflow-controls/workflow-controls.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/workflow-controls/workflow-controls.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/index.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/index.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/index.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/use-panel-resize.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/use-panel-resize.ts
similarity index 96%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/use-panel-resize.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/use-panel-resize.ts
index 26ee7c13eb..22e607dc4c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/use-panel-resize.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/use-panel-resize.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react'
-import { usePanelStore } from '@/stores/panel-new/store'
+import { usePanelStore } from '@/stores/panel/store'
 
 /**
  * Constants for panel sizing
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/use-usage-limits.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/use-usage-limits.ts
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/hooks/use-usage-limits.ts
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks/use-usage-limits.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
index a4594580ee..8f2ed8bea0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
@@ -1,624 +1,587 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ArrowDownToLine, CircleSlash, History, Pencil, Plus, Trash2, X } from 'lucide-react'
-import { Tooltip } from '@/components/emcn'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { Braces, Square } from 'lucide-react'
+import { useParams, useRouter } from 'next/navigation'
 import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu'
-import { LandingPromptStorage } from '@/lib/browser-storage'
+  BubbleChatPreview,
+  Button,
+  Copy,
+  Layout,
+  Modal,
+  ModalContent,
+  ModalDescription,
+  ModalFooter,
+  ModalHeader,
+  ModalTitle,
+  MoreHorizontal,
+  Play,
+  Popover,
+  PopoverContent,
+  PopoverItem,
+  PopoverTrigger,
+  Trash,
+} from '@/components/emcn'
+import { VariableIcon } from '@/components/icons'
 import { createLogger } from '@/lib/logs/console/logger'
+import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils'
+import {
+  Copilot,
+  Deploy,
+  Editor,
+  Toolbar,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components'
+import {
+  usePanelResize,
+  useUsageLimits,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/hooks'
+import { Variables } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/variables/variables'
+import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
+import { useDeleteWorkflow, useImportWorkflow } from '@/app/workspace/[workspaceId]/w/hooks'
 import { useChatStore } from '@/stores/chat/store'
 import { usePanelStore } from '@/stores/panel/store'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import { useTerminalConsoleStore } from '@/stores/terminal'
+import type { PanelTab } from '@/stores/panel/types'
+import { DEFAULT_TERMINAL_HEIGHT, MIN_TERMINAL_HEIGHT, useTerminalStore } from '@/stores/terminal'
+import { useVariablesStore } from '@/stores/variables/store'
+import { useWorkflowJsonStore } from '@/stores/workflows/json/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { Copilot } from '../panel-new/components/copilot/copilot'
-// import { Chat } from './components/chat/chat'
-import { Console } from './components/console/console'
-import { Variables } from './components/variables/variables'
+import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('Panel')
-
+/**
+ * Panel component with resizable width and tab navigation that persists across page refreshes.
+ *
+ * Uses a CSS-based approach to prevent hydration mismatches and flash on load:
+ * 1. Width is controlled by CSS variable (--panel-width)
+ * 2. Blocking script in layout.tsx sets CSS variable and data-panel-active-tab before React hydrates
+ * 3. CSS rules control initial visibility based on data-panel-active-tab attribute
+ * 4. React takes over visibility control after hydration completes
+ * 5. Store updates CSS variable when width changes
+ *
+ * This ensures server and client render identical HTML, preventing hydration errors and visual flash.
+ *
+ * Note: All tabs are kept mounted but hidden to preserve component state during tab switches.
+ * This prevents unnecessary remounting which would trigger data reloads and reset state.
+ *
+ * @returns Panel on the right side of the workflow
+ */
 export function Panel() {
-  const [chatMessage, setChatMessage] = useState<string>('')
-  const [isHistoryDropdownOpen, setIsHistoryDropdownOpen] = useState(false)
-  const [editingChatId, setEditingChatId] = useState<string | null>(null)
-  const [editingChatTitle, setEditingChatTitle] = useState<string>('')
-
-  const [isResizing, setIsResizing] = useState(false)
-  const [resizeStartX, setResizeStartX] = useState(0)
-  const [resizeStartWidth, setResizeStartWidth] = useState(0)
+  const router = useRouter()
+  const params = useParams()
+  const workspaceId = params.workspaceId as string
+
+  const panelRef = useRef<HTMLElement>(null)
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const { activeTab, setActiveTab, panelWidth, _hasHydrated, setHasHydrated } = usePanelStore()
   const copilotRef = useRef<{
     createNewChat: () => void
     setInputValueAndFocus: (value: string) => void
+    focusInput: () => void
   }>(null)
-  const lastLoadedWorkflowRef = useRef<string | null>(null)
-
-  const isOpen = usePanelStore((state) => state.isOpen)
-  const togglePanel = usePanelStore((state) => state.togglePanel)
-  const activeTab = usePanelStore((state) => state.activeTab)
-  const setActiveTab = usePanelStore((state) => state.setActiveTab)
-  const panelWidth = usePanelStore((state) => state.panelWidth)
-  const setPanelWidth = usePanelStore((state) => state.setPanelWidth)
-
-  const clearConsole = useTerminalConsoleStore((state) => state.clearConsole)
-  const exportConsoleCSV = useTerminalConsoleStore((state) => state.exportConsoleCSV)
-  const clearChat = useChatStore((state) => state.clearChat)
-  const exportChatCSV = useChatStore((state) => state.exportChatCSV)
-  const { activeWorkflowId } = useWorkflowRegistry()
-
-  // Copilot store for chat management
-  const {
-    chats,
-    isLoadingChats,
-    isSendingMessage,
-    selectChat,
-    currentChat,
-    error: copilotError,
-    clearError: clearCopilotError,
-    deleteChat,
-    workflowId: copilotWorkflowId,
-    setWorkflowId: setCopilotWorkflowId,
-    loadChats,
-    validateCurrentChat,
-    areChatsFresh,
-  } = useCopilotStore()
-
-  // Handle chat deletion
-  const handleDeleteChat = useCallback(
-    async (chatId: string) => {
-      try {
-        await deleteChat(chatId)
-      } catch (error) {
-        logger.error('Error deleting chat:', error)
-      }
-    },
-    [deleteChat]
-  )
-
-  // Ensure copilot data is loaded before performing actions
-  const ensureCopilotDataLoaded = useCallback(
-    async (forceRefresh = false) => {
-      try {
-        // Don't load if already loading, unless force refresh is requested
-        if (isLoadingChats && !forceRefresh) {
-          return
-        }
-
-        // Sync workflow ID if needed
-        if (activeWorkflowId !== copilotWorkflowId) {
-          await setCopilotWorkflowId(activeWorkflowId)
-        }
-
-        // Load chats for the current workflow - let the store handle caching
-        if (activeWorkflowId) {
-          await loadChats(forceRefresh)
-
-          // Only validate current chat if we're not actively streaming
-          // This prevents clearing the current conversation during a stream
-          if (!isSendingMessage) {
-            validateCurrentChat()
-          }
-
-          // Mark this workflow as loaded for the legacy ref
-          lastLoadedWorkflowRef.current = activeWorkflowId
-        }
-      } catch (error) {
-        logger.error('Failed to load copilot data:', error)
-      }
-    },
-    [
-      activeWorkflowId,
-      copilotWorkflowId,
-      setCopilotWorkflowId,
-      loadChats,
-      validateCurrentChat,
-      isLoadingChats,
-      isSendingMessage,
-    ]
-  )
-
-  // Handle new chat creation with data loading
-  const handleNewChat = useCallback(async () => {
-    // Instantly clear to a fresh chat locally
-    copilotRef.current?.createNewChat()
-    // Ensure copilot data is loaded in the background (do not await)
-    ensureCopilotDataLoaded().catch(() => {})
-  }, [ensureCopilotDataLoaded])
-
-  // Handle history dropdown opening - use smart caching instead of force refresh
-  const handleHistoryDropdownOpen = useCallback(
-    async (open: boolean) => {
-      // Open dropdown immediately for better UX
-      setIsHistoryDropdownOpen(open)
-
-      // If opening and there's an active stream, don't do any data loading at all
-      // Just show what's already loaded to avoid any interference
-      if (open && activeWorkflowId && !isSendingMessage) {
-        // Only load if we don't have fresh chats for this workflow AND we're not streaming
-        if (!areChatsFresh(activeWorkflowId)) {
-          // Don't await - let it load in background while dropdown is already open
-          ensureCopilotDataLoaded(false).catch((error) => {
-            logger.error('Failed to load chat history:', error)
-          })
-        }
-      }
-
-      // If streaming, just log that we're showing cached data
-      if (open && isSendingMessage) {
-        logger.info('Chat history opened during stream - showing cached data only')
-      }
-    },
-    [ensureCopilotDataLoaded, activeWorkflowId, areChatsFresh, isSendingMessage]
-  )
-
-  // Group chats by day
-  const groupedChats = useMemo(() => {
-    // Only process chats if we have the right workflow ID and chats exist
-    if (!activeWorkflowId || copilotWorkflowId !== activeWorkflowId || chats.length === 0) {
-      return []
+  const toolbarRef = useRef<{
+    focusSearch: () => void
+  } | null>(null)
+
+  // State
+  const [isMenuOpen, setIsMenuOpen] = useState(false)
+  const [isAutoLayouting, setIsAutoLayouting] = useState(false)
+  const [isExporting, setIsExporting] = useState(false)
+  const [isDuplicating, setIsDuplicating] = useState(false)
+  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false)
+
+  // Hooks
+  const userPermissions = useUserPermissionsContext()
+  const { isImporting, handleFileChange } = useImportWorkflow({ workspaceId })
+  const { workflows, activeWorkflowId, duplicateWorkflow, hydration } = useWorkflowRegistry()
+  const isRegistryLoading =
+    hydration.phase === 'idle' ||
+    hydration.phase === 'metadata-loading' ||
+    hydration.phase === 'state-loading'
+  const { getJson } = useWorkflowJsonStore()
+  const { blocks } = useWorkflowStore()
+
+  // Delete workflow hook
+  const { isDeleting, handleDeleteWorkflow } = useDeleteWorkflow({
+    workspaceId,
+    getWorkflowIds: () => activeWorkflowId || '',
+    isActive: true,
+    onSuccess: () => setIsDeleteModalOpen(false),
+  })
+
+  // Usage limits hook
+  const { usageExceeded } = useUsageLimits({
+    context: 'user',
+    autoRefresh: !isRegistryLoading,
+  })
+
+  // Workflow execution hook
+  const { handleRunWorkflow, handleCancelExecution, isExecuting } = useWorkflowExecution()
+
+  // Panel resize hook
+  const { handleMouseDown } = usePanelResize()
+
+  /**
+   * Opens subscription settings modal
+   */
+  const openSubscriptionSettings = () => {
+    if (typeof window !== 'undefined') {
+      window.dispatchEvent(
+        new CustomEvent('open-settings', {
+          detail: { tab: 'subscription' },
+        })
+      )
     }
+  }
 
-    // Chats are already filtered by workflow from the API and ordered by updatedAt desc
-    const filteredChats = chats
-
-    if (filteredChats.length === 0) {
-      return []
+  /**
+   * Runs the workflow with usage limit check
+   */
+  const runWorkflow = useCallback(async () => {
+    if (usageExceeded) {
+      openSubscriptionSettings()
+      return
+    }
+    const { openOnRun, terminalHeight, setTerminalHeight } = useTerminalStore.getState()
+    if (openOnRun && terminalHeight <= MIN_TERMINAL_HEIGHT) {
+      setTerminalHeight(DEFAULT_TERMINAL_HEIGHT)
     }
+    await handleRunWorkflow()
+  }, [usageExceeded, handleRunWorkflow])
+
+  /**
+   * Cancels the currently executing workflow
+   */
+  const cancelWorkflow = useCallback(async () => {
+    await handleCancelExecution()
+  }, [handleCancelExecution])
+
+  // Chat state
+  const { isChatOpen, setIsChatOpen } = useChatStore()
+  const { isOpen: isVariablesOpen, setIsOpen: setVariablesOpen } = useVariablesStore()
+
+  const currentWorkflow = activeWorkflowId ? workflows[activeWorkflowId] : null
+
+  /**
+   * Mark hydration as complete on mount
+   * This allows React to take over visibility control from CSS
+   */
+  useEffect(() => {
+    setHasHydrated(true)
+  }, [setHasHydrated])
 
-    const now = new Date()
-    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-    const yesterday = new Date(today.getTime() - 24 * 60 * 60 * 1000)
-    const thisWeekStart = new Date(today.getTime() - today.getDay() * 24 * 60 * 60 * 1000)
-    const lastWeekStart = new Date(thisWeekStart.getTime() - 7 * 24 * 60 * 60 * 1000)
-
-    const groups: Record<string, typeof filteredChats> = {
-      Today: [],
-      Yesterday: [],
-      'This Week': [],
-      'Last Week': [],
-      Older: [],
+  /**
+   * Focus Copilot user input when the Copilot tab becomes active or when
+   * the panel loads with Copilot already selected, after hydration.
+   */
+  useEffect(() => {
+    if (!_hasHydrated || activeTab !== 'copilot') {
+      return
     }
 
-    // Chats are already sorted by updatedAt desc from the API, so we don't need to sort again
-    filteredChats.forEach((chat) => {
-      const chatDate = new Date(chat.updatedAt)
-      const chatDay = new Date(chatDate.getFullYear(), chatDate.getMonth(), chatDate.getDate())
-
-      if (chatDay.getTime() === today.getTime()) {
-        groups.Today.push(chat)
-      } else if (chatDay.getTime() === yesterday.getTime()) {
-        groups.Yesterday.push(chat)
-      } else if (chatDay.getTime() >= thisWeekStart.getTime()) {
-        groups['This Week'].push(chat)
-      } else if (chatDay.getTime() >= lastWeekStart.getTime()) {
-        groups['Last Week'].push(chat)
-      } else {
-        groups.Older.push(chat)
-      }
-    })
-
-    // Filter out empty groups
-    return Object.entries(groups).filter(([, chats]) => chats.length > 0)
-  }, [chats, activeWorkflowId, copilotWorkflowId])
-
-  // Skeleton loading component for chat history
-  const ChatHistorySkeleton = () => (
-    <div className='px-1 py-1'>
-      {/* Group header skeleton */}
-      <div className='border-[#E5E5E5] border-t-0 px-1 pt-1 pb-0.5 dark:border-[#414141]'>
-        <div className='h-3 w-12 animate-pulse rounded bg-muted/40' />
-      </div>
-      {/* Chat item skeletons */}
-      <div className='mt-1 flex flex-col gap-1'>
-        {[1, 2, 3].map((i) => (
-          <div key={i} className='mx-1 flex h-8 items-center rounded-lg px-2 py-1.5'>
-            <div className='h-3 w-full animate-pulse rounded bg-muted/40' />
-          </div>
-        ))}
-      </div>
-    </div>
-  )
+    copilotRef.current?.focusInput()
+  }, [_hasHydrated, activeTab])
 
-  // Handle tab clicks - no loading, just switch tabs
-  const handleTabClick = async (tab: 'chat' | 'console' | 'variables' | 'copilot') => {
+  /**
+   * Handles tab click events
+   */
+  const handleTabClick = (tab: PanelTab) => {
     setActiveTab(tab)
-    if (!isOpen) {
-      togglePanel()
-    }
-    // Removed copilot data loading - store should persist across tab switches
   }
 
-  const handleClosePanel = () => {
-    togglePanel()
-  }
+  /**
+   * Downloads a file with the given content
+   */
+  const downloadFile = useCallback((content: string, filename: string, mimeType: string) => {
+    try {
+      const blob = new Blob([content], { type: mimeType })
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.href = url
+      a.download = filename
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+      URL.revokeObjectURL(url)
+    } catch (error) {
+      logger.error('Failed to download file:', error)
+    }
+  }, [])
 
-  // Resize functionality
-  const handleResizeStart = useCallback(
-    (e: React.MouseEvent) => {
-      if (!isOpen) return
-      e.preventDefault()
-      setIsResizing(true)
-      setResizeStartX(e.clientX)
-      setResizeStartWidth(panelWidth)
-    },
-    [isOpen, panelWidth]
-  )
+  /**
+   * Handles auto-layout of workflow blocks
+   */
+  const handleAutoLayout = useCallback(async () => {
+    if (isExecuting || !userPermissions.canEdit || isAutoLayouting) {
+      return
+    }
 
-  const handleResize = useCallback(
-    (e: MouseEvent) => {
-      if (!isResizing) return
-      const deltaX = resizeStartX - e.clientX // Subtract because we're expanding left
-      const newWidth = resizeStartWidth + deltaX
-      setPanelWidth(newWidth)
-    },
-    [isResizing, resizeStartX, resizeStartWidth, setPanelWidth]
-  )
+    setIsAutoLayouting(true)
+    try {
+      // Use the standalone auto layout utility for immediate frontend updates
+      const { applyAutoLayoutAndUpdateStore } = await import('../../utils')
 
-  const handleResizeEnd = useCallback(() => {
-    setIsResizing(false)
-  }, [])
+      const result = await applyAutoLayoutAndUpdateStore(activeWorkflowId!)
 
-  // Add global mouse event listeners for resize
-  useEffect(() => {
-    if (isResizing) {
-      document.addEventListener('mousemove', handleResize)
-      document.addEventListener('mouseup', handleResizeEnd)
-      document.body.style.cursor = 'col-resize'
-      document.body.style.userSelect = 'none'
-
-      return () => {
-        document.removeEventListener('mousemove', handleResize)
-        document.removeEventListener('mouseup', handleResizeEnd)
-        document.body.style.cursor = ''
-        document.body.style.userSelect = ''
+      if (result.success) {
+        logger.info('Auto layout completed successfully')
+      } else {
+        logger.error('Auto layout failed:', result.error)
       }
+    } catch (error) {
+      logger.error('Auto layout error:', error)
+    } finally {
+      setIsAutoLayouting(false)
     }
-  }, [isResizing, handleResize, handleResizeEnd])
-
-  // Only auto-load copilot data when workflow changes, not when switching tabs
-  useEffect(() => {
-    // Only load when the active workflow changes, not when switching panel tabs
-    if (activeWorkflowId && activeWorkflowId !== lastLoadedWorkflowRef.current) {
-      // This is a real workflow change, not just a tab switch
-      if (copilotWorkflowId !== activeWorkflowId || !copilotWorkflowId) {
-        ensureCopilotDataLoaded().catch((error) => {
-          logger.error('Failed to auto-load copilot data on workflow change:', error)
-        })
-      }
+  }, [isExecuting, userPermissions.canEdit, isAutoLayouting, activeWorkflowId])
+
+  /**
+   * Handles exporting workflow as JSON
+   */
+  const handleExportJson = useCallback(async () => {
+    if (!currentWorkflow || !activeWorkflowId) {
+      logger.warn('No active workflow to export')
+      return
     }
-  }, [activeWorkflowId, copilotWorkflowId, ensureCopilotDataLoaded])
 
-  useEffect(() => {
-    const storedPrompt = LandingPromptStorage.consume()
+    setIsExporting(true)
+    try {
+      // Get the JSON from the store
+      const jsonContent = await getJson()
 
-    if (storedPrompt && storedPrompt.trim().length > 0) {
-      setActiveTab('copilot')
-      if (!isOpen) {
-        togglePanel()
+      if (!jsonContent) {
+        throw new Error('Failed to generate JSON')
       }
 
-      setTimeout(() => {
-        if (copilotRef.current) {
-          copilotRef.current.setInputValueAndFocus(storedPrompt)
-        } else {
-          setTimeout(() => {
-            if (copilotRef.current) {
-              copilotRef.current.setInputValueAndFocus(storedPrompt)
-            }
-          }, 500)
-        }
-      }, 200)
+      const filename = `${currentWorkflow.name.replace(/[^a-z0-9]/gi, '-')}.json`
+      downloadFile(jsonContent, filename, 'application/json')
+      logger.info('Workflow exported as JSON')
+    } catch (error) {
+      logger.error('Failed to export workflow as JSON:', error)
+    } finally {
+      setIsExporting(false)
+      setIsMenuOpen(false)
+    }
+  }, [currentWorkflow, activeWorkflowId, getJson, downloadFile])
+
+  /**
+   * Handles duplicating the current workflow
+   */
+  const handleDuplicateWorkflow = useCallback(async () => {
+    if (!activeWorkflowId || !userPermissions.canEdit || isDuplicating) {
+      return
+    }
+
+    setIsDuplicating(true)
+    try {
+      const newWorkflow = await duplicateWorkflow(activeWorkflowId)
+      if (newWorkflow) {
+        router.push(`/workspace/${workspaceId}/w/${newWorkflow}`)
+      }
+    } catch (error) {
+      logger.error('Error duplicating workflow:', error)
+    } finally {
+      setIsDuplicating(false)
+      setIsMenuOpen(false)
     }
-  }, []) // eslint-disable-line react-hooks/exhaustive-deps -- Run only on mount
+  }, [
+    activeWorkflowId,
+    userPermissions.canEdit,
+    isDuplicating,
+    duplicateWorkflow,
+    router,
+    workspaceId,
+  ])
+
+  // Compute run button state
+  const canRun = userPermissions.canRead // Running only requires read permissions
+  const isLoadingPermissions = userPermissions.isLoading
+  const hasValidationErrors = false // TODO: Add validation logic if needed
+  const isWorkflowBlocked = isExecuting || hasValidationErrors
+  const isButtonDisabled = !isExecuting && (isWorkflowBlocked || (!canRun && !isLoadingPermissions))
+
+  /**
+   * Register global keyboard shortcuts using the central commands registry.
+   *
+   * - Mod+Enter: Run / cancel workflow (matches the Run button behavior)
+   * - C: Focus Copilot tab
+   * - T: Focus Toolbar tab
+   * - E: Focus Editor tab
+   * - Mod+F: Focus Toolbar tab and search input
+   *
+   * The tab-switching commands are disabled inside editable elements so typing
+   * in inputs or textareas is not interrupted.
+   */
+  useRegisterGlobalCommands(() =>
+    createCommands([
+      {
+        id: 'run-workflow',
+        handler: () => {
+          // Do exactly what the Run button does
+          if (isExecuting) {
+            void cancelWorkflow()
+          } else {
+            void runWorkflow()
+          }
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+      {
+        id: 'focus-copilot-tab',
+        handler: () => {
+          setActiveTab('copilot')
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+      {
+        id: 'focus-toolbar-tab',
+        handler: () => {
+          setActiveTab('toolbar')
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+      {
+        id: 'focus-editor-tab',
+        handler: () => {
+          setActiveTab('editor')
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+      {
+        id: 'focus-toolbar-search',
+        handler: () => {
+          setActiveTab('toolbar')
+          toolbarRef.current?.focusSearch()
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+    ])
+  )
 
   return (
     <>
-      {/* Tab Selector - Always visible */}
-      <div className='fixed top-[76px] right-4 z-20 flex h-9 w-[308px] items-center gap-1 rounded-[14px] border bg-card px-[2.5px] py-1 shadow-xs'>
-        <button
-          onClick={() => handleTabClick('copilot')}
-          className={`panel-tab-base inline-flex flex-1 cursor-pointer items-center justify-center rounded-[10px] border border-transparent py-1 font-[450] text-sm outline-none transition-colors duration-200 ${
-            isOpen && activeTab === 'copilot' ? 'panel-tab-active' : 'panel-tab-inactive'
-          }`}
-        >
-          Copilot
-        </button>
-        <button
-          onClick={() => handleTabClick('console')}
-          className={`panel-tab-base inline-flex flex-1 cursor-pointer items-center justify-center rounded-[10px] border border-transparent py-1 font-[450] text-sm outline-none transition-colors duration-200 ${
-            isOpen && activeTab === 'console' ? 'panel-tab-active' : 'panel-tab-inactive'
-          }`}
-        >
-          Console
-        </button>
-        <button
-          onClick={() => handleTabClick('chat')}
-          className={`panel-tab-base inline-flex flex-1 cursor-pointer items-center justify-center rounded-[10px] border border-transparent py-1 font-[450] text-sm outline-none transition-colors duration-200 ${
-            isOpen && activeTab === 'chat' ? 'panel-tab-active' : 'panel-tab-inactive'
-          }`}
-        >
-          Chat
-        </button>
-        <button
-          onClick={() => handleTabClick('variables')}
-          className={`panel-tab-base inline-flex flex-1 cursor-pointer items-center justify-center rounded-[10px] border border-transparent py-1 font-[450] text-sm outline-none transition-colors duration-200 ${
-            isOpen && activeTab === 'variables' ? 'panel-tab-active' : 'panel-tab-inactive'
-          }`}
-        >
-          Variables
-        </button>
-      </div>
-
-      {/* Panel Content - Only visible when isOpen is true */}
-      {isOpen && (
-        <div
-          className='fixed top-[124px] right-4 bottom-4 z-10 flex flex-col rounded-[14px] border bg-card shadow-xs'
-          style={{ width: `${panelWidth}px` }}
-        >
-          {/* Invisible resize handle */}
-          <div
-            className='-left-1 absolute top-0 bottom-0 w-2 cursor-col-resize'
-            onMouseDown={handleResizeStart}
-          />
-
-          {/* Header - Fixed width content */}
-          <div className='flex items-center justify-between px-3 pt-3 pb-1'>
-            <h2 className='font-[450] text-base text-card-foreground capitalize'>{activeTab}</h2>
-            <div className='flex items-center gap-2'>
-              {activeTab === 'console' && (
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <button
-                      onClick={() => activeWorkflowId && exportConsoleCSV(activeWorkflowId)}
-                      className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                      style={{ color: 'var(--base-muted-foreground)' }}
-                    >
-                      <ArrowDownToLine className='h-4 w-4' strokeWidth={2} />
-                    </button>
-                  </Tooltip.Trigger>
-                  <Tooltip.Content side='bottom'>Export console data</Tooltip.Content>
-                </Tooltip.Root>
-              )}
-              {activeTab === 'chat' && (
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <button
-                      onClick={() => activeWorkflowId && exportChatCSV(activeWorkflowId)}
-                      className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                      style={{ color: 'var(--base-muted-foreground)' }}
-                    >
-                      <ArrowDownToLine className='h-4 w-4' strokeWidth={2} />
-                    </button>
-                  </Tooltip.Trigger>
-                  <Tooltip.Content side='bottom'>Export chat data</Tooltip.Content>
-                </Tooltip.Root>
-              )}
-              {activeTab === 'copilot' && (
-                <>
-                  {/* New Chat Button */}
-                  <Tooltip.Root>
-                    <Tooltip.Trigger asChild>
-                      <button
-                        onClick={handleNewChat}
-                        className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                        style={{ color: 'var(--base-muted-foreground)' }}
-                      >
-                        <Plus className='h-4 w-4' strokeWidth={2} />
-                      </button>
-                    </Tooltip.Trigger>
-                    <Tooltip.Content side='bottom'>New chat</Tooltip.Content>
-                  </Tooltip.Root>
-
-                  {/* History Dropdown */}
-                  <DropdownMenu
-                    open={isHistoryDropdownOpen}
-                    onOpenChange={handleHistoryDropdownOpen}
+      <aside
+        ref={panelRef}
+        className='panel-container fixed inset-y-0 right-0 z-10 overflow-hidden dark:bg-[var(--surface-1)]'
+        aria-label='Workflow panel'
+      >
+        <div className='flex h-full flex-col border-l pt-[14px] dark:border-[var(--border)]'>
+          {/* Header */}
+          <div className='flex flex-shrink-0 items-center justify-between px-[8px]'>
+            {/* More and Chat */}
+            <div className='flex gap-[4px]'>
+              <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+                <PopoverTrigger asChild>
+                  <Button className='h-[32px] w-[32px]'>
+                    <MoreHorizontal />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent align='start' side='bottom' sideOffset={8}>
+                  <PopoverItem
+                    onClick={handleAutoLayout}
+                    disabled={isExecuting || !userPermissions.canEdit || isAutoLayouting}
+                  >
+                    <Layout className='h-3 w-3' animate={isAutoLayouting} variant='clockwise' />
+                    <span>Auto layout</span>
+                  </PopoverItem>
+                  {
+                    <PopoverItem onClick={() => setVariablesOpen(!isVariablesOpen)}>
+                      <VariableIcon className='h-3 w-3' />
+                      <span>Variables</span>
+                    </PopoverItem>
+                  }
+                  {/* <PopoverItem>
+                    <Bug className='h-3 w-3' />
+                    <span>Debug</span>
+                  </PopoverItem> */}
+                  {/* <PopoverItem onClick={() => setIsMenuOpen(false)}>
+                    <Webhook className='h-3 w-3' />
+                    <span>Log webhook</span>
+                  </PopoverItem> */}
+                  <PopoverItem
+                    onClick={handleExportJson}
+                    disabled={isExporting || !currentWorkflow}
+                  >
+                    <Braces className='h-3 w-3' />
+                    <span>Export workflow</span>
+                  </PopoverItem>
+                  <PopoverItem
+                    onClick={handleDuplicateWorkflow}
+                    disabled={!userPermissions.canEdit || isDuplicating}
                   >
-                    <Tooltip.Root>
-                      <DropdownMenuTrigger asChild>
-                        <Tooltip.Trigger asChild>
-                          <button
-                            className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                            style={{ color: 'var(--base-muted-foreground)' }}
-                          >
-                            <History className='h-4 w-4' strokeWidth={2} />
-                          </button>
-                        </Tooltip.Trigger>
-                      </DropdownMenuTrigger>
-                      <Tooltip.Content side='bottom'>Chat history</Tooltip.Content>
-                    </Tooltip.Root>
-                    <DropdownMenuContent
-                      align='end'
-                      className='z-[200] w-96 rounded-lg border bg-background p-2 shadow-lg dark:border-[#414141] dark:bg-[var(--surface-elevated)]'
-                      sideOffset={8}
-                      side='bottom'
-                      avoidCollisions={true}
-                      collisionPadding={8}
-                    >
-                      {isLoadingChats ? (
-                        <div className='max-h-[280px] overflow-y-auto'>
-                          <ChatHistorySkeleton />
-                        </div>
-                      ) : groupedChats.length === 0 ? (
-                        <div className='px-2 py-6 text-center text-muted-foreground text-sm'>
-                          No chats yet
-                        </div>
-                      ) : (
-                        <div className='max-h-[280px] overflow-y-auto'>
-                          {groupedChats.map(([groupName, chats], groupIndex) => (
-                            <div key={groupName}>
-                              <div
-                                className={`px-2 pt-2 pb-1 font-medium text-muted-foreground text-xs uppercase tracking-wide ${groupIndex === 0 ? 'pt-0' : ''}`}
-                              >
-                                {groupName}
-                              </div>
-                              <div className='flex flex-col gap-0.5'>
-                                {chats.map((chat) => (
-                                  <div
-                                    key={chat.id}
-                                    className={`group relative flex items-center gap-2 rounded-md px-2 py-1.5 text-left transition-colors ${
-                                      currentChat?.id === chat.id
-                                        ? 'bg-accent text-accent-foreground'
-                                        : 'text-foreground hover:bg-accent/50'
-                                    }`}
-                                  >
-                                    {editingChatId === chat.id ? (
-                                      <input
-                                        type='text'
-                                        value={editingChatTitle}
-                                        onChange={(e) => setEditingChatTitle(e.target.value)}
-                                        onKeyDown={async (e) => {
-                                          if (e.key === 'Enter') {
-                                            e.preventDefault()
-                                            const newTitle = editingChatTitle.trim() || 'New Chat'
-
-                                            // Update optimistically in store first
-                                            const updatedChats = chats.map((c) =>
-                                              c.id === chat.id ? { ...c, title: newTitle } : c
-                                            )
-                                            useCopilotStore.setState({ chats: updatedChats })
-
-                                            // Exit edit mode immediately
-                                            setEditingChatId(null)
-
-                                            // Save to database in background
-                                            try {
-                                              await fetch('/api/copilot/chat/update-title', {
-                                                method: 'POST',
-                                                headers: { 'Content-Type': 'application/json' },
-                                                body: JSON.stringify({
-                                                  chatId: chat.id,
-                                                  title: newTitle,
-                                                }),
-                                              })
-                                            } catch (error) {
-                                              logger.error('Failed to update chat title:', error)
-                                              // Revert on error
-                                              await loadChats(true)
-                                            }
-                                          } else if (e.key === 'Escape') {
-                                            setEditingChatId(null)
-                                          }
-                                        }}
-                                        onBlur={() => setEditingChatId(null)}
-                                        className='min-w-0 flex-1 rounded border-none bg-transparent px-0 text-sm outline-none focus:outline-none'
-                                      />
-                                    ) : (
-                                      <>
-                                        <span
-                                          onClick={() => {
-                                            // Only call selectChat if it's a different chat
-                                            if (currentChat?.id !== chat.id) {
-                                              selectChat(chat)
-                                            }
-                                            setIsHistoryDropdownOpen(false)
-                                          }}
-                                          className='min-w-0 cursor-pointer truncate text-sm'
-                                          style={{ maxWidth: 'calc(100% - 60px)' }}
-                                        >
-                                          {chat.title || 'New Chat'}
-                                        </span>
-                                        <div className='ml-auto flex flex-shrink-0 items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100'>
-                                          <button
-                                            onClick={(e) => {
-                                              e.stopPropagation()
-                                              setEditingChatId(chat.id)
-                                              setEditingChatTitle(chat.title || 'New Chat')
-                                            }}
-                                            className='flex h-5 w-5 items-center justify-center rounded hover:bg-muted'
-                                          >
-                                            <Pencil className='h-3 w-3 text-muted-foreground' />
-                                          </button>
-                                          <button
-                                            onClick={async (e) => {
-                                              e.stopPropagation()
-
-                                              // Check if deleting current chat
-                                              const isDeletingCurrent = currentChat?.id === chat.id
-
-                                              // Delete the chat (optimistic update happens in store)
-                                              await handleDeleteChat(chat.id)
-
-                                              // If deleted current chat, create new one
-                                              if (isDeletingCurrent) {
-                                                copilotRef.current?.createNewChat()
-                                              }
-                                            }}
-                                            className='flex h-5 w-5 items-center justify-center rounded hover:bg-muted'
-                                          >
-                                            <Trash2 className='h-3 w-3 text-muted-foreground' />
-                                          </button>
-                                        </div>
-                                      </>
-                                    )}
-                                  </div>
-                                ))}
-                              </div>
-                            </div>
-                          ))}
-                        </div>
-                      )}
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                </>
-              )}
-              {(activeTab === 'console' || activeTab === 'chat') && (
-                <Tooltip.Root>
-                  <Tooltip.Trigger asChild>
-                    <button
-                      onClick={() => {
-                        if (activeTab === 'console') {
-                          clearConsole(activeWorkflowId)
-                        } else if (activeTab === 'chat') {
-                          clearChat(activeWorkflowId)
-                        }
-                      }}
-                      className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                      style={{ color: 'var(--base-muted-foreground)' }}
-                    >
-                      <CircleSlash className='h-4 w-4' strokeWidth={2} />
-                    </button>
-                  </Tooltip.Trigger>
-                  <Tooltip.Content side='bottom'>Clear {activeTab}</Tooltip.Content>
-                </Tooltip.Root>
-              )}
-              <Tooltip.Root>
-                <Tooltip.Trigger asChild>
-                  <button
-                    onClick={handleClosePanel}
-                    className='font-medium text-md leading-normal transition-[filter] hover:brightness-75 focus:outline-none focus-visible:outline-none active:outline-none dark:hover:brightness-125'
-                    style={{ color: 'var(--base-muted-foreground)' }}
+                    <Copy className='h-3 w-3' animate={isDuplicating} />
+                    <span>Duplicate workflow</span>
+                  </PopoverItem>
+                  <PopoverItem
+                    onClick={() => {
+                      setIsMenuOpen(false)
+                      setIsDeleteModalOpen(true)
+                    }}
+                    disabled={!userPermissions.canEdit || Object.keys(workflows).length <= 1}
                   >
-                    <X className='h-4 w-4' strokeWidth={2} />
-                  </button>
-                </Tooltip.Trigger>
-                <Tooltip.Content side='bottom'>Close panel</Tooltip.Content>
-              </Tooltip.Root>
+                    <Trash className='h-3 w-3' />
+                    <span>Delete workflow</span>
+                  </PopoverItem>
+                </PopoverContent>
+              </Popover>
+              <Button
+                className='h-[32px] w-[32px]'
+                variant={isChatOpen ? 'active' : 'default'}
+                onClick={() => setIsChatOpen(!isChatOpen)}
+              >
+                <BubbleChatPreview />
+              </Button>
             </div>
-          </div>
 
-          {/* Panel Content Area - Resizable */}
-          <div className='flex-1 overflow-hidden px-3'>
-            {/* Keep all tabs mounted but hidden to preserve state and animations */}
-            <div style={{ display: activeTab === 'chat' ? 'block' : 'none', height: '100%' }}>
-              {/* <Chat chatMessage={chatMessage} setChatMessage={setChatMessage} /> */}
+            {/* Deploy and Run */}
+            <div className='flex gap-[4px]'>
+              <Deploy activeWorkflowId={activeWorkflowId} userPermissions={userPermissions} />
+              <Button
+                className='h-[32px] w-[61.5px] gap-[8px]'
+                variant={isExecuting ? 'active' : 'primary'}
+                onClick={isExecuting ? cancelWorkflow : () => runWorkflow()}
+                disabled={!isExecuting && isButtonDisabled}
+              >
+                {isExecuting ? (
+                  <Square className='h-[11.5px] w-[11.5px] fill-current' />
+                ) : (
+                  <Play className='h-[11.5px] w-[11.5px]' />
+                )}
+                Run
+              </Button>
             </div>
-            <div style={{ display: activeTab === 'console' ? 'block' : 'none', height: '100%' }}>
-              <Console panelWidth={panelWidth} />
+          </div>
+
+          {/* Tabs */}
+          <div className='flex flex-shrink-0 items-center justify-between px-[8px] pt-[14px]'>
+            <div className='flex gap-[4px]'>
+              <Button
+                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
+                variant={_hasHydrated && activeTab === 'copilot' ? 'active' : 'ghost'}
+                onClick={() => handleTabClick('copilot')}
+                data-tab-button='copilot'
+              >
+                Copilot
+              </Button>
+              <Button
+                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
+                variant={_hasHydrated && activeTab === 'toolbar' ? 'active' : 'ghost'}
+                onClick={() => handleTabClick('toolbar')}
+                data-tab-button='toolbar'
+              >
+                Toolbar
+              </Button>
+              <Button
+                className='h-[28px] px-[8px] py-[5px] text-[12.5px] hover:bg-[var(--surface-9)] hover:text-[var(--text-primary)] dark:hover:bg-[var(--surface-9)] dark:hover:text-[var(--text-primary)]'
+                variant={_hasHydrated && activeTab === 'editor' ? 'active' : 'ghost'}
+                onClick={() => handleTabClick('editor')}
+                data-tab-button='editor'
+              >
+                Editor
+              </Button>
             </div>
-            <div style={{ display: activeTab === 'copilot' ? 'block' : 'none', height: '100%' }}>
+
+            {/* Workflow Controls (Undo/Redo and Zoom) */}
+            {/* <WorkflowControls /> */}
+          </div>
+
+          {/* Tab Content - Keep all tabs mounted but hidden to preserve state */}
+          <div className='flex-1 overflow-hidden pt-[12px]'>
+            <div
+              className={
+                _hasHydrated && activeTab === 'copilot'
+                  ? 'h-full'
+                  : _hasHydrated
+                    ? 'hidden'
+                    : 'h-full'
+              }
+              data-tab-content='copilot'
+            >
               <Copilot ref={copilotRef} panelWidth={panelWidth} />
             </div>
-            <div style={{ display: activeTab === 'variables' ? 'block' : 'none', height: '100%' }}>
-              <Variables />
+            <div
+              className={
+                _hasHydrated && activeTab === 'editor'
+                  ? 'h-full'
+                  : _hasHydrated
+                    ? 'hidden'
+                    : 'h-full'
+              }
+              data-tab-content='editor'
+            >
+              <Editor />
+            </div>
+            <div
+              className={
+                _hasHydrated && activeTab === 'toolbar'
+                  ? 'h-full'
+                  : _hasHydrated
+                    ? 'hidden'
+                    : 'h-full'
+              }
+              data-tab-content='toolbar'
+            >
+              <Toolbar ref={toolbarRef} isActive={activeTab === 'toolbar'} />
             </div>
           </div>
         </div>
-      )}
+      </aside>
+
+      {/* Resize Handle */}
+      <div
+        className='fixed top-0 right-[calc(var(--panel-width)-4px)] bottom-0 z-20 w-[8px] cursor-ew-resize'
+        onMouseDown={handleMouseDown}
+        role='separator'
+        aria-orientation='vertical'
+        aria-label='Resize panel'
+      />
+
+      {/* Delete Confirmation Modal */}
+      <Modal open={isDeleteModalOpen} onOpenChange={setIsDeleteModalOpen}>
+        <ModalContent>
+          <ModalHeader>
+            <ModalTitle>Delete workflow?</ModalTitle>
+            <ModalDescription>
+              Deleting this workflow will permanently remove all associated blocks, executions, and
+              configuration.{' '}
+              <span className='text-[var(--text-error)] dark:text-[var(--text-error)]'>
+                This action cannot be undone.
+              </span>
+            </ModalDescription>
+          </ModalHeader>
+          <ModalFooter>
+            <Button
+              className='h-[32px] px-[12px]'
+              variant='outline'
+              onClick={() => setIsDeleteModalOpen(false)}
+              disabled={isDeleting}
+            >
+              Cancel
+            </Button>
+            <Button
+              className='h-[32px] bg-[var(--text-error)] px-[12px] text-[var(--white)] hover:bg-[var(--text-error)] hover:text-[var(--white)] dark:bg-[var(--text-error)] dark:text-[var(--white)] hover:dark:bg-[var(--text-error)] dark:hover:text-[var(--white)]'
+              onClick={handleDeleteWorkflow}
+              disabled={isDeleting}
+            >
+              {isDeleting ? 'Deleting...' : 'Delete'}
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Modal>
+
+      {/* Floating Variables Modal */}
+      <Variables />
     </>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx
index e7a9dadce6..de23983551 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node.tsx
@@ -6,7 +6,7 @@ import { cn } from '@/lib/utils'
 import { type DiffStatus, hasDiffStatus } from '@/lib/workflows/diff/types'
 import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 
 /**
  * Global styles for subflow nodes (loop and parallel containers).
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
index 6f8cbdff4e..0a11ad7b1a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -4,6 +4,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import clsx from 'clsx'
 import {
   ArrowDown,
+  ArrowDownToLine,
   ArrowUp,
   Check,
   ChevronDown,
@@ -25,6 +26,13 @@ import {
   PopoverTrigger,
   Tooltip,
 } from '@/components/emcn'
+import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils'
+import {
+  useOutputPanelResize,
+  useTerminalFilters,
+  useTerminalResize,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/hooks'
 import { getBlock } from '@/blocks'
 import type { ConsoleEntry } from '@/stores/terminal'
 import {
@@ -33,8 +41,6 @@ import {
   useTerminalStore,
 } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-// import { PrettierOutput } from './components'
-import { useOutputPanelResize, useTerminalFilters, useTerminalResize } from './hooks'
 
 /**
  * Terminal height configuration constants
@@ -261,6 +267,7 @@ export function Terminal() {
   } = useTerminalStore()
   const entries = useTerminalConsoleStore((state) => state.entries)
   const clearWorkflowConsole = useTerminalConsoleStore((state) => state.clearWorkflowConsole)
+  const exportConsoleCSV = useTerminalConsoleStore((state) => state.exportConsoleCSV)
   const { activeWorkflowId } = useWorkflowRegistry()
   const [selectedEntry, setSelectedEntry] = useState<ConsoleEntry | null>(null)
   const [isToggling, setIsToggling] = useState(false)
@@ -445,17 +452,61 @@ export function Terminal() {
   }, [selectedEntry, outputData, shouldShowCodeDisplay])
 
   /**
-   * Handle clear console for current workflow
+   * Clears the console for the active workflow.
+   *
+   * Extracted so it can be reused both by click handlers and global commands.
+   */
+  const clearCurrentWorkflowConsole = useCallback(() => {
+    if (activeWorkflowId) {
+      clearWorkflowConsole(activeWorkflowId)
+      setSelectedEntry(null)
+    }
+  }, [activeWorkflowId, clearWorkflowConsole])
+
+  /**
+   * Handle clear console for current workflow via mouse interaction.
    */
   const handleClearConsole = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation()
+      clearCurrentWorkflowConsole()
+    },
+    [clearCurrentWorkflowConsole]
+  )
+
+  /**
+   * Handle export of console entries for the current workflow via mouse interaction.
+   * Mirrors the visibility and interaction behavior of the clear console action.
+   */
+  const handleExportConsole = useCallback(
     (e: React.MouseEvent) => {
       e.stopPropagation()
       if (activeWorkflowId) {
-        clearWorkflowConsole(activeWorkflowId)
-        setSelectedEntry(null)
+        exportConsoleCSV(activeWorkflowId)
       }
     },
-    [activeWorkflowId, clearWorkflowConsole]
+    [activeWorkflowId, exportConsoleCSV]
+  )
+
+  /**
+   * Register global keyboard shortcuts for the terminal:
+   * - Mod+D: Clear terminal console for the active workflow
+   *
+   * The command is disabled in editable contexts so it does not interfere
+   * with typing inside inputs, textareas, or editors.
+   */
+  useRegisterGlobalCommands(() =>
+    createCommands([
+      {
+        id: 'clear-terminal-console',
+        handler: () => {
+          clearCurrentWorkflowConsole()
+        },
+        overrides: {
+          allowInEditable: false,
+        },
+      },
+    ])
   )
 
   /**
@@ -530,15 +581,19 @@ export function Terminal() {
    */
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
-      // Ignore when typing/navigating inside editable inputs/editors
       if (isEventFromEditableElement(e)) return
+      const activeElement = document.activeElement as HTMLElement | null
+      const toolbarRoot = document.querySelector(
+        '[data-toolbar-root][data-search-active=\"true\"]'
+      ) as HTMLElement | null
+      if (toolbarRoot && activeElement && toolbarRoot.contains(activeElement)) {
+        return
+      }
 
       if (!selectedEntry || filteredEntries.length === 0) return
 
-      // Only handle arrow keys
       if (e.key !== 'ArrowUp' && e.key !== 'ArrowDown') return
 
-      // Prevent default scrolling behavior
       e.preventDefault()
 
       const currentIndex = filteredEntries.findIndex((entry) => entry.id === selectedEntry.id)
@@ -568,13 +623,10 @@ export function Terminal() {
 
       if (!selectedEntry) return
 
-      // Only handle left/right arrow keys
       if (e.key !== 'ArrowLeft' && e.key !== 'ArrowRight') return
 
-      // Prevent default scrolling behavior
       e.preventDefault()
 
-      // Expand terminal if collapsed
       if (!isExpanded) {
         setIsToggling(true)
         const maxHeight = window.innerHeight * 0.7
@@ -583,12 +635,10 @@ export function Terminal() {
       }
 
       if (e.key === 'ArrowLeft') {
-        // Show output
         if (showInput) {
           setShowInput(false)
         }
       } else if (e.key === 'ArrowRight') {
-        // Show input (only if input data exists)
         if (!showInput && hasInputData) {
           setShowInput(true)
         }
@@ -605,7 +655,6 @@ export function Terminal() {
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
       if (e.key === 'Escape' && selectedEntry) {
-        // Escape unselects the current entry and re-enables auto-selection
         e.preventDefault()
         setSelectedEntry(null)
         setAutoSelectEnabled(true)
@@ -631,28 +680,22 @@ export function Terminal() {
         getComputedStyle(document.documentElement).getPropertyValue('--panel-width') || '0'
       )
 
-      // Calculate max width: total terminal width minus block column width
       const terminalWidth = window.innerWidth - sidebarWidth - panelWidth
       const maxWidth = terminalWidth - BLOCK_COLUMN_WIDTH_PX
 
-      // If current output panel width exceeds max, clamp it
       if (outputPanelWidth > maxWidth && maxWidth >= MIN_OUTPUT_PANEL_WIDTH_PX) {
         setOutputPanelWidth(Math.max(maxWidth, MIN_OUTPUT_PANEL_WIDTH_PX))
       }
     }
 
-    // Initial check
     handleResize()
 
-    // Listen for window resize events
     window.addEventListener('resize', handleResize)
 
-    // Create a MutationObserver to watch for CSS variable changes
     const observer = new MutationObserver(() => {
       handleResize()
     })
 
-    // Observe style attribute changes on the document element
     observer.observe(document.documentElement, {
       attributes: true,
       attributeFilter: ['style'],
@@ -915,21 +958,38 @@ export function Terminal() {
                     </Tooltip.Root>
                   )}
                   {filteredEntries.length > 0 && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={handleClearConsole}
-                          aria-label='Clear console'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <Trash2 className='h-3 w-3' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Clear console</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
+                    <>
+                      <Tooltip.Root>
+                        <Tooltip.Trigger asChild>
+                          <Button
+                            variant='ghost'
+                            onClick={handleExportConsole}
+                            aria-label='Download console CSV'
+                            className='!p-1.5 -m-1.5'
+                          >
+                            <ArrowDownToLine className='h-3 w-3' />
+                          </Button>
+                        </Tooltip.Trigger>
+                        <Tooltip.Content>
+                          <span>Download CSV</span>
+                        </Tooltip.Content>
+                      </Tooltip.Root>
+                      <Tooltip.Root>
+                        <Tooltip.Trigger asChild>
+                          <Button
+                            variant='ghost'
+                            onClick={handleClearConsole}
+                            aria-label='Clear console'
+                            className='!p-1.5 -m-1.5'
+                          >
+                            <Trash2 className='h-3 w-3' />
+                          </Button>
+                        </Tooltip.Trigger>
+                        <Tooltip.Content>
+                          <span>Clear console</span>
+                        </Tooltip.Content>
+                      </Tooltip.Root>
+                    </>
                   )}
                   <Popover open={mainOptionsOpen} onOpenChange={setMainOptionsOpen}>
                     <PopoverTrigger asChild>
@@ -1181,6 +1241,23 @@ export function Terminal() {
                       <span>{showCopySuccess ? 'Copied' : 'Copy output'}</span>
                     </Tooltip.Content>
                   </Tooltip.Root>
+                  {filteredEntries.length > 0 && (
+                    <Tooltip.Root>
+                      <Tooltip.Trigger asChild>
+                        <Button
+                          variant='ghost'
+                          onClick={handleExportConsole}
+                          aria-label='Download console CSV'
+                          className='!p-1.5 -m-1.5'
+                        >
+                          <ArrowDownToLine className='h-3 w-3' />
+                        </Button>
+                      </Tooltip.Trigger>
+                      <Tooltip.Content>
+                        <span>Download CSV</span>
+                      </Tooltip.Content>
+                    </Tooltip.Root>
+                  )}
                   {hasActiveFilters && (
                     <Tooltip.Root>
                       <Tooltip.Trigger asChild>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-controls.tsx
index 822fe50f63..c9e98a9d0b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-controls.tsx
@@ -2,10 +2,10 @@
 
 import { useEffect, useState } from 'react'
 import { getEnv, isTruthy } from '@/lib/env'
+import { TrainingFloatingButton } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-floating-button'
+import { TrainingModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-modal'
 import { useCopilotTrainingStore } from '@/stores/copilot-training/store'
 import { useGeneralStore } from '@/stores/settings/general/store'
-import { TrainingFloatingButton } from './training-floating-button'
-import { TrainingModal } from './training-modal'
 
 /**
  * Main training controls component that manages the training UI
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/webhook-settings/webhook-settings.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/webhook-settings/webhook-settings.tsx
similarity index 100%
rename from apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/webhook-settings/webhook-settings.tsx
rename to apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/webhook-settings/webhook-settings.tsx
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/connections/connections.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/connections/connections.tsx
index b4b8a00849..fcca532fb9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/connections/connections.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/connections/connections.tsx
@@ -1,4 +1,4 @@
-import { useBlockConnections } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/hooks/use-block-connections'
+import { useBlockConnections } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections'
 
 interface ConnectionsProps {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
index bd62a9a916..46b4398f87 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-workflow.ts
@@ -1,6 +1,6 @@
-import { useSubBlockValue } from '../../panel-new/components/editor/components/sub-block/hooks/use-sub-block-value'
-import type { WorkflowBlockProps } from '../types'
-import { useChildDeployment } from './use-child-deployment'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
+import { useChildDeployment } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks/use-child-deployment'
+import type { WorkflowBlockProps } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/types'
 
 /**
  * Return type for the useChildWorkflow hook
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
index 8d765467bd..1239ec3968 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
@@ -1,7 +1,7 @@
 import type { NodeProps } from 'reactflow'
+import { WEBHOOK_PROVIDERS } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/constants'
+import type { WorkflowBlockProps } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/types'
 import type { SubBlockConfig } from '@/blocks/types'
-import { WEBHOOK_PROVIDERS } from './constants'
-import type { WorkflowBlockProps } from './types'
 
 /**
  * Gets the display name for a webhook provider
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
index 7938954b5f..ebe0cad112 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -8,6 +8,21 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { createMcpToolId } from '@/lib/mcp/utils'
 import { cn } from '@/lib/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import {
+  ActionBar,
+  Connections,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components'
+import {
+  useBlockProperties,
+  useChildWorkflow,
+  useScheduleInfo,
+  useWebhookInfo,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks'
+import type { WorkflowBlockProps } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/types'
+import {
+  getProviderName,
+  shouldSkipBlockRender,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useBlockCore } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
 import {
   BLOCK_DIMENSIONS,
@@ -22,10 +37,6 @@ import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { ActionBar, Connections } from './components'
-import { useBlockProperties, useChildWorkflow, useScheduleInfo, useWebhookInfo } from './hooks'
-import type { WorkflowBlockProps } from './types'
-import { getProviderName, shouldSkipBlockRender } from './utils'
 
 const logger = createLogger('WorkflowBlock')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-core.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-core.ts
index 68dffa05ed..7625dc88cf 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-core.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-core.ts
@@ -1,11 +1,11 @@
 import { useCallback, useMemo } from 'react'
+import { useBlockState } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/hooks'
+import type { WorkflowBlockProps } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/types'
+import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow'
+import { getBlockRingStyles } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/block-ring-utils'
 import { useExecutionStore } from '@/stores/execution/store'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useBlockState } from '../components/workflow-block/hooks'
-import type { WorkflowBlockProps } from '../components/workflow-block/types'
-import { getBlockRingStyles } from '../utils/block-ring-utils'
-import { useCurrentWorkflow } from './use-current-workflow'
 
 interface UseBlockCoreOptions {
   blockId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts
index 0084308b99..622fed70ef 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-output-fields.ts
@@ -4,7 +4,7 @@ import { useMemo } from 'react'
 import { extractFieldsFromSchema } from '@/lib/response-format'
 import { getBlockOutputPaths, getBlockOutputs } from '@/lib/workflows/block-outputs'
 import { TRIGGER_TYPES } from '@/lib/workflows/triggers'
-import type { SchemaField } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/connection-blocks/components/field-item/field-item'
+import type { SchemaField } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/connection-blocks/components/field-item/field-item'
 import { getBlock } from '@/blocks'
 import type { BlockConfig } from '@/blocks/types'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts
index bfadab2819..e8299998c7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-scroll-management.ts
@@ -3,19 +3,37 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
 
 /**
- * Custom hook to manage scroll behavior in the copilot panel
- * Handles auto-scrolling during message streaming and user-initiated scrolling
+ * Options for configuring scroll behavior.
+ */
+interface UseScrollManagementOptions {
+  /**
+   * Scroll behavior for programmatic scrolls.
+   * - `smooth`: animated scroll (default, used by Copilot).
+   * - `auto`: immediate scroll to bottom (used by floating chat to avoid jitter).
+   */
+  behavior?: 'auto' | 'smooth'
+}
+
+/**
+ * Custom hook to manage scroll behavior in scrollable message panels.
+ * Handles auto-scrolling during message streaming and user-initiated scrolling.
  *
  * @param messages - Array of messages to track for scroll behavior
  * @param isSendingMessage - Whether a message is currently being sent/streamed
+ * @param options - Optional configuration for scroll behavior
  * @returns Scroll management utilities
  */
-export function useScrollManagement(messages: any[], isSendingMessage: boolean) {
+export function useScrollManagement(
+  messages: any[],
+  isSendingMessage: boolean,
+  options?: UseScrollManagementOptions
+) {
   const scrollAreaRef = useRef<HTMLDivElement>(null)
   const [isNearBottom, setIsNearBottom] = useState(true)
   const [userHasScrolledDuringStream, setUserHasScrolledDuringStream] = useState(false)
   const programmaticScrollInProgressRef = useRef(false)
   const lastScrollTopRef = useRef(0)
+  const scrollBehavior: 'auto' | 'smooth' = options?.behavior ?? 'smooth'
 
   /**
    * Scrolls the container to the bottom with smooth animation
@@ -33,13 +51,13 @@ export function useScrollManagement(messages: any[], isSendingMessage: boolean)
     programmaticScrollInProgressRef.current = true
     scrollContainer.scrollTo({
       top: scrollContainer.scrollHeight,
-      behavior: 'smooth',
+      behavior: scrollBehavior,
     })
     // Best-effort reset; not all browsers fire scrollend reliably
     window.setTimeout(() => {
       programmaticScrollInProgressRef.current = false
     }, 200)
-  }, [getScrollContainer])
+  }, [getScrollContainer, scrollBehavior])
 
   /**
    * Handles scroll events to track user position and show/hide scroll button
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
index 1ff1dd08a6..c15b61ea96 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
@@ -11,6 +11,7 @@ import {
   triggerNeedsMockPayload,
 } from '@/lib/workflows/trigger-utils'
 import { resolveStartCandidates, StartBlockPath, TriggerUtils } from '@/lib/workflows/triggers'
+import { useCurrentWorkflow } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-current-workflow'
 import type { BlockLog, ExecutionResult, StreamingExecution } from '@/executor/types'
 import { subscriptionKeys } from '@/hooks/queries/subscription'
 import { useExecutionStream } from '@/hooks/use-execution-stream'
@@ -23,7 +24,6 @@ import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
-import { useCurrentWorkflow } from './use-current-workflow'
 
 const logger = createLogger('useWorkflowExecution')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/page.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/page.tsx
index 602552e00f..f361b9a97c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/page.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/page.tsx
@@ -1,3 +1,3 @@
-import WorkFlow from '@/app/workspace/[workspaceId]/w/[workflowId]/workflow'
+import Workflow from '@/app/workspace/[workspaceId]/w/[workflowId]/workflow'
 
-export default WorkFlow
+export default Workflow
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index c752abc080..495cb0b1dc 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -34,8 +34,8 @@ import {
   useCurrentWorkflow,
   useNodeUtilities,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
-import { useSocket } from '@/contexts/socket-context'
 import { isAnnotationOnlyBlock } from '@/executor/consts'
 import { useWorkspaceEnvironment } from '@/hooks/queries/environment'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
@@ -43,8 +43,8 @@ import { useStreamCleanup } from '@/hooks/use-stream-cleanup'
 import { useWorkspacePermissions } from '@/hooks/use-workspace-permissions'
 import { useExecutionStore } from '@/stores/execution/store'
 import { useNotificationStore } from '@/stores/notifications/store'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 import { useGeneralStore } from '@/stores/settings/general/store'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -67,6 +67,8 @@ const edgeTypes: EdgeTypes = {
 // Memoized ReactFlow props to prevent unnecessary re-renders
 const defaultEdgeOptions = { type: 'custom' }
 const snapGrid: [number, number] = [20, 20]
+const reactFlowFitViewOptions = { padding: 0.6 } as const
+const reactFlowProOptions = { hideAttribution: true } as const
 
 interface SelectedEdgeInfo {
   id: string
@@ -275,6 +277,7 @@ const WorkflowContent = React.memo(() => {
   const {
     collaborativeAddBlock: addBlock,
     collaborativeAddEdge: addEdge,
+    collaborativeRemoveBlock: removeBlock,
     collaborativeRemoveEdge: removeEdge,
     collaborativeUpdateBlockPosition,
     collaborativeUpdateParentId: updateParentId,
@@ -2056,6 +2059,56 @@ const WorkflowContent = React.memo(() => {
     return () => window.removeEventListener('keydown', handleKeyDown)
   }, [selectedEdgeInfo, removeEdge])
 
+  /**
+   * Handle Delete / Backspace for removing selected blocks.
+   *
+   * This mirrors the behavior of clicking the ActionBar delete button by
+   * invoking the collaborative remove-block helper. The handler is disabled
+   * while focus is inside editable elements so it does not interfere with
+   * text editing.
+   */
+  useEffect(() => {
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key !== 'Delete' && event.key !== 'Backspace') {
+        return
+      }
+
+      // Ignore when typing/navigating inside editable inputs or editors
+      const activeElement = document.activeElement
+      const isEditableElement =
+        activeElement instanceof HTMLInputElement ||
+        activeElement instanceof HTMLTextAreaElement ||
+        activeElement?.hasAttribute('contenteditable')
+
+      if (isEditableElement) {
+        return
+      }
+
+      if (!effectivePermissions.canEdit) {
+        return
+      }
+
+      const selectedNodes = getNodes().filter((node) => node.selected)
+      if (selectedNodes.length === 0) {
+        return
+      }
+
+      // Prevent default browser behavior (e.g., page navigation) when we act
+      event.preventDefault()
+
+      try {
+        // For now, mirror edge behavior and delete the primary selected block
+        const primaryNode = selectedNodes[0]
+        removeBlock(primaryNode.id)
+      } catch (err) {
+        logger.error('Failed to delete block via keyboard', { err })
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [getNodes, removeBlock, effectivePermissions.canEdit])
+
   // Handle sub-block value updates from custom events
   useEffect(() => {
     const handleSubBlockValueUpdate = (event: CustomEvent) => {
@@ -2111,19 +2164,19 @@ const WorkflowContent = React.memo(() => {
           onDrop={effectivePermissions.canEdit ? onDrop : undefined}
           onDragOver={effectivePermissions.canEdit ? onDragOver : undefined}
           fitView
-          fitViewOptions={{ padding: 0.6 }}
           onInit={(instance) => {
             requestAnimationFrame(() => {
               requestAnimationFrame(() => {
-                instance.fitView({ padding: 0.3 })
+                instance.fitView(reactFlowFitViewOptions)
               })
             })
           }}
           minZoom={0.1}
           maxZoom={1.3}
           panOnScroll
+          fitViewOptions={reactFlowFitViewOptions} // Not seen due to onInit
           defaultEdgeOptions={defaultEdgeOptions}
-          proOptions={{ hideAttribution: true }}
+          proOptions={reactFlowProOptions}
           connectionLineStyle={connectionLineStyle}
           connectionLineType={ConnectionLineType.SmoothStep}
           onNodeClick={(e, _node) => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-modal.tsx
index 44da500ba2..161e90f9f1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-modal.tsx
@@ -9,8 +9,8 @@ import { Dialog, DialogPortal, DialogTitle } from '@/components/ui/dialog'
 import { useBrandConfig } from '@/lib/branding/branding'
 import { cn } from '@/lib/utils'
 import { getTriggersForSidebar, hasTriggerCapability } from '@/lib/workflows/trigger-utils'
+import { searchItems } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/search-modal/search-utils'
 import { getAllBlocks } from '@/blocks'
-import { searchItems } from './search-utils'
 
 interface SearchModalProps {
   open: boolean
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/creator-profile/creator-profile.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/creator-profile/creator-profile.tsx
index fbc61919b1..ffbda998ce 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/creator-profile/creator-profile.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/creator-profile/creator-profile.tsx
@@ -11,13 +11,13 @@ import { AgentIcon } from '@/components/icons'
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui'
 import { useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
+import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 import { useProfilePictureUpload } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/account/hooks/use-profile-picture-upload'
 import {
   useCreatorProfile,
   useOrganizations,
   useSaveCreatorProfile,
 } from '@/hooks/queries/creator-profile'
-import type { CreatorProfileDetails } from '@/types/creator-profile'
 
 const logger = createLogger('CreatorProfile')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/custom-tools/custom-tools.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/custom-tools/custom-tools.tsx
index f97f0db755..b26ac39813 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/custom-tools/custom-tools.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/custom-tools/custom-tools.tsx
@@ -15,7 +15,7 @@ import {
 } from '@/components/emcn'
 import { Alert, AlertDescription, Input, Skeleton } from '@/components/ui'
 import { createLogger } from '@/lib/logs/console/logger'
-import { CustomToolModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal'
+import { CustomToolModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/custom-tool-modal/custom-tool-modal'
 import { useCustomTools, useDeleteCustomTool } from '@/hooks/queries/custom-tools'
 
 const logger = createLogger('CustomToolsSettings')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/components/add-server-form.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/components/add-server-form.tsx
index 08fc694043..b670c1ead0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/components/add-server-form.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/components/add-server-form.tsx
@@ -2,8 +2,8 @@
 
 import { Plus, X } from 'lucide-react'
 import { Button, Input, Label } from '@/components/emcn'
-import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
-import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/formatted-text'
+import { EnvVarDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import type { McpServerFormData, McpServerTestResult } from '../types'
 
 interface AddServerFormProps {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/mcp.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/mcp.tsx
index a2b9cd4efb..b0c10a5486 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/mcp.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/mcp.tsx
@@ -7,7 +7,9 @@ import { Button } from '@/components/emcn'
 import { Alert, AlertDescription, Input, Skeleton } from '@/components/ui'
 import { createLogger } from '@/lib/logs/console/logger'
 import { createMcpToolId } from '@/lib/mcp/utils'
-import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/env-var-dropdown'
+import { checkEnvVarTrigger } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/env-var-dropdown'
+import { AddServerForm } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/components/add-server-form'
+import type { McpServerFormData } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/mcp/types'
 import {
   useCreateMcpServer,
   useDeleteMcpServer,
@@ -15,8 +17,6 @@ import {
   useMcpToolsQuery,
 } from '@/hooks/queries/mcp'
 import { useMcpServerTest } from '@/hooks/use-mcp-server-test'
-import { AddServerForm } from './components/add-server-form'
-import type { McpServerFormData } from './types'
 
 const logger = createLogger('McpSettings')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/plan-configs.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/plan-configs.ts
index 3e8200353f..65998bb8f7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/plan-configs.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/plan-configs.ts
@@ -10,7 +10,7 @@ import {
   Users,
   Zap,
 } from 'lucide-react'
-import type { PlanFeature } from './components/plan-card'
+import type { PlanFeature } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/settings-modal/components/subscription/components/plan-card'
 
 export const PRO_PLAN_FEATURES: PlanFeature[] = [
   { icon: Zap, text: '25 runs per minute (sync)' },
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/usage-indicator/usage-indicator.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/usage-indicator/usage-indicator.tsx
index 50ba451637..7f01e43be5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/usage-indicator/usage-indicator.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/usage-indicator/usage-indicator.tsx
@@ -12,10 +12,10 @@ import {
   getUsage,
 } from '@/lib/subscription/helpers'
 import { isUsageAtLimit, USAGE_PILL_COLORS } from '@/lib/subscription/usage-visualization'
-import { useSocket } from '@/contexts/socket-context'
+import { RotatingDigit } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/usage-indicator/rotating-digit'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { subscriptionKeys, useSubscriptionData } from '@/hooks/queries/subscription'
 import { MIN_SIDEBAR_WIDTH, useSidebarStore } from '@/stores/sidebar/store'
-import { RotatingDigit } from './rotating-digit'
 
 const logger = createLogger('UsageIndicator')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/workflow-item/avatars/avatars.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/workflow-item/avatars/avatars.tsx
index 549239db6a..077ed8970b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/workflow-item/avatars/avatars.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/workflow-item/avatars/avatars.tsx
@@ -5,7 +5,7 @@ import Image from 'next/image'
 import { Tooltip } from '@/components/emcn'
 import { useSession } from '@/lib/auth-client'
 import { getUserColor } from '@/app/workspace/[workspaceId]/w/utils/get-user-color'
-import { useSocket } from '@/contexts/socket-context'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
 
 interface AvatarsProps {
   workflowId: string
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workspace-header/workspace-header.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workspace-header/workspace-header.tsx
index 1c35acb639..cebca72571 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components-new/workspace-header/workspace-header.tsx
@@ -16,9 +16,9 @@ import {
 } from '@/components/emcn'
 import { createLogger } from '@/lib/logs/console/logger'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { ContextMenu } from '../workflow-list/components/context-menu/context-menu'
-import { DeleteModal } from '../workflow-list/components/delete-modal/delete-modal'
-import { InviteModal } from './components/invite-modal/invite-modal'
+import { ContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/context-menu/context-menu'
+import { DeleteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/workflow-list/components/delete-modal/delete-modal'
+import { InviteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components-new/workspace-header/components/invite-modal/invite-modal'
 
 const logger = createLogger('WorkspaceHeader')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/knowledge-base-tags.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/knowledge-base-tags.tsx
index bc0dc2bdfc..df57a2cade 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/knowledge-base-tags.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/knowledge-base-tags.tsx
@@ -36,11 +36,11 @@ import { ScrollArea } from '@/components/ui/scroll-area'
 import { MAX_TAG_SLOTS } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { DocumentList } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/components/document-list'
 import {
   type TagDefinition,
   useKnowledgeBaseTagDefinitions,
 } from '@/hooks/use-knowledge-base-tag-definitions'
-import { DocumentList } from './components/document-list'
 
 const logger = createLogger('KnowledgeBaseTags')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
index 61cb9eea5e..6162db6f86 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar-new.tsx
@@ -8,6 +8,7 @@ import { useSession } from '@/lib/auth-client'
 import { getEnv, isTruthy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
+import { createCommands } from '@/app/workspace/[workspaceId]/utils/commands-utils'
 import {
   FooterNavigation,
   SearchModal,
@@ -31,7 +32,6 @@ import { useSearchModalStore } from '@/stores/search-modal/store'
 import { MIN_SIDEBAR_WIDTH, useSidebarStore } from '@/stores/sidebar/store'
 
 const logger = createLogger('SidebarNew')
-
 // Feature flag: Billing usage indicator visibility (matches legacy sidebar behavior)
 const isBillingEnabled = isTruthy(getEnv('NEXT_PUBLIC_BILLING_ENABLED'))
 
@@ -377,90 +377,84 @@ export function SidebarNew() {
   )
 
   /**
-   * Register global commands:
-   * - Mod+Shift+A: Add an Agent block to the canvas
-   * - Mod+Y: Navigate to Templates (attempts to override browser history)
-   * - Mod+L: Navigate to Logs (attempts to override browser location bar)
-   * - Mod+K: Search (placeholder; no-op for now)
+   * Resolve a workspace id from either params or the current URL path.
+   *
+   * This mirrors existing behavior but is wrapped in a helper to keep command
+   * handlers small and focused.
    */
-  useRegisterGlobalCommands(() => [
-    {
-      id: 'add-agent',
-      shortcut: 'Mod+Shift+A',
-      allowInEditable: true,
-      handler: () => {
-        try {
-          const event = new CustomEvent('add-block-from-toolbar', {
-            detail: { type: 'agent', enableTriggerMode: false },
-          })
-          window.dispatchEvent(event)
-          logger.info('Dispatched add-agent command')
-        } catch (err) {
-          logger.error('Failed to dispatch add-agent command', { err })
-        }
+  const resolveWorkspaceIdFromPath = useCallback((): string | undefined => {
+    if (workspaceId) return workspaceId
+    if (typeof window === 'undefined') return undefined
+
+    const parts = window.location.pathname.split('/')
+    const idx = parts.indexOf('workspace')
+    if (idx === -1) return undefined
+
+    return parts[idx + 1]
+  }, [workspaceId])
+
+  /**
+   * Register global sidebar commands using the central commands registry.
+   *
+   * Only commands declared in the registry can be registered here. The
+   * registry owns ids and shortcut strings; this component supplies handlers.
+   */
+  useRegisterGlobalCommands(() =>
+    createCommands([
+      {
+        id: 'add-agent',
+        handler: () => {
+          try {
+            const event = new CustomEvent('add-block-from-toolbar', {
+              detail: { type: 'agent', enableTriggerMode: false },
+            })
+            window.dispatchEvent(event)
+            logger.info('Dispatched add-agent command')
+          } catch (err) {
+            logger.error('Failed to dispatch add-agent command', { err })
+          }
+        },
       },
-    },
-    {
-      id: 'goto-templates',
-      shortcut: 'Mod+Y',
-      allowInEditable: true,
-      handler: () => {
-        try {
-          const pathWorkspaceId =
-            workspaceId ||
-            (typeof window !== 'undefined'
-              ? (() => {
-                  const parts = window.location.pathname.split('/')
-                  const idx = parts.indexOf('workspace')
-                  return idx !== -1 ? parts[idx + 1] : undefined
-                })()
-              : undefined)
-          if (pathWorkspaceId) {
-            router.push(`/workspace/${pathWorkspaceId}/templates`)
-            logger.info('Navigated to templates', { workspaceId: pathWorkspaceId })
-          } else {
-            logger.warn('No workspace ID found, cannot navigate to templates')
+      {
+        id: 'goto-templates',
+        handler: () => {
+          try {
+            const pathWorkspaceId = resolveWorkspaceIdFromPath()
+            if (pathWorkspaceId) {
+              router.push(`/workspace/${pathWorkspaceId}/templates`)
+              logger.info('Navigated to templates', { workspaceId: pathWorkspaceId })
+            } else {
+              logger.warn('No workspace ID found, cannot navigate to templates')
+            }
+          } catch (err) {
+            logger.error('Failed to navigate to templates', { err })
           }
-        } catch (err) {
-          logger.error('Failed to navigate to templates', { err })
-        }
+        },
       },
-    },
-    {
-      id: 'goto-logs',
-      shortcut: 'Mod+L',
-      allowInEditable: true,
-      handler: () => {
-        try {
-          const pathWorkspaceId =
-            workspaceId ||
-            (typeof window !== 'undefined'
-              ? (() => {
-                  const parts = window.location.pathname.split('/')
-                  const idx = parts.indexOf('workspace')
-                  return idx !== -1 ? parts[idx + 1] : undefined
-                })()
-              : undefined)
-          if (pathWorkspaceId) {
-            router.push(`/workspace/${pathWorkspaceId}/logs`)
-            logger.info('Navigated to logs', { workspaceId: pathWorkspaceId })
-          } else {
-            logger.warn('No workspace ID found, cannot navigate to logs')
+      {
+        id: 'goto-logs',
+        handler: () => {
+          try {
+            const pathWorkspaceId = resolveWorkspaceIdFromPath()
+            if (pathWorkspaceId) {
+              router.push(`/workspace/${pathWorkspaceId}/logs`)
+              logger.info('Navigated to logs', { workspaceId: pathWorkspaceId })
+            } else {
+              logger.warn('No workspace ID found, cannot navigate to logs')
+            }
+          } catch (err) {
+            logger.error('Failed to navigate to logs', { err })
           }
-        } catch (err) {
-          logger.error('Failed to navigate to logs', { err })
-        }
+        },
       },
-    },
-    {
-      id: 'open-search',
-      shortcut: 'Mod+K',
-      allowInEditable: true,
-      handler: () => {
-        openSearchModal()
+      {
+        id: 'open-search',
+        handler: () => {
+          openSearchModal()
+        },
       },
-    },
-  ])
+    ])
+  )
 
   return (
     <>
diff --git a/apps/sim/app/workspace/layout.tsx b/apps/sim/app/workspace/layout.tsx
index c7245db73c..e15dd21384 100644
--- a/apps/sim/app/workspace/layout.tsx
+++ b/apps/sim/app/workspace/layout.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import { useSession } from '@/lib/auth-client'
-import { SocketProvider } from '@/contexts/socket-context'
+import { SocketProvider } from '@/app/workspace/providers/socket-provider'
 
 interface WorkspaceRootLayoutProps {
   children: React.ReactNode
diff --git a/apps/sim/contexts/socket-context.tsx b/apps/sim/app/workspace/providers/socket-provider.tsx
similarity index 100%
rename from apps/sim/contexts/socket-context.tsx
rename to apps/sim/app/workspace/providers/socket-provider.tsx
diff --git a/apps/sim/components/emails/batch-invitation-email.tsx b/apps/sim/components/emails/batch-invitation-email.tsx
index 1bf57e0fc2..9ec2f16ef2 100644
--- a/apps/sim/components/emails/batch-invitation-email.tsx
+++ b/apps/sim/components/emails/batch-invitation-email.tsx
@@ -11,10 +11,10 @@ import {
   Section,
   Text,
 } from '@react-email/components'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 interface WorkspaceInvitation {
   workspaceId: string
diff --git a/apps/sim/components/emails/help-confirmation-email.tsx b/apps/sim/components/emails/help-confirmation-email.tsx
index 890d84aec8..f6b6320564 100644
--- a/apps/sim/components/emails/help-confirmation-email.tsx
+++ b/apps/sim/components/emails/help-confirmation-email.tsx
@@ -11,10 +11,10 @@ import {
   Text,
 } from '@react-email/components'
 import { format } from 'date-fns'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 interface HelpConfirmationEmailProps {
   userEmail?: string
diff --git a/apps/sim/components/emails/invitation-email.tsx b/apps/sim/components/emails/invitation-email.tsx
index ef01196b19..d8eb567398 100644
--- a/apps/sim/components/emails/invitation-email.tsx
+++ b/apps/sim/components/emails/invitation-email.tsx
@@ -12,11 +12,11 @@ import {
   Text,
 } from '@react-email/components'
 import { format } from 'date-fns'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 interface InvitationEmailProps {
   inviterName?: string
diff --git a/apps/sim/components/emails/otp-verification-email.tsx b/apps/sim/components/emails/otp-verification-email.tsx
index f8249537d2..913a2936fb 100644
--- a/apps/sim/components/emails/otp-verification-email.tsx
+++ b/apps/sim/components/emails/otp-verification-email.tsx
@@ -10,10 +10,10 @@ import {
   Section,
   Text,
 } from '@react-email/components'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 interface OTPVerificationEmailProps {
   otp: string
diff --git a/apps/sim/components/emails/reset-password-email.tsx b/apps/sim/components/emails/reset-password-email.tsx
index 081579faaf..db921ef5e9 100644
--- a/apps/sim/components/emails/reset-password-email.tsx
+++ b/apps/sim/components/emails/reset-password-email.tsx
@@ -12,10 +12,10 @@ import {
   Text,
 } from '@react-email/components'
 import { format } from 'date-fns'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 interface ResetPasswordEmailProps {
   username?: string
diff --git a/apps/sim/components/emails/workspace-invitation.tsx b/apps/sim/components/emails/workspace-invitation.tsx
index 959c45dd14..89ff2ac28e 100644
--- a/apps/sim/components/emails/workspace-invitation.tsx
+++ b/apps/sim/components/emails/workspace-invitation.tsx
@@ -11,11 +11,11 @@ import {
   Section,
   Text,
 } from '@react-email/components'
+import { baseStyles } from '@/components/emails/base-styles'
+import EmailFooter from '@/components/emails/footer'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { baseStyles } from './base-styles'
-import EmailFooter from './footer'
 
 const logger = createLogger('WorkspaceInvitationEmail')
 
diff --git a/apps/sim/components/emcn/components/code/code.tsx b/apps/sim/components/emcn/components/code/code.tsx
index 723a389527..7f883837df 100644
--- a/apps/sim/components/emcn/components/code/code.tsx
+++ b/apps/sim/components/emcn/components/code/code.tsx
@@ -333,7 +333,7 @@ function Viewer({
                     {idx + 1}
                   </div>
                   <pre
-                    className='m-0 min-w-0 whitespace-pre-wrap pr-2 pl-2 font-mono text-[#eeeeee] text-[13px] leading-[21px]'
+                    className='m-0 min-w-0 whitespace-pre-wrap break-words pr-2 pl-2 font-mono text-[#eeeeee] text-[13px] leading-[21px]'
                     // Using per-line highlighting keeps the gutter height in sync with wrapped content
                     dangerouslySetInnerHTML={{ __html: perLineHighlighted || '&nbsp;' }}
                   />
diff --git a/apps/sim/components/emcn/components/combobox/combobox.tsx b/apps/sim/components/emcn/components/combobox/combobox.tsx
index 6f12eca66b..af21d087f4 100644
--- a/apps/sim/components/emcn/components/combobox/combobox.tsx
+++ b/apps/sim/components/emcn/components/combobox/combobox.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import {
   type ChangeEvent,
   forwardRef,
diff --git a/apps/sim/components/emcn/icons/copy.tsx b/apps/sim/components/emcn/icons/copy.tsx
index 076acbabb8..e331aab9c6 100644
--- a/apps/sim/components/emcn/icons/copy.tsx
+++ b/apps/sim/components/emcn/icons/copy.tsx
@@ -1,5 +1,5 @@
 import type { SVGProps } from 'react'
-import styles from './animate/copy.module.css'
+import styles from '@/components/emcn/icons/animate/copy.module.css'
 
 export interface CopyProps extends SVGProps<SVGSVGElement> {
   /**
diff --git a/apps/sim/components/emcn/icons/layout.tsx b/apps/sim/components/emcn/icons/layout.tsx
index 57755348ea..649de0124c 100644
--- a/apps/sim/components/emcn/icons/layout.tsx
+++ b/apps/sim/components/emcn/icons/layout.tsx
@@ -1,5 +1,5 @@
 import type { SVGProps } from 'react'
-import styles from './animate/layout.module.css'
+import styles from '@/components/emcn/icons/animate/layout.module.css'
 
 export type LayoutAnimationVariant = 'clockwise' | 'counterclockwise'
 
diff --git a/apps/sim/components/ui/image-upload.tsx b/apps/sim/components/ui/image-upload.tsx
deleted file mode 100644
index 8da253df67..0000000000
--- a/apps/sim/components/ui/image-upload.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useState } from 'react'
-import { ImagePlus, Loader2, Trash2, Upload, X } from 'lucide-react'
-import Image from 'next/image'
-import { Button } from '@/components/ui/button'
-import { Input } from '@/components/ui/input'
-import { cn } from '@/lib/utils'
-import { useImageUpload } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/chat-deploy/hooks/use-image-upload'
-
-interface ImageUploadProps {
-  onUpload?: (url: string | null) => void
-  onError?: (error: string) => void
-  onUploadStart?: (isUploading: boolean) => void
-  title?: string
-  description?: string
-  height?: string
-  className?: string
-  disabled?: boolean
-  acceptedFormats?: string[]
-  uploadToServer?: boolean
-  value?: string | null
-  hideHeader?: boolean
-}
-
-export function ImageUpload({
-  onUpload,
-  onError,
-  onUploadStart,
-  title = 'Logo Image',
-  description = 'PNG or JPEG (max 5MB)',
-  height = 'h-64',
-  className,
-  disabled = false,
-  acceptedFormats = ['image/png', 'image/jpeg', 'image/jpg'],
-  uploadToServer = false,
-  value,
-  hideHeader = false,
-}: ImageUploadProps) {
-  const {
-    previewUrl,
-    fileName,
-    fileInputRef,
-    handleThumbnailClick,
-    handleFileChange,
-    handleRemove,
-    isUploading,
-  } = useImageUpload({
-    onUpload,
-    onError,
-    uploadToServer,
-  })
-
-  const [isDragging, setIsDragging] = useState(false)
-
-  // Use value prop if provided, otherwise use internal previewUrl
-  const displayUrl = value || previewUrl
-  const isDisabled = disabled || isUploading
-
-  // Notify parent when upload status changes
-  useEffect(() => {
-    onUploadStart?.(isUploading)
-  }, [isUploading, onUploadStart])
-
-  const handleDragOver = (e: React.DragEvent<HTMLDivElement>) => {
-    e.preventDefault()
-    e.stopPropagation()
-  }
-
-  const handleDragEnter = (e: React.DragEvent<HTMLDivElement>) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setIsDragging(true)
-  }
-
-  const handleDragLeave = (e: React.DragEvent<HTMLDivElement>) => {
-    e.preventDefault()
-    e.stopPropagation()
-    setIsDragging(false)
-  }
-
-  const handleDrop = useCallback(
-    (e: React.DragEvent<HTMLDivElement>) => {
-      if (isDisabled) return
-
-      e.preventDefault()
-      e.stopPropagation()
-      setIsDragging(false)
-
-      const file = e.dataTransfer.files?.[0]
-      if (file) {
-        const fakeEvent = {
-          target: {
-            files: [file],
-          },
-        } as unknown as React.ChangeEvent<HTMLInputElement>
-        handleFileChange(fakeEvent)
-      }
-    },
-    [isDisabled, handleFileChange]
-  )
-
-  return (
-    <div
-      className={cn(
-        hideHeader
-          ? 'w-full space-y-4'
-          : 'w-full max-w-md space-y-6 rounded-xl border border-border bg-card p-6 shadow-sm',
-        className
-      )}
-    >
-      {!hideHeader && (
-        <div className='space-y-2'>
-          <h3 className='font-medium text-lg'>{title}</h3>
-          <p className='text-muted-foreground text-sm'>{description}</p>
-        </div>
-      )}
-
-      <Input
-        type='file'
-        accept={acceptedFormats.join(',')}
-        className='hidden'
-        ref={fileInputRef}
-        onChange={handleFileChange}
-        disabled={isDisabled}
-      />
-
-      {!displayUrl ? (
-        <div
-          onClick={
-            isDisabled
-              ? undefined
-              : (e) => {
-                  e.preventDefault()
-                  e.stopPropagation()
-                  handleThumbnailClick()
-                }
-          }
-          onDragOver={isDisabled ? undefined : handleDragOver}
-          onDragEnter={isDisabled ? undefined : handleDragEnter}
-          onDragLeave={isDisabled ? undefined : handleDragLeave}
-          onDrop={isDisabled ? undefined : handleDrop}
-          className={cn(
-            'flex cursor-pointer flex-col items-center justify-center gap-4 rounded-lg border-2 border-muted-foreground/25 border-dashed bg-muted/50 transition-colors',
-            height,
-            !isDisabled && 'hover:bg-muted',
-            isDragging && !isDisabled && 'border-primary/50 bg-primary/5',
-            isDisabled && 'cursor-not-allowed opacity-50'
-          )}
-        >
-          <div className='rounded-full bg-background p-3 shadow-sm'>
-            {isUploading ? (
-              <Loader2 className='h-6 w-6 animate-spin text-muted-foreground' />
-            ) : (
-              <ImagePlus className='h-6 w-6 text-muted-foreground' />
-            )}
-          </div>
-          <div className='text-center'>
-            <p className='font-medium text-sm'>
-              {isUploading ? 'Uploading...' : 'Click to select'}
-            </p>
-            <p className='text-muted-foreground text-xs'>
-              {isUploading ? 'Please wait' : 'or drag and drop file here'}
-            </p>
-          </div>
-        </div>
-      ) : displayUrl ? (
-        <div className='relative'>
-          <div className={cn('group relative overflow-hidden rounded-lg border', height)}>
-            <Image
-              src={displayUrl}
-              alt='Preview'
-              fill
-              className='object-cover transition-transform duration-300 group-hover:scale-105'
-              sizes='(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw'
-            />
-            <div className='absolute inset-0 bg-black/40 opacity-0 transition-opacity group-hover:opacity-100' />
-            <div className='absolute inset-0 flex items-center justify-center gap-2 opacity-0 transition-opacity group-hover:opacity-100'>
-              <Button
-                type='button'
-                size='sm'
-                variant='secondary'
-                onClick={(e) => {
-                  e.preventDefault()
-                  e.stopPropagation()
-                  handleThumbnailClick()
-                }}
-                className='h-9 w-9 p-0'
-                disabled={isDisabled}
-              >
-                <Upload className='h-4 w-4' />
-              </Button>
-              <Button
-                type='button'
-                size='sm'
-                variant='destructive'
-                onClick={(e) => {
-                  e.preventDefault()
-                  e.stopPropagation()
-                  handleRemove()
-                }}
-                className='h-9 w-9 p-0'
-                disabled={isDisabled}
-              >
-                <Trash2 className='h-4 w-4' />
-              </Button>
-            </div>
-          </div>
-          {fileName && (
-            <div className='mt-2 flex items-center gap-2 text-muted-foreground text-sm'>
-              <span className='truncate'>{fileName}</span>
-              <button
-                type='button'
-                onClick={(e) => {
-                  e.preventDefault()
-                  e.stopPropagation()
-                  handleRemove()
-                }}
-                className='ml-auto rounded-full p-1 hover:bg-muted disabled:cursor-not-allowed disabled:opacity-50'
-                disabled={isDisabled}
-              >
-                <X className='h-4 w-4' />
-              </button>
-            </div>
-          )}
-        </div>
-      ) : null}
-    </div>
-  )
-}
diff --git a/apps/sim/components/ui/index.ts b/apps/sim/components/ui/index.ts
index 6b24c30ba6..bd9ccfc03f 100644
--- a/apps/sim/components/ui/index.ts
+++ b/apps/sim/components/ui/index.ts
@@ -78,7 +78,6 @@ export {
   FormMessage,
   useFormField,
 } from './form'
-export { ImageUpload } from './image-upload'
 export { Input } from './input'
 export { InputOTP, InputOTPGroup, InputOTPSeparator, InputOTPSlot } from './input-otp'
 export { OTPInputForm } from './input-otp-form'
diff --git a/apps/sim/executor/execution/block-executor.ts b/apps/sim/executor/execution/block-executor.ts
index 4c260f463d..59e6d5474b 100644
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -187,12 +187,19 @@ export class BlockExecutor {
   ): NormalizedBlockOutput {
     const duration = Date.now() - startTime
     const errorMessage = normalizeError(error)
+    const hasResolvedInputs =
+      resolvedInputs && typeof resolvedInputs === 'object' && Object.keys(resolvedInputs).length > 0
+    const input =
+      hasResolvedInputs && resolvedInputs
+        ? resolvedInputs
+        : ((block.config?.params as Record<string, any> | undefined) ?? {})
 
     if (blockLog) {
       blockLog.endedAt = new Date().toISOString()
       blockLog.durationMs = duration
       blockLog.success = false
       blockLog.error = errorMessage
+      blockLog.input = input
     }
 
     const errorOutput: NormalizedBlockOutput = {
@@ -215,7 +222,7 @@ export class BlockExecutor {
     )
 
     if (!isSentinel) {
-      this.callOnBlockComplete(ctx, node, block, resolvedInputs, errorOutput, duration)
+      this.callOnBlockComplete(ctx, node, block, input, errorOutput, duration)
     }
 
     const hasErrorPort = this.hasErrorPortEdge(node)
diff --git a/apps/sim/hooks/queries/api-keys.ts b/apps/sim/hooks/queries/api-keys.ts
index 69d847f0fb..2daf9fb1d1 100644
--- a/apps/sim/hooks/queries/api-keys.ts
+++ b/apps/sim/hooks/queries/api-keys.ts
@@ -1,5 +1,5 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { workspaceKeys } from './workspace'
+import { workspaceKeys } from '@/hooks/queries/workspace'
 
 /**
  * Query key factories for API keys-related queries
diff --git a/apps/sim/hooks/queries/creator-profile.ts b/apps/sim/hooks/queries/creator-profile.ts
index 0b08506176..7dea4f5838 100644
--- a/apps/sim/hooks/queries/creator-profile.ts
+++ b/apps/sim/hooks/queries/creator-profile.ts
@@ -1,6 +1,6 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { CreatorProfileDetails } from '@/types/creator-profile'
+import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 
 const logger = createLogger('CreatorProfileQuery')
 
diff --git a/apps/sim/hooks/queries/sso.ts b/apps/sim/hooks/queries/sso.ts
index 18c9618c02..7c5c769ab7 100644
--- a/apps/sim/hooks/queries/sso.ts
+++ b/apps/sim/hooks/queries/sso.ts
@@ -1,5 +1,5 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { organizationKeys } from './organization'
+import { organizationKeys } from '@/hooks/queries/organization'
 
 /**
  * Query key factories for SSO-related queries
diff --git a/apps/sim/hooks/queries/subscription.ts b/apps/sim/hooks/queries/subscription.ts
index 969a3d3876..057e202958 100644
--- a/apps/sim/hooks/queries/subscription.ts
+++ b/apps/sim/hooks/queries/subscription.ts
@@ -1,5 +1,5 @@
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-import { organizationKeys } from './organization'
+import { organizationKeys } from '@/hooks/queries/organization'
 
 /**
  * Query key factories for subscription-related queries
diff --git a/apps/sim/hooks/selectors/registry.ts b/apps/sim/hooks/selectors/registry.ts
index 3647559e19..00990740a2 100644
--- a/apps/sim/hooks/selectors/registry.ts
+++ b/apps/sim/hooks/selectors/registry.ts
@@ -1,11 +1,11 @@
-import { fetchJson, fetchOAuthToken } from './helpers'
+import { fetchJson, fetchOAuthToken } from '@/hooks/selectors/helpers'
 import type {
   SelectorContext,
   SelectorDefinition,
   SelectorKey,
   SelectorOption,
   SelectorQueryArgs,
-} from './types'
+} from '@/hooks/selectors/types'
 
 const SELECTOR_STALE = 60 * 1000
 
diff --git a/apps/sim/hooks/selectors/use-selector-query.ts b/apps/sim/hooks/selectors/use-selector-query.ts
index 4ef0b26219..85a2aab98f 100644
--- a/apps/sim/hooks/selectors/use-selector-query.ts
+++ b/apps/sim/hooks/selectors/use-selector-query.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { useQuery } from '@tanstack/react-query'
-import { getSelectorDefinition, mergeOption } from './registry'
-import type { SelectorKey, SelectorOption, SelectorQueryArgs } from './types'
+import { getSelectorDefinition, mergeOption } from '@/hooks/selectors/registry'
+import type { SelectorKey, SelectorOption, SelectorQueryArgs } from '@/hooks/selectors/types'
 
 interface SelectorHookArgs extends Omit<SelectorQueryArgs, 'key'> {
   search?: string
diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts
index 848afe30dc..bcd5685bf5 100644
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -4,12 +4,12 @@ import { useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBlockOutputs } from '@/lib/workflows/block-outputs'
 import { TriggerUtils } from '@/lib/workflows/triggers'
+import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
-import { useSocket } from '@/contexts/socket-context'
 import { useUndoRedo } from '@/hooks/use-undo-redo'
 import { registerEmitFunctions, useOperationQueue } from '@/stores/operation-queue/store'
+import { usePanelEditorStore } from '@/stores/panel/editor/store'
 import { useVariablesStore } from '@/stores/panel/variables/store'
-import { usePanelEditorStore } from '@/stores/panel-new/editor/store'
 import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -889,7 +889,7 @@ export function useCollaborativeWorkflow() {
       }
       findAllDescendants(id)
 
-      // If the currently edited block is among the blocks being removed, clear selection to restore the last tab
+      // If the currently edited block is among the blocks being removed, clear selection to reset the panel
       const currentEditedBlockId = usePanelEditorStore.getState().currentBlockId
       if (currentEditedBlockId && blocksToRemove.has(currentEditedBlockId)) {
         usePanelEditorStore.getState().clearCurrentBlock()
diff --git a/apps/sim/hooks/use-webhook-management.ts b/apps/sim/hooks/use-webhook-management.ts
index c79b9ba7c4..2c1ed0f889 100644
--- a/apps/sim/hooks/use-webhook-management.ts
+++ b/apps/sim/hooks/use-webhook-management.ts
@@ -3,10 +3,10 @@ import { useParams } from 'next/navigation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getBaseUrl } from '@/lib/urls/utils'
 import { getBlock } from '@/blocks'
+import { populateTriggerFieldsFromConfig } from '@/hooks/use-trigger-config-aggregation'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import { getTrigger, isTriggerValid } from '@/triggers'
-import { populateTriggerFieldsFromConfig } from './use-trigger-config-aggregation'
 
 const logger = createLogger('useWebhookManagement')
 
diff --git a/apps/sim/lib/auth-client.ts b/apps/sim/lib/auth-client.ts
index 6b992121c9..a3c1f8efed 100644
--- a/apps/sim/lib/auth-client.ts
+++ b/apps/sim/lib/auth-client.ts
@@ -11,8 +11,8 @@ import { createAuthClient } from 'better-auth/react'
 import type { auth } from '@/lib/auth'
 import { env } from '@/lib/env'
 import { isBillingEnabled } from '@/lib/environment'
-import { SessionContext, type SessionHookResult } from '@/lib/session/session-context'
 import { getBaseUrl } from '@/lib/urls/utils'
+import { SessionContext, type SessionHookResult } from '@/app/_shell/providers/session-provider'
 
 export const client = createAuthClient({
   baseURL: getBaseUrl(),
diff --git a/apps/sim/lib/auth.ts b/apps/sim/lib/auth.ts
index 236dba2d1d..52ef5895fe 100644
--- a/apps/sim/lib/auth.ts
+++ b/apps/sim/lib/auth.ts
@@ -43,8 +43,8 @@ import { quickValidateEmail } from '@/lib/email/validation'
 import { env, isTruthy } from '@/lib/env'
 import { isBillingEnabled, isEmailVerificationEnabled } from '@/lib/environment'
 import { createLogger } from '@/lib/logs/console/logger'
+import { SSO_TRUSTED_PROVIDERS } from '@/lib/sso/consts'
 import { getBaseUrl } from '@/lib/urls/utils'
-import { SSO_TRUSTED_PROVIDERS } from './sso/consts'
 
 const logger = createLogger('Auth')
 
diff --git a/apps/sim/lib/billing/webhooks/subscription.ts b/apps/sim/lib/billing/webhooks/subscription.ts
index d7e97f4266..0e06b7519b 100644
--- a/apps/sim/lib/billing/webhooks/subscription.ts
+++ b/apps/sim/lib/billing/webhooks/subscription.ts
@@ -3,8 +3,11 @@ import { subscription } from '@sim/db/schema'
 import { and, eq, ne } from 'drizzle-orm'
 import { calculateSubscriptionOverage } from '@/lib/billing/core/billing'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
+import {
+  getBilledOverageForSubscription,
+  resetUsageForSubscription,
+} from '@/lib/billing/webhooks/invoices'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getBilledOverageForSubscription, resetUsageForSubscription } from './invoices'
 
 const logger = createLogger('StripeSubscriptionWebhooks')
 
diff --git a/apps/sim/lib/blog/mdx.tsx b/apps/sim/lib/blog/mdx.tsx
index d4cc0817c1..833ed355b8 100644
--- a/apps/sim/lib/blog/mdx.tsx
+++ b/apps/sim/lib/blog/mdx.tsx
@@ -1,7 +1,7 @@
 import clsx from 'clsx'
 import Image from 'next/image'
 import type { MDXRemoteProps } from 'next-mdx-remote/rsc'
-import { CodeBlock } from './code'
+import { CodeBlock } from '@/lib/blog/code'
 
 export const mdxComponents: MDXRemoteProps['components'] = {
   img: (props: any) => (
diff --git a/apps/sim/lib/blog/registry.ts b/apps/sim/lib/blog/registry.ts
index 9c123fa9ca..2c6cb16ff9 100644
--- a/apps/sim/lib/blog/registry.ts
+++ b/apps/sim/lib/blog/registry.ts
@@ -5,10 +5,10 @@ import { compileMDX } from 'next-mdx-remote/rsc'
 import rehypeAutolinkHeadings from 'rehype-autolink-headings'
 import rehypeSlug from 'rehype-slug'
 import remarkGfm from 'remark-gfm'
-import { mdxComponents } from './mdx'
-import type { BlogMeta, BlogPost, TagWithCount } from './schema'
-import { AuthorSchema, BlogFrontmatterSchema } from './schema'
-import { AUTHORS_DIR, BLOG_DIR, byDateDesc, ensureContentDirs, toIsoDate } from './utils'
+import { mdxComponents } from '@/lib/blog/mdx'
+import type { BlogMeta, BlogPost, TagWithCount } from '@/lib/blog/schema'
+import { AuthorSchema, BlogFrontmatterSchema } from '@/lib/blog/schema'
+import { AUTHORS_DIR, BLOG_DIR, byDateDesc, ensureContentDirs, toIsoDate } from '@/lib/blog/utils'
 
 let cachedMeta: BlogMeta[] | null = null
 let cachedAuthors: Record<string, any> | null = null
diff --git a/apps/sim/lib/blog/seo.ts b/apps/sim/lib/blog/seo.ts
index 8e4c51e0f1..b9b9259e5f 100644
--- a/apps/sim/lib/blog/seo.ts
+++ b/apps/sim/lib/blog/seo.ts
@@ -1,5 +1,5 @@
 import type { Metadata } from 'next'
-import type { BlogMeta } from './schema'
+import type { BlogMeta } from '@/lib/blog/schema'
 
 export function buildPostMetadata(post: BlogMeta): Metadata {
   const base = new URL(post.canonical)
diff --git a/apps/sim/lib/branding/metadata.ts b/apps/sim/lib/branding/metadata.ts
index 90533ec0a0..34f7ff1024 100644
--- a/apps/sim/lib/branding/metadata.ts
+++ b/apps/sim/lib/branding/metadata.ts
@@ -9,8 +9,8 @@ export function generateBrandedMetadata(override: Partial<Metadata> = {}): Metad
   const brand = getBrandConfig()
 
   const defaultTitle = brand.name
-  const summaryFull = `Sim is an open-source AI agent workflow builder. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform.  35,000+ developers are already using Sim to build and deploy AI agent workflows. Sim lets developers integrate with 100+ apps to streamline workflows with AI agents. Sim is SOC2 and HIPAA compliant, ensuring enterprise-level security.`
-  const summaryShort = `Sim is an open-source AI agent workflow builder.`
+  const summaryFull = `Sim is an open-source AI agent workflow builder. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform. 60,000+ developers already use Sim to build and deploy AI agent workflows and connect them to 100+ apps. Sim is SOC2 and HIPAA compliant, ensuring enterprise-grade security for AI automation.`
+  const summaryShort = `Sim is an open-source AI agent workflow builder for production workflows.`
 
   return {
     title: {
@@ -130,10 +130,13 @@ export function generateStructuredData() {
     '@type': 'SoftwareApplication',
     name: 'Sim',
     description:
-      'Sim is an open-source AI agent workflow builder. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform.  30,000+ developers are already using Sim to build and deploy AI agent workflows. Sim lets developers integrate with 100+ apps to streamline workflows with AI agents. Sim is SOC2 and HIPAA compliant, ensuring enterprise-level security.',
-    url: 'https://sim.ai',
+      'Sim is an open-source AI agent workflow builder. Developers at trail-blazing startups to Fortune 500 companies deploy agentic workflows on the Sim platform. 60,000+ developers already use Sim to build and deploy AI agent workflows and connect them to 100+ apps. Sim is SOC2 and HIPAA compliant, ensuring enterprise-level security.',
+    url: getBaseUrl(),
     applicationCategory: 'BusinessApplication',
     operatingSystem: 'Web Browser',
+    applicationSubCategory: 'AIWorkflowAutomation',
+    areaServed: 'Worldwide',
+    availableLanguage: ['en'],
     offers: {
       '@type': 'Offer',
       category: 'SaaS',
diff --git a/apps/sim/lib/chunkers/docs-chunker.ts b/apps/sim/lib/chunkers/docs-chunker.ts
index 693c6ca35d..e0da552800 100644
--- a/apps/sim/lib/chunkers/docs-chunker.ts
+++ b/apps/sim/lib/chunkers/docs-chunker.ts
@@ -1,9 +1,9 @@
 import fs from 'fs/promises'
 import path from 'path'
+import { TextChunker } from '@/lib/chunkers/text-chunker'
+import type { DocChunk, DocsChunkerOptions } from '@/lib/chunkers/types'
 import { generateEmbeddings } from '@/lib/embeddings/utils'
 import { createLogger } from '@/lib/logs/console/logger'
-import { TextChunker } from './text-chunker'
-import type { DocChunk, DocsChunkerOptions } from './types'
 
 interface HeaderInfo {
   level: number
diff --git a/apps/sim/lib/chunkers/json-yaml-chunker.ts b/apps/sim/lib/chunkers/json-yaml-chunker.ts
index ab17d6926c..2fd18d4dfc 100644
--- a/apps/sim/lib/chunkers/json-yaml-chunker.ts
+++ b/apps/sim/lib/chunkers/json-yaml-chunker.ts
@@ -1,8 +1,8 @@
 import * as yaml from 'js-yaml'
+import type { Chunk, ChunkerOptions } from '@/lib/chunkers/types'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getAccurateTokenCount } from '@/lib/tokenization'
 import { estimateTokenCount } from '@/lib/tokenization/estimators'
-import type { Chunk, ChunkerOptions } from './types'
 
 const logger = createLogger('JsonYamlChunker')
 
diff --git a/apps/sim/lib/chunkers/structured-data-chunker.ts b/apps/sim/lib/chunkers/structured-data-chunker.ts
index d7853b84f0..f53e9458ff 100644
--- a/apps/sim/lib/chunkers/structured-data-chunker.ts
+++ b/apps/sim/lib/chunkers/structured-data-chunker.ts
@@ -1,5 +1,5 @@
+import type { Chunk, StructuredDataOptions } from '@/lib/chunkers/types'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { Chunk, StructuredDataOptions } from './types'
 
 const logger = createLogger('StructuredDataChunker')
 
diff --git a/apps/sim/lib/chunkers/text-chunker.ts b/apps/sim/lib/chunkers/text-chunker.ts
index 0a13fb0bdb..2e6a62c63d 100644
--- a/apps/sim/lib/chunkers/text-chunker.ts
+++ b/apps/sim/lib/chunkers/text-chunker.ts
@@ -1,4 +1,4 @@
-import type { Chunk, ChunkerOptions } from './types'
+import type { Chunk, ChunkerOptions } from '@/lib/chunkers/types'
 
 /**
  * Lightweight text chunker optimized for RAG applications
diff --git a/apps/sim/lib/copilot/process-contents.ts b/apps/sim/lib/copilot/process-contents.ts
index b4d5e09835..cac8a1d052 100644
--- a/apps/sim/lib/copilot/process-contents.ts
+++ b/apps/sim/lib/copilot/process-contents.ts
@@ -4,7 +4,7 @@ import { and, eq, isNull } from 'drizzle-orm'
 import { createLogger } from '@/lib/logs/console/logger'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
 import { sanitizeForCopilot } from '@/lib/workflows/json-sanitizer'
-import type { ChatContext } from '@/stores/panel-new/copilot/types'
+import type { ChatContext } from '@/stores/panel/copilot/types'
 
 export type AgentContextType =
   | 'past_chat'
diff --git a/apps/sim/lib/copilot/tools/client/other/checkoff-todo.ts b/apps/sim/lib/copilot/tools/client/other/checkoff-todo.ts
index 4dd3f68066..0e2e6f0528 100644
--- a/apps/sim/lib/copilot/tools/client/other/checkoff-todo.ts
+++ b/apps/sim/lib/copilot/tools/client/other/checkoff-todo.ts
@@ -40,7 +40,7 @@ export class CheckoffTodoClientTool extends BaseClientTool {
       }
 
       try {
-        const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+        const { useCopilotStore } = await import('@/stores/panel/copilot/store')
         const store = useCopilotStore.getState()
         if (store.updatePlanTodoStatus) {
           store.updatePlanTodoStatus(todoId, 'completed')
diff --git a/apps/sim/lib/copilot/tools/client/other/mark-todo-in-progress.ts b/apps/sim/lib/copilot/tools/client/other/mark-todo-in-progress.ts
index 4a196901a9..2ba0a64ce8 100644
--- a/apps/sim/lib/copilot/tools/client/other/mark-todo-in-progress.ts
+++ b/apps/sim/lib/copilot/tools/client/other/mark-todo-in-progress.ts
@@ -43,7 +43,7 @@ export class MarkTodoInProgressClientTool extends BaseClientTool {
       }
 
       try {
-        const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+        const { useCopilotStore } = await import('@/stores/panel/copilot/store')
         const store = useCopilotStore.getState()
         if (store.updatePlanTodoStatus) {
           store.updatePlanTodoStatus(todoId, 'executing')
diff --git a/apps/sim/lib/copilot/tools/client/other/plan.ts b/apps/sim/lib/copilot/tools/client/other/plan.ts
index 6abd1d15b9..2d12ccff00 100644
--- a/apps/sim/lib/copilot/tools/client/other/plan.ts
+++ b/apps/sim/lib/copilot/tools/client/other/plan.ts
@@ -45,7 +45,7 @@ export class PlanClientTool extends BaseClientTool {
             completed: false,
             executing: false,
           }))
-          const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+          const { useCopilotStore } = await import('@/stores/panel/copilot/store')
           const store = useCopilotStore.getState()
           if (store.setPlanTodos) {
             store.setPlanTodos(todos)
diff --git a/apps/sim/lib/copilot/types.ts b/apps/sim/lib/copilot/types.ts
index c5c0560fc6..52995455cf 100644
--- a/apps/sim/lib/copilot/types.ts
+++ b/apps/sim/lib/copilot/types.ts
@@ -53,7 +53,7 @@ export interface ParsedMessageContent {
 
 import type { ProviderId } from '@/providers/types'
 // Copilot Tools Type Definitions (from workspace copilot lib)
-import type { CopilotToolCall, ToolState } from '@/stores/panel-new/copilot/types'
+import type { CopilotToolCall, ToolState } from '@/stores/panel/copilot/types'
 
 export type NotificationStatus =
   | 'pending'
diff --git a/apps/sim/lib/email/validation.test.ts b/apps/sim/lib/email/validation.test.ts
index b569d79786..50d97a0c67 100644
--- a/apps/sim/lib/email/validation.test.ts
+++ b/apps/sim/lib/email/validation.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { quickValidateEmail, validateEmail } from './validation'
+import { quickValidateEmail, validateEmail } from '@/lib/email/validation'
 
 describe('Email Validation', () => {
   describe('validateEmail', () => {
diff --git a/apps/sim/lib/execution/e2b.ts b/apps/sim/lib/execution/e2b.ts
index cebba3418c..889c442299 100644
--- a/apps/sim/lib/execution/e2b.ts
+++ b/apps/sim/lib/execution/e2b.ts
@@ -1,6 +1,6 @@
 import { Sandbox } from '@e2b/code-interpreter'
+import { CodeLanguage } from '@/lib/execution/languages'
 import { createLogger } from '@/lib/logs/console/logger'
-import { CodeLanguage } from './languages'
 
 export interface E2BExecutionRequest {
   code: string
diff --git a/apps/sim/lib/file-parsers/json-parser.ts b/apps/sim/lib/file-parsers/json-parser.ts
index bac191ccf1..1588113150 100644
--- a/apps/sim/lib/file-parsers/json-parser.ts
+++ b/apps/sim/lib/file-parsers/json-parser.ts
@@ -1,4 +1,4 @@
-import type { FileParseResult } from './types'
+import type { FileParseResult } from '@/lib/file-parsers/types'
 
 /**
  * Parse JSON files
diff --git a/apps/sim/lib/file-parsers/yaml-parser.ts b/apps/sim/lib/file-parsers/yaml-parser.ts
index a636d0329a..c055e848d6 100644
--- a/apps/sim/lib/file-parsers/yaml-parser.ts
+++ b/apps/sim/lib/file-parsers/yaml-parser.ts
@@ -1,5 +1,5 @@
 import * as yaml from 'js-yaml'
-import type { FileParseResult } from './types'
+import type { FileParseResult } from '@/lib/file-parsers/types'
 
 /**
  * Parse YAML files
diff --git a/apps/sim/lib/knowledge/documents/service.ts b/apps/sim/lib/knowledge/documents/service.ts
index f81492e8cd..77c83875fd 100644
--- a/apps/sim/lib/knowledge/documents/service.ts
+++ b/apps/sim/lib/knowledge/documents/service.ts
@@ -7,12 +7,12 @@ import { generateEmbeddings } from '@/lib/embeddings/utils'
 import { env } from '@/lib/env'
 import { getSlotsForFieldType, type TAG_SLOT_CONFIG } from '@/lib/knowledge/consts'
 import { processDocument } from '@/lib/knowledge/documents/document-processor'
+import { DocumentProcessingQueue } from '@/lib/knowledge/documents/queue'
+import type { DocumentSortField, SortOrder } from '@/lib/knowledge/documents/types'
 import { getNextAvailableSlot } from '@/lib/knowledge/tags/service'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getRedisClient } from '@/lib/redis'
 import type { DocumentProcessingPayload } from '@/background/knowledge-processing'
-import { DocumentProcessingQueue } from './queue'
-import type { DocumentSortField, SortOrder } from './types'
 
 const logger = createLogger('DocumentService')
 
diff --git a/apps/sim/lib/security/input-validation.test.ts b/apps/sim/lib/security/input-validation.test.ts
index b34bd462dd..2a9b5b4df7 100644
--- a/apps/sim/lib/security/input-validation.test.ts
+++ b/apps/sim/lib/security/input-validation.test.ts
@@ -8,7 +8,7 @@ import {
   validateNumericId,
   validatePathSegment,
   validateUUID,
-} from './input-validation'
+} from '@/lib/security/input-validation'
 
 describe('validatePathSegment', () => {
   describe('valid inputs', () => {
diff --git a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts b/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts
index 22ca9ce548..0eb6419510 100644
--- a/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts
+++ b/apps/sim/lib/uploads/contexts/execution/execution-file-manager.ts
@@ -1,8 +1,11 @@
 import { createLogger } from '@/lib/logs/console/logger'
+import type { ExecutionContext } from '@/lib/uploads/contexts/execution/execution-file-helpers'
+import {
+  generateExecutionFileKey,
+  generateFileId,
+} from '@/lib/uploads/contexts/execution/execution-file-helpers'
 import { isUserFile } from '@/lib/utils'
 import type { UserFile } from '@/executor/types'
-import type { ExecutionContext } from './execution-file-helpers'
-import { generateExecutionFileKey, generateFileId } from './execution-file-helpers'
 
 const logger = createLogger('ExecutionFileStorage')
 
diff --git a/apps/sim/lib/uploads/utils/file-utils.server.ts b/apps/sim/lib/uploads/utils/file-utils.server.ts
index 8d04be2f7d..ebd651197e 100644
--- a/apps/sim/lib/uploads/utils/file-utils.server.ts
+++ b/apps/sim/lib/uploads/utils/file-utils.server.ts
@@ -3,8 +3,8 @@
 import type { Logger } from '@/lib/logs/console/logger'
 import type { StorageContext } from '@/lib/uploads'
 import { isExecutionFile } from '@/lib/uploads/contexts/execution/execution-file-helpers'
+import { inferContextFromKey } from '@/lib/uploads/utils/file-utils'
 import type { UserFile } from '@/executor/types'
-import { inferContextFromKey } from './file-utils'
 
 /**
  * Download a file from a URL (internal or external)
diff --git a/apps/sim/lib/uploads/utils/file-utils.ts b/apps/sim/lib/uploads/utils/file-utils.ts
index 0ca0b687a0..b3fa6326e8 100644
--- a/apps/sim/lib/uploads/utils/file-utils.ts
+++ b/apps/sim/lib/uploads/utils/file-utils.ts
@@ -1,7 +1,7 @@
 import type { Logger } from '@/lib/logs/console/logger'
 import type { StorageContext } from '@/lib/uploads'
+import { ACCEPTED_FILE_TYPES } from '@/lib/uploads/utils/validation'
 import type { UserFile } from '@/executor/types'
-import { ACCEPTED_FILE_TYPES } from './validation'
 
 export interface FileAttachment {
   id: string
diff --git a/apps/sim/lib/workflows/autolayout/containers.ts b/apps/sim/lib/workflows/autolayout/containers.ts
index b744dd2667..e0bdf2a589 100644
--- a/apps/sim/lib/workflows/autolayout/containers.ts
+++ b/apps/sim/lib/workflows/autolayout/containers.ts
@@ -1,8 +1,7 @@
 import { createLogger } from '@/lib/logs/console/logger'
-import type { BlockState } from '@/stores/workflows/workflow/types'
-import { assignLayers, groupByLayer } from './layering'
-import { calculatePositions } from './positioning'
-import type { Edge, LayoutOptions } from './types'
+import { assignLayers, groupByLayer } from '@/lib/workflows/autolayout/layering'
+import { calculatePositions } from '@/lib/workflows/autolayout/positioning'
+import type { Edge, LayoutOptions } from '@/lib/workflows/autolayout/types'
 import {
   CONTAINER_PADDING,
   CONTAINER_PADDING_X,
@@ -12,7 +11,8 @@ import {
   filterLayoutEligibleBlockIds,
   getBlocksByParent,
   prepareBlockMetrics,
-} from './utils'
+} from '@/lib/workflows/autolayout/utils'
+import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('AutoLayout:Containers')
 
diff --git a/apps/sim/lib/workflows/autolayout/incremental.ts b/apps/sim/lib/workflows/autolayout/incremental.ts
index 0add1dfe19..3cbb0598eb 100644
--- a/apps/sim/lib/workflows/autolayout/incremental.ts
+++ b/apps/sim/lib/workflows/autolayout/incremental.ts
@@ -1,7 +1,12 @@
 import { createLogger } from '@/lib/logs/console/logger'
+import type { AdjustmentOptions, Edge } from '@/lib/workflows/autolayout/types'
+import {
+  boxesOverlap,
+  createBoundingBox,
+  getBlockMetrics,
+  shouldSkipAutoLayout,
+} from '@/lib/workflows/autolayout/utils'
 import type { BlockState } from '@/stores/workflows/workflow/types'
-import type { AdjustmentOptions, Edge } from './types'
-import { boxesOverlap, createBoundingBox, getBlockMetrics, shouldSkipAutoLayout } from './utils'
 
 const logger = createLogger('AutoLayout:Incremental')
 
diff --git a/apps/sim/lib/workflows/autolayout/layering.ts b/apps/sim/lib/workflows/autolayout/layering.ts
index 59a1d14bf0..f5993a8a1c 100644
--- a/apps/sim/lib/workflows/autolayout/layering.ts
+++ b/apps/sim/lib/workflows/autolayout/layering.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@/lib/logs/console/logger'
+import type { Edge, GraphNode } from '@/lib/workflows/autolayout/types'
+import { getBlockMetrics } from '@/lib/workflows/autolayout/utils'
 import type { BlockState } from '@/stores/workflows/workflow/types'
-import type { Edge, GraphNode } from './types'
-import { getBlockMetrics } from './utils'
 
 const logger = createLogger('AutoLayout:Layering')
 
diff --git a/apps/sim/lib/workflows/autolayout/positioning.ts b/apps/sim/lib/workflows/autolayout/positioning.ts
index 741d1197e5..44f003f017 100644
--- a/apps/sim/lib/workflows/autolayout/positioning.ts
+++ b/apps/sim/lib/workflows/autolayout/positioning.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@/lib/logs/console/logger'
-import type { GraphNode, LayoutOptions } from './types'
-import { boxesOverlap, createBoundingBox } from './utils'
+import type { GraphNode, LayoutOptions } from '@/lib/workflows/autolayout/types'
+import { boxesOverlap, createBoundingBox } from '@/lib/workflows/autolayout/utils'
 
 const logger = createLogger('AutoLayout:Positioning')
 
diff --git a/apps/sim/lib/workflows/autolayout/targeted.ts b/apps/sim/lib/workflows/autolayout/targeted.ts
index 0f808f7fdd..1daabb2b9a 100644
--- a/apps/sim/lib/workflows/autolayout/targeted.ts
+++ b/apps/sim/lib/workflows/autolayout/targeted.ts
@@ -1,8 +1,7 @@
 import { createLogger } from '@/lib/logs/console/logger'
-import type { BlockState } from '@/stores/workflows/workflow/types'
-import { assignLayers, groupByLayer } from './layering'
-import { calculatePositions } from './positioning'
-import type { Edge, LayoutOptions } from './types'
+import { assignLayers, groupByLayer } from '@/lib/workflows/autolayout/layering'
+import { calculatePositions } from '@/lib/workflows/autolayout/positioning'
+import type { Edge, LayoutOptions } from '@/lib/workflows/autolayout/types'
 import {
   CONTAINER_PADDING,
   CONTAINER_PADDING_X,
@@ -17,7 +16,8 @@ import {
   ROOT_PADDING_X,
   ROOT_PADDING_Y,
   shouldSkipAutoLayout,
-} from './utils'
+} from '@/lib/workflows/autolayout/utils'
+import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('AutoLayout:Targeted')
 
diff --git a/apps/sim/lib/workflows/autolayout/utils.ts b/apps/sim/lib/workflows/autolayout/utils.ts
index 8d6e83538a..28845032f7 100644
--- a/apps/sim/lib/workflows/autolayout/utils.ts
+++ b/apps/sim/lib/workflows/autolayout/utils.ts
@@ -1,6 +1,6 @@
+import type { BlockMetrics, BoundingBox, GraphNode } from '@/lib/workflows/autolayout/types'
 import { TriggerUtils } from '@/lib/workflows/triggers'
 import type { BlockState } from '@/stores/workflows/workflow/types'
-import type { BlockMetrics, BoundingBox, GraphNode } from './types'
 
 export const DEFAULT_BLOCK_WIDTH = 350
 export const DEFAULT_BLOCK_HEIGHT = 100
diff --git a/apps/sim/lib/workflows/diff/diff-engine.ts b/apps/sim/lib/workflows/diff/diff-engine.ts
index fdaf5b74ee..91e2539439 100644
--- a/apps/sim/lib/workflows/diff/diff-engine.ts
+++ b/apps/sim/lib/workflows/diff/diff-engine.ts
@@ -1,9 +1,9 @@
 import type { Edge } from 'reactflow'
 import { v4 as uuidv4 } from 'uuid'
 import { createLogger } from '@/lib/logs/console/logger'
+import type { BlockWithDiff } from '@/lib/workflows/diff/types'
 import { mergeSubblockState } from '@/stores/workflows/utils'
 import type { BlockState, WorkflowState } from '@/stores/workflows/workflow/types'
-import type { BlockWithDiff } from './types'
 
 const logger = createLogger('WorkflowDiffEngine')
 
diff --git a/apps/sim/lib/workflows/import-export.ts b/apps/sim/lib/workflows/import-export.ts
index b2d6ec240e..1dbb592b4e 100644
--- a/apps/sim/lib/workflows/import-export.ts
+++ b/apps/sim/lib/workflows/import-export.ts
@@ -1,7 +1,7 @@
 import JSZip from 'jszip'
 import { createLogger } from '@/lib/logs/console/logger'
+import { sanitizeForExport } from '@/lib/workflows/json-sanitizer'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
-import { sanitizeForExport } from './json-sanitizer'
 
 const logger = createLogger('WorkflowImportExport')
 
diff --git a/apps/sim/stores/custom-tools/store.ts b/apps/sim/stores/custom-tools/store.ts
index 21ad8b46fd..932f541812 100644
--- a/apps/sim/stores/custom-tools/store.ts
+++ b/apps/sim/stores/custom-tools/store.ts
@@ -1,7 +1,7 @@
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { CustomToolsState, CustomToolsStore } from './types'
+import type { CustomToolsState, CustomToolsStore } from '@/stores/custom-tools/types'
 
 const logger = createLogger('CustomToolsStore')
 
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 497f4997c9..a3407cac9b 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -4,8 +4,8 @@ import { useEffect } from 'react'
 import { createLogger } from '@/lib/logs/console/logger'
 import { useCustomToolsStore } from '@/stores/custom-tools/store'
 import { useExecutionStore } from '@/stores/execution/store'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
 import { useVariablesStore } from '@/stores/panel/variables/store'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
 import { useEnvironmentStore } from '@/stores/settings/environment/store'
 import { useTerminalConsoleStore } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
diff --git a/apps/sim/stores/notifications/store.ts b/apps/sim/stores/notifications/store.ts
index 5aec5eb95b..09525065f4 100644
--- a/apps/sim/stores/notifications/store.ts
+++ b/apps/sim/stores/notifications/store.ts
@@ -95,6 +95,19 @@ interface NotificationStore {
    * @returns Array of notifications for the workflow
    */
   getNotificationsForWorkflow: (workflowId: string) => Notification[]
+
+  /**
+   * Clears notifications.
+   *
+   * When a workflow ID is provided, this removes:
+   * - All notifications scoped to that workflow.
+   * - Global notifications (without a workflowId), since they are visible in all workflows.
+   *
+   * When omitted, all notifications are cleared.
+   *
+   * @param workflowId - Optional workflow ID to scope the clear operation.
+   */
+  clearNotifications: (workflowId?: string) => void
 }
 
 export const useNotificationStore = create<NotificationStore>()(
@@ -140,6 +153,22 @@ export const useNotificationStore = create<NotificationStore>()(
       getNotificationsForWorkflow: (workflowId: string) => {
         return get().notifications.filter((n) => !n.workflowId || n.workflowId === workflowId)
       },
+
+      clearNotifications: (workflowId?: string) => {
+        set((state) => {
+          if (!workflowId) {
+            return { notifications: [] }
+          }
+
+          return {
+            notifications: state.notifications.filter(
+              (notification) =>
+                // Keep notifications for other workflows only.
+                notification.workflowId && notification.workflowId !== workflowId
+            ),
+          }
+        })
+      },
     }),
     {
       name: 'notification-storage',
diff --git a/apps/sim/stores/notifications/utils.ts b/apps/sim/stores/notifications/utils.ts
index 1c522e81c3..671f0563d5 100644
--- a/apps/sim/stores/notifications/utils.ts
+++ b/apps/sim/stores/notifications/utils.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@/lib/logs/console/logger'
-import { useCopilotStore } from '@/stores/panel-new/copilot/store'
-import { usePanelStore } from '@/stores/panel-new/store'
+import { useCopilotStore } from '@/stores/panel/copilot/store'
+import { usePanelStore } from '@/stores/panel/store'
 
 const logger = createLogger('NotificationUtils')
 
diff --git a/apps/sim/stores/panel-new/copilot/index.ts b/apps/sim/stores/panel-new/copilot/index.ts
deleted file mode 100644
index 9986516cf3..0000000000
--- a/apps/sim/stores/panel-new/copilot/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { useCopilotStore } from '@/stores/panel-new/copilot/store'
-export type {
-  CopilotActions,
-  CopilotChat,
-  CopilotMessage,
-  CopilotState,
-  CopilotStore,
-} from '@/stores/panel-new/copilot/types'
diff --git a/apps/sim/stores/panel-new/store.ts b/apps/sim/stores/panel-new/store.ts
deleted file mode 100644
index f10b964174..0000000000
--- a/apps/sim/stores/panel-new/store.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { create } from 'zustand'
-import { persist } from 'zustand/middleware'
-import type { PanelState, PanelTab } from './types'
-
-/**
- * Panel width constraints
- * Note: Maximum width is enforced dynamically at 40% of viewport width in the resize hook
- */
-const MIN_PANEL_WIDTH = 244
-
-/**
- * Default panel tab
- */
-const DEFAULT_TAB: PanelTab = 'copilot'
-
-export const usePanelStore = create<PanelState>()(
-  persist(
-    (set) => ({
-      panelWidth: MIN_PANEL_WIDTH,
-      setPanelWidth: (width) => {
-        // Only enforce minimum - maximum is enforced dynamically by the resize hook
-        const clampedWidth = Math.max(MIN_PANEL_WIDTH, width)
-        set({ panelWidth: clampedWidth })
-        // Update CSS variable for immediate visual feedback
-        if (typeof window !== 'undefined') {
-          document.documentElement.style.setProperty('--panel-width', `${clampedWidth}px`)
-        }
-      },
-      activeTab: DEFAULT_TAB,
-      setActiveTab: (tab) => {
-        set({ activeTab: tab })
-        // Remove data attribute once React takes control
-        if (typeof document !== 'undefined') {
-          document.documentElement.removeAttribute('data-panel-active-tab')
-        }
-      },
-      previousTab: null,
-      setPreviousTab: (tab) => {
-        set({ previousTab: tab })
-      },
-      _hasHydrated: false,
-      setHasHydrated: (hasHydrated) => {
-        set({ _hasHydrated: hasHydrated })
-      },
-    }),
-    {
-      name: 'panel-state',
-      onRehydrateStorage: () => (state) => {
-        // Sync CSS variables with stored state after rehydration
-        if (state && typeof window !== 'undefined') {
-          document.documentElement.style.setProperty('--panel-width', `${state.panelWidth}px`)
-          // Remove the data attribute so CSS rules stop interfering
-          document.documentElement.removeAttribute('data-panel-active-tab')
-        }
-      },
-    }
-  )
-)
diff --git a/apps/sim/stores/panel-new/types.ts b/apps/sim/stores/panel-new/types.ts
deleted file mode 100644
index 7a6e0d7e44..0000000000
--- a/apps/sim/stores/panel-new/types.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Available panel tabs
- */
-export type PanelTab = 'copilot' | 'editor' | 'toolbar'
-
-/**
- * Panel state interface
- */
-export interface PanelState {
-  panelWidth: number
-  setPanelWidth: (width: number) => void
-  activeTab: PanelTab
-  setActiveTab: (tab: PanelTab) => void
-  /** The tab that was active before switching to the editor */
-  previousTab: PanelTab | null
-  setPreviousTab: (tab: PanelTab | null) => void
-  _hasHydrated: boolean
-  setHasHydrated: (hasHydrated: boolean) => void
-}
diff --git a/apps/sim/stores/panel/console/store.test.ts b/apps/sim/stores/panel/console/store.test.ts
deleted file mode 100644
index 0094e1ce08..0000000000
--- a/apps/sim/stores/panel/console/store.test.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { useConsoleStore } from '@/stores/panel/console/store'
-import type { ConsoleUpdate } from '@/stores/panel/console/types'
-
-vi.stubGlobal('crypto', {
-  randomUUID: vi.fn(() => 'test-uuid-123'),
-})
-
-vi.mock('@/lib/utils', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/lib/utils')>()
-  return {
-    ...actual,
-    redactApiKeys: vi.fn((obj) => obj), // Return object as-is for testing
-  }
-})
-
-describe('Console Store', () => {
-  beforeEach(() => {
-    useConsoleStore.setState({
-      entries: [],
-      isOpen: false,
-    })
-    vi.clearAllMocks()
-    // Clear localStorage mock
-    if (global.localStorage) {
-      vi.mocked(global.localStorage.getItem).mockReturnValue(null)
-      vi.mocked(global.localStorage.setItem).mockClear()
-    }
-  })
-
-  describe('addConsole', () => {
-    it('should add a new console entry with required fields', () => {
-      const store = useConsoleStore.getState()
-
-      const newEntry = store.addConsole({
-        workflowId: 'workflow-123',
-        blockId: 'block-123',
-        blockName: 'Test Block',
-        blockType: 'agent',
-        success: true,
-        output: { content: 'Test output' },
-        durationMs: 100,
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-
-      expect(newEntry).toBeDefined()
-      expect(newEntry.id).toBe('test-uuid-123')
-      expect(newEntry.workflowId).toBe('workflow-123')
-      expect(newEntry.blockId).toBe('block-123')
-      expect(newEntry.success).toBe(true)
-
-      const state = useConsoleStore.getState()
-      expect(state.entries).toHaveLength(1)
-      expect(state.entries[0]).toBe(newEntry)
-    })
-
-    it('should add entry with error', () => {
-      const store = useConsoleStore.getState()
-
-      store.addConsole({
-        workflowId: 'workflow-123',
-        blockId: 'block-123',
-        blockName: 'Failed Block',
-        blockType: 'agent',
-        success: false,
-        error: 'Something went wrong',
-        durationMs: 50,
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:00.500Z',
-      })
-
-      const state = useConsoleStore.getState()
-      expect(state.entries).toHaveLength(1)
-      expect(state.entries[0].success).toBe(false)
-      expect(state.entries[0].error).toBe('Something went wrong')
-    })
-  })
-
-  describe('updateConsole', () => {
-    beforeEach(() => {
-      // Add a test entry first
-      const store = useConsoleStore.getState()
-      store.addConsole({
-        workflowId: 'workflow-123',
-        blockId: 'block-123',
-        blockName: 'Test Block',
-        blockType: 'agent',
-        success: true,
-        output: { content: 'Initial content' },
-        durationMs: 100,
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-    })
-
-    it('should update console entry with string content', () => {
-      const store = useConsoleStore.getState()
-
-      store.updateConsole('block-123', 'Updated content')
-
-      const state = useConsoleStore.getState()
-      expect(state.entries).toHaveLength(1)
-      expect(state.entries[0].output?.content).toBe('Updated content')
-    })
-
-    it('should update console entry with object update', () => {
-      const store = useConsoleStore.getState()
-
-      const update: ConsoleUpdate = {
-        content: 'New content',
-        success: false,
-        error: 'Update error',
-        durationMs: 200,
-        endedAt: '2023-01-01T00:00:02.000Z',
-      }
-
-      store.updateConsole('block-123', update)
-
-      const state = useConsoleStore.getState()
-      const entry = state.entries[0]
-
-      expect(entry.output?.content).toBe('New content')
-      expect(entry.success).toBe(false)
-      expect(entry.error).toBe('Update error')
-      expect(entry.durationMs).toBe(200)
-      expect(entry.endedAt).toBe('2023-01-01T00:00:02.000Z')
-    })
-
-    it('should update output object directly', () => {
-      const store = useConsoleStore.getState()
-
-      const update: ConsoleUpdate = {
-        output: {
-          content: 'Direct output update',
-          status: 200,
-        },
-      }
-
-      store.updateConsole('block-123', update)
-
-      const state = useConsoleStore.getState()
-      const entry = state.entries[0]
-
-      expect(entry.output?.content).toBe('Direct output update')
-      expect(entry.output?.status).toBe(200)
-    })
-
-    it('should not update non-matching block IDs', () => {
-      const store = useConsoleStore.getState()
-
-      store.updateConsole('non-existent-block', 'Should not update')
-
-      const newState = useConsoleStore.getState()
-      expect(newState.entries[0].output?.content).toBe('Initial content')
-    })
-
-    it('should handle partial updates correctly', () => {
-      const store = useConsoleStore.getState()
-
-      // First update only success flag
-      store.updateConsole('block-123', { success: false })
-
-      let state = useConsoleStore.getState()
-      expect(state.entries[0].success).toBe(false)
-      expect(state.entries[0].output?.content).toBe('Initial content') // Should remain unchanged
-
-      // Then update only content
-      store.updateConsole('block-123', { content: 'Partial update' })
-
-      state = useConsoleStore.getState()
-      expect(state.entries[0].success).toBe(false) // Should remain false
-      expect(state.entries[0].output?.content).toBe('Partial update')
-    })
-  })
-
-  describe('clearConsole', () => {
-    beforeEach(() => {
-      const store = useConsoleStore.getState()
-
-      // Add multiple entries for different workflows
-      store.addConsole({
-        workflowId: 'workflow-1',
-        blockId: 'block-1',
-        blockName: 'Block 1',
-        blockType: 'agent',
-        success: true,
-        output: {},
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-
-      store.addConsole({
-        workflowId: 'workflow-2',
-        blockId: 'block-2',
-        blockName: 'Block 2',
-        blockType: 'api',
-        success: true,
-        output: {},
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-    })
-
-    it('should clear all entries when workflowId is null', () => {
-      const store = useConsoleStore.getState()
-
-      expect(store.entries).toHaveLength(2)
-
-      store.clearConsole(null)
-
-      const state = useConsoleStore.getState()
-      expect(state.entries).toHaveLength(0)
-    })
-
-    it('should clear only specific workflow entries', () => {
-      const store = useConsoleStore.getState()
-
-      expect(store.entries).toHaveLength(2)
-
-      store.clearConsole('workflow-1')
-
-      const state = useConsoleStore.getState()
-      expect(state.entries).toHaveLength(1)
-      expect(state.entries[0].workflowId).toBe('workflow-2')
-    })
-  })
-
-  describe('getWorkflowEntries', () => {
-    beforeEach(() => {
-      const store = useConsoleStore.getState()
-
-      // Add entries for different workflows
-      store.addConsole({
-        workflowId: 'workflow-1',
-        blockId: 'block-1',
-        blockName: 'Block 1',
-        blockType: 'agent',
-        success: true,
-        output: {},
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-
-      store.addConsole({
-        workflowId: 'workflow-2',
-        blockId: 'block-2',
-        blockName: 'Block 2',
-        blockType: 'api',
-        success: true,
-        output: {},
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-
-      store.addConsole({
-        workflowId: 'workflow-1',
-        blockId: 'block-3',
-        blockName: 'Block 3',
-        blockType: 'function',
-        success: false,
-        output: {},
-        error: 'Test error',
-        startedAt: '2023-01-01T00:00:00.000Z',
-        endedAt: '2023-01-01T00:00:01.000Z',
-      })
-    })
-
-    it('should return entries for specific workflow', () => {
-      const store = useConsoleStore.getState()
-
-      const workflow1Entries = store.getWorkflowEntries('workflow-1')
-      const workflow2Entries = store.getWorkflowEntries('workflow-2')
-
-      expect(workflow1Entries).toHaveLength(2)
-      expect(workflow2Entries).toHaveLength(1)
-
-      expect(workflow1Entries.every((entry) => entry.workflowId === 'workflow-1')).toBe(true)
-      expect(workflow2Entries.every((entry) => entry.workflowId === 'workflow-2')).toBe(true)
-    })
-
-    it('should return empty array for non-existent workflow', () => {
-      const store = useConsoleStore.getState()
-
-      const entries = store.getWorkflowEntries('non-existent-workflow')
-
-      expect(entries).toHaveLength(0)
-    })
-  })
-
-  describe('toggleConsole', () => {
-    it('should toggle console open state', () => {
-      const store = useConsoleStore.getState()
-
-      expect(store.isOpen).toBe(false)
-
-      store.toggleConsole()
-      expect(useConsoleStore.getState().isOpen).toBe(true)
-
-      store.toggleConsole()
-      expect(useConsoleStore.getState().isOpen).toBe(false)
-    })
-  })
-})
diff --git a/apps/sim/stores/panel/console/store.ts b/apps/sim/stores/panel/console/store.ts
deleted file mode 100644
index a94493a9c6..0000000000
--- a/apps/sim/stores/panel/console/store.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-import { create } from 'zustand'
-import { devtools, persist } from 'zustand/middleware'
-import { redactApiKeys } from '@/lib/utils'
-import type { NormalizedBlockOutput } from '@/executor/types'
-import type { ConsoleEntry, ConsoleStore } from '@/stores/panel/console/types'
-
-const MAX_ENTRIES = 500 // MAX across all workflows - allows for 100 loop iterations + other workflow logs
-const MAX_IMAGE_DATA_SIZE = 1000 // Maximum size of image data to store (in characters)
-const MAX_ANY_DATA_SIZE = 5000 // Maximum size of any data to store (in characters)
-const MAX_TOTAL_ENTRY_SIZE = 50000 // Maximum size of entire entry to prevent localStorage overflow
-
-/**
- * Safely clone and update a NormalizedBlockOutput
- */
-const updateBlockOutput = (
-  existingOutput: NormalizedBlockOutput | undefined,
-  contentUpdate: string
-): NormalizedBlockOutput => {
-  const baseOutput = existingOutput || {}
-
-  return {
-    ...baseOutput,
-    content: contentUpdate,
-  }
-}
-
-/**
- * Checks if a string is likely a base64 encoded image or large data blob
- */
-const isLikelyBase64Data = (value: string): boolean => {
-  if (value.length < 100) return false
-  return value.startsWith('data:image') || /^[A-Za-z0-9+/=]{1000,}$/.test(value)
-}
-
-/**
- * Processes an object to handle large strings and data for localStorage to prevent quota issues
- */
-const processSafeStorage = (obj: any): any => {
-  if (!obj) return obj
-
-  if (typeof obj === 'string') {
-    if (obj.length > MAX_ANY_DATA_SIZE) {
-      return `[Large text truncated, original length: ${obj.length}]${obj.substring(0, 200)}...`
-    }
-    return obj
-  }
-
-  if (typeof obj !== 'object') return obj
-
-  if (Array.isArray(obj)) {
-    if (obj.length > 100) {
-      return [
-        `[Array truncated, original length: ${obj.length}]`,
-        ...obj.slice(0, 10).map((item) => processSafeStorage(item)),
-      ]
-    }
-    return obj.map((item) => processSafeStorage(item))
-  }
-
-  const result: any = {}
-  for (const [key, value] of Object.entries(obj)) {
-    if (
-      (key === 'image' || key.includes('image')) &&
-      typeof value === 'string' &&
-      value.length > MAX_IMAGE_DATA_SIZE
-    ) {
-      if (value.startsWith('data:image')) {
-        const mimeEnd = value.indexOf(',')
-        result[key] =
-          mimeEnd > 0
-            ? `${value.substring(0, mimeEnd + 1)}[Image data removed, original length: ${value.length}]`
-            : `[Image data removed, original length: ${value.length}]`
-      } else {
-        result[key] = `[Image data removed, original length: ${value.length}]`
-      }
-    } else if (typeof value === 'object' && value !== null) {
-      result[key] = processSafeStorage(value)
-    } else if (typeof value === 'string' && value.length > MAX_ANY_DATA_SIZE) {
-      if (isLikelyBase64Data(value)) {
-        if (value.startsWith('data:image')) {
-          const mimeEnd = value.indexOf(',')
-          result[key] =
-            mimeEnd > 0
-              ? `${value.substring(0, mimeEnd + 1)}[Large data removed, original length: ${value.length}]`
-              : `[Large data removed, original length: ${value.length}]`
-        } else {
-          result[key] = `[Large data removed, original length: ${value.length}]`
-        }
-      } else {
-        // Truncate large text/JSON data
-        result[key] =
-          `[Large text truncated, original length: ${value.length}]${value.substring(0, 500)}...`
-      }
-    } else {
-      result[key] = value
-    }
-  }
-
-  return result
-}
-
-export const useConsoleStore = create<ConsoleStore>()(
-  devtools(
-    persist(
-      (set, get) => ({
-        entries: [],
-        isOpen: false,
-
-        addConsole: (entry: Omit<ConsoleEntry, 'id' | 'timestamp'>) => {
-          set((state) => {
-            // Determine early if this entry represents a streaming output
-            const isStreamingOutput =
-              (typeof ReadableStream !== 'undefined' && entry.output instanceof ReadableStream) ||
-              (typeof entry.output === 'object' &&
-                entry.output &&
-                entry.output.isStreaming === true) ||
-              (typeof entry.output === 'object' &&
-                entry.output &&
-                'executionData' in entry.output &&
-                typeof entry.output.executionData === 'object' &&
-                entry.output.executionData?.isStreaming === true) ||
-              (typeof entry.output === 'object' && entry.output && 'stream' in entry.output) ||
-              (typeof entry.output === 'object' &&
-                entry.output &&
-                'stream' in entry.output &&
-                'execution' in entry.output)
-
-            // Skip adding raw streaming objects that have both stream and executionData
-            if (
-              typeof entry.output === 'object' &&
-              entry.output &&
-              'stream' in entry.output &&
-              'executionData' in entry.output
-            ) {
-              // Don't add this entry - it will be processed by our explicit formatting code in executor/index.ts
-              return { entries: state.entries }
-            }
-
-            // Also skip raw StreamingExecution objects (with stream and execution properties)
-            if (
-              typeof entry.output === 'object' &&
-              entry.output &&
-              'stream' in entry.output &&
-              'execution' in entry.output
-            ) {
-              // Don't add this entry to prevent duplicate console entries for streaming responses
-              return { entries: state.entries }
-            }
-
-            // Create a new entry with redacted API keys (if not a stream)
-            const redactedEntry = { ...entry }
-
-            // If output is a stream, we skip redaction (it's not an object we want to recurse into)
-            if (
-              !isStreamingOutput &&
-              redactedEntry.output &&
-              typeof redactedEntry.output === 'object'
-            ) {
-              redactedEntry.output = redactApiKeys(redactedEntry.output)
-            }
-
-            // Create the new entry with ID and timestamp
-            const newEntry = {
-              ...redactedEntry,
-              id: crypto.randomUUID(),
-              timestamp: new Date().toISOString(),
-            }
-
-            // Keep only the last MAX_ENTRIES
-            const newEntries = [newEntry, ...state.entries].slice(0, MAX_ENTRIES)
-
-            return { entries: newEntries }
-          })
-
-          // Return the created entry by finding it in the updated store
-          return get().entries[0]
-        },
-
-        clearConsole: (workflowId: string | null) => {
-          set((state) => ({
-            entries: workflowId
-              ? state.entries.filter((entry) => entry.workflowId !== workflowId)
-              : [],
-          }))
-        },
-
-        exportConsoleCSV: (workflowId: string) => {
-          const entries = get().entries.filter((entry) => entry.workflowId === workflowId)
-
-          if (entries.length === 0) {
-            return
-          }
-
-          // Helper function to safely stringify and escape CSV values
-          const formatCSVValue = (value: any): string => {
-            if (value === null || value === undefined) {
-              return ''
-            }
-
-            let stringValue = typeof value === 'object' ? JSON.stringify(value) : String(value)
-
-            // Truncate very long strings
-            if (stringValue.length > 1000) {
-              stringValue = `${stringValue.substring(0, 1000)}...`
-            }
-
-            // Escape quotes and wrap in quotes if contains special characters
-            if (
-              stringValue.includes('"') ||
-              stringValue.includes(',') ||
-              stringValue.includes('\n')
-            ) {
-              stringValue = `"${stringValue.replace(/"/g, '""')}"`
-            }
-
-            return stringValue
-          }
-
-          // CSV Headers
-          const headers = [
-            'timestamp',
-            'blockName',
-            'blockType',
-            'startedAt',
-            'endedAt',
-            'durationMs',
-            'success',
-            'input',
-            'output',
-            'error',
-            'warning',
-          ]
-
-          // Generate CSV rows
-          const csvRows = [
-            headers.join(','),
-            ...entries.map((entry) =>
-              [
-                formatCSVValue(entry.timestamp),
-                formatCSVValue(entry.blockName),
-                formatCSVValue(entry.blockType),
-                formatCSVValue(entry.startedAt),
-                formatCSVValue(entry.endedAt),
-                formatCSVValue(entry.durationMs),
-                formatCSVValue(entry.success),
-                formatCSVValue(entry.input),
-                formatCSVValue(entry.output),
-                formatCSVValue(entry.error),
-                formatCSVValue(entry.warning),
-              ].join(',')
-            ),
-          ]
-
-          // Create CSV content
-          const csvContent = csvRows.join('\n')
-
-          // Generate filename with timestamp
-          const now = new Date()
-          const timestamp = now.toISOString().replace(/[:.]/g, '-').slice(0, 19)
-          const filename = `console-${workflowId}-${timestamp}.csv`
-
-          // Create and trigger download
-          const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' })
-          const link = document.createElement('a')
-
-          if (link.download !== undefined) {
-            const url = URL.createObjectURL(blob)
-            link.setAttribute('href', url)
-            link.setAttribute('download', filename)
-            link.style.visibility = 'hidden'
-            document.body.appendChild(link)
-            link.click()
-            document.body.removeChild(link)
-            URL.revokeObjectURL(url)
-          }
-        },
-
-        getWorkflowEntries: (workflowId) => {
-          return get().entries.filter((entry) => entry.workflowId === workflowId)
-        },
-
-        toggleConsole: () => {
-          set((state) => ({ isOpen: !state.isOpen }))
-        },
-
-        updateConsole: (
-          blockId: string,
-          update: string | import('@/stores/panel/console/types').ConsoleUpdate,
-          executionId?: string
-        ) => {
-          set((state) => {
-            const updatedEntries = state.entries.map((entry) => {
-              // Only update if both blockId and executionId match
-              const isMatch = entry.blockId === blockId && entry.executionId === executionId
-              if (isMatch) {
-                if (typeof update === 'string') {
-                  // Simple content update for backward compatibility
-                  const newOutput = updateBlockOutput(entry.output, update)
-                  return { ...entry, output: newOutput }
-                }
-                // Complex update with multiple fields
-                const updatedEntry = { ...entry }
-
-                if (update.content !== undefined) {
-                  const newOutput = updateBlockOutput(entry.output, update.content)
-                  updatedEntry.output = newOutput
-                }
-
-                if (update.replaceOutput !== undefined) {
-                  // Complete replacement of output
-                  updatedEntry.output = update.replaceOutput
-                } else if (update.output !== undefined) {
-                  const existingOutput = entry.output || {}
-                  updatedEntry.output = {
-                    ...existingOutput,
-                    ...update.output,
-                  }
-                }
-
-                if (update.error !== undefined) {
-                  updatedEntry.error = update.error
-                }
-
-                if (update.warning !== undefined) {
-                  updatedEntry.warning = update.warning
-                }
-
-                if (update.success !== undefined) {
-                  updatedEntry.success = update.success
-                }
-
-                if (update.endedAt !== undefined) {
-                  updatedEntry.endedAt = update.endedAt
-                }
-
-                if (update.durationMs !== undefined) {
-                  updatedEntry.durationMs = update.durationMs
-                }
-
-                if (update.input !== undefined) {
-                  updatedEntry.input = update.input
-                }
-
-                return updatedEntry
-              }
-              return entry
-            })
-            return { ...state, entries: updatedEntries }
-          })
-        },
-      }),
-      {
-        name: 'console-store',
-        partialize: (state) => {
-          const sanitizedEntries = state.entries.slice(0, MAX_ENTRIES).map((entry) => {
-            const sanitizedEntry = {
-              ...entry,
-              input: processSafeStorage(entry.input),
-              output: processSafeStorage(entry.output),
-            }
-
-            // Check total entry size and truncate further if needed
-            const entryJson = JSON.stringify(sanitizedEntry)
-            if (entryJson.length > MAX_TOTAL_ENTRY_SIZE) {
-              return {
-                ...sanitizedEntry,
-                output: `[Entry too large for storage, original size: ${entryJson.length} chars]`,
-                input:
-                  typeof sanitizedEntry.input === 'string' && sanitizedEntry.input.length > 1000
-                    ? `[Input truncated]${sanitizedEntry.input.substring(0, 200)}...`
-                    : sanitizedEntry.input,
-              }
-            }
-
-            return sanitizedEntry
-          })
-
-          return {
-            isOpen: state.isOpen,
-            entries: sanitizedEntries,
-          }
-        },
-      }
-    )
-  )
-)
diff --git a/apps/sim/stores/panel/console/types.ts b/apps/sim/stores/panel/console/types.ts
deleted file mode 100644
index ea816e05c4..0000000000
--- a/apps/sim/stores/panel/console/types.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { NormalizedBlockOutput } from '@/executor/types'
-import type { SubflowType } from '@/stores/workflows/workflow/types'
-
-export interface ConsoleEntry {
-  id: string
-  timestamp: string
-  workflowId: string
-  blockId: string
-  blockName: string
-  blockType: string
-  executionId?: string
-  startedAt?: string
-  endedAt?: string
-  durationMs?: number
-  success?: boolean
-  input?: any
-  output?: NormalizedBlockOutput
-  error?: string | Error | null
-  warning?: string
-  iterationCurrent?: number
-  iterationTotal?: number
-  iterationType?: SubflowType
-}
-
-export interface ConsoleUpdate {
-  content?: string
-  input?: any
-  output?: Partial<NormalizedBlockOutput>
-  replaceOutput?: NormalizedBlockOutput
-  error?: string
-  warning?: string
-  success?: boolean
-  endedAt?: string
-  durationMs?: number
-}
-
-export interface ConsoleStore {
-  entries: ConsoleEntry[]
-  isOpen: boolean
-
-  addConsole: (entry: Omit<ConsoleEntry, 'id' | 'timestamp'>) => ConsoleEntry
-  clearConsole: (workflowId: string | null) => void
-  exportConsoleCSV: (workflowId: string) => void
-  getWorkflowEntries: (workflowId: string) => ConsoleEntry[]
-  toggleConsole: () => void
-  updateConsole: (blockId: string, update: string | ConsoleUpdate, executionId?: string) => void
-}
diff --git a/apps/sim/stores/panel-new/copilot/constants.ts b/apps/sim/stores/panel/copilot/constants.ts
similarity index 100%
rename from apps/sim/stores/panel-new/copilot/constants.ts
rename to apps/sim/stores/panel/copilot/constants.ts
diff --git a/apps/sim/stores/panel/copilot/index.ts b/apps/sim/stores/panel/copilot/index.ts
new file mode 100644
index 0000000000..35c93817c6
--- /dev/null
+++ b/apps/sim/stores/panel/copilot/index.ts
@@ -0,0 +1,8 @@
+export { useCopilotStore } from '@/stores/panel/copilot/store'
+export type {
+  CopilotActions,
+  CopilotChat,
+  CopilotMessage,
+  CopilotState,
+  CopilotStore,
+} from '@/stores/panel/copilot/types'
diff --git a/apps/sim/stores/panel-new/copilot/preview-store.ts b/apps/sim/stores/panel/copilot/preview-store.ts
similarity index 97%
rename from apps/sim/stores/panel-new/copilot/preview-store.ts
rename to apps/sim/stores/panel/copilot/preview-store.ts
index 5bab8279a1..2802246725 100644
--- a/apps/sim/stores/panel-new/copilot/preview-store.ts
+++ b/apps/sim/stores/panel/copilot/preview-store.ts
@@ -2,8 +2,8 @@
 
 import { create } from 'zustand'
 import { persist } from 'zustand/middleware'
-import { COPILOT_TOOL_IDS } from './constants'
-import type { CopilotMessage, CopilotToolCall } from './types'
+import { COPILOT_TOOL_IDS } from '@/stores/panel/copilot/constants'
+import type { CopilotMessage, CopilotToolCall } from '@/stores/panel/copilot/types'
 
 export interface PreviewData {
   id: string
diff --git a/apps/sim/stores/panel-new/copilot/store.ts b/apps/sim/stores/panel/copilot/store.ts
similarity index 99%
rename from apps/sim/stores/panel-new/copilot/store.ts
rename to apps/sim/stores/panel/copilot/store.ts
index 168174dbdd..3c4197059a 100644
--- a/apps/sim/stores/panel-new/copilot/store.ts
+++ b/apps/sim/stores/panel/copilot/store.ts
@@ -49,7 +49,7 @@ import type {
   CopilotStore,
   CopilotToolCall,
   MessageFileAttachment,
-} from '@/stores/panel-new/copilot/types'
+} from '@/stores/panel/copilot/types'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
diff --git a/apps/sim/stores/panel-new/copilot/tools.ts b/apps/sim/stores/panel/copilot/tools.ts
similarity index 100%
rename from apps/sim/stores/panel-new/copilot/tools.ts
rename to apps/sim/stores/panel/copilot/tools.ts
diff --git a/apps/sim/stores/panel-new/copilot/types.ts b/apps/sim/stores/panel/copilot/types.ts
similarity index 100%
rename from apps/sim/stores/panel-new/copilot/types.ts
rename to apps/sim/stores/panel/copilot/types.ts
diff --git a/apps/sim/stores/panel-new/editor/store.ts b/apps/sim/stores/panel/editor/store.ts
similarity index 83%
rename from apps/sim/stores/panel-new/editor/store.ts
rename to apps/sim/stores/panel/editor/store.ts
index 9dc7dd5427..651951d076 100644
--- a/apps/sim/stores/panel-new/editor/store.ts
+++ b/apps/sim/stores/panel/editor/store.ts
@@ -42,29 +42,18 @@ export const usePanelEditorStore = create<PanelEditorState>()(
       setCurrentBlockId: (blockId) => {
         set({ currentBlockId: blockId })
 
-        // When a block is selected, switch to editor tab and remember previous tab
+        // When a block is selected, always switch to the editor tab
         if (blockId !== null) {
           const panelState = usePanelStore.getState()
-          const currentTab = panelState.activeTab
-
-          // Only save the previous tab if we're not already on the editor tab
-          if (currentTab !== 'editor') {
-            panelState.setPreviousTab(currentTab)
-            panelState.setActiveTab('editor')
-          }
+          panelState.setActiveTab('editor')
         }
       },
       clearCurrentBlock: () => {
         set({ currentBlockId: null })
 
-        // When selection is cleared, restore the previous tab
+        // When selection is cleared (e.g. clicking on the canvas), switch to the toolbar tab
         const panelState = usePanelStore.getState()
-        const previousTab = panelState.previousTab
-
-        if (previousTab !== null) {
-          panelState.setActiveTab(previousTab)
-          panelState.setPreviousTab(null)
-        }
+        panelState.setActiveTab('toolbar')
       },
       setConnectionsHeight: (height) => {
         const clampedHeight = Math.max(
diff --git a/apps/sim/stores/panel/store.ts b/apps/sim/stores/panel/store.ts
index 00af7ce54c..cc29a86d15 100644
--- a/apps/sim/stores/panel/store.ts
+++ b/apps/sim/stores/panel/store.ts
@@ -1,36 +1,54 @@
 import { create } from 'zustand'
-import { devtools, persist } from 'zustand/middleware'
-import type { PanelStore, PanelTab } from '@/stores/panel/types'
+import { persist } from 'zustand/middleware'
+import type { PanelState, PanelTab } from '@/stores/panel/types'
 
-export const usePanelStore = create<PanelStore>()(
-  devtools(
-    persist(
-      (set) => ({
-        isOpen: false,
-        activeTab: 'console',
-        panelWidth: 308,
+/**
+ * Panel width constraints
+ * Note: Maximum width is enforced dynamically at 40% of viewport width in the resize hook
+ */
+const MIN_PANEL_WIDTH = 244
 
-        togglePanel: () => {
-          set((state) => ({ isOpen: !state.isOpen }))
-        },
+/**
+ * Default panel tab
+ */
+const DEFAULT_TAB: PanelTab = 'copilot'
 
-        setActiveTab: (tab: PanelTab) => {
-          set({ activeTab: tab })
-        },
-
-        setPanelWidth: (width: number) => {
-          // Ensure minimum width of 308px and maximum of 800px
-          const clampedWidth = Math.max(308, Math.min(800, width))
-          set({ panelWidth: clampedWidth })
-        },
-
-        openCopilotPanel: () => {
-          set({ isOpen: true, activeTab: 'copilot' })
-        },
-      }),
-      {
-        name: 'panel-store',
-      }
-    )
+export const usePanelStore = create<PanelState>()(
+  persist(
+    (set) => ({
+      panelWidth: MIN_PANEL_WIDTH,
+      setPanelWidth: (width) => {
+        // Only enforce minimum - maximum is enforced dynamically by the resize hook
+        const clampedWidth = Math.max(MIN_PANEL_WIDTH, width)
+        set({ panelWidth: clampedWidth })
+        // Update CSS variable for immediate visual feedback
+        if (typeof window !== 'undefined') {
+          document.documentElement.style.setProperty('--panel-width', `${clampedWidth}px`)
+        }
+      },
+      activeTab: DEFAULT_TAB,
+      setActiveTab: (tab) => {
+        set({ activeTab: tab })
+        // Remove data attribute once React takes control
+        if (typeof document !== 'undefined') {
+          document.documentElement.removeAttribute('data-panel-active-tab')
+        }
+      },
+      _hasHydrated: false,
+      setHasHydrated: (hasHydrated) => {
+        set({ _hasHydrated: hasHydrated })
+      },
+    }),
+    {
+      name: 'panel-state',
+      onRehydrateStorage: () => (state) => {
+        // Sync CSS variables with stored state after rehydration
+        if (state && typeof window !== 'undefined') {
+          document.documentElement.style.setProperty('--panel-width', `${state.panelWidth}px`)
+          // Remove the data attribute so CSS rules stop interfering
+          document.documentElement.removeAttribute('data-panel-active-tab')
+        }
+      },
+    }
   )
 )
diff --git a/apps/sim/stores/panel-new/toolbar/store.ts b/apps/sim/stores/panel/toolbar/store.ts
similarity index 100%
rename from apps/sim/stores/panel-new/toolbar/store.ts
rename to apps/sim/stores/panel/toolbar/store.ts
diff --git a/apps/sim/stores/panel/types.ts b/apps/sim/stores/panel/types.ts
index 7e256ece88..f514301a29 100644
--- a/apps/sim/stores/panel/types.ts
+++ b/apps/sim/stores/panel/types.ts
@@ -1,11 +1,16 @@
-export type PanelTab = 'console' | 'variables' | 'chat' | 'copilot'
+/**
+ * Available panel tabs
+ */
+export type PanelTab = 'copilot' | 'editor' | 'toolbar'
 
-export interface PanelStore {
-  isOpen: boolean
-  activeTab: PanelTab
+/**
+ * Panel state interface
+ */
+export interface PanelState {
   panelWidth: number
-  togglePanel: () => void
-  setActiveTab: (tab: PanelTab) => void
   setPanelWidth: (width: number) => void
-  openCopilotPanel: () => void
+  activeTab: PanelTab
+  setActiveTab: (tab: PanelTab) => void
+  _hasHydrated: boolean
+  setHasHydrated: (hasHydrated: boolean) => void
 }
diff --git a/apps/sim/stores/providers/store.ts b/apps/sim/stores/providers/store.ts
index 1416a16565..403175d406 100644
--- a/apps/sim/stores/providers/store.ts
+++ b/apps/sim/stores/providers/store.ts
@@ -1,6 +1,6 @@
 import { create } from 'zustand'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { ProvidersStore } from './types'
+import type { ProvidersStore } from '@/stores/providers/types'
 
 const logger = createLogger('ProvidersStore')
 
diff --git a/apps/sim/stores/terminal/console/store.ts b/apps/sim/stores/terminal/console/store.ts
index 81fc71e0f6..a8b1eab0bb 100644
--- a/apps/sim/stores/terminal/console/store.ts
+++ b/apps/sim/stores/terminal/console/store.ts
@@ -6,7 +6,7 @@ import type { NormalizedBlockOutput } from '@/executor/types'
 import { useExecutionStore } from '@/stores/execution/store'
 import { useNotificationStore } from '@/stores/notifications'
 import { useGeneralStore } from '@/stores/settings/general/store'
-import type { ConsoleEntry, ConsoleStore, ConsoleUpdate } from './types'
+import type { ConsoleEntry, ConsoleStore, ConsoleUpdate } from '@/stores/terminal/console/types'
 
 const logger = createLogger('TerminalConsoleStore')
 
diff --git a/apps/sim/stores/undo-redo/store.ts b/apps/sim/stores/undo-redo/store.ts
index 80e8361551..f3082d816d 100644
--- a/apps/sim/stores/undo-redo/store.ts
+++ b/apps/sim/stores/undo-redo/store.ts
@@ -2,7 +2,6 @@ import type { Edge } from 'reactflow'
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
 import { createLogger } from '@/lib/logs/console/logger'
-import type { BlockState } from '@/stores/workflows/workflow/types'
 import type {
   MoveBlockOperation,
   Operation,
@@ -10,7 +9,8 @@ import type {
   RemoveBlockOperation,
   RemoveEdgeOperation,
   UndoRedoState,
-} from './types'
+} from '@/stores/undo-redo/types'
+import type { BlockState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('UndoRedoStore')
 const DEFAULT_CAPACITY = 100
diff --git a/apps/sim/stores/undo-redo/utils.ts b/apps/sim/stores/undo-redo/utils.ts
index ceee8872c0..69615b7f5a 100644
--- a/apps/sim/stores/undo-redo/utils.ts
+++ b/apps/sim/stores/undo-redo/utils.ts
@@ -1,4 +1,4 @@
-import type { Operation, OperationEntry } from './types'
+import type { Operation, OperationEntry } from '@/stores/undo-redo/types'
 
 export function createOperationEntry(operation: Operation, inverse: Operation): OperationEntry {
   return {
diff --git a/apps/sim/stores/variables/store.ts b/apps/sim/stores/variables/store.ts
index da51b702ca..a9404e8d3d 100644
--- a/apps/sim/stores/variables/store.ts
+++ b/apps/sim/stores/variables/store.ts
@@ -2,15 +2,15 @@ import { v4 as uuidv4 } from 'uuid'
 import { create } from 'zustand'
 import { devtools, persist } from 'zustand/middleware'
 import { createLogger } from '@/lib/logs/console/logger'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import type {
   Variable,
   VariablesDimensions,
   VariablesPosition,
   VariablesStore,
   VariableType,
-} from './types'
+} from '@/stores/variables/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 const logger = createLogger('VariablesModalStore')
 
diff --git a/apps/sim/stores/workflow-diff/store.ts b/apps/sim/stores/workflow-diff/store.ts
index 49332afa16..7c228ee549 100644
--- a/apps/sim/stores/workflow-diff/store.ts
+++ b/apps/sim/stores/workflow-diff/store.ts
@@ -166,7 +166,7 @@ export const useWorkflowDiffStore = create<WorkflowDiffState & WorkflowDiffActio
             // Attempt to capture the triggering user message id from copilot store
             let triggerMessageId: string | null = null
             try {
-              const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+              const { useCopilotStore } = await import('@/stores/panel/copilot/store')
               const { messages } = useCopilotStore.getState() as any
               if (Array.isArray(messages) && messages.length > 0) {
                 for (let i = messages.length - 1; i >= 0; i--) {
@@ -338,7 +338,7 @@ export const useWorkflowDiffStore = create<WorkflowDiffState & WorkflowDiffActio
 
             // Immediately flag diffAccepted on stats if we can (early upsert with minimal fields)
             try {
-              const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+              const { useCopilotStore } = await import('@/stores/panel/copilot/store')
               const { currentChat } = useCopilotStore.getState() as any
               const triggerMessageId = get()._triggerMessageId
               if (currentChat?.id && triggerMessageId) {
@@ -422,7 +422,7 @@ export const useWorkflowDiffStore = create<WorkflowDiffState & WorkflowDiffActio
 
               // Update copilot tool call state to 'accepted'
               try {
-                const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+                const { useCopilotStore } = await import('@/stores/panel/copilot/store')
                 const { messages, toolCallsById } = useCopilotStore.getState()
 
                 // Prefer the latest assistant message's build/edit tool_call from contentBlocks
@@ -472,7 +472,7 @@ export const useWorkflowDiffStore = create<WorkflowDiffState & WorkflowDiffActio
 
           // Update copilot tool call state to 'rejected'
           try {
-            const { useCopilotStore } = await import('@/stores/panel-new/copilot/store')
+            const { useCopilotStore } = await import('@/stores/panel/copilot/store')
             const { currentChat, messages, toolCallsById } = useCopilotStore.getState() as any
 
             // Post early diffAccepted=false if we have trigger + chat
diff --git a/apps/sim/tools/apollo/account_bulk_create.ts b/apps/sim/tools/apollo/account_bulk_create.ts
index 583d07a2f4..6bcaefecc5 100644
--- a/apps/sim/tools/apollo/account_bulk_create.ts
+++ b/apps/sim/tools/apollo/account_bulk_create.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloAccountBulkCreateParams,
+  ApolloAccountBulkCreateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloAccountBulkCreateParams, ApolloAccountBulkCreateResponse } from './types'
 
 export const apolloAccountBulkCreateTool: ToolConfig<
   ApolloAccountBulkCreateParams,
diff --git a/apps/sim/tools/apollo/account_bulk_update.ts b/apps/sim/tools/apollo/account_bulk_update.ts
index bc81b281e8..7d20d20956 100644
--- a/apps/sim/tools/apollo/account_bulk_update.ts
+++ b/apps/sim/tools/apollo/account_bulk_update.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloAccountBulkUpdateParams,
+  ApolloAccountBulkUpdateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloAccountBulkUpdateParams, ApolloAccountBulkUpdateResponse } from './types'
 
 export const apolloAccountBulkUpdateTool: ToolConfig<
   ApolloAccountBulkUpdateParams,
diff --git a/apps/sim/tools/apollo/account_create.ts b/apps/sim/tools/apollo/account_create.ts
index acfd7619ee..dac3203d66 100644
--- a/apps/sim/tools/apollo/account_create.ts
+++ b/apps/sim/tools/apollo/account_create.ts
@@ -1,5 +1,5 @@
+import type { ApolloAccountCreateParams, ApolloAccountCreateResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloAccountCreateParams, ApolloAccountCreateResponse } from './types'
 
 export const apolloAccountCreateTool: ToolConfig<
   ApolloAccountCreateParams,
diff --git a/apps/sim/tools/apollo/account_search.ts b/apps/sim/tools/apollo/account_search.ts
index c710ce48e9..9b2a870606 100644
--- a/apps/sim/tools/apollo/account_search.ts
+++ b/apps/sim/tools/apollo/account_search.ts
@@ -1,5 +1,5 @@
+import type { ApolloAccountSearchParams, ApolloAccountSearchResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloAccountSearchParams, ApolloAccountSearchResponse } from './types'
 
 export const apolloAccountSearchTool: ToolConfig<
   ApolloAccountSearchParams,
diff --git a/apps/sim/tools/apollo/account_update.ts b/apps/sim/tools/apollo/account_update.ts
index 76204022af..f49555318f 100644
--- a/apps/sim/tools/apollo/account_update.ts
+++ b/apps/sim/tools/apollo/account_update.ts
@@ -1,5 +1,5 @@
+import type { ApolloAccountUpdateParams, ApolloAccountUpdateResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloAccountUpdateParams, ApolloAccountUpdateResponse } from './types'
 
 export const apolloAccountUpdateTool: ToolConfig<
   ApolloAccountUpdateParams,
diff --git a/apps/sim/tools/apollo/contact_bulk_create.ts b/apps/sim/tools/apollo/contact_bulk_create.ts
index 11b8c278de..3b6a74089d 100644
--- a/apps/sim/tools/apollo/contact_bulk_create.ts
+++ b/apps/sim/tools/apollo/contact_bulk_create.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloContactBulkCreateParams,
+  ApolloContactBulkCreateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloContactBulkCreateParams, ApolloContactBulkCreateResponse } from './types'
 
 export const apolloContactBulkCreateTool: ToolConfig<
   ApolloContactBulkCreateParams,
diff --git a/apps/sim/tools/apollo/contact_bulk_update.ts b/apps/sim/tools/apollo/contact_bulk_update.ts
index a1d9133d54..8aec17f56e 100644
--- a/apps/sim/tools/apollo/contact_bulk_update.ts
+++ b/apps/sim/tools/apollo/contact_bulk_update.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloContactBulkUpdateParams,
+  ApolloContactBulkUpdateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloContactBulkUpdateParams, ApolloContactBulkUpdateResponse } from './types'
 
 export const apolloContactBulkUpdateTool: ToolConfig<
   ApolloContactBulkUpdateParams,
diff --git a/apps/sim/tools/apollo/contact_create.ts b/apps/sim/tools/apollo/contact_create.ts
index 4cd7be0786..efc806f0ad 100644
--- a/apps/sim/tools/apollo/contact_create.ts
+++ b/apps/sim/tools/apollo/contact_create.ts
@@ -1,5 +1,5 @@
+import type { ApolloContactCreateParams, ApolloContactCreateResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloContactCreateParams, ApolloContactCreateResponse } from './types'
 
 export const apolloContactCreateTool: ToolConfig<
   ApolloContactCreateParams,
diff --git a/apps/sim/tools/apollo/contact_search.ts b/apps/sim/tools/apollo/contact_search.ts
index 8f20a94df7..6a6ee9a151 100644
--- a/apps/sim/tools/apollo/contact_search.ts
+++ b/apps/sim/tools/apollo/contact_search.ts
@@ -1,5 +1,5 @@
+import type { ApolloContactSearchParams, ApolloContactSearchResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloContactSearchParams, ApolloContactSearchResponse } from './types'
 
 export const apolloContactSearchTool: ToolConfig<
   ApolloContactSearchParams,
diff --git a/apps/sim/tools/apollo/contact_update.ts b/apps/sim/tools/apollo/contact_update.ts
index d127c28ac9..c7c6041cf4 100644
--- a/apps/sim/tools/apollo/contact_update.ts
+++ b/apps/sim/tools/apollo/contact_update.ts
@@ -1,5 +1,5 @@
+import type { ApolloContactUpdateParams, ApolloContactUpdateResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloContactUpdateParams, ApolloContactUpdateResponse } from './types'
 
 export const apolloContactUpdateTool: ToolConfig<
   ApolloContactUpdateParams,
diff --git a/apps/sim/tools/apollo/email_accounts.ts b/apps/sim/tools/apollo/email_accounts.ts
index b3810dea6e..bf865f0578 100644
--- a/apps/sim/tools/apollo/email_accounts.ts
+++ b/apps/sim/tools/apollo/email_accounts.ts
@@ -1,5 +1,5 @@
+import type { ApolloEmailAccountsParams, ApolloEmailAccountsResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloEmailAccountsParams, ApolloEmailAccountsResponse } from './types'
 
 export const apolloEmailAccountsTool: ToolConfig<
   ApolloEmailAccountsParams,
diff --git a/apps/sim/tools/apollo/opportunity_create.ts b/apps/sim/tools/apollo/opportunity_create.ts
index 4203c5a9d5..5c329fd7b8 100644
--- a/apps/sim/tools/apollo/opportunity_create.ts
+++ b/apps/sim/tools/apollo/opportunity_create.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloOpportunityCreateParams,
+  ApolloOpportunityCreateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOpportunityCreateParams, ApolloOpportunityCreateResponse } from './types'
 
 export const apolloOpportunityCreateTool: ToolConfig<
   ApolloOpportunityCreateParams,
diff --git a/apps/sim/tools/apollo/opportunity_get.ts b/apps/sim/tools/apollo/opportunity_get.ts
index ae81ca145f..e6a3912b32 100644
--- a/apps/sim/tools/apollo/opportunity_get.ts
+++ b/apps/sim/tools/apollo/opportunity_get.ts
@@ -1,5 +1,5 @@
+import type { ApolloOpportunityGetParams, ApolloOpportunityGetResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOpportunityGetParams, ApolloOpportunityGetResponse } from './types'
 
 export const apolloOpportunityGetTool: ToolConfig<
   ApolloOpportunityGetParams,
diff --git a/apps/sim/tools/apollo/opportunity_search.ts b/apps/sim/tools/apollo/opportunity_search.ts
index 8cdc2e7261..2ad8782419 100644
--- a/apps/sim/tools/apollo/opportunity_search.ts
+++ b/apps/sim/tools/apollo/opportunity_search.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloOpportunitySearchParams,
+  ApolloOpportunitySearchResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOpportunitySearchParams, ApolloOpportunitySearchResponse } from './types'
 
 export const apolloOpportunitySearchTool: ToolConfig<
   ApolloOpportunitySearchParams,
diff --git a/apps/sim/tools/apollo/opportunity_update.ts b/apps/sim/tools/apollo/opportunity_update.ts
index caacfb46b3..8f19fcaf22 100644
--- a/apps/sim/tools/apollo/opportunity_update.ts
+++ b/apps/sim/tools/apollo/opportunity_update.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloOpportunityUpdateParams,
+  ApolloOpportunityUpdateResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOpportunityUpdateParams, ApolloOpportunityUpdateResponse } from './types'
 
 export const apolloOpportunityUpdateTool: ToolConfig<
   ApolloOpportunityUpdateParams,
diff --git a/apps/sim/tools/apollo/organization_bulk_enrich.ts b/apps/sim/tools/apollo/organization_bulk_enrich.ts
index f9282086ad..cdb06e0e1b 100644
--- a/apps/sim/tools/apollo/organization_bulk_enrich.ts
+++ b/apps/sim/tools/apollo/organization_bulk_enrich.ts
@@ -1,8 +1,8 @@
-import type { ToolConfig } from '@/tools/types'
 import type {
   ApolloOrganizationBulkEnrichParams,
   ApolloOrganizationBulkEnrichResponse,
-} from './types'
+} from '@/tools/apollo/types'
+import type { ToolConfig } from '@/tools/types'
 
 export const apolloOrganizationBulkEnrichTool: ToolConfig<
   ApolloOrganizationBulkEnrichParams,
diff --git a/apps/sim/tools/apollo/organization_enrich.ts b/apps/sim/tools/apollo/organization_enrich.ts
index 29ede58dc3..ded4f89629 100644
--- a/apps/sim/tools/apollo/organization_enrich.ts
+++ b/apps/sim/tools/apollo/organization_enrich.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloOrganizationEnrichParams,
+  ApolloOrganizationEnrichResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOrganizationEnrichParams, ApolloOrganizationEnrichResponse } from './types'
 
 export const apolloOrganizationEnrichTool: ToolConfig<
   ApolloOrganizationEnrichParams,
diff --git a/apps/sim/tools/apollo/organization_search.ts b/apps/sim/tools/apollo/organization_search.ts
index db3bbb5044..3d94f80d91 100644
--- a/apps/sim/tools/apollo/organization_search.ts
+++ b/apps/sim/tools/apollo/organization_search.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloOrganizationSearchParams,
+  ApolloOrganizationSearchResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloOrganizationSearchParams, ApolloOrganizationSearchResponse } from './types'
 
 export const apolloOrganizationSearchTool: ToolConfig<
   ApolloOrganizationSearchParams,
diff --git a/apps/sim/tools/apollo/people_bulk_enrich.ts b/apps/sim/tools/apollo/people_bulk_enrich.ts
index b598f5f3d9..afc965ece9 100644
--- a/apps/sim/tools/apollo/people_bulk_enrich.ts
+++ b/apps/sim/tools/apollo/people_bulk_enrich.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloPeopleBulkEnrichParams,
+  ApolloPeopleBulkEnrichResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloPeopleBulkEnrichParams, ApolloPeopleBulkEnrichResponse } from './types'
 
 export const apolloPeopleBulkEnrichTool: ToolConfig<
   ApolloPeopleBulkEnrichParams,
diff --git a/apps/sim/tools/apollo/people_enrich.ts b/apps/sim/tools/apollo/people_enrich.ts
index 5e73ab0db5..e10e474abd 100644
--- a/apps/sim/tools/apollo/people_enrich.ts
+++ b/apps/sim/tools/apollo/people_enrich.ts
@@ -1,5 +1,5 @@
+import type { ApolloPeopleEnrichParams, ApolloPeopleEnrichResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloPeopleEnrichParams, ApolloPeopleEnrichResponse } from './types'
 
 export const apolloPeopleEnrichTool: ToolConfig<
   ApolloPeopleEnrichParams,
diff --git a/apps/sim/tools/apollo/people_search.ts b/apps/sim/tools/apollo/people_search.ts
index 01a09fc9f1..f4b14d51c2 100644
--- a/apps/sim/tools/apollo/people_search.ts
+++ b/apps/sim/tools/apollo/people_search.ts
@@ -1,5 +1,5 @@
+import type { ApolloPeopleSearchParams, ApolloPeopleSearchResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloPeopleSearchParams, ApolloPeopleSearchResponse } from './types'
 
 export const apolloPeopleSearchTool: ToolConfig<
   ApolloPeopleSearchParams,
diff --git a/apps/sim/tools/apollo/sequence_add_contacts.ts b/apps/sim/tools/apollo/sequence_add_contacts.ts
index df8a54fe9e..b87a69f77e 100644
--- a/apps/sim/tools/apollo/sequence_add_contacts.ts
+++ b/apps/sim/tools/apollo/sequence_add_contacts.ts
@@ -1,5 +1,8 @@
+import type {
+  ApolloSequenceAddContactsParams,
+  ApolloSequenceAddContactsResponse,
+} from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloSequenceAddContactsParams, ApolloSequenceAddContactsResponse } from './types'
 
 export const apolloSequenceAddContactsTool: ToolConfig<
   ApolloSequenceAddContactsParams,
diff --git a/apps/sim/tools/apollo/sequence_search.ts b/apps/sim/tools/apollo/sequence_search.ts
index a56e7509b1..d358acd2a0 100644
--- a/apps/sim/tools/apollo/sequence_search.ts
+++ b/apps/sim/tools/apollo/sequence_search.ts
@@ -1,5 +1,5 @@
+import type { ApolloSequenceSearchParams, ApolloSequenceSearchResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloSequenceSearchParams, ApolloSequenceSearchResponse } from './types'
 
 export const apolloSequenceSearchTool: ToolConfig<
   ApolloSequenceSearchParams,
diff --git a/apps/sim/tools/apollo/task_create.ts b/apps/sim/tools/apollo/task_create.ts
index 6f7f8c1cd3..50f6dc017b 100644
--- a/apps/sim/tools/apollo/task_create.ts
+++ b/apps/sim/tools/apollo/task_create.ts
@@ -1,5 +1,5 @@
+import type { ApolloTaskCreateParams, ApolloTaskCreateResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloTaskCreateParams, ApolloTaskCreateResponse } from './types'
 
 export const apolloTaskCreateTool: ToolConfig<ApolloTaskCreateParams, ApolloTaskCreateResponse> = {
   id: 'apollo_task_create',
diff --git a/apps/sim/tools/apollo/task_search.ts b/apps/sim/tools/apollo/task_search.ts
index e8a676cbfd..024515d10a 100644
--- a/apps/sim/tools/apollo/task_search.ts
+++ b/apps/sim/tools/apollo/task_search.ts
@@ -1,5 +1,5 @@
+import type { ApolloTaskSearchParams, ApolloTaskSearchResponse } from '@/tools/apollo/types'
 import type { ToolConfig } from '@/tools/types'
-import type { ApolloTaskSearchParams, ApolloTaskSearchResponse } from './types'
 
 export const apolloTaskSearchTool: ToolConfig<ApolloTaskSearchParams, ApolloTaskSearchResponse> = {
   id: 'apollo_task_search',
diff --git a/apps/sim/tools/error-extractors.test.ts b/apps/sim/tools/error-extractors.test.ts
index 4ea793c90f..d1fe003016 100644
--- a/apps/sim/tools/error-extractors.test.ts
+++ b/apps/sim/tools/error-extractors.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { ErrorExtractorId, type ErrorInfo, extractErrorMessage } from './error-extractors'
+import { ErrorExtractorId, type ErrorInfo, extractErrorMessage } from '@/tools/error-extractors'
 
 describe('Error Extractors', () => {
   describe('extractErrorMessage', () => {
diff --git a/apps/sim/tools/jira/search_issues.ts b/apps/sim/tools/jira/search_issues.ts
index aa4b10dca1..109856b876 100644
--- a/apps/sim/tools/jira/search_issues.ts
+++ b/apps/sim/tools/jira/search_issues.ts
@@ -1,6 +1,6 @@
+import type { JiraSearchIssuesParams, JiraSearchIssuesResponse } from '@/tools/jira/types'
 import { getJiraCloudId } from '@/tools/jira/utils'
 import type { ToolConfig } from '@/tools/types'
-import type { JiraSearchIssuesParams, JiraSearchIssuesResponse } from './types'
 
 export const jiraSearchIssuesTool: ToolConfig<JiraSearchIssuesParams, JiraSearchIssuesResponse> = {
   id: 'jira_search_issues',
diff --git a/apps/sim/tools/wealthbox/utils.ts b/apps/sim/tools/wealthbox/utils.ts
index 8497bf4853..8edef405d4 100644
--- a/apps/sim/tools/wealthbox/utils.ts
+++ b/apps/sim/tools/wealthbox/utils.ts
@@ -2,7 +2,7 @@ import type {
   WealthboxTaskRequestBody,
   WealthboxWriteParams,
   WealthboxWriteResponse,
-} from './types'
+} from '@/tools/wealthbox/types'
 
 // Utility function to safely convert to string and trim
 const safeStringify = (value: any): string => {
diff --git a/apps/sim/triggers/calendly/invitee_canceled.ts b/apps/sim/triggers/calendly/invitee_canceled.ts
index 88bd0b6b5e..242e592f7b 100644
--- a/apps/sim/triggers/calendly/invitee_canceled.ts
+++ b/apps/sim/triggers/calendly/invitee_canceled.ts
@@ -1,6 +1,6 @@
 import { CalendlyIcon } from '@/components/icons'
+import { buildInviteeOutputs } from '@/triggers/calendly/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildInviteeOutputs } from './utils'
 
 export const calendlyInviteeCanceledTrigger: TriggerConfig = {
   id: 'calendly_invitee_canceled',
diff --git a/apps/sim/triggers/calendly/invitee_created.ts b/apps/sim/triggers/calendly/invitee_created.ts
index 350f72a994..8fe7e13eb9 100644
--- a/apps/sim/triggers/calendly/invitee_created.ts
+++ b/apps/sim/triggers/calendly/invitee_created.ts
@@ -1,6 +1,6 @@
 import { CalendlyIcon } from '@/components/icons'
+import { buildInviteeOutputs, calendlyTriggerOptions } from '@/triggers/calendly/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildInviteeOutputs, calendlyTriggerOptions } from './utils'
 
 export const calendlyInviteeCreatedTrigger: TriggerConfig = {
   id: 'calendly_invitee_created',
diff --git a/apps/sim/triggers/calendly/routing_form_submitted.ts b/apps/sim/triggers/calendly/routing_form_submitted.ts
index a75e267665..003751dcdb 100644
--- a/apps/sim/triggers/calendly/routing_form_submitted.ts
+++ b/apps/sim/triggers/calendly/routing_form_submitted.ts
@@ -1,6 +1,6 @@
 import { CalendlyIcon } from '@/components/icons'
+import { buildRoutingFormOutputs } from '@/triggers/calendly/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildRoutingFormOutputs } from './utils'
 
 export const calendlyRoutingFormSubmittedTrigger: TriggerConfig = {
   id: 'calendly_routing_form_submitted',
diff --git a/apps/sim/triggers/hubspot/company_created.ts b/apps/sim/triggers/hubspot/company_created.ts
index 199cc045ce..4a1f4e3883 100644
--- a/apps/sim/triggers/hubspot/company_created.ts
+++ b/apps/sim/triggers/hubspot/company_created.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildCompanyCreatedOutputs,
   hubspotCompanyTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotCompanyCreatedTrigger: TriggerConfig = {
   id: 'hubspot_company_created',
diff --git a/apps/sim/triggers/hubspot/company_deleted.ts b/apps/sim/triggers/hubspot/company_deleted.ts
index 0e53cf9d0e..5ca5a3ad99 100644
--- a/apps/sim/triggers/hubspot/company_deleted.ts
+++ b/apps/sim/triggers/hubspot/company_deleted.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildCompanyDeletedOutputs,
   hubspotCompanyTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotCompanyDeletedTrigger: TriggerConfig = {
   id: 'hubspot_company_deleted',
diff --git a/apps/sim/triggers/hubspot/company_property_changed.ts b/apps/sim/triggers/hubspot/company_property_changed.ts
index ae76a139ce..18b597712b 100644
--- a/apps/sim/triggers/hubspot/company_property_changed.ts
+++ b/apps/sim/triggers/hubspot/company_property_changed.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildCompanyPropertyChangedOutputs,
   hubspotCompanyTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotCompanyPropertyChangedTrigger: TriggerConfig = {
   id: 'hubspot_company_property_changed',
diff --git a/apps/sim/triggers/hubspot/contact_created.ts b/apps/sim/triggers/hubspot/contact_created.ts
index 2162636bf5..c8ef178160 100644
--- a/apps/sim/triggers/hubspot/contact_created.ts
+++ b/apps/sim/triggers/hubspot/contact_created.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildContactCreatedOutputs,
   hubspotContactTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotContactCreatedTrigger: TriggerConfig = {
   id: 'hubspot_contact_created',
diff --git a/apps/sim/triggers/hubspot/contact_deleted.ts b/apps/sim/triggers/hubspot/contact_deleted.ts
index de61368f97..44e412ae7e 100644
--- a/apps/sim/triggers/hubspot/contact_deleted.ts
+++ b/apps/sim/triggers/hubspot/contact_deleted.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildContactDeletedOutputs,
   hubspotContactTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotContactDeletedTrigger: TriggerConfig = {
   id: 'hubspot_contact_deleted',
diff --git a/apps/sim/triggers/hubspot/contact_privacy_deleted.ts b/apps/sim/triggers/hubspot/contact_privacy_deleted.ts
index b71fbdc106..a9e9e95e06 100644
--- a/apps/sim/triggers/hubspot/contact_privacy_deleted.ts
+++ b/apps/sim/triggers/hubspot/contact_privacy_deleted.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildContactPrivacyDeletedOutputs,
   hubspotContactTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotContactPrivacyDeletedTrigger: TriggerConfig = {
   id: 'hubspot_contact_privacy_deleted',
diff --git a/apps/sim/triggers/hubspot/contact_property_changed.ts b/apps/sim/triggers/hubspot/contact_property_changed.ts
index a83327abb1..65c9d3e6d2 100644
--- a/apps/sim/triggers/hubspot/contact_property_changed.ts
+++ b/apps/sim/triggers/hubspot/contact_property_changed.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildContactPropertyChangedOutputs,
   hubspotContactTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotContactPropertyChangedTrigger: TriggerConfig = {
   id: 'hubspot_contact_property_changed',
diff --git a/apps/sim/triggers/hubspot/conversation_creation.ts b/apps/sim/triggers/hubspot/conversation_creation.ts
index d32691cc88..14e7639289 100644
--- a/apps/sim/triggers/hubspot/conversation_creation.ts
+++ b/apps/sim/triggers/hubspot/conversation_creation.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildConversationCreationOutputs,
   hubspotConversationTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotConversationCreationTrigger: TriggerConfig = {
   id: 'hubspot_conversation_creation',
diff --git a/apps/sim/triggers/hubspot/conversation_deletion.ts b/apps/sim/triggers/hubspot/conversation_deletion.ts
index 04a212acff..647a4c763f 100644
--- a/apps/sim/triggers/hubspot/conversation_deletion.ts
+++ b/apps/sim/triggers/hubspot/conversation_deletion.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildConversationDeletionOutputs,
   hubspotConversationTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotConversationDeletionTrigger: TriggerConfig = {
   id: 'hubspot_conversation_deletion',
diff --git a/apps/sim/triggers/hubspot/conversation_new_message.ts b/apps/sim/triggers/hubspot/conversation_new_message.ts
index bb684249d9..a5d1664272 100644
--- a/apps/sim/triggers/hubspot/conversation_new_message.ts
+++ b/apps/sim/triggers/hubspot/conversation_new_message.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildConversationNewMessageOutputs,
   hubspotConversationTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotConversationNewMessageTrigger: TriggerConfig = {
   id: 'hubspot_conversation_new_message',
diff --git a/apps/sim/triggers/hubspot/conversation_privacy_deletion.ts b/apps/sim/triggers/hubspot/conversation_privacy_deletion.ts
index af37731dcb..7ede1098d2 100644
--- a/apps/sim/triggers/hubspot/conversation_privacy_deletion.ts
+++ b/apps/sim/triggers/hubspot/conversation_privacy_deletion.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildConversationPrivacyDeletionOutputs,
   hubspotConversationTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotConversationPrivacyDeletionTrigger: TriggerConfig = {
   id: 'hubspot_conversation_privacy_deletion',
diff --git a/apps/sim/triggers/hubspot/conversation_property_changed.ts b/apps/sim/triggers/hubspot/conversation_property_changed.ts
index 104a420f5a..9359a5f294 100644
--- a/apps/sim/triggers/hubspot/conversation_property_changed.ts
+++ b/apps/sim/triggers/hubspot/conversation_property_changed.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildConversationPropertyChangedOutputs,
   hubspotConversationTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotConversationPropertyChangedTrigger: TriggerConfig = {
   id: 'hubspot_conversation_property_changed',
diff --git a/apps/sim/triggers/hubspot/deal_created.ts b/apps/sim/triggers/hubspot/deal_created.ts
index e5c44b735a..cc20e7743b 100644
--- a/apps/sim/triggers/hubspot/deal_created.ts
+++ b/apps/sim/triggers/hubspot/deal_created.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildDealCreatedOutputs,
   hubspotDealTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotDealCreatedTrigger: TriggerConfig = {
   id: 'hubspot_deal_created',
diff --git a/apps/sim/triggers/hubspot/deal_deleted.ts b/apps/sim/triggers/hubspot/deal_deleted.ts
index ccb4d52e72..2b7d4afcb1 100644
--- a/apps/sim/triggers/hubspot/deal_deleted.ts
+++ b/apps/sim/triggers/hubspot/deal_deleted.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildDealDeletedOutputs,
   hubspotDealTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotDealDeletedTrigger: TriggerConfig = {
   id: 'hubspot_deal_deleted',
diff --git a/apps/sim/triggers/hubspot/deal_property_changed.ts b/apps/sim/triggers/hubspot/deal_property_changed.ts
index 28c918381d..82914ad2cd 100644
--- a/apps/sim/triggers/hubspot/deal_property_changed.ts
+++ b/apps/sim/triggers/hubspot/deal_property_changed.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildDealPropertyChangedOutputs,
   hubspotDealTriggerOptions,
   hubspotSetupInstructions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotDealPropertyChangedTrigger: TriggerConfig = {
   id: 'hubspot_deal_property_changed',
diff --git a/apps/sim/triggers/hubspot/ticket_created.ts b/apps/sim/triggers/hubspot/ticket_created.ts
index 55421009a4..85e29e1016 100644
--- a/apps/sim/triggers/hubspot/ticket_created.ts
+++ b/apps/sim/triggers/hubspot/ticket_created.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildTicketCreatedOutputs,
   hubspotSetupInstructions,
   hubspotTicketTriggerOptions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotTicketCreatedTrigger: TriggerConfig = {
   id: 'hubspot_ticket_created',
diff --git a/apps/sim/triggers/hubspot/ticket_deleted.ts b/apps/sim/triggers/hubspot/ticket_deleted.ts
index a316af2da0..23034fd6e1 100644
--- a/apps/sim/triggers/hubspot/ticket_deleted.ts
+++ b/apps/sim/triggers/hubspot/ticket_deleted.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildTicketDeletedOutputs,
   hubspotSetupInstructions,
   hubspotTicketTriggerOptions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotTicketDeletedTrigger: TriggerConfig = {
   id: 'hubspot_ticket_deleted',
diff --git a/apps/sim/triggers/hubspot/ticket_property_changed.ts b/apps/sim/triggers/hubspot/ticket_property_changed.ts
index 33f8ec1d53..157ac38edc 100644
--- a/apps/sim/triggers/hubspot/ticket_property_changed.ts
+++ b/apps/sim/triggers/hubspot/ticket_property_changed.ts
@@ -1,10 +1,10 @@
 import { HubspotIcon } from '@/components/icons'
-import type { TriggerConfig } from '@/triggers/types'
 import {
   buildTicketPropertyChangedOutputs,
   hubspotSetupInstructions,
   hubspotTicketTriggerOptions,
-} from './utils'
+} from '@/triggers/hubspot/utils'
+import type { TriggerConfig } from '@/triggers/types'
 
 export const hubspotTicketPropertyChangedTrigger: TriggerConfig = {
   id: 'hubspot_ticket_property_changed',
diff --git a/apps/sim/triggers/jira/issue_commented.ts b/apps/sim/triggers/jira/issue_commented.ts
index 6888fd3c76..3ebeb3709f 100644
--- a/apps/sim/triggers/jira/issue_commented.ts
+++ b/apps/sim/triggers/jira/issue_commented.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildCommentOutputs, jiraSetupInstructions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCommentOutputs, jiraSetupInstructions } from './utils'
 
 /**
  * Jira Issue Commented Trigger
diff --git a/apps/sim/triggers/jira/issue_created.ts b/apps/sim/triggers/jira/issue_created.ts
index 7c852e4036..f6cb716752 100644
--- a/apps/sim/triggers/jira/issue_created.ts
+++ b/apps/sim/triggers/jira/issue_created.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildIssueOutputs, jiraSetupInstructions, jiraTriggerOptions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, jiraSetupInstructions, jiraTriggerOptions } from './utils'
 
 /**
  * Jira Issue Created Trigger
diff --git a/apps/sim/triggers/jira/issue_deleted.ts b/apps/sim/triggers/jira/issue_deleted.ts
index 3a8b1c7ffa..559d5ebdce 100644
--- a/apps/sim/triggers/jira/issue_deleted.ts
+++ b/apps/sim/triggers/jira/issue_deleted.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildIssueOutputs, jiraSetupInstructions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, jiraSetupInstructions } from './utils'
 
 /**
  * Jira Issue Deleted Trigger
diff --git a/apps/sim/triggers/jira/issue_updated.ts b/apps/sim/triggers/jira/issue_updated.ts
index 4dbe3ea889..f8a0afb5b4 100644
--- a/apps/sim/triggers/jira/issue_updated.ts
+++ b/apps/sim/triggers/jira/issue_updated.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildIssueUpdatedOutputs, jiraSetupInstructions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueUpdatedOutputs, jiraSetupInstructions } from './utils'
 
 /**
  * Jira Issue Updated Trigger
diff --git a/apps/sim/triggers/jira/webhook.ts b/apps/sim/triggers/jira/webhook.ts
index 1e4fc862cc..aeb7722435 100644
--- a/apps/sim/triggers/jira/webhook.ts
+++ b/apps/sim/triggers/jira/webhook.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildIssueOutputs, jiraSetupInstructions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, jiraSetupInstructions } from './utils'
 
 /**
  * Generic Jira Webhook Trigger
diff --git a/apps/sim/triggers/jira/worklog_created.ts b/apps/sim/triggers/jira/worklog_created.ts
index 3e9ed1f691..0a26870502 100644
--- a/apps/sim/triggers/jira/worklog_created.ts
+++ b/apps/sim/triggers/jira/worklog_created.ts
@@ -1,6 +1,6 @@
 import { JiraIcon } from '@/components/icons'
+import { buildWorklogOutputs, jiraSetupInstructions } from '@/triggers/jira/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildWorklogOutputs, jiraSetupInstructions } from './utils'
 
 /**
  * Jira Worklog Created Trigger
diff --git a/apps/sim/triggers/linear/comment_created.ts b/apps/sim/triggers/linear/comment_created.ts
index 7b14d8e04a..532d6956e8 100644
--- a/apps/sim/triggers/linear/comment_created.ts
+++ b/apps/sim/triggers/linear/comment_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCommentOutputs, linearSetupInstructions } from './utils'
 
 export const linearCommentCreatedTrigger: TriggerConfig = {
   id: 'linear_comment_created',
diff --git a/apps/sim/triggers/linear/comment_updated.ts b/apps/sim/triggers/linear/comment_updated.ts
index f9e9e50a0e..941ac5e2dc 100644
--- a/apps/sim/triggers/linear/comment_updated.ts
+++ b/apps/sim/triggers/linear/comment_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCommentOutputs, linearSetupInstructions } from './utils'
 
 export const linearCommentUpdatedTrigger: TriggerConfig = {
   id: 'linear_comment_updated',
diff --git a/apps/sim/triggers/linear/customer_request_created.ts b/apps/sim/triggers/linear/customer_request_created.ts
index c879f73ddf..8c88ad584c 100644
--- a/apps/sim/triggers/linear/customer_request_created.ts
+++ b/apps/sim/triggers/linear/customer_request_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCustomerRequestOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCustomerRequestOutputs, linearSetupInstructions } from './utils'
 
 export const linearCustomerRequestCreatedTrigger: TriggerConfig = {
   id: 'linear_customer_request_created',
diff --git a/apps/sim/triggers/linear/customer_request_updated.ts b/apps/sim/triggers/linear/customer_request_updated.ts
index 5ca9d28fa3..a12cd455ab 100644
--- a/apps/sim/triggers/linear/customer_request_updated.ts
+++ b/apps/sim/triggers/linear/customer_request_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCustomerRequestOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCustomerRequestOutputs, linearSetupInstructions } from './utils'
 
 export const linearCustomerRequestUpdatedTrigger: TriggerConfig = {
   id: 'linear_customer_request_updated',
diff --git a/apps/sim/triggers/linear/cycle_created.ts b/apps/sim/triggers/linear/cycle_created.ts
index 0d0a3396aa..21fe093d1e 100644
--- a/apps/sim/triggers/linear/cycle_created.ts
+++ b/apps/sim/triggers/linear/cycle_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCycleOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCycleOutputs, linearSetupInstructions } from './utils'
 
 export const linearCycleCreatedTrigger: TriggerConfig = {
   id: 'linear_cycle_created',
diff --git a/apps/sim/triggers/linear/cycle_updated.ts b/apps/sim/triggers/linear/cycle_updated.ts
index d9772e59a9..b3e746ebf8 100644
--- a/apps/sim/triggers/linear/cycle_updated.ts
+++ b/apps/sim/triggers/linear/cycle_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildCycleOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildCycleOutputs, linearSetupInstructions } from './utils'
 
 export const linearCycleUpdatedTrigger: TriggerConfig = {
   id: 'linear_cycle_updated',
diff --git a/apps/sim/triggers/linear/issue_created.ts b/apps/sim/triggers/linear/issue_created.ts
index 857f89a482..fae43d8a2f 100644
--- a/apps/sim/triggers/linear/issue_created.ts
+++ b/apps/sim/triggers/linear/issue_created.ts
@@ -1,6 +1,10 @@
 import { LinearIcon } from '@/components/icons'
+import {
+  buildIssueOutputs,
+  linearSetupInstructions,
+  linearTriggerOptions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, linearSetupInstructions, linearTriggerOptions } from './utils'
 
 export const linearIssueCreatedTrigger: TriggerConfig = {
   id: 'linear_issue_created',
diff --git a/apps/sim/triggers/linear/issue_removed.ts b/apps/sim/triggers/linear/issue_removed.ts
index c864d6c4f0..5bb9739e52 100644
--- a/apps/sim/triggers/linear/issue_removed.ts
+++ b/apps/sim/triggers/linear/issue_removed.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildIssueOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, linearSetupInstructions } from './utils'
 
 export const linearIssueRemovedTrigger: TriggerConfig = {
   id: 'linear_issue_removed',
diff --git a/apps/sim/triggers/linear/issue_updated.ts b/apps/sim/triggers/linear/issue_updated.ts
index 50c36a3573..4f80d90292 100644
--- a/apps/sim/triggers/linear/issue_updated.ts
+++ b/apps/sim/triggers/linear/issue_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildIssueOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildIssueOutputs, linearSetupInstructions } from './utils'
 
 export const linearIssueUpdatedTrigger: TriggerConfig = {
   id: 'linear_issue_updated',
diff --git a/apps/sim/triggers/linear/label_created.ts b/apps/sim/triggers/linear/label_created.ts
index ac918d86e7..d35391efd2 100644
--- a/apps/sim/triggers/linear/label_created.ts
+++ b/apps/sim/triggers/linear/label_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildLabelOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildLabelOutputs, linearSetupInstructions } from './utils'
 
 export const linearLabelCreatedTrigger: TriggerConfig = {
   id: 'linear_label_created',
diff --git a/apps/sim/triggers/linear/label_updated.ts b/apps/sim/triggers/linear/label_updated.ts
index 6315a8724e..8ca6620774 100644
--- a/apps/sim/triggers/linear/label_updated.ts
+++ b/apps/sim/triggers/linear/label_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildLabelOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildLabelOutputs, linearSetupInstructions } from './utils'
 
 export const linearLabelUpdatedTrigger: TriggerConfig = {
   id: 'linear_label_updated',
diff --git a/apps/sim/triggers/linear/project_created.ts b/apps/sim/triggers/linear/project_created.ts
index fd0be51333..5a30e16ebe 100644
--- a/apps/sim/triggers/linear/project_created.ts
+++ b/apps/sim/triggers/linear/project_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildProjectOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildProjectOutputs, linearSetupInstructions } from './utils'
 
 export const linearProjectCreatedTrigger: TriggerConfig = {
   id: 'linear_project_created',
diff --git a/apps/sim/triggers/linear/project_update_created.ts b/apps/sim/triggers/linear/project_update_created.ts
index a4b0a04fde..aff4f44202 100644
--- a/apps/sim/triggers/linear/project_update_created.ts
+++ b/apps/sim/triggers/linear/project_update_created.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildProjectUpdateOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildProjectUpdateOutputs, linearSetupInstructions } from './utils'
 
 export const linearProjectUpdateCreatedTrigger: TriggerConfig = {
   id: 'linear_project_update_created',
diff --git a/apps/sim/triggers/linear/project_updated.ts b/apps/sim/triggers/linear/project_updated.ts
index 6cc017820b..3c708593c2 100644
--- a/apps/sim/triggers/linear/project_updated.ts
+++ b/apps/sim/triggers/linear/project_updated.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { buildProjectOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { buildProjectOutputs, linearSetupInstructions } from './utils'
 
 export const linearProjectUpdatedTrigger: TriggerConfig = {
   id: 'linear_project_updated',
diff --git a/apps/sim/triggers/linear/webhook.ts b/apps/sim/triggers/linear/webhook.ts
index 5c9eda4b6a..a1158746e5 100644
--- a/apps/sim/triggers/linear/webhook.ts
+++ b/apps/sim/triggers/linear/webhook.ts
@@ -1,6 +1,6 @@
 import { LinearIcon } from '@/components/icons'
+import { linearSetupInstructions, userOutputs } from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
-import { linearSetupInstructions, userOutputs } from './utils'
 
 export const linearWebhookTrigger: TriggerConfig = {
   id: 'linear_webhook',