From 756d07a8709151e775d65ed8718a1717a227273c Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Sat, 14 Jun 2025 16:32:19 -0700
Subject: [PATCH 01/27] remove local storage usage

---
 apps/sim/app/api/user/workspace/route.ts      |  138 +
 apps/sim/app/api/workflows/[id]/route.ts      |   64 +-
 apps/sim/app/api/workflows/sync/route.ts      |   94 +-
 .../components/oauth-required-modal.tsx       |  103 +-
 .../credential-selector.tsx                   |   33 +-
 .../components/confluence-file-selector.tsx   |   37 +-
 .../components/google-drive-picker.tsx        |   33 +-
 .../components/jira-issue-selector.tsx        |   33 +-
 .../components/microsoft-file-selector.tsx    |   33 +-
 .../components/teams-message-selector.tsx     |   33 +-
 .../folder-selector/folder-selector.tsx       |   37 +-
 .../components/jira-project-selector.tsx      |   33 +-
 apps/sim/app/w/[id]/workflow.tsx              |   18 +-
 .../components/credentials/credentials.tsx    |   73 +-
 .../workspace-header/workspace-header.tsx     |   36 +-
 apps/sim/db/migrations/0043_fair_roulette.sql |    2 +
 .../sim/db/migrations/meta/0043_snapshot.json | 3241 +++++++++++++++++
 apps/sim/db/migrations/meta/_journal.json     |    7 +
 apps/sim/db/schema.ts                         |    5 +
 apps/sim/stores/constants.ts                  |    6 +-
 apps/sim/stores/index.ts                      |  188 +-
 apps/sim/stores/workflows/index.ts            |  132 +-
 apps/sim/stores/workflows/middleware.ts       |   49 -
 apps/sim/stores/workflows/persistence.ts      |  224 +-
 apps/sim/stores/workflows/registry/store.ts   |  603 +--
 apps/sim/stores/workflows/registry/types.ts   |    6 +
 apps/sim/stores/workflows/subblock/store.ts   |  479 ++-
 apps/sim/stores/workflows/sync.ts             |   51 +-
 apps/sim/stores/workflows/workflow/store.ts   |   29 +-
 29 files changed, 4421 insertions(+), 1399 deletions(-)
 create mode 100644 apps/sim/app/api/user/workspace/route.ts
 create mode 100644 apps/sim/db/migrations/0043_fair_roulette.sql
 create mode 100644 apps/sim/db/migrations/meta/0043_snapshot.json

diff --git a/apps/sim/app/api/user/workspace/route.ts b/apps/sim/app/api/user/workspace/route.ts
new file mode 100644
index 00000000000..cf5b53d69b0
--- /dev/null
+++ b/apps/sim/app/api/user/workspace/route.ts
@@ -0,0 +1,138 @@
+import { and, eq } from 'drizzle-orm'
+import { NextResponse } from 'next/server'
+import { z } from 'zod'
+import { getSession } from '@/lib/auth'
+import { createLogger } from '@/lib/logs/console-logger'
+import { db } from '@/db'
+import { settings, workspaceMember } from '@/db/schema'
+
+const logger = createLogger('WorkspaceAPI')
+
+const WorkspaceRequestSchema = z.object({
+  workspaceId: z.string(),
+})
+
+/**
+ * GET /api/user/workspace
+ * Retrieve user's last active workspace
+ */
+export async function GET() {
+  const requestId = crypto.randomUUID().slice(0, 8)
+
+  try {
+    const session = await getSession()
+
+    if (!session?.user?.id) {
+      logger.warn(`[${requestId}] Unauthenticated workspace request rejected`)
+      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
+    }
+
+    const userId = session.user.id
+
+    // Get user's last active workspace from settings
+    const userSettings = await db
+      .select({ lastActiveWorkspaceId: settings.lastActiveWorkspaceId })
+      .from(settings)
+      .where(eq(settings.userId, userId))
+      .limit(1)
+
+    if (!userSettings.length || !userSettings[0].lastActiveWorkspaceId) {
+      // No workspace preference stored
+      return NextResponse.json({ workspaceId: null }, { status: 200 })
+    }
+
+    const workspaceId = userSettings[0].lastActiveWorkspaceId
+
+    // Verify user still has access to this workspace
+    const hasAccess = await db
+      .select({ workspaceId: workspaceMember.workspaceId })
+      .from(workspaceMember)
+      .where(and(eq(workspaceMember.userId, userId), eq(workspaceMember.workspaceId, workspaceId)))
+      .limit(1)
+
+    if (!hasAccess.length) {
+      // User no longer has access to this workspace, clear the preference
+      await db
+        .update(settings)
+        .set({ lastActiveWorkspaceId: null })
+        .where(eq(settings.userId, userId))
+
+      return NextResponse.json({ workspaceId: null }, { status: 200 })
+    }
+
+    return NextResponse.json({ workspaceId }, { status: 200 })
+  } catch (error) {
+    logger.error(`[${requestId}] Error retrieving workspace preference`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
+
+/**
+ * POST /api/user/workspace
+ * Store user's active workspace preference
+ */
+export async function POST(request: Request) {
+  const requestId = crypto.randomUUID().slice(0, 8)
+
+  try {
+    const session = await getSession()
+
+    if (!session?.user?.id) {
+      logger.warn(`[${requestId}] Unauthenticated workspace update rejected`)
+      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
+    }
+
+    const userId = session.user.id
+    const body = await request.json()
+
+    // Validate request body
+    const validationResult = WorkspaceRequestSchema.safeParse(body)
+    if (!validationResult.success) {
+      logger.warn(`[${requestId}] Invalid workspace request data`, {
+        errors: validationResult.error.errors,
+      })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: validationResult.error.errors },
+        { status: 400 }
+      )
+    }
+
+    const { workspaceId } = validationResult.data
+
+    // Verify workspace exists and user has access
+    const hasAccess = await db
+      .select({ workspaceId: workspaceMember.workspaceId })
+      .from(workspaceMember)
+      .where(and(eq(workspaceMember.userId, userId), eq(workspaceMember.workspaceId, workspaceId)))
+      .limit(1)
+
+    if (!hasAccess.length) {
+      logger.warn(
+        `[${requestId}] User ${userId} attempted to set workspace ${workspaceId} without access`
+      )
+      return NextResponse.json({ error: 'Access denied to workspace' }, { status: 403 })
+    }
+
+    // Update or create user settings with workspace preference
+    await db
+      .insert(settings)
+      .values({
+        id: userId, // Use user ID as settings ID
+        userId,
+        lastActiveWorkspaceId: workspaceId,
+        updatedAt: new Date(),
+      })
+      .onConflictDoUpdate({
+        target: [settings.userId],
+        set: {
+          lastActiveWorkspaceId: workspaceId,
+          updatedAt: new Date(),
+        },
+      })
+
+    return NextResponse.json({ success: true }, { status: 200 })
+  } catch (error) {
+    logger.error(`[${requestId}] Error updating workspace preference`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index ac317fb6faf..34dc9aed639 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -1,31 +1,32 @@
 import { and, eq } from 'drizzle-orm'
-import { NextResponse } from 'next/server'
+import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console-logger'
 import { db } from '@/db'
 import { workflow, workspaceMember } from '@/db/schema'
 
-const logger = createLogger('WorkflowDetailAPI')
+const logger = createLogger('WorkflowByIdAPI')
 
-export async function GET(request: Request, { params }: { params: Promise<{ id: string }> }) {
+/**
+ * GET /api/workflows/[id]
+ * Fetch a single workflow by ID
+ */
+export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
   const requestId = crypto.randomUUID().slice(0, 8)
   const startTime = Date.now()
+  const workflowId = params.id
 
   try {
     // Get the session
     const session = await getSession()
     if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthorized workflow access attempt`)
+      logger.warn(`[${requestId}] Unauthorized access attempt for workflow ${workflowId}`)
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
-    const { id: workflowId } = await params
+    const userId = session.user.id
 
-    if (!workflowId) {
-      return NextResponse.json({ error: 'Workflow ID is required' }, { status: 400 })
-    }
-
-    // Fetch the workflow from database
+    // Fetch the workflow
     const workflowData = await db
       .select()
       .from(workflow)
@@ -38,42 +39,43 @@ export async function GET(request: Request, { params }: { params: Promise<{ id:
     }
 
     // Check if user has access to this workflow
-    // User can access if they own it OR if it's in a workspace they're part of
-    const canAccess = workflowData.userId === session.user.id
+    let hasAccess = false
+
+    // Case 1: User owns the workflow
+    if (workflowData.userId === userId) {
+      hasAccess = true
+    }
 
-    if (!canAccess && workflowData.workspaceId) {
-      // Check workspace membership
+    // Case 2: Workflow belongs to a workspace the user is a member of
+    if (!hasAccess && workflowData.workspaceId) {
       const membership = await db
-        .select()
+        .select({ role: workspaceMember.role })
         .from(workspaceMember)
         .where(
           and(
             eq(workspaceMember.workspaceId, workflowData.workspaceId),
-            eq(workspaceMember.userId, session.user.id)
+            eq(workspaceMember.userId, userId)
           )
         )
         .then((rows) => rows[0])
 
       if (membership) {
-        // User is a member of the workspace, allow access
-        const elapsed = Date.now() - startTime
-        logger.info(`[${requestId}] Workflow ${workflowId} fetched in ${elapsed}ms`)
-        return NextResponse.json({ data: workflowData }, { status: 200 })
+        hasAccess = true
       }
-    } else if (canAccess) {
-      // User owns the workflow, allow access
-      const elapsed = Date.now() - startTime
-      logger.info(`[${requestId}] Workflow ${workflowId} fetched in ${elapsed}ms`)
-      return NextResponse.json({ data: workflowData }, { status: 200 })
     }
 
-    logger.warn(
-      `[${requestId}] User ${session.user.id} attempted to access workflow ${workflowId} without permission`
-    )
-    return NextResponse.json({ error: 'Access denied' }, { status: 403 })
+    if (!hasAccess) {
+      logger.warn(`[${requestId}] User ${userId} denied access to workflow ${workflowId}`)
+      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
+    }
+
+    const elapsed = Date.now() - startTime
+    logger.info(`[${requestId}] Successfully fetched workflow ${workflowId} in ${elapsed}ms`)
+
+    return NextResponse.json({ data: workflowData }, { status: 200 })
   } catch (error: any) {
     const elapsed = Date.now() - startTime
-    logger.error(`[${requestId}] Error fetching workflow after ${elapsed}ms:`, error)
-    return NextResponse.json({ error: 'Failed to fetch workflow' }, { status: 500 })
+    logger.error(`[${requestId}] Error fetching workflow ${workflowId} after ${elapsed}ms`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }
diff --git a/apps/sim/app/api/workflows/sync/route.ts b/apps/sim/app/api/workflows/sync/route.ts
index 7b72967ce6e..de6c8fad76d 100644
--- a/apps/sim/app/api/workflows/sync/route.ts
+++ b/apps/sim/app/api/workflows/sync/route.ts
@@ -377,9 +377,9 @@ export async function POST(req: NextRequest) {
         processedIds.add(id)
         const dbWorkflow = dbWorkflowMap.get(id)
 
-        // Handle legacy published workflows migration
+        // Handle legacy published workflows migration (only if state is provided)
         // If client workflow has isPublished but no marketplaceData, create marketplaceData with owner status
-        if (clientWorkflow.state.isPublished && !clientWorkflow.marketplaceData) {
+        if (clientWorkflow.state?.isPublished && !clientWorkflow.marketplaceData) {
           clientWorkflow.marketplaceData = { id: clientWorkflow.id, status: 'owner' }
         }
 
@@ -387,7 +387,7 @@ export async function POST(req: NextRequest) {
         const effectiveWorkspaceId = clientWorkflow.workspaceId || workspaceId
 
         if (!dbWorkflow) {
-          // New workflow - create
+          // New workflow - create (state is required by schema)
           operations.push(
             db.insert(workflow).values({
               id: clientWorkflow.id,
@@ -417,61 +417,57 @@ export async function POST(req: NextRequest) {
             continue // Skip this workflow update and move to the next one
           }
 
-          // Existing workflow - update if needed
-          const needsUpdate =
-            JSON.stringify(dbWorkflow.state) !== JSON.stringify(clientWorkflow.state) ||
-            dbWorkflow.name !== clientWorkflow.name ||
-            dbWorkflow.description !== clientWorkflow.description ||
-            dbWorkflow.color !== clientWorkflow.color ||
-            dbWorkflow.workspaceId !== effectiveWorkspaceId ||
-            dbWorkflow.folderId !== (clientWorkflow.folderId || null) ||
+          // For existing workflows, determine what needs updating
+          let needsUpdate = false
+          const updateData: any = {}
+
+          // Check metadata changes
+          if (dbWorkflow.name !== clientWorkflow.name) {
+            updateData.name = clientWorkflow.name
+            needsUpdate = true
+          }
+          if (dbWorkflow.description !== clientWorkflow.description) {
+            updateData.description = clientWorkflow.description
+            needsUpdate = true
+          }
+          if (dbWorkflow.color !== clientWorkflow.color) {
+            updateData.color = clientWorkflow.color
+            needsUpdate = true
+          }
+          if (dbWorkflow.workspaceId !== effectiveWorkspaceId) {
+            updateData.workspaceId = effectiveWorkspaceId
+            needsUpdate = true
+          }
+          if (dbWorkflow.folderId !== (clientWorkflow.folderId || null)) {
+            updateData.folderId = clientWorkflow.folderId || null
+            needsUpdate = true
+          }
+          if (
             JSON.stringify(dbWorkflow.marketplaceData) !==
-              JSON.stringify(clientWorkflow.marketplaceData)
+            JSON.stringify(clientWorkflow.marketplaceData)
+          ) {
+            updateData.marketplaceData = clientWorkflow.marketplaceData || null
+            needsUpdate = true
+          }
 
-          if (needsUpdate) {
-            operations.push(
-              db
-                .update(workflow)
-                .set({
-                  name: clientWorkflow.name,
-                  description: clientWorkflow.description,
-                  color: clientWorkflow.color,
-                  workspaceId: effectiveWorkspaceId,
-                  folderId: clientWorkflow.folderId || null,
-                  state: clientWorkflow.state,
-                  marketplaceData: clientWorkflow.marketplaceData || null,
-                  lastSynced: now,
-                  updatedAt: now,
-                })
-                .where(eq(workflow.id, id))
-            )
+          // Always update state since we only sync the active workflow with valid state
+          if (JSON.stringify(dbWorkflow.state) !== JSON.stringify(clientWorkflow.state)) {
+            updateData.state = clientWorkflow.state
+            needsUpdate = true
           }
-        }
-      }
 
-      // Handle deletions - workflows in DB but not in client
-      // Only delete workflows for the current workspace and only those the user can modify
-      for (const dbWorkflow of dbWorkflows) {
-        if (
-          !processedIds.has(dbWorkflow.id) &&
-          (!workspaceId || dbWorkflow.workspaceId === workspaceId)
-        ) {
-          // Check if the user has permission to delete this workflow
-          // Users can delete their own workflows, or any workflow if they're a workspace owner/admin
-          const canDelete =
-            dbWorkflow.userId === session.user.id ||
-            (workspaceId && (userRole === 'owner' || userRole === 'admin' || userRole === 'member'))
+          if (needsUpdate) {
+            updateData.lastSynced = now
+            updateData.updatedAt = now
 
-          if (canDelete) {
-            operations.push(db.delete(workflow).where(eq(workflow.id, dbWorkflow.id)))
-          } else {
-            logger.warn(
-              `[${requestId}] User ${session.user.id} attempted to delete workflow ${dbWorkflow.id} without permission`
-            )
+            operations.push(db.update(workflow).set(updateData).where(eq(workflow.id, id)))
           }
         }
       }
 
+      // NOTE: We don't delete workflows here since we're only syncing the active workflow
+      // Other workflows remain untouched in the database
+
       // Execute all operations in parallel
       await Promise.all(operations)
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
index 8c06924f53e..a8361515d8a 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -10,7 +10,6 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog'
-import { client } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console-logger'
 import {
   getProviderIdFromServiceId,
@@ -19,7 +18,6 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 
 const logger = createLogger('OAuthRequiredModal')
 
@@ -157,57 +155,78 @@ export function OAuthRequiredModal({
     (scope) => !scope.includes('userinfo.email') && !scope.includes('userinfo.profile')
   )
 
-  const handleRedirectToSettings = () => {
-    try {
-      // Determine the appropriate serviceId and providerId
-      const providerId = getProviderIdFromServiceId(effectiveServiceId)
+  const handleConnectAccount = () => {
+    // Calculate the provider ID from service ID
+    const effectiveProviderId = getProviderIdFromServiceId(effectiveServiceId)
+
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: effectiveProviderId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'oauth-required-modal',
+      timestamp: Date.now(),
+    }
 
-      // Store information about the required connection
-      saveToStorage<string>('pending_service_id', effectiveServiceId)
-      saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-      saveToStorage<string>('pending_oauth_return_url', window.location.href)
-      saveToStorage<string>('pending_oauth_provider_id', providerId)
-      saveToStorage<boolean>('from_oauth_modal', true)
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Close the modal
-      onClose()
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
 
-      // Open the settings modal with the credentials tab
-      const event = new CustomEvent('open-settings', {
-        detail: { tab: 'credentials' },
-      })
-      window.dispatchEvent(event)
+      window.location.href = authUrl
     } catch (error) {
-      logger.error('Error redirecting to settings:', { error })
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback: redirect without state
+      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
     }
+
+    onClose()
   }
 
-  const handleConnectDirectly = async () => {
-    try {
-      // Determine the appropriate serviceId and providerId
-      const providerId = getProviderIdFromServiceId(effectiveServiceId)
+  const handleConnectExisting = () => {
+    // Calculate the provider ID from service ID
+    const effectiveProviderId = getProviderIdFromServiceId(effectiveServiceId)
 
-      // Store information about the required connection
-      saveToStorage<string>('pending_service_id', effectiveServiceId)
-      saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-      saveToStorage<string>('pending_oauth_return_url', window.location.href)
-      saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: effectiveProviderId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'oauth-required-modal-existing',
+      timestamp: Date.now(),
+    }
 
-      // Close the modal
-      onClose()
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      logger.info('Linking OAuth2:', {
-        providerId,
-        requiredScopes,
-      })
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
 
-      await client.oauth2.link({
-        providerId,
-        callbackURL: window.location.href,
-      })
+      window.location.href = authUrl
     } catch (error) {
-      logger.error('Error initiating OAuth flow:', { error })
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback: redirect without state
+      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
     }
+
+    onClose()
   }
 
   return (
@@ -255,13 +274,13 @@ export function OAuthRequiredModal({
           <Button variant='outline' onClick={onClose} className='sm:order-1'>
             Cancel
           </Button>
-          <Button type='button' onClick={handleConnectDirectly} className='sm:order-3'>
+          <Button type='button' onClick={handleConnectAccount} className='sm:order-3'>
             Connect Now
           </Button>
           <Button
             type='button'
             variant='secondary'
-            onClick={handleRedirectToSettings}
+            onClick={handleConnectExisting}
             className='sm:order-2'
           >
             Go to Settings
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
index 717dbacd072..52192cde81d 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
@@ -21,7 +21,6 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from './components/oauth-required-modal'
 
 const logger = createLogger('CredentialSelector')
@@ -165,14 +164,32 @@ export function CredentialSelector({
 
   // Handle adding a new credential
   const handleAddCredential = () => {
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', effectiveProviderId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: effectiveProviderId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'credential-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
index a7f2e9e7bd2..e78ff490863 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
@@ -19,7 +19,6 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 export interface ConfluenceFileInfo {
@@ -354,18 +353,36 @@ export function ConfluenceFileSelector({
   }
 
   // Handle adding a new credential
-  const handleAddCredential = () => {
+  const handleConnectAccount = () => {
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'confluence-file-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      console.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
@@ -504,7 +521,7 @@ export function ConfluenceFileSelector({
                 {/* Connect account option - only show if no credentials */}
                 {credentials.length === 0 && (
                   <CommandGroup>
-                    <CommandItem onSelect={handleAddCredential}>
+                    <CommandItem onSelect={handleConnectAccount}>
                       <div className='flex items-center gap-2 text-primary'>
                         <ConfluenceIcon className='h-4 w-4' />
                         <span>Connect Confluence account</span>
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
index 2d0938bae5d..73c1fb91a74 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
@@ -24,7 +24,6 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('GoogleDrivePicker')
@@ -289,14 +288,32 @@ export function GoogleDrivePicker({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'google-drive-picker',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
index 2a2c2922996..5bc4775da39 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
@@ -20,7 +20,6 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_issue_selector')
@@ -423,14 +422,32 @@ export function JiraIssueSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'jira-issue-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
index a04f7e01c6b..38a09e95863 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
@@ -23,7 +23,6 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('MicrosoftFileSelector')
@@ -254,14 +253,32 @@ export function MicrosoftFileSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'microsoft-file-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
     setSearchQuery('') // Clear search when closing
   }
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
index f71abcfdce5..267f6d543b0 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
@@ -20,7 +20,6 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('TeamsMessageSelector')
@@ -402,14 +401,32 @@ export function TeamsMessageSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'teams-message-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
index 2a0d9990eab..92cebb4fb40 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
@@ -16,7 +16,6 @@ import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover
 import { createLogger } from '@/lib/logs/console-logger'
 import { type Credential, getProviderIdFromServiceId, getServiceIdFromScopes } from '@/lib/oauth'
 import { OAuthRequiredModal } from '@/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal'
-import { saveToStorage } from '@/stores/workflows/persistence'
 
 const logger = createLogger('FolderSelector')
 
@@ -273,18 +272,36 @@ export function FolderSelector({
   }
 
   // Handle adding a new credential
-  const handleAddCredential = () => {
+  const handleConnectAccount = () => {
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'folder-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
@@ -441,7 +458,7 @@ export function FolderSelector({
                 {/* Connect account option - only show if no credentials */}
                 {credentials.length === 0 && (
                   <CommandGroup>
-                    <CommandItem onSelect={handleAddCredential}>
+                    <CommandItem onSelect={handleConnectAccount}>
                       <div className='flex items-center gap-2 text-primary'>
                         <span>Connect {getProviderName()} account</span>
                       </div>
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
index 5d562708a2a..8ac48d6d7dd 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
@@ -20,7 +20,6 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_project_selector')
@@ -374,14 +373,32 @@ export function JiraProjectSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store information about the required connection
-    saveToStorage<string>('pending_service_id', effectiveServiceId)
-    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
-    saveToStorage<string>('pending_oauth_return_url', window.location.href)
-    saveToStorage<string>('pending_oauth_provider_id', providerId)
+    // Store OAuth state in localStorage before redirect
+    const oauthState = {
+      providerId: providerId,
+      serviceId: effectiveServiceId,
+      requiredScopes,
+      returnUrl: window.location.href,
+      context: 'jira-project-selector',
+      timestamp: Date.now(),
+    }
+
+    // Use localStorage for OAuth state management
+    try {
+      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+
+      // Navigate to OAuth URL
+      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
+        requiredScopes.join(',')
+      )}&return_url=${encodeURIComponent(window.location.href)}`
+
+      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Failed to store OAuth state:', error)
+      // Fallback to OAuth modal
+      setShowOAuthModal(true)
+    }
 
-    // Show the OAuth modal
-    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index ff10a7b9d6f..6e5b4fb03cf 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -757,7 +757,14 @@ function WorkflowContent() {
             clearInterval(checkInterval)
             // Reset variables loaded state before setting active workflow
             resetVariablesLoaded()
-            setActiveWorkflow(currentId)
+
+            // Only call setActiveWorkflow if the workflow isn't already active
+            // This prevents overwriting state that was just set in createWorkflow
+            const { activeWorkflowId } = useWorkflowRegistry.getState()
+            if (activeWorkflowId !== currentId) {
+              setActiveWorkflow(currentId)
+            }
+
             markAllAsRead(currentId)
           }
         }, 100)
@@ -766,7 +773,14 @@ function WorkflowContent() {
 
       // Reset variables loaded state before setting active workflow
       resetVariablesLoaded()
-      setActiveWorkflow(currentId)
+
+      // Only call setActiveWorkflow if the workflow isn't already active
+      // This prevents overwriting state that was just set in createWorkflow
+      const { activeWorkflowId } = useWorkflowRegistry.getState()
+      if (activeWorkflowId !== currentId) {
+        setActiveWorkflow(currentId)
+      }
+
       markAllAsRead(currentId)
     }
 
diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx b/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
index dab2d04b6ea..89168209770 100644
--- a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
+++ b/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
@@ -11,7 +11,6 @@ import { client, useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console-logger'
 import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth'
 import { cn } from '@/lib/utils'
-import { loadFromStorage, removeFromStorage, saveToStorage } from '@/stores/workflows/persistence'
 
 const logger = createLogger('Credentials')
 
@@ -141,7 +140,30 @@ export function Credentials({ onOpenChange }: CredentialsProps) {
 
     // Handle OAuth callback
     if (code && state) {
-      // This is an OAuth callback - set success flag
+      // This is an OAuth callback - try to restore state from localStorage
+      try {
+        const stored = localStorage.getItem('pending_oauth_state')
+        if (stored) {
+          const oauthState = JSON.parse(stored)
+          logger.info('OAuth callback with restored state:', oauthState)
+
+          // Mark as pending if we have context about what service was being connected
+          if (oauthState.serviceId) {
+            setPendingService(oauthState.serviceId)
+            setShowActionRequired(true)
+          }
+
+          // Clean up the state (one-time use)
+          localStorage.removeItem('pending_oauth_state')
+        } else {
+          logger.warn('OAuth callback but no state found in localStorage')
+        }
+      } catch (error) {
+        logger.error('Error loading OAuth state from localStorage:', error)
+        localStorage.removeItem('pending_oauth_state') // Clean up corrupted state
+      }
+
+      // Set success flag
       setAuthSuccess(true)
 
       // Refresh connections to show the new connection
@@ -159,46 +181,7 @@ export function Credentials({ onOpenChange }: CredentialsProps) {
 
   // Check for pending OAuth connections and return URL
   useEffect(() => {
-    if (typeof window === 'undefined') return
-
-    // Check if there's a pending OAuth connection
-    const serviceId = loadFromStorage<string>('pending_service_id')
-    const scopes = loadFromStorage<string[]>('pending_oauth_scopes') || []
-    const returnUrl = loadFromStorage<string>('pending_oauth_return_url')
-    const fromOAuthModal = loadFromStorage<boolean>('from_oauth_modal')
-
-    if (serviceId) {
-      setPendingService(serviceId)
-      setPendingScopes(scopes)
-
-      // Only show action required notification if navigated from the OAuth modal
-      setShowActionRequired(!!fromOAuthModal)
-
-      // Clear the pending connection after a short delay
-      // This gives the user time to see the highlighted connection
-      setTimeout(() => {
-        removeFromStorage('pending_service_id')
-        removeFromStorage('pending_oauth_scopes')
-        removeFromStorage('from_oauth_modal')
-      }, 500)
-    }
-
-    // Handle successful authentication return
-    if (authSuccess && returnUrl && onOpenChange) {
-      // Clear the success flag
-      setAuthSuccess(false)
-      removeFromStorage('pending_oauth_return_url')
-
-      // Close the settings modal and return to workflow
-      setTimeout(() => {
-        onOpenChange(false)
-
-        // Navigate back to the workflow if needed
-        if (returnUrl !== window.location.href) {
-          router.push(returnUrl)
-        }
-      }, 1500) // Slightly longer delay to show the connected state
-    }
+    // OAuth state managed via localStorage - no additional client-side state management needed
   }, [authSuccess, onOpenChange, router])
 
   // Fetch services on mount
@@ -213,12 +196,6 @@ export function Credentials({ onOpenChange }: CredentialsProps) {
     try {
       setIsConnecting(service.id)
 
-      // Store information about the connection
-      saveToStorage<string>('pending_service_id', service.id)
-      saveToStorage<string[]>('pending_oauth_scopes', service.scopes)
-      saveToStorage<string>('pending_oauth_return_url', window.location.href)
-      saveToStorage<string>('pending_oauth_provider_id', service.providerId)
-
       logger.info('Connecting service:', {
         serviceId: service.id,
         providerId: service.providerId,
diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 56a7d059eac..69118cae7fb 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -271,20 +271,30 @@ export function WorkspaceHeader({
             const fetchedWorkspaces = data.workspaces as Workspace[]
             setWorkspaces(fetchedWorkspaces)
 
-            // Find workspace that matches the active ID from registry or use first workspace
-            const matchingWorkspace = fetchedWorkspaces.find(
-              (workspace) => workspace.id === activeWorkspaceId
-            )
-            const workspaceToActivate = matchingWorkspace || fetchedWorkspaces[0]
-
-            // If we found a workspace, set it as active and update registry if needed
-            if (workspaceToActivate) {
-              setActiveWorkspace(workspaceToActivate)
-
-              // If active workspace in UI doesn't match registry, update registry
-              if (workspaceToActivate.id !== activeWorkspaceId) {
-                setActiveWorkspaceId(workspaceToActivate.id)
+            // Only update workspace if we have a valid activeWorkspaceId from registry
+            if (activeWorkspaceId) {
+              const matchingWorkspace = fetchedWorkspaces.find(
+                (workspace) => workspace.id === activeWorkspaceId
+              )
+              if (matchingWorkspace) {
+                setActiveWorkspace(matchingWorkspace)
+              } else {
+                // Active workspace not found, fallback to first workspace
+                const fallbackWorkspace = fetchedWorkspaces[0]
+                if (fallbackWorkspace) {
+                  setActiveWorkspace(fallbackWorkspace)
+                  setActiveWorkspaceId(fallbackWorkspace.id)
+                }
               }
+            } else {
+              // No active workspace in registry yet - wait for loadLastActiveWorkspace() to complete
+              // If there's only one workspace, we can safely select it
+              if (fetchedWorkspaces.length === 1) {
+                const onlyWorkspace = fetchedWorkspaces[0]
+                setActiveWorkspace(onlyWorkspace)
+                setActiveWorkspaceId(onlyWorkspace.id)
+              }
+              // For multiple workspaces, wait for the saved preference to load
             }
           }
           setIsWorkspacesLoading(false)
diff --git a/apps/sim/db/migrations/0043_fair_roulette.sql b/apps/sim/db/migrations/0043_fair_roulette.sql
new file mode 100644
index 00000000000..8513b0445fd
--- /dev/null
+++ b/apps/sim/db/migrations/0043_fair_roulette.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "settings" ADD COLUMN "last_active_workspace_id" text;--> statement-breakpoint
+ALTER TABLE "settings" ADD CONSTRAINT "settings_last_active_workspace_id_workspace_id_fk" FOREIGN KEY ("last_active_workspace_id") REFERENCES "public"."workspace"("id") ON DELETE set null ON UPDATE no action;
\ No newline at end of file
diff --git a/apps/sim/db/migrations/meta/0043_snapshot.json b/apps/sim/db/migrations/meta/0043_snapshot.json
new file mode 100644
index 00000000000..103c42ce412
--- /dev/null
+++ b/apps/sim/db/migrations/meta/0043_snapshot.json
@@ -0,0 +1,3241 @@
+{
+  "id": "7887982a-ab6f-4595-96f5-29b43b8399c0",
+  "prevId": "5a104de1-5afa-46be-bbe8-5a8759024b15",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.account": {
+      "name": "account",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "account_id": {
+          "name": "account_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token_expires_at": {
+          "name": "access_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refresh_token_expires_at": {
+          "name": "refresh_token_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_user_id_user_id_fk": {
+          "name": "account_user_id_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_key": {
+      "name": "api_key",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_used": {
+          "name": "last_used",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "api_key_user_id_user_id_fk": {
+          "name": "api_key_user_id_user_id_fk",
+          "tableFrom": "api_key",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "api_key_key_unique": {
+          "name": "api_key_key_unique",
+          "nullsNotDistinct": false,
+          "columns": ["key"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.chat": {
+      "name": "chat",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "subdomain": {
+          "name": "subdomain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "customizations": {
+          "name": "customizations",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'public'"
+        },
+        "password": {
+          "name": "password",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_emails": {
+          "name": "allowed_emails",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "output_configs": {
+          "name": "output_configs",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "subdomain_idx": {
+          "name": "subdomain_idx",
+          "columns": [
+            {
+              "expression": "subdomain",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "chat_workflow_id_workflow_id_fk": {
+          "name": "chat_workflow_id_workflow_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "chat_user_id_user_id_fk": {
+          "name": "chat_user_id_user_id_fk",
+          "tableFrom": "chat",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.custom_tools": {
+      "name": "custom_tools",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "schema": {
+          "name": "schema",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "custom_tools_user_id_user_id_fk": {
+          "name": "custom_tools_user_id_user_id_fk",
+          "tableFrom": "custom_tools",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.document": {
+      "name": "document",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "filename": {
+          "name": "filename",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_url": {
+          "name": "file_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_size": {
+          "name": "file_size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "mime_type": {
+          "name": "mime_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "file_hash": {
+          "name": "file_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "chunk_count": {
+          "name": "chunk_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "character_count": {
+          "name": "character_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "processing_status": {
+          "name": "processing_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "processing_started_at": {
+          "name": "processing_started_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_completed_at": {
+          "name": "processing_completed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processing_error": {
+          "name": "processing_error",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "uploaded_at": {
+          "name": "uploaded_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "doc_kb_id_idx": {
+          "name": "doc_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_file_hash_idx": {
+          "name": "doc_file_hash_idx",
+          "columns": [
+            {
+              "expression": "file_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_filename_idx": {
+          "name": "doc_filename_idx",
+          "columns": [
+            {
+              "expression": "filename",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_kb_uploaded_at_idx": {
+          "name": "doc_kb_uploaded_at_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "uploaded_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "doc_processing_status_idx": {
+          "name": "doc_processing_status_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "processing_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "document_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "document_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "document",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.embedding": {
+      "name": "embedding",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "knowledge_base_id": {
+          "name": "knowledge_base_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "document_id": {
+          "name": "document_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_index": {
+          "name": "chunk_index",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "chunk_hash": {
+          "name": "chunk_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "content_length": {
+          "name": "content_length",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "embedding": {
+          "name": "embedding",
+          "type": "vector(1536)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "start_offset": {
+          "name": "start_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "end_offset": {
+          "name": "end_offset",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "overlap_tokens": {
+          "name": "overlap_tokens",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "search_rank": {
+          "name": "search_rank",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'1.0'"
+        },
+        "access_count": {
+          "name": "access_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_accessed_at": {
+          "name": "last_accessed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quality_score": {
+          "name": "quality_score",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "enabled": {
+          "name": "enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "content_tsv": {
+          "name": "content_tsv",
+          "type": "tsvector",
+          "primaryKey": false,
+          "notNull": false,
+          "generated": {
+            "as": "to_tsvector('english', \"embedding\".\"content\")",
+            "type": "stored"
+          }
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "emb_kb_id_idx": {
+          "name": "emb_kb_id_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_id_idx": {
+          "name": "emb_doc_id_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_chunk_idx": {
+          "name": "emb_doc_chunk_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "chunk_index",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_model_idx": {
+          "name": "emb_kb_model_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "embedding_model",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_chunk_hash_idx": {
+          "name": "emb_chunk_hash_idx",
+          "columns": [
+            {
+              "expression": "chunk_hash",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_access_idx": {
+          "name": "emb_kb_access_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "last_accessed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_rank_idx": {
+          "name": "emb_kb_rank_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "search_rank",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_kb_enabled_idx": {
+          "name": "emb_kb_enabled_idx",
+          "columns": [
+            {
+              "expression": "knowledge_base_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "emb_doc_enabled_idx": {
+          "name": "emb_doc_enabled_idx",
+          "columns": [
+            {
+              "expression": "document_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "enabled",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "embedding_vector_hnsw_idx": {
+          "name": "embedding_vector_hnsw_idx",
+          "columns": [
+            {
+              "expression": "embedding",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last",
+              "opclass": "vector_cosine_ops"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "hnsw",
+          "with": {
+            "m": 16,
+            "ef_construction": 64
+          }
+        },
+        "emb_metadata_gin_idx": {
+          "name": "emb_metadata_gin_idx",
+          "columns": [
+            {
+              "expression": "metadata",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        },
+        "emb_content_fts_idx": {
+          "name": "emb_content_fts_idx",
+          "columns": [
+            {
+              "expression": "content_tsv",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "gin",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "embedding_knowledge_base_id_knowledge_base_id_fk": {
+          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "knowledge_base",
+          "columnsFrom": ["knowledge_base_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "embedding_document_id_document_id_fk": {
+          "name": "embedding_document_id_document_id_fk",
+          "tableFrom": "embedding",
+          "tableTo": "document",
+          "columnsFrom": ["document_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "embedding_not_null_check": {
+          "name": "embedding_not_null_check",
+          "value": "\"embedding\" IS NOT NULL"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.environment": {
+      "name": "environment",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "environment_user_id_user_id_fk": {
+          "name": "environment_user_id_user_id_fk",
+          "tableFrom": "environment",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "environment_user_id_unique": {
+          "name": "environment_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.invitation": {
+      "name": "invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "invitation_inviter_id_user_id_fk": {
+          "name": "invitation_inviter_id_user_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "invitation_organization_id_organization_id_fk": {
+          "name": "invitation_organization_id_organization_id_fk",
+          "tableFrom": "invitation",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.knowledge_base": {
+      "name": "knowledge_base",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_count": {
+          "name": "token_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "embedding_model": {
+          "name": "embedding_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text-embedding-3-small'"
+        },
+        "embedding_dimension": {
+          "name": "embedding_dimension",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 1536
+        },
+        "chunking_config": {
+          "name": "chunking_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{\"maxSize\": 1024, \"minSize\": 100, \"overlap\": 200}'"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "kb_user_id_idx": {
+          "name": "kb_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_workspace_id_idx": {
+          "name": "kb_workspace_id_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_user_workspace_idx": {
+          "name": "kb_user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "kb_deleted_at_idx": {
+          "name": "kb_deleted_at_idx",
+          "columns": [
+            {
+              "expression": "deleted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "knowledge_base_user_id_user_id_fk": {
+          "name": "knowledge_base_user_id_user_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "knowledge_base_workspace_id_workspace_id_fk": {
+          "name": "knowledge_base_workspace_id_workspace_id_fk",
+          "tableFrom": "knowledge_base",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.marketplace": {
+      "name": "marketplace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_name": {
+          "name": "author_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "views": {
+          "name": "views",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "category": {
+          "name": "category",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "marketplace_workflow_id_workflow_id_fk": {
+          "name": "marketplace_workflow_id_workflow_id_fk",
+          "tableFrom": "marketplace",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "marketplace_author_id_user_id_fk": {
+          "name": "marketplace_author_id_user_id_fk",
+          "tableFrom": "marketplace",
+          "tableTo": "user",
+          "columnsFrom": ["author_id"],
+          "columnsTo": ["id"],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.member": {
+      "name": "member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "organization_id": {
+          "name": "organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "member_user_id_user_id_fk": {
+          "name": "member_user_id_user_id_fk",
+          "tableFrom": "member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "member_organization_id_organization_id_fk": {
+          "name": "member_organization_id_organization_id_fk",
+          "tableFrom": "member",
+          "tableTo": "organization",
+          "columnsFrom": ["organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.memory": {
+      "name": "memory",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "deleted_at": {
+          "name": "deleted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "memory_key_idx": {
+          "name": "memory_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workflow_idx": {
+          "name": "memory_workflow_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "memory_workflow_key_idx": {
+          "name": "memory_workflow_key_idx",
+          "columns": [
+            {
+              "expression": "workflow_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "memory_workflow_id_workflow_id_fk": {
+          "name": "memory_workflow_id_workflow_id_fk",
+          "tableFrom": "memory",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.oauth_state": {
+      "name": "oauth_state",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "service_id": {
+          "name": "service_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "required_scopes": {
+          "name": "required_scopes",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "return_url": {
+          "name": "return_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "context": {
+          "name": "context",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "oauth_state_user_idx": {
+          "name": "oauth_state_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "oauth_state_token_idx": {
+          "name": "oauth_state_token_idx",
+          "columns": [
+            {
+              "expression": "token",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "oauth_state_expires_idx": {
+          "name": "oauth_state_expires_idx",
+          "columns": [
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "oauth_state_user_id_user_id_fk": {
+          "name": "oauth_state_user_id_user_id_fk",
+          "tableFrom": "oauth_state",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "oauth_state_token_unique": {
+          "name": "oauth_state_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.organization": {
+      "name": "organization",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "logo": {
+          "name": "logo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.session": {
+      "name": "session",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ip_address": {
+          "name": "ip_address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_agent": {
+          "name": "user_agent",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "active_organization_id": {
+          "name": "active_organization_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_user_id_user_id_fk": {
+          "name": "session_user_id_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "session_active_organization_id_organization_id_fk": {
+          "name": "session_active_organization_id_organization_id_fk",
+          "tableFrom": "session",
+          "tableTo": "organization",
+          "columnsFrom": ["active_organization_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "session_token_unique": {
+          "name": "session_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.settings": {
+      "name": "settings",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "theme": {
+          "name": "theme",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'system'"
+        },
+        "debug_mode": {
+          "name": "debug_mode",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "auto_connect": {
+          "name": "auto_connect",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "auto_fill_env_vars": {
+          "name": "auto_fill_env_vars",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_active_workspace_id": {
+          "name": "last_active_workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "telemetry_enabled": {
+          "name": "telemetry_enabled",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "telemetry_notified_user": {
+          "name": "telemetry_notified_user",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "email_preferences": {
+          "name": "email_preferences",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "general": {
+          "name": "general",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "settings_user_id_user_id_fk": {
+          "name": "settings_user_id_user_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "settings_last_active_workspace_id_workspace_id_fk": {
+          "name": "settings_last_active_workspace_id_workspace_id_fk",
+          "tableFrom": "settings",
+          "tableTo": "workspace",
+          "columnsFrom": ["last_active_workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "settings_user_id_unique": {
+          "name": "settings_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.subscription": {
+      "name": "subscription",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "plan": {
+          "name": "plan",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reference_id": {
+          "name": "reference_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stripe_subscription_id": {
+          "name": "stripe_subscription_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_start": {
+          "name": "period_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "period_end": {
+          "name": "period_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "cancel_at_period_end": {
+          "name": "cancel_at_period_end",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "seats": {
+          "name": "seats",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_start": {
+          "name": "trial_start",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trial_end": {
+          "name": "trial_end",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user": {
+      "name": "user",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "stripe_customer_id": {
+          "name": "stripe_customer_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.user_stats": {
+      "name": "user_stats",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_manual_executions": {
+          "name": "total_manual_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_api_calls": {
+          "name": "total_api_calls",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_webhook_triggers": {
+          "name": "total_webhook_triggers",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_scheduled_executions": {
+          "name": "total_scheduled_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_chat_executions": {
+          "name": "total_chat_executions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_tokens_used": {
+          "name": "total_tokens_used",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "total_cost": {
+          "name": "total_cost",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'0'"
+        },
+        "last_active": {
+          "name": "last_active",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "user_stats_user_id_user_id_fk": {
+          "name": "user_stats_user_id_user_id_fk",
+          "tableFrom": "user_stats",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_stats_user_id_unique": {
+          "name": "user_stats_user_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["user_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.verification": {
+      "name": "verification",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.waitlist": {
+      "name": "waitlist",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "waitlist_email_unique": {
+          "name": "waitlist_email_unique",
+          "nullsNotDistinct": false,
+          "columns": ["email"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.webhook": {
+      "name": "webhook",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_config": {
+          "name": "provider_config",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "path_idx": {
+          "name": "path_idx",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "webhook_workflow_id_workflow_id_fk": {
+          "name": "webhook_workflow_id_workflow_id_fk",
+          "tableFrom": "webhook",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow": {
+      "name": "workflow",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "folder_id": {
+          "name": "folder_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "state": {
+          "name": "state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'#3972F6'"
+        },
+        "last_synced": {
+          "name": "last_synced",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_deployed": {
+          "name": "is_deployed",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "deployed_state": {
+          "name": "deployed_state",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "deployed_at": {
+          "name": "deployed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "collaborators": {
+          "name": "collaborators",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'"
+        },
+        "run_count": {
+          "name": "run_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "last_run_at": {
+          "name": "last_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "variables": {
+          "name": "variables",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'"
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "marketplace_data": {
+          "name": "marketplace_data",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_user_id_user_id_fk": {
+          "name": "workflow_user_id_user_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_workspace_id_workspace_id_fk": {
+          "name": "workflow_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_id_workflow_folder_id_fk": {
+          "name": "workflow_folder_id_workflow_folder_id_fk",
+          "tableFrom": "workflow",
+          "tableTo": "workflow_folder",
+          "columnsFrom": ["folder_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_folder": {
+      "name": "workflow_folder",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'#6B7280'"
+        },
+        "is_expanded": {
+          "name": "is_expanded",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "workflow_folder_user_idx": {
+          "name": "workflow_folder_user_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_workspace_parent_idx": {
+          "name": "workflow_folder_workspace_parent_idx",
+          "columns": [
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "workflow_folder_parent_sort_idx": {
+          "name": "workflow_folder_parent_sort_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workflow_folder_user_id_user_id_fk": {
+          "name": "workflow_folder_user_id_user_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workflow_folder_workspace_id_workspace_id_fk": {
+          "name": "workflow_folder_workspace_id_workspace_id_fk",
+          "tableFrom": "workflow_folder",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_logs": {
+      "name": "workflow_logs",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "execution_id": {
+          "name": "execution_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "level": {
+          "name": "level",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "duration": {
+          "name": "duration",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger": {
+          "name": "trigger",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "json",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_logs_workflow_id_workflow_id_fk": {
+          "name": "workflow_logs_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_logs",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workflow_schedule": {
+      "name": "workflow_schedule",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workflow_id": {
+          "name": "workflow_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "cron_expression": {
+          "name": "cron_expression",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "next_run_at": {
+          "name": "next_run_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_ran_at": {
+          "name": "last_ran_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "trigger_type": {
+          "name": "trigger_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "timezone": {
+          "name": "timezone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UTC'"
+        },
+        "failed_count": {
+          "name": "failed_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "last_failed_at": {
+          "name": "last_failed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workflow_schedule_workflow_id_workflow_id_fk": {
+          "name": "workflow_schedule_workflow_id_workflow_id_fk",
+          "tableFrom": "workflow_schedule",
+          "tableTo": "workflow",
+          "columnsFrom": ["workflow_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workflow_schedule_workflow_id_unique": {
+          "name": "workflow_schedule_workflow_id_unique",
+          "nullsNotDistinct": false,
+          "columns": ["workflow_id"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace": {
+      "name": "workspace",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "owner_id": {
+          "name": "owner_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_owner_id_user_id_fk": {
+          "name": "workspace_owner_id_user_id_fk",
+          "tableFrom": "workspace",
+          "tableTo": "user",
+          "columnsFrom": ["owner_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_invitation": {
+      "name": "workspace_invitation",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "inviter_id": {
+          "name": "inviter_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "workspace_invitation_workspace_id_workspace_id_fk": {
+          "name": "workspace_invitation_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_invitation",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_invitation_inviter_id_user_id_fk": {
+          "name": "workspace_invitation_inviter_id_user_id_fk",
+          "tableFrom": "workspace_invitation",
+          "tableTo": "user",
+          "columnsFrom": ["inviter_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "workspace_invitation_token_unique": {
+          "name": "workspace_invitation_token_unique",
+          "nullsNotDistinct": false,
+          "columns": ["token"]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.workspace_member": {
+      "name": "workspace_member",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'member'"
+        },
+        "joined_at": {
+          "name": "joined_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "user_workspace_idx": {
+          "name": "user_workspace_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "workspace_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "workspace_member_workspace_id_workspace_id_fk": {
+          "name": "workspace_member_workspace_id_workspace_id_fk",
+          "tableFrom": "workspace_member",
+          "tableTo": "workspace",
+          "columnsFrom": ["workspace_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "workspace_member_user_id_user_id_fk": {
+          "name": "workspace_member_user_id_user_id_fk",
+          "tableFrom": "workspace_member",
+          "tableTo": "user",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
diff --git a/apps/sim/db/migrations/meta/_journal.json b/apps/sim/db/migrations/meta/_journal.json
index ff79c9ee703..d9abe2c6602 100644
--- a/apps/sim/db/migrations/meta/_journal.json
+++ b/apps/sim/db/migrations/meta/_journal.json
@@ -295,6 +295,13 @@
       "when": 1749784177503,
       "tag": "0042_breezy_miracleman",
       "breakpoints": true
+    },
+    {
+      "idx": 43,
+      "version": "7",
+      "when": 1749938228616,
+      "tag": "0043_fair_roulette",
+      "breakpoints": true
     }
   ]
 }
diff --git a/apps/sim/db/schema.ts b/apps/sim/db/schema.ts
index c0094992c6b..57a9199a8fd 100644
--- a/apps/sim/db/schema.ts
+++ b/apps/sim/db/schema.ts
@@ -176,6 +176,11 @@ export const settings = pgTable('settings', {
   autoConnect: boolean('auto_connect').notNull().default(true),
   autoFillEnvVars: boolean('auto_fill_env_vars').notNull().default(true),
 
+  // Workspace preference
+  lastActiveWorkspaceId: text('last_active_workspace_id').references(() => workspace.id, {
+    onDelete: 'set null',
+  }),
+
   // Privacy settings
   telemetryEnabled: boolean('telemetry_enabled').notNull().default(true),
   telemetryNotifiedUser: boolean('telemetry_notified_user').notNull().default(false),
diff --git a/apps/sim/stores/constants.ts b/apps/sim/stores/constants.ts
index 372881e643b..42ccb70db49 100644
--- a/apps/sim/stores/constants.ts
+++ b/apps/sim/stores/constants.ts
@@ -1,8 +1,4 @@
-export const STORAGE_KEYS = {
-  REGISTRY: 'workflow-registry',
-  WORKFLOW: (id: string) => `workflow-${id}`,
-  SUBBLOCK: (id: string) => `subblock-values-${id}`,
-}
+// localStorage persistence removed - STORAGE_KEYS no longer needed
 
 export const API_ENDPOINTS = {
   SYNC: '/api/workflows/sync',
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index d9712570e87..fcd7f443649 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -16,13 +16,6 @@ import {
 } from './sync-registry'
 // Import the syncWorkflows function directly
 import { syncWorkflows } from './workflows'
-import {
-  loadRegistry,
-  loadSubblockValues,
-  loadWorkflowState,
-  saveSubblockValues,
-  saveWorkflowState,
-} from './workflows/persistence'
 import { useWorkflowRegistry } from './workflows/registry/store'
 import { useSubBlockStore } from './workflows/subblock/store'
 import { isRegistryInitialized } from './workflows/sync'
@@ -37,11 +30,7 @@ let appFullyInitialized = false
 
 /**
  * Initialize the application state and sync system
- *
- * Note: Workflow scheduling is handled automatically by the workflowSync manager
- * when workflows are synced to the database. The scheduling logic checks if a
- * workflow has scheduling enabled in its starter block and updates the schedule
- * accordingly.
+ * localStorage persistence has been removed - relies on DB and Zustand stores only
  */
 async function initializeApplication(): Promise<void> {
   if (typeof window === 'undefined' || isInitializing) return
@@ -59,6 +48,9 @@ async function initializeApplication(): Promise<void> {
     // Load custom tools from server
     await useCustomToolsStore.getState().loadCustomTools()
 
+    // Load user's last active workspace from server
+    await useWorkflowRegistry.getState().loadLastActiveWorkspace()
+
     // Set a flag in sessionStorage to detect new login sessions
     // This helps identify fresh logins in private browsers
     const isNewLoginSession = !sessionStorage.getItem('app_initialized')
@@ -67,38 +59,22 @@ async function initializeApplication(): Promise<void> {
     // Initialize sync system for other stores
     await initializeSyncManagers()
 
-    // After DB sync, check if we need to load from localStorage
-    // This is a fallback in case DB sync failed or there's no data in DB
+    // Check if we have workflows from DB sync
     const registryState = useWorkflowRegistry.getState()
     const hasDbWorkflows = Object.keys(registryState.workflows).length > 0
 
-    if (!hasDbWorkflows) {
-      // No workflows loaded from DB, try localStorage as fallback
-      const workflows = loadRegistry()
-      if (workflows && Object.keys(workflows).length > 0) {
-        logger.info('Loading workflows from localStorage as fallback')
-        useWorkflowRegistry.setState({ workflows })
-
-        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-        if (activeWorkflowId) {
-          initializeWorkflowState(activeWorkflowId)
-        }
-      } else if (isNewLoginSession) {
-        // Critical safeguard: For new login sessions with no DB workflows
-        // and no localStorage, we disable sync temporarily to prevent data loss
-        logger.info('New login session with no workflows - preventing initial sync')
-        const syncManagers = getSyncManagers()
-        syncManagers.forEach((manager) => manager.stopIntervalSync())
-
-        // Create the first starter workflow with an agent block for new users
-        logger.info('Creating first workflow with agent block for new user')
-        createFirstWorkflowWithAgentBlock()
-      }
-    } else {
-      logger.info('Using workflows loaded from DB, ignoring localStorage')
+    if (!hasDbWorkflows && isNewLoginSession) {
+      // Critical safeguard: For new login sessions with no DB workflows
+      logger.info('New login session with no workflows - preventing initial sync')
+      const syncManagers = getSyncManagers()
+      syncManagers.forEach((manager) => manager.stopIntervalSync())
+
+      // Create the first starter workflow with an agent block for new users
+      logger.info('Creating first workflow with agent block for new user')
+      createFirstWorkflowWithAgentBlock()
     }
 
-    // 2. Register cleanup
+    // Register cleanup
     window.addEventListener('beforeunload', handleBeforeUnload)
 
     // Log initialization timing information
@@ -123,35 +99,6 @@ export function isAppInitialized(): boolean {
   return appFullyInitialized && isRegistryInitialized() && isSyncInitialized()
 }
 
-function initializeWorkflowState(workflowId: string): void {
-  // Load the specific workflow state from localStorage
-  const workflowState = loadWorkflowState(workflowId)
-  if (!workflowState) {
-    logger.warn(`No saved state found for workflow ${workflowId}`)
-    return
-  }
-
-  // Set the workflow store state with the loaded state
-  useWorkflowStore.setState(workflowState)
-
-  // Initialize subblock values for this workflow
-  const subblockValues = loadSubblockValues(workflowId)
-  if (subblockValues) {
-    // Update the subblock store with the loaded values
-    useSubBlockStore.setState((state) => ({
-      workflowValues: {
-        ...state.workflowValues,
-        [workflowId]: subblockValues,
-      },
-    }))
-  } else if (workflowState.blocks) {
-    // If no saved subblock values, initialize from blocks
-    useSubBlockStore.getState().initializeFromWorkflow(workflowId, workflowState.blocks)
-  }
-
-  logger.info(`Initialized workflow state for ${workflowId}`)
-}
-
 /**
  * Handle application cleanup before unload
  */
@@ -170,42 +117,17 @@ function handleBeforeUnload(event: BeforeUnloadEvent): void {
     }
   }
 
-  // 1. Persist current state
-  const currentId = useWorkflowRegistry.getState().activeWorkflowId
-  if (currentId) {
-    const currentState = useWorkflowStore.getState()
-
-    // Save the current workflow state with its ID
-    saveWorkflowState(currentId, {
-      blocks: currentState.blocks,
-      edges: currentState.edges,
-      loops: currentState.loops,
-      parallels: currentState.parallels,
-      isDeployed: currentState.isDeployed,
-      deployedAt: currentState.deployedAt,
-      lastSaved: Date.now(),
-      // Include history for undo/redo functionality
-      history: currentState.history,
-    })
-
-    // Save subblock values for the current workflow
-    const subblockValues = useSubBlockStore.getState().workflowValues[currentId]
-    if (subblockValues) {
-      saveSubblockValues(currentId, subblockValues)
-    }
-  }
-
   // Mark workflows as dirty to ensure sync on exit
   syncWorkflows()
 
-  // 2. Final sync for managers that need it
+  // Final sync for managers that need it
   getSyncManagers()
     .filter((manager) => manager.config.syncOnExit)
     .forEach((manager) => {
       manager.sync()
     })
 
-  // 3. Cleanup managers
+  // Cleanup managers
   getSyncManagers().forEach((manager) => manager.dispose())
 
   // Standard beforeunload pattern
@@ -223,19 +145,19 @@ function cleanupApplication(): void {
 
 /**
  * Clear all user data when signing out
- * This ensures data from one account doesn't persist to another
+ * localStorage persistence has been removed
  */
 export async function clearUserData(): Promise<void> {
   if (typeof window === 'undefined') return
 
   try {
-    // 1. Reset all sync managers to prevent any pending syncs
+    // Reset all sync managers to prevent any pending syncs
     resetSyncManagers()
 
-    // 2. Reset all stores to their initial state
+    // Reset all stores to their initial state
     resetAllStores()
 
-    // 3. Clear localStorage except for essential app settings
+    // Clear localStorage except for essential app settings (minimal usage)
     const keysToKeep = ['next-favicon', 'theme']
     const keysToRemove = Object.keys(localStorage).filter((key) => !keysToKeep.includes(key))
     keysToRemove.forEach((key) => localStorage.removeItem(key))
@@ -273,6 +195,38 @@ export function useLoginInitialization() {
   }, [])
 }
 
+/**
+ * Reinitialize the application after login
+ * This ensures we load fresh data from the database for the new user
+ */
+export async function reinitializeAfterLogin(): Promise<void> {
+  if (typeof window === 'undefined') return
+
+  try {
+    // Reset application initialization state
+    appFullyInitialized = false
+
+    // Reset sync managers to prevent any active syncs during reinitialization
+    resetSyncManagers()
+
+    // Clean existing state to avoid stale data
+    resetAllStores()
+
+    // Mark as a new login session
+    sessionStorage.removeItem('app_initialized')
+
+    // Reset initialization flags to force a fresh load
+    isInitializing = false
+
+    // Reinitialize the application
+    await initializeApplication()
+
+    logger.info('Application reinitialized after login')
+  } catch (error) {
+    logger.error('Error reinitializing application:', { error })
+  }
+}
+
 // Initialize immediately when imported on client
 if (typeof window !== 'undefined') {
   initializeApplication()
@@ -289,6 +243,7 @@ export {
   useCopilotStore,
   useCustomToolsStore,
   useVariablesStore,
+  useSubBlockStore,
 }
 
 // Helper function to reset all stores
@@ -334,38 +289,6 @@ export const logAllStores = () => {
   return state
 }
 
-/**
- * Reinitialize the application after login
- * This ensures we load fresh data from the database for the new user
- */
-export async function reinitializeAfterLogin(): Promise<void> {
-  if (typeof window === 'undefined') return
-
-  try {
-    // Reset application initialization state
-    appFullyInitialized = false
-
-    // Reset sync managers to prevent any active syncs during reinitialization
-    resetSyncManagers()
-
-    // Clean existing state to avoid stale data
-    resetAllStores()
-
-    // Mark as a new login session
-    sessionStorage.removeItem('app_initialized')
-
-    // Reset initialization flags to force a fresh load
-    isInitializing = false
-
-    // Reinitialize the application
-    await initializeApplication()
-
-    logger.info('Application reinitialized after login')
-  } catch (error) {
-    logger.error('Error reinitializing application:', { error })
-  }
-}
-
 /**
  * Creates the first workflow with a starter and agent block for new users
  */
@@ -483,9 +406,6 @@ function createFirstWorkflowWithAgentBlock(): void {
   // Initialize subblock values for agent block
   useSubBlockStore.getState().initializeFromWorkflow(workflowId, updatedState.blocks)
 
-  // Save the updated workflow state
-  saveWorkflowState(workflowId, updatedState)
-
   // Mark as dirty to ensure sync
   syncWorkflows()
 
diff --git a/apps/sim/stores/workflows/index.ts b/apps/sim/stores/workflows/index.ts
index f00b26f4499..ef3194590ac 100644
--- a/apps/sim/stores/workflows/index.ts
+++ b/apps/sim/stores/workflows/index.ts
@@ -1,7 +1,5 @@
 import { createLogger } from '@/lib/logs/console-logger'
-import { loadWorkflowState } from './persistence'
 import { useWorkflowRegistry } from './registry/store'
-import { useSubBlockStore } from './subblock/store'
 import { mergeSubblockState } from './utils'
 import { useWorkflowStore } from './workflow/store'
 import type { BlockState, WorkflowState } from './workflow/types'
@@ -10,8 +8,9 @@ const logger = createLogger('Workflows')
 
 /**
  * Get a workflow with its state merged in by ID
+ * Note: Since localStorage has been removed, this only works for the active workflow
  * @param workflowId ID of the workflow to retrieve
- * @returns The workflow with merged state values or null if not found
+ * @returns The workflow with merged state values or null if not found/not active
  */
 export function getWorkflowWithValues(workflowId: string) {
   const { workflows } = useWorkflowRegistry.getState()
@@ -23,39 +22,26 @@ export function getWorkflowWithValues(workflowId: string) {
     return null
   }
 
+  // Since localStorage persistence has been removed, only return data for active workflow
+  if (workflowId !== activeWorkflowId) {
+    logger.warn(`Cannot get state for non-active workflow ${workflowId} - localStorage removed`)
+    return null
+  }
+
   const metadata = workflows[workflowId]
 
   // Get deployment status from registry
   const deploymentStatus = useWorkflowRegistry.getState().getWorkflowDeploymentStatus(workflowId)
 
-  // Load the specific state for this workflow
-  let workflowState: WorkflowState
-
-  if (workflowId === activeWorkflowId) {
-    // For the active workflow, use the current state from the store
-    workflowState = {
-      blocks: currentState.blocks,
-      edges: currentState.edges,
-      loops: currentState.loops,
-      parallels: currentState.parallels,
-      isDeployed: deploymentStatus?.isDeployed || false,
-      deployedAt: deploymentStatus?.deployedAt,
-      lastSaved: currentState.lastSaved,
-    }
-  } else {
-    // For other workflows, load their state from localStorage
-    const savedState = loadWorkflowState(workflowId)
-    if (!savedState) {
-      logger.warn(`No saved state found for workflow ${workflowId}`)
-      return null
-    }
-
-    // Use registry deployment status instead of relying on saved state
-    workflowState = {
-      ...savedState,
-      isDeployed: deploymentStatus?.isDeployed || savedState.isDeployed || false,
-      deployedAt: deploymentStatus?.deployedAt || savedState.deployedAt,
-    }
+  // Use the current state from the store (only available for active workflow)
+  const workflowState: WorkflowState = {
+    blocks: currentState.blocks,
+    edges: currentState.edges,
+    loops: currentState.loops,
+    parallels: currentState.parallels,
+    isDeployed: deploymentStatus?.isDeployed || false,
+    deployedAt: deploymentStatus?.deployedAt,
+    lastSaved: currentState.lastSaved,
   }
 
   // Merge the subblock values for this specific workflow
@@ -98,8 +84,8 @@ export function getBlockWithValues(blockId: string): BlockState | null {
 
 /**
  * Get all workflows with their values merged
- * Used for sync operations to prepare the payload
- * @returns An object containing all workflows with their merged state values
+ * Note: Since localStorage has been removed, this only includes the active workflow state
+ * @returns An object containing workflows, with state only for the active workflow
  */
 export function getAllWorkflowsWithValues() {
   const { workflows, activeWorkspaceId } = useWorkflowRegistry.getState()
@@ -107,63 +93,48 @@ export function getAllWorkflowsWithValues() {
   const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
   const currentState = useWorkflowStore.getState()
 
-  for (const [id, metadata] of Object.entries(workflows)) {
-    // Skip workflows that don't belong to the active workspace
+  // Only sync the active workflow to ensure we always send valid state data
+  if (activeWorkflowId && workflows[activeWorkflowId]) {
+    const metadata = workflows[activeWorkflowId]
+
+    // Skip if workflow doesn't belong to the active workspace
     if (activeWorkspaceId && metadata.workspaceId !== activeWorkspaceId) {
       logger.debug(
-        `Skipping workflow ${id} - belongs to workspace ${metadata.workspaceId}, not active workspace ${activeWorkspaceId}`
+        `Skipping active workflow ${activeWorkflowId} - belongs to workspace ${metadata.workspaceId}, not active workspace ${activeWorkspaceId}`
       )
-      continue
+      return result
     }
 
     // Get deployment status from registry
-    const deploymentStatus = useWorkflowRegistry.getState().getWorkflowDeploymentStatus(id)
-
-    // Load the specific state for this workflow
-    let workflowState: WorkflowState
-
-    if (id === activeWorkflowId) {
-      // For the active workflow, use the current state from the store
-      workflowState = {
-        blocks: currentState.blocks,
-        edges: currentState.edges,
-        loops: currentState.loops,
-        parallels: currentState.parallels,
-        isDeployed: deploymentStatus?.isDeployed || false,
-        deployedAt: deploymentStatus?.deployedAt,
-        lastSaved: currentState.lastSaved,
-      }
-    } else {
-      // For other workflows, load their state from localStorage
-      const savedState = loadWorkflowState(id)
-      if (!savedState) {
-        // Skip workflows with no saved state
-        logger.warn(`No saved state found for workflow ${id}`)
-        continue
-      }
-
-      // Use registry deployment status instead of relying on saved state
-      workflowState = {
-        ...savedState,
-        isDeployed: deploymentStatus?.isDeployed || savedState.isDeployed || false,
-        deployedAt: deploymentStatus?.deployedAt || savedState.deployedAt,
-      }
+    const deploymentStatus = useWorkflowRegistry
+      .getState()
+      .getWorkflowDeploymentStatus(activeWorkflowId)
+
+    // Use the current state from the store (guaranteed to be valid)
+    const workflowState: WorkflowState = {
+      blocks: currentState.blocks,
+      edges: currentState.edges,
+      loops: currentState.loops,
+      parallels: currentState.parallels,
+      isDeployed: deploymentStatus?.isDeployed || false,
+      deployedAt: deploymentStatus?.deployedAt,
+      lastSaved: currentState.lastSaved,
     }
 
     // Merge the subblock values for this specific workflow
-    const mergedBlocks = mergeSubblockState(workflowState.blocks, id)
+    const mergedBlocks = mergeSubblockState(workflowState.blocks, activeWorkflowId)
 
     // Include the API key in the state if it exists in the deployment status
     const apiKey = deploymentStatus?.apiKey
 
-    result[id] = {
-      id,
+    result[activeWorkflowId] = {
+      id: activeWorkflowId,
       name: metadata.name,
       description: metadata.description,
       color: metadata.color || '#3972F6',
       marketplaceData: metadata.marketplaceData || null,
-      workspaceId: metadata.workspaceId, // Include workspaceId in the result
-      folderId: metadata.folderId, // Include folderId in the result
+      workspaceId: metadata.workspaceId,
+      folderId: metadata.folderId,
       state: {
         blocks: mergedBlocks,
         edges: workflowState.edges,
@@ -172,6 +143,7 @@ export function getAllWorkflowsWithValues() {
         lastSaved: workflowState.lastSaved,
         isDeployed: workflowState.isDeployed,
         deployedAt: workflowState.deployedAt,
+        marketplaceData: metadata.marketplaceData || null,
       },
       // Include API key if available
       apiKey,
@@ -191,4 +163,16 @@ export function syncWorkflows() {
   workflowStore.sync.forceSync()
 }
 
-export { useWorkflowRegistry, useWorkflowStore, useSubBlockStore }
+// Workflows store exports - localStorage persistence removed
+
+export { useWorkflowRegistry } from './registry/store'
+export type { WorkflowMetadata } from './registry/types'
+export { useSubBlockStore } from './subblock/store'
+export type { SubBlockStore } from './subblock/types'
+// Re-export utilities
+export { workflowSync } from './sync'
+export { mergeSubblockState } from './utils'
+// Re-export store hooks
+export { useWorkflowStore } from './workflow/store'
+// Re-export types
+export type { WorkflowState } from './workflow/types'
diff --git a/apps/sim/stores/workflows/middleware.ts b/apps/sim/stores/workflows/middleware.ts
index 9fb98e881c5..9ea95e07916 100644
--- a/apps/sim/stores/workflows/middleware.ts
+++ b/apps/sim/stores/workflows/middleware.ts
@@ -1,5 +1,4 @@
 import type { StateCreator } from 'zustand'
-import { saveSubblockValues, saveWorkflowState } from './persistence'
 import { useWorkflowRegistry } from './registry/store'
 import { useSubBlockStore } from './subblock/store'
 import type { WorkflowState, WorkflowStore } from './workflow/types'
@@ -108,23 +107,7 @@ export const withHistory = (
               [activeWorkflowId]: previous.subblockValues,
             },
           })
-
-          // Save to localStorage
-          saveSubblockValues(activeWorkflowId, previous.subblockValues)
         }
-
-        // Save workflow state after undo
-        const currentState = get()
-        saveWorkflowState(activeWorkflowId, {
-          blocks: currentState.blocks,
-          edges: currentState.edges,
-          loops: currentState.loops,
-          parallels: currentState.parallels,
-          history: currentState.history,
-          isDeployed: currentState.isDeployed,
-          deployedAt: currentState.deployedAt,
-          lastSaved: Date.now(),
-        })
       },
 
       // Restore next state from history
@@ -160,23 +143,7 @@ export const withHistory = (
               [activeWorkflowId]: next.subblockValues,
             },
           })
-
-          // Save to localStorage
-          saveSubblockValues(activeWorkflowId, next.subblockValues)
         }
-
-        // Save workflow state after redo
-        const currentState = get()
-        saveWorkflowState(activeWorkflowId, {
-          blocks: currentState.blocks,
-          edges: currentState.edges,
-          loops: currentState.loops,
-          parallels: currentState.parallels,
-          history: currentState.history,
-          isDeployed: currentState.isDeployed,
-          deployedAt: currentState.deployedAt,
-          lastSaved: Date.now(),
-        })
       },
 
       // Reset workflow to empty state
@@ -234,23 +201,7 @@ export const withHistory = (
               [activeWorkflowId]: targetState.subblockValues,
             },
           })
-
-          // Save to localStorage
-          saveSubblockValues(activeWorkflowId, targetState.subblockValues)
         }
-
-        // Save workflow state after revert
-        const currentState = get()
-        saveWorkflowState(activeWorkflowId, {
-          blocks: currentState.blocks,
-          edges: currentState.edges,
-          loops: currentState.loops,
-          parallels: currentState.parallels,
-          history: currentState.history,
-          isDeployed: currentState.isDeployed,
-          deployedAt: currentState.deployedAt,
-          lastSaved: Date.now(),
-        })
       },
     }
   }
diff --git a/apps/sim/stores/workflows/persistence.ts b/apps/sim/stores/workflows/persistence.ts
index 1429da02f47..99fa2b0f536 100644
--- a/apps/sim/stores/workflows/persistence.ts
+++ b/apps/sim/stores/workflows/persistence.ts
@@ -1,197 +1,101 @@
 /**
- * Centralized persistence layer for workflow stores
- * Handles localStorage interactions and synchronization
+ * OAuth state persistence for secure OAuth redirects
+ * This is the ONLY localStorage usage in the app - for temporary OAuth state during redirects
  */
 import { createLogger } from '@/lib/logs/console-logger'
-import { STORAGE_KEYS } from '../constants'
-import { useWorkflowRegistry } from './registry/store'
-import { useSubBlockStore } from './subblock/store'
-import { useWorkflowStore } from './workflow/store'
 
-const logger = createLogger('WorkflowsPersistence')
+const logger = createLogger('OAuthPersistence')
 
-/**
- * Save data to localStorage with error handling
- */
-export function saveToStorage<T>(key: string, data: T): boolean {
-  try {
-    localStorage.setItem(key, JSON.stringify(data))
-    return true
-  } catch (error) {
-    logger.error(`Failed to save data to ${key}:`, { error })
-    return false
-  }
+interface OAuthState {
+  providerId: string
+  serviceId: string
+  requiredScopes: string[]
+  returnUrl: string
+  context: string
+  timestamp: number
+  data?: Record<string, any>
 }
 
-/**
- * Load data from localStorage with error handling
- */
-export function loadFromStorage<T>(key: string): T | null {
-  try {
-    const data = localStorage.getItem(key)
-    return data ? JSON.parse(data) : null
-  } catch (error) {
-    logger.error(`Failed to load data from ${key}:`, { error })
-    return null
-  }
-}
+const OAUTH_STATE_KEY = 'pending_oauth_state'
+const OAUTH_STATE_EXPIRY = 10 * 60 * 1000 // 10 minutes
 
 /**
- * Remove data from localStorage with error handling
+ * Save OAuth state to localStorage before redirect
  */
-export function removeFromStorage(key: string): boolean {
+export function saveOAuthState(state: OAuthState): boolean {
   try {
-    localStorage.removeItem(key)
+    const stateWithTimestamp = {
+      ...state,
+      timestamp: Date.now(),
+    }
+    localStorage.setItem(OAUTH_STATE_KEY, JSON.stringify(stateWithTimestamp))
     return true
   } catch (error) {
-    logger.error(`Failed to remove data from ${key}:`, { error })
+    logger.error('Failed to save OAuth state to localStorage:', error)
     return false
   }
 }
 
 /**
- * Save workflow state to localStorage
+ * Load and remove OAuth state from localStorage after redirect
  */
-export function saveWorkflowState(workflowId: string, state: any): boolean {
-  // We need to handle history separately since it's not part of the base WorkflowState
-  return saveToStorage(STORAGE_KEYS.WORKFLOW(workflowId), state)
-}
+export function loadOAuthState(): OAuthState | null {
+  try {
+    const stored = localStorage.getItem(OAUTH_STATE_KEY)
+    if (!stored) return null
 
-/**
- * Load workflow state from localStorage
- */
-export function loadWorkflowState(workflowId: string): any {
-  return loadFromStorage(STORAGE_KEYS.WORKFLOW(workflowId))
-}
+    const state = JSON.parse(stored) as OAuthState
 
-/**
- * Save subblock values to localStorage
- */
-export function saveSubblockValues(workflowId: string, values: any): boolean {
-  return saveToStorage(STORAGE_KEYS.SUBBLOCK(workflowId), values)
-}
-
-/**
- * Load subblock values from localStorage
- */
-export function loadSubblockValues(workflowId: string): any {
-  return loadFromStorage(STORAGE_KEYS.SUBBLOCK(workflowId))
-}
+    // Check if state has expired
+    if (Date.now() - state.timestamp > OAUTH_STATE_EXPIRY) {
+      localStorage.removeItem(OAUTH_STATE_KEY)
+      logger.warn('OAuth state expired, removing from localStorage')
+      return null
+    }
 
-/**
- * Save registry to localStorage
- */
-export function saveRegistry(registry: any): boolean {
-  return saveToStorage(STORAGE_KEYS.REGISTRY, registry)
-}
+    // Remove state after loading (one-time use)
+    localStorage.removeItem(OAUTH_STATE_KEY)
 
-/**
- * Load registry from localStorage
- */
-export function loadRegistry(): any {
-  return loadFromStorage(STORAGE_KEYS.REGISTRY)
+    return state
+  } catch (error) {
+    logger.error('Failed to load OAuth state from localStorage:', error)
+    // Clean up corrupted state
+    localStorage.removeItem(OAUTH_STATE_KEY)
+    return null
+  }
 }
 
 /**
- * Initialize all stores from localStorage
- * This is the main initialization function that should be called once at app startup
+ * Remove OAuth state from localStorage (cleanup)
  */
-export function initializeStores(): void {
-  if (typeof window === 'undefined') return
-
-  // Initialize registry first
-  const workflows = loadRegistry()
-  if (workflows) {
-    useWorkflowRegistry.setState({ workflows })
-
-    // If there's an active workflow ID in the registry, load it
-    const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-    if (activeWorkflowId) {
-      // Load workflow state
-      const workflowState = loadWorkflowState(activeWorkflowId)
-      if (workflowState) {
-        // Initialize workflow store with saved state
-        useWorkflowStore.setState(workflowState)
-
-        // Initialize subblock store with workflow values
-        const subblockValues = loadSubblockValues(activeWorkflowId)
-        if (subblockValues) {
-          useSubBlockStore.setState((state) => ({
-            workflowValues: {
-              ...state.workflowValues,
-              [activeWorkflowId]: subblockValues,
-            },
-          }))
-        } else if (workflowState.blocks) {
-          // If no saved subblock values, initialize from blocks
-          useSubBlockStore.getState().initializeFromWorkflow(activeWorkflowId, workflowState.blocks)
-        }
-      }
-    }
+export function clearOAuthState(): void {
+  try {
+    localStorage.removeItem(OAUTH_STATE_KEY)
+  } catch (error) {
+    logger.error('Failed to clear OAuth state from localStorage:', error)
   }
-
-  // Setup unload persistence
-  setupUnloadPersistence()
 }
 
 /**
- * Setup persistence for page unload events
+ * Check if there's pending OAuth state
  */
-export function setupUnloadPersistence(): void {
-  if (typeof window === 'undefined') return
-
-  window.addEventListener('beforeunload', (event) => {
-    // Check if we're on an authentication page and skip confirmation if we are
-    const path = window.location.pathname
-    // Skip confirmation for auth-related pages
-    if (
-      path === '/login' ||
-      path === '/signup' ||
-      path === '/reset-password' ||
-      path === '/verify'
-    ) {
-      return
-    }
-
-    const currentId = useWorkflowRegistry.getState().activeWorkflowId
-    if (currentId) {
-      // Save workflow state
-      const currentState = useWorkflowStore.getState()
-
-      // Generate loops from the current blocks for consistency
-      const generatedLoops = currentState.generateLoopBlocks
-        ? currentState.generateLoopBlocks()
-        : {}
-
-      // Generate parallels from the current blocks for consistency
-      const generatedParallels = currentState.generateParallelBlocks
-        ? currentState.generateParallelBlocks()
-        : {}
+export function hasPendingOAuthState(): boolean {
+  try {
+    const stored = localStorage.getItem(OAUTH_STATE_KEY)
+    if (!stored) return false
 
-      // Save the complete state including history which is added by middleware
-      saveWorkflowState(currentId, {
-        blocks: currentState.blocks,
-        edges: currentState.edges,
-        loops: generatedLoops,
-        parallels: generatedParallels,
-        isDeployed: currentState.isDeployed,
-        deployedAt: currentState.deployedAt,
-        lastSaved: Date.now(),
-        history: currentState.history,
-      })
+    const state = JSON.parse(stored) as OAuthState
 
-      // Save subblock values
-      const subblockValues = useSubBlockStore.getState().workflowValues[currentId]
-      if (subblockValues) {
-        saveSubblockValues(currentId, subblockValues)
-      }
+    // Check if expired
+    if (Date.now() - state.timestamp > OAUTH_STATE_EXPIRY) {
+      localStorage.removeItem(OAUTH_STATE_KEY)
+      return false
     }
 
-    // Save registry
-    saveRegistry(useWorkflowRegistry.getState().workflows)
-
-    // Only prevent navigation on non-auth pages
-    event.preventDefault()
-    event.returnValue = ''
-  })
+    return true
+  } catch (error) {
+    logger.error('Failed to check pending OAuth state:', error)
+    localStorage.removeItem(OAUTH_STATE_KEY)
+    return false
+  }
 }
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 70d7cf13291..4a0dff04ff6 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -2,111 +2,20 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { createLogger } from '@/lib/logs/console-logger'
 import { clearWorkflowVariablesTracking } from '@/stores/panel/variables/store'
-import { API_ENDPOINTS, STORAGE_KEYS } from '../../constants'
-import {
-  loadWorkflowState,
-  removeFromStorage,
-  saveRegistry,
-  saveSubblockValues,
-  saveWorkflowState,
-} from '../persistence'
+import { API_ENDPOINTS } from '../../constants'
 import { useSubBlockStore } from '../subblock/store'
 import { fetchWorkflowsFromDB, resetRegistryInitialization, workflowSync } from '../sync'
 import { useWorkflowStore } from '../workflow/store'
+import type { BlockState } from '../workflow/types'
 import type { DeploymentStatus, WorkflowMetadata, WorkflowRegistry } from './types'
 import { generateUniqueName, getNextWorkflowColor } from './utils'
 
 const logger = createLogger('WorkflowRegistry')
 
-// Storage key for active workspace
-const ACTIVE_WORKSPACE_KEY = 'active-workspace-id'
-
 // Track workspace transitions to prevent race conditions
 let isWorkspaceTransitioning = false
 const TRANSITION_TIMEOUT = 5000 // 5 seconds maximum for workspace transitions
 
-// Helps clean up any localStorage data that isn't needed for the current workspace
-function cleanupLocalStorageForWorkspace(workspaceId: string): void {
-  if (typeof window === 'undefined') return
-
-  try {
-    const { workflows } = useWorkflowRegistry.getState()
-    const workflowIds = Object.keys(workflows)
-
-    // Find all localStorage keys that start with workflow- or subblock-values-
-    const localStorageKeys = Object.keys(localStorage)
-    const workflowKeys = localStorageKeys.filter(
-      (key) => key.startsWith('workflow-') || key.startsWith('subblock-values-')
-    )
-
-    // Extract the workflow ID from each key (remove the prefix)
-    for (const key of workflowKeys) {
-      let workflowId: string | null = null
-
-      if (key.startsWith('workflow-')) {
-        workflowId = key.replace('workflow-', '')
-      } else if (key.startsWith('subblock-values-')) {
-        workflowId = key.replace('subblock-values-', '')
-      }
-
-      if (workflowId) {
-        // Case 1: Clean up workflows not in the registry
-        if (!workflowIds.includes(workflowId)) {
-          // Check if this workflow exists in a different workspace
-          // We don't want to remove data for workflows in other workspaces
-          const exists = localStorage.getItem(`workflow-${workflowId}`)
-          if (exists) {
-            try {
-              const parsed = JSON.parse(exists)
-              // If we can't determine the workspace, leave it alone for safety
-              if (!parsed || !parsed.workspaceId) continue
-
-              // Only remove if it belongs to the current workspace
-              if (parsed.workspaceId === workspaceId) {
-                localStorage.removeItem(key)
-              }
-            } catch (_e) {}
-          } else {
-            // If we can't determine the workspace, remove it to be safe
-            localStorage.removeItem(key)
-          }
-        }
-        // Case 2: Clean up workflows that reference deleted workspaces
-        else {
-          const exists = localStorage.getItem(`workflow-${workflowId}`)
-          if (exists) {
-            try {
-              const parsed = JSON.parse(exists)
-              if (parsed?.workspaceId && parsed.workspaceId !== workspaceId) {
-                // Check if this workspace still exists in our list
-                const workspacesData = localStorage.getItem('workspaces')
-                if (workspacesData) {
-                  try {
-                    const workspaces = JSON.parse(workspacesData)
-                    const workspaceExists = workspaces.some((w: any) => w.id === parsed.workspaceId)
-
-                    if (!workspaceExists) {
-                      // Workspace doesn't exist, update the workflow to use current workspace
-                      parsed.workspaceId = workspaceId
-                      localStorage.setItem(`workflow-${workflowId}`, JSON.stringify(parsed))
-                    }
-                  } catch (_e) {
-                    // Skip if we can't parse workspaces data
-                  }
-                }
-              }
-            } catch (_e) {
-              // Skip if we can't parse the data
-            }
-          }
-        }
-      }
-    }
-  } catch (error) {
-    logger.error('Error cleaning up localStorage:', error)
-  }
-}
-
 // Resets workflow and subblock stores to prevent data leakage between workspaces
 function resetWorkflowStores() {
   // Reset variable tracking to prevent stale API calls
@@ -180,8 +89,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       // Store state
       workflows: {},
       activeWorkflowId: null,
-      activeWorkspaceId:
-        typeof window !== 'undefined' ? localStorage.getItem(ACTIVE_WORKSPACE_KEY) : null,
+      activeWorkspaceId: null, // No longer persisted in localStorage
       isLoading: false,
       error: null,
       // Initialize deployment statuses
@@ -196,7 +104,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       },
 
       // Handle cleanup on workspace deletion
-      handleWorkspaceDeletion: (newWorkspaceId: string) => {
+      handleWorkspaceDeletion: async (newWorkspaceId: string) => {
         const currentWorkspaceId = get().activeWorkspaceId
 
         if (!newWorkspaceId || newWorkspaceId === currentWorkspaceId) {
@@ -215,10 +123,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         // Reset registry initialization state
         resetRegistryInitialization()
 
-        // Save to localStorage for persistence
-        if (typeof window !== 'undefined') {
-          localStorage.setItem(ACTIVE_WORKSPACE_KEY, newWorkspaceId)
-        }
+        // No longer saving workspace to localStorage
 
         // Set loading state while we fetch workflows
         set({
@@ -233,9 +138,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           .then(() => {
             set({ isLoading: false })
 
-            // Clean up any stale localStorage data
-            cleanupLocalStorageForWorkspace(newWorkspaceId)
-
             // End transition state
             setWorkspaceTransitioning(false)
           })
@@ -251,8 +153,8 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           })
       },
 
-      // Set active workspace and update UI
-      setActiveWorkspace: (id: string) => {
+      // Set active workspace and update UI + persist to server
+      setActiveWorkspace: async (id: string) => {
         const currentWorkspaceId = get().activeWorkspaceId
 
         // Only perform the switch if the workspace is different
@@ -277,10 +179,16 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         // Reset registry initialization state
         resetRegistryInitialization()
 
-        // Save to localStorage for persistence
-        if (typeof window !== 'undefined') {
-          localStorage.setItem(ACTIVE_WORKSPACE_KEY, id)
-        }
+        // No longer saving workspace to localStorage
+
+        // Persist workspace selection to server (fire and forget)
+        fetch('/api/user/workspace', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ workspaceId: id }),
+        }).catch((error) => {
+          logger.warn('Failed to persist workspace selection to server:', error)
+        })
 
         // Set loading state while we fetch workflows
         set({
@@ -298,9 +206,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           .then(() => {
             set({ isLoading: false })
 
-            // Clean up any stale localStorage data for this workspace
-            cleanupLocalStorageForWorkspace(id)
-
             // End transition state
             setWorkspaceTransitioning(false)
           })
@@ -313,6 +218,24 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           })
       },
 
+      // Load user's last active workspace from server
+      loadLastActiveWorkspace: async () => {
+        try {
+          const response = await fetch('/api/user/workspace')
+          if (response.ok) {
+            const data = await response.json()
+            if (data.workspaceId && data.workspaceId !== get().activeWorkspaceId) {
+              // Set the workspace without triggering a full switch (since we're initializing)
+              set({ activeWorkspaceId: data.workspaceId })
+              logger.info(`Restored last active workspace: ${data.workspaceId}`)
+            }
+          }
+        } catch (error) {
+          logger.warn('Failed to load last active workspace from server:', error)
+          // This is non-critical, so we continue with default behavior
+        }
+      },
+
       // Method to get deployment status for a specific workflow
       getWorkflowDeploymentStatus: (workflowId: string | null): DeploymentStatus | null => {
         if (!workflowId) {
@@ -323,29 +246,11 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
         const { deploymentStatuses = {} } = get()
 
-        // First try to get from the workflow-specific deployment statuses
+        // Get from the workflow-specific deployment statuses in the registry
         if (deploymentStatuses[workflowId]) {
           return deploymentStatuses[workflowId]
         }
 
-        // For backward compatibility, check the workflow state in workflow store
-        // This will only be relevant during the transition period
-        const workflowState = loadWorkflowState(workflowId)
-        if (workflowState) {
-          // Check workflow-specific status in the workflow state
-          if (workflowState.deploymentStatuses?.[workflowId]) {
-            return workflowState.deploymentStatuses[workflowId]
-          }
-
-          // Fallback to legacy fields if needed
-          if (workflowState.isDeployed) {
-            return {
-              isDeployed: workflowState.isDeployed || false,
-              deployedAt: workflowState.deployedAt,
-            }
-          }
-        }
-
         // No deployment status found
         return null
       },
@@ -402,32 +307,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           }))
         }
 
-        // Save the deployment status in the workflow state
-        const workflowState = loadWorkflowState(workflowId)
-        if (workflowState) {
-          saveWorkflowState(workflowId, {
-            ...workflowState,
-            // Update both legacy and new fields for compatibility
-            isDeployed: workflowId === activeWorkflowId ? isDeployed : workflowState.isDeployed,
-            deployedAt:
-              workflowId === activeWorkflowId
-                ? deployedAt || (isDeployed ? new Date() : undefined)
-                : workflowState.deployedAt,
-            deploymentStatuses: {
-              ...(workflowState.deploymentStatuses || {}),
-              [workflowId]: {
-                isDeployed,
-                deployedAt: deployedAt || (isDeployed ? new Date() : undefined),
-                apiKey,
-                needsRedeployment: isDeployed
-                  ? false
-                  : ((workflowState.deploymentStatuses?.[workflowId] as any)?.needsRedeployment ??
-                    false),
-              },
-            },
-          })
-        }
-
         // Trigger workflow sync to update server state
         workflowSync.sync()
       },
@@ -460,155 +339,87 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         if (workflowId === activeWorkflowId) {
           useWorkflowStore.getState().setNeedsRedeploymentFlag(needsRedeployment)
         }
-        // Save to persistent storage
-        const workflowState = loadWorkflowState(workflowId)
-        if (workflowState) {
-          const deploymentStatuses = workflowState.deploymentStatuses || {}
-          const currentStatus = deploymentStatuses[workflowId] || { isDeployed: false }
-
-          saveWorkflowState(workflowId, {
-            ...workflowState,
-            deploymentStatuses: {
-              ...deploymentStatuses,
-              [workflowId]: {
-                ...currentStatus,
-                needsRedeployment,
-              },
-            },
-          })
-        }
       },
 
-      // Modified setActiveWorkflow to load deployment statuses
+      // Modified setActiveWorkflow to work with clean DB-only architecture
       setActiveWorkflow: async (id: string) => {
-        const { workflows } = get()
+        const { workflows, activeWorkflowId } = get()
         if (!workflows[id]) {
           set({ error: `Workflow ${id} not found` })
           return
         }
 
-        // Get current workflow ID
-        const currentId = get().activeWorkflowId
-        // Save current workflow state before switching
-        if (currentId) {
-          const currentState = useWorkflowStore.getState()
-
-          // Generate loops and parallels from current blocks
-          const generatedLoops = currentState.generateLoopBlocks
-            ? currentState.generateLoopBlocks()
-            : {}
-          const generatedParallels = currentState.generateParallelBlocks
-            ? currentState.generateParallelBlocks()
-            : {}
-
-          // Save the complete state for the current workflow
-          saveWorkflowState(currentId, {
-            blocks: currentState.blocks,
-            edges: currentState.edges,
-            loops: generatedLoops,
-            parallels: generatedParallels,
-            history: currentState.history,
-            isDeployed: currentState.isDeployed,
-            deployedAt: currentState.deployedAt,
-            deploymentStatuses: currentState.deploymentStatuses,
-            lastSaved: Date.now(),
-          })
-
-          // Also save current subblock values
-          const currentSubblockValues = useSubBlockStore.getState().workflowValues[currentId]
-          if (currentSubblockValues) {
-            saveSubblockValues(currentId, currentSubblockValues)
-          }
+        // First, sync the current workflow before switching (if there is one)
+        if (activeWorkflowId && activeWorkflowId !== id) {
+          console.log(
+            `[DEBUG] setActiveWorkflow: Syncing current workflow ${activeWorkflowId} before switching to ${id}`
+          )
+          // Mark current workflow as dirty and sync (fire and forget)
+          useWorkflowStore.getState().sync.markDirty()
+          useWorkflowStore.getState().sync.forceSync()
         }
 
-        // Load workflow state for the new active workflow
-        const parsedState = loadWorkflowState(id)
-        if (parsedState) {
-          const {
-            blocks,
-            edges,
-            parallels,
-            history,
-            loops,
-            isDeployed,
-            deployedAt,
-            deploymentStatuses,
-            needsRedeployment,
-          } = parsedState
-
-          // Get workflow-specific deployment status
-          let workflowIsDeployed = isDeployed
-          let workflowDeployedAt = deployedAt
-          let workflowNeedsRedeployment = needsRedeployment
-
-          // Check if we have a workflow-specific deployment status
-          if (deploymentStatuses?.[id]) {
-            workflowIsDeployed = deploymentStatuses[id].isDeployed
-            workflowDeployedAt = deploymentStatuses[id].deployedAt
-            workflowNeedsRedeployment = deploymentStatuses[id].needsRedeployment
-          }
+        console.log(`[DEBUG] setActiveWorkflow: Loading workflow ${id}`)
 
-          // Initialize subblock store with workflow values
-          useSubBlockStore.getState().initializeFromWorkflow(id, blocks)
-
-          // Set the workflow store state with the loaded state
-          useWorkflowStore.setState({
-            blocks,
-            edges,
-            loops,
-            parallels,
-            isDeployed: workflowIsDeployed !== undefined ? workflowIsDeployed : false,
-            deployedAt: workflowDeployedAt ? new Date(workflowDeployedAt) : undefined,
-            needsRedeployment:
-              workflowNeedsRedeployment !== undefined ? workflowNeedsRedeployment : false,
-            deploymentStatuses: deploymentStatuses || {},
+        // Fetch workflow state from database
+        const { fetchWorkflowStateFromDB } = await import('@/stores/workflows/sync')
+        const workflowData = await fetchWorkflowStateFromDB(id)
+
+        let workflowState: any
+
+        if (workflowData?.state) {
+          console.log(`[DEBUG] setActiveWorkflow: Found DB state for ${id}`, {
+            hasBlocks: Object.keys(workflowData.state.blocks || {}).length,
+            blockTypes: Object.values(workflowData.state.blocks || {}).map((b: any) => b.type),
+          })
+
+          // Use the state from the database
+          workflowState = {
+            blocks: workflowData.state.blocks || {},
+            edges: workflowData.state.edges || [],
+            loops: workflowData.state.loops || {},
+            parallels: workflowData.state.parallels || {},
+            isDeployed: workflowData.isDeployed || false,
+            deployedAt: workflowData.deployedAt ? new Date(workflowData.deployedAt) : undefined,
+            apiKey: workflowData.apiKey,
+            lastSaved: Date.now(),
+            marketplaceData: workflowData.marketplaceData || null,
+            deploymentStatuses: {},
             hasActiveSchedule: false,
-            history: history || {
+            history: {
               past: [],
               present: {
-                state: {
-                  blocks,
-                  edges,
-                  loops,
-                  parallels,
-                  isDeployed: workflowIsDeployed !== undefined ? workflowIsDeployed : false,
-                  deployedAt: workflowDeployedAt,
-                },
+                state: workflowData.state,
                 timestamp: Date.now(),
-                action: 'Initial state',
+                action: 'Loaded from database',
                 subblockValues: {},
               },
               future: [],
             },
-            lastSaved: parsedState.lastSaved || Date.now(),
-          })
-
-          // Update the deployment statuses in the registry
-          if (deploymentStatuses) {
-            set((state) => ({
-              deploymentStatuses: {
-                ...state.deploymentStatuses,
-                ...deploymentStatuses,
-              },
-            }))
-          } else if (workflowIsDeployed !== undefined) {
-            // If there's no deployment statuses object but we have legacy deployment status,
-            // create an entry in the deploymentStatuses map
-            set((state) => ({
-              deploymentStatuses: {
-                ...state.deploymentStatuses,
-                [id]: {
-                  isDeployed: workflowIsDeployed as boolean,
-                  deployedAt: workflowDeployedAt ? new Date(workflowDeployedAt) : undefined,
-                },
-              },
-            }))
           }
 
-          logger.info(`Switched to workflow ${id}`)
+          // Extract and update subblock values
+          const subblockValues: Record<string, Record<string, any>> = {}
+          Object.entries(workflowState.blocks).forEach(([blockId, block]) => {
+            const blockState = block as any
+            subblockValues[blockId] = {}
+            Object.entries(blockState.subBlocks || {}).forEach(([subblockId, subblock]) => {
+              subblockValues[blockId][subblockId] = (subblock as any).value
+            })
+          })
+
+          // Update subblock store for this workflow
+          useSubBlockStore.setState((state) => ({
+            workflowValues: {
+              ...state.workflowValues,
+              [id]: subblockValues,
+            },
+          }))
         } else {
-          // If no saved state, initialize with empty state
-          useWorkflowStore.setState({
+          console.log(`[DEBUG] setActiveWorkflow: No DB state for ${id}, initializing empty state`)
+
+          // If no state in DB, initialize with empty state
+          workflowState = {
             blocks: {},
             edges: [],
             loops: {},
@@ -635,13 +446,27 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               future: [],
             },
             lastSaved: Date.now(),
-          })
+          }
 
-          logger.warn(`No saved state found for workflow ${id}, initialized with empty state`)
+          // Initialize empty subblock values for this workflow
+          useSubBlockStore.setState((state) => ({
+            workflowValues: {
+              ...state.workflowValues,
+              [id]: {},
+            },
+          }))
         }
 
+        // Set the workflow state in the store
+        useWorkflowStore.setState(workflowState)
+        console.log(`[DEBUG] setActiveWorkflow: Set state in store`, {
+          blockCount: Object.keys(workflowState.blocks).length,
+        })
+
         // Update the active workflow ID
         set({ activeWorkflowId: id, error: null })
+
+        logger.info(`Switched to workflow ${id}`)
       },
 
       /**
@@ -844,20 +669,13 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           error: null,
         }))
 
-        // Save workflow list to localStorage
-        const updatedWorkflows = get().workflows
-        saveRegistry(updatedWorkflows)
-
-        // Save initial workflow state to localStorage
-        saveWorkflowState(id, initialState)
-
         // Initialize subblock values if this is a marketplace import
         if (options.marketplaceId && options.marketplaceState?.blocks) {
           useSubBlockStore.getState().initializeFromWorkflow(id, options.marketplaceState.blocks)
         }
 
         // If this is the first workflow or it's an initial workflow, set it as active
-        if (options.isInitial || Object.keys(updatedWorkflows).length === 1) {
+        if (options.isInitial || Object.keys(get().workflows).length === 1) {
           set({ activeWorkflowId: id })
           useWorkflowStore.setState(initialState)
         } else {
@@ -866,11 +684,32 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           useWorkflowStore.setState(initialState)
         }
 
-        // Mark as dirty to ensure sync
+        // Initialize subblock values to ensure they're available for sync
+        if (!options.marketplaceId) {
+          // For non-marketplace workflows, initialize subblock values from the starter block
+          const subblockValues: Record<string, Record<string, any>> = {}
+          const blocks = initialState.blocks as Record<string, BlockState>
+          for (const [blockId, block] of Object.entries(blocks)) {
+            subblockValues[blockId] = {}
+            for (const [subblockId, subblock] of Object.entries(block.subBlocks)) {
+              subblockValues[blockId][subblockId] = (subblock as any).value
+            }
+          }
+
+          // Update the subblock store with the initial values
+          useSubBlockStore.setState((state) => ({
+            workflowValues: {
+              ...state.workflowValues,
+              [id]: subblockValues,
+            },
+          }))
+        }
+
+        // Mark as dirty to ensure sync, but let it sync naturally
         useWorkflowStore.getState().sync.markDirty()
 
-        // Trigger sync
-        useWorkflowStore.getState().sync.forceSync()
+        // Remove immediate sync to prevent race conditions
+        // The sync will happen naturally through the interval sync mechanism
 
         logger.info(`Created new workflow with ID ${id} in workspace ${workspaceId || 'none'}`)
 
@@ -879,10 +718,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
       /**
        * Creates a new workflow from a marketplace workflow
-       * @param marketplaceId - The ID of the marketplace workflow to import
-       * @param state - The state of the marketplace workflow (blocks, edges, loops)
-       * @param metadata - Additional metadata like name, description from marketplace
-       * @returns The ID of the newly created workflow
        */
       createMarketplaceWorkflow: (
         marketplaceId: string,
@@ -939,18 +774,15 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           error: null,
         }))
 
-        // Save workflow list to localStorage
-        const updatedWorkflows = get().workflows
-        saveRegistry(updatedWorkflows)
-
-        // Save workflow state to localStorage
-        saveWorkflowState(id, initialState)
-
         // Initialize subblock values from state blocks
         if (state.blocks) {
           useSubBlockStore.getState().initializeFromWorkflow(id, state.blocks)
         }
 
+        // Set as active workflow and update store
+        set({ activeWorkflowId: id })
+        useWorkflowStore.setState(initialState)
+
         // Mark as dirty to ensure sync
         useWorkflowStore.getState().sync.markDirty()
 
@@ -964,8 +796,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
       /**
        * Duplicates an existing workflow
-       * @param sourceId - The ID of the workflow to duplicate
-       * @returns The ID of the newly created workflow
        */
       duplicateWorkflow: (sourceId: string) => {
         const { workflows, activeWorkspaceId } = get()
@@ -978,13 +808,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
         const id = crypto.randomUUID()
 
-        // Load the source workflow state
-        const sourceState = loadWorkflowState(sourceId)
-        if (!sourceState) {
-          set({ error: `No state found for workflow ${sourceId}` })
-          return null
-        }
-
         // Get the workspace ID from the source workflow or fall back to active workspace
         const workspaceId = sourceWorkflow.workspaceId || activeWorkspaceId || undefined
 
@@ -999,27 +822,27 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           // Do not copy marketplace data
         }
 
-        // Create new workflow state without deployment data
+        // Create new workflow state without deployment data - simplified since no localStorage
         const newState = {
-          blocks: sourceState.blocks || {},
-          edges: sourceState.edges || [],
-          loops: sourceState.loops || {},
-          parallels: sourceState.parallels || {},
-          isDeployed: false, // Reset deployment status
-          deployedAt: undefined, // Reset deployment timestamp
-          workspaceId, // Include workspaceId in state
-          deploymentStatuses: {}, // Start with empty deployment statuses map
+          blocks: {},
+          edges: [],
+          loops: {},
+          parallels: {},
+          isDeployed: false,
+          deployedAt: undefined,
+          workspaceId,
+          deploymentStatuses: {},
           history: {
             past: [],
             present: {
               state: {
-                blocks: sourceState.blocks || {},
-                edges: sourceState.edges || [],
-                loops: sourceState.loops || {},
-                parallels: sourceState.parallels || {},
+                blocks: {},
+                edges: [],
+                loops: {},
+                parallels: {},
                 isDeployed: false,
                 deployedAt: undefined,
-                workspaceId, // Include workspaceId in history state
+                workspaceId,
               },
               timestamp: Date.now(),
               action: 'Duplicated workflow',
@@ -1039,27 +862,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           error: null,
         }))
 
-        // Save workflow list to localStorage
-        const updatedWorkflows = get().workflows
-        saveRegistry(updatedWorkflows)
-
-        // Save workflow state to localStorage
-        saveWorkflowState(id, newState)
-
-        // Copy subblock values from the source workflow
-        const sourceSubblockValues = useSubBlockStore.getState().workflowValues[sourceId]
-        if (sourceSubblockValues) {
-          useSubBlockStore.setState((state) => ({
-            workflowValues: {
-              ...state.workflowValues,
-              [id]: JSON.parse(JSON.stringify(sourceSubblockValues)), // Deep copy
-            },
-          }))
-
-          // Save the copied subblock values
-          saveSubblockValues(id, JSON.parse(JSON.stringify(sourceSubblockValues)))
-        }
-
         // Mark as dirty to ensure sync
         useWorkflowStore.getState().sync.markDirty()
 
@@ -1079,11 +881,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           const newWorkflows = { ...state.workflows }
           delete newWorkflows[id]
 
-          // Clean up localStorage
-          removeFromStorage(STORAGE_KEYS.WORKFLOW(id))
-          removeFromStorage(STORAGE_KEYS.SUBBLOCK(id))
-          saveRegistry(newWorkflows)
-
           // Ensure any schedule for this workflow is cancelled
           // The API will handle the deletion of the schedule
           fetch(API_ENDPOINTS.SCHEDULE, {
@@ -1103,71 +900,40 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           // Sync deletion with database
           useWorkflowStore.getState().sync.forceSync()
 
-          // If deleting active workflow, switch to another one
+          // If deleting active workflow, switch to another one or initialize empty
           let newActiveWorkflowId = state.activeWorkflowId
           if (state.activeWorkflowId === id) {
             const remainingIds = Object.keys(newWorkflows)
-            // Switch to first available workflow
-            newActiveWorkflowId = remainingIds[0]
-            const savedState = loadWorkflowState(newActiveWorkflowId)
-            if (savedState) {
-              const { blocks, edges, history, loops, parallels, isDeployed, deployedAt } =
-                savedState
-              useWorkflowStore.setState({
-                blocks,
-                edges,
-                loops,
-                parallels,
-                isDeployed: isDeployed || false,
-                deployedAt: deployedAt ? new Date(deployedAt) : undefined,
-                hasActiveSchedule: false,
-                history: history || {
-                  past: [],
-                  present: {
-                    state: {
-                      blocks,
-                      edges,
-                      loops,
-                      parallels,
-                      isDeployed: isDeployed || false,
-                      deployedAt,
-                    },
-                    timestamp: Date.now(),
-                    action: 'Initial state',
-                    subblockValues: {},
+            newActiveWorkflowId = remainingIds[0] || null
+
+            // Initialize empty workflow state since no localStorage
+            useWorkflowStore.setState({
+              blocks: {},
+              edges: [],
+              loops: {},
+              parallels: {},
+              isDeployed: false,
+              deployedAt: undefined,
+              hasActiveSchedule: false,
+              history: {
+                past: [],
+                present: {
+                  state: {
+                    blocks: {},
+                    edges: [],
+                    loops: {},
+                    parallels: {},
+                    isDeployed: false,
+                    deployedAt: undefined,
                   },
-                  future: [],
+                  timestamp: Date.now(),
+                  action: 'Initial state',
+                  subblockValues: {},
                 },
-              })
-            } else {
-              useWorkflowStore.setState({
-                blocks: {},
-                edges: [],
-                loops: {},
-                parallels: {},
-                isDeployed: false,
-                deployedAt: undefined,
-                hasActiveSchedule: false,
-                history: {
-                  past: [],
-                  present: {
-                    state: {
-                      blocks: {},
-                      edges: [],
-                      loops: {},
-                      parallels: {},
-                      isDeployed: false,
-                      deployedAt: undefined,
-                    },
-                    timestamp: Date.now(),
-                    action: 'Initial state',
-                    subblockValues: {},
-                  },
-                  future: [],
-                },
-                lastSaved: Date.now(),
-              })
-            }
+                future: [],
+              },
+              lastSaved: Date.now(),
+            })
           }
 
           return {
@@ -1193,9 +959,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             },
           }
 
-          // Update localStorage
-          saveRegistry(updatedWorkflows)
-
           // Mark as dirty to ensure sync
           useWorkflowStore.getState().sync.markDirty()
 
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index facb08ce540..dcdb51e11e7 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -34,6 +34,7 @@ export interface WorkflowRegistryActions {
   setLoading: (loading: boolean) => void
   setActiveWorkflow: (id: string) => Promise<void>
   setActiveWorkspace: (id: string) => void
+  loadLastActiveWorkspace: () => Promise<void>
   handleWorkspaceDeletion: (newWorkspaceId: string) => void
   removeWorkflow: (id: string) => void
   updateWorkflow: (id: string, metadata: Partial<WorkflowMetadata>) => void
@@ -46,6 +47,11 @@ export interface WorkflowRegistryActions {
     workspaceId?: string
     folderId?: string | null
   }) => string
+  createMarketplaceWorkflow: (
+    marketplaceId: string,
+    state: any,
+    metadata: Partial<WorkflowMetadata>
+  ) => string
   duplicateWorkflow: (sourceId: string) => string | null
   getWorkflowDeploymentStatus: (workflowId: string | null) => DeploymentStatus | null
   setDeploymentStatus: (
diff --git a/apps/sim/stores/workflows/subblock/store.ts b/apps/sim/stores/workflows/subblock/store.ts
index 0fdf11f02f6..bd1f64d25ca 100644
--- a/apps/sim/stores/workflows/subblock/store.ts
+++ b/apps/sim/stores/workflows/subblock/store.ts
@@ -1,9 +1,8 @@
 import { create } from 'zustand'
-import { devtools, persist } from 'zustand/middleware'
+import { devtools } from 'zustand/middleware'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useEnvironmentStore } from '../../settings/environment/store'
 import { useGeneralStore } from '../../settings/general/store'
-import { loadSubblockValues, saveSubblockValues } from '../persistence'
 import { useWorkflowRegistry } from '../registry/store'
 import { workflowSync } from '../sync'
 import type { SubBlockStore } from './types'
@@ -26,307 +25,259 @@ const DEBOUNCE_DELAY = 500 // 500ms delay for sync
  */
 
 export const useSubBlockStore = create<SubBlockStore>()(
-  devtools(
-    persist(
-      (set, get) => ({
-        workflowValues: {},
-        // Initialize tool params-related state
-        toolParams: {},
-        clearedParams: {},
-
-        setValue: (blockId: string, subBlockId: string, value: any) => {
-          const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-          if (!activeWorkflowId) return
-
-          set((state) => ({
-            workflowValues: {
-              ...state.workflowValues,
-              [activeWorkflowId]: {
-                ...state.workflowValues[activeWorkflowId],
-                [blockId]: {
-                  ...state.workflowValues[activeWorkflowId]?.[blockId],
-                  [subBlockId]: value,
-                },
-              },
+  devtools((set, get) => ({
+    workflowValues: {},
+    // Initialize tool params-related state
+    toolParams: {},
+    clearedParams: {},
+
+    setValue: (blockId: string, subBlockId: string, value: any) => {
+      const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+      if (!activeWorkflowId) return
+
+      set((state) => ({
+        workflowValues: {
+          ...state.workflowValues,
+          [activeWorkflowId]: {
+            ...state.workflowValues[activeWorkflowId],
+            [blockId]: {
+              ...state.workflowValues[activeWorkflowId]?.[blockId],
+              [subBlockId]: value,
             },
-          }))
-
-          // Persist to localStorage for backup
-          const currentValues = get().workflowValues[activeWorkflowId] || {}
-          saveSubblockValues(activeWorkflowId, currentValues)
-
-          // Trigger debounced sync to DB
-          get().syncWithDB()
+          },
         },
+      }))
 
-        getValue: (blockId: string, subBlockId: string) => {
-          const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-          if (!activeWorkflowId) return null
-
-          return get().workflowValues[activeWorkflowId]?.[blockId]?.[subBlockId] ?? null
-        },
+      // Trigger debounced sync to DB
+      get().syncWithDB()
+    },
 
-        clear: () => {
-          const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-          if (!activeWorkflowId) return
+    getValue: (blockId: string, subBlockId: string) => {
+      const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+      if (!activeWorkflowId) return null
 
-          set((state) => ({
-            workflowValues: {
-              ...state.workflowValues,
-              [activeWorkflowId]: {},
-            },
-          }))
+      return get().workflowValues[activeWorkflowId]?.[blockId]?.[subBlockId] ?? null
+    },
 
-          saveSubblockValues(activeWorkflowId, {})
+    clear: () => {
+      const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
+      if (!activeWorkflowId) return
 
-          // Trigger sync to DB immediately on clear
-          workflowSync.sync()
+      set((state) => ({
+        workflowValues: {
+          ...state.workflowValues,
+          [activeWorkflowId]: {},
         },
-
-        initializeFromWorkflow: (workflowId: string, blocks: Record<string, any>) => {
-          // First, try to load from localStorage
-          const savedValues = loadSubblockValues(workflowId)
-
-          if (savedValues) {
-            set((state) => ({
-              workflowValues: {
-                ...state.workflowValues,
-                [workflowId]: savedValues,
-              },
-            }))
-            return
-          }
-
-          // If no saved values, initialize from blocks
-          const values: Record<string, Record<string, any>> = {}
-          Object.entries(blocks).forEach(([blockId, block]) => {
-            values[blockId] = {}
-            Object.entries(block.subBlocks).forEach(([subBlockId, subBlock]) => {
-              values[blockId][subBlockId] = (subBlock as SubBlockConfig).value
-            })
-          })
-
-          set((state) => ({
-            workflowValues: {
-              ...state.workflowValues,
-              [workflowId]: values,
-            },
-          }))
-
-          // Save to localStorage
-          saveSubblockValues(workflowId, values)
+      }))
+
+      // Trigger sync to DB immediately on clear
+      workflowSync.sync()
+    },
+
+    initializeFromWorkflow: (workflowId: string, blocks: Record<string, any>) => {
+      // Initialize from blocks
+      const values: Record<string, Record<string, any>> = {}
+      Object.entries(blocks).forEach(([blockId, block]) => {
+        values[blockId] = {}
+        Object.entries(block.subBlocks).forEach(([subBlockId, subBlock]) => {
+          values[blockId][subBlockId] = (subBlock as SubBlockConfig).value
+        })
+      })
+
+      set((state) => ({
+        workflowValues: {
+          ...state.workflowValues,
+          [workflowId]: values,
         },
+      }))
+    },
+
+    // Debounced sync function to trigger DB sync
+    syncWithDB: () => {
+      // Clear any existing timeout
+      if (syncDebounceTimer) {
+        clearTimeout(syncDebounceTimer)
+      }
 
-        // Debounced sync function to trigger DB sync
-        syncWithDB: () => {
-          // Clear any existing timeout
-          if (syncDebounceTimer) {
-            clearTimeout(syncDebounceTimer)
+      // Set new timeout
+      syncDebounceTimer = setTimeout(() => {
+        // Trigger workflow sync to DB
+        workflowSync.sync()
+      }, DEBOUNCE_DELAY)
+    },
+
+    // Tool params related functionality
+    setToolParam: (toolId: string, paramId: string, value: string) => {
+      // If setting a non-empty value, we should remove it from clearedParams if it exists
+      if (value.trim() !== '') {
+        set((state) => {
+          const newClearedParams = { ...state.clearedParams }
+          if (newClearedParams[toolId]?.[paramId]) {
+            delete newClearedParams[toolId][paramId]
+            // Clean up empty objects
+            if (Object.keys(newClearedParams[toolId]).length === 0) {
+              delete newClearedParams[toolId]
+            }
           }
 
-          // Set new timeout
-          syncDebounceTimer = setTimeout(() => {
-            // Trigger workflow sync to DB
-            workflowSync.sync()
-          }, DEBOUNCE_DELAY)
+          return { clearedParams: newClearedParams }
+        })
+      }
+
+      // Set the parameter value
+      set((state) => ({
+        toolParams: {
+          ...state.toolParams,
+          [toolId]: {
+            ...(state.toolParams[toolId] || {}),
+            [paramId]: value,
+          },
         },
+      }))
 
-        // Tool params related functionality
-        setToolParam: (toolId: string, paramId: string, value: string) => {
-          // If setting a non-empty value, we should remove it from clearedParams if it exists
-          if (value.trim() !== '') {
-            set((state) => {
-              const newClearedParams = { ...state.clearedParams }
-              if (newClearedParams[toolId]?.[paramId]) {
-                delete newClearedParams[toolId][paramId]
-                // Clean up empty objects
-                if (Object.keys(newClearedParams[toolId]).length === 0) {
-                  delete newClearedParams[toolId]
-                }
-              }
-
-              return { clearedParams: newClearedParams }
-            })
-          }
+      // For API keys, also store under a normalized tool name for cross-referencing
+      // This allows both blocks and tools to share the same parameters
+      if (paramId.toLowerCase() === 'apikey' || paramId.toLowerCase() === 'api_key') {
+        // Extract the tool name part (e.g., "exa" from "exa-search")
+        const baseTool = toolId.split('-')[0].toLowerCase()
 
-          // Set the parameter value
+        if (baseTool !== toolId) {
+          // Set the same value for the base tool to enable cross-referencing
           set((state) => ({
             toolParams: {
               ...state.toolParams,
-              [toolId]: {
-                ...(state.toolParams[toolId] || {}),
+              [baseTool]: {
+                ...(state.toolParams[baseTool] || {}),
                 [paramId]: value,
               },
             },
           }))
-
-          // For API keys, also store under a normalized tool name for cross-referencing
-          // This allows both blocks and tools to share the same parameters
-          if (paramId.toLowerCase() === 'apikey' || paramId.toLowerCase() === 'api_key') {
-            // Extract the tool name part (e.g., "exa" from "exa-search")
-            const baseTool = toolId.split('-')[0].toLowerCase()
-
-            if (baseTool !== toolId) {
-              // Set the same value for the base tool to enable cross-referencing
-              set((state) => ({
-                toolParams: {
-                  ...state.toolParams,
-                  [baseTool]: {
-                    ...(state.toolParams[baseTool] || {}),
-                    [paramId]: value,
-                  },
-                },
-              }))
-            }
-          }
-        },
-
-        markParamAsCleared: (instanceId: string, paramId: string) => {
-          // Mark this specific instance as cleared
-          set((state) => ({
-            clearedParams: {
-              ...state.clearedParams,
-              [instanceId]: {
-                ...(state.clearedParams[instanceId] || {}),
-                [paramId]: true,
-              },
-            },
-          }))
-        },
-
-        unmarkParamAsCleared: (instanceId: string, paramId: string) => {
-          // Remove the cleared flag for this parameter
-          set((state) => {
-            const newClearedParams = { ...state.clearedParams }
-            if (newClearedParams[instanceId]?.[paramId]) {
-              delete newClearedParams[instanceId][paramId]
-              // Clean up empty objects
-              if (Object.keys(newClearedParams[instanceId]).length === 0) {
-                delete newClearedParams[instanceId]
-              }
-            }
-            return { clearedParams: newClearedParams }
-          })
-        },
-
-        isParamCleared: (instanceId: string, paramId: string) => {
-          // Only check this specific instance
-          return !!get().clearedParams[instanceId]?.[paramId]
+        }
+      }
+    },
+
+    markParamAsCleared: (instanceId: string, paramId: string) => {
+      // Mark this specific instance as cleared
+      set((state) => ({
+        clearedParams: {
+          ...state.clearedParams,
+          [instanceId]: {
+            ...(state.clearedParams[instanceId] || {}),
+            [paramId]: true,
+          },
         },
-
-        getToolParam: (toolId: string, paramId: string) => {
-          // Check for direct match first
-          const directValue = get().toolParams[toolId]?.[paramId]
-          if (directValue) return directValue
-
-          // Try base tool name if it's a compound tool ID
-          if (toolId.includes('-')) {
-            const baseTool = toolId.split('-')[0].toLowerCase()
-            return get().toolParams[baseTool]?.[paramId]
+      }))
+    },
+
+    unmarkParamAsCleared: (instanceId: string, paramId: string) => {
+      // Remove the cleared flag for this parameter
+      set((state) => {
+        const newClearedParams = { ...state.clearedParams }
+        if (newClearedParams[instanceId]?.[paramId]) {
+          delete newClearedParams[instanceId][paramId]
+          // Clean up empty objects
+          if (Object.keys(newClearedParams[instanceId]).length === 0) {
+            delete newClearedParams[instanceId]
           }
+        }
+        return { clearedParams: newClearedParams }
+      })
+    },
+
+    isParamCleared: (instanceId: string, paramId: string) => {
+      // Only check this specific instance
+      return !!get().clearedParams[instanceId]?.[paramId]
+    },
+
+    getToolParam: (toolId: string, paramId: string) => {
+      // Check for direct match first
+      const directValue = get().toolParams[toolId]?.[paramId]
+      if (directValue) return directValue
+
+      // Try base tool name if it's a compound tool ID
+      if (toolId.includes('-')) {
+        const baseTool = toolId.split('-')[0].toLowerCase()
+        return get().toolParams[baseTool]?.[paramId]
+      }
 
-          // Try matching against any stored tool that starts with this ID
-          // This helps match "exa" with "exa-search" etc.
-          const matchingToolIds = Object.keys(get().toolParams).filter(
-            (id) => id.startsWith(toolId) || id.split('-')[0] === toolId
-          )
+      // Try matching against any stored tool that starts with this ID
+      // This helps match "exa" with "exa-search" etc.
+      const matchingToolIds = Object.keys(get().toolParams).filter(
+        (id) => id.startsWith(toolId) || id.split('-')[0] === toolId
+      )
 
-          for (const id of matchingToolIds) {
-            const value = get().toolParams[id]?.[paramId]
-            if (value) return value
-          }
-
-          return undefined
-        },
+      for (const id of matchingToolIds) {
+        const value = get().toolParams[id]?.[paramId]
+        if (value) return value
+      }
 
-        getToolParams: (toolId: string) => {
-          return get().toolParams[toolId] || {}
-        },
+      return undefined
+    },
 
-        isEnvVarReference,
+    getToolParams: (toolId: string) => {
+      return get().toolParams[toolId] || {}
+    },
 
-        resolveToolParamValue: (toolId: string, paramId: string, instanceId?: string) => {
-          // If this is a specific instance that has been deliberately cleared, don't auto-fill it
-          if (instanceId && get().isParamCleared(instanceId, paramId)) {
-            return undefined
-          }
+    isEnvVarReference,
 
-          // Check if auto-fill environment variables is enabled
-          const isAutoFillEnvVarsEnabled = useGeneralStore.getState().isAutoFillEnvVarsEnabled
-          if (!isAutoFillEnvVarsEnabled) {
-            // When auto-fill is disabled, we still return existing stored values, but don't
-            // attempt to resolve environment variables or set new values
-            return get().toolParams[toolId]?.[paramId]
-          }
+    resolveToolParamValue: (toolId: string, paramId: string, instanceId?: string) => {
+      // If this is a specific instance that has been deliberately cleared, don't auto-fill it
+      if (instanceId && get().isParamCleared(instanceId, paramId)) {
+        return undefined
+      }
 
-          const envStore = useEnvironmentStore.getState()
+      // Check if auto-fill environment variables is enabled
+      const isAutoFillEnvVarsEnabled = useGeneralStore.getState().isAutoFillEnvVarsEnabled
+      if (!isAutoFillEnvVarsEnabled) {
+        // When auto-fill is disabled, we still return existing stored values, but don't
+        // attempt to resolve environment variables or set new values
+        return get().toolParams[toolId]?.[paramId]
+      }
 
-          // First check params store for previously entered value
-          const storedValue = get().getToolParam(toolId, paramId)
+      const envStore = useEnvironmentStore.getState()
 
-          if (storedValue) {
-            // If the stored value is an environment variable reference like {{EXA_API_KEY}}
-            if (isEnvVarReference(storedValue)) {
-              // Extract variable name from {{VAR_NAME}}
-              const envVarName = extractEnvVarName(storedValue)
-              if (!envVarName) return undefined
+      // First check params store for previously entered value
+      const storedValue = get().getToolParam(toolId, paramId)
 
-              // Check if this environment variable still exists
-              const envValue = envStore.getVariable(envVarName)
+      if (storedValue) {
+        // If the stored value is an environment variable reference like {{EXA_API_KEY}}
+        if (isEnvVarReference(storedValue)) {
+          // Extract variable name from {{VAR_NAME}}
+          const envVarName = extractEnvVarName(storedValue)
+          if (!envVarName) return undefined
 
-              if (envValue) {
-                // Environment variable exists, return the reference
-                return storedValue
-              }
-              // Environment variable no longer exists
-              return undefined
-            }
+          // Check if this environment variable still exists
+          const envValue = envStore.getVariable(envVarName)
 
-            // Return the stored value directly if it's not an env var reference
+          if (envValue) {
+            // Environment variable exists, return the reference
             return storedValue
           }
-
-          // If no stored value, try to guess based on parameter name
-          // This handles cases where the user hasn't entered a value yet
-          if (paramId.toLowerCase() === 'apikey' || paramId.toLowerCase() === 'api_key') {
-            const matchingVar = findMatchingEnvVar(toolId)
-            if (matchingVar) {
-              const envReference = `{{${matchingVar}}}`
-              get().setToolParam(toolId, paramId, envReference)
-              return envReference
-            }
-          }
-
-          // No value found
+          // Environment variable no longer exists
           return undefined
-        },
+        }
 
-        clearToolParams: () => {
-          set({ toolParams: {}, clearedParams: {} })
-        },
-      }),
-      {
-        name: 'subblock-store',
-        partialize: (state) => ({
-          workflowValues: state.workflowValues,
-          toolParams: state.toolParams,
-          clearedParams: state.clearedParams,
-        }),
-        // Use default storage
-        storage: {
-          getItem: (name) => {
-            const value = localStorage.getItem(name)
-            return value ? JSON.parse(value) : null
-          },
-          setItem: (name, value) => {
-            localStorage.setItem(name, JSON.stringify(value))
-          },
-          removeItem: (name) => {
-            localStorage.removeItem(name)
-          },
-        },
+        // Return the stored value directly if it's not an env var reference
+        return storedValue
       }
-    ),
-    { name: 'subblock-store' }
-  )
+
+      // If no stored value, try to guess based on parameter name
+      // This handles cases where the user hasn't entered a value yet
+      if (paramId.toLowerCase() === 'apikey' || paramId.toLowerCase() === 'api_key') {
+        const matchingVar = findMatchingEnvVar(toolId)
+        if (matchingVar) {
+          const envReference = `{{${matchingVar}}}`
+          get().setToolParam(toolId, paramId, envReference)
+          return envReference
+        }
+      }
+
+      // No value found
+      return undefined
+    },
+
+    clearToolParams: () => {
+      set({ toolParams: {}, clearedParams: {} })
+    },
+  }))
 )
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index 9eea7f8b58f..eb891996a6d 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -7,7 +7,6 @@ import { getAllWorkflowsWithValues } from '.'
 import { useWorkflowRegistry } from './registry/store'
 import type { WorkflowMetadata } from './registry/types'
 import { useSubBlockStore } from './subblock/store'
-import { useWorkflowStore } from './workflow/store'
 import type { BlockState } from './workflow/types'
 
 const logger = createLogger('WorkflowsSync')
@@ -305,10 +304,8 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
         })
       })
 
-      // 4. Store the workflow state and subblock values in localStorage
-      // This ensures compatibility with existing code that loads from localStorage
-      localStorage.setItem(`workflow-${id}`, JSON.stringify(workflowState))
-      localStorage.setItem(`subblock-values-${id}`, JSON.stringify(subblockValues))
+      // 4. Only store metadata in registry - no workflow state caching
+      // Workflow states will be fetched individually when needed
 
       // 5. Update subblock store for this workflow
       useSubBlockStore.setState((state) => ({
@@ -329,19 +326,16 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
     // Capture initial state for change detection
     lastWorkflowState = getAllWorkflowsWithValues()
 
-    // 9. Set the first workflow as active if there's no active workflow
+    // 9. Don't automatically load first workflow - it will be loaded when setActiveWorkflow is called
+    // This maintains the clean "metadata in registry, active workflow in store" separation
     const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
     if (!activeWorkflowId && Object.keys(registryWorkflows).length > 0) {
       const firstWorkflowId = Object.keys(registryWorkflows)[0]
-
-      // Load the first workflow as active
-      const workflowState = JSON.parse(localStorage.getItem(`workflow-${firstWorkflowId}`) || '{}')
-
-      if (Object.keys(workflowState).length > 0) {
-        useWorkflowStore.setState(workflowState)
-        useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
-        logger.info(`Set first workflow ${firstWorkflowId} as active`)
-      }
+      // Just set the active workflow ID - the actual state will be fetched when needed
+      useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
+      logger.info(
+        `Set first workflow ${firstWorkflowId} as active (state will be loaded on demand)`
+      )
     }
 
     // Mark registry as fully initialized now that all data is loaded
@@ -515,3 +509,30 @@ export const workflowSync = {
     }, DEBOUNCE_DELAY)
   },
 }
+
+/**
+ * Fetch a single workflow state from the database
+ * @param workflowId The ID of the workflow to fetch
+ * @returns Promise that resolves to the workflow state if found, null otherwise
+ */
+export async function fetchWorkflowStateFromDB(workflowId: string): Promise<any | null> {
+  try {
+    const response = await fetch(`/api/workflows/${workflowId}`, {
+      method: 'GET',
+    })
+
+    if (!response.ok) {
+      if (response.status === 404) {
+        logger.warn(`Workflow ${workflowId} not found in database`)
+        return null
+      }
+      throw new Error(`Failed to fetch workflow: ${response.statusText}`)
+    }
+
+    const { data } = await response.json()
+    return data
+  } catch (error) {
+    logger.error(`Error fetching workflow ${workflowId} from DB:`, error)
+    return null
+  }
+}
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index eba99288519..35f090eb384 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -4,7 +4,6 @@ import { devtools } from 'zustand/middleware'
 import { getBlock } from '@/blocks'
 import { resolveOutputType } from '@/blocks/utils'
 import { pushHistory, type WorkflowStoreWithHistory, withHistory } from '../middleware'
-import { saveWorkflowState } from '../persistence'
 import { useWorkflowRegistry } from '../registry/store'
 import { useSubBlockStore } from '../subblock/store'
 import { markWorkflowsDirty, workflowSync } from '../sync'
@@ -469,30 +468,10 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
       updateLastSaved: () => {
         set({ lastSaved: Date.now() })
 
-        // Save current state to localStorage
-        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-        if (activeWorkflowId) {
-          const currentState = get()
-          const generatedLoops = currentState.generateLoopBlocks()
-          const generatedParallels = currentState.generateParallelBlocks()
-          saveWorkflowState(activeWorkflowId, {
-            blocks: currentState.blocks,
-            edges: currentState.edges,
-            loops: generatedLoops,
-            parallels: generatedParallels,
-            history: currentState.history,
-            // Include both legacy and new deployment status fields
-            isDeployed: currentState.isDeployed,
-            deployedAt: currentState.deployedAt,
-            deploymentStatuses: currentState.deploymentStatuses,
-            lastSaved: Date.now(),
-          })
-
-          // Note: Scheduling changes are automatically handled by the workflowSync
-          // When the workflow is synced to the database, the sync system checks if
-          // the starter block has scheduling enabled and updates or cancels the
-          // schedule accordingly.
-        }
+        // Note: Scheduling changes are automatically handled by the workflowSync
+        // When the workflow is synced to the database, the sync system checks if
+        // the starter block has scheduling enabled and updates or cancels the
+        // schedule accordingly.
       },
 
       toggleBlockEnabled: (id: string) => {

From 52367848cb5a89c56d4ccc58428d8f28193fb5cc Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Sat, 14 Jun 2025 17:57:34 -0700
Subject: [PATCH 02/27] remove migration for last active workspace id

---
 apps/sim/app/api/user/workspace/route.ts      | 138 ------------------
 apps/sim/app/api/workflows/[id]/route.ts      |   4 +-
 .../workspace-header/workspace-header.tsx     |   6 +-
 apps/sim/db/migrations/0043_fair_roulette.sql |   2 -
 apps/sim/db/schema.ts                         |   5 -
 apps/sim/stores/workflows/registry/store.ts   |  63 ++++----
 apps/sim/stores/workflows/registry/types.ts   |   3 +-
 apps/sim/stores/workflows/sync.ts             |   2 +-
 8 files changed, 37 insertions(+), 186 deletions(-)
 delete mode 100644 apps/sim/app/api/user/workspace/route.ts
 delete mode 100644 apps/sim/db/migrations/0043_fair_roulette.sql

diff --git a/apps/sim/app/api/user/workspace/route.ts b/apps/sim/app/api/user/workspace/route.ts
deleted file mode 100644
index cf5b53d69b0..00000000000
--- a/apps/sim/app/api/user/workspace/route.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { and, eq } from 'drizzle-orm'
-import { NextResponse } from 'next/server'
-import { z } from 'zod'
-import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
-import { db } from '@/db'
-import { settings, workspaceMember } from '@/db/schema'
-
-const logger = createLogger('WorkspaceAPI')
-
-const WorkspaceRequestSchema = z.object({
-  workspaceId: z.string(),
-})
-
-/**
- * GET /api/user/workspace
- * Retrieve user's last active workspace
- */
-export async function GET() {
-  const requestId = crypto.randomUUID().slice(0, 8)
-
-  try {
-    const session = await getSession()
-
-    if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthenticated workspace request rejected`)
-      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
-    }
-
-    const userId = session.user.id
-
-    // Get user's last active workspace from settings
-    const userSettings = await db
-      .select({ lastActiveWorkspaceId: settings.lastActiveWorkspaceId })
-      .from(settings)
-      .where(eq(settings.userId, userId))
-      .limit(1)
-
-    if (!userSettings.length || !userSettings[0].lastActiveWorkspaceId) {
-      // No workspace preference stored
-      return NextResponse.json({ workspaceId: null }, { status: 200 })
-    }
-
-    const workspaceId = userSettings[0].lastActiveWorkspaceId
-
-    // Verify user still has access to this workspace
-    const hasAccess = await db
-      .select({ workspaceId: workspaceMember.workspaceId })
-      .from(workspaceMember)
-      .where(and(eq(workspaceMember.userId, userId), eq(workspaceMember.workspaceId, workspaceId)))
-      .limit(1)
-
-    if (!hasAccess.length) {
-      // User no longer has access to this workspace, clear the preference
-      await db
-        .update(settings)
-        .set({ lastActiveWorkspaceId: null })
-        .where(eq(settings.userId, userId))
-
-      return NextResponse.json({ workspaceId: null }, { status: 200 })
-    }
-
-    return NextResponse.json({ workspaceId }, { status: 200 })
-  } catch (error) {
-    logger.error(`[${requestId}] Error retrieving workspace preference`, error)
-    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
-  }
-}
-
-/**
- * POST /api/user/workspace
- * Store user's active workspace preference
- */
-export async function POST(request: Request) {
-  const requestId = crypto.randomUUID().slice(0, 8)
-
-  try {
-    const session = await getSession()
-
-    if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthenticated workspace update rejected`)
-      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
-    }
-
-    const userId = session.user.id
-    const body = await request.json()
-
-    // Validate request body
-    const validationResult = WorkspaceRequestSchema.safeParse(body)
-    if (!validationResult.success) {
-      logger.warn(`[${requestId}] Invalid workspace request data`, {
-        errors: validationResult.error.errors,
-      })
-      return NextResponse.json(
-        { error: 'Invalid request data', details: validationResult.error.errors },
-        { status: 400 }
-      )
-    }
-
-    const { workspaceId } = validationResult.data
-
-    // Verify workspace exists and user has access
-    const hasAccess = await db
-      .select({ workspaceId: workspaceMember.workspaceId })
-      .from(workspaceMember)
-      .where(and(eq(workspaceMember.userId, userId), eq(workspaceMember.workspaceId, workspaceId)))
-      .limit(1)
-
-    if (!hasAccess.length) {
-      logger.warn(
-        `[${requestId}] User ${userId} attempted to set workspace ${workspaceId} without access`
-      )
-      return NextResponse.json({ error: 'Access denied to workspace' }, { status: 403 })
-    }
-
-    // Update or create user settings with workspace preference
-    await db
-      .insert(settings)
-      .values({
-        id: userId, // Use user ID as settings ID
-        userId,
-        lastActiveWorkspaceId: workspaceId,
-        updatedAt: new Date(),
-      })
-      .onConflictDoUpdate({
-        target: [settings.userId],
-        set: {
-          lastActiveWorkspaceId: workspaceId,
-          updatedAt: new Date(),
-        },
-      })
-
-    return NextResponse.json({ success: true }, { status: 200 })
-  } catch (error) {
-    logger.error(`[${requestId}] Error updating workspace preference`, error)
-    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
-  }
-}
diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index 34dc9aed639..e2fd855b0b9 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -11,10 +11,10 @@ const logger = createLogger('WorkflowByIdAPI')
  * GET /api/workflows/[id]
  * Fetch a single workflow by ID
  */
-export async function GET(request: NextRequest, { params }: { params: { id: string } }) {
+export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
   const requestId = crypto.randomUUID().slice(0, 8)
   const startTime = Date.now()
-  const workflowId = params.id
+  const { id: workflowId } = await params
 
   try {
     // Get the session
diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 69118cae7fb..29b4e8107a4 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -241,7 +241,7 @@ export function WorkspaceHeader({
   const router = useRouter()
 
   // Get workflowRegistry state and actions
-  const { activeWorkspaceId, setActiveWorkspace: setActiveWorkspaceId } = useWorkflowRegistry()
+  const { activeWorkspaceId, switchToWorkspace, setActiveWorkspaceId } = useWorkflowRegistry()
 
   const userName = sessionData?.user?.name || sessionData?.user?.email || 'User'
 
@@ -316,8 +316,8 @@ export function WorkspaceHeader({
     setActiveWorkspace(workspace)
     setIsOpen(false)
 
-    // Update the workflow registry store with the new active workspace
-    setActiveWorkspaceId(workspace.id)
+    // Use full workspace switch to clear workflows and load new ones
+    switchToWorkspace(workspace.id)
 
     // Update URL to include workspace ID
     router.push(`/w/${workspace.id}`)
diff --git a/apps/sim/db/migrations/0043_fair_roulette.sql b/apps/sim/db/migrations/0043_fair_roulette.sql
deleted file mode 100644
index 8513b0445fd..00000000000
--- a/apps/sim/db/migrations/0043_fair_roulette.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "settings" ADD COLUMN "last_active_workspace_id" text;--> statement-breakpoint
-ALTER TABLE "settings" ADD CONSTRAINT "settings_last_active_workspace_id_workspace_id_fk" FOREIGN KEY ("last_active_workspace_id") REFERENCES "public"."workspace"("id") ON DELETE set null ON UPDATE no action;
\ No newline at end of file
diff --git a/apps/sim/db/schema.ts b/apps/sim/db/schema.ts
index 57a9199a8fd..c0094992c6b 100644
--- a/apps/sim/db/schema.ts
+++ b/apps/sim/db/schema.ts
@@ -176,11 +176,6 @@ export const settings = pgTable('settings', {
   autoConnect: boolean('auto_connect').notNull().default(true),
   autoFillEnvVars: boolean('auto_fill_env_vars').notNull().default(true),
 
-  // Workspace preference
-  lastActiveWorkspaceId: text('last_active_workspace_id').references(() => workspace.id, {
-    onDelete: 'set null',
-  }),
-
   // Privacy settings
   telemetryEnabled: boolean('telemetry_enabled').notNull().default(true),
   telemetryNotifiedUser: boolean('telemetry_notified_user').notNull().default(false),
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 4a0dff04ff6..63db2e68a2f 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -153,25 +153,16 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           })
       },
 
-      // Set active workspace and update UI + persist to server
-      setActiveWorkspace: async (id: string) => {
-        const currentWorkspaceId = get().activeWorkspaceId
+      // Switch to workspace with comprehensive error handling and loading states
+      switchToWorkspace: (id: string) => {
+        const { activeWorkspaceId } = get()
 
-        // Only perform the switch if the workspace is different
-        if (id === currentWorkspaceId) {
-          return
-        }
-
-        // Prevent multiple workspace transitions at once
-        if (isWorkspaceTransitioning) {
-          logger.warn('Workspace already transitioning, ignoring new request')
-          return
-        }
+        if (activeWorkspaceId === id) return
 
         // Set transition state
         setWorkspaceTransitioning(true)
 
-        logger.info(`Switching workspace from ${currentWorkspaceId} to ${id}`)
+        logger.info(`Switching workspace from ${activeWorkspaceId} to ${id}`)
 
         // Reset all workflow state
         resetWorkflowStores()
@@ -179,16 +170,12 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         // Reset registry initialization state
         resetRegistryInitialization()
 
-        // No longer saving workspace to localStorage
-
-        // Persist workspace selection to server (fire and forget)
-        fetch('/api/user/workspace', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ workspaceId: id }),
-        }).catch((error) => {
-          logger.warn('Failed to persist workspace selection to server:', error)
-        })
+        // Save workspace to localStorage
+        try {
+          localStorage.setItem('lastActiveWorkspaceId', id)
+        } catch (error) {
+          logger.warn('Failed to save workspace to localStorage:', error)
+        }
 
         // Set loading state while we fetch workflows
         set({
@@ -218,24 +205,32 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           })
       },
 
-      // Load user's last active workspace from server
+      // Load user's last active workspace from localStorage
       loadLastActiveWorkspace: async () => {
         try {
-          const response = await fetch('/api/user/workspace')
-          if (response.ok) {
-            const data = await response.json()
-            if (data.workspaceId && data.workspaceId !== get().activeWorkspaceId) {
-              // Set the workspace without triggering a full switch (since we're initializing)
-              set({ activeWorkspaceId: data.workspaceId })
-              logger.info(`Restored last active workspace: ${data.workspaceId}`)
-            }
+          const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
+          if (savedWorkspaceId && savedWorkspaceId !== get().activeWorkspaceId) {
+            // Set the workspace without triggering a full switch (since we're initializing)
+            set({ activeWorkspaceId: savedWorkspaceId })
+            logger.info(`Restored last active workspace from localStorage: ${savedWorkspaceId}`)
           }
         } catch (error) {
-          logger.warn('Failed to load last active workspace from server:', error)
+          logger.warn('Failed to load last active workspace from localStorage:', error)
           // This is non-critical, so we continue with default behavior
         }
       },
 
+      // Simple method to set active workspace ID without triggering full switch
+      setActiveWorkspaceId: (id: string) => {
+        set({ activeWorkspaceId: id })
+        // Save to localStorage as well
+        try {
+          localStorage.setItem('lastActiveWorkspaceId', id)
+        } catch (error) {
+          logger.warn('Failed to save workspace to localStorage:', error)
+        }
+      },
+
       // Method to get deployment status for a specific workflow
       getWorkflowDeploymentStatus: (workflowId: string | null): DeploymentStatus | null => {
         if (!workflowId) {
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index dcdb51e11e7..849bc38a816 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -33,7 +33,8 @@ export interface WorkflowRegistryState {
 export interface WorkflowRegistryActions {
   setLoading: (loading: boolean) => void
   setActiveWorkflow: (id: string) => Promise<void>
-  setActiveWorkspace: (id: string) => void
+  switchToWorkspace: (id: string) => void
+  setActiveWorkspaceId: (id: string) => void
   loadLastActiveWorkspace: () => Promise<void>
   handleWorkspaceDeletion: (newWorkspaceId: string) => void
   removeWorkflow: (id: string) => void
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index eb891996a6d..ee0f2ab6fc7 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -193,7 +193,7 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
               // Switch to the first available workspace
               const firstWorkspace = workspaces[0]
               logger.info(`Switching to available workspace: ${firstWorkspace.id}`)
-              useWorkflowRegistry.getState().setActiveWorkspace(firstWorkspace.id)
+              useWorkflowRegistry.getState().switchToWorkspace(firstWorkspace.id)
               return
             }
           }

From 45c19f5a0b9ace1d14a37bccd18c444138010d0e Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Date: Sat, 14 Jun 2025 18:03:45 -0700
Subject: [PATCH 03/27] Update
 apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx

Add fallback for required scopes

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
---
 .../components/file-selector/components/jira-issue-selector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
index 5bc4775da39..4077a666130 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
@@ -438,7 +438,7 @@ export function JiraIssueSelector({
 
       // Navigate to OAuth URL
       const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
+        (requiredScopes || []).join(',')
       )}&return_url=${encodeURIComponent(window.location.href)}`
 
       window.location.href = authUrl

From 29cab6065f8b1cf01edbe0018387187575b0a967 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Sat, 14 Jun 2025 18:11:14 -0700
Subject: [PATCH 04/27] add url builder util

---
 .../components/oauth-required-modal.tsx       | 45 +++++++++-----
 .../credential-selector.tsx                   | 12 ++--
 .../components/confluence-file-selector.tsx   | 16 +++--
 .../components/google-drive-picker.tsx        | 12 ++--
 .../components/jira-issue-selector.tsx        | 12 ++--
 .../components/microsoft-file-selector.tsx    | 12 ++--
 .../components/teams-message-selector.tsx     | 29 ++++++---
 .../folder-selector/folder-selector.tsx       | 16 +++--
 .../components/jira-project-selector.tsx      | 12 ++--
 apps/sim/lib/urls/utils.ts                    | 61 +++++++++++++++++++
 10 files changed, 169 insertions(+), 58 deletions(-)

diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
index a8361515d8a..eb2bca96f4f 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -18,6 +18,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 
 const logger = createLogger('OAuthRequiredModal')
 
@@ -173,18 +174,24 @@ export function OAuthRequiredModal({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: effectiveProviderId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
       logger.error('Failed to store OAuth state:', error)
-      // Fallback: redirect without state
-      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Fallback: redirect without state using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: effectiveProviderId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     }
@@ -210,18 +217,24 @@ export function OAuthRequiredModal({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: effectiveProviderId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
       logger.error('Failed to store OAuth state:', error)
-      // Fallback: redirect without state
-      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Fallback: redirect without state using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: effectiveProviderId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     }
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
index 52192cde81d..6754efa716f 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
@@ -21,6 +21,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from './components/oauth-required-modal'
 
 const logger = createLogger('CredentialSelector')
@@ -178,10 +179,13 @@ export function CredentialSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${effectiveProviderId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: effectiveProviderId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
index e78ff490863..2356427844d 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
@@ -19,6 +19,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 export interface ConfluenceFileInfo {
@@ -353,7 +354,7 @@ export function ConfluenceFileSelector({
   }
 
   // Handle adding a new credential
-  const handleConnectAccount = () => {
+  const handleAddCredential = () => {
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
@@ -371,10 +372,13 @@ export function ConfluenceFileSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
@@ -521,7 +525,7 @@ export function ConfluenceFileSelector({
                 {/* Connect account option - only show if no credentials */}
                 {credentials.length === 0 && (
                   <CommandGroup>
-                    <CommandItem onSelect={handleConnectAccount}>
+                    <CommandItem onSelect={handleAddCredential}>
                       <div className='flex items-center gap-2 text-primary'>
                         <ConfluenceIcon className='h-4 w-4' />
                         <span>Connect Confluence account</span>
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
index 73c1fb91a74..066139847e0 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
@@ -24,6 +24,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('GoogleDrivePicker')
@@ -302,10 +303,13 @@ export function GoogleDrivePicker({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
index 5bc4775da39..89bf9216ab2 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
@@ -20,6 +20,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_issue_selector')
@@ -436,10 +437,13 @@ export function JiraIssueSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
index 38a09e95863..e2898e9592a 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
@@ -23,6 +23,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('MicrosoftFileSelector')
@@ -267,10 +268,13 @@ export function MicrosoftFileSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
index 267f6d543b0..effcc95ddde 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
@@ -20,6 +20,12 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
+import {
+  buildOAuthUrl,
+  buildTeamsChannelUrl,
+  buildTeamsChatUrl,
+  buildTeamsTeamUrl,
+} from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('TeamsMessageSelector')
@@ -166,7 +172,7 @@ export function TeamsMessageSelector({
         displayName: team.displayName,
         type: 'team' as const,
         teamId: team.id,
-        webViewLink: `https://teams.microsoft.com/l/team/${team.id}`,
+        webViewLink: buildTeamsTeamUrl(team.id),
       }))
 
       setTeams(teamsData)
@@ -228,7 +234,7 @@ export function TeamsMessageSelector({
           type: 'channel' as const,
           teamId,
           channelId: channel.id,
-          webViewLink: `https://teams.microsoft.com/l/channel/${teamId}/${encodeURIComponent(channel.displayName)}/${channel.id}`,
+          webViewLink: buildTeamsChannelUrl(teamId, channel.displayName, channel.id),
         }))
 
         setChannels(channelsData)
@@ -292,7 +298,7 @@ export function TeamsMessageSelector({
         displayName: chat.displayName,
         type: 'chat' as const,
         chatId: chat.id,
-        webViewLink: `https://teams.microsoft.com/l/chat/${chat.id}`,
+        webViewLink: buildTeamsChatUrl(chat.id),
       }))
 
       setChats(chatsData)
@@ -415,10 +421,13 @@ export function TeamsMessageSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
@@ -533,7 +542,7 @@ export function TeamsMessageSelector({
               displayName: team.displayName,
               type: 'team',
               teamId: team.id,
-              webViewLink: `https://teams.microsoft.com/l/team/${team.id}`,
+              webViewLink: buildTeamsTeamUrl(team.id),
             }
             setSelectedTeamId(team.id)
             setSelectedMessage(teamInfo)
@@ -571,7 +580,7 @@ export function TeamsMessageSelector({
               displayName: chat.displayName,
               type: 'chat',
               chatId: chat.id,
-              webViewLink: `https://teams.microsoft.com/l/chat/${chat.id}`,
+              webViewLink: buildTeamsChatUrl(chat.id),
             }
             setSelectedChatId(chat.id)
             setSelectedMessage(chatInfo)
@@ -633,7 +642,7 @@ export function TeamsMessageSelector({
                         type: 'channel' as const,
                         teamId: team.id,
                         channelId: channel.id,
-                        webViewLink: `https://teams.microsoft.com/l/channel/${team.id}/${encodeURIComponent(channel.displayName)}/${channel.id}`,
+                        webViewLink: buildTeamsChannelUrl(team.id, channel.displayName, channel.id),
                       },
                     }
                   }
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
index 92cebb4fb40..96baa45f5bd 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
@@ -15,6 +15,7 @@ import {
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { createLogger } from '@/lib/logs/console-logger'
 import { type Credential, getProviderIdFromServiceId, getServiceIdFromScopes } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '@/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('FolderSelector')
@@ -272,7 +273,7 @@ export function FolderSelector({
   }
 
   // Handle adding a new credential
-  const handleConnectAccount = () => {
+  const handleAddCredential = () => {
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
@@ -290,10 +291,13 @@ export function FolderSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
@@ -458,7 +462,7 @@ export function FolderSelector({
                 {/* Connect account option - only show if no credentials */}
                 {credentials.length === 0 && (
                   <CommandGroup>
-                    <CommandItem onSelect={handleConnectAccount}>
+                    <CommandItem onSelect={handleAddCredential}>
                       <div className='flex items-center gap-2 text-primary'>
                         <span>Connect {getProviderName()} account</span>
                       </div>
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
index 8ac48d6d7dd..778dab55a9f 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
@@ -20,6 +20,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
+import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_project_selector')
@@ -387,10 +388,13 @@ export function JiraProjectSelector({
     try {
       localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
 
-      // Navigate to OAuth URL
-      const authUrl = `/api/auth/oauth?provider=${providerId}&service=${effectiveServiceId}&scopes=${encodeURIComponent(
-        requiredScopes.join(',')
-      )}&return_url=${encodeURIComponent(window.location.href)}`
+      // Navigate to OAuth URL using the utility function
+      const authUrl = buildOAuthUrl({
+        provider: providerId,
+        service: effectiveServiceId,
+        scopes: requiredScopes,
+        returnUrl: window.location.href,
+      })
 
       window.location.href = authUrl
     } catch (error) {
diff --git a/apps/sim/lib/urls/utils.ts b/apps/sim/lib/urls/utils.ts
index c38c32a139a..587fd6cecbd 100644
--- a/apps/sim/lib/urls/utils.ts
+++ b/apps/sim/lib/urls/utils.ts
@@ -53,3 +53,64 @@ export function getEmailDomain(): string {
     return isProd ? 'simstudio.ai' : 'localhost:3000'
   }
 }
+
+/**
+ * OAuth URL construction utilities
+ */
+
+export interface OAuthUrlParams {
+  provider: string
+  service: string
+  scopes: string[]
+  returnUrl?: string
+}
+
+/**
+ * Constructs a standardized OAuth URL for authentication
+ * @param params OAuth URL parameters
+ * @returns The complete OAuth URL
+ */
+export function buildOAuthUrl({ provider, service, scopes, returnUrl }: OAuthUrlParams): string {
+  const currentReturnUrl = returnUrl || (typeof window !== 'undefined' ? window.location.href : '')
+
+  return `/api/auth/oauth?provider=${provider}&service=${service}&scopes=${encodeURIComponent(
+    scopes.join(',')
+  )}&return_url=${encodeURIComponent(currentReturnUrl)}`
+}
+
+/**
+ * Microsoft Teams URL construction utilities
+ */
+
+/**
+ * Constructs a Microsoft Teams team URL
+ * @param teamId The team ID
+ * @returns The complete Teams team URL
+ */
+export function buildTeamsTeamUrl(teamId: string): string {
+  return `https://teams.microsoft.com/l/team/${teamId}`
+}
+
+/**
+ * Constructs a Microsoft Teams channel URL
+ * @param teamId The team ID
+ * @param channelDisplayName The channel display name
+ * @param channelId The channel ID
+ * @returns The complete Teams channel URL
+ */
+export function buildTeamsChannelUrl(
+  teamId: string,
+  channelDisplayName: string,
+  channelId: string
+): string {
+  return `https://teams.microsoft.com/l/channel/${teamId}/${encodeURIComponent(channelDisplayName)}/${channelId}`
+}
+
+/**
+ * Constructs a Microsoft Teams chat URL
+ * @param chatId The chat ID
+ * @returns The complete Teams chat URL
+ */
+export function buildTeamsChatUrl(chatId: string): string {
+  return `https://teams.microsoft.com/l/chat/${chatId}`
+}

From beccbd09da80b431050c8261a453041906c11e43 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Sat, 14 Jun 2025 18:16:16 -0700
Subject: [PATCH 05/27] fi

---
 apps/sim/app/api/workflows/[id]/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index e2fd855b0b9..f4e8d31f228 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -49,7 +49,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
     // Case 2: Workflow belongs to a workspace the user is a member of
     if (!hasAccess && workflowData.workspaceId) {
       const membership = await db
-        .select({ role: workspaceMember.role })
+        .select({ id: workspaceMember.id })
         .from(workspaceMember)
         .where(
           and(

From db2104389d34bc6c57404c9de89ca1a3827053dd Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 13:03:53 -0700
Subject: [PATCH 06/27] fix lint

---
 apps/sim/app/api/workflows/[id]/route.ts      |  81 +++
 .../components/control-bar/control-bar.tsx    |  14 +-
 apps/sim/app/w/[id]/workflow.tsx              |  42 +-
 apps/sim/app/w/components/sidebar/sidebar.tsx |   9 -
 apps/sim/stores/index.ts                      |  35 +-
 apps/sim/stores/sync-registry.ts              |  77 +--
 apps/sim/stores/workflows/index.ts            |  23 +-
 apps/sim/stores/workflows/registry/store.ts   | 540 +++++++++++++-----
 apps/sim/stores/workflows/registry/types.ts   |   2 +-
 apps/sim/stores/workflows/sync.ts             | 516 ++++-------------
 apps/sim/stores/workflows/workflow/store.ts   |  52 +-
 11 files changed, 677 insertions(+), 714 deletions(-)

diff --git a/apps/sim/app/api/workflows/[id]/route.ts b/apps/sim/app/api/workflows/[id]/route.ts
index f4e8d31f228..7221f4c5b50 100644
--- a/apps/sim/app/api/workflows/[id]/route.ts
+++ b/apps/sim/app/api/workflows/[id]/route.ts
@@ -79,3 +79,84 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }
+
+/**
+ * DELETE /api/workflows/[id]
+ * Delete a workflow by ID
+ */
+export async function DELETE(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  const requestId = crypto.randomUUID().slice(0, 8)
+  const startTime = Date.now()
+  const { id: workflowId } = await params
+
+  try {
+    // Get the session
+    const session = await getSession()
+    if (!session?.user?.id) {
+      logger.warn(`[${requestId}] Unauthorized deletion attempt for workflow ${workflowId}`)
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const userId = session.user.id
+
+    // Fetch the workflow to check ownership/access
+    const workflowData = await db
+      .select()
+      .from(workflow)
+      .where(eq(workflow.id, workflowId))
+      .then((rows) => rows[0])
+
+    if (!workflowData) {
+      logger.warn(`[${requestId}] Workflow ${workflowId} not found for deletion`)
+      return NextResponse.json({ error: 'Workflow not found' }, { status: 404 })
+    }
+
+    // Check if user has permission to delete this workflow
+    let canDelete = false
+
+    // Case 1: User owns the workflow
+    if (workflowData.userId === userId) {
+      canDelete = true
+    }
+
+    // Case 2: Workflow belongs to a workspace and user has admin/owner role
+    if (!canDelete && workflowData.workspaceId) {
+      const membership = await db
+        .select({ role: workspaceMember.role })
+        .from(workspaceMember)
+        .where(
+          and(
+            eq(workspaceMember.workspaceId, workflowData.workspaceId),
+            eq(workspaceMember.userId, userId)
+          )
+        )
+        .then((rows) => rows[0])
+
+      if (membership && (membership.role === 'owner' || membership.role === 'admin')) {
+        canDelete = true
+      }
+    }
+
+    if (!canDelete) {
+      logger.warn(
+        `[${requestId}] User ${userId} denied permission to delete workflow ${workflowId}`
+      )
+      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
+    }
+
+    // Delete the workflow
+    await db.delete(workflow).where(eq(workflow.id, workflowId))
+
+    const elapsed = Date.now() - startTime
+    logger.info(`[${requestId}] Successfully deleted workflow ${workflowId} in ${elapsed}ms`)
+
+    return NextResponse.json({ success: true }, { status: 200 })
+  } catch (error: any) {
+    const elapsed = Date.now() - startTime
+    logger.error(`[${requestId}] Error deleting workflow ${workflowId} after ${elapsed}ms`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
diff --git a/apps/sim/app/w/[id]/components/control-bar/control-bar.tsx b/apps/sim/app/w/[id]/components/control-bar/control-bar.tsx
index 9dbcd5aeac5..d7907a05816 100644
--- a/apps/sim/app/w/[id]/components/control-bar/control-bar.tsx
+++ b/apps/sim/app/w/[id]/components/control-bar/control-bar.tsx
@@ -409,21 +409,25 @@ export function ControlBar() {
   /**
    * Workflow deletion handler
    */
-  const handleDeleteWorkflow = () => {
+  const handleDeleteWorkflow = async () => {
     if (!activeWorkflowId) return
 
-    // Get remaining workflow IDs
+    // Navigate to another workflow first
     const remainingIds = Object.keys(workflows).filter((id) => id !== activeWorkflowId)
 
-    // Navigate before removing the workflow to avoid any state inconsistencies
     if (remainingIds.length > 0) {
       router.push(`/w/${remainingIds[0]}`)
     } else {
       router.push('/')
     }
 
-    // Remove the workflow from the registry
-    removeWorkflow(activeWorkflowId)
+    // Remove the workflow from the registry (now async)
+    try {
+      await removeWorkflow(activeWorkflowId)
+    } catch (error) {
+      // Handle error gracefully - could show user notification instead
+      logger.error('Failed to delete workflow:', error)
+    }
   }
 
   // /**
diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index 6e5b4fb03cf..3cf10dfc631 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -23,7 +23,7 @@ import { useNotificationStore } from '@/stores/notifications/store'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useGeneralStore } from '@/stores/settings/general/store'
 import { useSidebarStore } from '@/stores/sidebar/store'
-import { initializeSyncManagers, isSyncInitialized } from '@/stores/sync-registry'
+import { initializeSyncManagers } from '@/stores/sync-registry'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
@@ -250,19 +250,14 @@ function WorkflowContent() {
   // Initialize workflow
   useEffect(() => {
     if (typeof window !== 'undefined') {
-      // Ensure sync system is initialized before proceeding
       const initSync = async () => {
         // Initialize sync system if not already initialized
         await initializeSyncManagers()
         setIsInitialized(true)
       }
 
-      // Check if already initialized
-      if (isSyncInitialized()) {
-        setIsInitialized(true)
-      } else {
-        initSync()
-      }
+      // Initialize sync system
+      initSync()
     }
   }, [])
 
@@ -747,38 +742,17 @@ function WorkflowContent() {
         return
       }
 
-      // Import the isActivelyLoadingFromDB function to check sync status
-      const { isActivelyLoadingFromDB } = await import('@/stores/workflows/sync')
-
-      // Wait for any active DB loading to complete before switching workflows
-      if (isActivelyLoadingFromDB()) {
-        const checkInterval = setInterval(() => {
-          if (!isActivelyLoadingFromDB()) {
-            clearInterval(checkInterval)
-            // Reset variables loaded state before setting active workflow
-            resetVariablesLoaded()
-
-            // Only call setActiveWorkflow if the workflow isn't already active
-            // This prevents overwriting state that was just set in createWorkflow
-            const { activeWorkflowId } = useWorkflowRegistry.getState()
-            if (activeWorkflowId !== currentId) {
-              setActiveWorkflow(currentId)
-            }
-
-            markAllAsRead(currentId)
-          }
-        }, 100)
-        return
-      }
-
       // Reset variables loaded state before setting active workflow
       resetVariablesLoaded()
 
-      // Only call setActiveWorkflow if the workflow isn't already active
-      // This prevents overwriting state that was just set in createWorkflow
+      // Always call setActiveWorkflow when workflow ID changes to ensure proper state
       const { activeWorkflowId } = useWorkflowRegistry.getState()
+
       if (activeWorkflowId !== currentId) {
         setActiveWorkflow(currentId)
+      } else {
+        // Even if the workflow is already active, call setActiveWorkflow to ensure state consistency
+        setActiveWorkflow(currentId)
       }
 
       markAllAsRead(currentId)
diff --git a/apps/sim/app/w/components/sidebar/sidebar.tsx b/apps/sim/app/w/components/sidebar/sidebar.tsx
index 6d8ce037df8..bea67211b2e 100644
--- a/apps/sim/app/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/w/components/sidebar/sidebar.tsx
@@ -129,15 +129,6 @@ export function Sidebar() {
   // Create workflow
   const handleCreateWorkflow = async (folderId?: string) => {
     try {
-      // Import the isActivelyLoadingFromDB function to check sync status
-      const { isActivelyLoadingFromDB } = await import('@/stores/workflows/sync')
-
-      // Prevent creating workflows during active DB operations
-      if (isActivelyLoadingFromDB()) {
-        console.log('Please wait, syncing in progress...')
-        return
-      }
-
       // Create the workflow and ensure it's associated with the active workspace and folder
       const id = createWorkflow({
         workspaceId: activeWorkspaceId || undefined,
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index fcd7f443649..dcc7cec2eda 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -8,17 +8,11 @@ import { useNotificationStore } from './notifications/store'
 import { useConsoleStore } from './panel/console/store'
 import { useVariablesStore } from './panel/variables/store'
 import { useEnvironmentStore } from './settings/environment/store'
-import {
-  getSyncManagers,
-  initializeSyncManagers,
-  isSyncInitialized,
-  resetSyncManagers,
-} from './sync-registry'
+import { disposeSyncManagers, initializeSyncManagers } from './sync-registry'
 // Import the syncWorkflows function directly
 import { syncWorkflows } from './workflows'
 import { useWorkflowRegistry } from './workflows/registry/store'
 import { useSubBlockStore } from './workflows/subblock/store'
-import { isRegistryInitialized } from './workflows/sync'
 import { useWorkflowStore } from './workflows/workflow/store'
 import type { BlockState } from './workflows/workflow/types'
 
@@ -66,8 +60,6 @@ async function initializeApplication(): Promise<void> {
     if (!hasDbWorkflows && isNewLoginSession) {
       // Critical safeguard: For new login sessions with no DB workflows
       logger.info('New login session with no workflows - preventing initial sync')
-      const syncManagers = getSyncManagers()
-      syncManagers.forEach((manager) => manager.stopIntervalSync())
 
       // Create the first starter workflow with an agent block for new users
       logger.info('Creating first workflow with agent block for new user')
@@ -96,7 +88,7 @@ async function initializeApplication(): Promise<void> {
  * Checks if application is fully initialized
  */
 export function isAppInitialized(): boolean {
-  return appFullyInitialized && isRegistryInitialized() && isSyncInitialized()
+  return appFullyInitialized
 }
 
 /**
@@ -120,16 +112,6 @@ function handleBeforeUnload(event: BeforeUnloadEvent): void {
   // Mark workflows as dirty to ensure sync on exit
   syncWorkflows()
 
-  // Final sync for managers that need it
-  getSyncManagers()
-    .filter((manager) => manager.config.syncOnExit)
-    .forEach((manager) => {
-      manager.sync()
-    })
-
-  // Cleanup managers
-  getSyncManagers().forEach((manager) => manager.dispose())
-
   // Standard beforeunload pattern
   event.preventDefault()
   event.returnValue = ''
@@ -140,7 +122,7 @@ function handleBeforeUnload(event: BeforeUnloadEvent): void {
  */
 function cleanupApplication(): void {
   window.removeEventListener('beforeunload', handleBeforeUnload)
-  getSyncManagers().forEach((manager) => manager.dispose())
+  disposeSyncManagers()
 }
 
 /**
@@ -152,7 +134,7 @@ export async function clearUserData(): Promise<void> {
 
   try {
     // Reset all sync managers to prevent any pending syncs
-    resetSyncManagers()
+    disposeSyncManagers()
 
     // Reset all stores to their initial state
     resetAllStores()
@@ -207,7 +189,7 @@ export async function reinitializeAfterLogin(): Promise<void> {
     appFullyInitialized = false
 
     // Reset sync managers to prevent any active syncs during reinitialization
-    resetSyncManagers()
+    disposeSyncManagers()
 
     // Clean existing state to avoid stale data
     resetAllStores()
@@ -409,13 +391,6 @@ function createFirstWorkflowWithAgentBlock(): void {
   // Mark as dirty to ensure sync
   syncWorkflows()
 
-  // Resume sync managers after initialization
-  setTimeout(() => {
-    const syncManagers = getSyncManagers()
-    syncManagers.forEach((manager) => manager.startIntervalSync())
-    syncWorkflows()
-  }, 1000)
-
   logger.info('First workflow with agent block created successfully')
 }
 
diff --git a/apps/sim/stores/sync-registry.ts b/apps/sim/stores/sync-registry.ts
index 56536ce34a6..8221896ace5 100644
--- a/apps/sim/stores/sync-registry.ts
+++ b/apps/sim/stores/sync-registry.ts
@@ -2,12 +2,7 @@
 
 import { createLogger } from '@/lib/logs/console-logger'
 import type { SyncManager } from './sync'
-import {
-  fetchWorkflowsFromDB,
-  isRegistryInitialized,
-  resetRegistryInitialization,
-  workflowSync,
-} from './workflows/sync'
+import { fetchWorkflowsFromDB, workflowSync } from './workflows/sync'
 
 const logger = createLogger('SyncRegistry')
 
@@ -17,13 +12,7 @@ let initializing = false
 let managers: SyncManager[] = []
 
 /**
- * Initialize sync managers and fetch data from DB
- * Returns a promise that resolves when initialization is complete
- *
- * Note: Workflow scheduling is handled automatically by the workflowSync manager
- * when workflows are synced to the database. The scheduling logic checks if a
- * workflow has scheduling enabled in its starter block and updates the schedule
- * accordingly.
+ * Simplified sync managers initialization
  */
 export async function initializeSyncManagers(): Promise<boolean> {
   // Skip if already initialized or initializing
@@ -37,34 +26,18 @@ export async function initializeSyncManagers(): Promise<boolean> {
     // Initialize sync managers
     managers = [workflowSync]
 
-    // Reset registry initialization state before fetching
-    resetRegistryInitialization()
-
     // Fetch data from DB
     try {
-      // Remove environment variables fetch
       await fetchWorkflowsFromDB()
-
-      // Wait for a short period to ensure registry is properly initialized
-      if (!isRegistryInitialized()) {
-        logger.info('Waiting for registry initialization to complete...')
-        await new Promise((resolve) => setTimeout(resolve, 500))
-      }
-
-      // Verify initialization complete
-      if (!isRegistryInitialized()) {
-        logger.warn('Registry initialization may not have completed properly')
-      } else {
-        logger.info('Registry initialization verified')
-      }
+      logger.info('Workflows loaded from database')
     } catch (error) {
-      logger.error('Error fetching data from DB:', { error })
+      logger.error('Error fetching data from DB:', error)
     }
 
     initialized = true
     return true
   } catch (error) {
-    logger.error('Error initializing sync managers:', { error })
+    logger.error('Error initializing sync managers:', error)
     return false
   } finally {
     initializing = false
@@ -72,28 +45,36 @@ export async function initializeSyncManagers(): Promise<boolean> {
 }
 
 /**
- * Check if sync managers are initialized
+ * Force resync all managers
  */
-export function isSyncInitialized(): boolean {
-  return initialized && isRegistryInitialized()
-}
+export function forceSyncAll(): void {
+  if (!initialized) {
+    logger.warn('Sync managers not initialized, cannot force sync')
+    return
+  }
 
-/**
- * Get all sync managers
- */
-export function getSyncManagers(): SyncManager[] {
-  return managers
+  managers.forEach((manager) => {
+    try {
+      manager.sync()
+    } catch (error) {
+      logger.error('Error forcing sync for manager:', error)
+    }
+  })
 }
 
 /**
- * Reset all sync managers
+ * Dispose all sync managers
  */
-export function resetSyncManagers(): void {
+export function disposeSyncManagers(): void {
+  managers.forEach((manager) => {
+    try {
+      manager.dispose()
+    } catch (error) {
+      logger.error('Error disposing sync manager:', error)
+    }
+  })
+
+  managers = []
   initialized = false
   initializing = false
-  managers = []
-  resetRegistryInitialization()
 }
-
-// Export individual sync managers for direct use
-export { workflowSync }
diff --git a/apps/sim/stores/workflows/index.ts b/apps/sim/stores/workflows/index.ts
index ef3194590ac..ea9bdd8e141 100644
--- a/apps/sim/stores/workflows/index.ts
+++ b/apps/sim/stores/workflows/index.ts
@@ -1,5 +1,6 @@
 import { createLogger } from '@/lib/logs/console-logger'
 import { useWorkflowRegistry } from './registry/store'
+import { workflowSync } from './sync'
 import { mergeSubblockState } from './utils'
 import { useWorkflowStore } from './workflow/store'
 import type { BlockState, WorkflowState } from './workflow/types'
@@ -110,15 +111,15 @@ export function getAllWorkflowsWithValues() {
       .getState()
       .getWorkflowDeploymentStatus(activeWorkflowId)
 
-    // Use the current state from the store (guaranteed to be valid)
+    // Ensure state has all required fields for Zod validation
     const workflowState: WorkflowState = {
-      blocks: currentState.blocks,
-      edges: currentState.edges,
-      loops: currentState.loops,
-      parallels: currentState.parallels,
+      blocks: currentState.blocks || {},
+      edges: currentState.edges || [],
+      loops: currentState.loops || {},
+      parallels: currentState.parallels || {},
       isDeployed: deploymentStatus?.isDeployed || false,
       deployedAt: deploymentStatus?.deployedAt,
-      lastSaved: currentState.lastSaved,
+      lastSaved: currentState.lastSaved || Date.now(),
     }
 
     // Merge the subblock values for this specific workflow
@@ -133,7 +134,6 @@ export function getAllWorkflowsWithValues() {
       description: metadata.description,
       color: metadata.color || '#3972F6',
       marketplaceData: metadata.marketplaceData || null,
-      workspaceId: metadata.workspaceId,
       folderId: metadata.folderId,
       state: {
         blocks: mergedBlocks,
@@ -148,6 +148,11 @@ export function getAllWorkflowsWithValues() {
       // Include API key if available
       apiKey,
     }
+
+    // Only include workspaceId if it's not null/undefined
+    if (metadata.workspaceId) {
+      result[activeWorkflowId].workspaceId = metadata.workspaceId
+    }
   }
 
   return result
@@ -158,9 +163,7 @@ export function getAllWorkflowsWithValues() {
  * This is a shortcut for other files to trigger sync operations
  */
 export function syncWorkflows() {
-  const workflowStore = useWorkflowStore.getState()
-  workflowStore.sync.markDirty()
-  workflowStore.sync.forceSync()
+  workflowSync.sync()
 }
 
 // Workflows store exports - localStorage persistence removed
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 63db2e68a2f..a4ceeb5e033 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -4,7 +4,7 @@ import { createLogger } from '@/lib/logs/console-logger'
 import { clearWorkflowVariablesTracking } from '@/stores/panel/variables/store'
 import { API_ENDPOINTS } from '../../constants'
 import { useSubBlockStore } from '../subblock/store'
-import { fetchWorkflowsFromDB, resetRegistryInitialization, workflowSync } from '../sync'
+import { fetchWorkflowsFromDB, workflowSync } from '../sync'
 import { useWorkflowStore } from '../workflow/store'
 import type { BlockState } from '../workflow/types'
 import type { DeploymentStatus, WorkflowMetadata, WorkflowRegistry } from './types'
@@ -120,9 +120,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         // Reset all workflow state
         resetWorkflowStores()
 
-        // Reset registry initialization state
-        resetRegistryInitialization()
-
         // No longer saving workspace to localStorage
 
         // Set loading state while we fetch workflows
@@ -154,55 +151,53 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       },
 
       // Switch to workspace with comprehensive error handling and loading states
-      switchToWorkspace: (id: string) => {
-        const { activeWorkspaceId } = get()
-
-        if (activeWorkspaceId === id) return
+      switchToWorkspace: async (workspaceId: string) => {
+        // Prevent multiple simultaneous transitions
+        if (isWorkspaceTransitioning) {
+          logger.warn(
+            `Ignoring workspace switch to ${workspaceId} - transition already in progress`
+          )
+          return
+        }
 
-        // Set transition state
         setWorkspaceTransitioning(true)
 
-        logger.info(`Switching workspace from ${activeWorkspaceId} to ${id}`)
-
-        // Reset all workflow state
-        resetWorkflowStores()
-
-        // Reset registry initialization state
-        resetRegistryInitialization()
-
-        // Save workspace to localStorage
         try {
-          localStorage.setItem('lastActiveWorkspaceId', id)
-        } catch (error) {
-          logger.warn('Failed to save workspace to localStorage:', error)
-        }
+          const { activeWorkspaceId: currentWorkspaceId } = get()
 
-        // Set loading state while we fetch workflows
-        set({
-          isLoading: true,
-          // Clear workflows to prevent showing old data during transition
-          workflows: {},
-          activeWorkspaceId: id,
-          // Reset active workflow when switching workspaces
-          activeWorkflowId: null,
-        })
+          // Early return if switching to the same workspace
+          if (currentWorkspaceId === workspaceId) {
+            logger.info(`Already in workspace ${workspaceId}`)
+            return
+          }
 
-        // Fetch workflows specifically for this workspace
-        // This is better than just triggering a sync as it's more immediate
-        fetchWorkflowsFromDB()
-          .then(() => {
-            set({ isLoading: false })
+          logger.info(`Switching workspace from ${currentWorkspaceId || 'none'} to ${workspaceId}`)
 
-            // End transition state
-            setWorkspaceTransitioning(false)
+          // Clear current workspace state
+          resetWorkflowStores()
+
+          // Update workspace in state
+          set({
+            activeWorkspaceId: workspaceId,
+            activeWorkflowId: null,
+            workflows: {},
+            isLoading: true,
+            error: null,
           })
-          .catch((error) => {
-            logger.error('Error fetching workflows for workspace:', { error, workspaceId: id })
-            set({ isLoading: false, error: 'Failed to load workspace data' })
 
-            // End transition state even on error
-            setWorkspaceTransitioning(false)
+          // Fetch workflows for the new workspace
+          await fetchWorkflowsFromDB()
+
+          logger.info(`Successfully switched to workspace: ${workspaceId}`)
+        } catch (error) {
+          logger.error(`Error switching to workspace ${workspaceId}:`, { error })
+          set({
+            error: `Failed to switch workspace: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            isLoading: false,
           })
+        } finally {
+          setWorkspaceTransitioning(false)
+        }
       },
 
       // Load user's last active workspace from localStorage
@@ -346,16 +341,11 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
         // First, sync the current workflow before switching (if there is one)
         if (activeWorkflowId && activeWorkflowId !== id) {
-          console.log(
-            `[DEBUG] setActiveWorkflow: Syncing current workflow ${activeWorkflowId} before switching to ${id}`
-          )
           // Mark current workflow as dirty and sync (fire and forget)
           useWorkflowStore.getState().sync.markDirty()
           useWorkflowStore.getState().sync.forceSync()
         }
 
-        console.log(`[DEBUG] setActiveWorkflow: Loading workflow ${id}`)
-
         // Fetch workflow state from database
         const { fetchWorkflowStateFromDB } = await import('@/stores/workflows/sync')
         const workflowData = await fetchWorkflowStateFromDB(id)
@@ -363,11 +353,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         let workflowState: any
 
         if (workflowData?.state) {
-          console.log(`[DEBUG] setActiveWorkflow: Found DB state for ${id}`, {
-            hasBlocks: Object.keys(workflowData.state.blocks || {}).length,
-            blockTypes: Object.values(workflowData.state.blocks || {}).map((b: any) => b.type),
-          })
-
           // Use the state from the database
           workflowState = {
             blocks: workflowData.state.blocks || {},
@@ -411,11 +396,100 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             },
           }))
         } else {
-          console.log(`[DEBUG] setActiveWorkflow: No DB state for ${id}, initializing empty state`)
+          // If no state in DB, initialize with starter block (for newly created workflows)
+          const starterId = crypto.randomUUID()
+          const starterBlock = {
+            id: starterId,
+            type: 'starter' as const,
+            name: 'Start',
+            position: { x: 100, y: 100 },
+            subBlocks: {
+              startWorkflow: {
+                id: 'startWorkflow',
+                type: 'dropdown' as const,
+                value: 'manual',
+              },
+              webhookPath: {
+                id: 'webhookPath',
+                type: 'short-input' as const,
+                value: '',
+              },
+              webhookSecret: {
+                id: 'webhookSecret',
+                type: 'short-input' as const,
+                value: '',
+              },
+              scheduleType: {
+                id: 'scheduleType',
+                type: 'dropdown' as const,
+                value: 'daily',
+              },
+              minutesInterval: {
+                id: 'minutesInterval',
+                type: 'short-input' as const,
+                value: '',
+              },
+              minutesStartingAt: {
+                id: 'minutesStartingAt',
+                type: 'short-input' as const,
+                value: '',
+              },
+              hourlyMinute: {
+                id: 'hourlyMinute',
+                type: 'short-input' as const,
+                value: '',
+              },
+              dailyTime: {
+                id: 'dailyTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              weeklyDay: {
+                id: 'weeklyDay',
+                type: 'dropdown' as const,
+                value: 'MON',
+              },
+              weeklyDayTime: {
+                id: 'weeklyDayTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              monthlyDay: {
+                id: 'monthlyDay',
+                type: 'short-input' as const,
+                value: '',
+              },
+              monthlyTime: {
+                id: 'monthlyTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              cronExpression: {
+                id: 'cronExpression',
+                type: 'short-input' as const,
+                value: '',
+              },
+              timezone: {
+                id: 'timezone',
+                type: 'dropdown' as const,
+                value: 'UTC',
+              },
+            },
+            outputs: {
+              response: {
+                type: {
+                  input: 'any',
+                },
+              },
+            },
+            enabled: true,
+            horizontalHandles: true,
+            isWide: false,
+            height: 0,
+          }
 
-          // If no state in DB, initialize with empty state
           workflowState = {
-            blocks: {},
+            blocks: { [starterId]: starterBlock },
             edges: [],
             loops: {},
             parallels: {},
@@ -427,7 +501,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               past: [],
               present: {
                 state: {
-                  blocks: {},
+                  blocks: { [starterId]: starterBlock },
                   edges: [],
                   loops: {},
                   parallels: {},
@@ -435,7 +509,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
                   deployedAt: undefined,
                 },
                 timestamp: Date.now(),
-                action: 'Initial state',
+                action: 'Initial state with starter block',
                 subblockValues: {},
               },
               future: [],
@@ -443,20 +517,23 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             lastSaved: Date.now(),
           }
 
-          // Initialize empty subblock values for this workflow
+          // Initialize subblock values for starter block
+          const subblockValues: Record<string, Record<string, any>> = {}
+          subblockValues[starterId] = {}
+          Object.entries(starterBlock.subBlocks).forEach(([subblockId, subblock]) => {
+            subblockValues[starterId][subblockId] = (subblock as any).value
+          })
+
           useSubBlockStore.setState((state) => ({
             workflowValues: {
               ...state.workflowValues,
-              [id]: {},
+              [id]: subblockValues,
             },
           }))
         }
 
         // Set the workflow state in the store
         useWorkflowStore.setState(workflowState)
-        console.log(`[DEBUG] setActiveWorkflow: Set state in store`, {
-          blockCount: Object.keys(workflowState.blocks).length,
-        })
 
         // Update the active workflow ID
         set({ activeWorkflowId: id, error: null })
@@ -655,7 +732,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           }
         }
 
-        // Add workflow to registry
+        // Add workflow to registry first
         set((state) => ({
           workflows: {
             ...state.workflows,
@@ -669,16 +746,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           useSubBlockStore.getState().initializeFromWorkflow(id, options.marketplaceState.blocks)
         }
 
-        // If this is the first workflow or it's an initial workflow, set it as active
-        if (options.isInitial || Object.keys(get().workflows).length === 1) {
-          set({ activeWorkflowId: id })
-          useWorkflowStore.setState(initialState)
-        } else {
-          // Make sure we switch to this workflow
-          set({ activeWorkflowId: id })
-          useWorkflowStore.setState(initialState)
-        }
-
         // Initialize subblock values to ensure they're available for sync
         if (!options.marketplaceId) {
           // For non-marketplace workflows, initialize subblock values from the starter block
@@ -700,11 +767,13 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           }))
         }
 
-        // Mark as dirty to ensure sync, but let it sync naturally
-        useWorkflowStore.getState().sync.markDirty()
+        // Properly set as active workflow and initialize state
+        set({ activeWorkflowId: id })
+        useWorkflowStore.setState(initialState)
 
-        // Remove immediate sync to prevent race conditions
-        // The sync will happen naturally through the interval sync mechanism
+        // Mark as dirty for sync and trigger immediate sync
+        useWorkflowStore.getState().sync.markDirty()
+        useWorkflowStore.getState().sync.forceSync()
 
         logger.info(`Created new workflow with ID ${id} in workspace ${workspaceId || 'none'}`)
 
@@ -817,12 +886,129 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           // Do not copy marketplace data
         }
 
-        // Create new workflow state without deployment data - simplified since no localStorage
+        // Get the current workflow state to copy from
+        const currentWorkflowState = useWorkflowStore.getState()
+
+        // If we're duplicating the active workflow, use current state
+        // Otherwise, we need to fetch it from DB or use empty state
+        let sourceState: any
+
+        if (sourceId === get().activeWorkflowId) {
+          // Source is the active workflow, copy current state
+          sourceState = {
+            blocks: currentWorkflowState.blocks || {},
+            edges: currentWorkflowState.edges || [],
+            loops: currentWorkflowState.loops || {},
+            parallels: currentWorkflowState.parallels || {},
+          }
+        } else {
+          // Source is not active workflow, create with starter block for now
+          // In a future enhancement, we could fetch from DB
+          const starterId = crypto.randomUUID()
+          const starterBlock = {
+            id: starterId,
+            type: 'starter' as const,
+            name: 'Start',
+            position: { x: 100, y: 100 },
+            subBlocks: {
+              startWorkflow: {
+                id: 'startWorkflow',
+                type: 'dropdown' as const,
+                value: 'manual',
+              },
+              webhookPath: {
+                id: 'webhookPath',
+                type: 'short-input' as const,
+                value: '',
+              },
+              webhookSecret: {
+                id: 'webhookSecret',
+                type: 'short-input' as const,
+                value: '',
+              },
+              scheduleType: {
+                id: 'scheduleType',
+                type: 'dropdown' as const,
+                value: 'daily',
+              },
+              minutesInterval: {
+                id: 'minutesInterval',
+                type: 'short-input' as const,
+                value: '',
+              },
+              minutesStartingAt: {
+                id: 'minutesStartingAt',
+                type: 'short-input' as const,
+                value: '',
+              },
+              hourlyMinute: {
+                id: 'hourlyMinute',
+                type: 'short-input' as const,
+                value: '',
+              },
+              dailyTime: {
+                id: 'dailyTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              weeklyDay: {
+                id: 'weeklyDay',
+                type: 'dropdown' as const,
+                value: 'MON',
+              },
+              weeklyDayTime: {
+                id: 'weeklyDayTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              monthlyDay: {
+                id: 'monthlyDay',
+                type: 'short-input' as const,
+                value: '',
+              },
+              monthlyTime: {
+                id: 'monthlyTime',
+                type: 'short-input' as const,
+                value: '',
+              },
+              cronExpression: {
+                id: 'cronExpression',
+                type: 'short-input' as const,
+                value: '',
+              },
+              timezone: {
+                id: 'timezone',
+                type: 'dropdown' as const,
+                value: 'UTC',
+              },
+            },
+            outputs: {
+              response: {
+                type: {
+                  input: 'any',
+                },
+              },
+            },
+            enabled: true,
+            horizontalHandles: true,
+            isWide: false,
+            height: 0,
+          }
+
+          sourceState = {
+            blocks: { [starterId]: starterBlock },
+            edges: [],
+            loops: {},
+            parallels: {},
+          }
+        }
+
+        // Create the new workflow state with copied content
         const newState = {
-          blocks: {},
-          edges: [],
-          loops: {},
-          parallels: {},
+          blocks: sourceState.blocks,
+          edges: sourceState.edges,
+          loops: sourceState.loops,
+          parallels: sourceState.parallels,
           isDeployed: false,
           deployedAt: undefined,
           workspaceId,
@@ -831,10 +1017,10 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             past: [],
             present: {
               state: {
-                blocks: {},
-                edges: [],
-                loops: {},
-                parallels: {},
+                blocks: sourceState.blocks,
+                edges: sourceState.edges,
+                loops: sourceState.loops,
+                parallels: sourceState.parallels,
                 isDeployed: false,
                 deployedAt: undefined,
                 workspaceId,
@@ -857,10 +1043,40 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           error: null,
         }))
 
-        // Mark as dirty to ensure sync
-        useWorkflowStore.getState().sync.markDirty()
+        // Copy subblock values if duplicating active workflow
+        if (sourceId === get().activeWorkflowId) {
+          const sourceSubblockValues = useSubBlockStore.getState().workflowValues[sourceId] || {}
+          useSubBlockStore.setState((state) => ({
+            workflowValues: {
+              ...state.workflowValues,
+              [id]: sourceSubblockValues,
+            },
+          }))
+        } else {
+          // Initialize subblock values for starter block
+          const subblockValues: Record<string, Record<string, any>> = {}
+          Object.entries(newState.blocks).forEach(([blockId, block]) => {
+            const blockState = block as any
+            subblockValues[blockId] = {}
+            Object.entries(blockState.subBlocks || {}).forEach(([subblockId, subblock]) => {
+              subblockValues[blockId][subblockId] = (subblock as any).value
+            })
+          })
 
-        // Trigger sync
+          useSubBlockStore.setState((state) => ({
+            workflowValues: {
+              ...state.workflowValues,
+              [id]: subblockValues,
+            },
+          }))
+        }
+
+        // Set as active workflow and update store
+        set({ activeWorkflowId: id })
+        useWorkflowStore.setState(newState)
+
+        // Mark as dirty for sync and trigger immediate sync
+        useWorkflowStore.getState().sync.markDirty()
         useWorkflowStore.getState().sync.forceSync()
 
         logger.info(
@@ -871,66 +1087,103 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       },
 
       // Delete workflow and clean up associated storage
-      removeWorkflow: (id: string) => {
+      removeWorkflow: async (id: string) => {
+        const { workflows } = get()
+        const workflowToDelete = workflows[id]
+
+        if (!workflowToDelete) {
+          logger.warn(`Attempted to delete non-existent workflow: ${id}`)
+          return
+        }
+
+        try {
+          // Call DELETE endpoint to remove from database
+          const response = await fetch(`/api/workflows/${id}`, {
+            method: 'DELETE',
+          })
+
+          if (!response.ok) {
+            const error = await response.json().catch(() => ({ error: 'Unknown error' }))
+            throw new Error(error.error || 'Failed to delete workflow')
+          }
+
+          logger.info(`Successfully deleted workflow ${id} from database`)
+        } catch (error) {
+          logger.error(`Failed to delete workflow ${id} from database:`, error)
+          set({
+            error: `Failed to delete workflow: ${error instanceof Error ? error.message : 'Unknown error'}`,
+          })
+          return
+        }
+
+        // Only update local state after successful deletion from database
         set((state) => {
           const newWorkflows = { ...state.workflows }
           delete newWorkflows[id]
 
-          // Ensure any schedule for this workflow is cancelled
-          // The API will handle the deletion of the schedule
-          fetch(API_ENDPOINTS.SCHEDULE, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-              workflowId: id,
-              state: { blocks: {} }, // Empty blocks will signal to cancel the schedule
-            }),
-          }).catch((error) => {
-            logger.error(`Error cancelling schedule for deleted workflow ${id}:`, { error })
+          // Clean up subblock values for this workflow
+          useSubBlockStore.setState((subBlockState) => {
+            const newWorkflowValues = { ...subBlockState.workflowValues }
+            delete newWorkflowValues[id]
+            return { workflowValues: newWorkflowValues }
           })
 
-          // Mark as dirty to ensure sync
-          useWorkflowStore.getState().sync.markDirty()
-
-          // Sync deletion with database
-          useWorkflowStore.getState().sync.forceSync()
-
-          // If deleting active workflow, switch to another one or initialize empty
+          // If deleting active workflow, switch to another one or clear state
           let newActiveWorkflowId = state.activeWorkflowId
           if (state.activeWorkflowId === id) {
             const remainingIds = Object.keys(newWorkflows)
             newActiveWorkflowId = remainingIds[0] || null
 
-            // Initialize empty workflow state since no localStorage
-            useWorkflowStore.setState({
-              blocks: {},
-              edges: [],
-              loops: {},
-              parallels: {},
-              isDeployed: false,
-              deployedAt: undefined,
-              hasActiveSchedule: false,
-              history: {
-                past: [],
-                present: {
-                  state: {
-                    blocks: {},
-                    edges: [],
-                    loops: {},
-                    parallels: {},
-                    isDeployed: false,
-                    deployedAt: undefined,
+            if (!newActiveWorkflowId) {
+              // No workflows left, initialize empty state
+              useWorkflowStore.setState({
+                blocks: {},
+                edges: [],
+                loops: {},
+                parallels: {},
+                isDeployed: false,
+                deployedAt: undefined,
+                hasActiveSchedule: false,
+                history: {
+                  past: [],
+                  present: {
+                    state: {
+                      blocks: {},
+                      edges: [],
+                      loops: {},
+                      parallels: {},
+                      isDeployed: false,
+                      deployedAt: undefined,
+                    },
+                    timestamp: Date.now(),
+                    action: 'Initial state',
+                    subblockValues: {},
                   },
-                  timestamp: Date.now(),
-                  action: 'Initial state',
-                  subblockValues: {},
+                  future: [],
                 },
-                future: [],
-              },
-              lastSaved: Date.now(),
-            })
+                lastSaved: Date.now(),
+              })
+            }
           }
 
+          // Cancel any schedule for this workflow (async, don't wait)
+          fetch(API_ENDPOINTS.SCHEDULE, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+              workflowId: id,
+              state: {
+                blocks: {},
+                edges: [],
+                loops: {},
+              },
+            }),
+          }).catch((error) => {
+            logger.error(`Error cancelling schedule for deleted workflow ${id}:`, error)
+          })
+
+          logger.info(`Removed workflow ${id} from local state`)
+
           return {
             workflows: newWorkflows,
             activeWorkflowId: newActiveWorkflowId,
@@ -966,6 +1219,23 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           }
         })
       },
+
+      logout: () => {
+        logger.info('Logging out - clearing all workflow data')
+
+        // Clear all state
+        resetWorkflowStores()
+
+        set({
+          workflows: {},
+          activeWorkflowId: null,
+          activeWorkspaceId: null,
+          isLoading: false,
+          error: null,
+        })
+
+        logger.info('Logout complete - all workflow data cleared')
+      },
     }),
     { name: 'workflow-registry' }
   )
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index 849bc38a816..1b2552cb787 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -37,7 +37,7 @@ export interface WorkflowRegistryActions {
   setActiveWorkspaceId: (id: string) => void
   loadLastActiveWorkspace: () => Promise<void>
   handleWorkspaceDeletion: (newWorkspaceId: string) => void
-  removeWorkflow: (id: string) => void
+  removeWorkflow: (id: string) => Promise<void>
   updateWorkflow: (id: string, metadata: Partial<WorkflowMetadata>) => void
   createWorkflow: (options?: {
     isInitial?: boolean
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index ee0f2ab6fc7..c677e47bf7a 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -11,217 +11,132 @@ import type { BlockState } from './workflow/types'
 
 const logger = createLogger('WorkflowsSync')
 
-// Add debounce utility
-let syncDebounceTimer: NodeJS.Timeout | null = null
-const DEBOUNCE_DELAY = 500 // 500ms delay
-
-// Flag to prevent immediate sync back to DB after loading from DB
-let _isLoadingFromDB = false
-let loadingFromDBToken: string | null = null
-let loadingFromDBStartTime = 0
-const LOADING_TIMEOUT = 3000 // 3 seconds maximum loading time
-
-// Add registry initialization tracking
-let registryFullyInitialized = false
-const _REGISTRY_INIT_TIMEOUT = 10000 // 10 seconds maximum for registry initialization
+// Simplified sync state tracking
+let lastSyncedData = ''
+let isSyncing = false
 
 /**
- * Checks if the system is currently in the process of loading data from the database
- * Includes safety timeout to prevent permanent blocking of syncs
- * @returns true if loading is active, false otherwise
+ * Simplified workflow sync - no more complex flags and initialization checks
  */
-export function isActivelyLoadingFromDB(): boolean {
-  if (!loadingFromDBToken) return false
-
-  // Safety check: ensure loading doesn't block syncs indefinitely
-  const elapsedTime = Date.now() - loadingFromDBStartTime
-  if (elapsedTime > LOADING_TIMEOUT) {
-    loadingFromDBToken = null
-    return false
-  }
+const workflowSyncConfig = {
+  endpoint: API_ENDPOINTS.SYNC,
+  preparePayload: () => {
+    if (typeof window === 'undefined') return { skipSync: true }
 
-  return true
-}
+    // Prevent concurrent syncs
+    if (isSyncing) {
+      return { skipSync: true }
+    }
 
-/**
- * Checks if the workflow registry is fully initialized
- * This is used to prevent syncs before the registry is ready
- * @returns true if registry is initialized, false otherwise
- */
-export function isRegistryInitialized(): boolean {
-  return registryFullyInitialized
-}
+    // Get all workflows with values
+    const allWorkflowsData = getAllWorkflowsWithValues()
 
-/**
- * Marks registry as initialized after successful load
- * Should be called only after all workflows have been loaded from DB
- */
-function setRegistryInitialized(): void {
-  registryFullyInitialized = true
-  logger.info('Workflow registry fully initialized')
-}
+    // Skip sync if no workflows
+    if (Object.keys(allWorkflowsData).length === 0) {
+      return { skipSync: true }
+    }
 
-/**
- * Reset registry initialization state when needed (e.g., workspace switch, logout)
- */
-export function resetRegistryInitialization(): void {
-  registryFullyInitialized = false
-  logger.info('Workflow registry initialization reset')
-}
+    // Skip sync if no changes detected
+    const currentDataHash = JSON.stringify(allWorkflowsData)
+    if (currentDataHash === lastSyncedData) {
+      return { skipSync: true }
+    }
 
-// Enhanced workflow state tracking
-let lastWorkflowState: Record<string, any> = {}
-let isDirty = false
+    // Update last synced data hash
+    lastSyncedData = currentDataHash
 
-/**
- * Checks if workflow state has actually changed since last sync
- * @param currentState Current workflow state to compare
- * @returns true if changes detected, false otherwise
- */
-function hasWorkflowChanges(currentState: Record<string, any>): boolean {
-  if (!currentState || Object.keys(currentState).length === 0) {
-    return false // Empty state should not trigger sync
-  }
+    // Get the active workspace ID
+    const activeWorkspaceId = useWorkflowRegistry.getState().activeWorkspaceId
 
-  if (Object.keys(lastWorkflowState).length === 0) {
-    // First time check, mark as changed
-    lastWorkflowState = JSON.parse(JSON.stringify(currentState))
-    return true
-  }
+    // Ensure all workflows have required fields for validation
+    const workflowsData: Record<string, any> = {}
+    Object.entries(allWorkflowsData).forEach(([id, workflow]) => {
+      // Ensure state has required fields for Zod validation
+      const safeWorkflow = {
+        ...workflow,
+        state: {
+          blocks: workflow.state?.blocks || {},
+          edges: workflow.state?.edges || [],
+          loops: workflow.state?.loops || {},
+          parallels: workflow.state?.parallels || {},
+          ...workflow.state,
+        },
+      }
 
-  // Check if workflow count changed
-  if (Object.keys(currentState).length !== Object.keys(lastWorkflowState).length) {
-    lastWorkflowState = JSON.parse(JSON.stringify(currentState))
-    return true
-  }
+      // Only include workspaceId if it exists
+      if (workflow.workspaceId || activeWorkspaceId) {
+        safeWorkflow.workspaceId = workflow.workspaceId || activeWorkspaceId
+      }
 
-  // Deep comparison of workflow states
-  let hasChanges = false
-  for (const [id, workflow] of Object.entries(currentState)) {
-    if (
-      !lastWorkflowState[id] ||
-      JSON.stringify(workflow) !== JSON.stringify(lastWorkflowState[id])
-    ) {
-      hasChanges = true
-      break
-    }
-  }
+      workflowsData[id] = safeWorkflow
+    })
 
-  if (hasChanges) {
-    lastWorkflowState = JSON.parse(JSON.stringify(currentState))
-  }
+    isSyncing = true
 
-  return hasChanges
-}
+    const payload: any = {
+      workflows: workflowsData,
+    }
 
-/**
- * Mark workflows as dirty (changed) to force a sync
- */
-export function markWorkflowsDirty(): void {
-  isDirty = true
-  logger.info('Workflows marked as dirty, will sync on next opportunity')
-}
+    // Only include workspaceId if it exists (not null/undefined)
+    if (activeWorkspaceId) {
+      payload.workspaceId = activeWorkspaceId
+    }
 
-/**
- * Checks if workflows are currently marked as dirty
- * @returns true if workflows are dirty and need syncing
- */
-export function areWorkflowsDirty(): boolean {
-  return isDirty
+    return payload
+  },
+  method: 'POST' as const,
+  syncOnInterval: true,
+  syncOnExit: true,
+  onSyncSuccess: () => {
+    isSyncing = false
+    logger.info('Workflow sync completed successfully')
+  },
+  onSyncError: (error: any) => {
+    isSyncing = false
+    logger.error('Workflow sync failed:', error)
+  },
 }
 
-/**
- * Reset the dirty flag after a successful sync
- */
-export function resetDirtyFlag(): void {
-  isDirty = false
-}
+// Create the sync manager without debouncing or complex initialization checks
+export const workflowSync = createSingletonSyncManager('workflow-sync', () => workflowSyncConfig)
 
 /**
- * Fetches workflows from the database and updates the local stores
- * This function handles backwards syncing on initialization
+ * Simplified function to fetch workflows from DB
  */
 export async function fetchWorkflowsFromDB(): Promise<void> {
   if (typeof window === 'undefined') return
 
   try {
-    // Reset registry initialization state
-    resetRegistryInitialization()
-
-    // Set loading state in registry
     useWorkflowRegistry.getState().setLoading(true)
 
-    // Set flag to prevent sync back to DB during loading
-    _isLoadingFromDB = true
-    loadingFromDBToken = 'loading'
-    loadingFromDBStartTime = Date.now()
-
-    // Get active workspace ID to filter workflows
     const activeWorkspaceId = useWorkflowRegistry.getState().activeWorkspaceId
-
-    // Call the API endpoint to get workflows from DB with workspace filter
     const url = new URL(API_ENDPOINTS.SYNC, window.location.origin)
+
     if (activeWorkspaceId) {
       url.searchParams.append('workspaceId', activeWorkspaceId)
-      logger.info(`Fetching workflows for workspace: ${activeWorkspaceId}`)
-    } else {
-      logger.info('Fetching workflows without workspace filter')
     }
 
-    const response = await fetch(url.toString(), {
-      method: 'GET',
-    })
+    const response = await fetch(url.toString(), { method: 'GET' })
 
     if (!response.ok) {
       if (response.status === 401) {
         logger.warn('User not authenticated for workflow fetch')
         return
       }
-
-      // Handle case when workspace not found
-      if (response.status === 404) {
-        const responseData = await response.json()
-        if (responseData.code === 'WORKSPACE_NOT_FOUND' && activeWorkspaceId) {
-          logger.warn(`Workspace ${activeWorkspaceId} not found, it may have been deleted`)
-
-          // Fetch user's available workspaces to switch to a valid one
-          const workspacesResponse = await fetch('/api/workspaces', { method: 'GET' })
-          if (workspacesResponse.ok) {
-            const { workspaces } = await workspacesResponse.json()
-
-            if (workspaces && workspaces.length > 0) {
-              // Switch to the first available workspace
-              const firstWorkspace = workspaces[0]
-              logger.info(`Switching to available workspace: ${firstWorkspace.id}`)
-              useWorkflowRegistry.getState().switchToWorkspace(firstWorkspace.id)
-              return
-            }
-          }
-        }
-      }
-
-      logger.error('Failed to fetch workflows:', response.statusText)
-      return
+      throw new Error(`Failed to fetch workflows: ${response.statusText}`)
     }
 
     const { data } = await response.json()
 
-    if (!data || !Array.isArray(data) || data.length === 0) {
-      logger.info(
-        `No workflows found in database for ${activeWorkspaceId ? `workspace ${activeWorkspaceId}` : 'user'}`
-      )
-      // Clear any existing workflows to ensure a clean state
+    if (!data || !Array.isArray(data)) {
+      logger.info('No workflows found in database')
       useWorkflowRegistry.setState({ workflows: {} })
-
-      // Mark registry as initialized even with empty data
-      setRegistryInitialized()
       return
     }
 
-    // Process workflows and update stores
+    // Process workflows
     const registryWorkflows: Record<string, WorkflowMetadata> = {}
 
-    // Process each workflow from the database
     data.forEach((workflow) => {
       const {
         id,
@@ -229,85 +144,43 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
         description,
         color,
         state,
-        lastSynced,
-        isDeployed,
-        deployedAt,
-        apiKey,
         createdAt,
         marketplaceData,
-        workspaceId, // Extract workspaceId
-        folderId, // Extract folderId
+        workspaceId,
+        folderId,
       } = workflow
 
-      // Ensure this workflow belongs to the current workspace
+      // Skip if workflow doesn't belong to active workspace
       if (activeWorkspaceId && workspaceId !== activeWorkspaceId) {
-        logger.warn(
-          `Skipping workflow ${id} as it belongs to workspace ${workspaceId}, not the active workspace ${activeWorkspaceId}`
-        )
         return
       }
 
-      // 1. Update registry store with workflow metadata
+      // Add to registry
       registryWorkflows[id] = {
         id,
         name,
         description: description || '',
         color: color || '#3972F6',
-        // Use createdAt for sorting if available, otherwise fall back to lastSynced
-        lastModified: createdAt ? new Date(createdAt) : new Date(lastSynced),
-        marketplaceData: marketplaceData || null,
-        workspaceId, // Include workspaceId in metadata
-        folderId: folderId || null, // Include folderId in metadata
-      }
-
-      // 2. Prepare workflow state data
-      const workflowState = {
-        blocks: state.blocks || {},
-        edges: state.edges || [],
-        loops: state.loops || {},
-        parallels: state.parallels || {},
-        isDeployed: isDeployed || false,
-        deployedAt: deployedAt ? new Date(deployedAt) : undefined,
-        apiKey,
-        lastSaved: Date.now(),
+        lastModified: createdAt ? new Date(createdAt) : new Date(),
         marketplaceData: marketplaceData || null,
+        workspaceId,
+        folderId: folderId || null,
       }
 
-      // 3. Initialize subblock values from the workflow state
+      // Initialize subblock values
       const subblockValues: Record<string, Record<string, any>> = {}
-
-      // Extract subblock values from blocks
-      Object.entries(workflowState.blocks).forEach(([blockId, block]) => {
-        const blockState = block as BlockState
-        subblockValues[blockId] = {}
-
-        Object.entries(blockState.subBlocks || {}).forEach(([subblockId, subblock]) => {
-          subblockValues[blockId][subblockId] = subblock.value
-        })
-      })
-
-      // Get any additional subblock values that might not be in the state but are in the store
-      const storedValues = useSubBlockStore.getState().workflowValues[id] || {}
-      Object.entries(storedValues).forEach(([blockId, blockValues]) => {
-        if (!subblockValues[blockId]) {
+      if (state?.blocks) {
+        Object.entries(state.blocks).forEach(([blockId, block]) => {
+          const blockState = block as BlockState
           subblockValues[blockId] = {}
-        }
-
-        Object.entries(blockValues).forEach(([subblockId, value]) => {
-          // Only update if not already set or if value is null
-          if (
-            subblockValues[blockId][subblockId] === null ||
-            subblockValues[blockId][subblockId] === undefined
-          ) {
-            subblockValues[blockId][subblockId] = value
-          }
-        })
-      })
 
-      // 4. Only store metadata in registry - no workflow state caching
-      // Workflow states will be fetched individually when needed
+          Object.entries(blockState.subBlocks || {}).forEach(([subblockId, subblock]) => {
+            subblockValues[blockId][subblockId] = subblock.value
+          })
+        })
+      }
 
-      // 5. Update subblock store for this workflow
+      // Update subblock store
       useSubBlockStore.setState((state) => ({
         workflowValues: {
           ...state.workflowValues,
@@ -316,210 +189,30 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       }))
     })
 
-    logger.info(
-      `Loaded ${Object.keys(registryWorkflows).length} workflows for ${activeWorkspaceId ? `workspace ${activeWorkspaceId}` : 'user'}`
-    )
-
-    // 8. Update registry store with all workflows
+    // Update registry
     useWorkflowRegistry.setState({ workflows: registryWorkflows })
 
-    // Capture initial state for change detection
-    lastWorkflowState = getAllWorkflowsWithValues()
-
-    // 9. Don't automatically load first workflow - it will be loaded when setActiveWorkflow is called
-    // This maintains the clean "metadata in registry, active workflow in store" separation
+    // Set first workflow as active if none selected
     const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
     if (!activeWorkflowId && Object.keys(registryWorkflows).length > 0) {
       const firstWorkflowId = Object.keys(registryWorkflows)[0]
-      // Just set the active workflow ID - the actual state will be fetched when needed
       useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
-      logger.info(
-        `Set first workflow ${firstWorkflowId} as active (state will be loaded on demand)`
-      )
     }
 
-    // Mark registry as fully initialized now that all data is loaded
-    setRegistryInitialized()
+    logger.info(`Loaded ${Object.keys(registryWorkflows).length} workflows`)
   } catch (error) {
-    logger.error('Error fetching workflows from DB:', { error })
-
-    // Mark registry as initialized even on error to allow fallback mechanisms
-    setRegistryInitialized()
+    logger.error('Error fetching workflows from DB:', error)
   } finally {
-    // Reset the flag after a short delay to allow state to settle
-    setTimeout(() => {
-      _isLoadingFromDB = false
-      loadingFromDBToken = null
-
-      // Set loading state to false
-      useWorkflowRegistry.getState().setLoading(false)
-
-      // Verify if registry has workflows as a final check
-      const registryWorkflows = useWorkflowRegistry.getState().workflows
-      const workflowCount = Object.keys(registryWorkflows).length
-      logger.info(`DB loading complete. Workflows in registry: ${workflowCount}`)
-
-      // Only trigger a final sync if necessary (don't do this for normal loads)
-      // This helps reduce unnecessary POST requests
-      const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-      if (workflowCount > 0 && activeWorkflowId && activeDBSyncNeeded()) {
-        // Small delay for state to fully settle before allowing syncs
-        setTimeout(() => {
-          isDirty = true // Explicitly mark as dirty for first sync
-          workflowSync.sync()
-        }, 500)
-      }
-    }, 1000) // Increased to 1 second for more reliable state settling
-  }
-}
-
-// Helper to determine if an active DB sync is actually needed
-function activeDBSyncNeeded(): boolean {
-  // In most cases after initial load, we don't need to sync back to DB
-  // Only sync if we have detected a change that needs to be persisted
-  const lastSynced = localStorage.getItem('last_db_sync_timestamp')
-  const currentTime = Date.now()
-
-  if (!lastSynced) {
-    // First sync - record it and return true
-    localStorage.setItem('last_db_sync_timestamp', currentTime.toString())
-    return true
+    useWorkflowRegistry.getState().setLoading(false)
   }
-
-  // Add additional checks here if needed for specific workflow changes
-  // For now, we'll simply avoid the automatic sync after load
-  return isDirty
-}
-
-// Create the basic sync configuration
-const workflowSyncConfig = {
-  endpoint: API_ENDPOINTS.SYNC,
-  preparePayload: () => {
-    if (typeof window === 'undefined') return {}
-
-    // Skip sync if registry is not fully initialized yet
-    if (!isRegistryInitialized()) {
-      logger.info('Skipping workflow sync while registry is not fully initialized')
-      return { skipSync: true }
-    }
-
-    // Skip sync if we're currently loading from DB to prevent overwriting DB data
-    if (isActivelyLoadingFromDB()) {
-      logger.info('Skipping workflow sync while loading from DB')
-      return { skipSync: true }
-    }
-
-    // Get all workflows with values
-    const allWorkflowsData = getAllWorkflowsWithValues()
-
-    // Only sync if there are actually changes
-    if (!isDirty && !hasWorkflowChanges(allWorkflowsData)) {
-      logger.info('Skipping workflow sync - no changes detected')
-      return { skipSync: true }
-    }
-
-    // Reset dirty flag since we're about to sync
-    resetDirtyFlag()
-
-    // Get the active workspace ID
-    const activeWorkspaceId = useWorkflowRegistry.getState().activeWorkspaceId
-
-    // Skip sync if there are no workflows to sync
-    if (Object.keys(allWorkflowsData).length === 0) {
-      // Safety check: if registry has workflows but we're sending empty data, something is wrong
-      const registryWorkflows = useWorkflowRegistry.getState().workflows
-      if (Object.keys(registryWorkflows).length > 0) {
-        logger.warn(
-          'Potential data loss prevented: Registry has workflows but sync payload is empty'
-        )
-        return { skipSync: true }
-      }
-
-      logger.info('Skipping workflow sync - no workflows to sync')
-      return { skipSync: true }
-    }
-
-    // Filter out any workflows associated with workspaces other than the active one
-    // This prevents foreign key constraint errors when a workspace has been deleted
-    const workflowsData: Record<string, any> = {}
-    Object.entries(allWorkflowsData).forEach(([id, workflow]) => {
-      // Include workflows if:
-      // 1. They match the active workspace, OR
-      // 2. They don't have a workspace ID (legacy workflows)
-      if (workflow.workspaceId === activeWorkspaceId || !workflow.workspaceId) {
-        // For workflows without workspace ID, assign the active workspace ID
-        if (!workflow.workspaceId) {
-          workflow.workspaceId = activeWorkspaceId
-          logger.info(`Assigning workspace ${activeWorkspaceId} to orphaned workflow ${id}`)
-        }
-        workflowsData[id] = workflow
-      } else {
-        logger.warn(
-          `Skipping sync for workflow ${id} - associated with non-active workspace ${workflow.workspaceId}`
-        )
-      }
-    })
-
-    // Skip sync if after filtering there are no workflows to sync
-    if (Object.keys(workflowsData).length === 0) {
-      logger.info('Skipping workflow sync - no workflows for active workspace to sync')
-      return { skipSync: true }
-    }
-
-    // Always include the workspace ID in the payload for correct DB filtering
-    return {
-      workflows: workflowsData,
-      workspaceId: activeWorkspaceId, // Include active workspace ID in the payload
-    }
-  },
-  method: 'POST' as const,
-  syncOnInterval: true,
-  syncOnExit: true,
-}
-
-// Create the sync manager
-const baseWorkflowSync = createSingletonSyncManager('workflow-sync', () => workflowSyncConfig)
-
-// Create a debounced version of the sync manager
-export const workflowSync = {
-  ...baseWorkflowSync,
-  sync: () => {
-    // Skip sync if not initialized
-    if (!isRegistryInitialized()) {
-      logger.info('Sync requested but registry not fully initialized yet - delaying')
-      // If we're not initialized, mark dirty and check again later
-      isDirty = true
-      return
-    }
-
-    // Clear any existing timeout
-    if (syncDebounceTimer) {
-      clearTimeout(syncDebounceTimer)
-    }
-
-    // Set new timeout
-    syncDebounceTimer = setTimeout(() => {
-      // Perform the sync
-      baseWorkflowSync.sync()
-
-      // Update the last sync timestamp
-      if (typeof window !== 'undefined') {
-        localStorage.setItem('last_db_sync_timestamp', Date.now().toString())
-      }
-    }, DEBOUNCE_DELAY)
-  },
 }
 
 /**
  * Fetch a single workflow state from the database
- * @param workflowId The ID of the workflow to fetch
- * @returns Promise that resolves to the workflow state if found, null otherwise
  */
 export async function fetchWorkflowStateFromDB(workflowId: string): Promise<any | null> {
   try {
-    const response = await fetch(`/api/workflows/${workflowId}`, {
-      method: 'GET',
-    })
+    const response = await fetch(`/api/workflows/${workflowId}`, { method: 'GET' })
 
     if (!response.ok) {
       if (response.status === 404) {
@@ -536,3 +229,12 @@ export async function fetchWorkflowStateFromDB(workflowId: string): Promise<any
     return null
   }
 }
+
+/**
+ * Mark workflows as dirty for sync
+ */
+export function markWorkflowsDirty(): void {
+  // Force a sync by clearing the last synced data hash
+  lastSyncedData = ''
+  logger.info('Workflows marked as dirty')
+}
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 35f090eb384..77c938d3d60 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -46,31 +46,24 @@ const initialState = {
 
 // Create a consolidated sync control implementation
 /**
- * The SyncControl implementation provides a clean, centralized way to handle workflow syncing.
- *
- * This pattern offers several advantages:
- * 1. It encapsulates sync logic through a clear, standardized interface
- * 2. It allows components to mark workflows as dirty without direct dependencies
- * 3. It prevents race conditions by ensuring changes are properly tracked before syncing
- * 4. It centralizes sync decisions to avoid redundant or conflicting operations
- *
- * Usage:
- * - Call markDirty() when workflow state changes but sync can be deferred
- * - Call forceSync() when an immediate sync to the server is needed
- * - Use isDirty() to check if there are unsaved changes
+ * Simplified SyncControl implementation
  */
 const createSyncControl = (): SyncControl => ({
   markDirty: () => {
+    // Simply mark workflows as dirty for sync
     markWorkflowsDirty()
   },
   isDirty: () => {
-    // This calls into the sync module to check dirty status
-    // Actual implementation in sync.ts
-    return true // Always return true as the sync module will do the actual checking
+    // Always return true - let the sync system decide if sync is needed
+    return true
   },
   forceSync: () => {
-    markWorkflowsDirty() // Always mark as dirty before forcing a sync
-    workflowSync.sync()
+    // Force sync by marking dirty and syncing
+    markWorkflowsDirty()
+    // Small delay to ensure state has settled
+    setTimeout(() => {
+      workflowSync.sync()
+    }, 100)
   },
 })
 
@@ -134,7 +127,7 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           set(newState)
           pushHistory(set, get, newState, `Add ${type} node`)
           get().updateLastSaved()
-          workflowSync.sync()
+          get().sync.markDirty()
           return
         }
 
@@ -184,7 +177,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
         pushHistory(set, get, newState, `Add ${type} block`)
         get().updateLastSaved()
         get().sync.markDirty()
-        get().sync.forceSync()
       },
 
       updateBlockPosition: (id: string, position: Position) => {
@@ -199,8 +191,7 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           edges: [...state.edges],
         }))
         get().updateLastSaved()
-
-        // No sync here as this is a frequent operation during dragging
+        // No sync for position updates to avoid excessive syncing during drag
       },
 
       updateNodeDimensions: (id: string, dimensions: { width: number; height: number }) => {
@@ -219,7 +210,7 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           edges: [...state.edges],
         }))
         get().updateLastSaved()
-        workflowSync.sync()
+        get().sync.markDirty()
       },
 
       updateParentId: (id: string, parentId: string, extent: 'parent') => {
@@ -290,7 +281,8 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           parentId ? `Set parent for ${block.name}` : `Remove parent for ${block.name}`
         )
         get().updateLastSaved()
-        workflowSync.sync()
+        get().sync.markDirty()
+        get().sync.forceSync()
       },
 
       removeBlock: (id: string) => {
@@ -362,7 +354,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
         pushHistory(set, get, newState, 'Remove block and children')
         get().updateLastSaved()
         get().sync.markDirty()
-        get().sync.forceSync()
       },
 
       addEdge: (edge: Edge) => {
@@ -390,7 +381,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
 
         const newEdges = [...get().edges, newEdge]
 
-        // Use the new loop generation approach
         const newState = {
           blocks: { ...get().blocks },
           edges: newEdges,
@@ -402,7 +392,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
         pushHistory(set, get, newState, 'Add connection')
         get().updateLastSaved()
         get().sync.markDirty()
-        get().sync.forceSync()
       },
 
       removeEdge: (edgeId: string) => {
@@ -415,7 +404,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
 
         const newEdges = get().edges.filter((edge) => edge.id !== edgeId)
 
-        // Use the new loop generation approach instead of cycle detection
         const newState = {
           blocks: { ...get().blocks },
           edges: newEdges,
@@ -427,7 +415,6 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
         pushHistory(set, get, newState, 'Remove connection')
         get().updateLastSaved()
         get().sync.markDirty()
-        get().sync.forceSync()
       },
 
       clear: () => {
@@ -435,6 +422,7 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           blocks: {},
           edges: [],
           loops: {},
+          parallels: {},
           history: {
             past: [],
             present: {
@@ -460,18 +448,12 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
         }
         set(newState)
         get().sync.markDirty()
-        get().sync.forceSync()
-
         return newState
       },
 
       updateLastSaved: () => {
         set({ lastSaved: Date.now() })
-
         // Note: Scheduling changes are automatically handled by the workflowSync
-        // When the workflow is synced to the database, the sync system checks if
-        // the starter block has scheduling enabled and updates or cancels the
-        // schedule accordingly.
       },
 
       toggleBlockEnabled: (id: string) => {
@@ -485,12 +467,12 @@ export const useWorkflowStore = create<WorkflowStoreWithHistory>()(
           },
           edges: [...get().edges],
           loops: { ...get().loops },
+          parallels: { ...get().parallels },
         }
 
         set(newState)
         get().updateLastSaved()
         get().sync.markDirty()
-        get().sync.forceSync()
       },
 
       duplicateBlock: (id: string) => {

From 1882d1ecff1cb86a709b9726d2ecf6d014e40c41 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 13:27:17 -0700
Subject: [PATCH 07/27] lint

---
 apps/sim/lib/oauth/index.ts | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 apps/sim/lib/oauth/index.ts

diff --git a/apps/sim/lib/oauth/index.ts b/apps/sim/lib/oauth/index.ts
new file mode 100644
index 00000000000..3ca648a5bff
--- /dev/null
+++ b/apps/sim/lib/oauth/index.ts
@@ -0,0 +1 @@
+export * from './oauth'

From ef8b17f9739c26956ab2a76badfc6db268d1d7de Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 13:29:52 -0700
Subject: [PATCH 08/27] modify pre commit hook

---
 .husky/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.husky/pre-commit b/.husky/pre-commit
index f54fc9cd5cf..36946c38ebf 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1 +1 @@
-bunx lint-staged
\ No newline at end of file
+bun lint
\ No newline at end of file

From 549b0f8d96b36df592a78d5c909039351337d8e7 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 16:12:02 -0700
Subject: [PATCH 09/27] fix oauth

---
 .../components/oauth-required-modal.tsx       | 112 +++++++-----------
 .../credential-selector.tsx                   |  37 ++----
 .../components/confluence-file-selector.tsx   |  37 ++----
 .../components/google-drive-picker.tsx        |  37 ++----
 .../components/jira-issue-selector.tsx        |  37 ++----
 .../components/microsoft-file-selector.tsx    |  37 ++----
 .../components/teams-message-selector.tsx     |  54 +++------
 .../folder-selector/folder-selector.tsx       |  37 ++----
 .../components/jira-project-selector.tsx      |  37 ++----
 apps/sim/stores/workflows/persistence.ts      |  27 +++++
 10 files changed, 137 insertions(+), 315 deletions(-)

diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
index eb2bca96f4f..8c06924f53e 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -10,6 +10,7 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@/components/ui/dialog'
+import { client } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console-logger'
 import {
   getProviderIdFromServiceId,
@@ -18,7 +19,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 
 const logger = createLogger('OAuthRequiredModal')
 
@@ -156,90 +157,57 @@ export function OAuthRequiredModal({
     (scope) => !scope.includes('userinfo.email') && !scope.includes('userinfo.profile')
   )
 
-  const handleConnectAccount = () => {
-    // Calculate the provider ID from service ID
-    const effectiveProviderId = getProviderIdFromServiceId(effectiveServiceId)
+  const handleRedirectToSettings = () => {
+    try {
+      // Determine the appropriate serviceId and providerId
+      const providerId = getProviderIdFromServiceId(effectiveServiceId)
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: effectiveProviderId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'oauth-required-modal',
-      timestamp: Date.now(),
-    }
+      // Store information about the required connection
+      saveToStorage<string>('pending_service_id', effectiveServiceId)
+      saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+      saveToStorage<string>('pending_oauth_return_url', window.location.href)
+      saveToStorage<string>('pending_oauth_provider_id', providerId)
+      saveToStorage<boolean>('from_oauth_modal', true)
 
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+      // Close the modal
+      onClose()
 
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: effectiveProviderId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
+      // Open the settings modal with the credentials tab
+      const event = new CustomEvent('open-settings', {
+        detail: { tab: 'credentials' },
       })
-
-      window.location.href = authUrl
+      window.dispatchEvent(event)
     } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback: redirect without state using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: effectiveProviderId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
+      logger.error('Error redirecting to settings:', { error })
     }
-
-    onClose()
   }
 
-  const handleConnectExisting = () => {
-    // Calculate the provider ID from service ID
-    const effectiveProviderId = getProviderIdFromServiceId(effectiveServiceId)
+  const handleConnectDirectly = async () => {
+    try {
+      // Determine the appropriate serviceId and providerId
+      const providerId = getProviderIdFromServiceId(effectiveServiceId)
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: effectiveProviderId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'oauth-required-modal-existing',
-      timestamp: Date.now(),
-    }
+      // Store information about the required connection
+      saveToStorage<string>('pending_service_id', effectiveServiceId)
+      saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+      saveToStorage<string>('pending_oauth_return_url', window.location.href)
+      saveToStorage<string>('pending_oauth_provider_id', providerId)
 
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
+      // Close the modal
+      onClose()
 
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: effectiveProviderId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
+      logger.info('Linking OAuth2:', {
+        providerId,
+        requiredScopes,
       })
 
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback: redirect without state using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: effectiveProviderId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
+      await client.oauth2.link({
+        providerId,
+        callbackURL: window.location.href,
       })
-
-      window.location.href = authUrl
+    } catch (error) {
+      logger.error('Error initiating OAuth flow:', { error })
     }
-
-    onClose()
   }
 
   return (
@@ -287,13 +255,13 @@ export function OAuthRequiredModal({
           <Button variant='outline' onClick={onClose} className='sm:order-1'>
             Cancel
           </Button>
-          <Button type='button' onClick={handleConnectAccount} className='sm:order-3'>
+          <Button type='button' onClick={handleConnectDirectly} className='sm:order-3'>
             Connect Now
           </Button>
           <Button
             type='button'
             variant='secondary'
-            onClick={handleConnectExisting}
+            onClick={handleRedirectToSettings}
             className='sm:order-2'
           >
             Go to Settings
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
index 6754efa716f..717dbacd072 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
@@ -21,7 +21,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from './components/oauth-required-modal'
 
 const logger = createLogger('CredentialSelector')
@@ -165,35 +165,14 @@ export function CredentialSelector({
 
   // Handle adding a new credential
   const handleAddCredential = () => {
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: effectiveProviderId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'credential-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: effectiveProviderId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', effectiveProviderId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
index 2356427844d..a7f2e9e7bd2 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
@@ -19,7 +19,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 export interface ConfluenceFileInfo {
@@ -358,35 +358,14 @@ export function ConfluenceFileSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'confluence-file-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      console.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
index 066139847e0..2d0938bae5d 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
@@ -24,7 +24,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('GoogleDrivePicker')
@@ -289,35 +289,14 @@ export function GoogleDrivePicker({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'google-drive-picker',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
index 89bf9216ab2..2a2c2922996 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
@@ -20,7 +20,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_issue_selector')
@@ -423,35 +423,14 @@ export function JiraIssueSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'jira-issue-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
index e2898e9592a..a04f7e01c6b 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
@@ -23,7 +23,7 @@ import {
   type OAuthProvider,
   parseProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = createLogger('MicrosoftFileSelector')
@@ -254,35 +254,14 @@ export function MicrosoftFileSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'microsoft-file-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
     setSearchQuery('') // Clear search when closing
   }
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
index effcc95ddde..f71abcfdce5 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
@@ -20,12 +20,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import {
-  buildOAuthUrl,
-  buildTeamsChannelUrl,
-  buildTeamsChatUrl,
-  buildTeamsTeamUrl,
-} from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('TeamsMessageSelector')
@@ -172,7 +167,7 @@ export function TeamsMessageSelector({
         displayName: team.displayName,
         type: 'team' as const,
         teamId: team.id,
-        webViewLink: buildTeamsTeamUrl(team.id),
+        webViewLink: `https://teams.microsoft.com/l/team/${team.id}`,
       }))
 
       setTeams(teamsData)
@@ -234,7 +229,7 @@ export function TeamsMessageSelector({
           type: 'channel' as const,
           teamId,
           channelId: channel.id,
-          webViewLink: buildTeamsChannelUrl(teamId, channel.displayName, channel.id),
+          webViewLink: `https://teams.microsoft.com/l/channel/${teamId}/${encodeURIComponent(channel.displayName)}/${channel.id}`,
         }))
 
         setChannels(channelsData)
@@ -298,7 +293,7 @@ export function TeamsMessageSelector({
         displayName: chat.displayName,
         type: 'chat' as const,
         chatId: chat.id,
-        webViewLink: buildTeamsChatUrl(chat.id),
+        webViewLink: `https://teams.microsoft.com/l/chat/${chat.id}`,
       }))
 
       setChats(chatsData)
@@ -407,35 +402,14 @@ export function TeamsMessageSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'teams-message-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
@@ -542,7 +516,7 @@ export function TeamsMessageSelector({
               displayName: team.displayName,
               type: 'team',
               teamId: team.id,
-              webViewLink: buildTeamsTeamUrl(team.id),
+              webViewLink: `https://teams.microsoft.com/l/team/${team.id}`,
             }
             setSelectedTeamId(team.id)
             setSelectedMessage(teamInfo)
@@ -580,7 +554,7 @@ export function TeamsMessageSelector({
               displayName: chat.displayName,
               type: 'chat',
               chatId: chat.id,
-              webViewLink: buildTeamsChatUrl(chat.id),
+              webViewLink: `https://teams.microsoft.com/l/chat/${chat.id}`,
             }
             setSelectedChatId(chat.id)
             setSelectedMessage(chatInfo)
@@ -642,7 +616,7 @@ export function TeamsMessageSelector({
                         type: 'channel' as const,
                         teamId: team.id,
                         channelId: channel.id,
-                        webViewLink: buildTeamsChannelUrl(team.id, channel.displayName, channel.id),
+                        webViewLink: `https://teams.microsoft.com/l/channel/${team.id}/${encodeURIComponent(channel.displayName)}/${channel.id}`,
                       },
                     }
                   }
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
index 96baa45f5bd..2a0d9990eab 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
@@ -15,8 +15,8 @@ import {
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { createLogger } from '@/lib/logs/console-logger'
 import { type Credential, getProviderIdFromServiceId, getServiceIdFromScopes } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
 import { OAuthRequiredModal } from '@/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal'
+import { saveToStorage } from '@/stores/workflows/persistence'
 
 const logger = createLogger('FolderSelector')
 
@@ -277,35 +277,14 @@ export function FolderSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'folder-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
index 778dab55a9f..5d562708a2a 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx
@@ -20,7 +20,7 @@ import {
   getServiceIdFromScopes,
   type OAuthProvider,
 } from '@/lib/oauth'
-import { buildOAuthUrl } from '@/lib/urls/utils'
+import { saveToStorage } from '@/stores/workflows/persistence'
 import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'
 
 const logger = new Logger('jira_project_selector')
@@ -374,35 +374,14 @@ export function JiraProjectSelector({
     const effectiveServiceId = getServiceId()
     const providerId = getProviderId()
 
-    // Store OAuth state in localStorage before redirect
-    const oauthState = {
-      providerId: providerId,
-      serviceId: effectiveServiceId,
-      requiredScopes,
-      returnUrl: window.location.href,
-      context: 'jira-project-selector',
-      timestamp: Date.now(),
-    }
-
-    // Use localStorage for OAuth state management
-    try {
-      localStorage.setItem('pending_oauth_state', JSON.stringify(oauthState))
-
-      // Navigate to OAuth URL using the utility function
-      const authUrl = buildOAuthUrl({
-        provider: providerId,
-        service: effectiveServiceId,
-        scopes: requiredScopes,
-        returnUrl: window.location.href,
-      })
-
-      window.location.href = authUrl
-    } catch (error) {
-      logger.error('Failed to store OAuth state:', error)
-      // Fallback to OAuth modal
-      setShowOAuthModal(true)
-    }
+    // Store information about the required connection
+    saveToStorage<string>('pending_service_id', effectiveServiceId)
+    saveToStorage<string[]>('pending_oauth_scopes', requiredScopes)
+    saveToStorage<string>('pending_oauth_return_url', window.location.href)
+    saveToStorage<string>('pending_oauth_provider_id', providerId)
 
+    // Show the OAuth modal
+    setShowOAuthModal(true)
     setOpen(false)
   }
 
diff --git a/apps/sim/stores/workflows/persistence.ts b/apps/sim/stores/workflows/persistence.ts
index 99fa2b0f536..cc7a57118b7 100644
--- a/apps/sim/stores/workflows/persistence.ts
+++ b/apps/sim/stores/workflows/persistence.ts
@@ -19,6 +19,33 @@ interface OAuthState {
 const OAUTH_STATE_KEY = 'pending_oauth_state'
 const OAUTH_STATE_EXPIRY = 10 * 60 * 1000 // 10 minutes
 
+/**
+ * Generic function to save data to localStorage (used by main branch OAuth flow)
+ */
+export function saveToStorage<T>(key: string, data: T): boolean {
+  try {
+    localStorage.setItem(key, JSON.stringify(data))
+    return true
+  } catch (error) {
+    logger.error(`Failed to save data to ${key}:`, { error })
+    return false
+  }
+}
+
+/**
+ * Generic function to load data from localStorage
+ */
+export function loadFromStorage<T>(key: string): T | null {
+  try {
+    const stored = localStorage.getItem(key)
+    if (!stored) return null
+    return JSON.parse(stored) as T
+  } catch (error) {
+    logger.error(`Failed to load data from ${key}:`, { error })
+    return null
+  }
+}
+
 /**
  * Save OAuth state to localStorage before redirect
  */

From de8da66a0555d05e8297c56961bc9d39f5e44eb1 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 16:47:47 -0700
Subject: [PATCH 10/27] get last active workspace working again

---
 apps/sim/app/w/[id]/workflow.tsx              |  20 ++-
 .../workspace-header/workspace-header.tsx     |   2 +-
 apps/sim/stores/index.ts                      | 153 +-----------------
 apps/sim/stores/sync-registry.ts              |  14 +-
 apps/sim/stores/workflows/registry/store.ts   |  33 +++-
 apps/sim/stores/workflows/sync.ts             |  21 ++-
 6 files changed, 75 insertions(+), 168 deletions(-)

diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index 3cf10dfc631..a0e666447d0 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -24,6 +24,7 @@ import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useGeneralStore } from '@/stores/settings/general/store'
 import { useSidebarStore } from '@/stores/sidebar/store'
 import { initializeSyncManagers } from '@/stores/sync-registry'
+import { isAppInitialized } from '@/stores'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
@@ -76,7 +77,7 @@ function WorkflowContent() {
   const { project, getNodes, fitView } = useReactFlow()
 
   // Store access
-  const { workflows, setActiveWorkflow, createWorkflow } = useWorkflowRegistry()
+  const { workflows, setActiveWorkflow, createWorkflow, isLoading: workflowsLoading } = useWorkflowRegistry()
   const {
     blocks,
     edges,
@@ -730,13 +731,25 @@ function WorkflowContent() {
       const workflowIds = Object.keys(workflows)
       const currentId = params.id as string
 
+      // Wait for both initialization and workflow loading to complete
+      if (workflowsLoading) {
+        logger.info('Workflows still loading, waiting...')
+        return
+      }
+
+      // If no workflows exist after loading is complete, create initial workflow
       if (workflowIds.length === 0) {
-        // Create initial workflow using the centralized function
-        const newId = createWorkflow({ isInitial: true })
+        logger.info('No workflows found after loading complete, creating initial workflow')
+        const newId = createWorkflow({ 
+          name: 'My First Workflow',
+          description: 'Getting started with agents',
+          isInitial: true 
+        })
         router.replace(`/w/${newId}`)
         return
       }
 
+      // Navigate to existing workflow or first available
       if (!workflows[currentId]) {
         router.replace(`/w/${workflowIds[0]}`)
         return
@@ -762,6 +775,7 @@ function WorkflowContent() {
   }, [
     params.id,
     workflows,
+    workflowsLoading,
     setActiveWorkflow,
     createWorkflow,
     router,
diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 29b4e8107a4..5d3dc5bed6c 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -316,7 +316,7 @@ export function WorkspaceHeader({
     setActiveWorkspace(workspace)
     setIsOpen(false)
 
-    // Use full workspace switch to clear workflows and load new ones
+    // Use full workspace switch which now handles localStorage automatically
     switchToWorkspace(workspace.id)
 
     // Update URL to include workspace ID
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index dcc7cec2eda..4fd1723a714 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -42,28 +42,15 @@ async function initializeApplication(): Promise<void> {
     // Load custom tools from server
     await useCustomToolsStore.getState().loadCustomTools()
 
-    // Load user's last active workspace from server
+    // Load user's last active workspace from localStorage (with validation)
     await useWorkflowRegistry.getState().loadLastActiveWorkspace()
 
-    // Set a flag in sessionStorage to detect new login sessions
-    // This helps identify fresh logins in private browsers
-    const isNewLoginSession = !sessionStorage.getItem('app_initialized')
-    sessionStorage.setItem('app_initialized', 'true')
-
-    // Initialize sync system for other stores
-    await initializeSyncManagers()
-
-    // Check if we have workflows from DB sync
-    const registryState = useWorkflowRegistry.getState()
-    const hasDbWorkflows = Object.keys(registryState.workflows).length > 0
-
-    if (!hasDbWorkflows && isNewLoginSession) {
-      // Critical safeguard: For new login sessions with no DB workflows
-      logger.info('New login session with no workflows - preventing initial sync')
-
-      // Create the first starter workflow with an agent block for new users
-      logger.info('Creating first workflow with agent block for new user')
-      createFirstWorkflowWithAgentBlock()
+    // Initialize sync system and wait for data to load completely
+    const syncInitialized = await initializeSyncManagers()
+    
+    if (!syncInitialized) {
+      logger.error('Failed to initialize sync managers')
+      return
     }
 
     // Register cleanup
@@ -194,9 +181,6 @@ export async function reinitializeAfterLogin(): Promise<void> {
     // Clean existing state to avoid stale data
     resetAllStores()
 
-    // Mark as a new login session
-    sessionStorage.removeItem('app_initialized')
-
     // Reset initialization flags to force a fresh load
     isInitializing = false
 
@@ -271,128 +255,5 @@ export const logAllStores = () => {
   return state
 }
 
-/**
- * Creates the first workflow with a starter and agent block for new users
- */
-function createFirstWorkflowWithAgentBlock(): void {
-  // Create a workflow with default settings
-  const workflowId = useWorkflowRegistry.getState().createWorkflow({
-    name: 'My First Workflow',
-    description: 'Getting started with agents',
-    isInitial: true,
-  })
-
-  // Get the current workflow state
-  const workflowState = useWorkflowStore.getState()
-  const starterBlockId = Object.keys(workflowState.blocks)[0]
-
-  if (!starterBlockId) {
-    logger.error('Failed to find starter block in new workflow')
-    return
-  }
-
-  // Create an agent block
-  const agentBlockId = crypto.randomUUID()
-  const agentBlock: BlockState = {
-    id: agentBlockId,
-    type: 'agent',
-    name: 'Agent',
-    position: { x: 577.2367674819552, y: -173.0961530669049 },
-    subBlocks: {
-      systemPrompt: {
-        id: 'systemPrompt',
-        type: 'long-input' as SubBlockType,
-        value: 'You are a helpful assistant.',
-      },
-      context: {
-        id: 'context',
-        type: 'short-input' as SubBlockType,
-        value: '',
-      },
-      model: {
-        id: 'model',
-        type: 'dropdown' as SubBlockType,
-        value: 'gpt-4o',
-      },
-      temperature: {
-        id: 'temperature',
-        type: 'slider' as SubBlockType,
-        value: 0.7,
-      },
-      apiKey: {
-        id: 'apiKey',
-        type: 'short-input' as SubBlockType,
-        value: '',
-      },
-      tools: {
-        id: 'tools',
-        type: 'tool-input' as SubBlockType,
-        value: '[]',
-      },
-      responseFormat: {
-        id: 'responseFormat',
-        type: 'code' as SubBlockType,
-        value: null,
-      },
-    },
-    outputs: {
-      response: {
-        content: 'string',
-        model: 'string',
-        tokens: 'any',
-        toolCalls: 'any',
-      },
-    },
-    enabled: true,
-    horizontalHandles: true,
-    isWide: false,
-    height: 642,
-  }
-
-  // Create an edge connecting starter to agent
-  const edgeId = crypto.randomUUID()
-  const edge = {
-    id: edgeId,
-    source: starterBlockId,
-    target: agentBlockId,
-  }
-
-  // Update the workflow state with the new block and edge
-  const updatedState = {
-    ...workflowState,
-    blocks: {
-      ...workflowState.blocks,
-      [agentBlockId]: agentBlock,
-    },
-    edges: [...workflowState.edges, edge],
-    history: {
-      ...workflowState.history,
-      present: {
-        ...workflowState.history.present,
-        state: {
-          ...workflowState.history.present.state,
-          blocks: {
-            ...workflowState.history.present.state.blocks,
-            [agentBlockId]: agentBlock,
-          },
-          edges: [...(workflowState.history.present.state.edges || []), edge],
-        },
-      },
-    },
-    lastSaved: Date.now(),
-  }
-
-  // Set the updated state
-  useWorkflowStore.setState(updatedState)
-
-  // Initialize subblock values for agent block
-  useSubBlockStore.getState().initializeFromWorkflow(workflowId, updatedState.blocks)
-
-  // Mark as dirty to ensure sync
-  syncWorkflows()
-
-  logger.info('First workflow with agent block created successfully')
-}
-
 // Re-export sync managers
 export { workflowSync } from './workflows/sync'
diff --git a/apps/sim/stores/sync-registry.ts b/apps/sim/stores/sync-registry.ts
index 8221896ace5..9cd6bf37be4 100644
--- a/apps/sim/stores/sync-registry.ts
+++ b/apps/sim/stores/sync-registry.ts
@@ -26,19 +26,17 @@ export async function initializeSyncManagers(): Promise<boolean> {
     // Initialize sync managers
     managers = [workflowSync]
 
-    // Fetch data from DB
-    try {
-      await fetchWorkflowsFromDB()
-      logger.info('Workflows loaded from database')
-    } catch (error) {
-      logger.error('Error fetching data from DB:', error)
-    }
+    // Fetch data from DB and properly await completion
+    await fetchWorkflowsFromDB()
+    logger.info('Workflows loaded from database successfully')
 
     initialized = true
     return true
   } catch (error) {
     logger.error('Error initializing sync managers:', error)
-    return false
+    // Still mark as initialized to allow the app to function with empty state
+    initialized = true
+    return true
   } finally {
     initializing = false
   }
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index a4ceeb5e033..1a435b801ef 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -173,6 +173,9 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
           logger.info(`Switching workspace from ${currentWorkspaceId || 'none'} to ${workspaceId}`)
 
+          // IMPORTANT: Save to localStorage first before any async operations
+          get().setActiveWorkspaceId(workspaceId)
+
           // Clear current workspace state
           resetWorkflowStores()
 
@@ -204,10 +207,32 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       loadLastActiveWorkspace: async () => {
         try {
           const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
-          if (savedWorkspaceId && savedWorkspaceId !== get().activeWorkspaceId) {
-            // Set the workspace without triggering a full switch (since we're initializing)
-            set({ activeWorkspaceId: savedWorkspaceId })
-            logger.info(`Restored last active workspace from localStorage: ${savedWorkspaceId}`)
+          if (!savedWorkspaceId || savedWorkspaceId === get().activeWorkspaceId) {
+            return // No saved workspace or already active
+          }
+
+          logger.info(`Attempting to restore last active workspace: ${savedWorkspaceId}`)
+
+          // Validate that the workspace exists by making a simple API call
+          try {
+            const response = await fetch('/api/workspaces')
+            if (response.ok) {
+              const data = await response.json()
+              const workspaces = data.workspaces || []
+              const workspaceExists = workspaces.some((ws: any) => ws.id === savedWorkspaceId)
+              
+              if (workspaceExists) {
+                // Set the validated workspace ID
+                set({ activeWorkspaceId: savedWorkspaceId })
+                logger.info(`Restored last active workspace from localStorage: ${savedWorkspaceId}`)
+              } else {
+                logger.warn(`Saved workspace ${savedWorkspaceId} no longer exists, clearing from localStorage`)
+                localStorage.removeItem('lastActiveWorkspaceId')
+              }
+            }
+          } catch (apiError) {
+            logger.warn('Failed to validate saved workspace, will use default:', apiError)
+            // Don't remove from localStorage in case it's a temporary network issue
           }
         } catch (error) {
           logger.warn('Failed to load last active workspace from localStorage:', error)
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index c677e47bf7a..6aa0a560fdb 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -121,6 +121,7 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
     if (!response.ok) {
       if (response.status === 401) {
         logger.warn('User not authenticated for workflow fetch')
+        useWorkflowRegistry.setState({ workflows: {}, isLoading: false })
         return
       }
       throw new Error(`Failed to fetch workflows: ${response.statusText}`)
@@ -130,7 +131,7 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
 
     if (!data || !Array.isArray(data)) {
       logger.info('No workflows found in database')
-      useWorkflowRegistry.setState({ workflows: {} })
+      useWorkflowRegistry.setState({ workflows: {}, isLoading: false })
       return
     }
 
@@ -189,8 +190,12 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       }))
     })
 
-    // Update registry
-    useWorkflowRegistry.setState({ workflows: registryWorkflows })
+    // Update registry with loaded workflows
+    useWorkflowRegistry.setState({ 
+      workflows: registryWorkflows, 
+      isLoading: false,
+      error: null
+    })
 
     // Set first workflow as active if none selected
     const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
@@ -199,11 +204,15 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
     }
 
-    logger.info(`Loaded ${Object.keys(registryWorkflows).length} workflows`)
+    logger.info(`Successfully loaded ${Object.keys(registryWorkflows).length} workflows from database`)
   } catch (error) {
     logger.error('Error fetching workflows from DB:', error)
-  } finally {
-    useWorkflowRegistry.getState().setLoading(false)
+    useWorkflowRegistry.setState({ 
+      isLoading: false,
+      error: `Failed to load workflows: ${error instanceof Error ? error.message : 'Unknown error'}`
+    })
+    // Re-throw to allow caller to handle the error appropriately
+    throw error
   }
 }
 

From 79029df2d7711aa85a100ae50f4722897b7521ae Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 16:49:58 -0700
Subject: [PATCH 11/27] new workspace logic works

---
 apps/sim/app/w/[id]/workflow.tsx                   | 12 ++++++++----
 .../workspace-header/workspace-header.tsx          |  5 +++--
 apps/sim/stores/index.ts                           |  4 +---
 apps/sim/stores/workflows/registry/store.ts        |  6 ++++--
 apps/sim/stores/workflows/sync.ts                  | 14 ++++++++------
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index a0e666447d0..2a8c3a1827d 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -24,7 +24,6 @@ import { useVariablesStore } from '@/stores/panel/variables/store'
 import { useGeneralStore } from '@/stores/settings/general/store'
 import { useSidebarStore } from '@/stores/sidebar/store'
 import { initializeSyncManagers } from '@/stores/sync-registry'
-import { isAppInitialized } from '@/stores'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
@@ -77,7 +76,12 @@ function WorkflowContent() {
   const { project, getNodes, fitView } = useReactFlow()
 
   // Store access
-  const { workflows, setActiveWorkflow, createWorkflow, isLoading: workflowsLoading } = useWorkflowRegistry()
+  const {
+    workflows,
+    setActiveWorkflow,
+    createWorkflow,
+    isLoading: workflowsLoading,
+  } = useWorkflowRegistry()
   const {
     blocks,
     edges,
@@ -740,10 +744,10 @@ function WorkflowContent() {
       // If no workflows exist after loading is complete, create initial workflow
       if (workflowIds.length === 0) {
         logger.info('No workflows found after loading complete, creating initial workflow')
-        const newId = createWorkflow({ 
+        const newId = createWorkflow({
           name: 'My First Workflow',
           description: 'Getting started with agents',
-          isInitial: true 
+          isInitial: true,
         })
         router.replace(`/w/${newId}`)
         return
diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 5d3dc5bed6c..892abbc5423 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -340,8 +340,9 @@ export function WorkspaceHeader({
           setWorkspaces((prev) => [...prev, newWorkspace])
           setActiveWorkspace(newWorkspace)
 
-          // Update the workflow registry store with the new active workspace
-          setActiveWorkspaceId(newWorkspace.id)
+          // Use switchToWorkspace to properly load workflows for the new workspace
+          // This will clear existing workflows, set loading state, and fetch workflows from DB
+          switchToWorkspace(newWorkspace.id)
 
           // Update URL to include new workspace ID
           router.push(`/w/${newWorkspace.id}`)
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 4fd1723a714..b7797ee3d4b 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -1,6 +1,5 @@
 import { useEffect } from 'react'
 import { createLogger } from '@/lib/logs/console-logger'
-import type { SubBlockType } from '@/blocks/types'
 import { useCopilotStore } from './copilot/store'
 import { useCustomToolsStore } from './custom-tools/store'
 import { useExecutionStore } from './execution/store'
@@ -14,7 +13,6 @@ import { syncWorkflows } from './workflows'
 import { useWorkflowRegistry } from './workflows/registry/store'
 import { useSubBlockStore } from './workflows/subblock/store'
 import { useWorkflowStore } from './workflows/workflow/store'
-import type { BlockState } from './workflows/workflow/types'
 
 const logger = createLogger('Stores')
 
@@ -47,7 +45,7 @@ async function initializeApplication(): Promise<void> {
 
     // Initialize sync system and wait for data to load completely
     const syncInitialized = await initializeSyncManagers()
-    
+
     if (!syncInitialized) {
       logger.error('Failed to initialize sync managers')
       return
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 1a435b801ef..41d0bb94840 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -220,13 +220,15 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               const data = await response.json()
               const workspaces = data.workspaces || []
               const workspaceExists = workspaces.some((ws: any) => ws.id === savedWorkspaceId)
-              
+
               if (workspaceExists) {
                 // Set the validated workspace ID
                 set({ activeWorkspaceId: savedWorkspaceId })
                 logger.info(`Restored last active workspace from localStorage: ${savedWorkspaceId}`)
               } else {
-                logger.warn(`Saved workspace ${savedWorkspaceId} no longer exists, clearing from localStorage`)
+                logger.warn(
+                  `Saved workspace ${savedWorkspaceId} no longer exists, clearing from localStorage`
+                )
                 localStorage.removeItem('lastActiveWorkspaceId')
               }
             }
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index 6aa0a560fdb..f3c42e781d8 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -191,10 +191,10 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
     })
 
     // Update registry with loaded workflows
-    useWorkflowRegistry.setState({ 
-      workflows: registryWorkflows, 
+    useWorkflowRegistry.setState({
+      workflows: registryWorkflows,
       isLoading: false,
-      error: null
+      error: null,
     })
 
     // Set first workflow as active if none selected
@@ -204,12 +204,14 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
     }
 
-    logger.info(`Successfully loaded ${Object.keys(registryWorkflows).length} workflows from database`)
+    logger.info(
+      `Successfully loaded ${Object.keys(registryWorkflows).length} workflows from database`
+    )
   } catch (error) {
     logger.error('Error fetching workflows from DB:', error)
-    useWorkflowRegistry.setState({ 
+    useWorkflowRegistry.setState({
       isLoading: false,
-      error: `Failed to load workflows: ${error instanceof Error ? error.message : 'Unknown error'}`
+      error: `Failed to load workflows: ${error instanceof Error ? error.message : 'Unknown error'}`,
     })
     // Re-throw to allow caller to handle the error appropriately
     throw error

From f1ce4fcd6108358824da1d1b9dfc0df23a36868c Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 17:02:54 -0700
Subject: [PATCH 12/27] fetch locks

---
 apps/sim/stores/workflows/registry/store.ts | 52 ++++++++++-----------
 apps/sim/stores/workflows/sync.ts           | 19 ++++++--
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 41d0bb94840..ee0281bfca7 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -115,39 +115,35 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         // Set transition state
         setWorkspaceTransitioning(true)
 
-        logger.info(`Switching from deleted workspace ${currentWorkspaceId} to ${newWorkspaceId}`)
-
-        // Reset all workflow state
-        resetWorkflowStores()
-
-        // No longer saving workspace to localStorage
-
-        // Set loading state while we fetch workflows
-        set({
-          isLoading: true,
-          workflows: {},
-          activeWorkspaceId: newWorkspaceId,
-          activeWorkflowId: null,
-        })
+        try {
+          logger.info(`Switching from deleted workspace ${currentWorkspaceId} to ${newWorkspaceId}`)
 
-        // Fetch workflows specifically for this workspace
-        fetchWorkflowsFromDB()
-          .then(() => {
-            set({ isLoading: false })
+          // Reset all workflow state
+          resetWorkflowStores()
 
-            // End transition state
-            setWorkspaceTransitioning(false)
+          // Set loading state while we fetch workflows
+          set({
+            isLoading: true,
+            workflows: {},
+            activeWorkspaceId: newWorkspaceId,
+            activeWorkflowId: null,
           })
-          .catch((error) => {
-            logger.error('Error fetching workflows after workspace deletion:', {
-              error,
-              workspaceId: newWorkspaceId,
-            })
-            set({ isLoading: false, error: 'Failed to load workspace data' })
 
-            // End transition state even on error
-            setWorkspaceTransitioning(false)
+          // Properly await workflow fetching to prevent race conditions
+          await fetchWorkflowsFromDB()
+          
+          set({ isLoading: false })
+          logger.info(`Successfully switched to workspace after deletion: ${newWorkspaceId}`)
+        } catch (error) {
+          logger.error('Error fetching workflows after workspace deletion:', {
+            error,
+            workspaceId: newWorkspaceId,
           })
+          set({ isLoading: false, error: 'Failed to load workspace data' })
+        } finally {
+          // End transition state
+          setWorkspaceTransitioning(false)
+        }
       },
 
       // Switch to workspace with comprehensive error handling and loading states
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index f3c42e781d8..d3f0d5d3f89 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -14,6 +14,7 @@ const logger = createLogger('WorkflowsSync')
 // Simplified sync state tracking
 let lastSyncedData = ''
 let isSyncing = false
+let isFetching = false // Add lock to prevent concurrent fetches
 
 /**
  * Simplified workflow sync - no more complex flags and initialization checks
@@ -106,6 +107,14 @@ export const workflowSync = createSingletonSyncManager('workflow-sync', () => wo
 export async function fetchWorkflowsFromDB(): Promise<void> {
   if (typeof window === 'undefined') return
 
+  // Prevent concurrent fetch operations
+  if (isFetching) {
+    logger.info('Fetch already in progress, skipping duplicate request')
+    return
+  }
+
+  isFetching = true
+
   try {
     useWorkflowRegistry.getState().setLoading(true)
 
@@ -197,11 +206,13 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       error: null,
     })
 
-    // Set first workflow as active if none selected
-    const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
-    if (!activeWorkflowId && Object.keys(registryWorkflows).length > 0) {
+    // Only set first workflow as active if no active workflow is set and we have workflows
+    // This prevents race conditions from overriding an already-set active workflow
+    const currentState = useWorkflowRegistry.getState()
+    if (!currentState.activeWorkflowId && Object.keys(registryWorkflows).length > 0) {
       const firstWorkflowId = Object.keys(registryWorkflows)[0]
       useWorkflowRegistry.setState({ activeWorkflowId: firstWorkflowId })
+      logger.info(`Set first workflow as active: ${firstWorkflowId}`)
     }
 
     logger.info(
@@ -215,6 +226,8 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
     })
     // Re-throw to allow caller to handle the error appropriately
     throw error
+  } finally {
+    isFetching = false
   }
 }
 

From 379bbb5467354c52b4f8ab4b2c8a034408c54906 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 17:05:07 -0700
Subject: [PATCH 13/27] works now

---
 apps/sim/stores/workflows/registry/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index ee0281bfca7..3c76ac84dc9 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -131,7 +131,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
           // Properly await workflow fetching to prevent race conditions
           await fetchWorkflowsFromDB()
-          
+
           set({ isLoading: false })
           logger.info(`Successfully switched to workspace after deletion: ${newWorkspaceId}`)
         } catch (error) {

From 36e35e28f1c6d62bbc1ca89560e3f0395aea7593 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 17:20:14 -0700
Subject: [PATCH 14/27] remove empty useEffect

---
 .../settings-modal/components/credentials/credentials.tsx    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx b/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
index f2d8a0ce0e3..da4faef5dc4 100644
--- a/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
+++ b/apps/sim/app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
@@ -179,11 +179,6 @@ export function Credentials({ onOpenChange }: CredentialsProps) {
     }
   }, [searchParams, router, userId])
 
-  // Check for pending OAuth connections and return URL
-  useEffect(() => {
-    // OAuth state managed via localStorage - no additional client-side state management needed
-  }, [authSuccess, onOpenChange, router])
-
   // Fetch services on mount
   useEffect(() => {
     if (userId) {

From deb8fef41371cc146938baff39d60985e0164c4e Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 18:37:31 -0700
Subject: [PATCH 15/27] fix loading issue

---
 apps/sim/app/w/hooks/use-registry-loading.ts | 17 ++++++++++-----
 apps/sim/stores/workflows/registry/store.ts  | 18 +++++++++++----
 apps/sim/stores/workflows/sync.ts            | 23 ++++++++++++++++++++
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/apps/sim/app/w/hooks/use-registry-loading.ts b/apps/sim/app/w/hooks/use-registry-loading.ts
index 0ca7ba5134a..1b8580f9736 100644
--- a/apps/sim/app/w/hooks/use-registry-loading.ts
+++ b/apps/sim/app/w/hooks/use-registry-loading.ts
@@ -10,18 +10,23 @@ import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
  * when workflows are loaded or after a timeout
  */
 export function useRegistryLoading() {
-  const { workflows, setLoading } = useWorkflowRegistry()
+  const { workflows, setLoading, isLoading } = useWorkflowRegistry()
 
   useEffect(() => {
-    // Set loading state initially
-    setLoading(true)
+    // Only set loading if we don't have workflows and aren't already loading
+    if (Object.keys(workflows).length === 0 && !isLoading) {
+      setLoading(true)
+    }
 
     // If workflows are already loaded, clear loading state
-    if (Object.keys(workflows).length > 0) {
-      setTimeout(() => setLoading(false), 300)
+    if (Object.keys(workflows).length > 0 && isLoading) {
+      setTimeout(() => setLoading(false), 100)
       return
     }
 
+    // Only create timeout if we're actually loading
+    if (!isLoading) return
+
     // Create a timeout to clear loading state after max time
     const timeout = setTimeout(() => {
       setLoading(false)
@@ -40,5 +45,5 @@ export function useRegistryLoading() {
       clearTimeout(timeout)
       clearInterval(checkInterval)
     }
-  }, [setLoading, workflows])
+  }, [setLoading, workflows, isLoading])
 }
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 3c76ac84dc9..b0c7ed8c755 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -97,10 +97,9 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
 
       // Set loading state
       setLoading: (loading: boolean) => {
-        // Only set loading to true if workflows is empty
-        if (!loading || Object.keys(get().workflows).length === 0) {
-          set({ isLoading: loading })
-        }
+        // Remove the broken logic that prevents loading when workflows exist
+        // This was causing race conditions during deletion and sync operations
+        set({ isLoading: loading })
       },
 
       // Handle cleanup on workspace deletion
@@ -1119,6 +1118,9 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           return
         }
 
+        // Set loading state to prevent concurrent operations during deletion
+        set({ isLoading: true, error: null })
+
         try {
           // Call DELETE endpoint to remove from database
           const response = await fetch(`/api/workflows/${id}`, {
@@ -1135,6 +1137,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           logger.error(`Failed to delete workflow ${id} from database:`, error)
           set({
             error: `Failed to delete workflow: ${error instanceof Error ? error.message : 'Unknown error'}`,
+            isLoading: false,
           })
           return
         }
@@ -1157,6 +1160,12 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             const remainingIds = Object.keys(newWorkflows)
             newActiveWorkflowId = remainingIds[0] || null
 
+            // Ensure the workflow we're switching to actually exists
+            if (newActiveWorkflowId && !newWorkflows[newActiveWorkflowId]) {
+              logger.warn(`Attempted to switch to non-existent workflow ${newActiveWorkflowId}`)
+              newActiveWorkflowId = null
+            }
+
             if (!newActiveWorkflowId) {
               // No workflows left, initialize empty state
               useWorkflowStore.setState({
@@ -1211,6 +1220,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
             workflows: newWorkflows,
             activeWorkflowId: newActiveWorkflowId,
             error: null,
+            isLoading: false, // Clear loading state after successful deletion
           }
         })
       },
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index d3f0d5d3f89..dbf2736cd6f 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -15,6 +15,7 @@ const logger = createLogger('WorkflowsSync')
 let lastSyncedData = ''
 let isSyncing = false
 let isFetching = false // Add lock to prevent concurrent fetches
+let lastFetchTimestamp = 0 // Track when we last fetched to prevent race conditions
 
 /**
  * Simplified workflow sync - no more complex flags and initialization checks
@@ -113,6 +114,7 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
     return
   }
 
+  const fetchStartTime = Date.now()
   isFetching = true
 
   try {
@@ -136,10 +138,31 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
       throw new Error(`Failed to fetch workflows: ${response.statusText}`)
     }
 
+    // Check if this fetch is still relevant (not superseded by a newer fetch)
+    if (fetchStartTime < lastFetchTimestamp) {
+      logger.info('Fetch superseded by newer operation, discarding results')
+      return
+    }
+
+    // Update timestamp to mark this as the most recent fetch
+    lastFetchTimestamp = fetchStartTime
+
     const { data } = await response.json()
 
     if (!data || !Array.isArray(data)) {
       logger.info('No workflows found in database')
+      
+      // Only clear workflows if we're confident this is a legitimate empty state
+      // Avoid overwriting existing workflows during race conditions
+      const currentWorkflows = useWorkflowRegistry.getState().workflows
+      const hasExistingWorkflows = Object.keys(currentWorkflows).length > 0
+      
+      if (hasExistingWorkflows) {
+        logger.warn('Received empty workflow data but local workflows exist - possible race condition, preserving local state')
+        useWorkflowRegistry.setState({ isLoading: false })
+        return
+      }
+      
       useWorkflowRegistry.setState({ workflows: {}, isLoading: false })
       return
     }

From 771d673fedd10185ecaea4d1876fe60f8fd6ff7c Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 19:04:36 -0700
Subject: [PATCH 16/27] skip empty workflow syncs

---
 apps/sim/app/w/[id]/workflow.tsx  |  8 +++++++-
 apps/sim/stores/workflows/sync.ts | 22 ++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index 2a8c3a1827d..86452b55ea2 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -744,8 +744,14 @@ function WorkflowContent() {
       // If no workflows exist after loading is complete, create initial workflow
       if (workflowIds.length === 0) {
         logger.info('No workflows found after loading complete, creating initial workflow')
+        
+        // Generate numbered workflow name based on existing workflows
+        const existingWorkflowCount = Object.keys(workflows).length
+        const workflowNumber = existingWorkflowCount + 1
+        const workflowName = `Workflow ${workflowNumber}`
+        
         const newId = createWorkflow({
-          name: 'My First Workflow',
+          name: workflowName,
           description: 'Getting started with agents',
           isInitial: true,
         })
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index dbf2736cd6f..d1b9678d5ee 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -38,6 +38,18 @@ const workflowSyncConfig = {
       return { skipSync: true }
     }
 
+    // SAFETY CHECK: Never sync if any workflow has empty state
+    // A valid workflow should always have at least a start block
+    const allWorkflowsHaveBlocks = Object.values(allWorkflowsData).every(workflow => {
+      const blocks = workflow.state?.blocks || {}
+      return Object.keys(blocks).length > 0
+    })
+
+    if (!allWorkflowsHaveBlocks) {
+      logger.warn('Skipping sync: One or more workflows have empty state (no blocks). This indicates corrupted or incomplete workflow data.')
+      return { skipSync: true }
+    }
+
     // Skip sync if no changes detected
     const currentDataHash = JSON.stringify(allWorkflowsData)
     if (currentDataHash === lastSyncedData) {
@@ -151,18 +163,20 @@ export async function fetchWorkflowsFromDB(): Promise<void> {
 
     if (!data || !Array.isArray(data)) {
       logger.info('No workflows found in database')
-      
+
       // Only clear workflows if we're confident this is a legitimate empty state
       // Avoid overwriting existing workflows during race conditions
       const currentWorkflows = useWorkflowRegistry.getState().workflows
       const hasExistingWorkflows = Object.keys(currentWorkflows).length > 0
-      
+
       if (hasExistingWorkflows) {
-        logger.warn('Received empty workflow data but local workflows exist - possible race condition, preserving local state')
+        logger.warn(
+          'Received empty workflow data but local workflows exist - possible race condition, preserving local state'
+        )
         useWorkflowRegistry.setState({ isLoading: false })
         return
       }
-      
+
       useWorkflowRegistry.setState({ workflows: {}, isLoading: false })
       return
     }

From 5ddbf00ebd18a9577b4afd85c5cc90836e1c47cf Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 19:23:28 -0700
Subject: [PATCH 17/27] use isWorkspace in transition flag

---
 apps/sim/app/w/[id]/workflow.tsx            |  4 ++--
 apps/sim/stores/workflows/registry/store.ts | 17 +++++++++--------
 apps/sim/stores/workflows/sync.ts           |  7 +++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index 86452b55ea2..fb1781d113c 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -744,12 +744,12 @@ function WorkflowContent() {
       // If no workflows exist after loading is complete, create initial workflow
       if (workflowIds.length === 0) {
         logger.info('No workflows found after loading complete, creating initial workflow')
-        
+
         // Generate numbered workflow name based on existing workflows
         const existingWorkflowCount = Object.keys(workflows).length
         const workflowNumber = existingWorkflowCount + 1
         const workflowName = `Workflow ${workflowNumber}`
-        
+
         const newId = createWorkflow({
           name: workflowName,
           description: 'Getting started with agents',
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index b0c7ed8c755..3b7352d1879 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -155,17 +155,18 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           return
         }
 
-        setWorkspaceTransitioning(true)
+        const { activeWorkspaceId: currentWorkspaceId } = get()
 
-        try {
-          const { activeWorkspaceId: currentWorkspaceId } = get()
+        // Early return if switching to the same workspace (before setting flag)
+        if (currentWorkspaceId === workspaceId) {
+          logger.info(`Already in workspace ${workspaceId}`)
+          return
+        }
 
-          // Early return if switching to the same workspace
-          if (currentWorkspaceId === workspaceId) {
-            logger.info(`Already in workspace ${workspaceId}`)
-            return
-          }
+        // Only set transition flag AFTER validating the switch is needed
+        setWorkspaceTransitioning(true)
 
+        try {
           logger.info(`Switching workspace from ${currentWorkspaceId || 'none'} to ${workspaceId}`)
 
           // IMPORTANT: Save to localStorage first before any async operations
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index d1b9678d5ee..3a783add6af 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -5,6 +5,7 @@ import { API_ENDPOINTS } from '../constants'
 import { createSingletonSyncManager } from '../sync'
 import { getAllWorkflowsWithValues } from '.'
 import { useWorkflowRegistry } from './registry/store'
+import { isWorkspaceInTransition } from './registry/store'
 import type { WorkflowMetadata } from './registry/types'
 import { useSubBlockStore } from './subblock/store'
 import type { BlockState } from './workflow/types'
@@ -30,6 +31,12 @@ const workflowSyncConfig = {
       return { skipSync: true }
     }
 
+    // CRITICAL: Block sync during workspace transitions to prevent race conditions
+    if (isWorkspaceInTransition()) {
+      logger.info('Skipping sync: Workspace transition in progress')
+      return { skipSync: true }
+    }
+
     // Get all workflows with values
     const allWorkflowsData = getAllWorkflowsWithValues()
 

From 75192aac26a9b5c0f669b1bea4a96574b5e3f872 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 19:31:13 -0700
Subject: [PATCH 18/27] add logging

---
 apps/sim/stores/workflows/sync.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index 3a783add6af..14e308b1fb1 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -4,8 +4,7 @@ import { createLogger } from '@/lib/logs/console-logger'
 import { API_ENDPOINTS } from '../constants'
 import { createSingletonSyncManager } from '../sync'
 import { getAllWorkflowsWithValues } from '.'
-import { useWorkflowRegistry } from './registry/store'
-import { isWorkspaceInTransition } from './registry/store'
+import { isWorkspaceInTransition, useWorkflowRegistry } from './registry/store'
 import type { WorkflowMetadata } from './registry/types'
 import { useSubBlockStore } from './subblock/store'
 import type { BlockState } from './workflow/types'
@@ -47,13 +46,15 @@ const workflowSyncConfig = {
 
     // SAFETY CHECK: Never sync if any workflow has empty state
     // A valid workflow should always have at least a start block
-    const allWorkflowsHaveBlocks = Object.values(allWorkflowsData).every(workflow => {
+    const allWorkflowsHaveBlocks = Object.values(allWorkflowsData).every((workflow) => {
       const blocks = workflow.state?.blocks || {}
       return Object.keys(blocks).length > 0
     })
 
     if (!allWorkflowsHaveBlocks) {
-      logger.warn('Skipping sync: One or more workflows have empty state (no blocks). This indicates corrupted or incomplete workflow data.')
+      logger.warn(
+        'Skipping sync: One or more workflows have empty state (no blocks). This indicates corrupted or incomplete workflow data.'
+      )
       return { skipSync: true }
     }
 

From 51b0c70d8adc04c9e3c326f901df19c96fcd4e92 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 19:46:43 -0700
Subject: [PATCH 19/27] add data initialized flag

---
 apps/sim/stores/index.ts                    | 16 ++++++++++++++++
 apps/sim/stores/workflows/sync.ts           | 10 +++++++++-
 apps/sim/stores/workflows/workflow/store.ts | 10 ++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index b7797ee3d4b..035199de28b 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -19,6 +19,7 @@ const logger = createLogger('Stores')
 // Track initialization state
 let isInitializing = false
 let appFullyInitialized = false
+let dataInitialized = false // Flag for actual data loading completion
 
 /**
  * Initialize the application state and sync system
@@ -51,6 +52,9 @@ async function initializeApplication(): Promise<void> {
       return
     }
 
+    // CRITICAL: Mark data as initialized only AFTER sync managers have loaded data from DB
+    dataInitialized = true
+
     // Register cleanup
     window.addEventListener('beforeunload', handleBeforeUnload)
 
@@ -64,6 +68,8 @@ async function initializeApplication(): Promise<void> {
     logger.error('Error during application initialization:', { error })
     // Still mark as initialized to prevent being stuck in initializing state
     appFullyInitialized = true
+    // But don't mark data as initialized on error
+    dataInitialized = false
   } finally {
     isInitializing = false
   }
@@ -76,6 +82,14 @@ export function isAppInitialized(): boolean {
   return appFullyInitialized
 }
 
+/**
+ * Checks if data has been loaded from the database
+ * This should be checked before any sync operations
+ */
+export function isDataInitialized(): boolean {
+  return dataInitialized
+}
+
 /**
  * Handle application cleanup before unload
  */
@@ -131,6 +145,7 @@ export async function clearUserData(): Promise<void> {
 
     // Reset application initialization state
     appFullyInitialized = false
+    dataInitialized = false
 
     logger.info('User data cleared successfully')
   } catch (error) {
@@ -172,6 +187,7 @@ export async function reinitializeAfterLogin(): Promise<void> {
   try {
     // Reset application initialization state
     appFullyInitialized = false
+    dataInitialized = false
 
     // Reset sync managers to prevent any active syncs during reinitialization
     disposeSyncManagers()
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index 14e308b1fb1..5199578edef 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -4,7 +4,9 @@ import { createLogger } from '@/lib/logs/console-logger'
 import { API_ENDPOINTS } from '../constants'
 import { createSingletonSyncManager } from '../sync'
 import { getAllWorkflowsWithValues } from '.'
-import { isWorkspaceInTransition, useWorkflowRegistry } from './registry/store'
+import { useWorkflowRegistry } from './registry/store'
+import { isWorkspaceInTransition } from './registry/store'
+import { isDataInitialized } from '../index'
 import type { WorkflowMetadata } from './registry/types'
 import { useSubBlockStore } from './subblock/store'
 import type { BlockState } from './workflow/types'
@@ -25,6 +27,12 @@ const workflowSyncConfig = {
   preparePayload: () => {
     if (typeof window === 'undefined') return { skipSync: true }
 
+    // CRITICAL: Never sync until data is loaded from database
+    if (!isDataInitialized()) {
+      logger.info('Skipping sync: Data not yet initialized from database')
+      return { skipSync: true }
+    }
+
     // Prevent concurrent syncs
     if (isSyncing) {
       return { skipSync: true }
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 77c938d3d60..8dd71043431 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -10,6 +10,8 @@ import { markWorkflowsDirty, workflowSync } from '../sync'
 import { mergeSubblockState } from '../utils'
 import type { Position, SubBlockState, SyncControl, WorkflowState } from './types'
 import { generateLoopBlocks, generateParallelBlocks } from './utils'
+import { useGeneralStore } from '@/stores/settings/general/store'
+import { isDataInitialized } from '../../index'
 
 const initialState = {
   blocks: {},
@@ -50,6 +52,10 @@ const initialState = {
  */
 const createSyncControl = (): SyncControl => ({
   markDirty: () => {
+    // Only mark dirty if data is initialized
+    if (!isDataInitialized()) {
+      return
+    }
     // Simply mark workflows as dirty for sync
     markWorkflowsDirty()
   },
@@ -58,6 +64,10 @@ const createSyncControl = (): SyncControl => ({
     return true
   },
   forceSync: () => {
+    // Only force sync if data is initialized
+    if (!isDataInitialized()) {
+      return
+    }
     // Force sync by marking dirty and syncing
     markWorkflowsDirty()
     // Small delay to ensure state has settled

From db836deba047392b189e2134c9d2948625bb7cbc Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Mon, 16 Jun 2025 19:54:13 -0700
Subject: [PATCH 20/27] fix lint

---
 apps/sim/stores/index.ts                    |  2 +-
 apps/sim/stores/workflows/registry/store.ts |  2 +-
 apps/sim/stores/workflows/sync.ts           | 11 +++++------
 apps/sim/stores/workflows/workflow/store.ts |  3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 035199de28b..16d4a0aa803 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -52,7 +52,7 @@ async function initializeApplication(): Promise<void> {
       return
     }
 
-    // CRITICAL: Mark data as initialized only AFTER sync managers have loaded data from DB
+    // Mark data as initialized only after sync managers have loaded data from DB
     dataInitialized = true
 
     // Register cleanup
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 3b7352d1879..0f2d1f09876 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -169,7 +169,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         try {
           logger.info(`Switching workspace from ${currentWorkspaceId || 'none'} to ${workspaceId}`)
 
-          // IMPORTANT: Save to localStorage first before any async operations
+          // Save to localStorage first before any async operations
           get().setActiveWorkspaceId(workspaceId)
 
           // Clear current workspace state
diff --git a/apps/sim/stores/workflows/sync.ts b/apps/sim/stores/workflows/sync.ts
index 5199578edef..0318d4b59c1 100644
--- a/apps/sim/stores/workflows/sync.ts
+++ b/apps/sim/stores/workflows/sync.ts
@@ -2,11 +2,10 @@
 
 import { createLogger } from '@/lib/logs/console-logger'
 import { API_ENDPOINTS } from '../constants'
+import { isDataInitialized } from '../index'
 import { createSingletonSyncManager } from '../sync'
 import { getAllWorkflowsWithValues } from '.'
-import { useWorkflowRegistry } from './registry/store'
-import { isWorkspaceInTransition } from './registry/store'
-import { isDataInitialized } from '../index'
+import { isWorkspaceInTransition, useWorkflowRegistry } from './registry/store'
 import type { WorkflowMetadata } from './registry/types'
 import { useSubBlockStore } from './subblock/store'
 import type { BlockState } from './workflow/types'
@@ -27,7 +26,7 @@ const workflowSyncConfig = {
   preparePayload: () => {
     if (typeof window === 'undefined') return { skipSync: true }
 
-    // CRITICAL: Never sync until data is loaded from database
+    // Skip sync if data is not yet initialized from database
     if (!isDataInitialized()) {
       logger.info('Skipping sync: Data not yet initialized from database')
       return { skipSync: true }
@@ -38,7 +37,7 @@ const workflowSyncConfig = {
       return { skipSync: true }
     }
 
-    // CRITICAL: Block sync during workspace transitions to prevent race conditions
+    // Block sync during workspace transitions to prevent race conditions
     if (isWorkspaceInTransition()) {
       logger.info('Skipping sync: Workspace transition in progress')
       return { skipSync: true }
@@ -52,7 +51,7 @@ const workflowSyncConfig = {
       return { skipSync: true }
     }
 
-    // SAFETY CHECK: Never sync if any workflow has empty state
+    // Safety check: Never sync if any workflow has empty state
     // A valid workflow should always have at least a start block
     const allWorkflowsHaveBlocks = Object.values(allWorkflowsData).every((workflow) => {
       const blocks = workflow.state?.blocks || {}
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
index 8dd71043431..8b417fbfdf9 100644
--- a/apps/sim/stores/workflows/workflow/store.ts
+++ b/apps/sim/stores/workflows/workflow/store.ts
@@ -3,6 +3,7 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { getBlock } from '@/blocks'
 import { resolveOutputType } from '@/blocks/utils'
+import { isDataInitialized } from '../../index'
 import { pushHistory, type WorkflowStoreWithHistory, withHistory } from '../middleware'
 import { useWorkflowRegistry } from '../registry/store'
 import { useSubBlockStore } from '../subblock/store'
@@ -10,8 +11,6 @@ import { markWorkflowsDirty, workflowSync } from '../sync'
 import { mergeSubblockState } from '../utils'
 import type { Position, SubBlockState, SyncControl, WorkflowState } from './types'
 import { generateLoopBlocks, generateParallelBlocks } from './utils'
-import { useGeneralStore } from '@/stores/settings/general/store'
-import { isDataInitialized } from '../../index'
 
 const initialState = {
   blocks: {},

From fa87f0e76a0d9a8b2c5fdadd825d100731f6d13c Mon Sep 17 00:00:00 2001
From: Emir Karabeg <emirkarabeg@berkeley.edu>
Date: Mon, 16 Jun 2025 23:18:26 -0700
Subject: [PATCH 21/27] fix: build error by create a server-side utils

---
 apps/sim/app/api/chat/utils.ts                |   2 +-
 apps/sim/app/api/schedules/execute/route.ts   |   2 +-
 .../app/api/workflows/[id]/execute/route.ts   |   2 +-
 apps/sim/lib/webhooks/utils.ts                |   2 +-
 apps/sim/stores/index.ts                      |   2 +
 apps/sim/stores/workflows/server-utils.ts     | 116 ++++++++++++++++++
 6 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 apps/sim/stores/workflows/server-utils.ts

diff --git a/apps/sim/app/api/chat/utils.ts b/apps/sim/app/api/chat/utils.ts
index a0e8512a7d1..7c211c45299 100644
--- a/apps/sim/app/api/chat/utils.ts
+++ b/apps/sim/app/api/chat/utils.ts
@@ -11,7 +11,7 @@ import { chat, environment as envTable, userStats, workflow } from '@/db/schema'
 import { Executor } from '@/executor'
 import type { BlockLog } from '@/executor/types'
 import { Serializer } from '@/serializer'
-import { mergeSubblockState } from '@/stores/workflows/utils'
+import { mergeSubblockState } from '@/stores/workflows/server-utils'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 declare global {
diff --git a/apps/sim/app/api/schedules/execute/route.ts b/apps/sim/app/api/schedules/execute/route.ts
index e347aa27dcf..c63eba20570 100644
--- a/apps/sim/app/api/schedules/execute/route.ts
+++ b/apps/sim/app/api/schedules/execute/route.ts
@@ -19,7 +19,7 @@ import { db } from '@/db'
 import { environment, userStats, workflow, workflowSchedule } from '@/db/schema'
 import { Executor } from '@/executor'
 import { Serializer } from '@/serializer'
-import { mergeSubblockState } from '@/stores/workflows/utils'
+import { mergeSubblockState } from '@/stores/workflows/server-utils'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 // Add dynamic export to prevent caching
diff --git a/apps/sim/app/api/workflows/[id]/execute/route.ts b/apps/sim/app/api/workflows/[id]/execute/route.ts
index 2e53a314f4d..4c1f363c950 100644
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -12,7 +12,7 @@ import { db } from '@/db'
 import { environment, userStats } from '@/db/schema'
 import { Executor } from '@/executor'
 import { Serializer } from '@/serializer'
-import { mergeSubblockState } from '@/stores/workflows/utils'
+import { mergeSubblockState } from '@/stores/workflows/server-utils'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 import { validateWorkflowAccess } from '../../middleware'
 import { createErrorResponse, createSuccessResponse } from '../../utils'
diff --git a/apps/sim/lib/webhooks/utils.ts b/apps/sim/lib/webhooks/utils.ts
index 42369f973fd..50f82abecfc 100644
--- a/apps/sim/lib/webhooks/utils.ts
+++ b/apps/sim/lib/webhooks/utils.ts
@@ -12,7 +12,7 @@ import { db } from '@/db'
 import { environment, userStats, webhook } from '@/db/schema'
 import { Executor } from '@/executor'
 import { Serializer } from '@/serializer'
-import { mergeSubblockStateAsync } from '@/stores/workflows/utils'
+import { mergeSubblockStateAsync } from '@/stores/workflows/server-utils'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('WebhookUtils')
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 16d4a0aa803..0a5c2acf696 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -1,3 +1,5 @@
+'use client'
+
 import { useEffect } from 'react'
 import { createLogger } from '@/lib/logs/console-logger'
 import { useCopilotStore } from './copilot/store'
diff --git a/apps/sim/stores/workflows/server-utils.ts b/apps/sim/stores/workflows/server-utils.ts
new file mode 100644
index 00000000000..19884bb8f8b
--- /dev/null
+++ b/apps/sim/stores/workflows/server-utils.ts
@@ -0,0 +1,116 @@
+/**
+ * Server-Safe Workflow Utilities
+ *
+ * This file contains workflow utility functions that can be safely imported
+ * by server-side API routes without causing client/server boundary violations.
+ *
+ * Unlike the main utils.ts file, this does NOT import any client-side stores
+ * or React hooks, making it safe for use in Next.js API routes.
+ */
+
+import type { BlockState, SubBlockState } from './workflow/types'
+
+/**
+ * Server-safe version of mergeSubblockState for API routes
+ *
+ * Merges workflow block states with provided subblock values while maintaining block structure.
+ * This version takes explicit subblock values instead of reading from client stores.
+ *
+ * @param blocks - Block configurations from workflow state
+ * @param subBlockValues - Object containing subblock values keyed by blockId -> subBlockId -> value
+ * @param blockId - Optional specific block ID to merge (merges all if not provided)
+ * @returns Merged block states with updated values
+ */
+export function mergeSubblockState(
+  blocks: Record<string, BlockState>,
+  subBlockValues: Record<string, Record<string, any>> = {},
+  blockId?: string
+): Record<string, BlockState> {
+  const blocksToProcess = blockId ? { [blockId]: blocks[blockId] } : blocks
+
+  return Object.entries(blocksToProcess).reduce(
+    (acc, [id, block]) => {
+      // Skip if block is undefined
+      if (!block) {
+        return acc
+      }
+
+      // Initialize subBlocks if not present
+      const blockSubBlocks = block.subBlocks || {}
+
+      // Get stored values for this block
+      const blockValues = subBlockValues[id] || {}
+
+      // Create a deep copy of the block's subBlocks to maintain structure
+      const mergedSubBlocks = Object.entries(blockSubBlocks).reduce(
+        (subAcc, [subBlockId, subBlock]) => {
+          // Skip if subBlock is undefined
+          if (!subBlock) {
+            return subAcc
+          }
+
+          // Get the stored value for this subblock
+          const storedValue = blockValues[subBlockId]
+
+          // Create a new subblock object with the same structure but updated value
+          subAcc[subBlockId] = {
+            ...subBlock,
+            value: storedValue !== undefined && storedValue !== null ? storedValue : subBlock.value,
+          }
+
+          return subAcc
+        },
+        {} as Record<string, SubBlockState>
+      )
+
+      // Return the full block state with updated subBlocks
+      acc[id] = {
+        ...block,
+        subBlocks: mergedSubBlocks,
+      }
+
+      // Add any values that exist in the provided values but aren't in the block structure
+      // This handles cases where block config has been updated but values still exist
+      Object.entries(blockValues).forEach(([subBlockId, value]) => {
+        if (!mergedSubBlocks[subBlockId] && value !== null && value !== undefined) {
+          // Create a minimal subblock structure
+          mergedSubBlocks[subBlockId] = {
+            id: subBlockId,
+            type: 'short-input', // Default type that's safe to use
+            value: value,
+          }
+        }
+      })
+
+      // Update the block with the final merged subBlocks (including orphaned values)
+      acc[id] = {
+        ...block,
+        subBlocks: mergedSubBlocks,
+      }
+
+      return acc
+    },
+    {} as Record<string, BlockState>
+  )
+}
+
+/**
+ * Server-safe async version of mergeSubblockState for API routes
+ *
+ * Asynchronously merges workflow block states with provided subblock values.
+ * This version takes explicit subblock values instead of reading from client stores.
+ *
+ * @param blocks - Block configurations from workflow state
+ * @param subBlockValues - Object containing subblock values keyed by blockId -> subBlockId -> value
+ * @param blockId - Optional specific block ID to merge (merges all if not provided)
+ * @returns Promise resolving to merged block states with updated values
+ */
+export async function mergeSubblockStateAsync(
+  blocks: Record<string, BlockState>,
+  subBlockValues: Record<string, Record<string, any>> = {},
+  blockId?: string
+): Promise<Record<string, BlockState>> {
+  // Since we're not reading from client stores, we can just return the sync version
+  // The async nature was only needed for the client-side store operations
+  return mergeSubblockState(blocks, subBlockValues, blockId)
+}

From 9970239e7c441875b5c621ad0302289f74b893ea Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@vikhyaths-air.lan>
Date: Tue, 17 Jun 2025 09:43:34 -0700
Subject: [PATCH 22/27] remove migration snapshots

---
 .../sim/db/migrations/meta/0043_snapshot.json | 3241 -----------------
 apps/sim/db/migrations/meta/_journal.json     |    7 -
 2 files changed, 3248 deletions(-)
 delete mode 100644 apps/sim/db/migrations/meta/0043_snapshot.json

diff --git a/apps/sim/db/migrations/meta/0043_snapshot.json b/apps/sim/db/migrations/meta/0043_snapshot.json
deleted file mode 100644
index 103c42ce412..00000000000
--- a/apps/sim/db/migrations/meta/0043_snapshot.json
+++ /dev/null
@@ -1,3241 +0,0 @@
-{
-  "id": "7887982a-ab6f-4595-96f5-29b43b8399c0",
-  "prevId": "5a104de1-5afa-46be-bbe8-5a8759024b15",
-  "version": "7",
-  "dialect": "postgresql",
-  "tables": {
-    "public.account": {
-      "name": "account",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "account_id": {
-          "name": "account_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "access_token": {
-          "name": "access_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "refresh_token": {
-          "name": "refresh_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "id_token": {
-          "name": "id_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "access_token_expires_at": {
-          "name": "access_token_expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "refresh_token_expires_at": {
-          "name": "refresh_token_expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "scope": {
-          "name": "scope",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "account_user_id_user_id_fk": {
-          "name": "account_user_id_user_id_fk",
-          "tableFrom": "account",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.api_key": {
-      "name": "api_key",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "last_used": {
-          "name": "last_used",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "api_key_user_id_user_id_fk": {
-          "name": "api_key_user_id_user_id_fk",
-          "tableFrom": "api_key",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "api_key_key_unique": {
-          "name": "api_key_key_unique",
-          "nullsNotDistinct": false,
-          "columns": ["key"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.chat": {
-      "name": "chat",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "subdomain": {
-          "name": "subdomain",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "customizations": {
-          "name": "customizations",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'{}'"
-        },
-        "auth_type": {
-          "name": "auth_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'public'"
-        },
-        "password": {
-          "name": "password",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "allowed_emails": {
-          "name": "allowed_emails",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'[]'"
-        },
-        "output_configs": {
-          "name": "output_configs",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'[]'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "subdomain_idx": {
-          "name": "subdomain_idx",
-          "columns": [
-            {
-              "expression": "subdomain",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "chat_workflow_id_workflow_id_fk": {
-          "name": "chat_workflow_id_workflow_id_fk",
-          "tableFrom": "chat",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "chat_user_id_user_id_fk": {
-          "name": "chat_user_id_user_id_fk",
-          "tableFrom": "chat",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.custom_tools": {
-      "name": "custom_tools",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "title": {
-          "name": "title",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "schema": {
-          "name": "schema",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "code": {
-          "name": "code",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "custom_tools_user_id_user_id_fk": {
-          "name": "custom_tools_user_id_user_id_fk",
-          "tableFrom": "custom_tools",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.document": {
-      "name": "document",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "knowledge_base_id": {
-          "name": "knowledge_base_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "filename": {
-          "name": "filename",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "file_url": {
-          "name": "file_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "file_size": {
-          "name": "file_size",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "mime_type": {
-          "name": "mime_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "file_hash": {
-          "name": "file_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "chunk_count": {
-          "name": "chunk_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "token_count": {
-          "name": "token_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "character_count": {
-          "name": "character_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "processing_status": {
-          "name": "processing_status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'pending'"
-        },
-        "processing_started_at": {
-          "name": "processing_started_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "processing_completed_at": {
-          "name": "processing_completed_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "processing_error": {
-          "name": "processing_error",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "uploaded_at": {
-          "name": "uploaded_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "doc_kb_id_idx": {
-          "name": "doc_kb_id_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "doc_file_hash_idx": {
-          "name": "doc_file_hash_idx",
-          "columns": [
-            {
-              "expression": "file_hash",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "doc_filename_idx": {
-          "name": "doc_filename_idx",
-          "columns": [
-            {
-              "expression": "filename",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "doc_kb_uploaded_at_idx": {
-          "name": "doc_kb_uploaded_at_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "uploaded_at",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "doc_processing_status_idx": {
-          "name": "doc_processing_status_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "processing_status",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "document_knowledge_base_id_knowledge_base_id_fk": {
-          "name": "document_knowledge_base_id_knowledge_base_id_fk",
-          "tableFrom": "document",
-          "tableTo": "knowledge_base",
-          "columnsFrom": ["knowledge_base_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.embedding": {
-      "name": "embedding",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "knowledge_base_id": {
-          "name": "knowledge_base_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "document_id": {
-          "name": "document_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "chunk_index": {
-          "name": "chunk_index",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "chunk_hash": {
-          "name": "chunk_hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "content": {
-          "name": "content",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "content_length": {
-          "name": "content_length",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "token_count": {
-          "name": "token_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "embedding": {
-          "name": "embedding",
-          "type": "vector(1536)",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "embedding_model": {
-          "name": "embedding_model",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'text-embedding-3-small'"
-        },
-        "start_offset": {
-          "name": "start_offset",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "end_offset": {
-          "name": "end_offset",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "overlap_tokens": {
-          "name": "overlap_tokens",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "jsonb",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{}'"
-        },
-        "search_rank": {
-          "name": "search_rank",
-          "type": "numeric",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'1.0'"
-        },
-        "access_count": {
-          "name": "access_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "last_accessed_at": {
-          "name": "last_accessed_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "quality_score": {
-          "name": "quality_score",
-          "type": "numeric",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "enabled": {
-          "name": "enabled",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "content_tsv": {
-          "name": "content_tsv",
-          "type": "tsvector",
-          "primaryKey": false,
-          "notNull": false,
-          "generated": {
-            "as": "to_tsvector('english', \"embedding\".\"content\")",
-            "type": "stored"
-          }
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "emb_kb_id_idx": {
-          "name": "emb_kb_id_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_doc_id_idx": {
-          "name": "emb_doc_id_idx",
-          "columns": [
-            {
-              "expression": "document_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_doc_chunk_idx": {
-          "name": "emb_doc_chunk_idx",
-          "columns": [
-            {
-              "expression": "document_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "chunk_index",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_kb_model_idx": {
-          "name": "emb_kb_model_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "embedding_model",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_chunk_hash_idx": {
-          "name": "emb_chunk_hash_idx",
-          "columns": [
-            {
-              "expression": "chunk_hash",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_kb_access_idx": {
-          "name": "emb_kb_access_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "last_accessed_at",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_kb_rank_idx": {
-          "name": "emb_kb_rank_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "search_rank",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_kb_enabled_idx": {
-          "name": "emb_kb_enabled_idx",
-          "columns": [
-            {
-              "expression": "knowledge_base_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "enabled",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "emb_doc_enabled_idx": {
-          "name": "emb_doc_enabled_idx",
-          "columns": [
-            {
-              "expression": "document_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "enabled",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "embedding_vector_hnsw_idx": {
-          "name": "embedding_vector_hnsw_idx",
-          "columns": [
-            {
-              "expression": "embedding",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last",
-              "opclass": "vector_cosine_ops"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "hnsw",
-          "with": {
-            "m": 16,
-            "ef_construction": 64
-          }
-        },
-        "emb_metadata_gin_idx": {
-          "name": "emb_metadata_gin_idx",
-          "columns": [
-            {
-              "expression": "metadata",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "gin",
-          "with": {}
-        },
-        "emb_content_fts_idx": {
-          "name": "emb_content_fts_idx",
-          "columns": [
-            {
-              "expression": "content_tsv",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "gin",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "embedding_knowledge_base_id_knowledge_base_id_fk": {
-          "name": "embedding_knowledge_base_id_knowledge_base_id_fk",
-          "tableFrom": "embedding",
-          "tableTo": "knowledge_base",
-          "columnsFrom": ["knowledge_base_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "embedding_document_id_document_id_fk": {
-          "name": "embedding_document_id_document_id_fk",
-          "tableFrom": "embedding",
-          "tableTo": "document",
-          "columnsFrom": ["document_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {
-        "embedding_not_null_check": {
-          "name": "embedding_not_null_check",
-          "value": "\"embedding\" IS NOT NULL"
-        }
-      },
-      "isRLSEnabled": false
-    },
-    "public.environment": {
-      "name": "environment",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "variables": {
-          "name": "variables",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "environment_user_id_user_id_fk": {
-          "name": "environment_user_id_user_id_fk",
-          "tableFrom": "environment",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "environment_user_id_unique": {
-          "name": "environment_user_id_unique",
-          "nullsNotDistinct": false,
-          "columns": ["user_id"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.invitation": {
-      "name": "invitation",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "inviter_id": {
-          "name": "inviter_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "role": {
-          "name": "role",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "invitation_inviter_id_user_id_fk": {
-          "name": "invitation_inviter_id_user_id_fk",
-          "tableFrom": "invitation",
-          "tableTo": "user",
-          "columnsFrom": ["inviter_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "invitation_organization_id_organization_id_fk": {
-          "name": "invitation_organization_id_organization_id_fk",
-          "tableFrom": "invitation",
-          "tableTo": "organization",
-          "columnsFrom": ["organization_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.knowledge_base": {
-      "name": "knowledge_base",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "token_count": {
-          "name": "token_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "embedding_model": {
-          "name": "embedding_model",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'text-embedding-3-small'"
-        },
-        "embedding_dimension": {
-          "name": "embedding_dimension",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 1536
-        },
-        "chunking_config": {
-          "name": "chunking_config",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{\"maxSize\": 1024, \"minSize\": 100, \"overlap\": 200}'"
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "kb_user_id_idx": {
-          "name": "kb_user_id_idx",
-          "columns": [
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "kb_workspace_id_idx": {
-          "name": "kb_workspace_id_idx",
-          "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "kb_user_workspace_idx": {
-          "name": "kb_user_workspace_idx",
-          "columns": [
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "kb_deleted_at_idx": {
-          "name": "kb_deleted_at_idx",
-          "columns": [
-            {
-              "expression": "deleted_at",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "knowledge_base_user_id_user_id_fk": {
-          "name": "knowledge_base_user_id_user_id_fk",
-          "tableFrom": "knowledge_base",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "knowledge_base_workspace_id_workspace_id_fk": {
-          "name": "knowledge_base_workspace_id_workspace_id_fk",
-          "tableFrom": "knowledge_base",
-          "tableTo": "workspace",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.marketplace": {
-      "name": "marketplace",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "state": {
-          "name": "state",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "author_id": {
-          "name": "author_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "author_name": {
-          "name": "author_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "views": {
-          "name": "views",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "category": {
-          "name": "category",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "marketplace_workflow_id_workflow_id_fk": {
-          "name": "marketplace_workflow_id_workflow_id_fk",
-          "tableFrom": "marketplace",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "marketplace_author_id_user_id_fk": {
-          "name": "marketplace_author_id_user_id_fk",
-          "tableFrom": "marketplace",
-          "tableTo": "user",
-          "columnsFrom": ["author_id"],
-          "columnsTo": ["id"],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.member": {
-      "name": "member",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "organization_id": {
-          "name": "organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "role": {
-          "name": "role",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "member_user_id_user_id_fk": {
-          "name": "member_user_id_user_id_fk",
-          "tableFrom": "member",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "member_organization_id_organization_id_fk": {
-          "name": "member_organization_id_organization_id_fk",
-          "tableFrom": "member",
-          "tableTo": "organization",
-          "columnsFrom": ["organization_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.memory": {
-      "name": "memory",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "type": {
-          "name": "type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "data": {
-          "name": "data",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "deleted_at": {
-          "name": "deleted_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {
-        "memory_key_idx": {
-          "name": "memory_key_idx",
-          "columns": [
-            {
-              "expression": "key",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "memory_workflow_idx": {
-          "name": "memory_workflow_idx",
-          "columns": [
-            {
-              "expression": "workflow_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "memory_workflow_key_idx": {
-          "name": "memory_workflow_key_idx",
-          "columns": [
-            {
-              "expression": "workflow_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "key",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "memory_workflow_id_workflow_id_fk": {
-          "name": "memory_workflow_id_workflow_id_fk",
-          "tableFrom": "memory",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.oauth_state": {
-      "name": "oauth_state",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "token": {
-          "name": "token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "provider_id": {
-          "name": "provider_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "service_id": {
-          "name": "service_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "required_scopes": {
-          "name": "required_scopes",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'[]'"
-        },
-        "return_url": {
-          "name": "return_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "context": {
-          "name": "context",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "data": {
-          "name": "data",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'{}'"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "oauth_state_user_idx": {
-          "name": "oauth_state_user_idx",
-          "columns": [
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "oauth_state_token_idx": {
-          "name": "oauth_state_token_idx",
-          "columns": [
-            {
-              "expression": "token",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "oauth_state_expires_idx": {
-          "name": "oauth_state_expires_idx",
-          "columns": [
-            {
-              "expression": "expires_at",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "oauth_state_user_id_user_id_fk": {
-          "name": "oauth_state_user_id_user_id_fk",
-          "tableFrom": "oauth_state",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "oauth_state_token_unique": {
-          "name": "oauth_state_token_unique",
-          "nullsNotDistinct": false,
-          "columns": ["token"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.organization": {
-      "name": "organization",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "slug": {
-          "name": "slug",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "logo": {
-          "name": "logo",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.session": {
-      "name": "session",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "token": {
-          "name": "token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "ip_address": {
-          "name": "ip_address",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "user_agent": {
-          "name": "user_agent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "active_organization_id": {
-          "name": "active_organization_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "session_user_id_user_id_fk": {
-          "name": "session_user_id_user_id_fk",
-          "tableFrom": "session",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "session_active_organization_id_organization_id_fk": {
-          "name": "session_active_organization_id_organization_id_fk",
-          "tableFrom": "session",
-          "tableTo": "organization",
-          "columnsFrom": ["active_organization_id"],
-          "columnsTo": ["id"],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "session_token_unique": {
-          "name": "session_token_unique",
-          "nullsNotDistinct": false,
-          "columns": ["token"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.settings": {
-      "name": "settings",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "theme": {
-          "name": "theme",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'system'"
-        },
-        "debug_mode": {
-          "name": "debug_mode",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
-        "auto_connect": {
-          "name": "auto_connect",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "auto_fill_env_vars": {
-          "name": "auto_fill_env_vars",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "last_active_workspace_id": {
-          "name": "last_active_workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "telemetry_enabled": {
-          "name": "telemetry_enabled",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "telemetry_notified_user": {
-          "name": "telemetry_notified_user",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
-        "email_preferences": {
-          "name": "email_preferences",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{}'"
-        },
-        "general": {
-          "name": "general",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'{}'"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "settings_user_id_user_id_fk": {
-          "name": "settings_user_id_user_id_fk",
-          "tableFrom": "settings",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "settings_last_active_workspace_id_workspace_id_fk": {
-          "name": "settings_last_active_workspace_id_workspace_id_fk",
-          "tableFrom": "settings",
-          "tableTo": "workspace",
-          "columnsFrom": ["last_active_workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "settings_user_id_unique": {
-          "name": "settings_user_id_unique",
-          "nullsNotDistinct": false,
-          "columns": ["user_id"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.subscription": {
-      "name": "subscription",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "plan": {
-          "name": "plan",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "reference_id": {
-          "name": "reference_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "stripe_customer_id": {
-          "name": "stripe_customer_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "stripe_subscription_id": {
-          "name": "stripe_subscription_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "period_start": {
-          "name": "period_start",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "period_end": {
-          "name": "period_end",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "cancel_at_period_end": {
-          "name": "cancel_at_period_end",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "seats": {
-          "name": "seats",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "trial_start": {
-          "name": "trial_start",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "trial_end": {
-          "name": "trial_end",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.user": {
-      "name": "user",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "email_verified": {
-          "name": "email_verified",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "image": {
-          "name": "image",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "stripe_customer_id": {
-          "name": "stripe_customer_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "user_email_unique": {
-          "name": "user_email_unique",
-          "nullsNotDistinct": false,
-          "columns": ["email"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.user_stats": {
-      "name": "user_stats",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "total_manual_executions": {
-          "name": "total_manual_executions",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_api_calls": {
-          "name": "total_api_calls",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_webhook_triggers": {
-          "name": "total_webhook_triggers",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_scheduled_executions": {
-          "name": "total_scheduled_executions",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_chat_executions": {
-          "name": "total_chat_executions",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_tokens_used": {
-          "name": "total_tokens_used",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "total_cost": {
-          "name": "total_cost",
-          "type": "numeric",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'0'"
-        },
-        "last_active": {
-          "name": "last_active",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "user_stats_user_id_user_id_fk": {
-          "name": "user_stats_user_id_user_id_fk",
-          "tableFrom": "user_stats",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "user_stats_user_id_unique": {
-          "name": "user_stats_user_id_unique",
-          "nullsNotDistinct": false,
-          "columns": ["user_id"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.verification": {
-      "name": "verification",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "identifier": {
-          "name": "identifier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.waitlist": {
-      "name": "waitlist",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'pending'"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "waitlist_email_unique": {
-          "name": "waitlist_email_unique",
-          "nullsNotDistinct": false,
-          "columns": ["email"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.webhook": {
-      "name": "webhook",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "provider": {
-          "name": "provider",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "provider_config": {
-          "name": "provider_config",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "path_idx": {
-          "name": "path_idx",
-          "columns": [
-            {
-              "expression": "path",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "webhook_workflow_id_workflow_id_fk": {
-          "name": "webhook_workflow_id_workflow_id_fk",
-          "tableFrom": "webhook",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workflow": {
-      "name": "workflow",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "folder_id": {
-          "name": "folder_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "description": {
-          "name": "description",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "state": {
-          "name": "state",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'#3972F6'"
-        },
-        "last_synced": {
-          "name": "last_synced",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "is_deployed": {
-          "name": "is_deployed",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
-        "deployed_state": {
-          "name": "deployed_state",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "deployed_at": {
-          "name": "deployed_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "collaborators": {
-          "name": "collaborators",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'[]'"
-        },
-        "run_count": {
-          "name": "run_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "last_run_at": {
-          "name": "last_run_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "variables": {
-          "name": "variables",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'{}'"
-        },
-        "is_published": {
-          "name": "is_published",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": false
-        },
-        "marketplace_data": {
-          "name": "marketplace_data",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "workflow_user_id_user_id_fk": {
-          "name": "workflow_user_id_user_id_fk",
-          "tableFrom": "workflow",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workflow_workspace_id_workspace_id_fk": {
-          "name": "workflow_workspace_id_workspace_id_fk",
-          "tableFrom": "workflow",
-          "tableTo": "workspace",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workflow_folder_id_workflow_folder_id_fk": {
-          "name": "workflow_folder_id_workflow_folder_id_fk",
-          "tableFrom": "workflow",
-          "tableTo": "workflow_folder",
-          "columnsFrom": ["folder_id"],
-          "columnsTo": ["id"],
-          "onDelete": "set null",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workflow_folder": {
-      "name": "workflow_folder",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "color": {
-          "name": "color",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "default": "'#6B7280'"
-        },
-        "is_expanded": {
-          "name": "is_expanded",
-          "type": "boolean",
-          "primaryKey": false,
-          "notNull": true,
-          "default": true
-        },
-        "sort_order": {
-          "name": "sort_order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "workflow_folder_user_idx": {
-          "name": "workflow_folder_user_idx",
-          "columns": [
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "workflow_folder_workspace_parent_idx": {
-          "name": "workflow_folder_workspace_parent_idx",
-          "columns": [
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "parent_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        },
-        "workflow_folder_parent_sort_idx": {
-          "name": "workflow_folder_parent_sort_idx",
-          "columns": [
-            {
-              "expression": "parent_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "sort_order",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": false,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "workflow_folder_user_id_user_id_fk": {
-          "name": "workflow_folder_user_id_user_id_fk",
-          "tableFrom": "workflow_folder",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workflow_folder_workspace_id_workspace_id_fk": {
-          "name": "workflow_folder_workspace_id_workspace_id_fk",
-          "tableFrom": "workflow_folder",
-          "tableTo": "workspace",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workflow_logs": {
-      "name": "workflow_logs",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "execution_id": {
-          "name": "execution_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "level": {
-          "name": "level",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "message": {
-          "name": "message",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "duration": {
-          "name": "duration",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "trigger": {
-          "name": "trigger",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "metadata": {
-          "name": "metadata",
-          "type": "json",
-          "primaryKey": false,
-          "notNull": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "workflow_logs_workflow_id_workflow_id_fk": {
-          "name": "workflow_logs_workflow_id_workflow_id_fk",
-          "tableFrom": "workflow_logs",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workflow_schedule": {
-      "name": "workflow_schedule",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workflow_id": {
-          "name": "workflow_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "cron_expression": {
-          "name": "cron_expression",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "next_run_at": {
-          "name": "next_run_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "last_ran_at": {
-          "name": "last_ran_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "trigger_type": {
-          "name": "trigger_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "timezone": {
-          "name": "timezone",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'UTC'"
-        },
-        "failed_count": {
-          "name": "failed_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "default": 0
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'active'"
-        },
-        "last_failed_at": {
-          "name": "last_failed_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "workflow_schedule_workflow_id_workflow_id_fk": {
-          "name": "workflow_schedule_workflow_id_workflow_id_fk",
-          "tableFrom": "workflow_schedule",
-          "tableTo": "workflow",
-          "columnsFrom": ["workflow_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "workflow_schedule_workflow_id_unique": {
-          "name": "workflow_schedule_workflow_id_unique",
-          "nullsNotDistinct": false,
-          "columns": ["workflow_id"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workspace": {
-      "name": "workspace",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "owner_id": {
-          "name": "owner_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "workspace_owner_id_user_id_fk": {
-          "name": "workspace_owner_id_user_id_fk",
-          "tableFrom": "workspace",
-          "tableTo": "user",
-          "columnsFrom": ["owner_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workspace_invitation": {
-      "name": "workspace_invitation",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "inviter_id": {
-          "name": "inviter_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "role": {
-          "name": "role",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'member'"
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'pending'"
-        },
-        "token": {
-          "name": "token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "workspace_invitation_workspace_id_workspace_id_fk": {
-          "name": "workspace_invitation_workspace_id_workspace_id_fk",
-          "tableFrom": "workspace_invitation",
-          "tableTo": "workspace",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workspace_invitation_inviter_id_user_id_fk": {
-          "name": "workspace_invitation_inviter_id_user_id_fk",
-          "tableFrom": "workspace_invitation",
-          "tableTo": "user",
-          "columnsFrom": ["inviter_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {
-        "workspace_invitation_token_unique": {
-          "name": "workspace_invitation_token_unique",
-          "nullsNotDistinct": false,
-          "columns": ["token"]
-        }
-      },
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    },
-    "public.workspace_member": {
-      "name": "workspace_member",
-      "schema": "",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "text",
-          "primaryKey": true,
-          "notNull": true
-        },
-        "workspace_id": {
-          "name": "workspace_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true
-        },
-        "role": {
-          "name": "role",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "'member'"
-        },
-        "joined_at": {
-          "name": "joined_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "timestamp",
-          "primaryKey": false,
-          "notNull": true,
-          "default": "now()"
-        }
-      },
-      "indexes": {
-        "user_workspace_idx": {
-          "name": "user_workspace_idx",
-          "columns": [
-            {
-              "expression": "user_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            },
-            {
-              "expression": "workspace_id",
-              "isExpression": false,
-              "asc": true,
-              "nulls": "last"
-            }
-          ],
-          "isUnique": true,
-          "concurrently": false,
-          "method": "btree",
-          "with": {}
-        }
-      },
-      "foreignKeys": {
-        "workspace_member_workspace_id_workspace_id_fk": {
-          "name": "workspace_member_workspace_id_workspace_id_fk",
-          "tableFrom": "workspace_member",
-          "tableTo": "workspace",
-          "columnsFrom": ["workspace_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "workspace_member_user_id_user_id_fk": {
-          "name": "workspace_member_user_id_user_id_fk",
-          "tableFrom": "workspace_member",
-          "tableTo": "user",
-          "columnsFrom": ["user_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "policies": {},
-      "checkConstraints": {},
-      "isRLSEnabled": false
-    }
-  },
-  "enums": {},
-  "schemas": {},
-  "sequences": {},
-  "roles": {},
-  "policies": {},
-  "views": {},
-  "_meta": {
-    "columns": {},
-    "schemas": {},
-    "tables": {}
-  }
-}
diff --git a/apps/sim/db/migrations/meta/_journal.json b/apps/sim/db/migrations/meta/_journal.json
index d9abe2c6602..ff79c9ee703 100644
--- a/apps/sim/db/migrations/meta/_journal.json
+++ b/apps/sim/db/migrations/meta/_journal.json
@@ -295,13 +295,6 @@
       "when": 1749784177503,
       "tag": "0042_breezy_miracleman",
       "breakpoints": true
-    },
-    {
-      "idx": 43,
-      "version": "7",
-      "when": 1749938228616,
-      "tag": "0043_fair_roulette",
-      "breakpoints": true
     }
   ]
 }

From 9ef67a7466195b87f81e1fbb0f34a8b9d4a2a7a5 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Tue, 17 Jun 2025 11:07:52 -0700
Subject: [PATCH 23/27] reverse search for workspace based on workflow id

---
 .../workspace-header/workspace-header.tsx     | 10 +--
 apps/sim/app/w/components/sidebar/sidebar.tsx |  1 +
 apps/sim/app/w/hooks/use-registry-loading.ts  | 67 ++++++++++++++++-
 apps/sim/stores/index.ts                      | 32 ++++++++-
 apps/sim/stores/workflows/registry/store.ts   | 72 ++++++++++++++++++-
 apps/sim/stores/workflows/registry/types.ts   |  1 +
 6 files changed, 168 insertions(+), 15 deletions(-)

diff --git a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
index 892abbc5423..473a3494c04 100644
--- a/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
+++ b/apps/sim/app/w/components/sidebar/components/workspace-header/workspace-header.tsx
@@ -286,16 +286,8 @@ export function WorkspaceHeader({
                   setActiveWorkspaceId(fallbackWorkspace.id)
                 }
               }
-            } else {
-              // No active workspace in registry yet - wait for loadLastActiveWorkspace() to complete
-              // If there's only one workspace, we can safely select it
-              if (fetchedWorkspaces.length === 1) {
-                const onlyWorkspace = fetchedWorkspaces[0]
-                setActiveWorkspace(onlyWorkspace)
-                setActiveWorkspaceId(onlyWorkspace.id)
-              }
-              // For multiple workspaces, wait for the saved preference to load
             }
+            // If no activeWorkspaceId, let loadWorkspaceFromWorkflowId handle workspace selection
           }
           setIsWorkspacesLoading(false)
         })
diff --git a/apps/sim/app/w/components/sidebar/sidebar.tsx b/apps/sim/app/w/components/sidebar/sidebar.tsx
index bea67211b2e..7a72043e4ce 100644
--- a/apps/sim/app/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/w/components/sidebar/sidebar.tsx
@@ -35,6 +35,7 @@ export function Sidebar() {
   const isLoading = workflowsLoading || sessionLoading
   const router = useRouter()
   const pathname = usePathname()
+
   const [showSettings, setShowSettings] = useState(false)
   const [showHelp, setShowHelp] = useState(false)
   const [showInviteMembers, setShowInviteMembers] = useState(false)
diff --git a/apps/sim/app/w/hooks/use-registry-loading.ts b/apps/sim/app/w/hooks/use-registry-loading.ts
index 1b8580f9736..c00ca87980f 100644
--- a/apps/sim/app/w/hooks/use-registry-loading.ts
+++ b/apps/sim/app/w/hooks/use-registry-loading.ts
@@ -1,17 +1,78 @@
 'use client'
 
 import { useEffect } from 'react'
+import { usePathname, useRouter } from 'next/navigation'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 /**
- * Custom hook to manage workflow registry loading state
+ * Extract workflow ID from pathname
+ * @param pathname - Current pathname
+ * @returns workflow ID if found, null otherwise
+ */
+function extractWorkflowIdFromPathname(pathname: string): string | null {
+  try {
+    const pathSegments = pathname.split('/')
+    // Check if URL matches pattern /w/{workflowId}
+    if (pathSegments.length >= 3 && pathSegments[1] === 'w') {
+      const workflowId = pathSegments[2]
+      // Basic UUID validation (36 characters, contains hyphens)
+      if (workflowId && workflowId.length === 36 && workflowId.includes('-')) {
+        return workflowId
+      }
+    }
+    return null
+  } catch (error) {
+    console.warn('Failed to extract workflow ID from pathname:', error)
+    return null
+  }
+}
+
+/**
+ * Custom hook to manage workflow registry loading state and handle first-time navigation
  *
  * This hook initializes the loading state and automatically clears it
- * when workflows are loaded or after a timeout
+ * when workflows are loaded. It also handles smart workspace selection 
+ * and navigation for first-time users.
  */
 export function useRegistryLoading() {
-  const { workflows, setLoading, isLoading } = useWorkflowRegistry()
+  const { 
+    workflows, 
+    setLoading, 
+    isLoading, 
+    activeWorkspaceId, 
+    loadWorkspaceFromWorkflowId 
+  } = useWorkflowRegistry()
+  const pathname = usePathname()
+  const router = useRouter()
+
+  // Handle workspace selection from URL
+  useEffect(() => {
+    if (!activeWorkspaceId) {
+      const workflowIdFromUrl = extractWorkflowIdFromPathname(pathname)
+      if (workflowIdFromUrl) {
+        loadWorkspaceFromWorkflowId(workflowIdFromUrl).catch((error) => {
+          console.warn('Failed to load workspace from workflow ID:', error)
+        })
+      }
+    }
+  }, [activeWorkspaceId, pathname, loadWorkspaceFromWorkflowId])
+
+  // Handle first-time navigation: if we're at /w and have workflows, navigate to first one
+  useEffect(() => {
+    if (!isLoading && activeWorkspaceId && Object.keys(workflows).length > 0) {
+      const workflowCount = Object.keys(workflows).length
+      const currentWorkflowId = extractWorkflowIdFromPathname(pathname)
+      
+      // If we're at a generic workspace URL (/w, /w/, or /w/workspaceId) without a specific workflow
+      if (!currentWorkflowId && (pathname === '/w' || pathname === '/w/' || pathname === `/w/${activeWorkspaceId}`)) {
+        const firstWorkflowId = Object.keys(workflows)[0]
+        console.log('First-time navigation: redirecting to first workflow:', firstWorkflowId)
+        router.replace(`/w/${firstWorkflowId}`)
+      }
+    }
+  }, [isLoading, activeWorkspaceId, workflows, pathname, router])
 
+  // Handle loading states
   useEffect(() => {
     // Only set loading if we don't have workflows and aren't already loading
     if (Object.keys(workflows).length === 0 && !isLoading) {
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 0a5c2acf696..3a855b64942 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -43,8 +43,11 @@ async function initializeApplication(): Promise<void> {
     // Load custom tools from server
     await useCustomToolsStore.getState().loadCustomTools()
 
-    // Load user's last active workspace from localStorage (with validation)
-    await useWorkflowRegistry.getState().loadLastActiveWorkspace()
+    // Extract workflow ID from URL for smart workspace selection
+    const workflowIdFromUrl = extractWorkflowIdFromUrl()
+    
+    // Load workspace based on workflow ID in URL, with fallback to last active workspace
+    await useWorkflowRegistry.getState().loadWorkspaceFromWorkflowId(workflowIdFromUrl)
 
     // Initialize sync system and wait for data to load completely
     const syncInitialized = await initializeSyncManagers()
@@ -77,6 +80,31 @@ async function initializeApplication(): Promise<void> {
   }
 }
 
+/**
+ * Extract workflow ID from current URL
+ * @returns workflow ID if found in URL, null otherwise
+ */
+function extractWorkflowIdFromUrl(): string | null {
+  if (typeof window === 'undefined') return null
+  
+  try {
+    const pathSegments = window.location.pathname.split('/')
+    // Check if URL matches pattern /w/{workflowId}
+    if (pathSegments.length >= 3 && pathSegments[1] === 'w') {
+      const workflowId = pathSegments[2]
+      // Basic UUID validation (36 characters, contains hyphens)
+      if (workflowId && workflowId.length === 36 && workflowId.includes('-')) {
+        logger.info(`Extracted workflow ID from URL: ${workflowId}`)
+        return workflowId
+      }
+    }
+    return null
+  } catch (error) {
+    logger.warn('Failed to extract workflow ID from URL:', error)
+    return null
+  }
+}
+
 /**
  * Checks if application is fully initialized
  */
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 0f2d1f09876..69a08b11593 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -238,6 +238,76 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }
       },
 
+      // Load workspace based on workflow ID from URL, with fallback to last active workspace
+      loadWorkspaceFromWorkflowId: async (workflowId: string | null) => {
+        try {
+          logger.info(`Loading workspace for workflow ID: ${workflowId}`)
+          
+          // If workflow ID provided, try to get its workspace
+          if (workflowId) {
+            try {
+              const response = await fetch(`/api/workflows/${workflowId}`)
+              if (response.ok) {
+                const data = await response.json()
+                const workflow = data.data
+                
+                if (workflow && workflow.workspaceId) {
+                  // Validate workspace access
+                  const workspacesResponse = await fetch('/api/workspaces')
+                  if (workspacesResponse.ok) {
+                    const workspacesData = await workspacesResponse.json()
+                    const workspaces = workspacesData.workspaces || []
+                    const workspaceExists = workspaces.some((ws: any) => ws.id === workflow.workspaceId)
+                    
+                    if (workspaceExists) {
+                      set({ activeWorkspaceId: workflow.workspaceId })
+                      localStorage.setItem('lastActiveWorkspaceId', workflow.workspaceId)
+                      logger.info(`Set active workspace from workflow: ${workflow.workspaceId}`)
+                      return
+                    }
+                  }
+                }
+              }
+            } catch (error) {
+              logger.warn('Error fetching workflow:', error)
+            }
+          }
+          
+          // Fallback: use last active workspace or first available
+          const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
+          const response = await fetch('/api/workspaces')
+          
+          if (response.ok) {
+            const data = await response.json()
+            const workspaces = data.workspaces || []
+            
+            if (workspaces.length === 0) {
+              logger.warn('No workspaces found')
+              return
+            }
+            
+            // Try saved workspace first
+            let targetWorkspace = savedWorkspaceId ? 
+              workspaces.find((ws: any) => ws.id === savedWorkspaceId) : null
+            
+            // Fall back to first workspace
+            if (!targetWorkspace) {
+              targetWorkspace = workspaces[0]
+              if (savedWorkspaceId) {
+                localStorage.removeItem('lastActiveWorkspaceId')
+              }
+            }
+            
+            set({ activeWorkspaceId: targetWorkspace.id })
+            localStorage.setItem('lastActiveWorkspaceId', targetWorkspace.id)
+            logger.info(`Set active workspace: ${targetWorkspace.id}`)
+          }
+          
+        } catch (error) {
+          logger.error('Error in loadWorkspaceFromWorkflowId:', error)
+        }
+      },
+
       // Simple method to set active workspace ID without triggering full switch
       setActiveWorkspaceId: (id: string) => {
         set({ activeWorkspaceId: id })
@@ -1208,7 +1278,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               state: {
                 blocks: {},
                 edges: [],
-                loops: {},
+                loops: [],
               },
             }),
           }).catch((error) => {
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index 1b2552cb787..797886778ae 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -36,6 +36,7 @@ export interface WorkflowRegistryActions {
   switchToWorkspace: (id: string) => void
   setActiveWorkspaceId: (id: string) => void
   loadLastActiveWorkspace: () => Promise<void>
+  loadWorkspaceFromWorkflowId: (workflowId: string | null) => Promise<void>
   handleWorkspaceDeletion: (newWorkspaceId: string) => void
   removeWorkflow: (id: string) => Promise<void>
   updateWorkflow: (id: string, metadata: Partial<WorkflowMetadata>) => void

From 243958ae7c47dc1feaab130ab14a7fcf471f2f7b Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Tue, 17 Jun 2025 11:17:10 -0700
Subject: [PATCH 24/27] fix lint

---
 apps/sim/app/w/hooks/use-registry-loading.ts | 18 +++++------
 apps/sim/stores/index.ts                     |  4 +--
 apps/sim/stores/workflows/registry/store.ts  | 32 +++++++++++---------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/apps/sim/app/w/hooks/use-registry-loading.ts b/apps/sim/app/w/hooks/use-registry-loading.ts
index c00ca87980f..5f4870eb7b7 100644
--- a/apps/sim/app/w/hooks/use-registry-loading.ts
+++ b/apps/sim/app/w/hooks/use-registry-loading.ts
@@ -31,17 +31,12 @@ function extractWorkflowIdFromPathname(pathname: string): string | null {
  * Custom hook to manage workflow registry loading state and handle first-time navigation
  *
  * This hook initializes the loading state and automatically clears it
- * when workflows are loaded. It also handles smart workspace selection 
+ * when workflows are loaded. It also handles smart workspace selection
  * and navigation for first-time users.
  */
 export function useRegistryLoading() {
-  const { 
-    workflows, 
-    setLoading, 
-    isLoading, 
-    activeWorkspaceId, 
-    loadWorkspaceFromWorkflowId 
-  } = useWorkflowRegistry()
+  const { workflows, setLoading, isLoading, activeWorkspaceId, loadWorkspaceFromWorkflowId } =
+    useWorkflowRegistry()
   const pathname = usePathname()
   const router = useRouter()
 
@@ -62,9 +57,12 @@ export function useRegistryLoading() {
     if (!isLoading && activeWorkspaceId && Object.keys(workflows).length > 0) {
       const workflowCount = Object.keys(workflows).length
       const currentWorkflowId = extractWorkflowIdFromPathname(pathname)
-      
+
       // If we're at a generic workspace URL (/w, /w/, or /w/workspaceId) without a specific workflow
-      if (!currentWorkflowId && (pathname === '/w' || pathname === '/w/' || pathname === `/w/${activeWorkspaceId}`)) {
+      if (
+        !currentWorkflowId &&
+        (pathname === '/w' || pathname === '/w/' || pathname === `/w/${activeWorkspaceId}`)
+      ) {
         const firstWorkflowId = Object.keys(workflows)[0]
         console.log('First-time navigation: redirecting to first workflow:', firstWorkflowId)
         router.replace(`/w/${firstWorkflowId}`)
diff --git a/apps/sim/stores/index.ts b/apps/sim/stores/index.ts
index 3a855b64942..59d687bc3e9 100644
--- a/apps/sim/stores/index.ts
+++ b/apps/sim/stores/index.ts
@@ -45,7 +45,7 @@ async function initializeApplication(): Promise<void> {
 
     // Extract workflow ID from URL for smart workspace selection
     const workflowIdFromUrl = extractWorkflowIdFromUrl()
-    
+
     // Load workspace based on workflow ID in URL, with fallback to last active workspace
     await useWorkflowRegistry.getState().loadWorkspaceFromWorkflowId(workflowIdFromUrl)
 
@@ -86,7 +86,7 @@ async function initializeApplication(): Promise<void> {
  */
 function extractWorkflowIdFromUrl(): string | null {
   if (typeof window === 'undefined') return null
-  
+
   try {
     const pathSegments = window.location.pathname.split('/')
     // Check if URL matches pattern /w/{workflowId}
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 69a08b11593..018093927b1 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -242,7 +242,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       loadWorkspaceFromWorkflowId: async (workflowId: string | null) => {
         try {
           logger.info(`Loading workspace for workflow ID: ${workflowId}`)
-          
+
           // If workflow ID provided, try to get its workspace
           if (workflowId) {
             try {
@@ -250,15 +250,17 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               if (response.ok) {
                 const data = await response.json()
                 const workflow = data.data
-                
-                if (workflow && workflow.workspaceId) {
+
+                if (workflow?.workspaceId) {
                   // Validate workspace access
                   const workspacesResponse = await fetch('/api/workspaces')
                   if (workspacesResponse.ok) {
                     const workspacesData = await workspacesResponse.json()
                     const workspaces = workspacesData.workspaces || []
-                    const workspaceExists = workspaces.some((ws: any) => ws.id === workflow.workspaceId)
-                    
+                    const workspaceExists = workspaces.some(
+                      (ws: any) => ws.id === workflow.workspaceId
+                    )
+
                     if (workspaceExists) {
                       set({ activeWorkspaceId: workflow.workspaceId })
                       localStorage.setItem('lastActiveWorkspaceId', workflow.workspaceId)
@@ -272,24 +274,25 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               logger.warn('Error fetching workflow:', error)
             }
           }
-          
+
           // Fallback: use last active workspace or first available
           const savedWorkspaceId = localStorage.getItem('lastActiveWorkspaceId')
           const response = await fetch('/api/workspaces')
-          
+
           if (response.ok) {
             const data = await response.json()
             const workspaces = data.workspaces || []
-            
+
             if (workspaces.length === 0) {
               logger.warn('No workspaces found')
               return
             }
-            
+
             // Try saved workspace first
-            let targetWorkspace = savedWorkspaceId ? 
-              workspaces.find((ws: any) => ws.id === savedWorkspaceId) : null
-            
+            let targetWorkspace = savedWorkspaceId
+              ? workspaces.find((ws: any) => ws.id === savedWorkspaceId)
+              : null
+
             // Fall back to first workspace
             if (!targetWorkspace) {
               targetWorkspace = workspaces[0]
@@ -297,12 +300,11 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
                 localStorage.removeItem('lastActiveWorkspaceId')
               }
             }
-            
+
             set({ activeWorkspaceId: targetWorkspace.id })
             localStorage.setItem('lastActiveWorkspaceId', targetWorkspace.id)
             logger.info(`Set active workspace: ${targetWorkspace.id}`)
           }
-          
         } catch (error) {
           logger.error('Error in loadWorkspaceFromWorkflowId:', error)
         }
@@ -1278,7 +1280,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               state: {
                 blocks: {},
                 edges: [],
-                loops: [],
+                loops: {},
               },
             }),
           }).catch((error) => {

From 141af6637d1c7f551b7ca695846baaed20f58cc0 Mon Sep 17 00:00:00 2001
From: Emir Karabeg <emirkarabeg@berkeley.edu>
Date: Tue, 17 Jun 2025 11:17:25 -0700
Subject: [PATCH 25/27] improvement: loading check and animation

---
 .../skeleton-loading/skeleton-loading.tsx     | 205 ++++++++++++++++++
 apps/sim/app/w/[id]/workflow.tsx              |  66 +++++-
 2 files changed, 260 insertions(+), 11 deletions(-)
 create mode 100644 apps/sim/app/w/[id]/components/skeleton-loading/skeleton-loading.tsx

diff --git a/apps/sim/app/w/[id]/components/skeleton-loading/skeleton-loading.tsx b/apps/sim/app/w/[id]/components/skeleton-loading/skeleton-loading.tsx
new file mode 100644
index 00000000000..141700a1ec2
--- /dev/null
+++ b/apps/sim/app/w/[id]/components/skeleton-loading/skeleton-loading.tsx
@@ -0,0 +1,205 @@
+'use client'
+
+import { Bell, Bug, ChevronDown, Copy, History, Layers, Play, Rocket, Trash2 } from 'lucide-react'
+import { Button } from '@/components/ui/button'
+import { Skeleton } from '@/components/ui/skeleton'
+import { useSidebarStore } from '@/stores/sidebar/store'
+
+// Skeleton Components
+const SkeletonControlBar = () => {
+  return (
+    <div className='flex h-16 w-full items-center justify-between border-b bg-background'>
+      {/* Left Section - Workflow Name Skeleton */}
+      <div className='flex flex-col gap-[2px] pl-4'>
+        {/* Workflow name skeleton */}
+        <Skeleton className='h-[20px] w-32' />
+        {/* "Saved X time ago" skeleton */}
+        <Skeleton className='h-3 w-24' />
+      </div>
+
+      {/* Middle Section */}
+      <div className='flex-1' />
+
+      {/* Right Section - Action Buttons with Real Icons */}
+      <div className='flex items-center gap-1 pr-4'>
+        {/* Delete Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Trash2 className='h-5 w-5' />
+        </Button>
+
+        {/* History Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <History className='h-5 w-5' />
+        </Button>
+
+        {/* Notifications Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Bell className='h-5 w-5' />
+        </Button>
+
+        {/* Duplicate Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Copy className='h-5 w-5' />
+        </Button>
+
+        {/* Auto Layout Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Layers className='h-5 w-5' />
+        </Button>
+
+        {/* Debug Mode Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Bug className='h-5 w-5' />
+        </Button>
+
+        {/* Deploy Button */}
+        <Button variant='ghost' size='icon' disabled className='opacity-60'>
+          <Rocket className='h-5 w-5' />
+        </Button>
+
+        {/* Run Button with Dropdown */}
+        <div className='ml-1 flex'>
+          {/* Main Run Button */}
+          <Button
+            disabled
+            className='h-10 gap-2 rounded-r-none border-r border-r-[#6420cc] bg-[#701FFC] px-4 py-2 font-medium text-white opacity-60'
+          >
+            <Play className='h-3.5 w-3.5 fill-current stroke-current' />
+            Run
+          </Button>
+
+          {/* Dropdown Trigger */}
+          <Button
+            disabled
+            className='h-10 rounded-l-none bg-[#701FFC] px-2 font-medium text-white opacity-60'
+          >
+            <ChevronDown className='h-4 w-4' />
+          </Button>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+const SkeletonPanelComponent = () => {
+  return (
+    <div className='fixed top-0 right-0 z-10'>
+      {/* Panel skeleton */}
+      <div className='h-96 w-80 space-y-4 rounded-bl-lg border-b border-l bg-background p-4'>
+        {/* Tab headers skeleton */}
+        <div className='flex gap-2 border-b pb-2'>
+          {Array.from({ length: 3 }).map((_, i) => (
+            <Skeleton key={i} className='h-6 w-16' />
+          ))}
+        </div>
+
+        {/* Content skeleton */}
+        <div className='space-y-3'>
+          {Array.from({ length: 6 }).map((_, i) => (
+            <Skeleton key={i} className='h-4' style={{ width: `${Math.random() * 40 + 60}%` }} />
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+const SkeletonNodes = () => {
+  return [
+    // Starter node skeleton
+    {
+      id: 'skeleton-starter',
+      type: 'workflowBlock',
+      position: { x: 100, y: 100 },
+      data: {
+        type: 'skeleton',
+        config: { name: '', description: '', bgColor: '#9CA3AF' },
+        name: '',
+        isActive: false,
+        isPending: false,
+        isSkeleton: true,
+      },
+      dragHandle: '.workflow-drag-handle',
+    },
+    // Additional skeleton nodes
+    {
+      id: 'skeleton-node-1',
+      type: 'workflowBlock',
+      position: { x: 500, y: 100 },
+      data: {
+        type: 'skeleton',
+        config: { name: '', description: '', bgColor: '#9CA3AF' },
+        name: '',
+        isActive: false,
+        isPending: false,
+        isSkeleton: true,
+      },
+      dragHandle: '.workflow-drag-handle',
+    },
+    {
+      id: 'skeleton-node-2',
+      type: 'workflowBlock',
+      position: { x: 300, y: 300 },
+      data: {
+        type: 'skeleton',
+        config: { name: '', description: '', bgColor: '#9CA3AF' },
+        name: '',
+        isActive: false,
+        isPending: false,
+        isSkeleton: true,
+      },
+      dragHandle: '.workflow-drag-handle',
+    },
+  ]
+}
+
+interface SkeletonLoadingProps {
+  showSkeleton: boolean
+  isSidebarCollapsed: boolean
+  children: React.ReactNode
+}
+
+export function SkeletonLoading({
+  showSkeleton,
+  isSidebarCollapsed,
+  children,
+}: SkeletonLoadingProps) {
+  const { mode, isExpanded } = useSidebarStore()
+
+  return (
+    <div className='flex h-screen w-full flex-col overflow-hidden'>
+      <div className={`transition-all duration-200 ${isSidebarCollapsed ? 'ml-14' : 'ml-60'}`}>
+        {/* Skeleton Control Bar */}
+        <div
+          className={`transition-opacity duration-500 ${showSkeleton ? 'opacity-100' : 'pointer-events-none absolute opacity-0'}`}
+          style={{ zIndex: showSkeleton ? 10 : -1 }}
+        >
+          <SkeletonControlBar />
+        </div>
+
+        {/* Real Control Bar */}
+        <div
+          className={`transition-opacity duration-500 ${showSkeleton ? 'pointer-events-none absolute opacity-0' : 'opacity-100'}`}
+          style={{ zIndex: showSkeleton ? -1 : 10 }}
+        >
+          {children}
+        </div>
+      </div>
+
+      {/* Real content will be rendered by children - sidebar will show its own loading state */}
+    </div>
+  )
+}
+
+export function SkeletonPanelWrapper({ showSkeleton }: { showSkeleton: boolean }) {
+  return (
+    <div
+      className={`transition-opacity duration-500 ${showSkeleton ? 'opacity-100' : 'pointer-events-none absolute opacity-0'}`}
+      style={{ zIndex: showSkeleton ? 10 : -1 }}
+    >
+      <SkeletonPanelComponent />
+    </div>
+  )
+}
+
+export { SkeletonNodes, SkeletonPanelComponent }
diff --git a/apps/sim/app/w/[id]/workflow.tsx b/apps/sim/app/w/[id]/workflow.tsx
index fb1781d113c..3aa89114b09 100644
--- a/apps/sim/app/w/[id]/workflow.tsx
+++ b/apps/sim/app/w/[id]/workflow.tsx
@@ -12,7 +12,6 @@ import ReactFlow, {
 } from 'reactflow'
 import 'reactflow/dist/style.css'
 
-import { LoadingAgent } from '@/components/ui/loading-agent'
 import { createLogger } from '@/lib/logs/console-logger'
 import { LoopNodeComponent } from '@/app/w/[id]/components/loop-node/loop-node'
 import { NotificationList } from '@/app/w/[id]/components/notifications/notifications'
@@ -30,6 +29,7 @@ import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import { ControlBar } from './components/control-bar/control-bar'
 import { ErrorBoundary } from './components/error/index'
 import { Panel } from './components/panel/panel'
+import { SkeletonLoading } from './components/skeleton-loading/skeleton-loading'
 import { Toolbar } from './components/toolbar/toolbar'
 import { WorkflowBlock } from './components/workflow-block/workflow-block'
 import { WorkflowEdge } from './components/workflow-edge/workflow-edge'
@@ -56,7 +56,7 @@ const edgeTypes: EdgeTypes = { workflowEdge: WorkflowEdge }
 
 function WorkflowContent() {
   // State
-  const [isInitialized, setIsInitialized] = useState(false)
+  const [isWorkflowReady, setIsWorkflowReady] = useState(false)
   const { mode, isExpanded } = useSidebarStore()
   // In hover mode, act as if sidebar is always collapsed for layout purposes
   const isSidebarCollapsed =
@@ -78,6 +78,7 @@ function WorkflowContent() {
   // Store access
   const {
     workflows,
+    activeWorkflowId,
     setActiveWorkflow,
     createWorkflow,
     isLoading: workflowsLoading,
@@ -252,13 +253,13 @@ function WorkflowContent() {
     }
   }, [debouncedAutoLayout])
 
-  // Initialize workflow
+  // Initialize workflow system
   useEffect(() => {
     if (typeof window !== 'undefined') {
       const initSync = async () => {
         // Initialize sync system if not already initialized
         await initializeSyncManagers()
-        setIsInitialized(true)
+        // Note: setIsWorkflowReady is handled in the workflow data tracking effect below
       }
 
       // Initialize sync system
@@ -727,10 +728,38 @@ function WorkflowContent() {
     [project, isPointInLoopNodeWrapper, getNodes]
   )
 
-  // Init workflow
+  // Track when workflow is fully ready for rendering
   useEffect(() => {
-    if (!isInitialized) return
+    const currentId = params.id as string
+
+    // Reset workflow ready state when workflow changes
+    if (activeWorkflowId !== currentId) {
+      setIsWorkflowReady(false)
+      return
+    }
+
+    // Check if we have the necessary data to render the workflow
+    const hasActiveWorkflow = activeWorkflowId === currentId
+    const hasWorkflowInRegistry = Boolean(workflows[currentId])
+    const isNotLoading = !workflowsLoading
+
+    // Workflow is ready when:
+    // 1. We have an active workflow that matches the URL
+    // 2. The workflow exists in the registry
+    // 3. Workflows are not currently loading
+    if (hasActiveWorkflow && hasWorkflowInRegistry && isNotLoading) {
+      // Add a small delay to ensure blocks state has settled
+      const timeoutId = setTimeout(() => {
+        setIsWorkflowReady(true)
+      }, 100)
+
+      return () => clearTimeout(timeoutId)
+    }
+    setIsWorkflowReady(false)
+  }, [activeWorkflowId, params.id, workflows, workflowsLoading])
 
+  // Init workflow
+  useEffect(() => {
     const validateAndNavigate = async () => {
       const workflowIds = Object.keys(workflows)
       const currentId = params.id as string
@@ -789,7 +818,6 @@ function WorkflowContent() {
     setActiveWorkflow,
     createWorkflow,
     router,
-    isInitialized,
     markAllAsRead,
     resetVariablesLoaded,
   ])
@@ -1339,10 +1367,27 @@ function WorkflowContent() {
     }
   }, [setSubBlockValue])
 
-  if (!isInitialized) {
+  // Show skeleton UI while loading, then smoothly transition to real content
+  const showSkeletonUI = !isWorkflowReady
+
+  if (showSkeletonUI) {
     return (
-      <div className='flex h-[calc(100vh-4rem)] w-full items-center justify-center'>
-        <LoadingAgent size='lg' />
+      <div className='flex h-screen w-full flex-col overflow-hidden'>
+        <SkeletonLoading showSkeleton={true} isSidebarCollapsed={isSidebarCollapsed}>
+          <ControlBar />
+        </SkeletonLoading>
+        <Toolbar />
+        <div
+          className={`relative h-full w-full flex-1 transition-all duration-200 ${isSidebarCollapsed ? 'pl-14' : 'pl-60'}`}
+        >
+          <div className='fixed top-0 right-0 z-10'>
+            <Panel />
+            <NotificationList />
+          </div>
+          <div className='workflow-container h-full'>
+            <Background />
+          </div>
+        </div>
       </div>
     )
   }
@@ -1383,7 +1428,6 @@ function WorkflowContent() {
           }}
           connectionLineType={ConnectionLineType.SmoothStep}
           onNodeClick={(e, node) => {
-            // Allow selecting nodes, but stop propagation to prevent triggering other events
             e.stopPropagation()
           }}
           onPaneClick={onPaneClick}

From 65747c596dab0b39fcc8d5f57033593a1ccafd24 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Tue, 17 Jun 2025 12:39:55 -0700
Subject: [PATCH 26/27] remove unused utils

---
 apps/sim/lib/urls/utils.ts | 61 --------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/apps/sim/lib/urls/utils.ts b/apps/sim/lib/urls/utils.ts
index 587fd6cecbd..c38c32a139a 100644
--- a/apps/sim/lib/urls/utils.ts
+++ b/apps/sim/lib/urls/utils.ts
@@ -53,64 +53,3 @@ export function getEmailDomain(): string {
     return isProd ? 'simstudio.ai' : 'localhost:3000'
   }
 }
-
-/**
- * OAuth URL construction utilities
- */
-
-export interface OAuthUrlParams {
-  provider: string
-  service: string
-  scopes: string[]
-  returnUrl?: string
-}
-
-/**
- * Constructs a standardized OAuth URL for authentication
- * @param params OAuth URL parameters
- * @returns The complete OAuth URL
- */
-export function buildOAuthUrl({ provider, service, scopes, returnUrl }: OAuthUrlParams): string {
-  const currentReturnUrl = returnUrl || (typeof window !== 'undefined' ? window.location.href : '')
-
-  return `/api/auth/oauth?provider=${provider}&service=${service}&scopes=${encodeURIComponent(
-    scopes.join(',')
-  )}&return_url=${encodeURIComponent(currentReturnUrl)}`
-}
-
-/**
- * Microsoft Teams URL construction utilities
- */
-
-/**
- * Constructs a Microsoft Teams team URL
- * @param teamId The team ID
- * @returns The complete Teams team URL
- */
-export function buildTeamsTeamUrl(teamId: string): string {
-  return `https://teams.microsoft.com/l/team/${teamId}`
-}
-
-/**
- * Constructs a Microsoft Teams channel URL
- * @param teamId The team ID
- * @param channelDisplayName The channel display name
- * @param channelId The channel ID
- * @returns The complete Teams channel URL
- */
-export function buildTeamsChannelUrl(
-  teamId: string,
-  channelDisplayName: string,
-  channelId: string
-): string {
-  return `https://teams.microsoft.com/l/channel/${teamId}/${encodeURIComponent(channelDisplayName)}/${channelId}`
-}
-
-/**
- * Constructs a Microsoft Teams chat URL
- * @param chatId The chat ID
- * @returns The complete Teams chat URL
- */
-export function buildTeamsChatUrl(chatId: string): string {
-  return `https://teams.microsoft.com/l/chat/${chatId}`
-}

From 597cc07e63e10e52745513de8325f0af674395e6 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-Air.attlocal.net>
Date: Tue, 17 Jun 2025 13:03:21 -0700
Subject: [PATCH 27/27] remove console  logs

---
 apps/sim/app/w/hooks/use-registry-loading.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/sim/app/w/hooks/use-registry-loading.ts b/apps/sim/app/w/hooks/use-registry-loading.ts
index 5f4870eb7b7..207514e18fd 100644
--- a/apps/sim/app/w/hooks/use-registry-loading.ts
+++ b/apps/sim/app/w/hooks/use-registry-loading.ts
@@ -2,8 +2,11 @@
 
 import { useEffect } from 'react'
 import { usePathname, useRouter } from 'next/navigation'
+import { createLogger } from '@/lib/logs/console-logger'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
+const logger = createLogger('UseRegistryLoading')
+
 /**
  * Extract workflow ID from pathname
  * @param pathname - Current pathname
@@ -22,7 +25,7 @@ function extractWorkflowIdFromPathname(pathname: string): string | null {
     }
     return null
   } catch (error) {
-    console.warn('Failed to extract workflow ID from pathname:', error)
+    logger.warn('Failed to extract workflow ID from pathname:', error)
     return null
   }
 }
@@ -46,7 +49,7 @@ export function useRegistryLoading() {
       const workflowIdFromUrl = extractWorkflowIdFromPathname(pathname)
       if (workflowIdFromUrl) {
         loadWorkspaceFromWorkflowId(workflowIdFromUrl).catch((error) => {
-          console.warn('Failed to load workspace from workflow ID:', error)
+          logger.warn('Failed to load workspace from workflow ID:', error)
         })
       }
     }
@@ -64,7 +67,7 @@ export function useRegistryLoading() {
         (pathname === '/w' || pathname === '/w/' || pathname === `/w/${activeWorkspaceId}`)
       ) {
         const firstWorkflowId = Object.keys(workflows)[0]
-        console.log('First-time navigation: redirecting to first workflow:', firstWorkflowId)
+        logger.info('First-time navigation: redirecting to first workflow:', firstWorkflowId)
         router.replace(`/w/${firstWorkflowId}`)
       }
     }