v0.5.16: MCP fixes, code refactors, jira fixes, new mistral models

* fix(async-execution): restore async executions

* fix schedules trace span collection'

* fix execution trace spans for schedules + cost tracking when workflow errors

apps/docs/components/icons.tsx

@@ -3765,12 +3765,16 @@ export function MailgunIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
       {...props}
-      fill='currentColor'
+      version='1.1'
+      viewBox='0 0 1000 1000'
       xmlns='http://www.w3.org/2000/svg'
+      xmlnsXlink='http://www.w3.org/1999/xlink'
       xmlSpace='preserve'
-      viewBox='0 0 512 512'
     >
-      <path d='M256.5 159.5c-53.5 0-97 43.5-97 97s43.5 97 97 97 97-43.5 97-97-43.5-97-97-97m-151.1 97c0-83.4 67.7-151.1 151.1-151.1s151.1 67.7 151.1 151.1c0 5.8-.5 11-1 16.3-1 14.7 9.4 25.7 24.1 25.7 24.7 0 27.3-32 27.3-42.5 0-111.7-90.2-202-202-202S54 144.3 54 256s90.2 202 202 202c59.3 0 112.3-25.7 149.5-66.1l41.4 34.6C400.3 479 332.1 512 256 512 114.4 512 0 397.1 0 256 0 114.4 114.9 0 256 0c141.6 0 256 114.9 256 256 0 56.7-27.3 102.8-81.3 102.8-24.1 0-38.3-11-46.7-23.1-26.8 43-74 71.3-128.5 71.3-82.4.6-150.1-67.1-150.1-150.5m151.1-44.6c24.7 0 44.6 19.9 44.6 44.1 0 24.7-19.9 44.6-44.6 44.6s-44.6-19.9-44.6-44.6c.6-24.1 20-44.1 44.6-44.1' />
+      <path
+        fill='#C12126'
+        d='M493,305.7c-88.9,0-161,72.1-161,161c0,88.9,72.1,161,161,161c88.9,0,161-72.1,161-161 C654,377.8,582,305.7,493,305.7z M242,466.7c0-138.7,112.4-251,251-251c138.7,0,251.1,112.4,251.1,251c0,9.2-0.5,18.2-1.4,27.1 c-1.9,24.5,16.1,43.2,40.4,43.2c41.3,0,45.7-53.2,45.7-70.3c0-185.4-150.3-335.6-335.6-335.6S157.4,281.4,157.4,466.7 c0,185.4,150.3,335.6,335.6,335.6c98.4,0,187-42.4,248.4-109.9l69,57.9c-77.9,87.1-191.3,142-317.4,142 c-235.1,0-425.7-190.6-425.7-425.7S257.9,41,493,41c235.1,0,425.7,190.6,425.7,425.7c0,94.5-45,171.2-135.4,171.2 c-39.8,0-64-18.2-77.2-38.6C661.9,670.5,583,717.8,493,717.8C354.4,717.8,242,605.4,242,466.7z M493,393.1c40.7,0,73.7,33,73.7,73.7 c0,40.7-33,73.7-73.7,73.7c-40.7,0-73.7-33-73.7-73.7S452.3,393.1,493,393.1z'
+      />
     </svg>
   )
 }

apps/docs/content/docs/de/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/content/docs/en/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/content/docs/es/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/content/docs/fr/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/content/docs/ja/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/content/docs/zh/tools/mailgun.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="mailgun"
-  color="#F06248"
+  color="#E0E0E0"
 />
 
 {/* MANUAL-CONTENT-START:intro */}

apps/docs/i18n.lock

@@ -47252,7 +47252,7 @@ checksums:
     meta/title: b0301322c66fcbf604c6988c11a8a0b6
     meta/description: 54233683a87a944c333d0a27a15f297e
     content/0: 1b031fb0c62c46b177aeed5c3d3f8f80
-    content/1: 0aefa3b41a9d2ecaf2cfafe6818ed5d2
+    content/1: 64159072101de51ad1e456dc76936fd0
     content/2: 3f99340b6a2b22d8f91d8cabd457f4f5
     content/3: e64b467b3c7f0ade59c79c0a9a8da002
     content/4: a639faec4ba8d6237dd700c4c986f8cd

apps/sim/app/(auth)/components/auth-background.tsx

