v0.3.38: billing cron job fix

* feat(native-bg-tasks): support webhooks and async workflow executions without trigger"

* fix tests

* fix env var defaults and revert async workflow execution to always use trigger

* fix UI for hiding async

* hide entire toggle

.github/workflows/build.yml

@@ -85,8 +85,8 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=build-v2
-          cache-to: type=gha,mode=max,scope=build-v2
+          cache-from: type=gha,scope=build-v3
+          cache-to: type=gha,mode=max,scope=build-v3
           provenance: false
           sbom: false
 

.github/workflows/trigger-deploy.yml

@@ -0,0 +1,44 @@
+name: Trigger.dev Deploy
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+
+jobs:
+  deploy:
+    name: Trigger.dev Deploy
+    runs-on: ubuntu-latest
+    concurrency:
+      group: trigger-deploy-${{ github.ref }}
+      cancel-in-progress: false
+    env:
+      TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'lts/*'
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Deploy to Staging
+        if: github.ref == 'refs/heads/staging'
+        working-directory: ./apps/sim
+        run: npx --yes trigger.dev@4.0.0 deploy -e staging
+
+      - name: Deploy to Production
+        if: github.ref == 'refs/heads/main'
+        working-directory: ./apps/sim
+        run: npx --yes trigger.dev@4.0.0 deploy
+

README.md

@@ -160,6 +160,7 @@ Copilot is a Sim-managed service. To use Copilot on a self-hosted instance:
 
 - Go to https://sim.ai → Settings → Copilot and generate a Copilot API key
 - Set `COPILOT_API_KEY` in your self-hosted environment to that value
+- Host Sim on a publicly available DNS and set NEXT_PUBLIC_APP_URL and BETTER_AUTH_URL to that value ([ngrok](https://ngrok.com/))
 
 ## Tech Stack
 

apps/docs/content/docs/copilot/index.mdx

@@ -16,7 +16,10 @@ Copilot is your in-editor assistant that helps you build, understand, and improv
 - **Edit**: Make changes to blocks, connections, and settings when you approve
 
 <Callout type="info">
-  Copilot is a Sim-managed service. For self-hosted deployments, generate a Copilot API key in the hosted app (sim.ai → Settings → Copilot) and set `COPILOT_API_KEY` in your environment.
+  Copilot is a Sim-managed service. For self-hosted deployments, generate a Copilot API key in the hosted app (sim.ai → Settings → Copilot)
+  1. Go to [sim.ai](https://sim.ai) → Settings → Copilot and generate a Copilot API key
+2. Set `COPILOT_API_KEY` in your self-hosted environment to that value
+3. Host Sim on a publicly available DNS and set `NEXT_PUBLIC_APP_URL` and `BETTER_AUTH_URL` to that value (e.g., using ngrok)
 </Callout>
 
 ## Modes

apps/docs/content/docs/tools/microsoft_excel.mdx

@@ -115,8 +115,7 @@ Read data from a Microsoft Excel spreadsheet
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Excel spreadsheet data and metadata |
+| `data` | object | Range data from the spreadsheet |
 
 ### `microsoft_excel_write`
 
@@ -136,8 +135,11 @@ Write data to a Microsoft Excel spreadsheet
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Write operation results and metadata |
+| `updatedRange` | string | The range that was updated |
+| `updatedRows` | number | Number of rows that were updated |
+| `updatedColumns` | number | Number of columns that were updated |
+| `updatedCells` | number | Number of cells that were updated |
+| `metadata` | object | Spreadsheet metadata |
 
 ### `microsoft_excel_table_add`
 
@@ -155,8 +157,9 @@ Add new rows to a Microsoft Excel table
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `success` | boolean | Operation success status |
-| `output` | object | Table add operation results and metadata |
+| `index` | number | Index of the first row that was added |
+| `values` | array | Array of rows that were added to the table |
+| `metadata` | object | Spreadsheet metadata |
 
 
 

apps/docs/content/docs/tools/supabase.mdx

@@ -142,7 +142,7 @@ Get a single row from a Supabase table based on filter criteria
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `message` | string | Operation status message |
-| `results` | object | The row data if found, null if not found |
+| `results` | array | Array containing the row data if found, empty array if not found |
 
 ### `supabase_update`
 
@@ -185,6 +185,26 @@ Delete rows from a Supabase table based on filter criteria
 | `message` | string | Operation status message |
 | `results` | array | Array of deleted records |
 
+### `supabase_upsert`
+
+Insert or update data in a Supabase table (upsert operation)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `projectId` | string | Yes | Your Supabase project ID \(e.g., jdrkgepadsdopsntdlom\) |
+| `table` | string | Yes | The name of the Supabase table to upsert data into |
+| `data` | any | Yes | The data to upsert \(insert or update\) |
+| `apiKey` | string | Yes | Your Supabase service role secret key |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `results` | array | Array of upserted records |
+
 
 
 ## Notes

apps/sim/app/(auth)/components/social-login-buttons.tsx

@@ -3,7 +3,6 @@
 import { useEffect, useState } from 'react'
 import { GithubIcon, GoogleIcon } from '@/components/icons'
 import { Button } from '@/components/ui/button'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { client } from '@/lib/auth-client'
 
 interface SocialLoginButtonsProps {
@@ -114,58 +113,16 @@ export function SocialLoginButtons({
     </Button>
   )
 
-  const renderGithubButton = () => {
-    if (githubAvailable) return githubButton
+  const hasAnyOAuthProvider = githubAvailable || googleAvailable
 
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <div>{githubButton}</div>
-          </TooltipTrigger>
-          <TooltipContent className='border-neutral-700 bg-neutral-800 text-white'>
-            <p>
-              GitHub login requires OAuth credentials to be configured. Add the following
-              environment variables:
-            </p>
-            <ul className='mt-2 space-y-1 text-neutral-300 text-xs'>
-              <li>• GITHUB_CLIENT_ID</li>
-              <li>• GITHUB_CLIENT_SECRET</li>
-            </ul>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    )
-  }
-
-  const renderGoogleButton = () => {
-    if (googleAvailable) return googleButton
-
-    return (
-      <TooltipProvider>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <div>{googleButton}</div>
-          </TooltipTrigger>
-          <TooltipContent className='border-neutral-700 bg-neutral-800 text-white'>
-            <p>
-              Google login requires OAuth credentials to be configured. Add the following
-              environment variables:
-            </p>
-            <ul className='mt-2 space-y-1 text-neutral-300 text-xs'>
-              <li>• GOOGLE_CLIENT_ID</li>
-              <li>• GOOGLE_CLIENT_SECRET</li>
-            </ul>
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
-    )
+  if (!hasAnyOAuthProvider) {
+    return null
   }
 
   return (
     <div className='grid gap-3'>
-      {renderGithubButton()}
-      {renderGoogleButton()}
+      {githubAvailable && githubButton}
+      {googleAvailable && googleButton}
     </div>
   )
 }

apps/sim/app/(auth)/layout.tsx

@@ -28,12 +28,12 @@ export default function AuthLayout({ children }: { children: React.ReactNode })
               <img
                 src={brand.logoUrl}
                 alt={`${brand.name} Logo`}
-                width={42}
-                height={42}
-                className='h-[42px] w-[42px] object-contain'
+                width={56}
+                height={56}
+                className='h-[56px] w-[56px] object-contain'
               />
             ) : (
-              <Image src='/sim.svg' alt={`${brand.name} Logo`} width={42} height={42} />
+              <Image src='/sim.svg' alt={`${brand.name} Logo`} width={56} height={56} />
             )}
           </Link>
         </div>

apps/sim/app/(auth)/login/login-form.tsx

@@ -366,11 +366,13 @@ export default function LoginPage({
             callbackURL={callbackUrl}
           />
 
-          <div className='relative mt-2 py-4'>
-            <div className='absolute inset-0 flex items-center'>
-              <div className='w-full border-neutral-700/50 border-t' />
+          {(githubAvailable || googleAvailable) && (
+            <div className='relative mt-2 py-4'>
+              <div className='absolute inset-0 flex items-center'>
+                <div className='w-full border-neutral-700/50 border-t' />
+              </div>
             </div>
-          </div>
+          )}
 
           <form onSubmit={onSubmit} className='space-y-5'>
             <div className='space-y-4'>

apps/sim/app/(auth)/signup/signup-form.tsx

@@ -381,11 +381,13 @@ function SignupFormContent({
             isProduction={isProduction}
           />
 
-          <div className='relative mt-2 py-4'>
-            <div className='absolute inset-0 flex items-center'>
-              <div className='w-full border-neutral-700/50 border-t' />
+          {(githubAvailable || googleAvailable) && (
+            <div className='relative mt-2 py-4'>
+              <div className='absolute inset-0 flex items-center'>
+                <div className='w-full border-neutral-700/50 border-t' />
+              </div>
             </div>
-          </div>
+          )}
 
           <form onSubmit={onSubmit} className='space-y-5'>
             <div className='space-y-4'>

apps/sim/app/api/__test-utils__/utils.ts

@@ -354,6 +354,18 @@ export function mockExecutionDependencies() {
   }))
 }
 
+/**
+ * Mock Trigger.dev SDK (tasks.trigger and task factory) for tests that import background modules
+ */
+export function mockTriggerDevSdk() {
+  vi.mock('@trigger.dev/sdk', () => ({
+    tasks: {
+      trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
+    },
+    task: vi.fn().mockReturnValue({}),
+  }))
+}
+
 export function mockWorkflowAccessValidation(shouldSucceed = true) {
   if (shouldSucceed) {
     vi.mock('@/app/api/workflows/middleware', () => ({

apps/sim/app/api/auth/oauth/token/route.ts

@@ -84,14 +84,12 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: 'Credential not found' }, { status: 404 })
     }
 
-    // Check if the access token is valid
     if (!credential.accessToken) {
       logger.warn(`[${requestId}] No access token available for credential`)
       return NextResponse.json({ error: 'No access token available' }, { status: 400 })
     }
 
     try {
-      // Refresh the token if needed
       const { accessToken } = await refreshTokenIfNeeded(requestId, credential, credentialId)
       return NextResponse.json({ accessToken }, { status: 200 })
     } catch (_error) {

apps/sim/app/api/auth/oauth/utils.ts

@@ -1,4 +1,4 @@
-import { and, eq } from 'drizzle-orm'
+import { and, desc, eq } from 'drizzle-orm'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
 import { refreshOAuthToken } from '@/lib/oauth/oauth'
@@ -70,7 +70,8 @@ export async function getOAuthToken(userId: string, providerId: string): Promise
     })
     .from(account)
     .where(and(eq(account.userId, userId), eq(account.providerId, providerId)))
-    .orderBy(account.createdAt)
+    // Always use the most recently updated credential for this provider
+    .orderBy(desc(account.updatedAt))
     .limit(1)
 
   if (connections.length === 0) {
@@ -80,19 +81,13 @@ export async function getOAuthToken(userId: string, providerId: string): Promise
 
   const credential = connections[0]
 
-  // Check if we have a valid access token
-  if (!credential.accessToken) {
-    logger.warn(`Access token is null for user ${userId}, provider ${providerId}`)
-    return null
-  }
-
-  // Check if the token is expired and needs refreshing
+  // Determine whether we should refresh: missing token OR expired token
   const now = new Date()
   const tokenExpiry = credential.accessTokenExpiresAt
-  // Only refresh if we have an expiration time AND it's expired AND we have a refresh token
-  const needsRefresh = tokenExpiry && tokenExpiry < now && !!credential.refreshToken
+  const shouldAttemptRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (tokenExpiry && tokenExpiry < now))
 
-  if (needsRefresh) {
+  if (shouldAttemptRefresh) {
     logger.info(
       `Access token expired for user ${userId}, provider ${providerId}. Attempting to refresh.`
     )
@@ -141,6 +136,13 @@ export async function getOAuthToken(userId: string, providerId: string): Promise
     }
   }
 
+  if (!credential.accessToken) {
+    logger.warn(
+      `Access token is null and no refresh attempted or available for user ${userId}, provider ${providerId}`
+    )
+    return null
+  }
+
   logger.info(`Found valid OAuth token for user ${userId}, provider ${providerId}`)
   return credential.accessToken
 }
@@ -164,19 +166,21 @@ export async function refreshAccessTokenIfNeeded(
     return null
   }
 
-  // Check if we need to refresh the token
+  // Decide if we should refresh: token missing OR expired
   const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-  // Only refresh if we have an expiration time AND it's expired
-  // If no expiration time is set (newly created credentials), assume token is valid
-  const needsRefresh = expiresAt && expiresAt <= now
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))
 
   const accessToken = credential.accessToken
 
-  if (needsRefresh && credential.refreshToken) {
+  if (shouldRefresh) {
     logger.info(`[${requestId}] Token expired, attempting to refresh for credential`)
     try {
-      const refreshedToken = await refreshOAuthToken(credential.providerId, credential.refreshToken)
+      const refreshedToken = await refreshOAuthToken(
+        credential.providerId,
+        credential.refreshToken!
+      )
 
       if (!refreshedToken) {
         logger.error(`[${requestId}] Failed to refresh token for credential: ${credentialId}`, {
@@ -217,6 +221,7 @@ export async function refreshAccessTokenIfNeeded(
       return null
     }
   } else if (!accessToken) {
+    // We have no access token and either no refresh token or not eligible to refresh
     logger.error(`[${requestId}] Missing access token for credential`)
     return null
   }
@@ -233,21 +238,20 @@ export async function refreshTokenIfNeeded(
   credential: any,
   credentialId: string
 ): Promise<{ accessToken: string; refreshed: boolean }> {
-  // Check if we need to refresh the token
+  // Decide if we should refresh: token missing OR expired
   const expiresAt = credential.accessTokenExpiresAt
   const now = new Date()
-  // Only refresh if we have an expiration time AND it's expired
-  // If no expiration time is set (newly created credentials), assume token is valid
-  const needsRefresh = expiresAt && expiresAt <= now
+  const shouldRefresh =
+    !!credential.refreshToken && (!credential.accessToken || (expiresAt && expiresAt <= now))
 
-  // If token is still valid, return it directly
-  if (!needsRefresh || !credential.refreshToken) {
+  // If token appears valid and present, return it directly
+  if (!shouldRefresh) {
     logger.info(`[${requestId}] Access token is valid`)
     return { accessToken: credential.accessToken, refreshed: false }
   }
 
   try {
-    const refreshResult = await refreshOAuthToken(credential.providerId, credential.refreshToken)
+    const refreshResult = await refreshOAuthToken(credential.providerId, credential.refreshToken!)
 
     if (!refreshResult) {
       logger.error(`[${requestId}] Failed to refresh token for credential`)

apps/sim/app/api/auth/socket-token/route.ts

@@ -4,8 +4,9 @@ import { auth } from '@/lib/auth'
 
 export async function POST() {
   try {
+    const hdrs = await headers()
     const response = await auth.api.generateOneTimeToken({
-      headers: await headers(),
+      headers: hdrs,
     })
 
     if (!response) {
@@ -14,7 +15,6 @@ export async function POST() {
 
     return NextResponse.json({ token: response.token })
   } catch (error) {
-    console.error('Error generating one-time token:', error)
     return NextResponse.json({ error: 'Failed to generate token' }, { status: 500 })
   }
 }

apps/sim/app/api/billing/daily/route.ts

@@ -67,7 +67,7 @@ export async function POST(request: NextRequest) {
       { status: 500 }
     )
   } catch (error) {
-    logger.error('Fatal error in monthly billing cron job', { error })
+    logger.error('Fatal error in daily billing cron job', { error })
 
     return NextResponse.json(
       {
@@ -90,18 +90,59 @@ export async function GET(request: NextRequest) {
       return authError
     }
 
-    return NextResponse.json({
-      status: 'ready',
-      message:
-        'Daily billing check cron job is ready to process users and organizations with periods ending today',
-      currentDate: new Date().toISOString().split('T')[0],
+    const startTime = Date.now()
+    const result = await processDailyBillingCheck()
+    const duration = Date.now() - startTime
+
+    if (result.success) {
+      logger.info('Daily billing check (GET) completed successfully', {
+        processedUsers: result.processedUsers,
+        processedOrganizations: result.processedOrganizations,
+        totalChargedAmount: result.totalChargedAmount,
+        duration: `${duration}ms`,
+      })
+
+      return NextResponse.json({
+        success: true,
+        summary: {
+          processedUsers: result.processedUsers,
+          processedOrganizations: result.processedOrganizations,
+          totalChargedAmount: result.totalChargedAmount,
+          duration: `${duration}ms`,
+        },
+      })
+    }
+
+    logger.error('Daily billing check (GET) completed with errors', {
+      processedUsers: result.processedUsers,
+      processedOrganizations: result.processedOrganizations,
+      totalChargedAmount: result.totalChargedAmount,
+      errorCount: result.errors.length,
+      errors: result.errors,
+      duration: `${duration}ms`,
     })
-  } catch (error) {
-    logger.error('Error in billing health check', { error })
+
     return NextResponse.json(
       {
-        status: 'error',
-        error: error instanceof Error ? error.message : 'Unknown error',
+        success: false,
+        summary: {
+          processedUsers: result.processedUsers,
+          processedOrganizations: result.processedOrganizations,
+          totalChargedAmount: result.totalChargedAmount,
+          errorCount: result.errors.length,
+          duration: `${duration}ms`,
+        },
+        errors: result.errors,
+      },
+      { status: 500 }
+    )
+  } catch (error) {
+    logger.error('Fatal error in daily billing (GET) cron job', { error })
+    return NextResponse.json(
+      {
+        success: false,
+        error: 'Internal server error during daily billing check',
+        details: error instanceof Error ? error.message : 'Unknown error',
       },
       { status: 500 }
     )

apps/sim/app/api/help/route.ts

@@ -1,12 +1,13 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { Resend } from 'resend'
 import { z } from 'zod'
+import { renderHelpConfirmationEmail } from '@/components/emails'
 import { getSession } from '@/lib/auth'
+import { sendEmail } from '@/lib/email/mailer'
+import { getFromEmailAddress } from '@/lib/email/utils'
 import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getEmailDomain } from '@/lib/urls/utils'
 
-const resend = env.RESEND_API_KEY ? new Resend(env.RESEND_API_KEY) : null
 const logger = createLogger('HelpAPI')
 
 const helpFormSchema = z.object({
@@ -28,18 +29,6 @@ export async function POST(req: NextRequest) {
 
     const email = session.user.email
 
-    // Check if Resend API key is configured
-    if (!resend) {
-      logger.error(`[${requestId}] RESEND_API_KEY not configured`)
-      return NextResponse.json(
-        {
-          error:
-            'Email service not configured. Please set RESEND_API_KEY in environment variables.',
-        },
-        { status: 500 }
-      )
-    }
-
     // Handle multipart form data
     const formData = await req.formData()
 
@@ -54,18 +43,18 @@ export async function POST(req: NextRequest) {
     })
 
     // Validate the form data
-    const result = helpFormSchema.safeParse({
+    const validationResult = helpFormSchema.safeParse({
       subject,
       message,
       type,
     })
 
-    if (!result.success) {
+    if (!validationResult.success) {
       logger.warn(`[${requestId}] Invalid help request data`, {
-        errors: result.error.format(),
+        errors: validationResult.error.format(),
       })
       return NextResponse.json(
-        { error: 'Invalid request data', details: result.error.format() },
+        { error: 'Invalid request data', details: validationResult.error.format() },
         { status: 400 }
       )
     }
@@ -103,63 +92,60 @@ ${message}
       emailText += `\n\n${images.length} image(s) attached.`
     }
 
-    // Send email using Resend
-    const { error } = await resend.emails.send({
-      from: `Sim <noreply@${env.EMAIL_DOMAIN || getEmailDomain()}>`,
+    const emailResult = await sendEmail({
       to: [`help@${env.EMAIL_DOMAIN || getEmailDomain()}`],
       subject: `[${type.toUpperCase()}] ${subject}`,
-      replyTo: email,
       text: emailText,
+      from: getFromEmailAddress(),
+      replyTo: email,
+      emailType: 'transactional',
       attachments: images.map((image) => ({
         filename: image.filename,
         content: image.content.toString('base64'),
         contentType: image.contentType,
-        disposition: 'attachment', // Explicitly set as attachment
+        disposition: 'attachment',
       })),
     })
 
-    if (error) {
-      logger.error(`[${requestId}] Error sending help request email`, error)
+    if (!emailResult.success) {
+      logger.error(`[${requestId}] Error sending help request email`, emailResult.message)
       return NextResponse.json({ error: 'Failed to send email' }, { status: 500 })
     }
 
     logger.info(`[${requestId}] Help request email sent successfully`)
 
     // Send confirmation email to the user
-    await resend.emails
-      .send({
-        from: `Sim <noreply@${env.EMAIL_DOMAIN || getEmailDomain()}>`,
+    try {
+      const confirmationHtml = await renderHelpConfirmationEmail(
+        email,
+        type as 'bug' | 'feedback' | 'feature_request' | 'other',
+        images.length
+      )
+
+      await sendEmail({
         to: [email],
         subject: `Your ${type} request has been received: ${subject}`,
-        text: `
-Hello,
-
-Thank you for your ${type} submission. We've received your request and will get back to you as soon as possible.
-
-Your message:
-${message}
-
-${images.length > 0 ? `You attached ${images.length} image(s).` : ''}
-
-Best regards,
-The Sim Team
-        `,
+        html: confirmationHtml,
+        from: getFromEmailAddress(),
         replyTo: `help@${env.EMAIL_DOMAIN || getEmailDomain()}`,
+        emailType: 'transactional',
       })
-      .catch((err) => {
-        logger.warn(`[${requestId}] Failed to send confirmation email`, err)
-      })
+    } catch (err) {
+      logger.warn(`[${requestId}] Failed to send confirmation email`, err)
+    }
 
     return NextResponse.json(
       { success: true, message: 'Help request submitted successfully' },
       { status: 200 }
     )
   } catch (error) {
-    // Check if error is related to missing API key
-    if (error instanceof Error && error.message.includes('API key')) {
-      logger.error(`[${requestId}] API key configuration error`, error)
+    if (error instanceof Error && error.message.includes('not configured')) {
+      logger.error(`[${requestId}] Email service configuration error`, error)
       return NextResponse.json(
-        { error: 'Email service configuration error. Please check your RESEND_API_KEY.' },
+        {
+          error:
+            'Email service configuration error. Please check your email service configuration.',
+        },
         { status: 500 }
       )
     }

apps/sim/app/api/jobs/[jobId]/route.ts

@@ -1,4 +1,4 @@
-import { runs } from '@trigger.dev/sdk/v3'
+import { runs } from '@trigger.dev/sdk'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'

apps/sim/app/api/knowledge/search/utils.test.ts

@@ -4,15 +4,50 @@
  *
  * @vitest-environment node
  */
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 vi.mock('drizzle-orm')
-vi.mock('@/lib/logs/console/logger')
+vi.mock('@/lib/logs/console/logger', () => ({
+  createLogger: vi.fn(() => ({
+    info: vi.fn(),
+    debug: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn(),
+  })),
+}))
 vi.mock('@/db')
+vi.mock('@/lib/documents/utils', () => ({
+  retryWithExponentialBackoff: (fn: any) => fn(),
+}))
 
-import { handleTagAndVectorSearch, handleTagOnlySearch, handleVectorOnlySearch } from './utils'
+vi.stubGlobal(
+  'fetch',
+  vi.fn().mockResolvedValue({
+    ok: true,
+    json: async () => ({
+      data: [{ embedding: [0.1, 0.2, 0.3] }],
+    }),
+  })
+)
+
+vi.mock('@/lib/env', () => ({
+  env: {},
+  isTruthy: (value: string | boolean | number | undefined) =>
+    typeof value === 'string' ? value === 'true' || value === '1' : Boolean(value),
+}))
+
+import {
+  generateSearchEmbedding,
+  handleTagAndVectorSearch,
+  handleTagOnlySearch,
+  handleVectorOnlySearch,
+} from './utils'
 
 describe('Knowledge Search Utils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
   describe('handleTagOnlySearch', () => {
     it('should throw error when no filters provided', async () => {
       const params = {
@@ -140,4 +175,251 @@ describe('Knowledge Search Utils', () => {
       expect(params.distanceThreshold).toBe(0.8)
     })
   })
+
+  describe('generateSearchEmbedding', () => {
+    it('should use Azure OpenAI when KB-specific config is provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        AZURE_OPENAI_API_VERSION: '2024-12-01-preview',
+        KB_OPENAI_MODEL_NAME: 'text-embedding-ada-002',
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      const result = await generateSearchEmbedding('test query')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://test.openai.azure.com/openai/deployments/text-embedding-ada-002/embeddings?api-version=2024-12-01-preview',
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            'api-key': 'test-azure-key',
+          }),
+        })
+      )
+      expect(result).toEqual([0.1, 0.2, 0.3])
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should fallback to OpenAI when no KB Azure config provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      const result = await generateSearchEmbedding('test query')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://api.openai.com/v1/embeddings',
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer test-openai-key',
+          }),
+        })
+      )
+      expect(result).toEqual([0.1, 0.2, 0.3])
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should use default API version when not provided in Azure config', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        KB_OPENAI_MODEL_NAME: 'custom-embedding-model',
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      await generateSearchEmbedding('test query')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        expect.stringContaining('api-version='),
+        expect.any(Object)
+      )
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should use custom model name when provided in Azure config', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        AZURE_OPENAI_API_VERSION: '2024-12-01-preview',
+        KB_OPENAI_MODEL_NAME: 'custom-embedding-model',
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      await generateSearchEmbedding('test query', 'text-embedding-3-small')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://test.openai.azure.com/openai/deployments/custom-embedding-model/embeddings?api-version=2024-12-01-preview',
+        expect.any(Object)
+      )
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should throw error when no API configuration provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+
+      await expect(generateSearchEmbedding('test query')).rejects.toThrow(
+        'Either OPENAI_API_KEY or Azure OpenAI configuration (AZURE_OPENAI_API_KEY + AZURE_OPENAI_ENDPOINT) must be configured'
+      )
+    })
+
+    it('should handle Azure OpenAI API errors properly', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        AZURE_OPENAI_API_VERSION: '2024-12-01-preview',
+        KB_OPENAI_MODEL_NAME: 'text-embedding-ada-002',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: false,
+        status: 404,
+        statusText: 'Not Found',
+        text: async () => 'Deployment not found',
+      } as any)
+
+      await expect(generateSearchEmbedding('test query')).rejects.toThrow('Embedding API failed')
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should handle OpenAI API errors properly', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: false,
+        status: 429,
+        statusText: 'Too Many Requests',
+        text: async () => 'Rate limit exceeded',
+      } as any)
+
+      await expect(generateSearchEmbedding('test query')).rejects.toThrow('Embedding API failed')
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should include correct request body for Azure OpenAI', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        AZURE_OPENAI_API_VERSION: '2024-12-01-preview',
+        KB_OPENAI_MODEL_NAME: 'text-embedding-ada-002',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      await generateSearchEmbedding('test query')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          body: JSON.stringify({
+            input: ['test query'],
+            encoding_format: 'float',
+          }),
+        })
+      )
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should include correct request body for OpenAI', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2, 0.3] }],
+        }),
+      } as any)
+
+      await generateSearchEmbedding('test query', 'text-embedding-3-small')
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          body: JSON.stringify({
+            input: ['test query'],
+            model: 'text-embedding-3-small',
+            encoding_format: 'float',
+          }),
+        })
+      )
+
+      // Clean up
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+  })
 })

apps/sim/app/api/knowledge/search/utils.ts

@@ -1,22 +1,10 @@
 import { and, eq, inArray, sql } from 'drizzle-orm'
-import { retryWithExponentialBackoff } from '@/lib/documents/utils'
-import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { embedding } from '@/db/schema'
 
 const logger = createLogger('KnowledgeSearchUtils')
 
-export class APIError extends Error {
-  public status: number
-
-  constructor(message: string, status: number) {
-    super(message)
-    this.name = 'APIError'
-    this.status = status
-  }
-}
-
 export interface SearchResult {
   id: string
   content: string
@@ -41,61 +29,8 @@ export interface SearchParams {
   distanceThreshold?: number
 }
 
-export async function generateSearchEmbedding(query: string): Promise<number[]> {
-  const openaiApiKey = env.OPENAI_API_KEY
-  if (!openaiApiKey) {
-    throw new Error('OPENAI_API_KEY not configured')
-  }
-
-  try {
-    const embedding = await retryWithExponentialBackoff(
-      async () => {
-        const response = await fetch('https://api.openai.com/v1/embeddings', {
-          method: 'POST',
-          headers: {
-            Authorization: `Bearer ${openaiApiKey}`,
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify({
-            input: query,
-            model: 'text-embedding-3-small',
-            encoding_format: 'float',
-          }),
-        })
-
-        if (!response.ok) {
-          const errorText = await response.text()
-          const error = new APIError(
-            `OpenAI API error: ${response.status} ${response.statusText} - ${errorText}`,
-            response.status
-          )
-          throw error
-        }
-
-        const data = await response.json()
-
-        if (!data.data || !Array.isArray(data.data) || data.data.length === 0) {
-          throw new Error('Invalid response format from OpenAI embeddings API')
-        }
-
-        return data.data[0].embedding
-      },
-      {
-        maxRetries: 5,
-        initialDelayMs: 1000,
-        maxDelayMs: 30000,
-        backoffMultiplier: 2,
-      }
-    )
-
-    return embedding
-  } catch (error) {
-    logger.error('Failed to generate search embedding:', error)
-    throw new Error(
-      `Embedding generation failed: ${error instanceof Error ? error.message : 'Unknown error'}`
-    )
-  }
-}
+// Use shared embedding utility
+export { generateSearchEmbedding } from '@/lib/embeddings/utils'
 
 function getTagFilters(filters: Record<string, string>, embedding: any) {
   return Object.entries(filters).map(([key, value]) => {

apps/sim/app/api/knowledge/utils.test.ts

@@ -252,5 +252,76 @@ describe('Knowledge Utils', () => {
 
       expect(result.length).toBe(2)
     })
+
+    it('should use Azure OpenAI when Azure config is provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        AZURE_OPENAI_API_KEY: 'test-azure-key',
+        AZURE_OPENAI_ENDPOINT: 'https://test.openai.azure.com',
+        AZURE_OPENAI_API_VERSION: '2024-12-01-preview',
+        KB_OPENAI_MODEL_NAME: 'text-embedding-ada-002',
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2], index: 0 }],
+        }),
+      } as any)
+
+      await generateEmbeddings(['test text'])
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://test.openai.azure.com/openai/deployments/text-embedding-ada-002/embeddings?api-version=2024-12-01-preview',
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            'api-key': 'test-azure-key',
+          }),
+        })
+      )
+
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should fallback to OpenAI when no Azure config provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+      Object.assign(env, {
+        OPENAI_API_KEY: 'test-openai-key',
+      })
+
+      const fetchSpy = vi.mocked(fetch)
+      fetchSpy.mockResolvedValueOnce({
+        ok: true,
+        json: async () => ({
+          data: [{ embedding: [0.1, 0.2], index: 0 }],
+        }),
+      } as any)
+
+      await generateEmbeddings(['test text'])
+
+      expect(fetchSpy).toHaveBeenCalledWith(
+        'https://api.openai.com/v1/embeddings',
+        expect.objectContaining({
+          headers: expect.objectContaining({
+            Authorization: 'Bearer test-openai-key',
+          }),
+        })
+      )
+
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+    })
+
+    it('should throw error when no API configuration provided', async () => {
+      const { env } = await import('@/lib/env')
+      Object.keys(env).forEach((key) => delete (env as any)[key])
+
+      await expect(generateEmbeddings(['test text'])).rejects.toThrow(
+        'Either OPENAI_API_KEY or Azure OpenAI configuration (AZURE_OPENAI_API_KEY + AZURE_OPENAI_ENDPOINT) must be configured'
+      )
+    })
   })
 })

apps/sim/app/api/knowledge/utils.ts

@@ -1,8 +1,7 @@
 import crypto from 'crypto'
 import { and, eq, isNull } from 'drizzle-orm'
 import { processDocument } from '@/lib/documents/document-processor'
-import { retryWithExponentialBackoff } from '@/lib/documents/utils'
-import { env } from '@/lib/env'
+import { generateEmbeddings } from '@/lib/embeddings/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
@@ -10,22 +9,11 @@ import { document, embedding, knowledgeBase } from '@/db/schema'
 
 const logger = createLogger('KnowledgeUtils')
 
-// Timeout constants (in milliseconds)
 const TIMEOUTS = {
   OVERALL_PROCESSING: 150000, // 150 seconds (2.5 minutes)
   EMBEDDINGS_API: 60000, // 60 seconds per batch
 } as const
 
-class APIError extends Error {
-  public status: number
-
-  constructor(message: string, status: number) {
-    super(message)
-    this.name = 'APIError'
-    this.status = status
-  }
-}
-
 /**
  * Create a timeout wrapper for async operations
  */
@@ -110,18 +98,6 @@ export interface EmbeddingData {
   updatedAt: Date
 }
 
-interface OpenAIEmbeddingResponse {
-  data: Array<{
-    embedding: number[]
-    index: number
-  }>
-  model: string
-  usage: {
-    prompt_tokens: number
-    total_tokens: number
-  }
-}
-
 export interface KnowledgeBaseAccessResult {
   hasAccess: true
   knowledgeBase: Pick<KnowledgeBaseData, 'id' | 'userId'>
@@ -405,87 +381,8 @@ export async function checkChunkAccess(
   }
 }
 