@@ -1,4 +1,4 @@
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/core/utils/cn'
 import AuthBackgroundSVG from '@/app/(auth)/components/auth-background-svg'
 
 type AuthBackgroundProps = {

apps/sim/app/(auth)/components/oauth-provider-checker.tsx

@@ -1,7 +1,7 @@
 'use server'
 
-import { env } from '@/lib/env'
-import { isProd } from '@/lib/environment'
+import { env } from '@/lib/core/config/env'
+import { isProd } from '@/lib/core/config/environment'
 
 export async function getOAuthProviderStatus() {
   const githubAvailable = !!(env.GITHUB_CLIENT_ID && env.GITHUB_CLIENT_SECRET)

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

@@ -3,7 +3,7 @@
 import { type ReactNode, useEffect, useState } from 'react'
 import { GithubIcon, GoogleIcon } from '@/components/icons'
 import { Button } from '@/components/ui/button'
-import { client } from '@/lib/auth-client'
+import { client } from '@/lib/auth/auth-client'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface SocialLoginButtonsProps {

apps/sim/app/(auth)/components/sso-login-button.tsx

@@ -2,8 +2,8 @@
 
 import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
-import { getEnv, isTruthy } from '@/lib/env'
-import { cn } from '@/lib/utils'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
+import { cn } from '@/lib/core/utils/cn'
 
 interface SSOLoginButtonProps {
   callbackURL?: string

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

@@ -14,12 +14,12 @@ import {
 } from '@/components/ui/dialog'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { client } from '@/lib/auth-client'
-import { quickValidateEmail } from '@/lib/email/validation'
-import { getEnv, isFalsy, isTruthy } from '@/lib/env'
+import { client } from '@/lib/auth/auth-client'
+import { getEnv, isFalsy, isTruthy } from '@/lib/core/config/env'
+import { cn } from '@/lib/core/utils/cn'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getBaseUrl } from '@/lib/urls/utils'
-import { cn } from '@/lib/utils'
+import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'

apps/sim/app/(auth)/reset-password/reset-password-form.tsx

@@ -5,7 +5,7 @@ import { ArrowRight, ChevronRight, Eye, EyeOff } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/core/utils/cn'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 
 interface RequestResetFormProps {

apps/sim/app/(auth)/signup/page.tsx

@@ -1,4 +1,4 @@
-import { env, isTruthy } from '@/lib/env'
+import { env, isTruthy } from '@/lib/core/config/env'
 import { getOAuthProviderStatus } from '@/app/(auth)/components/oauth-provider-checker'
 import SignupForm from '@/app/(auth)/signup/signup-form'
 

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

@@ -7,11 +7,11 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { client, useSession } from '@/lib/auth-client'
-import { quickValidateEmail } from '@/lib/email/validation'
-import { getEnv, isFalsy, isTruthy } from '@/lib/env'
+import { client, useSession } from '@/lib/auth/auth-client'
+import { getEnv, isFalsy, isTruthy } from '@/lib/core/config/env'
+import { cn } from '@/lib/core/utils/cn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
+import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'

apps/sim/app/(auth)/sso/page.tsx

@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation'
-import { getEnv, isTruthy } from '@/lib/env'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
 import SSOForm from '@/app/(auth)/sso/sso-form'
 
 export const dynamic = 'force-dynamic'

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

@@ -6,11 +6,11 @@ import { useRouter, useSearchParams } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { client } from '@/lib/auth-client'
-import { quickValidateEmail } from '@/lib/email/validation'
-import { env, isFalsy } from '@/lib/env'
+import { client } from '@/lib/auth/auth-client'
+import { env, isFalsy } from '@/lib/core/config/env'
+import { cn } from '@/lib/core/utils/cn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
+import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 

apps/sim/app/(auth)/verify/page.tsx

@@ -1,5 +1,5 @@
-import { hasEmailService } from '@/lib/email/mailer'
-import { isEmailVerificationEnabled, isProd } from '@/lib/environment'
+import { isEmailVerificationEnabled, isProd } from '@/lib/core/config/environment'
+import { hasEmailService } from '@/lib/messaging/email/mailer'
 import { VerifyContent } from '@/app/(auth)/verify/verify-content'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/(auth)/verify/use-verification.ts

@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
-import { client, useSession } from '@/lib/auth-client'
+import { client, useSession } from '@/lib/auth/auth-client'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('useVerification')

apps/sim/app/(auth)/verify/verify-content.tsx

@@ -4,7 +4,7 @@ import { Suspense, useEffect, useState } from 'react'
 import { useRouter } from 'next/navigation'
 import { Button } from '@/components/ui/button'
 import { InputOTP, InputOTPGroup, InputOTPSlot } from '@/components/ui/input-otp'
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/core/utils/cn'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { useVerification } from '@/app/(auth)/verify/use-verification'

apps/sim/app/(landing)/careers/page.tsx

@@ -13,10 +13,10 @@ import {
   SelectValue,
 } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
-import { quickValidateEmail } from '@/lib/email/validation'
-import { isHosted } from '@/lib/environment'
+import { isHosted } from '@/lib/core/config/environment'
+import { cn } from '@/lib/core/utils/cn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
+import { quickValidateEmail } from '@/lib/messaging/email/validation'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'

apps/sim/app/(landing)/components/background/background.tsx

@@ -1,5 +1,5 @@
 import dynamic from 'next/dynamic'
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/core/utils/cn'
 
 // Lazy load the SVG to reduce initial bundle size
 const BackgroundSVG = dynamic(() => import('./background-svg'), {

apps/sim/app/(landing)/components/hero/components/landing-canvas/dot-pattern.tsx

@@ -2,7 +2,7 @@
 
 import type React from 'react'
 import { useEffect, useId, useRef, useState } from 'react'
-import { cn } from '@/lib/utils'
+import { cn } from '@/lib/core/utils/cn'
 
 /**
  *  DotPattern Component Props

apps/sim/app/(landing)/components/hero/hero.tsx

@@ -32,7 +32,7 @@ import {
   StripeIcon,
   SupabaseIcon,
 } from '@/components/icons'
-import { LandingPromptStorage } from '@/lib/browser-storage'
+import { LandingPromptStorage } from '@/lib/core/utils/browser-storage'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import {
   CARD_WIDTH,

apps/sim/app/(landing)/components/landing-pricing/landing-pricing.tsx

@@ -12,8 +12,8 @@ import {
   Workflow,
 } from 'lucide-react'
 import { useRouter } from 'next/navigation'
+import { cn } from '@/lib/core/utils/cn'
 import { createLogger } from '@/lib/logs/console/logger'
-import { cn } from '@/lib/utils'
 import { inter } from '@/app/_styles/fonts/inter/inter'
 import {
   ENTERPRISE_PLAN_FEATURES,

apps/sim/app/(landing)/components/legal-layout.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { isHosted } from '@/lib/environment'
+import { isHosted } from '@/lib/core/config/environment'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import Footer from '@/app/(landing)/components/footer/footer'
 import Nav from '@/app/(landing)/components/nav/nav'

apps/sim/app/(landing)/components/nav/nav.tsx

@@ -7,7 +7,7 @@ import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { GithubIcon } from '@/components/icons'
 import { useBrandConfig } from '@/lib/branding/branding'
-import { isHosted } from '@/lib/environment'
+import { isHosted } from '@/lib/core/config/environment'
 import { createLogger } from '@/lib/logs/console/logger'
 import { soehne } from '@/app/_styles/fonts/soehne/soehne'
 import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'

apps/sim/app/(landing)/privacy/page.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect } from 'react'
 import Link from 'next/link'
-import { getEnv } from '@/lib/env'
+import { getEnv } from '@/lib/core/config/env'
 import { LegalLayout } from '@/app/(landing)/components'
 
 export default function PrivacyPolicy() {

apps/sim/app/(landing)/terms/page.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect } from 'react'
 import Link from 'next/link'
-import { getEnv } from '@/lib/env'
+import { getEnv } from '@/lib/core/config/env'
 import { LegalLayout } from '@/app/(landing)/components'
 
 export default function TermsOfService() {

apps/sim/app/_shell/providers/posthog-provider.tsx

@@ -3,7 +3,7 @@
 import { useEffect } from 'react'
 import posthog from 'posthog-js'
 import { PostHogProvider as PHProvider } from 'posthog-js/react'
-import { getEnv, isTruthy } from '../../../lib/env'
+import { getEnv, isTruthy } from '@/lib/core/config/env'
 
 export function PostHogProvider({ children }: { children: React.ReactNode }) {
   useEffect(() => {

apps/sim/app/_shell/providers/session-provider.tsx

@@ -3,7 +3,7 @@
 import type React from 'react'
 import { createContext, useCallback, useEffect, useMemo, useState } from 'react'
 import posthog from 'posthog-js'
-import { client } from '@/lib/auth-client'
+import { client } from '@/lib/auth/auth-client'
 
 export type AppSession = {
   user: {

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

@@ -305,24 +305,20 @@ export function createMockRequest(
 }
 
 export function mockExecutionDependencies() {
-  vi.mock('@/lib/utils', async () => {
-    const actual = await vi.importActual('@/lib/utils')
-    return {
-      ...(actual as any),
-      decryptSecret: vi.fn().mockImplementation((encrypted: string) => {
-        const entries = Object.entries(mockEnvironmentVars)
-        const found = entries.find(([_, val]) => val === encrypted)
-        const key = found ? found[0] : null
+  vi.mock('@/lib/core/security/encryption', () => ({
+    decryptSecret: vi.fn().mockImplementation((encrypted: string) => {
+      const entries = Object.entries(mockEnvironmentVars)
+      const found = entries.find(([_, val]) => val === encrypted)
+      const key = found ? found[0] : null
 
-        return Promise.resolve({
-          decrypted:
-            key && key in mockDecryptedEnvVars
-              ? mockDecryptedEnvVars[key as keyof typeof mockDecryptedEnvVars]
-              : 'decrypted-value',
-        })
-      }),
-    }
-  })
+      return Promise.resolve({
+        decrypted:
+          key && key in mockDecryptedEnvVars
+            ? mockDecryptedEnvVars[key as keyof typeof mockDecryptedEnvVars]
+            : 'decrypted-value',
+      })
+    }),
+  }))
 
   vi.mock('@/lib/logs/execution/trace-spans/trace-spans', () => ({
     buildTraceSpans: vi.fn().mockReturnValue({
@@ -455,7 +451,7 @@ export function mockWorkflowAccessValidation(shouldSucceed = true) {
 }
 
 export async function getMockedDependencies() {
-  const utilsModule = await import('@/lib/utils')
+  const encryptionModule = await import('@/lib/core/security/encryption')
   const traceSpansModule = await import('@/lib/logs/execution/trace-spans/trace-spans')
   const workflowUtilsModule = await import('@/lib/workflows/utils')
   const executorModule = await import('@/executor')
@@ -463,7 +459,7 @@ export async function getMockedDependencies() {
   const dbModule = await import('@sim/db')
 
   return {
-    decryptSecret: utilsModule.decryptSecret,
+    decryptSecret: encryptionModule.decryptSecret,
     buildTraceSpans: traceSpansModule.buildTraceSpans,
     updateWorkflowRunCounts: workflowUtilsModule.updateWorkflowRunCounts,
     Executor: executorModule.Executor,
@@ -801,7 +797,7 @@ export function mockFileSystem(
 export function mockEncryption(options: { encryptedValue?: string; decryptedValue?: string } = {}) {
   const { encryptedValue = 'encrypted-value', decryptedValue = 'decrypted-value' } = options
 
-  vi.doMock('@/lib/utils', () => ({
+  vi.doMock('@/lib/core/security/encryption', () => ({
     encryptSecret: vi.fn().mockResolvedValue({ encrypted: encryptedValue }),
     decryptSecret: vi.fn().mockResolvedValue({ decrypted: decryptedValue }),
   }))

apps/sim/app/api/admin/import-workflow/route.ts

@@ -1,159 +0,0 @@
-import { db } from '@sim/db'
-import { user, workflow, workflowDeploymentVersion } from '@sim/db/schema'
-import { and, eq } 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 { generateRequestId } from '@/lib/utils'
-import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
-import { sanitizeForExport } from '@/lib/workflows/json-sanitizer'
-
-const logger = createLogger('AdminImportWorkflowAPI')
-
-const ImportWorkflowSchema = z.object({
-  workflowId: z.string().min(1, 'Workflow ID is required'),
-  targetWorkspaceId: z.string().min(1, 'Target workspace ID is required'),
-  deploymentVersion: z.number().int().positive().optional(),
-})
-
-/**
- * POST /api/admin/import-workflow
- * Export a workflow from database by ID (superuser only)
- */
-export async function POST(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const session = await getSession()
-    if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthorized import attempt`)
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    // Check if user is superuser
-    const currentUser = await db
-      .select({ isSuperUser: user.isSuperUser })
-      .from(user)
-      .where(eq(user.id, session.user.id))
-      .limit(1)
-
-    if (!currentUser[0]?.isSuperUser) {
-      logger.warn(`[${requestId}] Non-superuser attempted workflow import: ${session.user.id}`)
-      return NextResponse.json({ error: 'Forbidden - Superuser access required' }, { status: 403 })
-    }
-
-    const body = await request.json()
-    const validation = ImportWorkflowSchema.safeParse(body)
-
-    if (!validation.success) {
-      return NextResponse.json(
-        { error: 'Invalid request', details: validation.error.errors },
-        { status: 400 }
-      )
-    }
-
-    const { workflowId, targetWorkspaceId, deploymentVersion } = validation.data
-
-    // Fetch workflow metadata
-    const [workflowData] = await db
-      .select()
-      .from(workflow)
-      .where(eq(workflow.id, workflowId))
-      .limit(1)
-
-    if (!workflowData) {
-      return NextResponse.json({ error: 'Workflow not found' }, { status: 404 })
-    }
-
-    let workflowState: any
-    let sourceLabel = 'current state'
-
-    if (deploymentVersion !== undefined) {
-      // Load from deployment version
-      const [deployedVersion] = await db
-        .select({ state: workflowDeploymentVersion.state })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, workflowId),
-            eq(workflowDeploymentVersion.version, deploymentVersion)
-          )
-        )
-        .limit(1)
-
-      if (!deployedVersion?.state) {
-        return NextResponse.json({ error: `Deployment version ${deploymentVersion} not found` }, { status: 404 })
-      }
-
-      const deployedState = deployedVersion.state as any
-      workflowState = {
-        blocks: deployedState.blocks || {},
-        edges: Array.isArray(deployedState.edges) ? deployedState.edges : [],
-        loops: deployedState.loops || {},
-        parallels: deployedState.parallels || {},
-        metadata: {
-          name: workflowData.name,
-          description: workflowData.description ?? undefined,
-          color: workflowData.color ?? undefined,
-        },
-        variables: Array.isArray(deployedState.variables) ? deployedState.variables : [],
-      }
-      sourceLabel = `deployment v${deploymentVersion}`
-    } else {
-      // Load current state from normalized tables
-      const normalizedData = await loadWorkflowFromNormalizedTables(workflowId)
-
-      if (!normalizedData) {
-        return NextResponse.json({ error: 'Workflow has no data' }, { status: 404 })
-      }
-
-      let workflowVariables: any[] = []
-      if (workflowData.variables && typeof workflowData.variables === 'object') {
-        workflowVariables = Object.values(workflowData.variables).map((v: any) => ({
-          id: v.id,
-          name: v.name,
-          type: v.type,
-          value: v.value,
-        }))
-      }
-
-      workflowState = {
-        blocks: normalizedData.blocks || {},
-        edges: Array.isArray(normalizedData.edges) ? normalizedData.edges : [],
-        loops: normalizedData.loops || {},
-        parallels: normalizedData.parallels || {},
-        metadata: {
-          name: workflowData.name,
-          description: workflowData.description ?? undefined,
-          color: workflowData.color ?? undefined,
-        },
-        variables: workflowVariables,
-      }
-    }
-
-    const exportState = sanitizeForExport(workflowState)
-
-    logger.info(`[${requestId}] Exported workflow ${workflowId} (${sourceLabel})`)
-
-    return NextResponse.json({
-      success: true,
-      workflow: exportState,
-      metadata: {
-        originalId: workflowId,
-        originalName: workflowData.name,
-        originalDescription: workflowData.description,
-        targetWorkspaceId,
-        deploymentVersion: deploymentVersion ?? null,
-        source: sourceLabel,
-      },
-    })
-  } catch (error) {
-    logger.error(`[${requestId}] Error importing workflow:`, error)
-    return NextResponse.json(
-      { error: 'Failed to import workflow' },
-      { status: 500 }
-    )
-  }
-}
-

apps/sim/app/api/admin/workflow-deployments/route.ts

@@ -1,65 +0,0 @@
-import { db } from '@sim/db'
-import { user, workflowDeploymentVersion } from '@sim/db/schema'
-import { desc, eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
-
-const logger = createLogger('AdminWorkflowDeploymentsAPI')
-
-/**
- * GET /api/admin/workflow-deployments?workflowId=xxx
- * List all deployment versions for a workflow (superuser only)
- */
-export async function GET(request: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const session = await getSession()
-    if (!session?.user?.id) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    // Check if user is superuser
-    const currentUser = await db
-      .select({ isSuperUser: user.isSuperUser })
-      .from(user)
-      .where(eq(user.id, session.user.id))
-      .limit(1)
-
-    if (!currentUser[0]?.isSuperUser) {
-      return NextResponse.json({ error: 'Forbidden - Superuser access required' }, { status: 403 })
-    }
-
-    const { searchParams } = new URL(request.url)
-    const workflowId = searchParams.get('workflowId')
-
-    if (!workflowId) {
-      return NextResponse.json({ error: 'workflowId query parameter is required' }, { status: 400 })
-    }
-
-    const versions = await db
-      .select({
-        id: workflowDeploymentVersion.id,
-        version: workflowDeploymentVersion.version,
-        name: workflowDeploymentVersion.name,
-        isActive: workflowDeploymentVersion.isActive,
-        createdAt: workflowDeploymentVersion.createdAt,
-        createdBy: workflowDeploymentVersion.createdBy,
-        deployedBy: user.name,
-      })
-      .from(workflowDeploymentVersion)
-      .leftJoin(user, eq(workflowDeploymentVersion.createdBy, user.id))
-      .where(eq(workflowDeploymentVersion.workflowId, workflowId))
-      .orderBy(desc(workflowDeploymentVersion.version))
-
-    logger.info(`[${requestId}] Retrieved ${versions.length} deployments for workflow ${workflowId}`)
-
-    return NextResponse.json({ success: true, versions })
-  } catch (error) {
-    logger.error(`[${requestId}] Error listing deployments:`, error)
-    return NextResponse.json({ error: 'Failed to list deployments' }, { status: 500 })
-  }
-}
-

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

@@ -3,10 +3,10 @@ import { eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { OAuthProvider } from '@/lib/oauth/oauth'
 import { evaluateScopeCoverage, parseProvider } from '@/lib/oauth/oauth'
-import { generateRequestId } from '@/lib/utils'
 
 const logger = createLogger('OAuthConnectionsAPI')
 

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

@@ -5,10 +5,10 @@ import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
 import { evaluateScopeCoverage, parseProvider } from '@/lib/oauth/oauth'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
-import { generateRequestId } from '@/lib/utils'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -4,8 +4,8 @@ import { and, eq, like, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 
 export const dynamic = 'force-dynamic'
 

apps/sim/app/api/auth/oauth/microsoft/file/route.ts

@@ -1,8 +1,8 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
+import { validateMicrosoftGraphId } from '@/lib/core/security/input-validation'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { validateMicrosoftGraphId } from '@/lib/security/input-validation'
-import { generateRequestId } from '@/lib/utils'
 import { getCredential, refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/api/auth/oauth/microsoft/files/route.ts

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { getCredential, refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'

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

@@ -2,8 +2,8 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { getCredential, refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/api/auth/oauth/wealthbox/item/route.ts

@@ -3,9 +3,9 @@ import { account } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { validateEnum, validatePathSegment } from '@/lib/core/security/input-validation'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { validateEnum, validatePathSegment } from '@/lib/security/input-validation'
-import { generateRequestId } from '@/lib/utils'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/api/auth/oauth/wealthbox/items/route.ts

@@ -3,8 +3,8 @@ import { account } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 
 export const dynamic = 'force-dynamic'

apps/sim/app/api/auth/sso/register/route.ts

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { auth } from '@/lib/auth'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('SSO-Register')

apps/sim/app/api/auth/trello/authorize/route.ts

@@ -1,8 +1,8 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getBaseUrl } from '@/lib/urls/utils'
 
 const logger = createLogger('TrelloAuthorize')
 

apps/sim/app/api/auth/trello/callback/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { getBaseUrl } from '@/lib/urls/utils'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 
 export const dynamic = 'force-dynamic'
 

apps/sim/app/api/auth/trello/store/route.ts

@@ -1,7 +1,7 @@
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/../../packages/db'
 import { account } from '@/../../packages/db/schema'

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

@@ -4,8 +4,8 @@ import { and, eq, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getBaseUrl } from '@/lib/urls/utils'
 
 const logger = createLogger('BillingPortal')
 

apps/sim/app/api/billing/update-cost/route.ts

@@ -5,9 +5,9 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { checkAndBillOverageThreshold } from '@/lib/billing/threshold-billing'
 import { checkInternalApiKey } from '@/lib/copilot/utils'
-import { isBillingEnabled } from '@/lib/environment'
+import { isBillingEnabled } from '@/lib/core/config/environment'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 
 const logger = createLogger('BillingUpdateCostAPI')
 

apps/sim/app/api/careers/submit/route.ts

@@ -3,9 +3,9 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import CareersConfirmationEmail from '@/components/emails/careers/careers-confirmation-email'
 import CareersSubmissionEmail from '@/components/emails/careers/careers-submission-email'
-import { sendEmail } from '@/lib/email/mailer'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
+import { sendEmail } from '@/lib/messaging/email/mailer'
 
 export const dynamic = 'force-dynamic'
 

apps/sim/app/api/chat/[identifier]/otp/route.ts

@@ -4,10 +4,10 @@ import { eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { z } from 'zod'
 import { renderOTPEmail } from '@/components/emails/render-email'
-import { sendEmail } from '@/lib/email/mailer'
+import { getRedisClient, markMessageAsProcessed, releaseLock } from '@/lib/core/config/redis'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getRedisClient, markMessageAsProcessed, releaseLock } from '@/lib/redis'
-import { generateRequestId } from '@/lib/utils'
+import { sendEmail } from '@/lib/messaging/email/mailer'
 import { addCorsHeaders, setChatAuthCookie } from '@/app/api/chat/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 

apps/sim/app/api/chat/[identifier]/route.test.ts

@@ -53,17 +53,20 @@ vi.mock('@/lib/logs/execution/logging-session', () => ({
   })),
 }))
 
-vi.mock('@/lib/workflows/streaming', () => ({
+vi.mock('@/lib/workflows/streaming/streaming', () => ({
   createStreamingResponse: vi.fn().mockImplementation(async () => createMockStream()),
 }))
 
-vi.mock('@/lib/utils', () => ({
+vi.mock('@/lib/core/utils/sse', () => ({
   SSE_HEADERS: {
     'Content-Type': 'text/event-stream',
     'Cache-Control': 'no-cache',
     Connection: 'keep-alive',
     'X-Accel-Buffering': 'no',
   },
+}))
+
+vi.mock('@/lib/core/utils/request', () => ({
   generateRequestId: vi.fn().mockReturnValue('test-request-id'),
 }))
 
@@ -388,7 +391,7 @@ describe('Chat Identifier API Route', () => {
       const params = Promise.resolve({ identifier: 'test-chat' })
 
       const { POST } = await import('@/app/api/chat/[identifier]/route')
-      const { createStreamingResponse } = await import('@/lib/workflows/streaming')
+      const { createStreamingResponse } = await import('@/lib/workflows/streaming/streaming')
 
       const response = await POST(req, { params })
 
@@ -440,7 +443,7 @@ describe('Chat Identifier API Route', () => {
     })
 
     it('should handle workflow execution errors gracefully', async () => {
-      const { createStreamingResponse } = await import('@/lib/workflows/streaming')
+      const { createStreamingResponse } = await import('@/lib/workflows/streaming/streaming')
       const originalStreamingResponse = vi.mocked(createStreamingResponse).getMockImplementation()
       vi.mocked(createStreamingResponse).mockImplementationOnce(async () => {
         throw new Error('Execution failed')
@@ -492,7 +495,7 @@ describe('Chat Identifier API Route', () => {
       const params = Promise.resolve({ identifier: 'test-chat' })
 
       const { POST } = await import('@/app/api/chat/[identifier]/route')
-      const { createStreamingResponse } = await import('@/lib/workflows/streaming')
+      const { createStreamingResponse } = await import('@/lib/workflows/streaming/streaming')
 
       await POST(req, { params })
 
@@ -511,7 +514,7 @@ describe('Chat Identifier API Route', () => {
       const params = Promise.resolve({ identifier: 'test-chat' })
 
       const { POST } = await import('@/app/api/chat/[identifier]/route')
-      const { createStreamingResponse } = await import('@/lib/workflows/streaming')
+      const { createStreamingResponse } = await import('@/lib/workflows/streaming/streaming')
 
       await POST(req, { params })
 

apps/sim/app/api/chat/[identifier]/route.ts

@@ -4,11 +4,11 @@ import { chat } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { preprocessExecution } from '@/lib/execution/preprocessing'
 import { createLogger } from '@/lib/logs/console/logger'
 import { LoggingSession } from '@/lib/logs/execution/logging-session'
 import { ChatFiles } from '@/lib/uploads'
-import { generateRequestId } from '@/lib/utils'
 import {
   addCorsHeaders,
   setChatAuthCookie,
@@ -182,8 +182,8 @@ export async function POST(
         }
       }
 
-      const { createStreamingResponse } = await import('@/lib/workflows/streaming')
-      const { SSE_HEADERS } = await import('@/lib/utils')
+      const { createStreamingResponse } = await import('@/lib/workflows/streaming/streaming')
+      const { SSE_HEADERS } = await import('@/lib/core/utils/sse')
       const { createFilteredResult } = await import('@/app/api/workflows/[id]/execute/route')
 
       const workflowInput: any = { input, conversationId }

apps/sim/app/api/chat/manage/[id]/route.test.ts

@@ -69,15 +69,15 @@ describe('Chat Edit API Route', () => {
       }),
     }))
 
-    vi.doMock('@/lib/utils', () => ({
+    vi.doMock('@/lib/core/security/encryption', () => ({
       encryptSecret: mockEncryptSecret.mockResolvedValue({ encrypted: 'encrypted-password' }),
     }))
 
-    vi.doMock('@/lib/urls/utils', () => ({
+    vi.doMock('@/lib/core/utils/urls', () => ({
       getEmailDomain: vi.fn().mockReturnValue('localhost:3000'),
     }))
 
-    vi.doMock('@/lib/environment', () => ({
+    vi.doMock('@/lib/core/config/environment', () => ({
       isDev: true,
     }))
 
@@ -86,7 +86,7 @@ describe('Chat Edit API Route', () => {
     }))
 
     mockDeployWorkflow.mockResolvedValue({ success: true, version: 1 })
-    vi.doMock('@/lib/workflows/db-helpers', () => ({
+    vi.doMock('@/lib/workflows/persistence/utils', () => ({
       deployWorkflow: mockDeployWorkflow,
     }))
 

apps/sim/app/api/chat/manage/[id]/route.ts

@@ -4,11 +4,11 @@ import { eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { isDev } from '@/lib/environment'
+import { isDev } from '@/lib/core/config/environment'
+import { encryptSecret } from '@/lib/core/security/encryption'
+import { getEmailDomain } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getEmailDomain } from '@/lib/urls/utils'
-import { encryptSecret } from '@/lib/utils'
-import { deployWorkflow } from '@/lib/workflows/db-helpers'
+import { deployWorkflow } from '@/lib/workflows/persistence/utils'
 import { checkChatAccess } from '@/app/api/chat/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 

apps/sim/app/api/chat/route.test.ts

@@ -66,7 +66,7 @@ describe('Chat API Route', () => {
       }),
     }))
 
-    vi.doMock('@/lib/utils', () => ({
+    vi.doMock('@/lib/core/security/encryption', () => ({
       encryptSecret: mockEncryptSecret.mockResolvedValue({ encrypted: 'encrypted-password' }),
     }))
 
@@ -78,7 +78,7 @@ describe('Chat API Route', () => {
       checkWorkflowAccessForChatCreation: mockCheckWorkflowAccessForChatCreation,
     }))
 
-    vi.doMock('@/lib/workflows/db-helpers', () => ({
+    vi.doMock('@/lib/workflows/persistence/utils', () => ({
       deployWorkflow: mockDeployWorkflow.mockResolvedValue({
         success: true,
         version: 1,
@@ -249,7 +249,7 @@ describe('Chat API Route', () => {
         }),
       }))
 
-      vi.doMock('@/lib/env', () => ({
+      vi.doMock('@/lib/core/config/env', () => ({
         env: {
           NODE_ENV: 'development',
           NEXT_PUBLIC_APP_URL: 'http://localhost:3000',
@@ -296,7 +296,7 @@ describe('Chat API Route', () => {
         }),
       }))
 
-      vi.doMock('@/lib/env', () => ({
+      vi.doMock('@/lib/core/config/env', () => ({
         env: {
           NODE_ENV: 'development',
           NEXT_PUBLIC_APP_URL: 'http://localhost:3000',

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

@@ -5,11 +5,11 @@ import type { NextRequest } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { isDev } from '@/lib/environment'
+import { isDev } from '@/lib/core/config/environment'
+import { encryptSecret } from '@/lib/core/security/encryption'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getBaseUrl } from '@/lib/urls/utils'
-import { encryptSecret } from '@/lib/utils'
-import { deployWorkflow } from '@/lib/workflows/db-helpers'
+import { deployWorkflow } from '@/lib/workflows/persistence/utils'
 import { checkWorkflowAccessForChatCreation } from '@/app/api/chat/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 

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

@@ -5,7 +5,7 @@ import type { NextResponse } from 'next/server'
  * @vitest-environment node
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 
 vi.mock('@sim/db', () => ({
   db: {
@@ -36,8 +36,11 @@ vi.mock('@/stores/workflows/server-utils', () => ({
 
 const mockDecryptSecret = vi.fn()
 
-vi.mock('@/lib/utils', () => ({
+vi.mock('@/lib/core/security/encryption', () => ({
   decryptSecret: mockDecryptSecret,
+}))
+
+vi.mock('@/lib/core/utils/request', () => ({
   generateRequestId: vi.fn(),
 }))
 
@@ -60,7 +63,7 @@ describe('Chat API Utils', () => {
       },
     })
 
-    vi.doMock('@/lib/environment', () => ({
+    vi.doMock('@/lib/core/config/environment', () => ({
       isDev: true,
       isHosted: false,
     }))
@@ -229,7 +232,7 @@ describe('Chat API Utils', () => {
 
     it('should validate password for POST requests', async () => {
       const { validateChatAuth } = await import('@/app/api/chat/utils')
-      const { decryptSecret } = await import('@/lib/utils')
+      const { decryptSecret } = await import('@/lib/core/security/encryption')
 
       const deployment = {
         id: 'chat-id',

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

@@ -2,10 +2,10 @@ import { db } from '@sim/db'
 import { chat, workflow } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import type { NextRequest, NextResponse } from 'next/server'
-import { isDev } from '@/lib/environment'
+import { isDev } from '@/lib/core/config/environment'
+import { decryptSecret } from '@/lib/core/security/encryption'
 import { createLogger } from '@/lib/logs/console/logger'
-import { hasAdminPermission } from '@/lib/permissions/utils'
-import { decryptSecret } from '@/lib/utils'
+import { hasAdminPermission } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('ChatAuthUtils')
 

apps/sim/app/api/copilot/api-keys/generate/route.ts

@@ -1,8 +1,8 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { env } from '@/lib/env'
-import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent/constants'
+import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/copilot/constants'
+import { env } from '@/lib/core/config/env'
 
 const GenerateApiKeySchema = z.object({}).optional()
 

apps/sim/app/api/copilot/api-keys/route.ts

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { env } from '@/lib/env'
-import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent/constants'
+import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/copilot/constants'
+import { env } from '@/lib/core/config/env'
 
 export async function GET(request: NextRequest) {
   try {

apps/sim/app/api/copilot/chat/route.test.ts

@@ -97,8 +97,11 @@ describe('Copilot Chat API Route', () => {
 
     mockGetRotatingApiKey.mockReturnValue('test-api-key')
 
-    vi.doMock('@/lib/utils', () => ({
+    vi.doMock('@/lib/core/config/api-keys', () => ({
       getRotatingApiKey: mockGetRotatingApiKey,
+    }))
+
+    vi.doMock('@/lib/core/utils/request', () => ({
       generateRequestId: vi.fn(() => 'test-request-id'),
     }))
 
@@ -110,7 +113,7 @@ describe('Copilot Chat API Route', () => {
       NODE_ENV: 'test',
     } as const
 
-    vi.doMock('@/lib/env', () => ({
+    vi.doMock('@/lib/core/config/env', () => ({
       env: mockEnvValues,
       getEnv: (variable: string) => mockEnvValues[variable as keyof typeof mockEnvValues],
       isTruthy: (value: string | boolean | number | undefined) =>

apps/sim/app/api/copilot/chat/route.ts

@@ -4,19 +4,19 @@ import { and, desc, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateChatTitle } from '@/lib/copilot/chat-title'
+import { getCopilotModel } from '@/lib/copilot/config'
+import { SIM_AGENT_API_URL_DEFAULT, SIM_AGENT_VERSION } from '@/lib/copilot/constants'
 import {
   authenticateCopilotRequestSessionOnly,
   createBadRequestResponse,
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
-import { getCopilotModel } from '@/lib/copilot/config'
+} from '@/lib/copilot/request-helpers'
 import type { CopilotProviderConfig } from '@/lib/copilot/types'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
-import { SIM_AGENT_API_URL_DEFAULT, SIM_AGENT_VERSION } from '@/lib/sim-agent/constants'
-import { generateChatTitle } from '@/lib/sim-agent/utils'
 import { CopilotFiles } from '@/lib/uploads'
 import { createFileContent } from '@/lib/uploads/utils/file-utils'
 

apps/sim/app/api/copilot/chat/update-messages/route.ts

@@ -9,7 +9,7 @@ import {
   createNotFoundResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotChatUpdateAPI')

apps/sim/app/api/copilot/chats/route.ts

@@ -6,7 +6,7 @@ import {
   authenticateCopilotRequestSessionOnly,
   createInternalServerErrorResponse,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotChatsListAPI')

apps/sim/app/api/copilot/checkpoints/revert/route.test.ts

@@ -24,7 +24,7 @@ describe('Copilot Checkpoints Revert API Route', () => {
     mockCryptoUuid()
 
     // Mock getBaseUrl to return localhost for tests
-    vi.doMock('@/lib/urls/utils', () => ({
+    vi.doMock('@/lib/core/utils/urls', () => ({
       getBaseUrl: vi.fn(() => 'http://localhost:3000'),
       getBaseDomain: vi.fn(() => 'localhost:3000'),
       getEmailDomain: vi.fn(() => 'localhost:3000'),

apps/sim/app/api/copilot/checkpoints/revert/route.ts

@@ -9,10 +9,10 @@ import {
   createNotFoundResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
+import { validateUUID } from '@/lib/core/security/input-validation'
+import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { validateUUID } from '@/lib/security/input-validation'
-import { getBaseUrl } from '@/lib/urls/utils'
 
 const logger = createLogger('CheckpointRevertAPI')
 

apps/sim/app/api/copilot/checkpoints/route.ts

@@ -9,7 +9,7 @@ import {
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('WorkflowCheckpointsAPI')

apps/sim/app/api/copilot/confirm/route.test.ts

@@ -28,27 +28,23 @@ describe('Copilot Confirm API Route', () => {
     }
 
     mockGetRedisClient.mockReturnValue(mockRedisClient)
-    mockRedisExists.mockResolvedValue(1) // Tool call exists by default
+    mockRedisExists.mockResolvedValue(1)
     mockRedisSet.mockResolvedValue('OK')
 
-    vi.doMock('@/lib/redis', () => ({
+    vi.doMock('@/lib/core/config/redis', () => ({
       getRedisClient: mockGetRedisClient,
     }))
 
-    // Mock setTimeout to control polling behavior
     vi.spyOn(global, 'setTimeout').mockImplementation((callback, _delay) => {
-      // Immediately call callback to avoid delays
       if (typeof callback === 'function') {
         setImmediate(callback)
       }
       return setTimeout(() => {}, 0) as any
     })
 
-    // Mock Date.now to control timeout behavior
     let mockTime = 1640995200000
     vi.spyOn(Date, 'now').mockImplementation(() => {
-      // Increment time rapidly to trigger timeout for non-existent keys
-      mockTime += 10000 // Add 10 seconds each call
+      mockTime += 10000
       return mockTime
     })
   })
@@ -82,7 +78,6 @@ describe('Copilot Confirm API Route', () => {
 
       const req = createMockRequest('POST', {
         status: 'success',
-        // Missing toolCallId
       })
 
       const { POST } = await import('@/app/api/copilot/confirm/route')
@@ -149,7 +144,6 @@ describe('Copilot Confirm API Route', () => {
         status: 'success',
       })
 
-      // Verify Redis operations were called
       expect(mockRedisExists).toHaveBeenCalled()
       expect(mockRedisSet).toHaveBeenCalled()
     })
@@ -252,7 +246,6 @@ describe('Copilot Confirm API Route', () => {
       const authMocks = mockAuth()
       authMocks.setAuthenticated()
 
-      // Mock Redis client as unavailable
       mockGetRedisClient.mockReturnValue(null)
 
       const req = createMockRequest('POST', {
@@ -272,7 +265,6 @@ describe('Copilot Confirm API Route', () => {
       const authMocks = mockAuth()
       authMocks.setAuthenticated()
 
-      // Mock tool call as not existing in Redis
       mockRedisExists.mockResolvedValue(0)
 
       const req = createMockRequest('POST', {
@@ -292,7 +284,6 @@ describe('Copilot Confirm API Route', () => {
       const authMocks = mockAuth()
       authMocks.setAuthenticated()
 
-      // Mock Redis operations to throw an error
       mockRedisExists.mockRejectedValue(new Error('Redis connection failed'))
 
       const req = createMockRequest('POST', {
@@ -312,7 +303,6 @@ describe('Copilot Confirm API Route', () => {
       const authMocks = mockAuth()
       authMocks.setAuthenticated()
 
-      // Tool call exists but set operation fails
       mockRedisExists.mockResolvedValue(1)
       mockRedisSet.mockRejectedValue(new Error('Redis set failed'))
 
@@ -333,7 +323,6 @@ describe('Copilot Confirm API Route', () => {
       const authMocks = mockAuth()
       authMocks.setAuthenticated()
 
-      // Create a request with invalid JSON
       const req = new NextRequest('http://localhost:3000/api/copilot/confirm', {
         method: 'POST',
         body: '{invalid-json',

apps/sim/app/api/copilot/confirm/route.ts

@@ -7,9 +7,9 @@ import {
   createRequestTracker,
   createUnauthorizedResponse,
   type NotificationStatus,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
+import { getRedisClient } from '@/lib/core/config/redis'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getRedisClient } from '@/lib/redis'
 
 const logger = createLogger('CopilotConfirmAPI')
 

apps/sim/app/api/copilot/context-usage/route.ts

@@ -2,10 +2,10 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { getCopilotModel } from '@/lib/copilot/config'
+import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/copilot/constants'
 import type { CopilotProviderConfig } from '@/lib/copilot/types'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
-import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent/constants'
 
 const logger = createLogger('ContextUsageAPI')
 

apps/sim/app/api/copilot/execute-copilot-server-tool/route.ts

@@ -6,7 +6,7 @@ import {
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
 import { routeExecution } from '@/lib/copilot/tools/server/router'
 import { createLogger } from '@/lib/logs/console/logger'
 

apps/sim/app/api/copilot/feedback/route.ts

@@ -8,7 +8,7 @@ import {
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
+} from '@/lib/copilot/request-helpers'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotFeedbackAPI')

apps/sim/app/api/copilot/stats/route.ts

@@ -1,14 +1,14 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/copilot/constants'
 import {
   authenticateCopilotRequestSessionOnly,
   createBadRequestResponse,
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
-import { env } from '@/lib/env'
-import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent/constants'
+} from '@/lib/copilot/request-helpers'
+import { env } from '@/lib/core/config/env'
 
 const SIM_AGENT_API_URL = env.SIM_AGENT_API_URL || SIM_AGENT_API_URL_DEFAULT
 

apps/sim/app/api/copilot/tools/mark-complete/route.ts

@@ -1,15 +1,15 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
+import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/copilot/constants'
 import {
   authenticateCopilotRequestSessionOnly,
   createBadRequestResponse,
   createInternalServerErrorResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-} from '@/lib/copilot/auth'
-import { env } from '@/lib/env'
+} from '@/lib/copilot/request-helpers'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
-import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent/constants'
 
 const logger = createLogger('CopilotMarkToolCompleteAPI')
 

apps/sim/app/api/copilot/training/examples/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotTrainingExamplesAPI')

apps/sim/app/api/copilot/training/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { env } from '@/lib/env'
+import { env } from '@/lib/core/config/env'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotTrainingAPI')

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

@@ -4,8 +4,8 @@ import { and, eq, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 
 const logger = createLogger('CreatorProfileByIdAPI')
 

apps/sim/app/api/creators/[id]/verify/route.ts

@@ -3,8 +3,8 @@ import { templateCreators, user } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 
 const logger = createLogger('CreatorVerificationAPI')
 

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

@@ -5,8 +5,8 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import type { CreatorProfileDetails } from '@/app/_types/creator-profile'
 
 const logger = createLogger('CreatorProfilesAPI')

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

@@ -4,8 +4,9 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { decryptSecret, encryptSecret } from '@/lib/core/security/encryption'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { decryptSecret, encryptSecret, generateRequestId } from '@/lib/utils'
 import type { EnvironmentVariable } from '@/stores/settings/environment/types'
 
 const logger = createLogger('EnvironmentAPI')

apps/sim/app/api/files/authorization.ts

@@ -2,7 +2,6 @@ import { db } from '@sim/db'
 import { document, workspaceFile } from '@sim/db/schema'
 import { eq, like, or } from 'drizzle-orm'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { getFileMetadata } from '@/lib/uploads'
 import type { StorageContext } from '@/lib/uploads/config'
 import {
@@ -14,6 +13,7 @@ import {
 import type { StorageConfig } from '@/lib/uploads/core/storage-client'
 import { getFileMetadataByKey } from '@/lib/uploads/server/metadata'
 import { inferContextFromKey } from '@/lib/uploads/utils/file-utils'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('FileAuthorization')
 

apps/sim/app/api/files/download/route.ts

@@ -61,7 +61,7 @@ export async function POST(request: NextRequest) {
       throw new FileNotFoundError(`File not found: ${key}`)
     }
 
-    const { getBaseUrl } = await import('@/lib/urls/utils')
+    const { getBaseUrl } = await import('@/lib/core/utils/urls')
     const downloadUrl = `${getBaseUrl()}/api/files/serve/${encodeURIComponent(key)}?context=${storageContext}`
 
     logger.info(`Generated download URL for ${storageContext} file: ${key}`)

apps/sim/app/api/files/parse/route.ts

@@ -5,10 +5,9 @@ import path from 'path'
 import binaryExtensionsList from 'binary-extensions'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
+import { validateExternalUrl } from '@/lib/core/security/input-validation'
 import { isSupportedFileType, parseFile } from '@/lib/file-parsers'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
-import { validateExternalUrl } from '@/lib/security/input-validation'
 import { isUsingCloudStorage, type StorageContext, StorageService } from '@/lib/uploads'
 import { UPLOAD_DIR_SERVER } from '@/lib/uploads/core/setup.server'
 import { getFileMetadataByKey } from '@/lib/uploads/server/metadata'
@@ -19,6 +18,7 @@ import {
   getViewerUrl,
   inferContextFromKey,
 } from '@/lib/uploads/utils/file-utils'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import { verifyFileAccess } from '@/app/api/files/authorization'
 import '@/lib/uploads/core/setup.server'
 

apps/sim/app/api/files/upload/route.ts

@@ -2,10 +2,10 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { createLogger } from '@/lib/logs/console/logger'
 import '@/lib/uploads/core/setup.server'
 import { getSession } from '@/lib/auth'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import type { StorageContext } from '@/lib/uploads/config'
 import { isImageFileType } from '@/lib/uploads/utils/file-utils'
 import { validateFileType } from '@/lib/uploads/utils/validation'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 import {
   createErrorResponse,
   createOptionsResponse,

apps/sim/app/api/folders/[id]/duplicate/route.ts

@@ -4,10 +4,10 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
-import { generateRequestId } from '@/lib/utils'
-import { duplicateWorkflow } from '@/lib/workflows/duplicate'
+import { duplicateWorkflow } from '@/lib/workflows/persistence/duplicate'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('FolderDuplicateAPI')
 

apps/sim/app/api/folders/[id]/route.test.ts

@@ -113,7 +113,7 @@ describe('Individual Folder API Route', () => {
 
     mockGetUserEntityPermissions.mockResolvedValue('admin')
 
-    vi.doMock('@/lib/permissions/utils', () => ({
+    vi.doMock('@/lib/workspaces/permissions/utils', () => ({
       getUserEntityPermissions: mockGetUserEntityPermissions,
     }))
   })

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

@@ -5,7 +5,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('FoldersIDAPI')
 

apps/sim/app/api/folders/route.test.ts

@@ -83,7 +83,7 @@ describe('Folders API Route', () => {
       },
     }))
 
-    vi.doMock('@/lib/permissions/utils', () => ({
+    vi.doMock('@/lib/workspaces/permissions/utils', () => ({
       getUserEntityPermissions: mockGetUserEntityPermissions,
     }))
   })

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

@@ -4,7 +4,7 @@ import { and, asc, desc, eq, isNull } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getUserEntityPermissions } from '@/lib/permissions/utils'
+import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
 
 const logger = createLogger('FoldersAPI')
 

apps/sim/app/api/function/execute/route.test.ts

@@ -66,7 +66,7 @@ describe('Function Execute API Route', () => {
     })
 
     it.concurrent('should block SSRF attacks through secure fetch wrapper', async () => {
-      const { validateProxyUrl } = await import('@/lib/security/input-validation')
+      const { validateProxyUrl } = await import('@/lib/core/security/input-validation')
 
       expect(validateProxyUrl('http://169.254.169.254/latest/meta-data/').isValid).toBe(false)
       expect(validateProxyUrl('http://127.0.0.1:8080/admin').isValid).toBe(false)
@@ -75,7 +75,7 @@ describe('Function Execute API Route', () => {
     })
 
     it.concurrent('should allow legitimate external URLs', async () => {
-      const { validateProxyUrl } = await import('@/lib/security/input-validation')
+      const { validateProxyUrl } = await import('@/lib/core/security/input-validation')
 
       expect(validateProxyUrl('https://api.github.com/user').isValid).toBe(true)
       expect(validateProxyUrl('https://httpbin.org/get').isValid).toBe(true)
@@ -83,7 +83,7 @@ describe('Function Execute API Route', () => {
     })
 
     it.concurrent('should block dangerous protocols', async () => {
-      const { validateProxyUrl } = await import('@/lib/security/input-validation')
+      const { validateProxyUrl } = await import('@/lib/core/security/input-validation')
 
       expect(validateProxyUrl('file:///etc/passwd').isValid).toBe(false)
       expect(validateProxyUrl('ftp://internal.server/files').isValid).toBe(false)

apps/sim/app/api/function/execute/route.ts

@@ -1,11 +1,11 @@
 import { createContext, Script } from 'vm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { env, isTruthy } from '@/lib/env'
+import { env, isTruthy } from '@/lib/core/config/env'
+import { validateProxyUrl } from '@/lib/core/security/input-validation'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { executeInE2B } from '@/lib/execution/e2b'
 import { CodeLanguage, DEFAULT_CODE_LANGUAGE, isValidCodeLanguage } from '@/lib/execution/languages'
 import { createLogger } from '@/lib/logs/console/logger'
-import { validateProxyUrl } from '@/lib/security/input-validation'
-import { generateRequestId } from '@/lib/utils'
 export const dynamic = 'force-dynamic'
 export const runtime = 'nodejs'
 

apps/sim/app/api/guardrails/validate/route.ts

@@ -1,10 +1,10 @@
 import { type NextRequest, NextResponse } from 'next/server'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { validateHallucination } from '@/lib/guardrails/validate_hallucination'
 import { validateJson } from '@/lib/guardrails/validate_json'
 import { validatePII } from '@/lib/guardrails/validate_pii'
 import { validateRegex } from '@/lib/guardrails/validate_regex'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 
 const logger = createLogger('GuardrailsValidateAPI')
 

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

@@ -2,12 +2,12 @@ import { type NextRequest, NextResponse } from 'next/server'
 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 { env } from '@/lib/core/config/env'
+import { generateRequestId } from '@/lib/core/utils/request'
+import { getEmailDomain } from '@/lib/core/utils/urls'
 import { createLogger } from '@/lib/logs/console/logger'
-import { getEmailDomain } from '@/lib/urls/utils'
-import { generateRequestId } from '@/lib/utils'
+import { sendEmail } from '@/lib/messaging/email/mailer'
+import { getFromEmailAddress } from '@/lib/messaging/email/utils'
 
 const logger = createLogger('HelpAPI')
 

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

@@ -2,8 +2,8 @@ import { runs } from '@trigger.dev/sdk'
 import { type NextRequest, NextResponse } from 'next/server'
 import { authenticateApiKeyFromHeader, updateApiKeyLastUsed } from '@/lib/api-key/service'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { createErrorResponse } from '@/app/api/workflows/utils'
 
 const logger = createLogger('TaskStatusAPI')

apps/sim/app/api/knowledge/[id]/documents/[documentId]/chunks/route.ts

@@ -1,9 +1,9 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import { batchChunkOperation, createChunk, queryChunks } from '@/lib/knowledge/chunks/service'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { getUserId } from '@/app/api/auth/oauth/utils'
 import { checkDocumentAccess, checkDocumentWriteAccess } from '@/app/api/knowledge/utils'
 import { calculateCost } from '@/providers/utils'

apps/sim/app/api/knowledge/[id]/documents/[documentId]/route.ts

@@ -1,6 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import {
   deleteDocument,
   markDocumentAsFailedTimeout,
@@ -8,7 +9,6 @@ import {
   updateDocument,
 } from '@/lib/knowledge/documents/service'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { checkDocumentAccess, checkDocumentWriteAccess } from '@/app/api/knowledge/utils'
 
 const logger = createLogger('DocumentByIdAPI')

apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts

@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/consts'
+import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import {
   cleanupUnusedTagDefinitions,
   createOrUpdateTagDefinitionsBulk,

apps/sim/app/api/knowledge/[id]/documents/route.ts

@@ -189,7 +189,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
 
         // Track bulk document upload
         try {
-          const { trackPlatformEvent } = await import('@/lib/telemetry/tracer')
+          const { trackPlatformEvent } = await import('@/lib/core/telemetry')
           trackPlatformEvent('platform.knowledge_base.documents_uploaded', {
             'knowledge_base.id': knowledgeBaseId,
             'documents.count': createdDocuments.length,
@@ -253,7 +253,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
 
         // Track single document upload
         try {
-          const { trackPlatformEvent } = await import('@/lib/telemetry/tracer')
+          const { trackPlatformEvent } = await import('@/lib/core/telemetry')
           trackPlatformEvent('platform.knowledge_base.documents_uploaded', {
             'knowledge_base.id': knowledgeBaseId,
             'documents.count': 1,

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

@@ -1,13 +1,13 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
+import { generateRequestId } from '@/lib/core/utils/request'
 import {
   deleteKnowledgeBase,
   getKnowledgeBaseById,
   updateKnowledgeBase,
 } from '@/lib/knowledge/service'
 import { createLogger } from '@/lib/logs/console/logger'
-import { generateRequestId } from '@/lib/utils'
 import { checkKnowledgeBaseAccess, checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 
 const logger = createLogger('KnowledgeBaseByIdAPI')