-/**
- * Generate embeddings using OpenAI API with retry logic for rate limiting
- */
-export async function generateEmbeddings(
-  texts: string[],
-  embeddingModel = 'text-embedding-3-small'
-): Promise<number[][]> {
-  const openaiApiKey = env.OPENAI_API_KEY
-  if (!openaiApiKey) {
-    throw new Error('OPENAI_API_KEY not configured')
-  }
-
-  try {
-    const batchSize = 100
-    const allEmbeddings: number[][] = []
-
-    for (let i = 0; i < texts.length; i += batchSize) {
-      const batch = texts.slice(i, i + batchSize)
-
-      logger.info(
-        `Generating embeddings for batch ${Math.floor(i / batchSize) + 1} (${batch.length} texts)`
-      )
-
-      const batchEmbeddings = await retryWithExponentialBackoff(
-        async () => {
-          const controller = new AbortController()
-          const timeoutId = setTimeout(() => controller.abort(), TIMEOUTS.EMBEDDINGS_API)
-
-          try {
-            const response = await fetch('https://api.openai.com/v1/embeddings', {
-              method: 'POST',
-              headers: {
-                Authorization: `Bearer ${openaiApiKey}`,
-                'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                input: batch,
-                model: embeddingModel,
-                encoding_format: 'float',
-              }),
-              signal: controller.signal,
-            })
-
-            clearTimeout(timeoutId)
-
-            if (!response.ok) {
-              const errorText = await response.text()
-              const error = new APIError(
-                `OpenAI API error: ${response.status} ${response.statusText} - ${errorText}`,
-                response.status
-              )
-              throw error
-            }
-
-            const data: OpenAIEmbeddingResponse = await response.json()
-            return data.data.map((item) => item.embedding)
-          } catch (error) {
-            clearTimeout(timeoutId)
-            if (error instanceof Error && error.name === 'AbortError') {
-              throw new Error('OpenAI API request timed out')
-            }
-            throw error
-          }
-        },
-        {
-          maxRetries: 5,
-          initialDelayMs: 1000,
-          maxDelayMs: 60000, // Max 1 minute delay for embeddings
-          backoffMultiplier: 2,
-        }
-      )
-
-      allEmbeddings.push(...batchEmbeddings)
-    }
-
-    return allEmbeddings
-  } catch (error) {
-    logger.error('Failed to generate embeddings:', error)
-    throw error
-  }
-}
+// Export for external use
+export { generateEmbeddings }
 
 /**
  * Process a document asynchronously with full error handling

apps/sim/app/api/providers/route.ts

@@ -39,6 +39,8 @@ export async function POST(request: NextRequest) {
       stream,
       messages,
       environmentVariables,
+      reasoningEffort,
+      verbosity,
     } = body
 
     logger.info(`[${requestId}] Provider request details`, {
@@ -58,6 +60,8 @@ export async function POST(request: NextRequest) {
       messageCount: messages?.length || 0,
       hasEnvironmentVariables:
         !!environmentVariables && Object.keys(environmentVariables).length > 0,
+      reasoningEffort,
+      verbosity,
     })
 
     let finalApiKey: string
@@ -99,6 +103,8 @@ export async function POST(request: NextRequest) {
       stream,
       messages,
       environmentVariables,
+      reasoningEffort,
+      verbosity,
     })
 
     const executionTime = Date.now() - startTime

apps/sim/app/api/templates/[id]/route.ts

@@ -1,9 +1,11 @@
 import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
+import { hasAdminPermission } from '@/lib/permissions/utils'
 import { db } from '@/db'
-import { templates } from '@/db/schema'
+import { templates, workflow } from '@/db/schema'
 
 const logger = createLogger('TemplateByIdAPI')
 
@@ -62,3 +64,153 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
     return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
   }
 }
+
+const updateTemplateSchema = z.object({
+  name: z.string().min(1).max(100),
+  description: z.string().min(1).max(500),
+  author: z.string().min(1).max(100),
+  category: z.string().min(1),
+  icon: z.string().min(1),
+  color: z.string().regex(/^#[0-9A-F]{6}$/i),
+  state: z.any().optional(), // Workflow state
+})
+
+// PUT /api/templates/[id] - Update a template
+export async function PUT(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
+  const requestId = crypto.randomUUID().slice(0, 8)
+  const { id } = await params
+
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      logger.warn(`[${requestId}] Unauthorized template update attempt for ID: ${id}`)
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    const body = await request.json()
+    const validationResult = updateTemplateSchema.safeParse(body)
+
+    if (!validationResult.success) {
+      logger.warn(`[${requestId}] Invalid template data for update: ${id}`, validationResult.error)
+      return NextResponse.json(
+        { error: 'Invalid template data', details: validationResult.error.errors },
+        { status: 400 }
+      )
+    }
+
+    const { name, description, author, category, icon, color, state } = validationResult.data
+
+    // Check if template exists
+    const existingTemplate = await db.select().from(templates).where(eq(templates.id, id)).limit(1)
+
+    if (existingTemplate.length === 0) {
+      logger.warn(`[${requestId}] Template not found for update: ${id}`)
+      return NextResponse.json({ error: 'Template not found' }, { status: 404 })
+    }
+
+    // Permission: template owner OR admin of the workflow's workspace (if any)
+    let canUpdate = existingTemplate[0].userId === session.user.id
+
+    if (!canUpdate && existingTemplate[0].workflowId) {
+      const wfRows = await db
+        .select({ workspaceId: workflow.workspaceId })
+        .from(workflow)
+        .where(eq(workflow.id, existingTemplate[0].workflowId))
+        .limit(1)
+
+      const workspaceId = wfRows[0]?.workspaceId as string | null | undefined
+      if (workspaceId) {
+        const hasAdmin = await hasAdminPermission(session.user.id, workspaceId)
+        if (hasAdmin) canUpdate = true
+      }
+    }
+
+    if (!canUpdate) {
+      logger.warn(`[${requestId}] User denied permission to update template ${id}`)
+      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
+    }
+
+    // Update the template
+    const updatedTemplate = await db
+      .update(templates)
+      .set({
+        name,
+        description,
+        author,
+        category,
+        icon,
+        color,
+        ...(state && { state }),
+        updatedAt: new Date(),
+      })
+      .where(eq(templates.id, id))
+      .returning()
+
+    logger.info(`[${requestId}] Successfully updated template: ${id}`)
+
+    return NextResponse.json({
+      data: updatedTemplate[0],
+      message: 'Template updated successfully',
+    })
+  } catch (error: any) {
+    logger.error(`[${requestId}] Error updating template: ${id}`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}
+
+// DELETE /api/templates/[id] - Delete a template
+export async function DELETE(
+  request: NextRequest,
+  { params }: { params: Promise<{ id: string }> }
+) {
+  const requestId = crypto.randomUUID().slice(0, 8)
+  const { id } = await params
+
+  try {
+    const session = await getSession()
+    if (!session?.user?.id) {
+      logger.warn(`[${requestId}] Unauthorized template delete attempt for ID: ${id}`)
+      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    }
+
+    // Fetch template
+    const existing = await db.select().from(templates).where(eq(templates.id, id)).limit(1)
+    if (existing.length === 0) {
+      logger.warn(`[${requestId}] Template not found for delete: ${id}`)
+      return NextResponse.json({ error: 'Template not found' }, { status: 404 })
+    }
+
+    const template = existing[0]
+
+    // Permission: owner or admin of the workflow's workspace (if any)
+    let canDelete = template.userId === session.user.id
+
+    if (!canDelete && template.workflowId) {
+      // Look up workflow to get workspaceId
+      const wfRows = await db
+        .select({ workspaceId: workflow.workspaceId })
+        .from(workflow)
+        .where(eq(workflow.id, template.workflowId))
+        .limit(1)
+
+      const workspaceId = wfRows[0]?.workspaceId as string | null | undefined
+      if (workspaceId) {
+        const hasAdmin = await hasAdminPermission(session.user.id, workspaceId)
+        if (hasAdmin) canDelete = true
+      }
+    }
+
+    if (!canDelete) {
+      logger.warn(`[${requestId}] User denied permission to delete template ${id}`)
+      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
+    }
+
+    await db.delete(templates).where(eq(templates.id, id))
+
+    logger.info(`[${requestId}] Deleted template: ${id}`)
+    return NextResponse.json({ success: true })
+  } catch (error: any) {
+    logger.error(`[${requestId}] Error deleting template: ${id}`, error)
+    return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
+  }
+}

apps/sim/app/api/templates/route.ts

@@ -77,6 +77,7 @@ const QueryParamsSchema = z.object({
   limit: z.coerce.number().optional().default(50),
   offset: z.coerce.number().optional().default(0),
   search: z.string().optional(),
+  workflowId: z.string().optional(),
 })
 
 // GET /api/templates - Retrieve templates
@@ -111,6 +112,11 @@ export async function GET(request: NextRequest) {
       )
     }
 
+    // Apply workflow filter if provided (for getting template by workflow)
+    if (params.workflowId) {
+      conditions.push(eq(templates.workflowId, params.workflowId))
+    }
+
     // Combine conditions
     const whereCondition = conditions.length > 0 ? and(...conditions) : undefined
 

apps/sim/app/api/tools/drive/file/route.ts

@@ -45,7 +45,7 @@ export async function GET(request: NextRequest) {
     // Fetch the file from Google Drive API
     logger.info(`[${requestId}] Fetching file ${fileId} from Google Drive API`)
     const response = await fetch(
-      `https://www.googleapis.com/drive/v3/files/${fileId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks`,
+      `https://www.googleapis.com/drive/v3/files/${fileId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks,shortcutDetails&supportsAllDrives=true`,
       {
         headers: {
           Authorization: `Bearer ${accessToken}`,
@@ -77,6 +77,34 @@ export async function GET(request: NextRequest) {
       'application/vnd.google-apps.presentation': 'application/pdf', // Google Slides to PDF
     }
 
+    // Resolve shortcuts transparently for UI stability
+    if (
+      file.mimeType === 'application/vnd.google-apps.shortcut' &&
+      file.shortcutDetails?.targetId
+    ) {
+      const targetId = file.shortcutDetails.targetId
+      const shortcutResp = await fetch(
+        `https://www.googleapis.com/drive/v3/files/${targetId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks&supportsAllDrives=true`,
+        {
+          headers: { Authorization: `Bearer ${accessToken}` },
+        }
+      )
+      if (shortcutResp.ok) {
+        const targetFile = await shortcutResp.json()
+        file.id = targetFile.id
+        file.name = targetFile.name
+        file.mimeType = targetFile.mimeType
+        file.iconLink = targetFile.iconLink
+        file.webViewLink = targetFile.webViewLink
+        file.thumbnailLink = targetFile.thumbnailLink
+        file.createdTime = targetFile.createdTime
+        file.modifiedTime = targetFile.modifiedTime
+        file.size = targetFile.size
+        file.owners = targetFile.owners
+        file.exportLinks = targetFile.exportLinks
+      }
+    }
+
     // If the file is a Google Docs, Sheets, or Slides file, we need to provide the export link
     if (file.mimeType.startsWith('application/vnd.google-apps.')) {
       const format = exportFormats[file.mimeType] || 'application/pdf'

apps/sim/app/api/tools/drive/files/route.ts

@@ -1,10 +1,8 @@
-import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { createLogger } from '@/lib/logs/console/logger'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
-import { db } from '@/db'
-import { account } from '@/db/schema'
 
 export const dynamic = 'force-dynamic'
 
@@ -32,64 +30,48 @@ export async function GET(request: NextRequest) {
     const credentialId = searchParams.get('credentialId')
     const mimeType = searchParams.get('mimeType')
     const query = searchParams.get('query') || ''
+    const folderId = searchParams.get('folderId') || searchParams.get('parentId') || ''
+    const workflowId = searchParams.get('workflowId') || undefined
 
     if (!credentialId) {
       logger.warn(`[${requestId}] Missing credential ID`)
       return NextResponse.json({ error: 'Credential ID is required' }, { status: 400 })
     }
 
-    // Get the credential from the database
-    const credentials = await db.select().from(account).where(eq(account.id, credentialId)).limit(1)
-
-    if (!credentials.length) {
-      logger.warn(`[${requestId}] Credential not found`, { credentialId })
-      return NextResponse.json({ error: 'Credential not found' }, { status: 404 })
-    }
-
-    const credential = credentials[0]
-
-    // Check if the credential belongs to the user
-    if (credential.userId !== session.user.id) {
-      logger.warn(`[${requestId}] Unauthorized credential access attempt`, {
-        credentialUserId: credential.userId,
-        requestUserId: session.user.id,
-      })
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 403 })
+    // Authorize use of the credential (supports collaborator credentials via workflow)
+    const authz = await authorizeCredentialUse(request, { credentialId: credentialId!, workflowId })
+    if (!authz.ok || !authz.credentialOwnerUserId) {
+      logger.warn(`[${requestId}] Unauthorized credential access attempt`, authz)
+      return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
     }
 
     // Refresh access token if needed using the utility function
-    const accessToken = await refreshAccessTokenIfNeeded(credentialId, session.user.id, requestId)
+    const accessToken = await refreshAccessTokenIfNeeded(
+      credentialId!,
+      authz.credentialOwnerUserId,
+      requestId
+    )
 
     if (!accessToken) {
       return NextResponse.json({ error: 'Failed to obtain valid access token' }, { status: 401 })
     }
 
-    // Build the query parameters for Google Drive API
-    let queryParams = 'trashed=false'
-
-    // Add mimeType filter if provided
+    // Build Drive 'q' expression safely
+    const qParts: string[] = ['trashed = false']
+    if (folderId) {
+      qParts.push(`'${folderId.replace(/'/g, "\\'")}' in parents`)
+    }
     if (mimeType) {
-      // For Google Drive API, we need to use 'q' parameter for mimeType filtering
-      // Instead of using the mimeType parameter directly, we'll add it to the query
-      if (queryParams.includes('q=')) {
-        queryParams += ` and mimeType='${mimeType}'`
-      } else {
-        queryParams += `&q=mimeType='${mimeType}'`
-      }
+      qParts.push(`mimeType = '${mimeType.replace(/'/g, "\\'")}'`)
     }
-
-    // Add search query if provided
     if (query) {
-      if (queryParams.includes('q=')) {
-        queryParams += ` and name contains '${query}'`
-      } else {
-        queryParams += `&q=name contains '${query}'`
-      }
+      qParts.push(`name contains '${query.replace(/'/g, "\\'")}'`)
     }
+    const q = encodeURIComponent(qParts.join(' and '))
 
-    // Fetch files from Google Drive API
+    // Fetch files from Google Drive API with shared drives support
     const response = await fetch(
-      `https://www.googleapis.com/drive/v3/files?${queryParams}&fields=files(id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners)`,
+      `https://www.googleapis.com/drive/v3/files?q=${q}&supportsAllDrives=true&includeItemsFromAllDrives=true&spaces=drive&fields=files(id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,parents)`,
       {
         headers: {
           Authorization: `Bearer ${accessToken}`,

apps/sim/app/api/tools/jira/issue/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getJiraCloudId } from '@/tools/jira/utils'
 
 export const dynamic = 'force-dynamic'
 
-const logger = new Logger('JiraIssueAPI')
+const logger = createLogger('JiraIssueAPI')
 
 export async function POST(request: Request) {
   try {

apps/sim/app/api/tools/jira/issues/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getJiraCloudId } from '@/tools/jira/utils'
 
 export const dynamic = 'force-dynamic'
 
-const logger = new Logger('JiraIssuesAPI')
+const logger = createLogger('JiraIssuesAPI')
 
 export async function POST(request: Request) {
   try {

apps/sim/app/api/tools/jira/projects/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getJiraCloudId } from '@/tools/jira/utils'
 
 export const dynamic = 'force-dynamic'
 
-const logger = new Logger('JiraProjectsAPI')
+const logger = createLogger('JiraProjectsAPI')
 
 export async function GET(request: Request) {
   try {

apps/sim/app/api/tools/jira/update/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getJiraCloudId } from '@/tools/jira/utils'
 
 export const dynamic = 'force-dynamic'
 
-const logger = new Logger('JiraUpdateAPI')
+const logger = createLogger('JiraUpdateAPI')
 
 export async function PUT(request: Request) {
   try {

apps/sim/app/api/tools/jira/write/route.ts

@@ -1,10 +1,10 @@
 import { NextResponse } from 'next/server'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getJiraCloudId } from '@/tools/jira/utils'
 
 export const dynamic = 'force-dynamic'
 
-const logger = new Logger('JiraWriteAPI')
+const logger = createLogger('JiraWriteAPI')
 
 export async function POST(request: Request) {
   try {

apps/sim/app/api/wand-generate/route.ts

@@ -1,6 +1,6 @@
 import { unstable_noStore as noStore } from 'next/cache'
 import { type NextRequest, NextResponse } from 'next/server'
-import OpenAI from 'openai'
+import OpenAI, { AzureOpenAI } from 'openai'
 import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 
@@ -10,14 +10,32 @@ export const maxDuration = 60
 
 const logger = createLogger('WandGenerateAPI')
 
-const openai = env.OPENAI_API_KEY
-  ? new OpenAI({
-      apiKey: env.OPENAI_API_KEY,
-    })
-  : null
+const azureApiKey = env.AZURE_OPENAI_API_KEY
+const azureEndpoint = env.AZURE_OPENAI_ENDPOINT
+const azureApiVersion = env.AZURE_OPENAI_API_VERSION
+const wandModelName = env.WAND_OPENAI_MODEL_NAME || 'gpt-4o'
+const openaiApiKey = env.OPENAI_API_KEY
 
-if (!env.OPENAI_API_KEY) {
-  logger.warn('OPENAI_API_KEY not found. Wand generation API will not function.')
+const useWandAzure = azureApiKey && azureEndpoint && azureApiVersion
+
+const client = useWandAzure
+  ? new AzureOpenAI({
+      apiKey: azureApiKey,
+      apiVersion: azureApiVersion,
+      endpoint: azureEndpoint,
+    })
+  : openaiApiKey
+    ? new OpenAI({
+        apiKey: openaiApiKey,
+      })
+    : null
+
+if (!useWandAzure && !openaiApiKey) {
+  logger.warn(
+    'Neither Azure OpenAI nor OpenAI API key found. Wand generation API will not function.'
+  )
+} else {
+  logger.info(`Using ${useWandAzure ? 'Azure OpenAI' : 'OpenAI'} for wand generation`)
 }
 
 interface ChatMessage {
@@ -32,14 +50,12 @@ interface RequestBody {
   history?: ChatMessage[]
 }
 
-// The endpoint is now generic - system prompts come from wand configs
-
 export async function POST(req: NextRequest) {
   const requestId = crypto.randomUUID().slice(0, 8)
   logger.info(`[${requestId}] Received wand generation request`)
 
-  if (!openai) {
-    logger.error(`[${requestId}] OpenAI client not initialized. Missing API key.`)
+  if (!client) {
+    logger.error(`[${requestId}] AI client not initialized. Missing API key.`)
     return NextResponse.json(
       { success: false, error: 'Wand generation service is not configured.' },
       { status: 503 }
@@ -74,22 +90,34 @@ export async function POST(req: NextRequest) {
     // Add the current user prompt
     messages.push({ role: 'user', content: prompt })
 
-    logger.debug(`[${requestId}] Calling OpenAI API for wand generation`, {
-      stream,
-      historyLength: history.length,
-    })
+    logger.debug(
+      `[${requestId}] Calling ${useWandAzure ? 'Azure OpenAI' : 'OpenAI'} API for wand generation`,
+      {
+        stream,
+        historyLength: history.length,
+        endpoint: useWandAzure ? azureEndpoint : 'api.openai.com',
+        model: useWandAzure ? wandModelName : 'gpt-4o',
+        apiVersion: useWandAzure ? azureApiVersion : 'N/A',
+      }
+    )
 
     // For streaming responses
     if (stream) {
       try {
-        const streamCompletion = await openai?.chat.completions.create({
-          model: 'gpt-4o',
+        logger.debug(
+          `[${requestId}] Starting streaming request to ${useWandAzure ? 'Azure OpenAI' : 'OpenAI'}`
+        )
+
+        const streamCompletion = await client.chat.completions.create({
+          model: useWandAzure ? wandModelName : 'gpt-4o',
           messages: messages,
           temperature: 0.3,
           max_tokens: 10000,
           stream: true,
         })
 
+        logger.debug(`[${requestId}] Stream connection established successfully`)
+
         return new Response(
           new ReadableStream({
             async start(controller) {
@@ -99,21 +127,23 @@ export async function POST(req: NextRequest) {
                 for await (const chunk of streamCompletion) {
                   const content = chunk.choices[0]?.delta?.content || ''
                   if (content) {
-                    // Use the same format as codegen API for consistency
+                    // Use SSE format identical to chat streaming
                     controller.enqueue(
-                      encoder.encode(`${JSON.stringify({ chunk: content, done: false })}\n`)
+                      encoder.encode(`data: ${JSON.stringify({ chunk: content })}\n\n`)
                     )
                   }
                 }
 
-                // Send completion signal
-                controller.enqueue(encoder.encode(`${JSON.stringify({ chunk: '', done: true })}\n`))
+                // Send completion signal in SSE format
+                controller.enqueue(encoder.encode(`data: ${JSON.stringify({ done: true })}\n\n`))
                 controller.close()
                 logger.info(`[${requestId}] Wand generation streaming completed`)
               } catch (streamError: any) {
                 logger.error(`[${requestId}] Streaming error`, { error: streamError.message })
                 controller.enqueue(
-                  encoder.encode(`${JSON.stringify({ error: 'Streaming failed', done: true })}\n`)
+                  encoder.encode(
+                    `data: ${JSON.stringify({ error: 'Streaming failed', done: true })}\n\n`
+                  )
                 )
                 controller.close()
               }
@@ -121,9 +151,10 @@ export async function POST(req: NextRequest) {
           }),
           {
             headers: {
-              'Content-Type': 'text/plain',
-              'Cache-Control': 'no-cache, no-transform',
+              'Content-Type': 'text/event-stream',
+              'Cache-Control': 'no-cache',
               Connection: 'keep-alive',
+              'X-Accel-Buffering': 'no',
             },
           }
         )
@@ -141,8 +172,8 @@ export async function POST(req: NextRequest) {
     }
 
     // For non-streaming responses
-    const completion = await openai?.chat.completions.create({
-      model: 'gpt-4o',
+    const completion = await client.chat.completions.create({
+      model: useWandAzure ? wandModelName : 'gpt-4o',
       messages: messages,
       temperature: 0.3,
       max_tokens: 10000,
@@ -151,9 +182,11 @@ export async function POST(req: NextRequest) {
     const generatedContent = completion.choices[0]?.message?.content?.trim()
 
     if (!generatedContent) {
-      logger.error(`[${requestId}] OpenAI response was empty or invalid.`)
+      logger.error(
+        `[${requestId}] ${useWandAzure ? 'Azure OpenAI' : 'OpenAI'} response was empty or invalid.`
+      )
       return NextResponse.json(
-        { success: false, error: 'Failed to generate content. OpenAI response was empty.' },
+        { success: false, error: 'Failed to generate content. AI response was empty.' },
         { status: 500 }
       )
     }
@@ -171,7 +204,9 @@ export async function POST(req: NextRequest) {
 
     if (error instanceof OpenAI.APIError) {
       status = error.status || 500
-      logger.error(`[${requestId}] OpenAI API Error: ${status} - ${error.message}`)
+      logger.error(
+        `[${requestId}] ${useWandAzure ? 'Azure OpenAI' : 'OpenAI'} API Error: ${status} - ${error.message}`
+      )
 
       if (status === 401) {
         clientErrorMessage = 'Authentication failed. Please check your API key configuration.'
@@ -181,6 +216,10 @@ export async function POST(req: NextRequest) {
         clientErrorMessage =
           'The wand generation service is currently unavailable. Please try again later.'
       }
+    } else if (useWandAzure && error.message?.includes('DeploymentNotFound')) {
+      clientErrorMessage =
+        'Azure OpenAI deployment not found. Please check your model deployment configuration.'
+      status = 404
     }
 
     return NextResponse.json(

apps/sim/app/api/webhooks/[id]/route.ts

@@ -1,8 +1,10 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
+import { getOAuthToken } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { webhook, workflow } from '@/db/schema'
 
@@ -242,6 +244,167 @@ export async function DELETE(
 
     const foundWebhook = webhookData.webhook
 
+    // If it's an Airtable webhook, delete it from Airtable first
+    if (foundWebhook.provider === 'airtable') {
+      try {
+        const { baseId, externalId } = (foundWebhook.providerConfig || {}) as {
+          baseId?: string
+          externalId?: string
+        }
+
+        if (!baseId) {
+          logger.warn(`[${requestId}] Missing baseId for Airtable webhook deletion.`, {
+            webhookId: id,
+          })
+          return NextResponse.json(
+            { error: 'Missing baseId for Airtable webhook deletion' },
+            { status: 400 }
+          )
+        }
+
+        // Get access token for the workflow owner
+        const userIdForToken = webhookData.workflow.userId
+        const accessToken = await getOAuthToken(userIdForToken, 'airtable')
+        if (!accessToken) {
+          logger.warn(
+            `[${requestId}] Could not retrieve Airtable access token for user ${userIdForToken}. Cannot delete webhook in Airtable.`,
+            { webhookId: id }
+          )
+          return NextResponse.json(
+            { error: 'Airtable access token not found for webhook deletion' },
+            { status: 401 }
+          )
+        }
+
+        // Resolve externalId if missing by listing webhooks and matching our notificationUrl
+        let resolvedExternalId: string | undefined = externalId
+
+        if (!resolvedExternalId) {
+          try {
+            const requestOrigin = new URL(request.url).origin
+            const effectiveOrigin = requestOrigin.includes('localhost')
+              ? env.NEXT_PUBLIC_APP_URL || requestOrigin
+              : requestOrigin
+            const expectedNotificationUrl = `${effectiveOrigin}/api/webhooks/trigger/${foundWebhook.path}`
+
+            const listUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
+            const listResp = await fetch(listUrl, {
+              headers: {
+                Authorization: `Bearer ${accessToken}`,
+              },
+            })
+            const listBody = await listResp.json().catch(() => null)
+
+            if (listResp.ok && listBody && Array.isArray(listBody.webhooks)) {
+              const match = listBody.webhooks.find((w: any) => {
+                const url: string | undefined = w?.notificationUrl
+                if (!url) return false
+                // Prefer exact match; fallback to suffix match to handle origin/host remaps
+                return (
+                  url === expectedNotificationUrl ||
+                  url.endsWith(`/api/webhooks/trigger/${foundWebhook.path}`)
+                )
+              })
+              if (match?.id) {
+                resolvedExternalId = match.id as string
+                // Persist resolved externalId for future operations
+                try {
+                  await db
+                    .update(webhook)
+                    .set({
+                      providerConfig: {
+                        ...(foundWebhook.providerConfig || {}),
+                        externalId: resolvedExternalId,
+                      },
+                      updatedAt: new Date(),
+                    })
+                    .where(eq(webhook.id, id))
+                } catch {
+                  // non-fatal persistence error
+                }
+                logger.info(`[${requestId}] Resolved Airtable externalId by listing webhooks`, {
+                  baseId,
+                  externalId: resolvedExternalId,
+                })
+              } else {
+                logger.warn(`[${requestId}] Could not resolve Airtable externalId from list`, {
+                  baseId,
+                  expectedNotificationUrl,
+                })
+              }
+            } else {
+              logger.warn(`[${requestId}] Failed to list Airtable webhooks to resolve externalId`, {
+                baseId,
+                status: listResp.status,
+                body: listBody,
+              })
+            }
+          } catch (e: any) {
+            logger.warn(`[${requestId}] Error attempting to resolve Airtable externalId`, {
+              error: e?.message,
+            })
+          }
+        }
+
+        // If still not resolvable, skip remote deletion but proceed with local delete
+        if (!resolvedExternalId) {
+          logger.info(
+            `[${requestId}] Airtable externalId not found; skipping remote deletion and proceeding to remove local record`,
+            { baseId }
+          )
+        }
+
+        if (resolvedExternalId) {
+          const airtableDeleteUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks/${resolvedExternalId}`
+          const airtableResponse = await fetch(airtableDeleteUrl, {
+            method: 'DELETE',
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+            },
+          })
+
+          // Attempt to parse error body for better diagnostics
+          if (!airtableResponse.ok) {
+            let responseBody: any = null
+            try {
+              responseBody = await airtableResponse.json()
+            } catch {
+              // ignore parse errors
+            }
+
+            logger.error(
+              `[${requestId}] Failed to delete Airtable webhook in Airtable. Status: ${airtableResponse.status}`,
+              { baseId, externalId: resolvedExternalId, response: responseBody }
+            )
+            return NextResponse.json(
+              {
+                error: 'Failed to delete webhook from Airtable',
+                details:
+                  (responseBody && (responseBody.error?.message || responseBody.error)) ||
+                  `Status ${airtableResponse.status}`,
+              },
+              { status: 500 }
+            )
+          }
+
+          logger.info(`[${requestId}] Successfully deleted Airtable webhook in Airtable`, {
+            baseId,
+            externalId: resolvedExternalId,
+          })
+        }
+      } catch (error: any) {
+        logger.error(`[${requestId}] Error deleting Airtable webhook`, {
+          webhookId: id,
+          error: error.message,
+          stack: error.stack,
+        })
+        return NextResponse.json(
+          { error: 'Failed to delete webhook from Airtable', details: error.message },
+          { status: 500 }
+        )
+      }
+    }
+
     // If it's a Telegram webhook, delete it from Telegram first
     if (foundWebhook.provider === 'telegram') {
       try {

apps/sim/app/api/webhooks/poll/gmail/route.ts

@@ -1,11 +1,11 @@
 import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { acquireLock, releaseLock } from '@/lib/redis'
 import { pollGmailWebhooks } from '@/lib/webhooks/gmail-polling-service'
 
-const logger = new Logger('GmailPollingAPI')
+const logger = createLogger('GmailPollingAPI')
 
 export const dynamic = 'force-dynamic'
 export const maxDuration = 180 // Allow up to 3 minutes for polling to complete

apps/sim/app/api/webhooks/poll/outlook/route.ts

@@ -1,11 +1,11 @@
 import { nanoid } from 'nanoid'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { acquireLock, releaseLock } from '@/lib/redis'
 import { pollOutlookWebhooks } from '@/lib/webhooks/outlook-polling-service'
 
-const logger = new Logger('OutlookPollingAPI')
+const logger = createLogger('OutlookPollingAPI')
 
 export const dynamic = 'force-dynamic'
 export const maxDuration = 180 // Allow up to 3 minutes for polling to complete

apps/sim/app/api/webhooks/route.ts

@@ -329,7 +329,7 @@ export async function POST(request: NextRequest) {
       logger.info(`[${requestId}] Gmail provider detected. Setting up Gmail webhook configuration.`)
       try {
         const { configureGmailPolling } = await import('@/lib/webhooks/utils')
-        // Use workflow owner for OAuth lookups to support collaborator-saved credentials
+        // Pass workflow owner for backward-compat fallback (utils prefers credentialId if present)
         const success = await configureGmailPolling(workflowRecord.userId, savedWebhook, requestId)
 
         if (!success) {
@@ -364,7 +364,7 @@ export async function POST(request: NextRequest) {
       )
       try {
         const { configureOutlookPolling } = await import('@/lib/webhooks/utils')
-        // Use workflow owner for OAuth lookups to support collaborator-saved credentials
+        // Pass workflow owner for backward-compat fallback (utils prefers credentialId if present)
         const success = await configureOutlookPolling(
           workflowRecord.userId,
           savedWebhook,

apps/sim/app/api/webhooks/trigger/[path]/route.test.ts

@@ -5,7 +5,22 @@ import { NextRequest } from 'next/server'
  * @vitest-environment node
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createMockRequest, mockExecutionDependencies } from '@/app/api/__test-utils__/utils'
+import {
+  createMockRequest,
+  mockExecutionDependencies,
+  mockTriggerDevSdk,
+} from '@/app/api/__test-utils__/utils'
+
+// Prefer mocking the background module to avoid loading Trigger.dev at all during tests
+vi.mock('@/background/webhook-execution', () => ({
+  executeWebhookJob: vi.fn().mockResolvedValue({
+    success: true,
+    workflowId: 'test-workflow-id',
+    executionId: 'test-exec-id',
+    output: {},
+    executedAt: new Date().toISOString(),
+  }),
+}))
 
 const hasProcessedMessageMock = vi.fn().mockResolvedValue(false)
 const markMessageAsProcessedMock = vi.fn().mockResolvedValue(true)
@@ -111,6 +126,7 @@ describe('Webhook Trigger API Route', () => {
     vi.resetAllMocks()
 
     mockExecutionDependencies()
+    mockTriggerDevSdk()
 
     vi.doMock('@/services/queue', () => ({
       RateLimiter: vi.fn().mockImplementation(() => ({
@@ -309,11 +325,7 @@ describe('Webhook Trigger API Route', () => {
       const req = createMockRequest('POST', { event: 'test', id: 'test-123' })
       const params = Promise.resolve({ path: 'test-path' })
 
-      vi.doMock('@trigger.dev/sdk/v3', () => ({
-        tasks: {
-          trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
-        },
-      }))
+      mockTriggerDevSdk()
 
       const { POST } = await import('@/app/api/webhooks/trigger/[path]/route')
       const response = await POST(req, { params })
@@ -339,11 +351,7 @@ describe('Webhook Trigger API Route', () => {
       const req = createMockRequest('POST', { event: 'bearer.test' }, headers)
       const params = Promise.resolve({ path: 'test-path' })
 
-      vi.doMock('@trigger.dev/sdk/v3', () => ({
-        tasks: {
-          trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
-        },
-      }))
+      mockTriggerDevSdk()
 
       const { POST } = await import('@/app/api/webhooks/trigger/[path]/route')
       const response = await POST(req, { params })
@@ -369,11 +377,7 @@ describe('Webhook Trigger API Route', () => {
       const req = createMockRequest('POST', { event: 'custom.header.test' }, headers)
       const params = Promise.resolve({ path: 'test-path' })
 
-      vi.doMock('@trigger.dev/sdk/v3', () => ({
-        tasks: {
-          trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
-        },
-      }))
+      mockTriggerDevSdk()
 
       const { POST } = await import('@/app/api/webhooks/trigger/[path]/route')
       const response = await POST(req, { params })
@@ -391,7 +395,7 @@ describe('Webhook Trigger API Route', () => {
         token: 'case-test-token',
       })
 
-      vi.doMock('@trigger.dev/sdk/v3', () => ({
+      vi.doMock('@trigger.dev/sdk', () => ({
         tasks: {
           trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
         },
@@ -430,7 +434,7 @@ describe('Webhook Trigger API Route', () => {
         secretHeaderName: 'X-Secret-Key',
       })
 
-      vi.doMock('@trigger.dev/sdk/v3', () => ({
+      vi.doMock('@trigger.dev/sdk', () => ({
         tasks: {
           trigger: vi.fn().mockResolvedValue({ id: 'mock-task-id' }),
         },

apps/sim/app/api/webhooks/trigger/[path]/route.ts

@@ -1,13 +1,15 @@
-import { tasks } from '@trigger.dev/sdk/v3'
+import { tasks } from '@trigger.dev/sdk'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkServerSideUsageLimits } from '@/lib/billing'
+import { env, isTruthy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import {
   handleSlackChallenge,
   handleWhatsAppVerification,
   validateMicrosoftTeamsSignature,
 } from '@/lib/webhooks/utils'
+import { executeWebhookJob } from '@/background/webhook-execution'
 import { db } from '@/db'
 import { subscription, webhook, workflow } from '@/db/schema'
 import { RateLimiter } from '@/services/queue'
@@ -17,6 +19,7 @@ const logger = createLogger('WebhookTriggerAPI')
 
 export const dynamic = 'force-dynamic'
 export const maxDuration = 300
+export const runtime = 'nodejs'
 
 /**
  * Webhook Verification Handler (GET)
@@ -330,10 +333,9 @@ export async function POST(
     // Continue processing - better to risk usage limit bypass than fail webhook
   }
 
-  // --- PHASE 5: Queue webhook execution via trigger.dev ---
+  // --- PHASE 5: Queue webhook execution (trigger.dev or direct based on env) ---
   try {
-    // Queue the webhook execution task
-    const handle = await tasks.trigger('webhook-execution', {
+    const payload = {
       webhookId: foundWebhook.id,
       workflowId: foundWorkflow.id,
       userId: foundWorkflow.userId,
@@ -342,11 +344,24 @@ export async function POST(
       headers: Object.fromEntries(request.headers.entries()),
       path,
       blockId: foundWebhook.blockId,
-    })
+    }
 
-    logger.info(
-      `[${requestId}] Queued webhook execution task ${handle.id} for ${foundWebhook.provider} webhook`
-    )
+    const useTrigger = isTruthy(env.TRIGGER_DEV_ENABLED)
+
+    if (useTrigger) {
+      const handle = await tasks.trigger('webhook-execution', payload)
+      logger.info(
+        `[${requestId}] Queued webhook execution task ${handle.id} for ${foundWebhook.provider} webhook`
+      )
+    } else {
+      // Fire-and-forget direct execution to avoid blocking webhook response
+      void executeWebhookJob(payload).catch((error) => {
+        logger.error(`[${requestId}] Direct webhook execution failed`, error)
+      })
+      logger.info(
+        `[${requestId}] Queued direct webhook execution for ${foundWebhook.provider} webhook (Trigger.dev disabled)`
+      )
+    }
 
     // Return immediate acknowledgment with provider-specific format
     if (foundWebhook.provider === 'microsoftteams') {

apps/sim/app/api/workflows/[id]/execute/route.ts

@@ -1,4 +1,4 @@
-import { tasks } from '@trigger.dev/sdk/v3'
+import { tasks } from '@trigger.dev/sdk'
 import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
@@ -540,7 +540,7 @@ export async function POST(
           )
         }
 
-        // Rate limit passed - trigger the task
+        // Rate limit passed - always use Trigger.dev for async executions
         const handle = await tasks.trigger('workflow-execution', {
           workflowId,
           userId: authenticatedUserId,

apps/sim/app/api/workflows/[id]/route.ts

@@ -8,7 +8,7 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions, hasAdminPermission } from '@/lib/permissions/utils'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
 import { db } from '@/db'
-import { apiKey as apiKeyTable, workflow } from '@/db/schema'
+import { apiKey as apiKeyTable, templates, workflow } from '@/db/schema'
 
 const logger = createLogger('WorkflowByIdAPI')
 
@@ -218,6 +218,48 @@ export async function DELETE(
       return NextResponse.json({ error: 'Access denied' }, { status: 403 })
     }
 
+    // Check if workflow has published templates before deletion
+    const { searchParams } = new URL(request.url)
+    const checkTemplates = searchParams.get('check-templates') === 'true'
+    const deleteTemplatesParam = searchParams.get('deleteTemplates')
+
+    if (checkTemplates) {
+      // Return template information for frontend to handle
+      const publishedTemplates = await db
+        .select()
+        .from(templates)
+        .where(eq(templates.workflowId, workflowId))
+
+      return NextResponse.json({
+        hasPublishedTemplates: publishedTemplates.length > 0,
+        count: publishedTemplates.length,
+        publishedTemplates: publishedTemplates.map((t) => ({
+          id: t.id,
+          name: t.name,
+          views: t.views,
+          stars: t.stars,
+        })),
+      })
+    }
+
+    // Handle template deletion based on user choice
+    if (deleteTemplatesParam !== null) {
+      const deleteTemplates = deleteTemplatesParam === 'delete'
+
+      if (deleteTemplates) {
+        // Delete all templates associated with this workflow
+        await db.delete(templates).where(eq(templates.workflowId, workflowId))
+        logger.info(`[${requestId}] Deleted templates for workflow ${workflowId}`)
+      } else {
+        // Orphan the templates (set workflowId to null)
+        await db
+          .update(templates)
+          .set({ workflowId: null })
+          .where(eq(templates.workflowId, workflowId))
+        logger.info(`[${requestId}] Orphaned templates for workflow ${workflowId}`)
+      }
+    }
+
     await db.delete(workflow).where(eq(workflow.id, workflowId))
 
     const elapsed = Date.now() - startTime

apps/sim/app/api/workspaces/[id]/route.ts

@@ -1,4 +1,4 @@
-import { and, eq } from 'drizzle-orm'
+import { and, eq, inArray } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
@@ -8,7 +8,7 @@ const logger = createLogger('WorkspaceByIdAPI')
 
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
-import { knowledgeBase, permissions, workspace } from '@/db/schema'
+import { knowledgeBase, permissions, templates, workspace } from '@/db/schema'
 
 export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
   const { id } = await params
@@ -19,6 +19,8 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
   }
 
   const workspaceId = id
+  const url = new URL(request.url)
+  const checkTemplates = url.searchParams.get('check-templates') === 'true'
 
   // Check if user has any access to this workspace
   const userPermission = await getUserEntityPermissions(session.user.id, 'workspace', workspaceId)
@@ -26,6 +28,42 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
     return NextResponse.json({ error: 'Workspace not found or access denied' }, { status: 404 })
   }
 
+  // If checking for published templates before deletion
+  if (checkTemplates) {
+    try {
+      // Get all workflows in this workspace
+      const workspaceWorkflows = await db
+        .select({ id: workflow.id })
+        .from(workflow)
+        .where(eq(workflow.workspaceId, workspaceId))
+
+      if (workspaceWorkflows.length === 0) {
+        return NextResponse.json({ hasPublishedTemplates: false, publishedTemplates: [] })
+      }
+
+      const workflowIds = workspaceWorkflows.map((w) => w.id)
+
+      // Check for published templates that reference these workflows
+      const publishedTemplates = await db
+        .select({
+          id: templates.id,
+          name: templates.name,
+          workflowId: templates.workflowId,
+        })
+        .from(templates)
+        .where(inArray(templates.workflowId, workflowIds))
+
+      return NextResponse.json({
+        hasPublishedTemplates: publishedTemplates.length > 0,
+        publishedTemplates,
+        count: publishedTemplates.length,
+      })
+    } catch (error) {
+      logger.error(`Error checking published templates for workspace ${workspaceId}:`, error)
+      return NextResponse.json({ error: 'Failed to check published templates' }, { status: 500 })
+    }
+  }
+
   // Get workspace details
   const workspaceDetails = await db
     .select()
@@ -108,6 +146,8 @@ export async function DELETE(
   }
 
   const workspaceId = id
+  const body = await request.json().catch(() => ({}))
+  const { deleteTemplates = false } = body // User's choice: false = keep templates (recommended), true = delete templates
 
   // Check if user has admin permissions to delete workspace
   const userPermission = await getUserEntityPermissions(session.user.id, 'workspace', workspaceId)
@@ -116,10 +156,39 @@ export async function DELETE(
   }
 
   try {
-    logger.info(`Deleting workspace ${workspaceId} for user ${session.user.id}`)
+    logger.info(
+      `Deleting workspace ${workspaceId} for user ${session.user.id}, deleteTemplates: ${deleteTemplates}`
+    )
 
     // Delete workspace and all related data in a transaction
     await db.transaction(async (tx) => {
+      // Get all workflows in this workspace before deletion
+      const workspaceWorkflows = await tx
+        .select({ id: workflow.id })
+        .from(workflow)
+        .where(eq(workflow.workspaceId, workspaceId))
+
+      if (workspaceWorkflows.length > 0) {
+        const workflowIds = workspaceWorkflows.map((w) => w.id)
+
+        // Handle templates based on user choice
+        if (deleteTemplates) {
+          // Delete published templates that reference these workflows
+          await tx.delete(templates).where(inArray(templates.workflowId, workflowIds))
+          logger.info(`Deleted templates for workflows in workspace ${workspaceId}`)
+        } else {
+          // Set workflowId to null for templates to create "orphaned" templates
+          // This allows templates to remain in marketplace but without source workflows
+          await tx
+            .update(templates)
+            .set({ workflowId: null })
+            .where(inArray(templates.workflowId, workflowIds))
+          logger.info(
+            `Updated templates to orphaned status for workflows in workspace ${workspaceId}`
+          )
+        }
+      }
+
       // Delete all workflows in the workspace - database cascade will handle all workflow-related data
       // The database cascade will handle deleting related workflow_blocks, workflow_edges, workflow_subflows,
       // workflow_logs, workflow_execution_snapshots, workflow_execution_logs, workflow_execution_trace_spans,

apps/sim/app/api/workspaces/invitations/route.test.ts

@@ -91,6 +91,7 @@ describe('Workspace Invitations API Route', () => {
       env: {
         RESEND_API_KEY: 'test-resend-key',
         NEXT_PUBLIC_APP_URL: 'https://test.sim.ai',
+        FROM_EMAIL_ADDRESS: 'Sim <noreply@test.sim.ai>',
         EMAIL_DOMAIN: 'test.sim.ai',
       },
     }))

apps/sim/app/api/workspaces/invitations/route.ts

@@ -2,12 +2,12 @@ import { randomUUID } from 'crypto'
 import { render } from '@react-email/render'
 import { and, eq, inArray } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { Resend } from 'resend'
 import { WorkspaceInvitationEmail } from '@/components/emails/workspace-invitation'
 import { getSession } from '@/lib/auth'
+import { sendEmail } from '@/lib/email/mailer'
+import { getFromEmailAddress } from '@/lib/email/utils'
 import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getEmailDomain } from '@/lib/urls/utils'
 import { db } from '@/db'
 import {
   permissions,
@@ -20,7 +20,6 @@ import {
 export const dynamic = 'force-dynamic'
 
 const logger = createLogger('WorkspaceInvitationsAPI')
-const resend = env.RESEND_API_KEY ? new Resend(env.RESEND_API_KEY) : null
 
 type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
@@ -241,30 +240,23 @@ async function sendInvitationEmail({
       })
     )
 
-    if (!resend) {
-      logger.error('RESEND_API_KEY not configured')
-      return NextResponse.json(
-        {
-          error:
-            'Email service not configured. Please set RESEND_API_KEY in environment variables.',
-        },
-        { status: 500 }
-      )
-    }
-
-    const emailDomain = env.EMAIL_DOMAIN || getEmailDomain()
-    const fromAddress = `noreply@${emailDomain}`
+    const fromAddress = getFromEmailAddress()
 
     logger.info(`Attempting to send email from ${fromAddress} to ${to}`)
 
-    const result = await resend.emails.send({
-      from: fromAddress,
+    const result = await sendEmail({
       to,
       subject: `You've been invited to join "${workspaceName}" on Sim`,
       html: emailHtml,
+      from: fromAddress,
+      emailType: 'transactional',
     })
 
-    logger.info(`Invitation email sent successfully to ${to}`, { result })
+    if (result.success) {
+      logger.info(`Invitation email sent successfully to ${to}`, { result })
+    } else {
+      logger.error(`Failed to send invitation email to ${to}`, { error: result.message })
+    }
   } catch (error) {
     logger.error('Error sending invitation email:', error)
     // Continue even if email fails - the invitation is still created

apps/sim/app/chat/[subdomain]/chat-client.css

@@ -0,0 +1,167 @@
+/* Force light mode for chat subdomain by overriding dark mode utilities */
+/* This file uses CSS variables from globals.css light mode theme */
+
+/* When inside the chat layout, force all light mode CSS variables */
+.chat-light-wrapper {
+  /* Core Colors - from globals.css light mode */
+  --background: 0 0% 100%;
+  --foreground: 0 0% 3.9%;
+
+  /* Card Colors */
+  --card: 0 0% 99.2%;
+  --card-foreground: 0 0% 3.9%;
+
+  /* Popover Colors */
+  --popover: 0 0% 100%;
+  --popover-foreground: 0 0% 3.9%;
+
+  /* Primary Colors */
+  --primary: 0 0% 11.2%;
+  --primary-foreground: 0 0% 98%;
+
+  /* Secondary Colors */
+  --secondary: 0 0% 96.1%;
+  --secondary-foreground: 0 0% 11.2%;
+
+  /* Muted Colors */
+  --muted: 0 0% 96.1%;
+  --muted-foreground: 0 0% 46.9%;
+
+  /* Accent Colors */
+  --accent: 0 0% 92.5%;
+  --accent-foreground: 0 0% 11.2%;
+
+  /* Destructive Colors */
+  --destructive: 0 84.2% 60.2%;
+  --destructive-foreground: 0 0% 98%;
+
+  /* Border & Input Colors */
+  --border: 0 0% 89.8%;
+  --input: 0 0% 89.8%;
+  --ring: 0 0% 3.9%;
+
+  /* Border Radius */
+  --radius: 0.5rem;
+
+  /* Scrollbar Properties */
+  --scrollbar-track: 0 0% 85%;
+  --scrollbar-thumb: 0 0% 65%;
+  --scrollbar-thumb-hover: 0 0% 55%;
+  --scrollbar-size: 8px;
+
+  /* Workflow Properties */
+  --workflow-background: 0 0% 100%;
+  --workflow-dots: 0 0% 94.5%;
+  --card-background: 0 0% 99.2%;
+  --card-border: 0 0% 89.8%;
+  --card-text: 0 0% 3.9%;
+  --card-hover: 0 0% 96.1%;
+
+  /* Base Component Properties */
+  --base-muted-foreground: #737373;
+
+  /* Gradient Colors */
+  --gradient-primary: 263 85% 70%;
+  --gradient-secondary: 336 95% 65%;
+
+  /* Brand Colors */
+  --brand-primary-hex: #701ffc;
+  --brand-primary-hover-hex: #802fff;
+  --brand-secondary-hex: #6518e6;
+  --brand-accent-hex: #9d54ff;
+  --brand-accent-hover-hex: #a66fff;
+  --brand-background-hex: #0c0c0c;
+
+  /* UI Surface Colors */
+  --surface-elevated: #202020;
+}
+
+/* Override dark mode utility classes using CSS variables */
+.chat-light-wrapper :is(.dark\:bg-black) {
+  background-color: hsl(var(--secondary));
+}
+
+.chat-light-wrapper :is(.dark\:bg-gray-900) {
+  background-color: hsl(var(--background));
+}
+
+.chat-light-wrapper :is(.dark\:bg-gray-800) {
+  background-color: hsl(var(--secondary));
+}
+
+.chat-light-wrapper :is(.dark\:bg-gray-700) {
+  background-color: hsl(var(--accent));
+}
+
+.chat-light-wrapper :is(.dark\:bg-gray-600) {
+  background-color: hsl(var(--muted));
+}
+
+.chat-light-wrapper :is(.dark\:bg-gray-300) {
+  background-color: hsl(var(--primary));
+}
+
+/* Text color overrides using CSS variables */
+.chat-light-wrapper :is(.dark\:text-gray-100) {
+  color: hsl(var(--primary));
+}
+
+.chat-light-wrapper :is(.dark\:text-gray-200) {
+  color: hsl(var(--foreground));
+}
+
+.chat-light-wrapper :is(.dark\:text-gray-300) {
+  color: hsl(var(--muted-foreground));
+}
+
+.chat-light-wrapper :is(.dark\:text-gray-400) {
+  color: hsl(var(--muted-foreground));
+}
+
+.chat-light-wrapper :is(.dark\:text-neutral-600) {
+  color: hsl(var(--muted-foreground));
+}
+
+.chat-light-wrapper :is(.dark\:text-blue-400) {
+  color: var(--brand-accent-hex);
+}
+
+/* Border color overrides using CSS variables */
+.chat-light-wrapper :is(.dark\:border-gray-700) {
+  border-color: hsl(var(--border));
+}
+
+.chat-light-wrapper :is(.dark\:border-gray-800) {
+  border-color: hsl(var(--border));
+}
+
+.chat-light-wrapper :is(.dark\:border-gray-600) {
+  border-color: hsl(var(--border));
+}
+
+.chat-light-wrapper :is(.dark\:divide-gray-700) > * + * {
+  border-color: hsl(var(--border));
+}
+
+/* Hover state overrides */
+.chat-light-wrapper :is(.dark\:hover\:bg-gray-800\/60:hover) {
+  background-color: hsl(var(--card-hover));
+}
+
+/* Code blocks specific overrides using CSS variables */
+.chat-light-wrapper pre:is(.dark\:bg-black) {
+  background-color: hsl(var(--workflow-dots));
+}
+
+.chat-light-wrapper code:is(.dark\:bg-gray-700) {
+  background-color: hsl(var(--accent));
+}
+
+.chat-light-wrapper code:is(.dark\:text-gray-200) {
+  color: hsl(var(--foreground));
+}
+
+/* Force color scheme */
+.chat-light-wrapper {
+  color-scheme: light !important;
+}

apps/sim/app/chat/[subdomain]/chat-client.tsx

@@ -481,7 +481,7 @@ export default function ChatClient({ subdomain }: { subdomain: string }) {
 
   // Standard text-based chat interface
   return (
-    <div className='fixed inset-0 z-[100] flex flex-col bg-background'>
+    <div className='fixed inset-0 z-[100] flex flex-col bg-background text-foreground'>
       {/* Header component */}
       <ChatHeader chatConfig={chatConfig} starCount={starCount} />
 

apps/sim/app/chat/[subdomain]/components/header/header.tsx

@@ -22,53 +22,14 @@ export function ChatHeader({ chatConfig, starCount }: ChatHeaderProps) {
   return (
     <div className='flex items-center justify-between bg-background/95 px-6 py-4 pt-6 backdrop-blur supports-[backdrop-filter]:bg-background/60 md:px-8 md:pt-4'>
       <div className='flex items-center gap-4'>
-        {customImage ? (
+        {customImage && (
           <img
             src={customImage}
             alt={`${chatConfig?.title || 'Chat'} logo`}
-            className='h-12 w-12 rounded-md object-cover'
+            className='h-8 w-8 rounded-md object-cover'
           />
-        ) : (
-          // Default Sim Studio logo when no custom image is provided
-          <div
-            className='flex h-12 w-12 items-center justify-center rounded-md'
-            style={{ backgroundColor: primaryColor }}
-          >
-            <svg
-              width='20'
-              height='20'
-              viewBox='0 0 50 50'
-              fill='none'
-              xmlns='http://www.w3.org/2000/svg'
-            >
-              <path
-                d='M34.1455 20.0728H16.0364C12.7026 20.0728 10 22.7753 10 26.1091V35.1637C10 38.4975 12.7026 41.2 16.0364 41.2H34.1455C37.4792 41.2 40.1818 38.4975 40.1818 35.1637V26.1091C40.1818 22.7753 37.4792 20.0728 34.1455 20.0728Z'
-                fill={primaryColor}
-                stroke='white'
-                strokeWidth='3.5'
-                strokeLinecap='round'
-                strokeLinejoin='round'
-              />
-              <path
-                d='M25.0919 14.0364C26.7588 14.0364 28.1101 12.6851 28.1101 11.0182C28.1101 9.35129 26.7588 8 25.0919 8C23.425 8 22.0737 9.35129 22.0737 11.0182C22.0737 12.6851 23.425 14.0364 25.0919 14.0364Z'
-                fill={primaryColor}
-                stroke='white'
-                strokeWidth='4'
-                strokeLinecap='round'
-                strokeLinejoin='round'
-              />
-              <path
-                d='M25.0915 14.856V19.0277M20.5645 32.1398V29.1216M29.619 29.1216V32.1398'
-                stroke='white'
-                strokeWidth='4'
-                strokeLinecap='round'
-                strokeLinejoin='round'
-              />
-              <circle cx='25' cy='11' r='2' fill={primaryColor} />
-            </svg>
-          </div>
         )}
-        <h2 className='font-medium text-lg'>
+        <h2 className='font-medium text-foreground text-lg'>
           {chatConfig?.customizations?.headerText || chatConfig?.title || 'Chat'}
         </h2>
       </div>

apps/sim/app/chat/[subdomain]/components/loading-state/loading-state.tsx

@@ -2,10 +2,10 @@
 
 export function ChatLoadingState() {
   return (
-    <div className='flex min-h-screen items-center justify-center bg-gray-50'>
+    <div className='flex min-h-screen items-center justify-center bg-background text-foreground'>
       <div className='animate-pulse text-center'>
-        <div className='mx-auto mb-4 h-8 w-48 rounded bg-gray-200' />
-        <div className='mx-auto h-4 w-64 rounded bg-gray-200' />
+        <div className='mx-auto mb-4 h-8 w-48 rounded bg-muted' />
+        <div className='mx-auto h-4 w-64 rounded bg-muted' />
       </div>
     </div>
   )

apps/sim/app/chat/[subdomain]/layout.tsx

@@ -0,0 +1,19 @@
+'use client'
+
+import { ThemeProvider } from 'next-themes'
+import './chat-client.css'
+
+export default function ChatLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <ThemeProvider
+      attribute='class'
+      forcedTheme='light'
+      enableSystem={false}
+      disableTransitionOnChange
+    >
+      <div className='light chat-light-wrapper' style={{ colorScheme: 'light' }}>
+        {children}
+      </div>
+    </ThemeProvider>
+  )
+}

apps/sim/app/layout.tsx

@@ -3,6 +3,7 @@ import { SpeedInsights } from '@vercel/speed-insights/next'
 import type { Metadata, Viewport } from 'next'
 import { PublicEnvScript } from 'next-runtime-env'
 import { BrandedLayout } from '@/components/branded-layout'
+import { generateThemeCSS } from '@/lib/branding/inject-theme'
 import { generateBrandedMetadata, generateStructuredData } from '@/lib/branding/metadata'
 import { env } from '@/lib/env'
 import { isHosted } from '@/lib/environment'
@@ -10,6 +11,8 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { getAssetUrl } from '@/lib/utils'
 import '@/app/globals.css'
 
+import { SessionProvider } from '@/lib/session-context'
+import { ThemeProvider } from '@/app/theme-provider'
 import { ZoomPrevention } from '@/app/zoom-prevention'
 
 const logger = createLogger('RootLayout')
@@ -45,11 +48,14 @@ if (typeof window !== 'undefined') {
 }
 
 export const viewport: Viewport = {
-  themeColor: '#ffffff',
   width: 'device-width',
   initialScale: 1,
   maximumScale: 1,
   userScalable: false,
+  themeColor: [
+    { media: '(prefers-color-scheme: light)', color: '#ffffff' },
+    { media: '(prefers-color-scheme: dark)', color: '#0c0c0c' },
+  ],
 }
 
 // Generate dynamic metadata based on brand configuration
@@ -57,6 +63,7 @@ export const metadata: Metadata = generateBrandedMetadata()
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   const structuredData = generateStructuredData()
+  const themeCSS = generateThemeCSS()
 
   return (
     <html lang='en' suppressHydrationWarning>
@@ -69,9 +76,18 @@ export default function RootLayout({ children }: { children: React.ReactNode })
           }}
         />
 
+        {/* Theme CSS Override */}
+        {themeCSS && (
+          <style
+            id='theme-override'
+            dangerouslySetInnerHTML={{
+              __html: themeCSS,
+            }}
+          />
+        )}
+
         {/* Meta tags for better SEO */}
-        <meta name='theme-color' content='#ffffff' />
-        <meta name='color-scheme' content='light' />
+        <meta name='color-scheme' content='light dark' />
         <meta name='format-detection' content='telephone=no' />
         <meta httpEquiv='x-ua-compatible' content='ie=edge' />
 
@@ -107,16 +123,20 @@ export default function RootLayout({ children }: { children: React.ReactNode })
         )}
       </head>
       <body suppressHydrationWarning>
-        <BrandedLayout>
-          <ZoomPrevention />
-          {children}
-          {isHosted && (
-            <>
-              <SpeedInsights />
-              <Analytics />
-            </>
-          )}
-        </BrandedLayout>
+        <ThemeProvider>
+          <SessionProvider>
+            <BrandedLayout>
+              <ZoomPrevention />
+              {children}
+              {isHosted && (
+                <>
+                  <SpeedInsights />
+                  <Analytics />
+                </>
+              )}
+            </BrandedLayout>
+          </SessionProvider>
+        </ThemeProvider>
       </body>
     </html>
   )

apps/sim/app/manifest.ts

@@ -11,8 +11,8 @@ export default function manifest(): MetadataRoute.Manifest {
       'Build and deploy AI agents using our Figma-like canvas. Build, write evals, and deploy AI agent workflows that automate workflows and streamline your business processes.',
     start_url: '/',
     display: 'standalone',
-    background_color: '#701FFC', // Default Sim brand primary color
-    theme_color: '#701FFC', // Default Sim brand primary color
+    background_color: brand.theme?.backgroundColor || '#701FFC',
+    theme_color: brand.theme?.primaryColor || '#701FFC',
     icons: [
       {
         src: '/favicon/android-chrome-192x192.png',

apps/sim/app/theme-provider.tsx

@@ -0,0 +1,19 @@
+'use client'
+
+import type { ThemeProviderProps } from 'next-themes'
+import { ThemeProvider as NextThemesProvider } from 'next-themes'
+
+export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
+  return (
+    <NextThemesProvider
+      attribute='class'
+      defaultTheme='system'
+      enableSystem
+      disableTransitionOnChange
+      storageKey='sim-theme'
+      {...props}
+    >
+      {children}
+    </NextThemesProvider>
+  )
+}

apps/sim/app/workspace/[workspaceId]/logs/components/trace-spans/trace-spans-display.tsx

@@ -82,14 +82,21 @@ function transformBlockData(data: any, blockType: string, isInput: boolean) {
 interface CollapsibleInputOutputProps {
   span: TraceSpan
   spanId: string
+  depth: number
 }
 
-function CollapsibleInputOutput({ span, spanId }: CollapsibleInputOutputProps) {
+function CollapsibleInputOutput({ span, spanId, depth }: CollapsibleInputOutputProps) {
   const [inputExpanded, setInputExpanded] = useState(false)
   const [outputExpanded, setOutputExpanded] = useState(false)
 
+  // Calculate the left margin based on depth to match the parent span's indentation
+  const leftMargin = depth * 16 + 8 + 24 // Base depth indentation + icon width + extra padding
+
   return (
-    <div className='mt-2 mr-4 mb-4 ml-8 space-y-3 overflow-hidden'>
+    <div
+      className='mt-2 mr-4 mb-4 space-y-3 overflow-hidden'
+      style={{ marginLeft: `${leftMargin}px` }}
+    >
       {/* Input Data - Collapsible */}
       {span.input && (
         <div>
@@ -162,26 +169,30 @@ function BlockDataDisplay({
     if (value === undefined) return <span className='text-muted-foreground italic'>undefined</span>
 
     if (typeof value === 'string') {
-      return <span className='break-all text-green-700 dark:text-green-400'>"{value}"</span>
+      return <span className='break-all text-emerald-700 dark:text-emerald-400'>"{value}"</span>
     }
 
     if (typeof value === 'number') {
-      return <span className='text-blue-700 dark:text-blue-400'>{value}</span>
+      return <span className='font-mono text-blue-700 dark:text-blue-400'>{value}</span>
     }
 
     if (typeof value === 'boolean') {
-      return <span className='text-purple-700 dark:text-purple-400'>{value.toString()}</span>
+      return (
+        <span className='font-mono text-amber-700 dark:text-amber-400'>{value.toString()}</span>
+      )
     }
 
     if (Array.isArray(value)) {
       if (value.length === 0) return <span className='text-muted-foreground'>[]</span>
       return (
-        <div className='space-y-1'>
+        <div className='space-y-0.5'>
           <span className='text-muted-foreground'>[</span>
-          <div className='ml-4 space-y-1'>
+          <div className='ml-2 space-y-0.5'>
             {value.map((item, index) => (
-              <div key={index} className='flex min-w-0 gap-2'>
-                <span className='flex-shrink-0 text-muted-foreground text-xs'>{index}:</span>
+              <div key={index} className='flex min-w-0 gap-1.5'>
+                <span className='flex-shrink-0 font-mono text-slate-600 text-xs dark:text-slate-400'>
+                  {index}:
+                </span>
                 <div className='min-w-0 flex-1 overflow-hidden'>{renderValue(item)}</div>
               </div>
             ))}
@@ -196,10 +207,10 @@ function BlockDataDisplay({
       if (entries.length === 0) return <span className='text-muted-foreground'>{'{}'}</span>
 
       return (
-        <div className='space-y-1'>
+        <div className='space-y-0.5'>
           {entries.map(([objKey, objValue]) => (
-            <div key={objKey} className='flex min-w-0 gap-2'>
-              <span className='flex-shrink-0 font-medium text-orange-700 dark:text-orange-400'>
+            <div key={objKey} className='flex min-w-0 gap-1.5'>
+              <span className='flex-shrink-0 font-medium text-indigo-700 dark:text-indigo-400'>
                 {objKey}:
               </span>
               <div className='min-w-0 flex-1 overflow-hidden'>{renderValue(objValue, objKey)}</div>
@@ -227,12 +238,12 @@ function BlockDataDisplay({
         {transformedData &&
           Object.keys(transformedData).filter((key) => key !== 'error' && key !== 'success')
             .length > 0 && (
-            <div className='space-y-1'>
+            <div className='space-y-0.5'>
               {Object.entries(transformedData)
                 .filter(([key]) => key !== 'error' && key !== 'success')
                 .map(([key, value]) => (
-                  <div key={key} className='flex gap-2'>
-                    <span className='font-medium text-orange-700 dark:text-orange-400'>{key}:</span>
+                  <div key={key} className='flex gap-1.5'>
+                    <span className='font-medium text-indigo-700 dark:text-indigo-400'>{key}:</span>
                     {renderValue(value, key)}
                   </div>
                 ))}
@@ -592,7 +603,9 @@ function TraceSpanItem({
       {expanded && (
         <div>
           {/* Block Input/Output Data - Collapsible */}
-          {(span.input || span.output) && <CollapsibleInputOutput span={span} spanId={spanId} />}
+          {(span.input || span.output) && (
+            <CollapsibleInputOutput span={span} spanId={spanId} depth={depth} />
+          )}
 
           {/* Children and tool calls */}
           {/* Render child spans */}

apps/sim/app/workspace/[workspaceId]/providers/providers.tsx

@@ -2,8 +2,8 @@
 
 import React from 'react'
 import { TooltipProvider } from '@/components/ui/tooltip'
-import { ThemeProvider } from '@/app/workspace/[workspaceId]/providers/theme-provider'
 import { WorkspacePermissionsProvider } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
+import { SettingsLoader } from './settings-loader'
 
 interface ProvidersProps {
   children: React.ReactNode
@@ -11,11 +11,12 @@ interface ProvidersProps {
 
 const Providers = React.memo<ProvidersProps>(({ children }) => {
   return (
-    <ThemeProvider>
+    <>
+      <SettingsLoader />
       <TooltipProvider delayDuration={100} skipDelayDuration={0}>
         <WorkspacePermissionsProvider>{children}</WorkspacePermissionsProvider>
       </TooltipProvider>
-    </ThemeProvider>
+    </>
   )
 })
 

apps/sim/app/workspace/[workspaceId]/providers/settings-loader.tsx

@@ -0,0 +1,27 @@
+'use client'
+
+import { useEffect, useRef } from 'react'
+import { useSession } from '@/lib/auth-client'
+import { useGeneralStore } from '@/stores/settings/general/store'
+
+/**
+ * Loads user settings from database once per workspace session.
+ * This ensures settings are synced from DB on initial load but uses
+ * localStorage cache for subsequent navigation within the app.
+ */
+export function SettingsLoader() {
+  const { data: session, isPending: isSessionPending } = useSession()
+  const loadSettings = useGeneralStore((state) => state.loadSettings)
+  const hasLoadedRef = useRef(false)
+
+  useEffect(() => {
+    // Only load settings once per session for authenticated users
+    if (!isSessionPending && session?.user && !hasLoadedRef.current) {
+      hasLoadedRef.current = true
+      // Force load from DB on initial workspace entry
+      loadSettings(true)
+    }
+  }, [isSessionPending, session?.user, loadSettings])
+
+  return null
+}

apps/sim/app/workspace/[workspaceId]/providers/theme-provider.tsx

@@ -1,23 +0,0 @@
-'use client'
-
-import { useEffect } from 'react'
-import { useGeneralStore } from '@/stores/settings/general/store'
-
-export function ThemeProvider({ children }: { children: React.ReactNode }) {
-  const theme = useGeneralStore((state) => state.theme)
-
-  useEffect(() => {
-    const root = window.document.documentElement
-    root.classList.remove('light', 'dark')
-
-    // If theme is system, check system preference
-    if (theme === 'system') {
-      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches
-      root.classList.add(prefersDark ? 'dark' : 'light')
-    } else {
-      root.classList.add(theme)
-    }
-  }, [theme])
-
-  return children
-}

apps/sim/app/workspace/[workspaceId]/templates/templates.tsx

@@ -29,7 +29,7 @@ export type CategoryValue = (typeof categories)[number]['value']
 // Template data structure
 export interface Template {
   id: string
-  workflowId: string
+  workflowId: string | null
   userId: string
   name: string
   description: string | null

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/components/deployment-info/components/example-command/example-command.tsx

@@ -11,6 +11,7 @@ import {
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
 import { Label } from '@/components/ui/label'
+import { getEnv, isTruthy } from '@/lib/env'
 
 interface ExampleCommandProps {
   command: string
@@ -32,6 +33,7 @@ export function ExampleCommand({
 }: ExampleCommandProps) {
   const [mode, setMode] = useState<ExampleMode>('sync')
   const [exampleType, setExampleType] = useState<ExampleType>('execute')
+  const isAsyncEnabled = isTruthy(getEnv('NEXT_PUBLIC_TRIGGER_DEV_ENABLED'))
 
   // Format the curl command to use a placeholder for the API key
   const formatCurlCommand = (command: string, apiKey: string) => {
@@ -146,62 +148,67 @@ export function ExampleCommand({
     <div className='space-y-1.5'>
       <div className='flex items-center justify-between'>
         {showLabel && <Label className='font-medium text-sm'>Example</Label>}
-        <div className='flex items-center gap-1'>
-          <Button
-            variant='outline'
-            size='sm'
-            onClick={() => setMode('sync')}
-            className={`h-6 min-w-[50px] px-2 py-1 text-xs transition-none ${
-              mode === 'sync'
-                ? 'border-primary bg-primary text-primary-foreground hover:border-primary hover:bg-primary hover:text-primary-foreground'
-                : ''
-            }`}
-          >
-            Sync
-          </Button>
-          <Button
-            variant='outline'
-            size='sm'
-            onClick={() => setMode('async')}
-            className={`h-6 min-w-[50px] px-2 py-1 text-xs transition-none ${
-              mode === 'async'
-                ? 'border-primary bg-primary text-primary-foreground hover:border-primary hover:bg-primary hover:text-primary-foreground'
-                : ''
-            }`}
-          >
-            Async
-          </Button>
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant='outline'
-                size='sm'
-                className='h-6 min-w-[140px] justify-between px-2 py-1 text-xs'
-                disabled={mode === 'sync'}
-              >
-                <span className='truncate'>{getExampleTitle()}</span>
-                <ChevronDown className='ml-1 h-3 w-3 flex-shrink-0' />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align='end'>
-              <DropdownMenuItem
-                className='cursor-pointer'
-                onClick={() => setExampleType('execute')}
-              >
-                Async Execution
-              </DropdownMenuItem>
-              <DropdownMenuItem className='cursor-pointer' onClick={() => setExampleType('status')}>
-                Check Job Status
-              </DropdownMenuItem>
-              <DropdownMenuItem
-                className='cursor-pointer'
-                onClick={() => setExampleType('rate-limits')}
-              >
-                Rate Limits & Usage
-              </DropdownMenuItem>
-            </DropdownMenuContent>
-          </DropdownMenu>
-        </div>
+        {isAsyncEnabled && (
+          <div className='flex items-center gap-1'>
+            <Button
+              variant='outline'
+              size='sm'
+              onClick={() => setMode('sync')}
+              className={`h-6 min-w-[50px] px-2 py-1 text-xs transition-none ${
+                mode === 'sync'
+                  ? 'border-primary bg-primary text-primary-foreground hover:border-primary hover:bg-primary hover:text-primary-foreground'
+                  : ''
+              }`}
+            >
+              Sync
+            </Button>
+            <Button
+              variant='outline'
+              size='sm'
+              onClick={() => setMode('async')}
+              className={`h-6 min-w-[50px] px-2 py-1 text-xs transition-none ${
+                mode === 'async'
+                  ? 'border-primary bg-primary text-primary-foreground hover:border-primary hover:bg-primary hover:text-primary-foreground'
+                  : ''
+              }`}
+            >
+              Async
+            </Button>
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  variant='outline'
+                  size='sm'
+                  className='h-6 min-w-[140px] justify-between px-2 py-1 text-xs'
+                  disabled={mode === 'sync'}
+                >
+                  <span className='truncate'>{getExampleTitle()}</span>
+                  <ChevronDown className='ml-1 h-3 w-3 flex-shrink-0' />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align='end'>
+                <DropdownMenuItem
+                  className='cursor-pointer'
+                  onClick={() => setExampleType('execute')}
+                >
+                  Async Execution
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  className='cursor-pointer'
+                  onClick={() => setExampleType('status')}
+                >
+                  Check Job Status
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  className='cursor-pointer'
+                  onClick={() => setExampleType('rate-limits')}
+                >
+                  Rate Limits & Usage
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
+        )}
       </div>
 
       <div className='group relative h-[120px] rounded-md border bg-background transition-colors hover:bg-muted/50'>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/template-modal/template-modal.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import { zodResolver } from '@hookform/resolvers/zod'
 import {
   Award,
@@ -18,6 +18,7 @@ import {
   Database,
   DollarSign,
   Edit,
+  Eye,
   FileText,
   Folder,
   Globe,
@@ -48,6 +49,16 @@ import {
 } from 'lucide-react'
 import { useForm } from 'react-hook-form'
 import { z } from 'zod'
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+} from '@/components/ui/alert-dialog'
 import { Button } from '@/components/ui/button'
 import { ColorPicker } from '@/components/ui/color-picker'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
@@ -68,6 +79,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from '@/components/ui/select'
+import { Skeleton } from '@/components/ui/skeleton'
 import { Textarea } from '@/components/ui/textarea'
 import { useSession } from '@/lib/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
@@ -100,7 +112,6 @@ interface TemplateModalProps {
   workflowId: string
 }
 
-// Enhanced icon selection with category-relevant icons
 const icons = [
   // Content & Documentation
   { value: 'FileText', label: 'File Text', component: FileText },
@@ -165,6 +176,10 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
   const { data: session } = useSession()
   const [isSubmitting, setIsSubmitting] = useState(false)
   const [iconPopoverOpen, setIconPopoverOpen] = useState(false)
+  const [existingTemplate, setExistingTemplate] = useState<any>(null)
+  const [isLoadingTemplate, setIsLoadingTemplate] = useState(false)
+  const [showDeleteDialog, setShowDeleteDialog] = useState(false)
+  const [isDeleting, setIsDeleting] = useState(false)
 
   const form = useForm<TemplateFormData>({
     resolver: zodResolver(templateSchema),
@@ -178,6 +193,63 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
     },
   })
 
+  // Watch form state to determine if all required fields are valid
+  const formValues = form.watch()
+  const isFormValid =
+    form.formState.isValid &&
+    formValues.name?.trim() &&
+    formValues.description?.trim() &&
+    formValues.author?.trim() &&
+    formValues.category
+
+  // Check for existing template when modal opens
+  useEffect(() => {
+    if (open && workflowId) {
+      checkExistingTemplate()
+    }
+  }, [open, workflowId])
+
+  const checkExistingTemplate = async () => {
+    setIsLoadingTemplate(true)
+    try {
+      const response = await fetch(`/api/templates?workflowId=${workflowId}&limit=1`)
+      if (response.ok) {
+        const result = await response.json()
+        const template = result.data?.[0] || null
+        setExistingTemplate(template)
+
+        // Pre-fill form with existing template data
+        if (template) {
+          form.reset({
+            name: template.name,
+            description: template.description,
+            author: template.author,
+            category: template.category,
+            icon: template.icon,
+            color: template.color,
+          })
+        } else {
+          // No existing template found
+          setExistingTemplate(null)
+          // Reset form to defaults
+          form.reset({
+            name: '',
+            description: '',
+            author: session?.user?.name || session?.user?.email || '',
+            category: '',
+            icon: 'FileText',
+            color: '#3972F6',
+          })
+        }
+      }
+    } catch (error) {
+      logger.error('Error checking existing template:', error)
+      setExistingTemplate(null)
+    } finally {
+      setIsLoadingTemplate(false)
+    }
+  }
+
   const onSubmit = async (data: TemplateFormData) => {
     if (!session?.user) {
       logger.error('User not authenticated')
@@ -201,21 +273,36 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
         state: templateState,
       }
 
-      const response = await fetch('/api/templates', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(templateData),
-      })
+      let response
+      if (existingTemplate) {
+        // Update existing template
+        response = await fetch(`/api/templates/${existingTemplate.id}`, {
+          method: 'PUT',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(templateData),
+        })
+      } else {
+        // Create new template
+        response = await fetch('/api/templates', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(templateData),
+        })
+      }
 
       if (!response.ok) {
         const errorData = await response.json()
-        throw new Error(errorData.error || 'Failed to create template')
+        throw new Error(
+          errorData.error || `Failed to ${existingTemplate ? 'update' : 'create'} template`
+        )
       }
 
       const result = await response.json()
-      logger.info('Template created successfully:', result)
+      logger.info(`Template ${existingTemplate ? 'updated' : 'created'} successfully:`, result)
 
       // Reset form and close modal
       form.reset()
@@ -241,7 +328,35 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
       >
         <DialogHeader className='flex-shrink-0 border-b px-6 py-4'>
           <div className='flex items-center justify-between'>
-            <DialogTitle className='font-medium text-lg'>Publish Template</DialogTitle>
+            <div className='flex items-center gap-3'>
+              <DialogTitle className='font-medium text-lg'>
+                {isLoadingTemplate
+                  ? 'Loading...'
+                  : existingTemplate
+                    ? 'Update Template'
+                    : 'Publish Template'}
+              </DialogTitle>
+              {existingTemplate && (
+                <div className='flex items-center gap-2'>
+                  {existingTemplate.stars > 0 && (
+                    <div className='flex items-center gap-1 rounded-full bg-yellow-50 px-2 py-1 dark:bg-yellow-900/20'>
+                      <Star className='h-3 w-3 fill-yellow-400 text-yellow-400' />
+                      <span className='font-medium text-xs text-yellow-700 dark:text-yellow-300'>
+                        {existingTemplate.stars}
+                      </span>
+                    </div>
+                  )}
+                  {existingTemplate.views > 0 && (
+                    <div className='flex items-center gap-1 rounded-full bg-blue-50 px-2 py-1 dark:bg-blue-900/20'>
+                      <Eye className='h-3 w-3 text-blue-500' />
+                      <span className='font-medium text-blue-700 text-xs dark:text-blue-300'>
+                        {existingTemplate.views}
+                      </span>
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
             <Button
               variant='ghost'
               size='icon'
@@ -259,65 +374,189 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
             onSubmit={form.handleSubmit(onSubmit)}
             className='flex flex-1 flex-col overflow-hidden'
           >
-            <div className='flex-1 overflow-y-auto px-6 py-4'>
-              <div className='space-y-6'>
-                <div className='flex gap-3'>
+            <div className='flex-1 overflow-y-auto px-6 py-6'>
+              {isLoadingTemplate ? (
+                <div className='space-y-6'>
+                  {/* Icon and Color row */}
+                  <div className='flex gap-3'>
+                    <div className='w-20'>
+                      <Skeleton className='mb-2 h-4 w-8' /> {/* Label */}
+                      <Skeleton className='h-10 w-20' /> {/* Icon picker */}
+                    </div>
+                    <div className='w-20'>
+                      <Skeleton className='mb-2 h-4 w-10' /> {/* Label */}
+                      <Skeleton className='h-10 w-20' /> {/* Color picker */}
+                    </div>
+                  </div>
+
+                  {/* Name field */}
+                  <div>
+                    <Skeleton className='mb-2 h-4 w-12' /> {/* Label */}
+                    <Skeleton className='h-10 w-full' /> {/* Input */}
+                  </div>
+
+                  {/* Author and Category row */}
+                  <div className='grid grid-cols-2 gap-4'>
+                    <div>
+                      <Skeleton className='mb-2 h-4 w-14' /> {/* Label */}
+                      <Skeleton className='h-10 w-full' /> {/* Input */}
+                    </div>
+                    <div>
+                      <Skeleton className='mb-2 h-4 w-16' /> {/* Label */}
+                      <Skeleton className='h-10 w-full' /> {/* Select */}
+                    </div>
+                  </div>
+
+                  {/* Description field */}
+                  <div>
+                    <Skeleton className='mb-2 h-4 w-20' /> {/* Label */}
+                    <Skeleton className='h-20 w-full' /> {/* Textarea */}
+                  </div>
+                </div>
+              ) : (
+                <div className='space-y-6'>
+                  <div className='flex gap-3'>
+                    <FormField
+                      control={form.control}
+                      name='icon'
+                      render={({ field }) => (
+                        <FormItem className='w-20'>
+                          <FormLabel className='!text-foreground font-medium text-sm'>
+                            Icon
+                          </FormLabel>
+                          <Popover open={iconPopoverOpen} onOpenChange={setIconPopoverOpen}>
+                            <PopoverTrigger asChild>
+                              <Button variant='outline' role='combobox' className='h-10 w-20 p-0'>
+                                <SelectedIconComponent className='h-4 w-4' />
+                              </Button>
+                            </PopoverTrigger>
+                            <PopoverContent className='z-50 w-84 p-0' align='start'>
+                              <div className='p-3'>
+                                <div className='grid max-h-80 grid-cols-8 gap-2 overflow-y-auto'>
+                                  {icons.map((icon) => {
+                                    const IconComponent = icon.component
+                                    return (
+                                      <button
+                                        key={icon.value}
+                                        type='button'
+                                        onClick={() => {
+                                          field.onChange(icon.value)
+                                          setIconPopoverOpen(false)
+                                        }}
+                                        className={cn(
+                                          'flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted',
+                                          field.value === icon.value &&
+                                            'bg-primary text-primary-foreground'
+                                        )}
+                                      >
+                                        <IconComponent className='h-4 w-4' />
+                                      </button>
+                                    )
+                                  })}
+                                </div>
+                              </div>
+                            </PopoverContent>
+                          </Popover>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <FormField
+                      control={form.control}
+                      name='color'
+                      render={({ field }) => (
+                        <FormItem className='w-20'>
+                          <FormLabel className='!text-foreground font-medium text-sm'>
+                            Color
+                          </FormLabel>
+                          <FormControl>
+                            <ColorPicker
+                              value={field.value}
+                              onChange={field.onChange}
+                              onBlur={field.onBlur}
+                              className='h-10 w-20'
+                            />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+
                   <FormField
                     control={form.control}
-                    name='icon'
+                    name='name'
                     render={({ field }) => (
-                      <FormItem className='w-20'>
-                        <FormLabel>Icon</FormLabel>
-                        <Popover open={iconPopoverOpen} onOpenChange={setIconPopoverOpen}>
-                          <PopoverTrigger asChild>
-                            <Button variant='outline' role='combobox' className='h-10 w-20 p-0'>
-                              <SelectedIconComponent className='h-4 w-4' />
-                            </Button>
-                          </PopoverTrigger>
-                          <PopoverContent className='z-50 w-84 p-0' align='start'>
-                            <div className='p-3'>
-                              <div className='grid max-h-80 grid-cols-8 gap-2 overflow-y-auto'>
-                                {icons.map((icon) => {
-                                  const IconComponent = icon.component
-                                  return (
-                                    <button
-                                      key={icon.value}
-                                      type='button'
-                                      onClick={() => {
-                                        field.onChange(icon.value)
-                                        setIconPopoverOpen(false)
-                                      }}
-                                      className={cn(
-                                        'flex h-8 w-8 items-center justify-center rounded-md border transition-colors hover:bg-muted',
-                                        field.value === icon.value &&
-                                          'bg-primary text-primary-foreground'
-                                      )}
-                                    >
-                                      <IconComponent className='h-4 w-4' />
-                                    </button>
-                                  )
-                                })}
-                              </div>
-                            </div>
-                          </PopoverContent>
-                        </Popover>
+                      <FormItem>
+                        <FormLabel className='!text-foreground font-medium text-sm'>Name</FormLabel>
+                        <FormControl>
+                          <Input placeholder='Enter template name' {...field} />
+                        </FormControl>
                         <FormMessage />
                       </FormItem>
                     )}
                   />
 
+                  <div className='grid grid-cols-2 gap-4'>
+                    <FormField
+                      control={form.control}
+                      name='author'
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel className='!text-foreground font-medium text-sm'>
+                            Author
+                          </FormLabel>
+                          <FormControl>
+                            <Input placeholder='Enter author name' {...field} />
+                          </FormControl>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
+                    <FormField
+                      control={form.control}
+                      name='category'
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel className='!text-foreground font-medium text-sm'>
+                            Category
+                          </FormLabel>
+                          <Select onValueChange={field.onChange} defaultValue={field.value}>
+                            <FormControl>
+                              <SelectTrigger>
+                                <SelectValue placeholder='Select a category' />
+                              </SelectTrigger>
+                            </FormControl>
+                            <SelectContent>
+                              {categories.map((category) => (
+                                <SelectItem key={category.value} value={category.value}>
+                                  {category.label}
+                                </SelectItem>
+                              ))}
+                            </SelectContent>
+                          </Select>
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+                  </div>
+
                   <FormField
                     control={form.control}
-                    name='color'
+                    name='description'
                     render={({ field }) => (
-                      <FormItem className='w-20'>
-                        <FormLabel>Color</FormLabel>
+                      <FormItem>
+                        <FormLabel className='!text-foreground font-medium text-sm'>
+                          Description
+                        </FormLabel>
                         <FormControl>
-                          <ColorPicker
-                            value={field.value}
-                            onChange={field.onChange}
-                            onBlur={field.onBlur}
-                            className='h-10 w-20'
+                          <Textarea
+                            placeholder='Describe what this template does...'
+                            className='resize-none'
+                            rows={3}
+                            {...field}
                           />
                         </FormControl>
                         <FormMessage />
@@ -325,91 +564,28 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
                     )}
                   />
                 </div>
-
-                <FormField
-                  control={form.control}
-                  name='name'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Name</FormLabel>
-                      <FormControl>
-                        <Input placeholder='Enter template name' {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <div className='grid grid-cols-2 gap-4'>
-                  <FormField
-                    control={form.control}
-                    name='author'
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>Author</FormLabel>
-                        <FormControl>
-                          <Input placeholder='Enter author name' {...field} />
-                        </FormControl>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-
-                  <FormField
-                    control={form.control}
-                    name='category'
-                    render={({ field }) => (
-                      <FormItem>
-                        <FormLabel>Category</FormLabel>
-                        <Select onValueChange={field.onChange} defaultValue={field.value}>
-                          <FormControl>
-                            <SelectTrigger>
-                              <SelectValue placeholder='Select a category' />
-                            </SelectTrigger>
-                          </FormControl>
-                          <SelectContent>
-                            {categories.map((category) => (
-                              <SelectItem key={category.value} value={category.value}>
-                                {category.label}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
-                        <FormMessage />
-                      </FormItem>
-                    )}
-                  />
-                </div>
-
-                <FormField
-                  control={form.control}
-                  name='description'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Description</FormLabel>
-                      <FormControl>
-                        <Textarea
-                          placeholder='Describe what this template does...'
-                          className='resize-none'
-                          rows={3}
-                          {...field}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
+              )}
             </div>
 
             {/* Fixed Footer */}
             <div className='mt-auto border-t px-6 pt-4 pb-6'>
-              <div className='flex justify-end'>
+              <div className='flex items-center'>
+                {existingTemplate && (
+                  <Button
+                    type='button'
+                    variant='destructive'
+                    onClick={() => setShowDeleteDialog(true)}
+                    disabled={isSubmitting || isLoadingTemplate}
+                    className='h-10 rounded-md px-4 py-2'
+                  >
+                    Delete
+                  </Button>
+                )}
                 <Button
                   type='submit'
-                  disabled={isSubmitting}
+                  disabled={isSubmitting || !isFormValid || isLoadingTemplate}
                   className={cn(
-                    'font-medium',
+                    'ml-auto font-medium',
                     'bg-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hover-hex)]',
                     'shadow-[0_0_0_0_var(--brand-primary-hex)] hover:shadow-[0_0_0_4px_rgba(127,47,255,0.15)]',
                     'text-white transition-all duration-200',
@@ -420,16 +596,59 @@ export function TemplateModal({ open, onOpenChange, workflowId }: TemplateModalP
                   {isSubmitting ? (
                     <>
                       <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                      Publishing...
+                      {existingTemplate ? 'Updating...' : 'Publishing...'}
                     </>
+                  ) : existingTemplate ? (
+                    'Update Template'
                   ) : (
-                    'Publish'
+                    'Publish Template'
                   )}
                 </Button>
               </div>
             </div>
           </form>
         </Form>
+        {existingTemplate && (
+          <AlertDialog open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
+            <AlertDialogContent>
+              <AlertDialogHeader>
+                <AlertDialogTitle>Delete Template?</AlertDialogTitle>
+                <AlertDialogDescription>
+                  Deleting this template will remove it from the gallery. This action cannot be
+                  undone.
+                </AlertDialogDescription>
+              </AlertDialogHeader>
+              <AlertDialogFooter>
+                <AlertDialogCancel disabled={isDeleting}>Cancel</AlertDialogCancel>
+                <AlertDialogAction
+                  className='bg-destructive text-destructive-foreground hover:bg-destructive/90'
+                  disabled={isDeleting}
+                  onClick={async () => {
+                    if (!existingTemplate) return
+                    setIsDeleting(true)
+                    try {
+                      const resp = await fetch(`/api/templates/${existingTemplate.id}`, {
+                        method: 'DELETE',
+                      })
+                      if (!resp.ok) {
+                        const err = await resp.json().catch(() => ({}))
+                        throw new Error(err.error || 'Failed to delete template')
+                      }
+                      setShowDeleteDialog(false)
+                      onOpenChange(false)
+                    } catch (err) {
+                      logger.error('Failed to delete template', err)
+                    } finally {
+                      setIsDeleting(false)
+                    }
+                  }}
+                >
+                  {isDeleting ? 'Deleting...' : 'Delete'}
+                </AlertDialogAction>
+              </AlertDialogFooter>
+            </AlertDialogContent>
+          </AlertDialog>
+        )}
       </DialogContent>
     </Dialog>
   )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/control-bar.tsx

@@ -18,7 +18,6 @@ import {
 import { useParams, useRouter } from 'next/navigation'
 import {
   AlertDialog,
-  AlertDialogAction,
   AlertDialogCancel,
   AlertDialogContent,
   AlertDialogDescription,
@@ -113,6 +112,15 @@ export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
   const [isTemplateModalOpen, setIsTemplateModalOpen] = useState(false)
   const [isAutoLayouting, setIsAutoLayouting] = useState(false)
 
+  // Delete workflow state - grouped for better organization
+  const [deleteState, setDeleteState] = useState({
+    showDialog: false,
+    isDeleting: false,
+    hasPublishedTemplates: false,
+    publishedTemplates: [] as any[],
+    showTemplateChoice: false,
+  })
+
   // Deployed state management
   const [deployedState, setDeployedState] = useState<WorkflowState | null>(null)
   const [isLoadingDeployedState, setIsLoadingDeployedState] = useState<boolean>(false)
@@ -337,35 +345,170 @@ export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
   }
 
   /**
-   * Handle deleting the current workflow
+   * Reset delete state
    */
-  const handleDeleteWorkflow = () => {
+  const resetDeleteState = useCallback(() => {
+    setDeleteState({
+      showDialog: false,
+      isDeleting: false,
+      hasPublishedTemplates: false,
+      publishedTemplates: [],
+      showTemplateChoice: false,
+    })
+  }, [])
+
+  /**
+   * Navigate to next workflow after deletion
+   */
+  const navigateAfterDeletion = useCallback(
+    (currentWorkflowId: string) => {
+      const sidebarWorkflows = getSidebarOrderedWorkflows()
+      const currentIndex = sidebarWorkflows.findIndex((w) => w.id === currentWorkflowId)
+
+      // Find next workflow: try next, then previous
+      let nextWorkflowId: string | null = null
+      if (sidebarWorkflows.length > 1) {
+        if (currentIndex < sidebarWorkflows.length - 1) {
+          nextWorkflowId = sidebarWorkflows[currentIndex + 1].id
+        } else if (currentIndex > 0) {
+          nextWorkflowId = sidebarWorkflows[currentIndex - 1].id
+        }
+      }
+
+      // Navigate to next workflow or workspace home
+      if (nextWorkflowId) {
+        router.push(`/workspace/${workspaceId}/w/${nextWorkflowId}`)
+      } else {
+        router.push(`/workspace/${workspaceId}`)
+      }
+    },
+    [workspaceId, router]
+  )
+
+  /**
+   * Check if workflow has published templates
+   */
+  const checkPublishedTemplates = useCallback(async (workflowId: string) => {
+    const checkResponse = await fetch(`/api/workflows/${workflowId}?check-templates=true`, {
+      method: 'DELETE',
+    })
+
+    if (!checkResponse.ok) {
+      throw new Error(`Failed to check templates: ${checkResponse.statusText}`)
+    }
+
+    return await checkResponse.json()
+  }, [])
+
+  /**
+   * Delete workflow with optional template handling
+   */
+  const deleteWorkflowWithTemplates = useCallback(
+    async (workflowId: string, templateAction?: 'keep' | 'delete') => {
+      const endpoint = templateAction
+        ? `/api/workflows/${workflowId}?deleteTemplates=${templateAction}`
+        : null
+
+      if (endpoint) {
+        // Use custom endpoint for template handling
+        const response = await fetch(endpoint, { method: 'DELETE' })
+        if (!response.ok) {
+          throw new Error(`Failed to delete workflow: ${response.statusText}`)
+        }
+
+        // Manual registry cleanup since we used custom API
+        useWorkflowRegistry.setState((state) => {
+          const newWorkflows = { ...state.workflows }
+          delete newWorkflows[workflowId]
+
+          return {
+            ...state,
+            workflows: newWorkflows,
+            activeWorkflowId: state.activeWorkflowId === workflowId ? null : state.activeWorkflowId,
+          }
+        })
+      } else {
+        // Use registry's built-in deletion (handles database + state)
+        await useWorkflowRegistry.getState().removeWorkflow(workflowId)
+      }
+    },
+    []
+  )
+
+  /**
+   * Handle deleting the current workflow - called after user confirms
+   */
+  const handleDeleteWorkflow = useCallback(async () => {
     const currentWorkflowId = params.workflowId as string
     if (!currentWorkflowId || !userPermissions.canEdit) return
 
-    const sidebarWorkflows = getSidebarOrderedWorkflows()
-    const currentIndex = sidebarWorkflows.findIndex((w) => w.id === currentWorkflowId)
+    setDeleteState((prev) => ({ ...prev, isDeleting: true }))
 
-    // Find next workflow: try next, then previous
-    let nextWorkflowId: string | null = null
-    if (sidebarWorkflows.length > 1) {
-      if (currentIndex < sidebarWorkflows.length - 1) {
-        nextWorkflowId = sidebarWorkflows[currentIndex + 1].id
-      } else if (currentIndex > 0) {
-        nextWorkflowId = sidebarWorkflows[currentIndex - 1].id
+    try {
+      // Check if workflow has published templates
+      const checkData = await checkPublishedTemplates(currentWorkflowId)
+
+      if (checkData.hasPublishedTemplates) {
+        setDeleteState((prev) => ({
+          ...prev,
+          hasPublishedTemplates: true,
+          publishedTemplates: checkData.publishedTemplates || [],
+          showTemplateChoice: true,
+          isDeleting: false, // Stop showing "Deleting..." and show template choice
+        }))
+        return
       }
-    }
 
-    // Navigate to next workflow or workspace home
-    if (nextWorkflowId) {
-      router.push(`/workspace/${workspaceId}/w/${nextWorkflowId}`)
-    } else {
-      router.push(`/workspace/${workspaceId}`)
+      // No templates, proceed with standard deletion
+      navigateAfterDeletion(currentWorkflowId)
+      await deleteWorkflowWithTemplates(currentWorkflowId)
+      resetDeleteState()
+    } catch (error) {
+      logger.error('Error deleting workflow:', error)
+      setDeleteState((prev) => ({ ...prev, isDeleting: false }))
     }
+  }, [
+    params.workflowId,
+    userPermissions.canEdit,
+    checkPublishedTemplates,
+    navigateAfterDeletion,
+    deleteWorkflowWithTemplates,
+    resetDeleteState,
+  ])
 
-    // Remove the workflow from the registry using the URL parameter
-    useWorkflowRegistry.getState().removeWorkflow(currentWorkflowId)
-  }
+  /**
+   * Handle template action selection
+   */
+  const handleTemplateAction = useCallback(
+    async (action: 'keep' | 'delete') => {
+      const currentWorkflowId = params.workflowId as string
+      if (!currentWorkflowId || !userPermissions.canEdit) return
+
+      setDeleteState((prev) => ({ ...prev, isDeleting: true }))
+
+      try {
+        logger.info(`Deleting workflow ${currentWorkflowId} with template action: ${action}`)
+
+        navigateAfterDeletion(currentWorkflowId)
+        await deleteWorkflowWithTemplates(currentWorkflowId, action)
+
+        logger.info(
+          `Successfully deleted workflow ${currentWorkflowId} with template action: ${action}`
+        )
+        resetDeleteState()
+      } catch (error) {
+        logger.error('Error deleting workflow:', error)
+        setDeleteState((prev) => ({ ...prev, isDeleting: false }))
+      }
+    },
+    [
+      params.workflowId,
+      userPermissions.canEdit,
+      navigateAfterDeletion,
+      deleteWorkflowWithTemplates,
+      resetDeleteState,
+    ]
+  )
 
   // Helper function to open subscription settings
   const openSubscriptionSettings = () => {
@@ -422,7 +565,23 @@ export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
     }
 
     return (
-      <AlertDialog>
+      <AlertDialog
+        open={deleteState.showDialog}
+        onOpenChange={(open) => {
+          if (open) {
+            // Reset all state when opening dialog to ensure clean start
+            setDeleteState({
+              showDialog: true,
+              isDeleting: false,
+              hasPublishedTemplates: false,
+              publishedTemplates: [],
+              showTemplateChoice: false,
+            })
+          } else {
+            resetDeleteState()
+          }
+        }}
+      >
         <Tooltip>
           <TooltipTrigger asChild>
             <AlertDialogTrigger asChild>
@@ -444,21 +603,71 @@ export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
 
         <AlertDialogContent>
           <AlertDialogHeader>
-            <AlertDialogTitle>Delete workflow?</AlertDialogTitle>
-            <AlertDialogDescription>
-              Deleting this workflow will permanently remove all associated blocks, executions, and
-              configuration.{' '}
-              <span className='text-red-500 dark:text-red-500'>This action cannot be undone.</span>
-            </AlertDialogDescription>
+            <AlertDialogTitle>
+              {deleteState.showTemplateChoice ? 'Published Templates Found' : 'Delete workflow?'}
+            </AlertDialogTitle>
+            {deleteState.showTemplateChoice ? (
+              <div className='space-y-3'>
+                <AlertDialogDescription>
+                  This workflow has {deleteState.publishedTemplates.length} published template
+                  {deleteState.publishedTemplates.length > 1 ? 's' : ''}:
+                </AlertDialogDescription>
+                {deleteState.publishedTemplates.length > 0 && (
+                  <ul className='list-disc space-y-1 pl-6'>
+                    {deleteState.publishedTemplates.map((template) => (
+                      <li key={template.id}>{template.name}</li>
+                    ))}
+                  </ul>
+                )}
+                <AlertDialogDescription>
+                  What would you like to do with the published template
+                  {deleteState.publishedTemplates.length > 1 ? 's' : ''}?
+                </AlertDialogDescription>
+              </div>
+            ) : (
+              <AlertDialogDescription>
+                Deleting this workflow will permanently remove all associated blocks, executions,
+                and configuration.{' '}
+                <span className='text-red-500 dark:text-red-500'>
+                  This action cannot be undone.
+                </span>
+              </AlertDialogDescription>
+            )}
           </AlertDialogHeader>
           <AlertDialogFooter className='flex'>
-            <AlertDialogCancel className='h-9 w-full rounded-[8px]'>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={handleDeleteWorkflow}
-              className='h-9 w-full rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
-            >
-              Delete
-            </AlertDialogAction>
+            {deleteState.showTemplateChoice ? (
+              <div className='flex w-full gap-2'>
+                <Button
+                  variant='outline'
+                  onClick={() => handleTemplateAction('keep')}
+                  disabled={deleteState.isDeleting}
+                  className='h-9 flex-1 rounded-[8px]'
+                >
+                  Keep templates
+                </Button>
+                <Button
+                  onClick={() => handleTemplateAction('delete')}
+                  disabled={deleteState.isDeleting}
+                  className='h-9 flex-1 rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
+                >
+                  {deleteState.isDeleting ? 'Deleting...' : 'Delete templates'}
+                </Button>
+              </div>
+            ) : (
+              <>
+                <AlertDialogCancel className='h-9 w-full rounded-[8px]'>Cancel</AlertDialogCancel>
+                <Button
+                  onClick={(e) => {
+                    e.preventDefault()
+                    handleDeleteWorkflow()
+                  }}
+                  disabled={deleteState.isDeleting}
+                  className='h-9 w-full rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
+                >
+                  {deleteState.isDeleting ? 'Deleting...' : 'Delete'}
+                </Button>
+              </>
+            )}
           </AlertDialogFooter>
         </AlertDialogContent>
       </AlertDialog>
@@ -1002,10 +1211,10 @@ export function ControlBar({ hasValidationErrors = false }: ControlBarProps) {
       {renderToggleButton()}
       {isExpanded && <ExportControls />}
       {isExpanded && renderAutoLayoutButton()}
-      {renderDuplicateButton()}
-      {renderDeleteButton()}
-      {!isDebugging && renderDebugModeToggle()}
       {isExpanded && renderPublishButton()}
+      {renderDeleteButton()}
+      {renderDuplicateButton()}
+      {!isDebugging && renderDebugModeToggle()}
       {renderDeployButton()}
       {isDebugging ? renderDebugControlsBar() : renderRunButton()}
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/channel-selector-input.tsx

@@ -6,9 +6,9 @@ import {
   type SlackChannelInfo,
   SlackChannelSelector,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/channel-selector/components/slack-channel-selector'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 interface ChannelSelectorInputProps {
   blockId: string
@@ -29,8 +29,6 @@ export function ChannelSelectorInput({
   isPreview = false,
   previewValue,
 }: ChannelSelectorInputProps) {
-  const { getValue } = useSubBlockStore()
-
   // Use the proper hook to get the current value and setter (same as file-selector)
   const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id)
   // Reactive upstream fields
@@ -43,6 +41,8 @@ export function ChannelSelectorInput({
   // Get provider-specific values
   const provider = subBlock.provider || 'slack'
   const isSlack = provider === 'slack'
+  // Central dependsOn gating
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
 
   // Get the credential for the provider - use provided credential or fall back to reactive values
   let credential: string
@@ -89,15 +89,10 @@ export function ChannelSelectorInput({
                 }}
                 credential={credential}
                 label={subBlock.placeholder || 'Select Slack channel'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
               />
             </div>
           </TooltipTrigger>
-          {!credential && (
-            <TooltipContent side='top'>
-              <p>Please select a Slack account or enter a bot token first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/credential-selector.tsx

@@ -26,7 +26,6 @@ import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import type { SubBlockConfig } from '@/blocks/types'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 const logger = createLogger('CredentialSelector')
 
@@ -217,17 +216,6 @@ export function CredentialSelector({
     setSelectedId(credentialId)
     if (!isPreview) {
       setStoreValue(credentialId)
-      // If credential changed, clear other sub-block fields for a clean state
-      if (previousId && previousId !== credentialId) {
-        const wfId = (activeWorkflowId as string) || ''
-        const workflowValues = useSubBlockStore.getState().workflowValues[wfId] || {}
-        const blockValues = workflowValues[blockId] || {}
-        Object.keys(blockValues).forEach((key) => {
-          if (key !== subBlock.id) {
-            collaborativeSetSubblockValue(blockId, key, '')
-          }
-        })
-      }
     }
     setOpen(false)
   }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/date-input.tsx

@@ -1,73 +0,0 @@
-'use client'
-
-import * as React from 'react'
-import { format } from 'date-fns'
-import { Calendar as CalendarIcon } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import { Calendar } from '@/components/ui/calendar'
-import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { cn } from '@/lib/utils'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
-
-interface DateInputProps {
-  blockId: string
-  subBlockId: string
-  placeholder?: string
-  isPreview?: boolean
-  previewValue?: string | null
-  disabled?: boolean
-}
-
-export function DateInput({
-  blockId,
-  subBlockId,
-  placeholder,
-  isPreview = false,
-  previewValue,
-  disabled = false,
-}: DateInputProps) {
-  const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlockId)
-
-  // Use preview value when in preview mode, otherwise use store value
-  const value = isPreview ? previewValue : storeValue
-  const date = value ? new Date(value) : undefined
-
-  const isPastDate = React.useMemo(() => {
-    if (!date) return false
-    const today = new Date()
-    today.setHours(0, 0, 0, 0)
-    return date < today
-  }, [date])
-
-  const handleDateSelect = (selectedDate: Date | undefined) => {
-    if (isPreview || disabled) return
-
-    if (selectedDate) {
-      const today = new Date()
-      today.setHours(0, 0, 0, 0)
-    }
-    setStoreValue(selectedDate?.toISOString() || '')
-  }
-
-  return (
-    <Popover>
-      <PopoverTrigger asChild>
-        <Button
-          variant='outline'
-          disabled={isPreview || disabled}
-          className={cn(
-            'w-full justify-start text-left font-normal',
-            !date && 'text-muted-foreground',
-            isPastDate && 'border-red-500'
-          )}
-        >
-          <CalendarIcon className='mr-1 h-4 w-4' />
-          {date ? format(date, 'MMM d, yy') : <span>{placeholder || 'Pick a date'}</span>}
-        </Button>
-      </PopoverTrigger>
-      <PopoverContent className='w-auto p-0'>
-        <Calendar mode='single' selected={date} onSelect={handleDateSelect} initialFocus />
-      </PopoverContent>
-    </Popover>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx

@@ -12,6 +12,7 @@ import {
   CommandList,
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 
@@ -65,6 +66,9 @@ export function DocumentSelector({
   // Use preview value when in preview mode, otherwise use store value
   const value = isPreview ? previewValue : storeValue
 
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
+  const isDisabled = finalDisabled
+
   // Fetch documents for the selected knowledge base
   const fetchDocuments = useCallback(async () => {
     if (!knowledgeBaseId) {
@@ -103,6 +107,7 @@ export function DocumentSelector({
   // Handle dropdown open/close - fetch documents when opening
   const handleOpenChange = (isOpen: boolean) => {
     if (isPreview) return
+    if (isDisabled) return
 
     setOpen(isOpen)
 
@@ -124,13 +129,14 @@ export function DocumentSelector({
 
   // Sync selected document with value prop
   useEffect(() => {
+    if (isDisabled) return
     if (value && documents.length > 0) {
       const docInfo = documents.find((doc) => doc.id === value)
       setSelectedDocument(docInfo || null)
     } else {
       setSelectedDocument(null)
     }
-  }, [value, documents])
+  }, [value, documents, isDisabled])
 
   // Reset documents when knowledge base changes
   useEffect(() => {
@@ -141,10 +147,10 @@ export function DocumentSelector({
 
   // Fetch documents when knowledge base is available
   useEffect(() => {
-    if (knowledgeBaseId && !isPreview) {
+    if (knowledgeBaseId && !isPreview && !isDisabled) {
       fetchDocuments()
     }
-  }, [knowledgeBaseId, isPreview, fetchDocuments])
+  }, [knowledgeBaseId, isPreview, isDisabled, fetchDocuments])
 
   const formatDocumentName = (document: DocumentData) => {
     return document.filename
@@ -166,9 +172,6 @@ export function DocumentSelector({
 
   const label = subBlock.placeholder || 'Select document'
 
-  // Show disabled state if no knowledge base is selected
-  const isDisabled = disabled || isPreview || !knowledgeBaseId
-
   return (
     <div className='w-full'>
       <Popover open={open} onOpenChange={handleOpenChange}>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/dropdown.tsx

@@ -22,6 +22,7 @@ interface DropdownProps {
   previewValue?: string | null
   disabled?: boolean
   placeholder?: string
+  config?: import('@/blocks/types').SubBlockConfig
 }
 
 export function Dropdown({
@@ -34,6 +35,7 @@ export function Dropdown({
   previewValue,
   disabled,
   placeholder = 'Select an option...',
+  config,
 }: DropdownProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<string>(blockId, subBlockId)
   const [storeInitialized, setStoreInitialized] = useState(false)
@@ -281,7 +283,7 @@ export function Dropdown({
 
       {/* Dropdown */}
       {open && (
-        <div className='absolute top-full left-0 z-[100] mt-1 w-full min-w-[286px]'>
+        <div className='absolute top-full left-0 z-[100] mt-1 w-full'>
           <div className='allow-scroll fade-in-0 zoom-in-95 animate-in rounded-md border bg-popover text-popover-foreground shadow-lg'>
             <div
               ref={dropdownRef}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/confluence-file-selector.tsx

@@ -376,6 +376,14 @@ export function ConfluenceFileSelector({
     }
   }, [value])
 
+  // Clear preview when value is cleared (e.g., collaborator cleared or domain change cascade)
+  useEffect(() => {
+    if (!value) {
+      setSelectedFile(null)
+      onFileInfoChange?.(null)
+    }
+  }, [value, onFileInfoChange])
+
   // Handle file selection
   const handleSelectFile = (file: ConfluenceFileInfo) => {
     setSelectedFileId(file.id)
@@ -547,7 +555,7 @@ export function ConfluenceFileSelector({
         </Popover>
 
         {/* File preview */}
-        {showPreview && selectedFile && (
+        {showPreview && selectedFile && selectedFileId && selectedFile.id === selectedFileId && (
           <div className='relative mt-2 rounded-md border border-muted bg-muted/10 p-2'>
             <div className='absolute top-2 right-2'>
               <Button

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx

@@ -237,10 +237,11 @@ export function GoogleDrivePicker({
 
     setIsLoading(true)
     try {
-      const url = new URL('/api/auth/oauth/token', window.location.origin)
-      url.searchParams.set('credentialId', effectiveCredentialId)
-      // include workflowId if available via global registry (server adds session owner otherwise)
-      const response = await fetch(url.toString())
+      const response = await fetch('/api/auth/oauth/token', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ credentialId: effectiveCredentialId, workflowId }),
+      })
 
       if (!response.ok) {
         throw new Error(`Failed to fetch access token: ${response.status}`)
@@ -414,6 +415,13 @@ export function GoogleDrivePicker({
     return <FileIcon className={`${iconSize} text-muted-foreground`} />
   }
 
+  const canShowPreview = !!(
+    showPreview &&
+    selectedFile &&
+    selectedFileId &&
+    selectedFile.id === selectedFileId
+  )
+
   return (
     <>
       <div className='space-y-2'>
@@ -440,7 +448,7 @@ export function GoogleDrivePicker({
           }}
         >
           <div className='flex min-w-0 items-center gap-2 overflow-hidden'>
-            {selectedFile ? (
+            {canShowPreview ? (
               <>
                 {getFileIcon(selectedFile, 'sm')}
                 <span className='truncate font-normal'>{selectedFile.name}</span>
@@ -460,7 +468,7 @@ export function GoogleDrivePicker({
         </Button>
 
         {/* File preview */}
-        {showPreview && selectedFile && (
+        {canShowPreview && (
           <div className='relative mt-2 rounded-md border border-muted bg-muted/10 p-2'>
             <div className='absolute top-2 right-2'>
               <Button

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx

@@ -13,7 +13,7 @@ import {
   CommandList,
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import {
   type Credential,
   getProviderIdFromServiceId,
@@ -22,7 +22,7 @@ import {
 } from '@/lib/oauth'
 import { OAuthRequiredModal } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal'
 
-const logger = new Logger('JiraIssueSelector')
+const logger = createLogger('JiraIssueSelector')
 
 export interface JiraIssueInfo {
   id: string

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx

@@ -88,6 +88,8 @@ export function MicrosoftFileSelector({
   const [showOAuthModal, setShowOAuthModal] = useState(false)
   const [credentialsLoaded, setCredentialsLoaded] = useState(false)
   const initialFetchRef = useRef(false)
+  // Track the last (credentialId, fileId) we attempted to resolve to avoid tight retry loops
+  const lastMetaAttemptRef = useRef<string>('')
 
   // Handle Microsoft Planner task selection
   const [plannerTasks, setPlannerTasks] = useState<PlannerTask[]>([])
@@ -496,11 +498,15 @@ export function MicrosoftFileSelector({
         setSelectedFileId('')
         onChange('')
       }
+      // Reset memo when credential is cleared
+      lastMetaAttemptRef.current = ''
     } else if (prevCredentialId && prevCredentialId !== selectedCredentialId) {
       // Credentials changed (not initial load) - clear file info to force refetch
       if (selectedFile) {
         setSelectedFile(null)
       }
+      // Reset memo when switching credentials
+      lastMetaAttemptRef.current = ''
     }
   }, [selectedCredentialId, selectedFile, onChange])
 
@@ -514,10 +520,17 @@ export function MicrosoftFileSelector({
       (!selectedFile || selectedFile.id !== value) &&
       !isLoadingSelectedFile
     ) {
+      // Avoid tight retry loops by memoizing the last attempt tuple
+      const attemptKey = `${selectedCredentialId}::${value}`
+      if (lastMetaAttemptRef.current === attemptKey) {
+        return
+      }
+      lastMetaAttemptRef.current = attemptKey
+
       if (serviceId === 'microsoft-planner') {
         void fetchPlannerTaskById(value)
       } else {
-        fetchFileById(value)
+        void fetchFileById(value)
       }
     }
   }, [
@@ -727,6 +740,13 @@ export function MicrosoftFileSelector({
         })
       : availableFiles
 
+  const canShowPreview = !!(
+    showPreview &&
+    selectedFile &&
+    selectedFileId &&
+    selectedFile.id === selectedFileId
+  )
+
   return (
     <>
       <div className='space-y-2'>
@@ -750,7 +770,7 @@ export function MicrosoftFileSelector({
               }
             >
               <div className='flex min-w-0 items-center gap-2 overflow-hidden'>
-                {selectedFile ? (
+                {canShowPreview ? (
                   <>
                     {getFileIcon(selectedFile, 'sm')}
                     <span className='truncate font-normal'>{selectedFile.name}</span>
@@ -925,7 +945,7 @@ export function MicrosoftFileSelector({
         </Popover>
 
         {/* File preview */}
-        {showPreview && selectedFile && (
+        {canShowPreview && (
           <div className='relative mt-2 rounded-md border border-muted bg-muted/10 p-2'>
             <div className='absolute top-2 right-2'>
               <Button

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/file-selector-input.tsx

@@ -1,33 +1,25 @@
 'use client'
 
-import { useEffect, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { getEnv } from '@/lib/env'
+import { getProviderIdFromServiceId } from '@/lib/oauth'
 import {
-  type ConfluenceFileInfo,
   ConfluenceFileSelector,
-  type DiscordChannelInfo,
   DiscordChannelSelector,
-  type FileInfo,
-  type GoogleCalendarInfo,
   GoogleCalendarSelector,
   GoogleDrivePicker,
-  type JiraIssueInfo,
   JiraIssueSelector,
-  type MicrosoftFileInfo,
   MicrosoftFileSelector,
-  type TeamsMessageInfo,
   TeamsMessageSelector,
   WealthboxFileSelector,
-  type WealthboxItemInfo,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/components'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 interface FileSelectorInputProps {
   blockId: string
@@ -46,11 +38,12 @@ export function FileSelectorInput({
   previewValue,
   previewContextValues,
 }: FileSelectorInputProps) {
-  const { getValue } = useSubBlockStore()
   const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
   const { activeWorkflowId } = useWorkflowRegistry()
   const params = useParams()
   const workflowIdFromUrl = (params?.workflowId as string) || activeWorkflowId || ''
+  // Central dependsOn gating for this selector instance
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
 
   // Helper to coerce various preview value shapes into a string ID
   const coerceToIdString = (val: unknown): string => {
@@ -72,22 +65,21 @@ export function FileSelectorInput({
   // Use the proper hook to get the current value and setter
   const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id)
   const [connectedCredential] = useSubBlockValue(blockId, 'credential')
-  const [selectedFileId, setSelectedFileId] = useState<string>('')
-  const [_fileInfo, setFileInfo] = useState<FileInfo | ConfluenceFileInfo | null>(null)
-  const [selectedIssueId, setSelectedIssueId] = useState<string>('')
-  const [_issueInfo, setIssueInfo] = useState<JiraIssueInfo | null>(null)
-  const [selectedChannelId, setSelectedChannelId] = useState<string>('')
-  const [channelInfo, setChannelInfo] = useState<DiscordChannelInfo | null>(null)
-  const [selectedMessageId, setSelectedMessageId] = useState<string>('')
-  const [messageInfo, setMessageInfo] = useState<TeamsMessageInfo | null>(null)
-  const [selectedCalendarId, setSelectedCalendarId] = useState<string>('')
-  const [calendarInfo, setCalendarInfo] = useState<GoogleCalendarInfo | null>(null)
-  const [selectedWealthboxItemId, setSelectedWealthboxItemId] = useState<string>('')
-  const [wealthboxItemInfo, setWealthboxItemInfo] = useState<WealthboxItemInfo | null>(null)
+  const [domainValue] = useSubBlockValue(blockId, 'domain')
+  const [projectIdValue] = useSubBlockValue(blockId, 'projectId')
+  const [planIdValue] = useSubBlockValue(blockId, 'planId')
+  const [teamIdValue] = useSubBlockValue(blockId, 'teamId')
+  const [operationValue] = useSubBlockValue(blockId, 'operation')
+  const [serverIdValue] = useSubBlockValue(blockId, 'serverId')
+  const [botTokenValue] = useSubBlockValue(blockId, 'botToken')
 
   // Determine if the persisted credential belongs to the current viewer
+  // Use service providerId where available (e.g., onedrive/sharepoint) instead of base provider ("microsoft")
+  const foreignCheckProvider = subBlock.serviceId
+    ? getProviderIdFromServiceId(subBlock.serviceId)
+    : (subBlock.provider as string) || ''
   const { isForeignCredential } = useForeignCredential(
-    subBlock.provider || subBlock.serviceId || '',
+    foreignCheckProvider,
     (connectedCredential as string) || ''
   )
 
@@ -104,128 +96,29 @@ export function FileSelectorInput({
   const isWealthbox = provider === 'wealthbox'
   const isMicrosoftSharePoint = provider === 'microsoft' && subBlock.serviceId === 'sharepoint'
   const isMicrosoftPlanner = provider === 'microsoft-planner'
+
   // For Confluence and Jira, we need the domain and credentials
   const domain =
     isConfluence || isJira
-      ? (isPreview && previewContextValues?.domain?.value) ||
-        (getValue(blockId, 'domain') as string) ||
-        ''
+      ? (isPreview && previewContextValues?.domain?.value) || (domainValue as string) || ''
       : ''
   const jiraCredential = isJira
     ? (isPreview && previewContextValues?.credential?.value) ||
-      (getValue(blockId, 'credential') as string) ||
+      (connectedCredential as string) ||
       ''
     : ''
+
   // For Discord, we need the bot token and server ID
   const botToken = isDiscord
-    ? (isPreview && previewContextValues?.botToken?.value) ||
-      (getValue(blockId, 'botToken') as string) ||
-      ''
+    ? (isPreview && previewContextValues?.botToken?.value) || (botTokenValue as string) || ''
     : ''
   const serverId = isDiscord
-    ? (isPreview && previewContextValues?.serverId?.value) ||
-      (getValue(blockId, 'serverId') as string) ||
-      ''
+    ? (isPreview && previewContextValues?.serverId?.value) || (serverIdValue as string) || ''
     : ''
 
   // Use preview value when in preview mode, otherwise use store value
   const value = isPreview ? previewValue : storeValue
 
-  // Keep local selection in sync with store value (and preview)
-  useEffect(() => {
-    const raw = isPreview && previewValue !== undefined ? previewValue : storeValue
-    const effective = coerceToIdString(raw)
-    if (effective) {
-      if (isJira) {
-        setSelectedIssueId(effective)
-      } else if (isDiscord) {
-        setSelectedChannelId(effective)
-      } else if (isMicrosoftTeams) {
-        setSelectedMessageId(effective)
-      } else if (isGoogleCalendar) {
-        setSelectedCalendarId(effective)
-      } else if (isWealthbox) {
-        setSelectedWealthboxItemId(effective)
-      } else if (isMicrosoftSharePoint) {
-        setSelectedFileId(effective)
-      } else {
-        setSelectedFileId(effective)
-      }
-    } else {
-      // Clear when value becomes empty
-      if (isJira) {
-        setSelectedIssueId('')
-      } else if (isDiscord) {
-        setSelectedChannelId('')
-      } else if (isMicrosoftTeams) {
-        setSelectedMessageId('')
-      } else if (isGoogleCalendar) {
-        setSelectedCalendarId('')
-      } else if (isWealthbox) {
-        setSelectedWealthboxItemId('')
-      } else if (isMicrosoftSharePoint) {
-        setSelectedFileId('')
-      } else {
-        setSelectedFileId('')
-      }
-    }
-  }, [
-    isPreview,
-    previewValue,
-    storeValue,
-    isJira,
-    isDiscord,
-    isMicrosoftTeams,
-    isGoogleCalendar,
-    isWealthbox,
-    isMicrosoftSharePoint,
-  ])
-
-  // Handle file selection
-  const handleFileChange = (fileId: string, info?: any) => {
-    setSelectedFileId(fileId)
-    setFileInfo(info || null)
-    setStoreValue(fileId)
-  }
-
-  // Handle issue selection
-  const handleIssueChange = (issueKey: string, info?: JiraIssueInfo) => {
-    setSelectedIssueId(issueKey)
-    setIssueInfo(info || null)
-    setStoreValue(issueKey)
-
-    // Clear the fields when a new issue is selected
-    if (isJira) {
-      collaborativeSetSubblockValue(blockId, 'summary', '')
-      collaborativeSetSubblockValue(blockId, 'description', '')
-      if (!issueKey) {
-        // Also clear the manual issue key when cleared
-        collaborativeSetSubblockValue(blockId, 'manualIssueKey', '')
-      }
-    }
-  }
-
-  // Handle channel selection
-  const handleChannelChange = (channelId: string, info?: DiscordChannelInfo) => {
-    setSelectedChannelId(channelId)
-    setChannelInfo(info || null)
-    setStoreValue(channelId)
-  }
-
-  // Handle calendar selection
-  const handleCalendarChange = (calendarId: string, info?: GoogleCalendarInfo) => {
-    setSelectedCalendarId(calendarId)
-    setCalendarInfo(info || null)
-    setStoreValue(calendarId)
-  }
-
-  // Handle Wealthbox item selection
-  const handleWealthboxItemChange = (itemId: string, info?: WealthboxItemInfo) => {
-    setSelectedWealthboxItemId(itemId)
-    setWealthboxItemInfo(info || null)
-    setStoreValue(itemId)
-  }
-
   // For Google Drive
   const clientId = getEnv('NEXT_PUBLIC_GOOGLE_CLIENT_ID') || ''
   const apiKey = getEnv('NEXT_PUBLIC_GOOGLE_API_KEY') || ''
@@ -245,25 +138,17 @@ export function FileSelectorInput({
                     ? (previewValue as string)
                     : (storeValue as string)) || ''
                 }
-                onChange={(val, info) => {
-                  setSelectedCalendarId(val)
-                  setCalendarInfo(info || null)
+                onChange={(val) => {
                   collaborativeSetSubblockValue(blockId, subBlock.id, val)
                 }}
                 label={subBlock.placeholder || 'Select Google Calendar'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onCalendarInfoChange={setCalendarInfo}
                 credentialId={credential}
                 workflowId={workflowIdFromUrl}
               />
             </div>
           </TooltipTrigger>
-          {!credential && (
-            <TooltipContent side='top'>
-              <p>Please select Google Calendar credentials first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
@@ -277,21 +162,18 @@ export function FileSelectorInput({
           <TooltipTrigger asChild>
             <div className='w-full'>
               <DiscordChannelSelector
-                value={selectedChannelId}
-                onChange={handleChannelChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(channelId) => setStoreValue(channelId)}
                 botToken={botToken}
                 serverId={serverId}
                 label={subBlock.placeholder || 'Select Discord channel'}
-                disabled={disabled || !botToken || !serverId}
+                disabled={finalDisabled}
                 showPreview={true}
               />
             </div>
           </TooltipTrigger>
-          {(!botToken || !serverId) && (
-            <TooltipContent side='top'>
-              <p>{!botToken ? 'Please enter a Bot Token first' : 'Please select a Server first'}</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
@@ -311,9 +193,7 @@ export function FileSelectorInput({
                     ? (previewValue as string)
                     : (storeValue as string)) || ''
                 }
-                onChange={(val, info) => {
-                  setSelectedFileId(val)
-                  setFileInfo(info || null)
+                onChange={(val) => {
                   collaborativeSetSubblockValue(blockId, subBlock.id, val)
                 }}
                 domain={domain}
@@ -321,20 +201,14 @@ export function FileSelectorInput({
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select Confluence page'}
-                disabled={disabled || !domain}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: ConfluenceFileInfo | null) => void}
                 credentialId={credential}
                 workflowId={workflowIdFromUrl}
                 isForeignCredential={isForeignCredential}
               />
             </div>
           </TooltipTrigger>
-          {!domain && (
-            <TooltipContent side='top'>
-              <p>Please enter a Confluence domain first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
@@ -353,168 +227,133 @@ export function FileSelectorInput({
                     ? (previewValue as string)
                     : (storeValue as string)) || ''
                 }
-                onChange={(val, info) => {
-                  setSelectedIssueId(val)
-                  setIssueInfo(info || null)
-                  collaborativeSetSubblockValue(blockId, subBlock.id, val)
+                onChange={(issueKey) => {
+                  collaborativeSetSubblockValue(blockId, subBlock.id, issueKey)
                 }}
                 domain={domain}
                 provider='jira'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select Jira issue'}
-                disabled={
-                  disabled || !domain || !credential || !(getValue(blockId, 'projectId') as string)
-                }
+                disabled={finalDisabled}
                 showPreview={true}
-                onIssueInfoChange={setIssueInfo as (info: JiraIssueInfo | null) => void}
                 credentialId={credential}
-                projectId={(getValue(blockId, 'projectId') as string) || ''}
+                projectId={(projectIdValue as string) || ''}
                 isForeignCredential={isForeignCredential}
                 workflowId={activeWorkflowId || ''}
               />
             </div>
           </TooltipTrigger>
-          {!domain ? (
-            <TooltipContent side='top'>
-              <p>Please enter a Jira domain first</p>
-            </TooltipContent>
-          ) : !credential ? (
-            <TooltipContent side='top'>
-              <p>Please select Jira credentials first</p>
-            </TooltipContent>
-          ) : !(getValue(blockId, 'projectId') as string) ? (
-            <TooltipContent side='top'>
-              <p>Please select a Jira project first</p>
-            </TooltipContent>
-          ) : null}
         </Tooltip>
       </TooltipProvider>
     )
   }
 
   if (isMicrosoftExcel) {
-    // Get credential reactively
     const credential = (connectedCredential as string) || ''
-
     return (
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <div className='w-full'>
               <MicrosoftFileSelector
-                value={coerceToIdString(selectedFileId)}
-                onChange={handleFileChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(fileId) => setStoreValue(fileId)}
                 provider='microsoft-excel'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select Microsoft Excel file'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void}
                 workflowId={activeWorkflowId || ''}
                 credentialId={credential}
                 isForeignCredential={isForeignCredential}
               />
             </div>
           </TooltipTrigger>
-          {!credential && (
-            <TooltipContent side='top'>
-              <p>Please select Microsoft Excel credentials first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
   }
 
-  // Handle Microsoft Word selector
+  // Microsoft Word selector
   if (isMicrosoftWord) {
-    // Get credential reactively
     const credential = (connectedCredential as string) || ''
-
     return (
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <div className='w-full'>
               <MicrosoftFileSelector
-                value={coerceToIdString(selectedFileId)}
-                onChange={handleFileChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(fileId) => setStoreValue(fileId)}
                 provider='microsoft-word'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select Microsoft Word document'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void}
               />
             </div>
           </TooltipTrigger>
-          {!credential && (
-            <TooltipContent side='top'>
-              <p>Please select Microsoft Word credentials first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
   }
 
-  // Handle Microsoft OneDrive selector
+  // Microsoft OneDrive selector
   if (isMicrosoftOneDrive) {
     const credential = (connectedCredential as string) || ''
-
     return (
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <div className='w-full'>
               <MicrosoftFileSelector
-                value={coerceToIdString(selectedFileId)}
-                onChange={handleFileChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(fileId) => setStoreValue(fileId)}
                 provider='microsoft'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select OneDrive folder'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void}
                 workflowId={activeWorkflowId || ''}
                 credentialId={credential}
                 isForeignCredential={isForeignCredential}
               />
             </div>
           </TooltipTrigger>
-          {!credential && (
-            <TooltipContent side='top'>
-              <p>Please select Microsoft credentials first</p>
-            </TooltipContent>
-          )}
         </Tooltip>
       </TooltipProvider>
     )
   }
 
-  // Handle Microsoft SharePoint selector
+  // Microsoft SharePoint selector
   if (isMicrosoftSharePoint) {
     const credential = (connectedCredential as string) || ''
-
     return (
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <div className='w-full'>
               <MicrosoftFileSelector
-                value={coerceToIdString(selectedFileId)}
-                onChange={handleFileChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(fileId) => setStoreValue(fileId)}
                 provider='microsoft'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select SharePoint site'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void}
                 workflowId={activeWorkflowId || ''}
                 credentialId={credential}
                 isForeignCredential={isForeignCredential}
@@ -531,26 +370,26 @@ export function FileSelectorInput({
     )
   }
 
-  // Handle Microsoft Planner task selector
+  // Microsoft Planner task selector
   if (isMicrosoftPlanner) {
     const credential = (connectedCredential as string) || ''
-    const planId = (getValue(blockId, 'planId') as string) || ''
-
+    const planId = (planIdValue as string) || ''
     return (
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>
             <div className='w-full'>
               <MicrosoftFileSelector
-                value={selectedFileId}
-                onChange={handleFileChange}
+                value={coerceToIdString(
+                  (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
+                )}
+                onChange={(fileId) => setStoreValue(fileId)}
                 provider='microsoft-planner'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId='microsoft-planner'
                 label={subBlock.placeholder || 'Select task'}
-                disabled={disabled || !credential || !planId}
+                disabled={finalDisabled}
                 showPreview={true}
-                onFileInfoChange={setFileInfo as (info: MicrosoftFileInfo | null) => void}
                 planId={planId}
                 workflowId={activeWorkflowId || ''}
                 credentialId={credential}
@@ -572,32 +411,22 @@ export function FileSelectorInput({
     )
   }
 
-  // Handle Microsoft Teams selector
+  // Microsoft Teams selector
   if (isMicrosoftTeams) {
-    // Get credential using the same pattern as other tools
     const credential = (connectedCredential as string) || ''
 
-    // Determine the selector type based on the subBlock ID
+    // Determine the selector type based on the subBlock ID / operation
     let selectionType: 'team' | 'channel' | 'chat' = 'team'
-
-    if (subBlock.id === 'teamId') {
-      selectionType = 'team'
-    } else if (subBlock.id === 'channelId') {
-      selectionType = 'channel'
-    } else if (subBlock.id === 'chatId') {
-      selectionType = 'chat'
-    } else {
-      // Fallback: look at the operation to determine the selection type
-      const operation = (getValue(blockId, 'operation') as string) || ''
-      if (operation.includes('chat')) {
-        selectionType = 'chat'
-      } else if (operation.includes('channel')) {
-        selectionType = 'channel'
-      }
+    if (subBlock.id === 'teamId') selectionType = 'team'
+    else if (subBlock.id === 'channelId') selectionType = 'channel'
+    else if (subBlock.id === 'chatId') selectionType = 'chat'
+    else {
+      const operation = (operationValue as string) || ''
+      if (operation.includes('chat')) selectionType = 'chat'
+      else if (operation.includes('channel')) selectionType = 'channel'
     }
 
-    // Get the teamId from workflow parameters for channel selector
-    const selectedTeamId = (getValue(blockId, 'teamId') as string) || ''
+    const selectedTeamId = (teamIdValue as string) || ''
 
     return (
       <TooltipProvider>
@@ -610,18 +439,15 @@ export function FileSelectorInput({
                     ? (previewValue as string)
                     : (storeValue as string)) || ''
                 }
-                onChange={(value, info) => {
-                  setSelectedMessageId(value)
-                  setMessageInfo(info || null)
-                  collaborativeSetSubblockValue(blockId, subBlock.id, value)
+                onChange={(val) => {
+                  collaborativeSetSubblockValue(blockId, subBlock.id, val)
                 }}
                 provider='microsoft-teams'
                 requiredScopes={subBlock.requiredScopes || []}
                 serviceId={subBlock.serviceId}
                 label={subBlock.placeholder || 'Select Teams message location'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 showPreview={true}
-                onMessageInfoChange={setMessageInfo}
                 credential={credential}
                 selectionType={selectionType}
                 initialTeamId={selectedTeamId}
@@ -640,15 +466,11 @@ export function FileSelectorInput({
     )
   }
 
-  // Render Wealthbox selector
+  // Wealthbox selector
   if (isWealthbox) {
-    // Get credential reactively
     const credential = (connectedCredential as string) || ''
-
-    // Only handle contacts now - both notes and tasks use short-input
     if (subBlock.id === 'contactId') {
       const itemType = 'contact'
-
       return (
         <TooltipProvider>
           <Tooltip>
@@ -660,18 +482,15 @@ export function FileSelectorInput({
                       ? (previewValue as string)
                       : (storeValue as string)) || ''
                   }
-                  onChange={(val, info) => {
-                    setSelectedWealthboxItemId(val)
-                    setWealthboxItemInfo(info || null)
+                  onChange={(val) => {
                     collaborativeSetSubblockValue(blockId, subBlock.id, val)
                   }}
                   provider='wealthbox'
                   requiredScopes={subBlock.requiredScopes || []}
                   serviceId={subBlock.serviceId}
                   label={subBlock.placeholder || `Select ${itemType}`}
-                  disabled={disabled || !credential}
+                  disabled={finalDisabled}
                   showPreview={true}
-                  onFileInfoChange={setWealthboxItemInfo}
                   credentialId={credential}
                   itemType={itemType}
                 />
@@ -686,7 +505,7 @@ export function FileSelectorInput({
         </TooltipProvider>
       )
     }
-    // If it's noteId or taskId, we should not render the file selector since they now use short-input
+    // noteId or taskId now use short-input
     return null
   }
 
@@ -705,19 +524,16 @@ export function FileSelectorInput({
                 value={coerceToIdString(
                   (isPreview && previewValue !== undefined ? previewValue : storeValue) as any
                 )}
-                onChange={(val, info) => {
-                  setSelectedFileId(val)
-                  setFileInfo(info || null)
+                onChange={(val) => {
                   collaborativeSetSubblockValue(blockId, subBlock.id, val)
                 }}
                 provider={provider}
                 requiredScopes={subBlock.requiredScopes || []}
                 label={subBlock.placeholder || 'Select file'}
-                disabled={disabled || !credential}
+                disabled={finalDisabled}
                 serviceId={subBlock.serviceId}
                 mimeTypeFilter={subBlock.mimeType}
                 showPreview={true}
-                onFileInfoChange={setFileInfo}
                 clientId={clientId}
                 apiKey={apiKey}
                 credentialId={credential}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/components/folder-selector-input.tsx

@@ -5,6 +5,7 @@ import {
   type FolderInfo,
   FolderSelector,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
@@ -37,8 +38,13 @@ export function FolderSelectorInput({
     (connectedCredential as string) || ''
   )
 
+  // Central dependsOn gating
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
+
   // Get the current value from the store or prop value if in preview mode
   useEffect(() => {
+    // When gated/disabled, do not set defaults or write to store
+    if (finalDisabled) return
     if (isPreview && previewValue !== undefined) {
       setSelectedFolderId(previewValue)
       return
@@ -54,7 +60,15 @@ export function FolderSelectorInput({
     if (!isPreview) {
       collaborativeSetSubblockValue(blockId, subBlock.id, defaultValue)
     }
-  }, [blockId, subBlock.id, storeValue, collaborativeSetSubblockValue, isPreview, previewValue])
+  }, [
+    blockId,
+    subBlock.id,
+    storeValue,
+    collaborativeSetSubblockValue,
+    isPreview,
+    previewValue,
+    finalDisabled,
+  ])
 
   // Handle folder selection
   const handleFolderChange = (folderId: string, info?: FolderInfo) => {
@@ -72,7 +86,7 @@ export function FolderSelectorInput({
       provider={subBlock.provider || 'google-email'}
       requiredScopes={subBlock.requiredScopes || []}
       label={subBlock.placeholder || 'Select folder'}
-      disabled={disabled}
+      disabled={finalDisabled}
       serviceId={subBlock.serviceId}
       onFolderInfoChange={setFolderInfo}
       credentialId={(connectedCredential as string) || ''}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx

@@ -279,29 +279,33 @@ export function FolderSelector({
 
   // Fetch credentials on initial mount
   useEffect(() => {
+    if (disabled) return
     if (!initialFetchRef.current) {
       fetchCredentials()
       initialFetchRef.current = true
     }
-  }, [fetchCredentials])
+  }, [fetchCredentials, disabled])
 
   // Fetch folders when credential is selected
   useEffect(() => {
+    if (disabled) return
     if (selectedCredentialId) {
       fetchFolders()
     }
-  }, [selectedCredentialId, fetchFolders])
+  }, [selectedCredentialId, fetchFolders, disabled])
 
   // Keep internal selectedFolderId in sync with the value prop
   useEffect(() => {
+    if (disabled) return
     const currentValue = isPreview ? previewValue : value
     if (currentValue !== selectedFolderId) {
       setSelectedFolderId(currentValue || '')
     }
-  }, [value, isPreview, previewValue])
+  }, [value, isPreview, previewValue, disabled])
 
   // Fetch the selected folder metadata once credentials are ready or value changes
   useEffect(() => {
+    if (disabled) return
     const currentValue = isPreview ? (previewValue as string) : (value as string)
     if (
       currentValue &&
@@ -310,7 +314,15 @@ export function FolderSelector({
     ) {
       fetchFolderById(currentValue)
     }
-  }, [value, selectedCredentialId, selectedFolder, fetchFolderById, isPreview, previewValue])
+  }, [
+    value,
+    selectedCredentialId,
+    selectedFolder,
+    fetchFolderById,
+    isPreview,
+    previewValue,
+    disabled,
+  ])
 
   // Handle folder selection
   const handleSelectFolder = (folder: FolderInfo) => {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/index.ts

@@ -4,7 +4,6 @@ export { Code } from './code'
 export { ComboBox } from './combobox'
 export { ConditionInput } from './condition-input'
 export { CredentialSelector } from './credential-selector/credential-selector'
-export { DateInput } from './date-input'
 export { DocumentSelector } from './document-selector/document-selector'
 export { Dropdown } from './dropdown'
 export { EvalInput } from './eval-input'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/jira-project-selector.tsx

@@ -353,6 +353,14 @@ export function JiraProjectSelector({
     }
   }, [value])
 
+  // Clear local preview when value is cleared remotely or via collaborator
+  useEffect(() => {
+    if (!value) {
+      setSelectedProject(null)
+      onProjectInfoChange?.(null)
+    }
+  }, [value, onProjectInfoChange])
+
   // Handle open change
   const handleOpenChange = (isOpen: boolean) => {
     setOpen(isOpen)
@@ -387,6 +395,8 @@ export function JiraProjectSelector({
     onProjectInfoChange?.(null)
   }
 
+  const canShowPreview = !!(showPreview && selectedProject && value && selectedProject.id === value)
+
   return (
     <>
       <div className='space-y-2'>
@@ -399,7 +409,7 @@ export function JiraProjectSelector({
               className='w-full justify-between'
               disabled={disabled || !domain || !selectedCredentialId || isForeignCredential}
             >
-              {selectedProject ? (
+              {canShowPreview ? (
                 <div className='flex items-center gap-2 overflow-hidden'>
                   <JiraIcon className='h-4 w-4' />
                   <span className='truncate font-normal'>{selectedProject.name}</span>
@@ -546,7 +556,7 @@ export function JiraProjectSelector({
         </Popover>
 
         {/* Project preview */}
-        {showPreview && selectedProject && (
+        {canShowPreview && (
           <div className='relative mt-2 rounded-md border border-muted bg-muted/10 p-2'>
             <div className='absolute top-2 right-2'>
               <Button

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/project-selector-input.tsx

@@ -18,6 +18,7 @@ import {
   type LinearTeamInfo,
   LinearTeamSelector,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/components/linear-team-selector'
+import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
@@ -51,16 +52,11 @@ export function ProjectSelectorInput({
     subBlock.provider || subBlock.serviceId || 'jira',
     (connectedCredential as string) || ''
   )
-  // Local setters for related Jira fields to ensure immediate UI clearing
-  const [_issueKeyValue, setIssueKeyValue] = useSubBlockValue<string>(blockId, 'issueKey')
-  const [_manualIssueKeyValue, setManualIssueKeyValue] = useSubBlockValue<string>(
-    blockId,
-    'manualIssueKey'
-  )
   // Reactive dependencies from store for Linear
   const [linearCredential] = useSubBlockValue(blockId, 'credential')
   const [linearTeamId] = useSubBlockValue(blockId, 'teamId')
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId) as string | null
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
 
   // Get provider-specific values
   const provider = subBlock.provider || 'jira'
@@ -95,27 +91,6 @@ export function ProjectSelectorInput({
     setProjectInfo(info || null)
     setStoreValue(projectId)
 
-    // Clear the issue-related fields when a new project is selected
-    if (provider === 'jira') {
-      collaborativeSetSubblockValue(blockId, 'summary', '')
-      collaborativeSetSubblockValue(blockId, 'description', '')
-      // Clear both the basic and advanced issue key fields to ensure UI resets
-      collaborativeSetSubblockValue(blockId, 'issueKey', '')
-      collaborativeSetSubblockValue(blockId, 'manualIssueKey', '')
-      // Also clear locally for immediate UI feedback on this client
-      setIssueKeyValue('')
-      setManualIssueKeyValue('')
-    } else if (provider === 'discord') {
-      collaborativeSetSubblockValue(blockId, 'channelId', '')
-    } else if (provider === 'linear') {
-      if (subBlock.id === 'teamId') {
-        collaborativeSetSubblockValue(blockId, 'teamId', projectId)
-        collaborativeSetSubblockValue(blockId, 'projectId', '')
-      } else if (subBlock.id === 'projectId') {
-        collaborativeSetSubblockValue(blockId, 'projectId', projectId)
-      }
-    }
-
     onProjectSelect?.(projectId)
   }
 
@@ -163,7 +138,7 @@ export function ProjectSelectorInput({
                   }}
                   credential={(linearCredential as string) || ''}
                   label={subBlock.placeholder || 'Select Linear team'}
-                  disabled={disabled || !(linearCredential as string)}
+                  disabled={finalDisabled}
                   showPreview={true}
                   workflowId={activeWorkflowId || ''}
                 />
@@ -171,7 +146,7 @@ export function ProjectSelectorInput({
                 (() => {
                   const credential = (linearCredential as string) || ''
                   const teamId = (linearTeamId as string) || ''
-                  const isDisabled = disabled || !credential || !teamId
+                  const isDisabled = finalDisabled
                   return (
                     <LinearProjectSelector
                       value={selectedProjectId}
@@ -213,7 +188,7 @@ export function ProjectSelectorInput({
               requiredScopes={subBlock.requiredScopes || []}
               serviceId={subBlock.serviceId}
               label={subBlock.placeholder || 'Select Jira project'}
-              disabled={disabled || !domain || !(jiraCredential as string)}
+              disabled={finalDisabled}
               showPreview={true}
               onProjectInfoChange={setProjectInfo}
               credentialId={(jiraCredential as string) || ''}
@@ -222,15 +197,6 @@ export function ProjectSelectorInput({
             />
           </div>
         </TooltipTrigger>
-        {!domain ? (
-          <TooltipContent side='top'>
-            <p>Please enter a Jira domain first</p>
-          </TooltipContent>
-        ) : !(jiraCredential as string) ? (
-          <TooltipContent side='top'>
-            <p>Please select a Jira account first</p>
-          </TooltipContent>
-        ) : null}
       </Tooltip>
     </TooltipProvider>
   )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/starter/input-format.tsx

@@ -1,4 +1,4 @@
-import { useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { ChevronDown, Plus, Trash } from 'lucide-react'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
@@ -8,10 +8,16 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu'
-import { formatDisplayText } from '@/components/ui/formatted-text'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { checkTagTrigger, TagDropdown } from '@/components/ui/tag-dropdown'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select'
+import { Textarea } from '@/components/ui/textarea'
 import { cn } from '@/lib/utils'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 
@@ -59,27 +65,31 @@ export function FieldFormat({
   emptyMessage = 'No fields defined',
   showType = true,
   showValue = false,
-  valuePlaceholder = 'Enter value or <variable.name>',
+  valuePlaceholder = 'Enter test value',
   isConnecting = false,
   config,
 }: FieldFormatProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<Field[]>(blockId, subBlockId)
-  const [tagDropdownStates, setTagDropdownStates] = useState<
-    Record<
-      string,
-      {
-        visible: boolean
-        cursorPosition: number
-      }
-    >
-  >({})
   const [dragHighlight, setDragHighlight] = useState<Record<string, boolean>>({})
-  const valueInputRefs = useRef<Record<string, HTMLInputElement>>({})
+  const valueInputRefs = useRef<Record<string, HTMLInputElement | HTMLTextAreaElement>>({})
+  const [localValues, setLocalValues] = useState<Record<string, string>>({})
 
   // Use preview value when in preview mode, otherwise use store value
   const value = isPreview ? previewValue : storeValue
   const fields: Field[] = value || []
 
+  useEffect(() => {
+    const initial: Record<string, string> = {}
+    ;(fields || []).forEach((f) => {
+      if (localValues[f.id] === undefined) {
+        initial[f.id] = (f.value as string) || ''
+      }
+    })
+    if (Object.keys(initial).length > 0) {
+      setLocalValues((prev) => ({ ...prev, ...initial }))
+    }
+  }, [fields])
+
   // Field operations
   const addField = () => {
     if (isPreview || disabled) return
@@ -88,12 +98,12 @@ export function FieldFormat({
       ...DEFAULT_FIELD,
       id: crypto.randomUUID(),
     }
-    setStoreValue([...fields, newField])
+    setStoreValue([...(fields || []), newField])
   }
 
   const removeField = (id: string) => {
     if (isPreview || disabled) return
-    setStoreValue(fields.filter((field: Field) => field.id !== id))
+    setStoreValue((fields || []).filter((field: Field) => field.id !== id))
   }
 
   // Validate field name for API safety
@@ -103,38 +113,22 @@ export function FieldFormat({
     return name.replace(/[\x00-\x1F"\\]/g, '').trim()
   }
 
-  // Tag dropdown handlers
   const handleValueInputChange = (fieldId: string, newValue: string) => {
-    const input = valueInputRefs.current[fieldId]
-    if (!input) return
-
-    const cursorPosition = input.selectionStart || 0
-    const shouldShow = checkTagTrigger(newValue, cursorPosition)
-
-    setTagDropdownStates((prev) => ({
-      ...prev,
-      [fieldId]: {
-        visible: shouldShow.show,
-        cursorPosition,
-      },
-    }))
-
-    updateField(fieldId, 'value', newValue)
+    setLocalValues((prev) => ({ ...prev, [fieldId]: newValue }))
   }
 
-  const handleTagSelect = (fieldId: string, newValue: string) => {
-    updateField(fieldId, 'value', newValue)
-    setTagDropdownStates((prev) => ({
-      ...prev,
-      [fieldId]: { ...prev[fieldId], visible: false },
-    }))
-  }
+  // Value normalization: keep it simple for string types
 
-  const handleTagDropdownClose = (fieldId: string) => {
-    setTagDropdownStates((prev) => ({
-      ...prev,
-      [fieldId]: { ...prev[fieldId], visible: false },
-    }))
+  const handleValueInputBlur = (field: Field) => {
+    if (isPreview || disabled) return
+
+    const inputEl = valueInputRefs.current[field.id]
+    if (!inputEl) return
+
+    const current = localValues[field.id] ?? inputEl.value ?? ''
+    const trimmed = current.trim()
+    if (!trimmed) return
+    updateField(field.id, 'value', current)
   }
 
   // Drag and drop handlers for connection blocks
@@ -152,47 +146,8 @@ export function FieldFormat({
   const handleDrop = (e: React.DragEvent, fieldId: string) => {
     e.preventDefault()
     setDragHighlight((prev) => ({ ...prev, [fieldId]: false }))
-
-    try {
-      const data = JSON.parse(e.dataTransfer.getData('application/json'))
-      if (data.type === 'connectionBlock' && data.connectionData) {
-        const input = valueInputRefs.current[fieldId]
-        if (!input) return
-
-        // Focus the input first
-        input.focus()
-
-        // Get current cursor position or use end of field
-        const dropPosition = input.selectionStart ?? (input.value?.length || 0)
-
-        // Insert '<' at drop position to trigger the dropdown
-        const currentValue = input.value || ''
-        const newValue = `${currentValue.slice(0, dropPosition)}<${currentValue.slice(dropPosition)}`
-
-        // Update the field value
-        updateField(fieldId, 'value', newValue)
-
-        // Set cursor position and show dropdown
-        setTimeout(() => {
-          input.selectionStart = dropPosition + 1
-          input.selectionEnd = dropPosition + 1
-
-          // Trigger dropdown by simulating the tag check
-          const cursorPosition = dropPosition + 1
-          const shouldShow = checkTagTrigger(newValue, cursorPosition)
-
-          setTagDropdownStates((prev) => ({
-            ...prev,
-            [fieldId]: {
-              visible: shouldShow.show,
-              cursorPosition,
-            },
-          }))
-        }, 0)
-      }
-    } catch (error) {
-      console.error('Error handling drop:', error)
-    }
+    const input = valueInputRefs.current[fieldId]
+    input?.focus()
   }
 
   // Update handlers
@@ -204,12 +159,14 @@ export function FieldFormat({
       value = validateFieldName(value)
     }
 
-    setStoreValue(fields.map((f: Field) => (f.id === id ? { ...f, [field]: value } : f)))
+    setStoreValue((fields || []).map((f: Field) => (f.id === id ? { ...f, [field]: value } : f)))
   }
 
   const toggleCollapse = (id: string) => {
     if (isPreview || disabled) return
-    setStoreValue(fields.map((f: Field) => (f.id === id ? { ...f, collapsed: !f.collapsed } : f)))
+    setStoreValue(
+      (fields || []).map((f: Field) => (f.id === id ? { ...f, collapsed: !f.collapsed } : f))
+    )
   }
 
   // Field header
@@ -371,54 +328,66 @@ export function FieldFormat({
                     <div className='space-y-1.5'>
                       <Label className='text-xs'>Value</Label>
                       <div className='relative'>
-                        <Input
-                          ref={(el) => {
-                            if (el) valueInputRefs.current[field.id] = el
-                          }}
-                          name='value'
-                          value={field.value || ''}
-                          onChange={(e) => handleValueInputChange(field.id, e.target.value)}
-                          onKeyDown={(e) => {
-                            if (e.key === 'Escape') {
-                              handleTagDropdownClose(field.id)
+                        {field.type === 'boolean' ? (
+                          <Select
+                            value={localValues[field.id] ?? (field.value as string) ?? ''}
+                            onValueChange={(v) => {
+                              setLocalValues((prev) => ({ ...prev, [field.id]: v }))
+                              if (!isPreview && !disabled) updateField(field.id, 'value', v)
+                            }}
+                          >
+                            <SelectTrigger className='h-9 w-full justify-between font-normal'>
+                              <SelectValue placeholder='Select value' className='truncate' />
+                            </SelectTrigger>
+                            <SelectContent>
+                              <SelectItem value='true'>true</SelectItem>
+                              <SelectItem value='false'>false</SelectItem>
+                            </SelectContent>
+                          </Select>
+                        ) : field.type === 'object' || field.type === 'array' ? (
+                          <Textarea
+                            ref={(el) => {
+                              if (el) valueInputRefs.current[field.id] = el
+                            }}
+                            name='value'
+                            value={localValues[field.id] ?? (field.value as string) ?? ''}
+                            onChange={(e) => handleValueInputChange(field.id, e.target.value)}
+                            onBlur={() => handleValueInputBlur(field)}
+                            placeholder={
+                              field.type === 'object' ? '{\n  "key": "value"\n}' : '[\n  1, 2, 3\n]'
                             }
-                          }}
-                          onDragOver={(e) => handleDragOver(e, field.id)}
-                          onDragLeave={(e) => handleDragLeave(e, field.id)}
-                          onDrop={(e) => handleDrop(e, field.id)}
-                          placeholder={valuePlaceholder}
-                          disabled={isPreview || disabled}
-                          className={cn(
-                            'h-9 text-transparent caret-foreground placeholder:text-muted-foreground/50',
-                            dragHighlight[field.id] && 'ring-2 ring-blue-500 ring-offset-2',
-                            isConnecting &&
-                              config?.connectionDroppable !== false &&
-                              'ring-2 ring-blue-500 ring-offset-2 focus-visible:ring-blue-500'
-                          )}
-                        />
-                        {field.value && (
-                          <div className='pointer-events-none absolute inset-0 flex items-center px-3 py-2'>
-                            <div className='w-full overflow-hidden text-ellipsis whitespace-nowrap text-sm'>
-                              {formatDisplayText(field.value, true)}
-                            </div>
-                          </div>
+                            disabled={isPreview || disabled}
+                            className={cn(
+                              'min-h-[120px] font-mono text-sm placeholder:text-muted-foreground/50',
+                              dragHighlight[field.id] && 'ring-2 ring-blue-500 ring-offset-2',
+                              isConnecting &&
+                                config?.connectionDroppable !== false &&
+                                'ring-2 ring-blue-500 ring-offset-2 focus-visible:ring-blue-500'
+                            )}
+                          />
+                        ) : (
+                          <Input
+                            ref={(el) => {
+                              if (el) valueInputRefs.current[field.id] = el
+                            }}
+                            name='value'
+                            value={localValues[field.id] ?? field.value ?? ''}
+                            onChange={(e) => handleValueInputChange(field.id, e.target.value)}
+                            onBlur={() => handleValueInputBlur(field)}
+                            onDragOver={(e) => handleDragOver(e, field.id)}
+                            onDragLeave={(e) => handleDragLeave(e, field.id)}
+                            onDrop={(e) => handleDrop(e, field.id)}
+                            placeholder={valuePlaceholder}
+                            disabled={isPreview || disabled}
+                            className={cn(
+                              'h-9 placeholder:text-muted-foreground/50',
+                              dragHighlight[field.id] && 'ring-2 ring-blue-500 ring-offset-2',
+                              isConnecting &&
+                                config?.connectionDroppable !== false &&
+                                'ring-2 ring-blue-500 ring-offset-2 focus-visible:ring-blue-500'
+                            )}
+                          />
                         )}
-                        <TagDropdown
-                          visible={tagDropdownStates[field.id]?.visible || false}
-                          onSelect={(newValue) => handleTagSelect(field.id, newValue)}
-                          blockId={blockId}
-                          activeSourceBlockId={null}
-                          inputValue={field.value || ''}
-                          cursorPosition={tagDropdownStates[field.id]?.cursorPosition || 0}
-                          onClose={() => handleTagDropdownClose(field.id)}
-                          style={{
-                            position: 'absolute',
-                            top: '100%',
-                            left: 0,
-                            right: 0,
-                            zIndex: 9999,
-                          }}
-                        />
                       </div>
                     </div>
                   )}
@@ -460,7 +429,7 @@ export function ResponseFormat(
       emptyMessage='No response fields defined'
       showType={false}
       showValue={true}
-      valuePlaceholder='Enter value or <variable.name>'
+      valuePlaceholder='Enter test value'
     />
   )
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/tool-input/tool-input.tsx

@@ -1,5 +1,4 @@
 import { useCallback, useEffect, useState } from 'react'
-import { logger } from '@trigger.dev/sdk/v3'
 import { PlusIcon, WrenchIcon, XIcon } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
@@ -13,6 +12,7 @@ import {
 import { Switch } from '@/components/ui/switch'
 import { Toggle } from '@/components/ui/toggle'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { createLogger } from '@/lib/logs/console/logger'
 import type { OAuthProvider, OAuthService } from '@/lib/oauth/oauth'
 import { cn } from '@/lib/utils'
 import {
@@ -20,7 +20,6 @@ import {
   CheckboxList,
   Code,
   ComboBox,
-  DateInput,
   FileSelectorInput,
   FileUpload,
   LongInput,
@@ -49,6 +48,8 @@ import {
   type ToolParameterConfig,
 } from '@/tools/params'
 
+const logger = createLogger('ToolInput')
+
 interface ToolInputProps {
   blockId: string
   subBlockId: string
@@ -170,33 +171,6 @@ function TableSyncWrapper({
   )
 }
 
-function DateInputSyncWrapper({
-  blockId,
-  paramId,
-  value,
-  onChange,
-  uiComponent,
-  disabled,
-}: {
-  blockId: string
-  paramId: string
-  value: string
-  onChange: (value: string) => void
-  uiComponent: any
-  disabled: boolean
-}) {
-  return (
-    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
-      <DateInput
-        blockId={blockId}
-        subBlockId={paramId}
-        placeholder={uiComponent.placeholder}
-        disabled={disabled}
-      />
-    </GenericSyncWrapper>
-  )
-}
-
 function TimeInputSyncWrapper({
   blockId,
   paramId,
@@ -1157,18 +1131,6 @@ export function ToolInput({
           />
         )
 
-      case 'date-input':
-        return (
-          <DateInputSyncWrapper
-            blockId={blockId}
-            paramId={param.id}
-            value={value}
-            onChange={onChange}
-            uiComponent={uiComponent}
-            disabled={disabled}
-          />
-        )
-
       case 'time-input':
         return (
           <TimeInputSyncWrapper

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/components/trigger-modal.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { Trash2 } from 'lucide-react'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
@@ -46,18 +46,51 @@ export function TriggerModal({
   const [config, setConfig] = useState<Record<string, any>>(initialConfig)
   const [isSaving, setIsSaving] = useState(false)
 
-  // Track if config has changed from initial values
+  // Snapshot initial values at open for stable dirty-checking across collaborators
+  const initialConfigRef = useRef<Record<string, any>>(initialConfig)
+  const initialCredentialRef = useRef<string | null>(null)
+
+  // Capture initial credential on first detect
+  useEffect(() => {
+    if (initialCredentialRef.current !== null) return
+    const subBlockStore = useSubBlockStore.getState()
+    const cred = (subBlockStore.getValue(blockId, 'triggerCredentials') as string | null) || null
+    initialCredentialRef.current = cred
+  }, [blockId])
+
+  // Track if config has changed from initial snapshot
   const hasConfigChanged = useMemo(() => {
-    return JSON.stringify(config) !== JSON.stringify(initialConfig)
-  }, [config, initialConfig])
+    return JSON.stringify(config) !== JSON.stringify(initialConfigRef.current)
+  }, [config])
+
+  // Track if credential has changed from initial snapshot (computed later once selectedCredentialId is declared)
+  let hasCredentialChanged = false
   const [isDeleting, setIsDeleting] = useState(false)
   const [webhookUrl, setWebhookUrl] = useState('')
   const [generatedPath, setGeneratedPath] = useState('')
   const [hasCredentials, setHasCredentials] = useState(false)
   const [selectedCredentialId, setSelectedCredentialId] = useState<string | null>(null)
+  hasCredentialChanged = selectedCredentialId !== initialCredentialRef.current
   const [dynamicOptions, setDynamicOptions] = useState<
     Record<string, Array<{ id: string; name: string }>>
   >({})
+  const lastCredentialIdRef = useRef<string | null>(null)
+
+  // Reset provider-dependent config fields when credentials change
+  const resetFieldsForCredentialChange = () => {
+    setConfig((prev) => {
+      const next = { ...prev }
+      if (triggerDef.provider === 'gmail') {
+        if (Array.isArray(next.labelIds)) next.labelIds = []
+      } else if (triggerDef.provider === 'outlook') {
+        if (Array.isArray(next.folderIds)) next.folderIds = []
+      } else if (triggerDef.provider === 'airtable') {
+        if (typeof next.baseId === 'string') next.baseId = ''
+        if (typeof next.tableId === 'string') next.tableId = ''
+      }
+      return next
+    })
+  }
 
   // Initialize config with default values from trigger definition
   useEffect(() => {
@@ -79,35 +112,71 @@ export function TriggerModal({
     }
   }, [triggerDef.configFields, initialConfig])
 
-  // Monitor credential selection
+  // Monitor credential selection across collaborators; clear options on change/clear
   useEffect(() => {
     if (triggerDef.requiresCredentials && triggerDef.credentialProvider) {
-      // Check if credentials are selected by monitoring the sub-block store
       const checkCredentials = () => {
         const subBlockStore = useSubBlockStore.getState()
-        const credentialValue = subBlockStore.getValue(blockId, 'triggerCredentials')
-        const hasCredential = Boolean(credentialValue)
+        const credentialValue = subBlockStore.getValue(blockId, 'triggerCredentials') as
+          | string
+          | null
+        const currentCredentialId = credentialValue || null
+        const hasCredential = Boolean(currentCredentialId)
         setHasCredentials(hasCredential)
 
-        // If credential changed and it's a Gmail trigger, load labels
-        if (hasCredential && credentialValue !== selectedCredentialId) {
-          setSelectedCredentialId(credentialValue)
+        // If credential was cleared by another user, reset local state and dynamic options
+        if (!hasCredential) {
+          if (selectedCredentialId !== null) {
+            setSelectedCredentialId(null)
+          }
+          // Clear provider-specific dynamic options
+          setDynamicOptions({})
+          // Per requirements: only clear dependent selections on actual credential CHANGE,
+          // not when it becomes empty. So we do NOT reset fields here.
+          lastCredentialIdRef.current = null
+          return
+        }
+
+        // If credential changed, clear options immediately and load for new cred
+        const previousCredentialId = lastCredentialIdRef.current
+
+        // First detection (prev null → current non-null): do not clear selections
+        if (previousCredentialId === null) {
+          setSelectedCredentialId(currentCredentialId)
+          lastCredentialIdRef.current = currentCredentialId
+          if (typeof currentCredentialId === 'string') {
+            if (triggerDef.provider === 'gmail') {
+              void loadGmailLabels(currentCredentialId)
+            } else if (triggerDef.provider === 'outlook') {
+              void loadOutlookFolders(currentCredentialId)
+            }
+          }
+          return
+        }
+
+        // Real change (prev non-null → different non-null): clear dependent selections
+        if (
+          typeof currentCredentialId === 'string' &&
+          currentCredentialId !== previousCredentialId
+        ) {
+          setSelectedCredentialId(currentCredentialId)
+          lastCredentialIdRef.current = currentCredentialId
+          // Clear stale options before loading new ones
+          setDynamicOptions({})
+          // Clear any selected values that depend on the credential
+          resetFieldsForCredentialChange()
           if (triggerDef.provider === 'gmail') {
-            loadGmailLabels(credentialValue)
+            void loadGmailLabels(currentCredentialId)
           } else if (triggerDef.provider === 'outlook') {
-            loadOutlookFolders(credentialValue)
+            void loadOutlookFolders(currentCredentialId)
           }
         }
       }
 
       checkCredentials()
-
-      // Set up a subscription to monitor changes
       const unsubscribe = useSubBlockStore.subscribe(checkCredentials)
-
       return unsubscribe
     }
-    // If credentials aren't required, set to true
     setHasCredentials(true)
   }, [
     blockId,
@@ -367,10 +436,14 @@ export function TriggerModal({
               </Button>
               <Button
                 onClick={handleSave}
-                disabled={isSaving || !isConfigValid() || (!hasConfigChanged && !!triggerId)}
+                disabled={
+                  isSaving ||
+                  !isConfigValid() ||
+                  (!(hasConfigChanged || hasCredentialChanged) && !!triggerId)
+                }
                 className={cn(
                   'h-10',
-                  isConfigValid() && (hasConfigChanged || !triggerId)
+                  isConfigValid() && (hasConfigChanged || hasCredentialChanged || !triggerId)
                     ? 'bg-primary hover:bg-primary/90'
                     : '',
                   isSaving &&

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/trigger-config/trigger-config.tsx

@@ -172,6 +172,11 @@ export function TriggerConfig({
       // Map trigger ID to webhook provider name
       const webhookProvider = effectiveTriggerId.replace(/_webhook|_poller$/, '') // e.g., 'slack_webhook' -> 'slack', 'gmail_poller' -> 'gmail'
 
+      // Include selected credential from the modal (if any)
+      const selectedCredentialId =
+        (useSubBlockStore.getState().getValue(blockId, 'triggerCredentials') as string | null) ||
+        null
+
       // For credential-based triggers (like Gmail), create webhook entry for polling service but no webhook URL
       if (triggerDef.requiresCredentials && !triggerDef.webhook) {
         // Gmail polling service requires a webhook database entry to find the configuration
@@ -185,7 +190,10 @@ export function TriggerConfig({
             blockId,
             path: '', // Empty path - API will generate dummy path for Gmail
             provider: webhookProvider,
-            providerConfig: config,
+            providerConfig: {
+              ...config,
+              ...(selectedCredentialId ? { credentialId: selectedCredentialId } : {}),
+            },
           }),
         })
 
@@ -225,7 +233,10 @@ export function TriggerConfig({
           blockId,
           path,
           provider: webhookProvider,
-          providerConfig: config,
+          providerConfig: {
+            ...config,
+            ...(selectedCredentialId ? { credentialId: selectedCredentialId } : {}),
+          },
         }),
       })
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/webhook/components/providers/gmail.tsx

@@ -17,11 +17,11 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from '@/components/ui'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { JSONView } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components'
 import { ConfigSection } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/webhook/components'
 
-const logger = new Logger('GmailConfig')
+const logger = createLogger('GmailConfig')
 
 const TOOLTIPS = {
   labels: 'Select which email labels to monitor.',

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/webhook/components/providers/outlook.tsx

@@ -17,11 +17,11 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from '@/components/ui'
-import { Logger } from '@/lib/logs/console/logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { JSONView } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components'
 import { ConfigSection } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/webhook/components'
 
-const logger = new Logger('OutlookConfig')
+const logger = createLogger('OutlookConfig')
 
 interface OutlookFolder {
   id: string

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-depends-on-gate.ts

@@ -0,0 +1,54 @@
+'use client'
+
+import { useMemo } from 'react'
+import type { SubBlockConfig } from '@/blocks/types'
+import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { useSubBlockStore } from '@/stores/workflows/subblock/store'
+
+/**
+ * Centralized dependsOn gating for sub-block components.
+ * - Computes dependency values from the active workflow/block
+ * - Returns a stable disabled flag to pass to inputs and to guard effects
+ */
+export function useDependsOnGate(
+  blockId: string,
+  subBlock: SubBlockConfig,
+  opts?: { disabled?: boolean; isPreview?: boolean }
+) {
+  const disabledProp = opts?.disabled ?? false
+  const isPreview = opts?.isPreview ?? false
+
+  const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
+
+  // Use only explicit dependsOn from block config. No inference.
+  const dependsOn: string[] = (subBlock.dependsOn as string[] | undefined) || []
+
+  const dependencyValues = useSubBlockStore((state) => {
+    if (dependsOn.length === 0) return [] as any[]
+    if (!activeWorkflowId) return dependsOn.map(() => null)
+    const workflowValues = state.workflowValues[activeWorkflowId] || {}
+    const blockValues = (workflowValues as any)[blockId] || {}
+    return dependsOn.map((depKey) => (blockValues as any)[depKey] ?? null)
+  }) as any[]
+
+  const depsSatisfied = useMemo(() => {
+    if (dependsOn.length === 0) return true
+    return dependencyValues.every((v) =>
+      typeof v === 'string' ? v.trim().length > 0 : v !== null && v !== undefined && v !== ''
+    )
+  }, [dependencyValues, dependsOn])
+
+  // Block everything except the credential field itself until dependencies are set
+  const blocked =
+    !isPreview && dependsOn.length > 0 && !depsSatisfied && subBlock.type !== 'oauth-input'
+
+  const finalDisabled = disabledProp || isPreview || blocked
+
+  return {
+    dependsOn,
+    dependencyValues,
+    depsSatisfied,
+    blocked,
+    finalDisabled,
+  }
+}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value.ts

@@ -37,6 +37,10 @@ export function useSubBlockValue<T = any>(
 
   const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
 
+  // Subscribe to active workflow id to avoid races where the workflow id is set after mount.
+  // This ensures our selector recomputes when the active workflow changes.
+  const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
+
   const blockType = useWorkflowStore(
     useCallback((state) => state.blocks?.[blockId]?.type, [blockId])
   )
@@ -56,9 +60,17 @@ export function useSubBlockValue<T = any>(
   const streamingValueRef = useRef<T | null>(null)
   const wasStreamingRef = useRef<boolean>(false)
 
-  // Get value from subblock store - always call this hook unconditionally
+  // Get value from subblock store, keyed by active workflow id
+  // We intentionally depend on activeWorkflowId so this recomputes when it changes.
   const storeValue = useSubBlockStore(
-    useCallback((state) => state.getValue(blockId, subBlockId), [blockId, subBlockId])
+    useCallback(
+      (state) => {
+        // If the active workflow ID isn't available yet, return undefined so we can fall back to initialValue
+        if (!activeWorkflowId) return undefined
+        return state.workflowValues[activeWorkflowId]?.[blockId]?.[subBlockId] ?? null
+      },
+      [activeWorkflowId, blockId, subBlockId]
+    )
   )
 
   // Check if we're in diff mode and get diff value if available
@@ -123,12 +135,10 @@ export function useSubBlockValue<T = any>(
         useSubBlockStore.setState((state) => ({
           workflowValues: {
             ...state.workflowValues,
-            [useWorkflowRegistry.getState().activeWorkflowId || '']: {
-              ...state.workflowValues[useWorkflowRegistry.getState().activeWorkflowId || ''],
+            [activeWorkflowId || '']: {
+              ...state.workflowValues[activeWorkflowId || ''],
               [blockId]: {
-                ...state.workflowValues[useWorkflowRegistry.getState().activeWorkflowId || '']?.[
-                  blockId
-                ],
+                ...state.workflowValues[activeWorkflowId || '']?.[blockId],
                 [subBlockId]: newValue,
               },
             },
@@ -190,6 +200,7 @@ export function useSubBlockValue<T = any>(
       isStreaming,
       emitValue,
       isShowingDiff,
+      activeWorkflowId,
     ]
   )
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/sub-block.tsx

@@ -11,7 +11,6 @@ import {
   ComboBox,
   ConditionInput,
   CredentialSelector,
-  DateInput,
   DocumentSelector,
   Dropdown,
   EvalInput,
@@ -126,9 +125,12 @@ export function SubBlock({
               blockId={blockId}
               subBlockId={config.id}
               options={config.options as { label: string; id: string }[]}
+              defaultValue={typeof config.value === 'function' ? config.value({}) : config.value}
+              placeholder={config.placeholder}
               isPreview={isPreview}
               previewValue={previewValue}
               disabled={isDisabled}
+              config={config}
             />
           </div>
         )
@@ -139,6 +141,7 @@ export function SubBlock({
               blockId={blockId}
               subBlockId={config.id}
               options={config.options as { label: string; id: string }[]}
+              defaultValue={typeof config.value === 'function' ? config.value({}) : config.value}
               placeholder={config.placeholder}
               isPreview={isPreview}
               previewValue={previewValue}
@@ -252,17 +255,6 @@ export function SubBlock({
             disabled={isDisabled}
           />
         )
-      case 'date-input':
-        return (
-          <DateInput
-            blockId={blockId}
-            subBlockId={config.id}
-            placeholder={config.placeholder}
-            isPreview={isPreview}
-            previewValue={previewValue}
-            disabled={isDisabled}
-          />
-        )
       case 'time-input':
         return (
           <TimeInput
@@ -435,6 +427,7 @@ export function SubBlock({
             disabled={isDisabled}
             isConnecting={isConnecting}
             config={config}
+            showValue={true}
           />
         )
       }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand.ts

@@ -198,35 +198,37 @@ export function useWand({
             const { done, value } = await reader.read()
             if (done) break
 
-            // Process incoming chunks
-            const text = decoder.decode(value)
-            const lines = text.split('\n').filter((line) => line.trim() !== '')
+            // Process incoming chunks using SSE format (identical to Chat panel)
+            const chunk = decoder.decode(value)
+            const lines = chunk.split('\n\n')
 
             for (const line of lines) {
-              try {
-                const data = JSON.parse(line)
+              if (line.startsWith('data: ')) {
+                try {
+                  const data = JSON.parse(line.substring(6))
 
-                // Check if there's an error
-                if (data.error) {
-                  throw new Error(data.error)
-                }
-
-                // Process chunk
-                if (data.chunk && !data.done) {
-                  accumulatedContent += data.chunk
-                  // Stream each chunk to the UI immediately
-                  if (onStreamChunk) {
-                    onStreamChunk(data.chunk)
+                  // Check if there's an error
+                  if (data.error) {
+                    throw new Error(data.error)
                   }
-                }
 
-                // Check if streaming is complete
-                if (data.done) {
-                  break
+                  // Process chunk
+                  if (data.chunk) {
+                    accumulatedContent += data.chunk
+                    // Stream each chunk to the UI immediately
+                    if (onStreamChunk) {
+                      onStreamChunk(data.chunk)
+                    }
+                  }
+
+                  // Check if streaming is complete
+                  if (data.done) {
+                    break
+                  }
+                } catch (parseError) {
+                  // Continue processing other lines
+                  logger.debug('Failed to parse SSE line', { line, parseError })
                 }
-              } catch (parseError) {
-                // Continue processing other lines
-                logger.debug('Failed to parse streaming line', { line, parseError })
               }
             }
           }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts

@@ -548,8 +548,8 @@ export function useWorkflowExecution() {
       }
     })
 
-    // Merge subblock states from the appropriate store
-    const mergedStates = mergeSubblockState(validBlocks)
+    // Merge subblock states from the appropriate store (scoped to active workflow)
+    const mergedStates = mergeSubblockState(validBlocks, activeWorkflowId ?? undefined)
 
     // Debug: Check for blocks with undefined types after merging
     Object.entries(mergedStates).forEach(([blockId, block]) => {
@@ -807,7 +807,7 @@ export function useWorkflowExecution() {
 
       // Continue execution until there are no more pending blocks
       let iterationCount = 0
-      const maxIterations = 100 // Safety to prevent infinite loops
+      const maxIterations = 500 // Safety to prevent infinite loops
 
       while (currentPendingBlocks.length > 0 && iterationCount < maxIterations) {
         logger.info(

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/create-menu/create-menu.tsx

@@ -1,11 +1,11 @@
 'use client'
 
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { logger } from '@sentry/nextjs'
 import { Download, Folder, Plus } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { createLogger } from '@/lib/logs/console/logger'
 import { generateFolderName } from '@/lib/naming'
 import { cn } from '@/lib/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
@@ -14,7 +14,8 @@ import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { parseWorkflowYaml } from '@/stores/workflows/yaml/importer'
 
-// Constants
+const logger = createLogger('CreateMenu')
+
 const TIMERS = {
   LONG_PRESS_DELAY: 500,
   CLOSE_DELAY: 150,

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/floating-navigation/floating-navigation.tsx

@@ -0,0 +1,67 @@
+import { HelpCircle, LibraryBig, ScrollText, Settings, Shapes } from 'lucide-react'
+import { NavigationItem } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/navigation-item/navigation-item'
+import { getKeyboardShortcutText } from '@/app/workspace/[workspaceId]/w/hooks/use-keyboard-shortcuts'
+
+interface FloatingNavigationProps {
+  workspaceId: string
+  pathname: string
+  onShowSettings: () => void
+  onShowHelp: () => void
+  bottom: number
+}
+
+export const FloatingNavigation = ({
+  workspaceId,
+  pathname,
+  onShowSettings,
+  onShowHelp,
+  bottom,
+}: FloatingNavigationProps) => {
+  // Navigation items with their respective actions
+  const navigationItems = [
+    {
+      id: 'settings',
+      icon: Settings,
+      onClick: onShowSettings,
+      tooltip: 'Settings',
+    },
+    {
+      id: 'help',
+      icon: HelpCircle,
+      onClick: onShowHelp,
+      tooltip: 'Help',
+    },
+    {
+      id: 'logs',
+      icon: ScrollText,
+      href: `/workspace/${workspaceId}/logs`,
+      tooltip: 'Logs',
+      shortcut: getKeyboardShortcutText('L', true, true),
+      active: pathname === `/workspace/${workspaceId}/logs`,
+    },
+    {
+      id: 'knowledge',
+      icon: LibraryBig,
+      href: `/workspace/${workspaceId}/knowledge`,
+      tooltip: 'Knowledge',
+      active: pathname === `/workspace/${workspaceId}/knowledge`,
+    },
+    {
+      id: 'templates',
+      icon: Shapes,
+      href: `/workspace/${workspaceId}/templates`,
+      tooltip: 'Templates',
+      active: pathname === `/workspace/${workspaceId}/templates`,
+    },
+  ]
+
+  return (
+    <div className='pointer-events-auto fixed left-4 z-50 w-56' style={{ bottom: `${bottom}px` }}>
+      <div className='flex items-center gap-1'>
+        {navigationItems.map((item) => (
+          <NavigationItem key={item.id} item={item} />
+        ))}
+      </div>
+    </div>
+  )
+}

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/index.ts

@@ -1,9 +1,12 @@
 export { CreateMenu } from './create-menu/create-menu'
+export { FloatingNavigation } from './floating-navigation/floating-navigation'
 export { FolderTree } from './folder-tree/folder-tree'
 export { HelpModal } from './help-modal/help-modal'
+export { KeyboardShortcut } from './keyboard-shortcut/keyboard-shortcut'
 export { KnowledgeBaseTags } from './knowledge-base-tags/knowledge-base-tags'
 export { KnowledgeTags } from './knowledge-tags/knowledge-tags'
 export { LogsFilters } from './logs-filters/logs-filters'
+export { NavigationItem } from './navigation-item/navigation-item'
 export { SettingsModal } from './settings-modal/settings-modal'
 export { SubscriptionModal } from './subscription-modal/subscription-modal'
 export { Toolbar } from './toolbar/toolbar'

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/keyboard-shortcut/keyboard-shortcut.tsx

@@ -0,0 +1,32 @@
+import { cn } from '@/lib/utils'
+
+interface KeyboardShortcutProps {
+  shortcut: string
+  className?: string
+}
+
+export const KeyboardShortcut = ({ shortcut, className }: KeyboardShortcutProps) => {
+  const parts = shortcut.split('+')
+
+  // Helper function to determine if a part is a symbol that should be larger
+  const isSymbol = (part: string) => {
+    return ['⌘', '⇧', '⌥', '⌃'].includes(part)
+  }
+
+  return (
+    <kbd
+      className={cn(
+        'flex h-6 w-8 items-center justify-center rounded-[5px] border border-border bg-background font-mono text-[#CDCDCD] text-xs dark:text-[#454545]',
+        className
+      )}
+    >
+      <span className='flex items-center justify-center gap-[1px] pt-[1px]'>
+        {parts.map((part, index) => (
+          <span key={index} className={cn(isSymbol(part) ? 'text-[17px]' : 'text-xs')}>
+            {part}
+          </span>
+        ))}
+      </span>
+    </kbd>
+  )
+}

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/navigation-item/navigation-item.tsx

@@ -0,0 +1,64 @@
+import { Button, Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui'
+import { cn } from '@/lib/utils'
+
+interface NavigationItemProps {
+  item: {
+    id: string
+    icon: React.ElementType
+    onClick?: () => void
+    href?: string
+    tooltip: string
+    shortcut?: string
+    active?: boolean
+    disabled?: boolean
+  }
+}
+
+export const NavigationItem = ({ item }: NavigationItemProps) => {
+  // Settings and help buttons get gray hover, others get purple hover
+  const isGrayHover = item.id === 'settings' || item.id === 'help'
+
+  const content = item.disabled ? (
+    <div className='inline-flex h-[42px] w-[42px] cursor-not-allowed items-center justify-center gap-2 whitespace-nowrap rounded-[11px] border bg-card font-medium text-card-foreground text-sm opacity-50 ring-offset-background transition-colors [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0'>
+      <item.icon className='h-4 w-4' />
+    </div>
+  ) : (
+    <Button
+      variant='outline'
+      onClick={item.onClick}
+      className={cn(
+        'h-[42px] w-[42px] rounded-[10px] border bg-background text-foreground shadow-xs transition-all duration-200',
+        isGrayHover && 'hover:bg-secondary',
+        !isGrayHover &&
+          'hover:border-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hex)] hover:text-white',
+        item.active && 'border-[var(--brand-primary-hex)] bg-[var(--brand-primary-hex)] text-white'
+      )}
+    >
+      <item.icon className='h-4 w-4' />
+    </Button>
+  )
+
+  if (item.href && !item.disabled) {
+    return (
+      <Tooltip>
+        <TooltipTrigger asChild>
+          <a href={item.href} className='inline-block'>
+            {content}
+          </a>
+        </TooltipTrigger>
+        <TooltipContent side='top' command={item.shortcut}>
+          {item.tooltip}
+        </TooltipContent>
+      </Tooltip>
+    )
+  }
+
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>{content}</TooltipTrigger>
+      <TooltipContent side='top' command={item.shortcut}>
+        {item.tooltip}
+      </TooltipContent>
+    </Tooltip>
+  )
+}

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/general/general.tsx

@@ -45,14 +45,15 @@ export function General() {
   const toggleConsoleExpandedByDefault = useGeneralStore(
     (state) => state.toggleConsoleExpandedByDefault
   )
-  const loadSettings = useGeneralStore((state) => state.loadSettings)
 
+  // Sync theme from store to next-themes when theme changes
   useEffect(() => {
-    const loadData = async () => {
-      await loadSettings()
+    if (!isLoading && theme) {
+      // Ensure next-themes is in sync with our store
+      const { syncThemeToNextThemes } = require('@/lib/theme-sync')
+      syncThemeToNextThemes(theme)
     }
-    loadData()
-  }, [loadSettings])
+  }, [theme, isLoading])
 
   const handleThemeChange = async (value: 'system' | 'light' | 'dark') => {
     await setTheme(value)

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-selector/workspace-selector.tsx

@@ -44,7 +44,7 @@ interface WorkspaceSelectorProps {
   onWorkspaceUpdate: () => Promise<void>
   onSwitchWorkspace: (workspace: Workspace) => Promise<void>
   onCreateWorkspace: () => Promise<void>
-  onDeleteWorkspace: (workspace: Workspace) => Promise<void>
+  onDeleteWorkspace: (workspace: Workspace, templateAction?: 'keep' | 'delete') => Promise<void>
   onLeaveWorkspace: (workspace: Workspace) => Promise<void>
   updateWorkspaceName: (workspaceId: string, newName: string) => Promise<boolean>
   isDeleting: boolean
@@ -76,6 +76,14 @@ export function WorkspaceSelector({
   const [isRenaming, setIsRenaming] = useState(false)
   const [deleteConfirmationName, setDeleteConfirmationName] = useState('')
   const [leaveConfirmationName, setLeaveConfirmationName] = useState('')
+  const [isCheckingTemplates, setIsCheckingTemplates] = useState(false)
+  const [showTemplateChoice, setShowTemplateChoice] = useState(false)
+  const [templatesInfo, setTemplatesInfo] = useState<{
+    count: number
+    templates: Array<{ id: string; name: string }>
+  } | null>(null)
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false)
+  const [workspaceToDelete, setWorkspaceToDelete] = useState<Workspace | null>(null)
 
   // Refs
   const scrollAreaRef = useRef<HTMLDivElement>(null)
@@ -206,15 +214,82 @@ export function WorkspaceSelector({
   )
 
   /**
-   * Confirm delete workspace
+   * Reset delete dialog state
    */
-  const confirmDeleteWorkspace = useCallback(
-    async (workspaceToDelete: Workspace) => {
-      await onDeleteWorkspace(workspaceToDelete)
+  const resetDeleteState = useCallback(() => {
+    setDeleteConfirmationName('')
+    setShowTemplateChoice(false)
+    setTemplatesInfo(null)
+    setIsCheckingTemplates(false)
+    setWorkspaceToDelete(null)
+  }, [])
+
+  /**
+   * Handle dialog close
+   */
+  const handleDialogClose = useCallback(
+    (open: boolean) => {
+      if (!open) {
+        resetDeleteState()
+      }
+      setIsDeleteDialogOpen(open)
     },
-    [onDeleteWorkspace]
+    [resetDeleteState]
   )
 
+  /**
+   * Handle template choice action
+   */
+  const handleTemplateAction = useCallback(
+    async (action: 'keep' | 'delete') => {
+      if (!workspaceToDelete) return
+
+      setShowTemplateChoice(false)
+      setTemplatesInfo(null)
+      setDeleteConfirmationName('')
+      await onDeleteWorkspace(workspaceToDelete, action)
+      setWorkspaceToDelete(null)
+      setIsDeleteDialogOpen(false)
+    },
+    [workspaceToDelete, onDeleteWorkspace]
+  )
+
+  /**
+   * Check for templates and handle deletion
+   */
+  const handleDeleteClick = useCallback(async () => {
+    if (!workspaceToDelete) return
+
+    setIsCheckingTemplates(true)
+    try {
+      const checkResponse = await fetch(
+        `/api/workspaces/${workspaceToDelete.id}?check-templates=true`
+      )
+      if (checkResponse.ok) {
+        const templateCheck = await checkResponse.json()
+        if (templateCheck.hasPublishedTemplates && templateCheck.count > 0) {
+          // Templates exist - show template choice
+          setTemplatesInfo({
+            count: templateCheck.count,
+            templates: templateCheck.publishedTemplates,
+          })
+          setShowTemplateChoice(true)
+          setIsCheckingTemplates(false)
+          return
+        }
+      }
+    } catch (error) {
+      logger.error('Error checking templates:', error)
+    }
+
+    // No templates or error - proceed with deletion
+    setIsCheckingTemplates(false)
+    setDeleteConfirmationName('')
+    await onDeleteWorkspace(workspaceToDelete)
+    setWorkspaceToDelete(null)
+    setIsDeleteDialogOpen(false)
+  }, [workspaceToDelete, onDeleteWorkspace])
+
   /**
    * Confirm leave workspace
    */
@@ -352,7 +427,7 @@ export function WorkspaceSelector({
                         <Input
                           value={leaveConfirmationName}
                           onChange={(e) => setLeaveConfirmationName(e.target.value)}
-                          placeholder='Placeholder'
+                          placeholder={workspace.name}
                           className='h-9'
                         />
                       </div>
@@ -381,66 +456,21 @@ export function WorkspaceSelector({
 
                 {/* Delete Workspace - for admin users */}
                 {workspace.permissions === 'admin' && (
-                  <AlertDialog>
-                    <AlertDialogTrigger asChild>
-                      <Button
-                        variant='ghost'
-                        size='icon'
-                        onClick={(e) => e.stopPropagation()}
-                        className={cn(
-                          'h-4 w-4 p-0 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground',
-                          !isEditing && isHovered ? 'opacity-100' : 'pointer-events-none opacity-0'
-                        )}
-                      >
-                        <Trash2 className='!h-3.5 !w-3.5' />
-                      </Button>
-                    </AlertDialogTrigger>
-
-                    <AlertDialogContent>
-                      <AlertDialogHeader>
-                        <AlertDialogTitle>Delete workspace?</AlertDialogTitle>
-                        <AlertDialogDescription>
-                          Deleting this workspace will permanently remove all associated workflows,
-                          logs, and knowledge bases.{' '}
-                          <span className='text-red-500 dark:text-red-500'>
-                            This action cannot be undone.
-                          </span>
-                        </AlertDialogDescription>
-                      </AlertDialogHeader>
-
-                      <div className='py-2'>
-                        <p className='mb-2 font-[360] text-sm'>
-                          Enter the workspace name{' '}
-                          <span className='font-semibold'>{workspace.name}</span> to confirm.
-                        </p>
-                        <Input
-                          value={deleteConfirmationName}
-                          onChange={(e) => setDeleteConfirmationName(e.target.value)}
-                          placeholder='Placeholder'
-                          className='h-9 rounded-[8px]'
-                        />
-                      </div>
-
-                      <AlertDialogFooter className='flex'>
-                        <AlertDialogCancel
-                          className='h-9 w-full rounded-[8px]'
-                          onClick={() => setDeleteConfirmationName('')}
-                        >
-                          Cancel
-                        </AlertDialogCancel>
-                        <AlertDialogAction
-                          onClick={() => {
-                            confirmDeleteWorkspace(workspace)
-                            setDeleteConfirmationName('')
-                          }}
-                          className='h-9 w-full rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
-                          disabled={isDeleting || deleteConfirmationName !== workspace.name}
-                        >
-                          {isDeleting ? 'Deleting...' : 'Delete'}
-                        </AlertDialogAction>
-                      </AlertDialogFooter>
-                    </AlertDialogContent>
-                  </AlertDialog>
+                  <Button
+                    variant='ghost'
+                    size='icon'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      setWorkspaceToDelete(workspace)
+                      setIsDeleteDialogOpen(true)
+                    }}
+                    className={cn(
+                      'h-4 w-4 p-0 text-muted-foreground transition-colors hover:bg-transparent hover:text-foreground',
+                      !isEditing && isHovered ? 'opacity-100' : 'pointer-events-none opacity-0'
+                    )}
+                  >
+                    <Trash2 className='!h-3.5 !w-3.5' />
+                  </Button>
                 )}
               </div>
             </div>
@@ -496,6 +526,106 @@ export function WorkspaceSelector({
         </div>
       </div>
 
+      {/* Centralized Delete Workspace Dialog */}
+      <AlertDialog open={isDeleteDialogOpen} onOpenChange={handleDialogClose}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              {showTemplateChoice
+                ? 'Delete workspace with published templates?'
+                : 'Delete workspace?'}
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              {showTemplateChoice ? (
+                <>
+                  This workspace contains {templatesInfo?.count} published template
+                  {templatesInfo?.count === 1 ? '' : 's'}:
+                  <br />
+                  <br />
+                  {templatesInfo?.templates.map((template) => (
+                    <span key={template.id} className='block'>
+                      • {template.name}
+                    </span>
+                  ))}
+                  <br />
+                  What would you like to do with the published templates?
+                </>
+              ) : (
+                <>
+                  Deleting this workspace will permanently remove all associated workflows, logs,
+                  and knowledge bases.{' '}
+                  <span className='text-red-500 dark:text-red-500'>
+                    This action cannot be undone.
+                  </span>
+                </>
+              )}
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+
+          {showTemplateChoice ? (
+            <div className='flex gap-2 py-2'>
+              <Button
+                onClick={() => handleTemplateAction('keep')}
+                className='h-9 flex-1 rounded-[8px]'
+                variant='outline'
+                disabled={isDeleting}
+              >
+                {isDeleting ? 'Deleting...' : 'Keep Templates'}
+              </Button>
+              <Button
+                onClick={() => handleTemplateAction('delete')}
+                className='h-9 flex-1 rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
+                disabled={isDeleting}
+              >
+                {isDeleting ? 'Deleting...' : 'Delete Templates'}
+              </Button>
+            </div>
+          ) : (
+            <div className='py-2'>
+              <p className='mb-2 font-[360] text-sm'>
+                Enter the workspace name{' '}
+                <span className='font-semibold'>{workspaceToDelete?.name}</span> to confirm.
+              </p>
+              <Input
+                value={deleteConfirmationName}
+                onChange={(e) => setDeleteConfirmationName(e.target.value)}
+                placeholder={workspaceToDelete?.name}
+                className='h-9 rounded-[8px]'
+              />
+            </div>
+          )}
+
+          {!showTemplateChoice && (
+            <AlertDialogFooter className='flex'>
+              <Button
+                variant='outline'
+                className='h-9 w-full rounded-[8px]'
+                onClick={() => {
+                  resetDeleteState()
+                  setIsDeleteDialogOpen(false)
+                }}
+              >
+                Cancel
+              </Button>
+              <Button
+                onClick={(e) => {
+                  e.preventDefault()
+                  handleDeleteClick()
+                }}
+                className='h-9 w-full rounded-[8px] bg-red-500 text-white transition-all duration-200 hover:bg-red-600 dark:bg-red-500 dark:hover:bg-red-600'
+                disabled={
+                  isDeleting ||
+                  deleteConfirmationName !== workspaceToDelete?.name ||
+                  isCheckingTemplates
+                }
+              >
+                {isDeleting ? 'Deleting...' : isCheckingTemplates ? 'Deleting...' : 'Delete'}
+              </Button>
+            </AlertDialogFooter>
+          )}
+        </AlertDialogContent>
+      </AlertDialog>
+
       {/* Invite Modal */}
       <InviteModal
         open={showInviteMembers}

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -1,20 +1,21 @@
 'use client'
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { HelpCircle, LibraryBig, ScrollText, Search, Settings, Shapes } from 'lucide-react'
+import { Search } from 'lucide-react'
 import { useParams, usePathname, useRouter } from 'next/navigation'
-import { Button, ScrollArea, Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui'
+import { ScrollArea } from '@/components/ui'
 import { useSession } from '@/lib/auth-client'
 import { getEnv, isTruthy } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateWorkspaceName } from '@/lib/naming'
-import { cn } from '@/lib/utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { SearchModal } from '@/app/workspace/[workspaceId]/w/components/search-modal/search-modal'
 import {
   CreateMenu,
+  FloatingNavigation,
   FolderTree,
   HelpModal,
+  KeyboardShortcut,
   KnowledgeBaseTags,
   KnowledgeTags,
   LogsFilters,
@@ -26,6 +27,7 @@ import {
   WorkspaceSelector,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/components'
 import { InviteModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-selector/components/invite-modal/invite-modal'
+import { useAutoScroll } from '@/app/workspace/[workspaceId]/w/hooks/use-auto-scroll'
 import {
   getKeyboardShortcutText,
   useGlobalShortcuts,
@@ -40,109 +42,6 @@ const SIDEBAR_GAP = 12 // 12px gap between components - easily editable
 
 const isBillingEnabled = isTruthy(getEnv('NEXT_PUBLIC_BILLING_ENABLED'))
 
-/**
- * Optimized auto-scroll hook for smooth drag operations
- * Extracted outside component for better performance
- */
-const useAutoScroll = (containerRef: React.RefObject<HTMLDivElement | null>) => {
-  const animationRef = useRef<number | null>(null)
-  const speedRef = useRef<number>(0)
-  const lastUpdateRef = useRef<number>(0)
-
-  const animateScroll = useCallback(() => {
-    const scrollContainer = containerRef.current?.querySelector(
-      '[data-radix-scroll-area-viewport]'
-    ) as HTMLElement
-    if (!scrollContainer || speedRef.current === 0) {
-      animationRef.current = null
-      return
-    }
-
-    const currentScrollTop = scrollContainer.scrollTop
-    const maxScrollTop = scrollContainer.scrollHeight - scrollContainer.clientHeight
-
-    // Check bounds and stop if needed
-    if (
-      (speedRef.current < 0 && currentScrollTop <= 0) ||
-      (speedRef.current > 0 && currentScrollTop >= maxScrollTop)
-    ) {
-      speedRef.current = 0
-      animationRef.current = null
-      return
-    }
-
-    // Apply smooth scroll
-    scrollContainer.scrollTop = Math.max(
-      0,
-      Math.min(maxScrollTop, currentScrollTop + speedRef.current)
-    )
-    animationRef.current = requestAnimationFrame(animateScroll)
-  }, [containerRef])
-
-  const startScroll = useCallback(
-    (speed: number) => {
-      speedRef.current = speed
-      if (!animationRef.current) {
-        animationRef.current = requestAnimationFrame(animateScroll)
-      }
-    },
-    [animateScroll]
-  )
-
-  const stopScroll = useCallback(() => {
-    if (animationRef.current) {
-      cancelAnimationFrame(animationRef.current)
-      animationRef.current = null
-    }
-    speedRef.current = 0
-  }, [])
-
-  const handleDragOver = useCallback(
-    (e: DragEvent) => {
-      const now = performance.now()
-      // Throttle to ~16ms for 60fps
-      if (now - lastUpdateRef.current < 16) return
-      lastUpdateRef.current = now
-
-      const scrollContainer = containerRef.current
-      if (!scrollContainer) return
-
-      const rect = scrollContainer.getBoundingClientRect()
-      const mouseY = e.clientY
-
-      // Early exit if mouse is outside container
-      if (mouseY < rect.top || mouseY > rect.bottom) {
-        stopScroll()
-        return
-      }
-
-      const scrollZone = 50
-      const maxSpeed = 4
-      const distanceFromTop = mouseY - rect.top
-      const distanceFromBottom = rect.bottom - mouseY
-
-      let scrollSpeed = 0
-
-      if (distanceFromTop < scrollZone) {
-        const intensity = (scrollZone - distanceFromTop) / scrollZone
-        scrollSpeed = -maxSpeed * intensity ** 2
-      } else if (distanceFromBottom < scrollZone) {
-        const intensity = (scrollZone - distanceFromBottom) / scrollZone
-        scrollSpeed = maxSpeed * intensity ** 2
-      }
-
-      if (Math.abs(scrollSpeed) > 0.1) {
-        startScroll(scrollSpeed)
-      } else {
-        stopScroll()
-      }
-    },
-    [containerRef, startScroll, stopScroll]
-  )
-
-  return { handleDragOver, stopScroll }
-}
-
 // Heights for dynamic calculation (in px)
 const SIDEBAR_HEIGHTS = {
   CONTAINER_PADDING: 32, // p-4 = 16px top + 16px bottom (bottom provides control bar spacing match)
@@ -204,6 +103,7 @@ export function Sidebar() {
   const [isCreatingWorkspace, setIsCreatingWorkspace] = useState(false)
   // Add sidebar collapsed state
   const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(false)
+
   const params = useParams()
   const workspaceId = params.workspaceId as string
   const workflowId = params.workflowId as string
@@ -509,16 +409,22 @@ export function Sidebar() {
   }, [refreshWorkspaceList, switchWorkspace, isCreatingWorkspace])
 
   /**
-   * Confirm delete workspace
+   * Confirm delete workspace (called from regular deletion dialog)
    */
   const confirmDeleteWorkspace = useCallback(
-    async (workspaceToDelete: Workspace) => {
+    async (workspaceToDelete: Workspace, templateAction?: 'keep' | 'delete') => {
       setIsDeleting(true)
       try {
         logger.info('Deleting workspace:', workspaceToDelete.id)
 
+        const deleteTemplates = templateAction === 'delete'
+
         const response = await fetch(`/api/workspaces/${workspaceToDelete.id}`, {
           method: 'DELETE',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({ deleteTemplates }),
         })
 
         if (!response.ok) {
@@ -720,21 +626,47 @@ export function Sidebar() {
           `[data-workflow-id="${workflowId}"]`
         ) as HTMLElement
         if (activeWorkflow) {
-          activeWorkflow.scrollIntoView({
-            block: 'start',
-          })
+          // Check if this is a newly created workflow (created within the last 5 seconds)
+          const currentWorkflow = workflows[workflowId]
+          const isNewlyCreated =
+            currentWorkflow &&
+            currentWorkflow.lastModified instanceof Date &&
+            Date.now() - currentWorkflow.lastModified.getTime() < 5000 // 5 seconds
 
-          // Adjust scroll position to eliminate the small gap at the top
-          const scrollViewport = scrollContainer.querySelector(
-            '[data-radix-scroll-area-viewport]'
-          ) as HTMLElement
-          if (scrollViewport && scrollViewport.scrollTop > 0) {
-            scrollViewport.scrollTop = Math.max(0, scrollViewport.scrollTop - 8)
+          if (isNewlyCreated) {
+            // For newly created workflows, use the original behavior - scroll to top
+            activeWorkflow.scrollIntoView({
+              block: 'start',
+            })
+
+            // Adjust scroll position to eliminate the small gap at the top
+            const scrollViewport = scrollContainer.querySelector(
+              '[data-radix-scroll-area-viewport]'
+            ) as HTMLElement
+            if (scrollViewport && scrollViewport.scrollTop > 0) {
+              scrollViewport.scrollTop = Math.max(0, scrollViewport.scrollTop - 8)
+            }
+          } else {
+            // For existing workflows, check if already visible and scroll minimally
+            const containerRect = scrollContainer.getBoundingClientRect()
+            const workflowRect = activeWorkflow.getBoundingClientRect()
+
+            // Only scroll if the workflow is not fully visible
+            const isFullyVisible =
+              workflowRect.top >= containerRect.top && workflowRect.bottom <= containerRect.bottom
+
+            if (!isFullyVisible) {
+              // Use 'nearest' to scroll minimally - only bring into view, don't force to top
+              activeWorkflow.scrollIntoView({
+                block: 'nearest',
+                behavior: 'smooth',
+              })
+            }
           }
         }
       }
     }
-  }, [workflowId, isLoading])
+  }, [workflowId, isLoading, workflows])
 
   const [showSettings, setShowSettings] = useState(false)
   const [showHelp, setShowHelp] = useState(false)
@@ -935,44 +867,6 @@ export function Sidebar() {
     }
   }, [stopScroll])
 
-  // Navigation items with their respective actions
-  const navigationItems = [
-    {
-      id: 'settings',
-      icon: Settings,
-      onClick: () => setShowSettings(true),
-      tooltip: 'Settings',
-    },
-    {
-      id: 'help',
-      icon: HelpCircle,
-      onClick: () => setShowHelp(true),
-      tooltip: 'Help',
-    },
-    {
-      id: 'logs',
-      icon: ScrollText,
-      href: `/workspace/${workspaceId}/logs`,
-      tooltip: 'Logs',
-      shortcut: getKeyboardShortcutText('L', true, true),
-      active: pathname === `/workspace/${workspaceId}/logs`,
-    },
-    {
-      id: 'knowledge',
-      icon: LibraryBig,
-      href: `/workspace/${workspaceId}/knowledge`,
-      tooltip: 'Knowledge',
-      active: pathname === `/workspace/${workspaceId}/knowledge`,
-    },
-    {
-      id: 'templates',
-      icon: Shapes,
-      href: `/workspace/${workspaceId}/templates`,
-      tooltip: 'Templates',
-      active: pathname === `/workspace/${workspaceId}/templates`,
-    },
-  ]
-
   return (
     <>
       {/* Main Sidebar - Overlay */}
@@ -1129,16 +1023,13 @@ export function Sidebar() {
       )}
 
       {/* Floating Navigation - Always visible */}
-      <div
-        className='pointer-events-auto fixed left-4 z-50 w-56'
-        style={{ bottom: `${navigationBottom}px` }}
-      >
-        <div className='flex items-center gap-1'>
-          {navigationItems.map((item) => (
-            <NavigationItem key={item.id} item={item} />
-          ))}
-        </div>
-      </div>
+      <FloatingNavigation
+        workspaceId={workspaceId}
+        pathname={pathname}
+        onShowSettings={() => setShowSettings(true)}
+        onShowHelp={() => setShowHelp(true)}
+        bottom={navigationBottom}
+      />
 
       {/* Modals */}
       <SettingsModal open={showSettings} onOpenChange={setShowSettings} />
@@ -1157,98 +1048,3 @@ export function Sidebar() {
     </>
   )
 }
-
-// Keyboard Shortcut Component
-interface KeyboardShortcutProps {
-  shortcut: string
-  className?: string
-}
-
-const KeyboardShortcut = ({ shortcut, className }: KeyboardShortcutProps) => {
-  const parts = shortcut.split('+')
-
-  // Helper function to determine if a part is a symbol that should be larger
-  const isSymbol = (part: string) => {
-    return ['⌘', '⇧', '⌥', '⌃'].includes(part)
-  }
-
-  return (
-    <kbd
-      className={cn(
-        'flex h-6 w-8 items-center justify-center rounded-[5px] border border-border bg-background font-mono text-[#CDCDCD] text-xs dark:text-[#454545]',
-        className
-      )}
-    >
-      <span className='flex items-center justify-center gap-[1px] pt-[1px]'>
-        {parts.map((part, index) => (
-          <span key={index} className={cn(isSymbol(part) ? 'text-[17px]' : 'text-xs')}>
-            {part}
-          </span>
-        ))}
-      </span>
-    </kbd>
-  )
-}
-
-// Navigation Item Component
-interface NavigationItemProps {
-  item: {
-    id: string
-    icon: React.ElementType
-    onClick?: () => void
-    href?: string
-    tooltip: string
-    shortcut?: string
-    active?: boolean
-    disabled?: boolean
-  }
-}
-
-const NavigationItem = ({ item }: NavigationItemProps) => {
-  // Settings and help buttons get gray hover, others get purple hover
-  const isGrayHover = item.id === 'settings' || item.id === 'help'
-
-  const content = item.disabled ? (
-    <div className='inline-flex h-[42px] w-[42px] cursor-not-allowed items-center justify-center gap-2 whitespace-nowrap rounded-[11px] border bg-card font-medium text-card-foreground text-sm opacity-50 ring-offset-background transition-colors [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0'>
-      <item.icon className='h-4 w-4' />
-    </div>
-  ) : (
-    <Button
-      variant='outline'
-      onClick={item.onClick}
-      className={cn(
-        'h-[42px] w-[42px] rounded-[10px] border bg-background text-foreground shadow-xs transition-all duration-200',
-        isGrayHover && 'hover:bg-secondary',
-        !isGrayHover &&
-          'hover:border-[var(--brand-primary-hex)] hover:bg-[var(--brand-primary-hex)] hover:text-white',
-        item.active && 'border-[var(--brand-primary-hex)] bg-[var(--brand-primary-hex)] text-white'
-      )}
-    >
-      <item.icon className='h-4 w-4' />
-    </Button>
-  )
-
-  if (item.href && !item.disabled) {
-    return (
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <a href={item.href} className='inline-block'>
-            {content}
-          </a>
-        </TooltipTrigger>
-        <TooltipContent side='top' command={item.shortcut}>
-          {item.tooltip}
-        </TooltipContent>
-      </Tooltip>
-    )
-  }
-
-  return (
-    <Tooltip>
-      <TooltipTrigger asChild>{content}</TooltipTrigger>
-      <TooltipContent side='top' command={item.shortcut}>
-        {item.tooltip}
-      </TooltipContent>
-    </Tooltip>
-  )
-}

apps/sim/app/workspace/[workspaceId]/w/hooks/use-auto-scroll.ts

@@ -0,0 +1,103 @@
+import { useCallback, useRef } from 'react'
+
+/**
+ * Optimized auto-scroll hook for smooth drag operations
+ */
+export const useAutoScroll = (containerRef: React.RefObject<HTMLDivElement | null>) => {
+  const animationRef = useRef<number | null>(null)
+  const speedRef = useRef<number>(0)
+  const lastUpdateRef = useRef<number>(0)
+
+  const animateScroll = useCallback(() => {
+    const scrollContainer = containerRef.current?.querySelector(
+      '[data-radix-scroll-area-viewport]'
+    ) as HTMLElement
+    if (!scrollContainer || speedRef.current === 0) {
+      animationRef.current = null
+      return
+    }
+
+    const currentScrollTop = scrollContainer.scrollTop
+    const maxScrollTop = scrollContainer.scrollHeight - scrollContainer.clientHeight
+
+    // Check bounds and stop if needed
+    if (
+      (speedRef.current < 0 && currentScrollTop <= 0) ||
+      (speedRef.current > 0 && currentScrollTop >= maxScrollTop)
+    ) {
+      speedRef.current = 0
+      animationRef.current = null
+      return
+    }
+
+    // Apply smooth scroll
+    scrollContainer.scrollTop = Math.max(
+      0,
+      Math.min(maxScrollTop, currentScrollTop + speedRef.current)
+    )
+    animationRef.current = requestAnimationFrame(animateScroll)
+  }, [containerRef])
+
+  const startScroll = useCallback(
+    (speed: number) => {
+      speedRef.current = speed
+      if (!animationRef.current) {
+        animationRef.current = requestAnimationFrame(animateScroll)
+      }
+    },
+    [animateScroll]
+  )
+
+  const stopScroll = useCallback(() => {
+    if (animationRef.current) {
+      cancelAnimationFrame(animationRef.current)
+      animationRef.current = null
+    }
+    speedRef.current = 0
+  }, [])
+
+  const handleDragOver = useCallback(
+    (e: DragEvent) => {
+      const now = performance.now()
+      // Throttle to ~16ms for 60fps
+      if (now - lastUpdateRef.current < 16) return
+      lastUpdateRef.current = now
+
+      const scrollContainer = containerRef.current
+      if (!scrollContainer) return
+
+      const rect = scrollContainer.getBoundingClientRect()
+      const mouseY = e.clientY
+
+      // Early exit if mouse is outside container
+      if (mouseY < rect.top || mouseY > rect.bottom) {
+        stopScroll()
+        return
+      }
+
+      const scrollZone = 50
+      const maxSpeed = 4
+      const distanceFromTop = mouseY - rect.top
+      const distanceFromBottom = rect.bottom - mouseY
+
+      let scrollSpeed = 0
+
+      if (distanceFromTop < scrollZone) {
+        const intensity = (scrollZone - distanceFromTop) / scrollZone
+        scrollSpeed = -maxSpeed * intensity ** 2
+      } else if (distanceFromBottom < scrollZone) {
+        const intensity = (scrollZone - distanceFromBottom) / scrollZone
+        scrollSpeed = maxSpeed * intensity ** 2
+      }
+
+      if (Math.abs(scrollSpeed) > 0.1) {
+        startScroll(scrollSpeed)
+      } else {
+        stopScroll()
+      }
+    },
+    [containerRef, startScroll, stopScroll]
+  )
+
+  return { handleDragOver, stopScroll }
+}

apps/sim/app/workspace/layout.tsx

@@ -13,7 +13,7 @@ export default function WorkspaceRootLayout({ children }: WorkspaceRootLayoutPro
   const user = session.data?.user
     ? {
         id: session.data.user.id,
-        name: session.data.user.name,
+        name: session.data.user.name ?? undefined,
         email: session.data.user.email,
       }
     : undefined

apps/sim/background/webhook-execution.ts

@@ -1,4 +1,4 @@
-import { task } from '@trigger.dev/sdk/v3'
+import { task } from '@trigger.dev/sdk'
 import { eq, sql } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
 import { checkServerSideUsageLimits } from '@/lib/billing'
@@ -17,362 +17,363 @@ import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
 const logger = createLogger('TriggerWebhookExecution')
 
+export type WebhookExecutionPayload = {
+  webhookId: string
+  workflowId: string
+  userId: string
+  provider: string
+  body: any
+  headers: Record<string, string>
+  path: string
+  blockId?: string
+}
+
+export async function executeWebhookJob(payload: WebhookExecutionPayload) {
+  const executionId = uuidv4()
+  const requestId = executionId.slice(0, 8)
+
+  logger.info(`[${requestId}] Starting webhook execution`, {
+    webhookId: payload.webhookId,
+    workflowId: payload.workflowId,
+    provider: payload.provider,
+    userId: payload.userId,
+    executionId,
+  })
+
+  // Initialize logging session outside try block so it's available in catch
+  const loggingSession = new LoggingSession(payload.workflowId, executionId, 'webhook', requestId)
+
+  try {
+    // Check usage limits first
+    const usageCheck = await checkServerSideUsageLimits(payload.userId)
+    if (usageCheck.isExceeded) {
+      logger.warn(
+        `[${requestId}] User ${payload.userId} has exceeded usage limits. Skipping webhook execution.`,
+        {
+          currentUsage: usageCheck.currentUsage,
+          limit: usageCheck.limit,
+          workflowId: payload.workflowId,
+        }
+      )
+      throw new Error(
+        usageCheck.message ||
+          'Usage limit exceeded. Please upgrade your plan to continue using webhooks.'
+      )
+    }
+
+    // Load workflow from normalized tables
+    const workflowData = await loadWorkflowFromNormalizedTables(payload.workflowId)
+    if (!workflowData) {
+      throw new Error(`Workflow not found: ${payload.workflowId}`)
+    }
+
+    const { blocks, edges, loops, parallels } = workflowData
+
+    // Get environment variables (matching workflow-execution pattern)
+    const [userEnv] = await db
+      .select()
+      .from(environmentTable)
+      .where(eq(environmentTable.userId, payload.userId))
+      .limit(1)
+
+    let decryptedEnvVars: Record<string, string> = {}
+    if (userEnv) {
+      const decryptionPromises = Object.entries((userEnv.variables as any) || {}).map(
+        async ([key, encryptedValue]) => {
+          try {
+            const { decrypted } = await decryptSecret(encryptedValue as string)
+            return [key, decrypted] as const
+          } catch (error: any) {
+            logger.error(`[${requestId}] Failed to decrypt environment variable "${key}":`, error)
+            throw new Error(`Failed to decrypt environment variable "${key}": ${error.message}`)
+          }
+        }
+      )
+
+      const decryptedPairs = await Promise.all(decryptionPromises)
+      decryptedEnvVars = Object.fromEntries(decryptedPairs)
+    }
+
+    // Start logging session
+    await loggingSession.safeStart({
+      userId: payload.userId,
+      workspaceId: '', // TODO: Get from workflow if needed
+      variables: decryptedEnvVars,
+    })
+
+    // Merge subblock states (matching workflow-execution pattern)
+    const mergedStates = mergeSubblockState(blocks, {})
+
+    // Process block states for execution
+    const processedBlockStates = Object.entries(mergedStates).reduce(
+      (acc, [blockId, blockState]) => {
+        acc[blockId] = Object.entries(blockState.subBlocks).reduce(
+          (subAcc, [key, subBlock]) => {
+            subAcc[key] = subBlock.value
+            return subAcc
+          },
+          {} as Record<string, any>
+        )
+        return acc
+      },
+      {} as Record<string, Record<string, any>>
+    )
+
+    // Handle workflow variables (for now, use empty object since we don't have workflow metadata)
+    const workflowVariables = {}
+
+    // Create serialized workflow
+    const serializer = new Serializer()
+    const serializedWorkflow = serializer.serializeWorkflow(
+      mergedStates,
+      edges,
+      loops || {},
+      parallels || {},
+      true // Enable validation during execution
+    )
+
+    // Handle special Airtable case
+    if (payload.provider === 'airtable') {
+      logger.info(`[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`)
+
+      // Load the actual webhook record from database to get providerConfig
+      const [webhookRecord] = await db
+        .select()
+        .from(webhook)
+        .where(eq(webhook.id, payload.webhookId))
+        .limit(1)
+
+      if (!webhookRecord) {
+        throw new Error(`Webhook record not found: ${payload.webhookId}`)
+      }
+
+      const webhookData = {
+        id: payload.webhookId,
+        provider: payload.provider,
+        providerConfig: webhookRecord.providerConfig,
+      }
+
+      // Create a mock workflow object for Airtable processing
+      const mockWorkflow = {
+        id: payload.workflowId,
+        userId: payload.userId,
+      }
+
+      // Get the processed Airtable input
+      const airtableInput = await fetchAndProcessAirtablePayloads(
+        webhookData,
+        mockWorkflow,
+        requestId
+      )
+
+      // If we got input (changes), execute the workflow like other providers
+      if (airtableInput) {
+        logger.info(`[${requestId}] Executing workflow with Airtable changes`)
+
+        // Create executor and execute (same as standard webhook flow)
+        const executor = new Executor({
+          workflow: serializedWorkflow,
+          currentBlockStates: processedBlockStates,
+          envVarValues: decryptedEnvVars,
+          workflowInput: airtableInput,
+          workflowVariables,
+          contextExtensions: {
+            executionId,
+            workspaceId: '',
+          },
+        })
+
+        // Set up logging on the executor
+        loggingSession.setupExecutor(executor)
+
+        // Execute the workflow
+        const result = await executor.execute(payload.workflowId, payload.blockId)
+
+        // Check if we got a StreamingExecution result
+        const executionResult =
+          'stream' in result && 'execution' in result ? result.execution : result
+
+        logger.info(`[${requestId}] Airtable webhook execution completed`, {
+          success: executionResult.success,
+          workflowId: payload.workflowId,
+        })
+
+        // Update workflow run counts on success
+        if (executionResult.success) {
+          await updateWorkflowRunCounts(payload.workflowId)
+
+          // Track execution in user stats
+          await db
+            .update(userStats)
+            .set({
+              totalWebhookTriggers: sql`total_webhook_triggers + 1`,
+              lastActive: sql`now()`,
+            })
+            .where(eq(userStats.userId, payload.userId))
+        }
+
+        // Build trace spans and complete logging session
+        const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
+
+        await loggingSession.safeComplete({
+          endedAt: new Date().toISOString(),
+          totalDurationMs: totalDuration || 0,
+          finalOutput: executionResult.output || {},
+          traceSpans: traceSpans as any,
+        })
+
+        return {
+          success: executionResult.success,
+          workflowId: payload.workflowId,
+          executionId,
+          output: executionResult.output,
+          executedAt: new Date().toISOString(),
+          provider: payload.provider,
+        }
+      }
+      // No changes to process
+      logger.info(`[${requestId}] No Airtable changes to process`)
+
+      await loggingSession.safeComplete({
+        endedAt: new Date().toISOString(),
+        totalDurationMs: 0,
+        finalOutput: { message: 'No Airtable changes to process' },
+        traceSpans: [],
+      })
+
+      return {
+        success: true,
+        workflowId: payload.workflowId,
+        executionId,
+        output: { message: 'No Airtable changes to process' },
+        executedAt: new Date().toISOString(),
+      }
+    }
+
+    // Format input for standard webhooks
+    const mockWebhook = {
+      provider: payload.provider,
+      blockId: payload.blockId,
+    }
+    const mockWorkflow = {
+      id: payload.workflowId,
+      userId: payload.userId,
+    }
+    const mockRequest = {
+      headers: new Map(Object.entries(payload.headers)),
+    } as any
+
+    const input = formatWebhookInput(mockWebhook, mockWorkflow, payload.body, mockRequest)
+
+    if (!input && payload.provider === 'whatsapp') {
+      logger.info(`[${requestId}] No messages in WhatsApp payload, skipping execution`)
+      await loggingSession.safeComplete({
+        endedAt: new Date().toISOString(),
+        totalDurationMs: 0,
+        finalOutput: { message: 'No messages in WhatsApp payload' },
+        traceSpans: [],
+      })
+      return {
+        success: true,
+        workflowId: payload.workflowId,
+        executionId,
+        output: { message: 'No messages in WhatsApp payload' },
+        executedAt: new Date().toISOString(),
+      }
+    }
+
+    // Create executor and execute
+    const executor = new Executor({
+      workflow: serializedWorkflow,
+      currentBlockStates: processedBlockStates,
+      envVarValues: decryptedEnvVars,
+      workflowInput: input || {},
+      workflowVariables,
+      contextExtensions: {
+        executionId,
+        workspaceId: '', // TODO: Get from workflow if needed - see comment on line 103
+      },
+    })
+
+    // Set up logging on the executor
+    loggingSession.setupExecutor(executor)
+
+    logger.info(`[${requestId}] Executing workflow for ${payload.provider} webhook`)
+
+    // Execute the workflow
+    const result = await executor.execute(payload.workflowId, payload.blockId)
+
+    // Check if we got a StreamingExecution result
+    const executionResult = 'stream' in result && 'execution' in result ? result.execution : result
+
+    logger.info(`[${requestId}] Webhook execution completed`, {
+      success: executionResult.success,
+      workflowId: payload.workflowId,
+      provider: payload.provider,
+    })
+
+    // Update workflow run counts on success
+    if (executionResult.success) {
+      await updateWorkflowRunCounts(payload.workflowId)
+
+      // Track execution in user stats
+      await db
+        .update(userStats)
+        .set({
+          totalWebhookTriggers: sql`total_webhook_triggers + 1`,
+          lastActive: sql`now()`,
+        })
+        .where(eq(userStats.userId, payload.userId))
+    }
+
+    // Build trace spans and complete logging session
+    const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
+
+    await loggingSession.safeComplete({
+      endedAt: new Date().toISOString(),
+      totalDurationMs: totalDuration || 0,
+      finalOutput: executionResult.output || {},
+      traceSpans: traceSpans as any,
+    })
+
+    return {
+      success: executionResult.success,
+      workflowId: payload.workflowId,
+      executionId,
+      output: executionResult.output,
+      executedAt: new Date().toISOString(),
+      provider: payload.provider,
+    }
+  } catch (error: any) {
+    logger.error(`[${requestId}] Webhook execution failed`, {
+      error: error.message,
+      stack: error.stack,
+      workflowId: payload.workflowId,
+      provider: payload.provider,
+    })
+
+    // Complete logging session with error (matching workflow-execution pattern)
+    try {
+      await loggingSession.safeCompleteWithError({
+        endedAt: new Date().toISOString(),
+        totalDurationMs: 0,
+        error: {
+          message: error.message || 'Webhook execution failed',
+          stackTrace: error.stack,
+        },
+      })
+    } catch (loggingError) {
+      logger.error(`[${requestId}] Failed to complete logging session`, loggingError)
+    }
+
+    throw error
+  }
+}
+
 export const webhookExecution = task({
   id: 'webhook-execution',
   retry: {
     maxAttempts: 1,
   },
-  run: async (payload: {
-    webhookId: string
-    workflowId: string
-    userId: string
-    provider: string
-    body: any
-    headers: Record<string, string>
-    path: string
-    blockId?: string
-  }) => {
-    const executionId = uuidv4()
-    const requestId = executionId.slice(0, 8)
-
-    logger.info(`[${requestId}] Starting webhook execution via trigger.dev`, {
-      webhookId: payload.webhookId,
-      workflowId: payload.workflowId,
-      provider: payload.provider,
-      userId: payload.userId,
-      executionId,
-    })
-
-    // Initialize logging session outside try block so it's available in catch
-    const loggingSession = new LoggingSession(payload.workflowId, executionId, 'webhook', requestId)
-
-    try {
-      // Check usage limits first
-      const usageCheck = await checkServerSideUsageLimits(payload.userId)
-      if (usageCheck.isExceeded) {
-        logger.warn(
-          `[${requestId}] User ${payload.userId} has exceeded usage limits. Skipping webhook execution.`,
-          {
-            currentUsage: usageCheck.currentUsage,
-            limit: usageCheck.limit,
-            workflowId: payload.workflowId,
-          }
-        )
-        throw new Error(
-          usageCheck.message ||
-            'Usage limit exceeded. Please upgrade your plan to continue using webhooks.'
-        )
-      }
-
-      // Load workflow from normalized tables
-      const workflowData = await loadWorkflowFromNormalizedTables(payload.workflowId)
-      if (!workflowData) {
-        throw new Error(`Workflow not found: ${payload.workflowId}`)
-      }
-
-      const { blocks, edges, loops, parallels } = workflowData
-
-      // Get environment variables (matching workflow-execution pattern)
-      const [userEnv] = await db
-        .select()
-        .from(environmentTable)
-        .where(eq(environmentTable.userId, payload.userId))
-        .limit(1)
-
-      let decryptedEnvVars: Record<string, string> = {}
-      if (userEnv) {
-        const decryptionPromises = Object.entries((userEnv.variables as any) || {}).map(
-          async ([key, encryptedValue]) => {
-            try {
-              const { decrypted } = await decryptSecret(encryptedValue as string)
-              return [key, decrypted] as const
-            } catch (error: any) {
-              logger.error(`[${requestId}] Failed to decrypt environment variable "${key}":`, error)
-              throw new Error(`Failed to decrypt environment variable "${key}": ${error.message}`)
-            }
-          }
-        )
-
-        const decryptedPairs = await Promise.all(decryptionPromises)
-        decryptedEnvVars = Object.fromEntries(decryptedPairs)
-      }
-
-      // Start logging session
-      await loggingSession.safeStart({
-        userId: payload.userId,
-        workspaceId: '', // TODO: Get from workflow if needed
-        variables: decryptedEnvVars,
-      })
-
-      // Merge subblock states (matching workflow-execution pattern)
-      const mergedStates = mergeSubblockState(blocks, {})
-
-      // Process block states for execution
-      const processedBlockStates = Object.entries(mergedStates).reduce(
-        (acc, [blockId, blockState]) => {
-          acc[blockId] = Object.entries(blockState.subBlocks).reduce(
-            (subAcc, [key, subBlock]) => {
-              subAcc[key] = subBlock.value
-              return subAcc
-            },
-            {} as Record<string, any>
-          )
-          return acc
-        },
-        {} as Record<string, Record<string, any>>
-      )
-
-      // Handle workflow variables (for now, use empty object since we don't have workflow metadata)
-      const workflowVariables = {}
-
-      // Create serialized workflow
-      const serializer = new Serializer()
-      const serializedWorkflow = serializer.serializeWorkflow(
-        mergedStates,
-        edges,
-        loops || {},
-        parallels || {},
-        true // Enable validation during execution
-      )
-
-      // Handle special Airtable case
-      if (payload.provider === 'airtable') {
-        logger.info(
-          `[${requestId}] Processing Airtable webhook via fetchAndProcessAirtablePayloads`
-        )
-
-        // Load the actual webhook record from database to get providerConfig
-        const [webhookRecord] = await db
-          .select()
-          .from(webhook)
-          .where(eq(webhook.id, payload.webhookId))
-          .limit(1)
-
-        if (!webhookRecord) {
-          throw new Error(`Webhook record not found: ${payload.webhookId}`)
-        }
-
-        const webhookData = {
-          id: payload.webhookId,
-          provider: payload.provider,
-          providerConfig: webhookRecord.providerConfig,
-        }
-
-        // Create a mock workflow object for Airtable processing
-        const mockWorkflow = {
-          id: payload.workflowId,
-          userId: payload.userId,
-        }
-
-        // Get the processed Airtable input
-        const airtableInput = await fetchAndProcessAirtablePayloads(
-          webhookData,
-          mockWorkflow,
-          requestId
-        )
-
-        // If we got input (changes), execute the workflow like other providers
-        if (airtableInput) {
-          logger.info(`[${requestId}] Executing workflow with Airtable changes`)
-
-          // Create executor and execute (same as standard webhook flow)
-          const executor = new Executor({
-            workflow: serializedWorkflow,
-            currentBlockStates: processedBlockStates,
-            envVarValues: decryptedEnvVars,
-            workflowInput: airtableInput,
-            workflowVariables,
-            contextExtensions: {
-              executionId,
-              workspaceId: '',
-            },
-          })
-
-          // Set up logging on the executor
-          loggingSession.setupExecutor(executor)
-
-          // Execute the workflow
-          const result = await executor.execute(payload.workflowId, payload.blockId)
-
-          // Check if we got a StreamingExecution result
-          const executionResult =
-            'stream' in result && 'execution' in result ? result.execution : result
-
-          logger.info(`[${requestId}] Airtable webhook execution completed`, {
-            success: executionResult.success,
-            workflowId: payload.workflowId,
-          })
-
-          // Update workflow run counts on success
-          if (executionResult.success) {
-            await updateWorkflowRunCounts(payload.workflowId)
-
-            // Track execution in user stats
-            await db
-              .update(userStats)
-              .set({
-                totalWebhookTriggers: sql`total_webhook_triggers + 1`,
-                lastActive: sql`now()`,
-              })
-              .where(eq(userStats.userId, payload.userId))
-          }
-
-          // Build trace spans and complete logging session
-          const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
-
-          await loggingSession.safeComplete({
-            endedAt: new Date().toISOString(),
-            totalDurationMs: totalDuration || 0,
-            finalOutput: executionResult.output || {},
-            traceSpans: traceSpans as any,
-          })
-
-          return {
-            success: executionResult.success,
-            workflowId: payload.workflowId,
-            executionId,
-            output: executionResult.output,
-            executedAt: new Date().toISOString(),
-            provider: payload.provider,
-          }
-        }
-        // No changes to process
-        logger.info(`[${requestId}] No Airtable changes to process`)
-
-        await loggingSession.safeComplete({
-          endedAt: new Date().toISOString(),
-          totalDurationMs: 0,
-          finalOutput: { message: 'No Airtable changes to process' },
-          traceSpans: [],
-        })
-
-        return {
-          success: true,
-          workflowId: payload.workflowId,
-          executionId,
-          output: { message: 'No Airtable changes to process' },
-          executedAt: new Date().toISOString(),
-        }
-      }
-
-      // Format input for standard webhooks
-      const mockWebhook = {
-        provider: payload.provider,
-        blockId: payload.blockId,
-      }
-      const mockWorkflow = {
-        id: payload.workflowId,
-        userId: payload.userId,
-      }
-      const mockRequest = {
-        headers: new Map(Object.entries(payload.headers)),
-      } as any
-
-      const input = formatWebhookInput(mockWebhook, mockWorkflow, payload.body, mockRequest)
-
-      if (!input && payload.provider === 'whatsapp') {
-        logger.info(`[${requestId}] No messages in WhatsApp payload, skipping execution`)
-        await loggingSession.safeComplete({
-          endedAt: new Date().toISOString(),
-          totalDurationMs: 0,
-          finalOutput: { message: 'No messages in WhatsApp payload' },
-          traceSpans: [],
-        })
-        return {
-          success: true,
-          workflowId: payload.workflowId,
-          executionId,
-          output: { message: 'No messages in WhatsApp payload' },
-          executedAt: new Date().toISOString(),
-        }
-      }
-
-      // Create executor and execute
-      const executor = new Executor({
-        workflow: serializedWorkflow,
-        currentBlockStates: processedBlockStates,
-        envVarValues: decryptedEnvVars,
-        workflowInput: input || {},
-        workflowVariables,
-        contextExtensions: {
-          executionId,
-          workspaceId: '', // TODO: Get from workflow if needed - see comment on line 103
-        },
-      })
-
-      // Set up logging on the executor
-      loggingSession.setupExecutor(executor)
-
-      logger.info(`[${requestId}] Executing workflow for ${payload.provider} webhook`)
-
-      // Execute the workflow
-      const result = await executor.execute(payload.workflowId, payload.blockId)
-
-      // Check if we got a StreamingExecution result
-      const executionResult =
-        'stream' in result && 'execution' in result ? result.execution : result
-
-      logger.info(`[${requestId}] Webhook execution completed`, {
-        success: executionResult.success,
-        workflowId: payload.workflowId,
-        provider: payload.provider,
-      })
-
-      // Update workflow run counts on success
-      if (executionResult.success) {
-        await updateWorkflowRunCounts(payload.workflowId)
-
-        // Track execution in user stats
-        await db
-          .update(userStats)
-          .set({
-            totalWebhookTriggers: sql`total_webhook_triggers + 1`,
-            lastActive: sql`now()`,
-          })
-          .where(eq(userStats.userId, payload.userId))
-      }
-
-      // Build trace spans and complete logging session
-      const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
-
-      await loggingSession.safeComplete({
-        endedAt: new Date().toISOString(),
-        totalDurationMs: totalDuration || 0,
-        finalOutput: executionResult.output || {},
-        traceSpans: traceSpans as any,
-      })
-
-      return {
-        success: executionResult.success,
-        workflowId: payload.workflowId,
-        executionId,
-        output: executionResult.output,
-        executedAt: new Date().toISOString(),
-        provider: payload.provider,
-      }
-    } catch (error: any) {
-      logger.error(`[${requestId}] Webhook execution failed`, {
-        error: error.message,
-        stack: error.stack,
-        workflowId: payload.workflowId,
-        provider: payload.provider,
-      })
-
-      // Complete logging session with error (matching workflow-execution pattern)
-      try {
-        await loggingSession.safeCompleteWithError({
-          endedAt: new Date().toISOString(),
-          totalDurationMs: 0,
-          error: {
-            message: error.message || 'Webhook execution failed',
-            stackTrace: error.stack,
-          },
-        })
-      } catch (loggingError) {
-        logger.error(`[${requestId}] Failed to complete logging session`, loggingError)
-      }
-
-      throw error // Let Trigger.dev handle retries
-    }
-  },
+  run: async (payload: WebhookExecutionPayload) => executeWebhookJob(payload),
 })

apps/sim/background/workflow-execution.ts

@@ -1,4 +1,4 @@
-import { task } from '@trigger.dev/sdk/v3'
+import { task } from '@trigger.dev/sdk'
 import { eq, sql } from 'drizzle-orm'
 import { v4 as uuidv4 } from 'uuid'
 import { checkServerSideUsageLimits } from '@/lib/billing'
@@ -16,200 +16,202 @@ import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
 const logger = createLogger('TriggerWorkflowExecution')
 
+export type WorkflowExecutionPayload = {
+  workflowId: string
+  userId: string
+  input?: any
+  triggerType?: 'api' | 'webhook' | 'schedule' | 'manual' | 'chat'
+  metadata?: Record<string, any>
+}
+
+export async function executeWorkflowJob(payload: WorkflowExecutionPayload) {
+  const workflowId = payload.workflowId
+  const executionId = uuidv4()
+  const requestId = executionId.slice(0, 8)
+
+  logger.info(`[${requestId}] Starting workflow execution: ${workflowId}`, {
+    userId: payload.userId,
+    triggerType: payload.triggerType,
+    executionId,
+  })
+
+  // Initialize logging session
+  const triggerType = payload.triggerType || 'api'
+  const loggingSession = new LoggingSession(workflowId, executionId, triggerType, requestId)
+
+  try {
+    const usageCheck = await checkServerSideUsageLimits(payload.userId)
+    if (usageCheck.isExceeded) {
+      logger.warn(
+        `[${requestId}] User ${payload.userId} has exceeded usage limits. Skipping workflow execution.`,
+        {
+          currentUsage: usageCheck.currentUsage,
+          limit: usageCheck.limit,
+          workflowId: payload.workflowId,
+        }
+      )
+      throw new Error(
+        usageCheck.message ||
+          'Usage limit exceeded. Please upgrade your plan to continue using workflows.'
+      )
+    }
+
+    // Load workflow data from deployed state (this task is only used for API executions right now)
+    const workflowData = await loadDeployedWorkflowState(workflowId)
+
+    const { blocks, edges, loops, parallels } = workflowData
+
+    // Merge subblock states (server-safe version doesn't need workflowId)
+    const mergedStates = mergeSubblockState(blocks, {})
+
+    // Process block states for execution
+    const processedBlockStates = Object.entries(mergedStates).reduce(
+      (acc, [blockId, blockState]) => {
+        acc[blockId] = Object.entries(blockState.subBlocks).reduce(
+          (subAcc, [key, subBlock]) => {
+            subAcc[key] = subBlock.value
+            return subAcc
+          },
+          {} as Record<string, any>
+        )
+        return acc
+      },
+      {} as Record<string, Record<string, any>>
+    )
+
+    // Get environment variables
+    const [userEnv] = await db
+      .select()
+      .from(environmentTable)
+      .where(eq(environmentTable.userId, payload.userId))
+      .limit(1)
+
+    let decryptedEnvVars: Record<string, string> = {}
+    if (userEnv) {
+      const decryptionPromises = Object.entries((userEnv.variables as any) || {}).map(
+        async ([key, encryptedValue]) => {
+          try {
+            const { decrypted } = await decryptSecret(encryptedValue as string)
+            return [key, decrypted] as const
+          } catch (error: any) {
+            logger.error(`[${requestId}] Failed to decrypt environment variable "${key}":`, error)
+            throw new Error(`Failed to decrypt environment variable "${key}": ${error.message}`)
+          }
+        }
+      )
+
+      const decryptedPairs = await Promise.all(decryptionPromises)
+      decryptedEnvVars = Object.fromEntries(decryptedPairs)
+    }
+
+    // Start logging session
+    await loggingSession.safeStart({
+      userId: payload.userId,
+      workspaceId: '', // TODO: Get from workflow if needed
+      variables: decryptedEnvVars,
+    })
+
+    // Create serialized workflow
+    const serializer = new Serializer()
+    const serializedWorkflow = serializer.serializeWorkflow(
+      mergedStates,
+      edges,
+      loops || {},
+      parallels || {},
+      true // Enable validation during execution
+    )
+
+    // Create executor and execute
+    const executor = new Executor({
+      workflow: serializedWorkflow,
+      currentBlockStates: processedBlockStates,
+      envVarValues: decryptedEnvVars,
+      workflowInput: payload.input || {},
+      workflowVariables: {},
+      contextExtensions: {
+        executionId,
+        workspaceId: '', // TODO: Get from workflow if needed - see comment on line 120
+      },
+    })
+
+    // Set up logging on the executor
+    loggingSession.setupExecutor(executor)
+
+    const result = await executor.execute(workflowId)
+
+    // Handle streaming vs regular result
+    const executionResult = 'stream' in result && 'execution' in result ? result.execution : result
+
+    logger.info(`[${requestId}] Workflow execution completed: ${workflowId}`, {
+      success: executionResult.success,
+      executionTime: executionResult.metadata?.duration,
+      executionId,
+    })
+
+    // Update workflow run counts on success
+    if (executionResult.success) {
+      await updateWorkflowRunCounts(workflowId)
+
+      // Track execution in user stats
+      const statsUpdate =
+        triggerType === 'api'
+          ? { totalApiCalls: sql`total_api_calls + 1` }
+          : triggerType === 'webhook'
+            ? { totalWebhookTriggers: sql`total_webhook_triggers + 1` }
+            : triggerType === 'schedule'
+              ? { totalScheduledExecutions: sql`total_scheduled_executions + 1` }
+              : { totalManualExecutions: sql`total_manual_executions + 1` }
+
+      await db
+        .update(userStats)
+        .set({
+          ...statsUpdate,
+          lastActive: sql`now()`,
+        })
+        .where(eq(userStats.userId, payload.userId))
+    }
+
+    // Build trace spans and complete logging session (for both success and failure)
+    const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
+
+    await loggingSession.safeComplete({
+      endedAt: new Date().toISOString(),
+      totalDurationMs: totalDuration || 0,
+      finalOutput: executionResult.output || {},
+      traceSpans: traceSpans as any,
+    })
+
+    return {
+      success: executionResult.success,
+      workflowId: payload.workflowId,
+      executionId,
+      output: executionResult.output,
+      executedAt: new Date().toISOString(),
+      metadata: payload.metadata,
+    }
+  } catch (error: any) {
+    logger.error(`[${requestId}] Workflow execution failed: ${workflowId}`, {
+      error: error.message,
+      stack: error.stack,
+    })
+
+    await loggingSession.safeCompleteWithError({
+      endedAt: new Date().toISOString(),
+      totalDurationMs: 0,
+      error: {
+        message: error.message || 'Workflow execution failed',
+        stackTrace: error.stack,
+      },
+    })
+
+    throw error
+  }
+}
+
 export const workflowExecution = task({
   id: 'workflow-execution',
   retry: {
     maxAttempts: 1,
   },
-  run: async (payload: {
-    workflowId: string
-    userId: string
-    input?: any
-    triggerType?: string
-    metadata?: Record<string, any>
-  }) => {
-    const workflowId = payload.workflowId
-    const executionId = uuidv4()
-    const requestId = executionId.slice(0, 8)
-
-    logger.info(`[${requestId}] Starting Trigger.dev workflow execution: ${workflowId}`, {
-      userId: payload.userId,
-      triggerType: payload.triggerType,
-      executionId,
-    })
-
-    // Initialize logging session
-    const triggerType =
-      (payload.triggerType as 'api' | 'webhook' | 'schedule' | 'manual' | 'chat') || 'api'
-    const loggingSession = new LoggingSession(workflowId, executionId, triggerType, requestId)
-
-    try {
-      const usageCheck = await checkServerSideUsageLimits(payload.userId)
-      if (usageCheck.isExceeded) {
-        logger.warn(
-          `[${requestId}] User ${payload.userId} has exceeded usage limits. Skipping workflow execution.`,
-          {
-            currentUsage: usageCheck.currentUsage,
-            limit: usageCheck.limit,
-            workflowId: payload.workflowId,
-          }
-        )
-        throw new Error(
-          usageCheck.message ||
-            'Usage limit exceeded. Please upgrade your plan to continue using workflows.'
-        )
-      }
-
-      // Load workflow data from deployed state (this task is only used for API executions right now)
-      const workflowData = await loadDeployedWorkflowState(workflowId)
-
-      const { blocks, edges, loops, parallels } = workflowData
-
-      // Merge subblock states (server-safe version doesn't need workflowId)
-      const mergedStates = mergeSubblockState(blocks, {})
-
-      // Process block states for execution
-      const processedBlockStates = Object.entries(mergedStates).reduce(
-        (acc, [blockId, blockState]) => {
-          acc[blockId] = Object.entries(blockState.subBlocks).reduce(
-            (subAcc, [key, subBlock]) => {
-              subAcc[key] = subBlock.value
-              return subAcc
-            },
-            {} as Record<string, any>
-          )
-          return acc
-        },
-        {} as Record<string, Record<string, any>>
-      )
-
-      // Get environment variables
-      const [userEnv] = await db
-        .select()
-        .from(environmentTable)
-        .where(eq(environmentTable.userId, payload.userId))
-        .limit(1)
-
-      let decryptedEnvVars: Record<string, string> = {}
-      if (userEnv) {
-        const decryptionPromises = Object.entries((userEnv.variables as any) || {}).map(
-          async ([key, encryptedValue]) => {
-            try {
-              const { decrypted } = await decryptSecret(encryptedValue as string)
-              return [key, decrypted] as const
-            } catch (error: any) {
-              logger.error(`[${requestId}] Failed to decrypt environment variable "${key}":`, error)
-              throw new Error(`Failed to decrypt environment variable "${key}": ${error.message}`)
-            }
-          }
-        )
-
-        const decryptedPairs = await Promise.all(decryptionPromises)
-        decryptedEnvVars = Object.fromEntries(decryptedPairs)
-      }
-
-      // Start logging session
-      await loggingSession.safeStart({
-        userId: payload.userId,
-        workspaceId: '', // TODO: Get from workflow if needed
-        variables: decryptedEnvVars,
-      })
-
-      // Create serialized workflow
-      const serializer = new Serializer()
-      const serializedWorkflow = serializer.serializeWorkflow(
-        mergedStates,
-        edges,
-        loops || {},
-        parallels || {},
-        true // Enable validation during execution
-      )
-
-      // Create executor and execute
-      const executor = new Executor({
-        workflow: serializedWorkflow,
-        currentBlockStates: processedBlockStates,
-        envVarValues: decryptedEnvVars,
-        workflowInput: payload.input || {},
-        workflowVariables: {},
-        contextExtensions: {
-          executionId,
-          workspaceId: '', // TODO: Get from workflow if needed - see comment on line 120
-        },
-      })
-
-      // Set up logging on the executor
-      loggingSession.setupExecutor(executor)
-
-      const result = await executor.execute(workflowId)
-
-      // Handle streaming vs regular result
-      const executionResult =
-        'stream' in result && 'execution' in result ? result.execution : result
-
-      logger.info(`[${requestId}] Workflow execution completed: ${workflowId}`, {
-        success: executionResult.success,
-        executionTime: executionResult.metadata?.duration,
-        executionId,
-      })
-
-      // Update workflow run counts on success
-      if (executionResult.success) {
-        await updateWorkflowRunCounts(workflowId)
-
-        // Track execution in user stats
-        const statsUpdate =
-          triggerType === 'api'
-            ? { totalApiCalls: sql`total_api_calls + 1` }
-            : triggerType === 'webhook'
-              ? { totalWebhookTriggers: sql`total_webhook_triggers + 1` }
-              : triggerType === 'schedule'
-                ? { totalScheduledExecutions: sql`total_scheduled_executions + 1` }
-                : { totalManualExecutions: sql`total_manual_executions + 1` }
-
-        await db
-          .update(userStats)
-          .set({
-            ...statsUpdate,
-            lastActive: sql`now()`,
-          })
-          .where(eq(userStats.userId, payload.userId))
-      }
-
-      // Build trace spans and complete logging session (for both success and failure)
-      const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
-
-      await loggingSession.safeComplete({
-        endedAt: new Date().toISOString(),
-        totalDurationMs: totalDuration || 0,
-        finalOutput: executionResult.output || {},
-        traceSpans: traceSpans as any,
-      })
-
-      return {
-        success: executionResult.success,
-        workflowId: payload.workflowId,
-        executionId,
-        output: executionResult.output,
-        executedAt: new Date().toISOString(),
-        metadata: payload.metadata,
-      }
-    } catch (error: any) {
-      logger.error(`[${requestId}] Workflow execution failed: ${workflowId}`, {
-        error: error.message,
-        stack: error.stack,
-      })
-
-      await loggingSession.safeCompleteWithError({
-        endedAt: new Date().toISOString(),
-        totalDurationMs: 0,
-        error: {
-          message: error.message || 'Workflow execution failed',
-          stackTrace: error.stack,
-        },
-      })
-
-      throw error // Let Trigger.dev handle retries
-    }
-  },
+  run: async (payload: WorkflowExecutionPayload) => executeWorkflowJob(payload),
 })

apps/sim/blocks/blocks/agent.ts

@@ -9,7 +9,9 @@ import {
   getProviderIcon,
   MODELS_TEMP_RANGE_0_1,
   MODELS_TEMP_RANGE_0_2,
+  MODELS_WITH_REASONING_EFFORT,
   MODELS_WITH_TEMPERATURE_SUPPORT,
+  MODELS_WITH_VERBOSITY,
   providers,
 } from '@/providers/utils'
 
@@ -210,6 +212,41 @@ Create a system prompt appropriately detailed for the request, using clear langu
         },
       },
     },
+    {
+      id: 'reasoningEffort',
+      title: 'Reasoning Effort',
+      type: 'dropdown',
+      layout: 'half',
+      placeholder: 'Select reasoning effort...',
+      options: [
+        { label: 'minimal', id: 'minimal' },
+        { label: 'low', id: 'low' },
+        { label: 'medium', id: 'medium' },
+        { label: 'high', id: 'high' },
+      ],
+      value: () => 'medium',
+      condition: {
+        field: 'model',
+        value: MODELS_WITH_REASONING_EFFORT,
+      },
+    },
+    {
+      id: 'verbosity',
+      title: 'Verbosity',
+      type: 'dropdown',
+      layout: 'half',
+      placeholder: 'Select verbosity...',
+      options: [
+        { label: 'low', id: 'low' },
+        { label: 'medium', id: 'medium' },
+        { label: 'high', id: 'high' },
+      ],
+      value: () => 'medium',
+      condition: {
+        field: 'model',
+        value: MODELS_WITH_VERBOSITY,
+      },
+    },
     {
       id: 'apiKey',
       title: 'API Key',
@@ -485,6 +522,8 @@ Example 3 (Array Input):
       },
     },
     temperature: { type: 'number', description: 'Response randomness level' },
+    reasoningEffort: { type: 'string', description: 'Reasoning effort level for GPT-5 models' },
+    verbosity: { type: 'string', description: 'Verbosity level for GPT-5 models' },
     tools: { type: 'json', description: 'Available tools configuration' },
   },
   outputs: {

apps/sim/blocks/blocks/airtable.ts

@@ -45,6 +45,7 @@ export const AirtableBlock: BlockConfig<AirtableResponse> = {
       type: 'short-input',
       layout: 'full',
       placeholder: 'Enter your base ID (e.g., appXXXXXXXXXXXXXX)',
+      dependsOn: ['credential'],
       required: true,
     },
     {
@@ -53,6 +54,7 @@ export const AirtableBlock: BlockConfig<AirtableResponse> = {
       type: 'short-input',
       layout: 'full',
       placeholder: 'Enter table ID (e.g., tblXXXXXXXXXXXXXX)',
+      dependsOn: ['credential', 'baseId'],
       required: true,
     },
     {

apps/sim/blocks/blocks/confluence.ts

@@ -58,6 +58,7 @@ export const ConfluenceBlock: BlockConfig<ConfluenceResponse> = {
       provider: 'confluence',
       serviceId: 'confluence',
       placeholder: 'Select Confluence page',
+      dependsOn: ['credential', 'domain'],
       mode: 'basic',
     },
     // Manual page ID input (advanced mode)