refactor(logger): code cleanup for new execution logger (#798)

* refactor(logger): code hygiene with new logger

* modify remaining files

* simplify code structure

---------

Co-authored-by: waleedlatif <waleedlatif@waleedlatifs-MacBook-Pro.local>

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

@@ -15,7 +15,7 @@ import {
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { client } from '@/lib/auth-client'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
 import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'
 

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

@@ -11,7 +11,7 @@ import {
   CardHeader,
   CardTitle,
 } from '@/components/ui/card'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { SetNewPasswordForm } from './reset-password-form'
 
 const logger = createLogger('ResetPasswordPage')

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

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

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

@@ -279,7 +279,7 @@ export function mockExecutionDependencies() {
     }
   })
 
-  vi.mock('@/lib/logs/trace-spans', () => ({
+  vi.mock('@/lib/logs/execution/trace-spans/trace-spans', () => ({
     buildTraceSpans: vi.fn().mockReturnValue({
       traceSpans: [],
       totalDuration: 100,
@@ -375,7 +375,7 @@ export function mockWorkflowAccessValidation(shouldSucceed = true) {
 
 export async function getMockedDependencies() {
   const utilsModule = await import('@/lib/utils')
-  const traceSpansModule = await import('@/lib/logs/trace-spans')
+  const traceSpansModule = await import('@/lib/logs/execution/trace-spans/trace-spans')
   const workflowUtilsModule = await import('@/lib/workflows/utils')
   const executorModule = await import('@/executor')
   const serializerModule = await import('@/serializer')
@@ -655,7 +655,7 @@ export function mockKnowledgeSchemas() {
  * Mock console logger
  */
 export function mockConsoleLogger() {
-  vi.doMock('@/lib/logs/console-logger', () => ({
+  vi.doMock('@/lib/logs/console/logger', () => ({
     createLogger: vi.fn().mockReturnValue(mockLogger),
   }))
 }

apps/sim/app/api/auth/forget-password/route.test.ts

@@ -134,7 +134,7 @@ describe('Forget Password API Route', () => {
     expect(response.status).toBe(500)
     expect(data.message).toBe(errorMessage)
 
-    const logger = await import('@/lib/logs/console-logger')
+    const logger = await import('@/lib/logs/console/logger')
     const mockLogger = logger.createLogger('ForgetPasswordTest')
     expect(mockLogger.error).toHaveBeenCalledWith('Error requesting password reset:', {
       error: expect.any(Error),
@@ -164,7 +164,7 @@ describe('Forget Password API Route', () => {
     expect(response.status).toBe(500)
     expect(data.message).toBe('Failed to send password reset email. Please try again later.')
 
-    const logger = await import('@/lib/logs/console-logger')
+    const logger = await import('@/lib/logs/console/logger')
     const mockLogger = logger.createLogger('ForgetPasswordTest')
     expect(mockLogger.error).toHaveBeenCalled()
   })

apps/sim/app/api/auth/forget-password/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { auth } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -51,7 +51,7 @@ describe('OAuth Connections API Route', () => {
       jwtDecode: vi.fn(),
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
   })

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

@@ -2,7 +2,7 @@ import { eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { account, user } from '@/db/schema'
 

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

@@ -63,7 +63,7 @@ describe('OAuth Credentials API Route', () => {
       jwtDecode: vi.fn(),
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
   })

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

@@ -2,7 +2,7 @@ import { and, eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import type { OAuthService } from '@/lib/oauth/oauth'
 import { parseProvider } from '@/lib/oauth/oauth'
 import { db } from '@/db'

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

@@ -47,7 +47,7 @@ describe('OAuth Disconnect API Route', () => {
       or: vi.fn((...conditions) => ({ conditions, type: 'or' })),
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
   })

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

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

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

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

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

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

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

@@ -34,7 +34,7 @@ describe('OAuth Token API Routes', () => {
       refreshTokenIfNeeded: mockRefreshTokenIfNeeded,
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
   })

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

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getCredential, getUserId, refreshTokenIfNeeded } from '../utils'
 
 export const dynamic = 'force-dynamic'

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

@@ -39,7 +39,7 @@ describe('OAuth Utils', () => {
       refreshOAuthToken: mockRefreshOAuthToken,
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
   })

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

@@ -1,6 +1,6 @@
 import { and, eq } from 'drizzle-orm'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { refreshOAuthToken } from '@/lib/oauth/oauth'
 import { db } from '@/db'
 import { account, workflow } from '@/db/schema'

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

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

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

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

apps/sim/app/api/auth/reset-password/route.test.ts

@@ -148,7 +148,7 @@ describe('Reset Password API Route', () => {
     expect(response.status).toBe(500)
     expect(data.message).toBe(errorMessage)
 
-    const logger = await import('@/lib/logs/console-logger')
+    const logger = await import('@/lib/logs/console/logger')
     const mockLogger = logger.createLogger('PasswordReset')
     expect(mockLogger.error).toHaveBeenCalledWith('Error during password reset:', {
       error: expect.any(Error),
@@ -181,7 +181,7 @@ describe('Reset Password API Route', () => {
       'Failed to reset password. Please try again or request a new reset link.'
     )
 
-    const logger = await import('@/lib/logs/console-logger')
+    const logger = await import('@/lib/logs/console/logger')
     const mockLogger = logger.createLogger('PasswordReset')
     expect(mockLogger.error).toHaveBeenCalled()
   })

apps/sim/app/api/auth/reset-password/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { auth } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { processDailyBillingCheck } from '@/lib/billing/core/billing'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('DailyBillingCron')
 

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

@@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { getSimplifiedBillingSummary } from '@/lib/billing/core/billing'
 import { getOrganizationBillingData } from '@/lib/billing/core/organization-billing'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member } from '@/db/schema'
 

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

@@ -4,7 +4,7 @@ import type Stripe from 'stripe'
 import { requireStripeClient } from '@/lib/billing/stripe-client'
 import { handleInvoiceWebhook } from '@/lib/billing/webhooks/stripe-invoice-webhooks'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('StripeInvoiceWebhook')
 

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

@@ -3,7 +3,7 @@ import type { NextRequest } from 'next/server'
 import { z } from 'zod'
 import { renderOTPEmail } from '@/components/emails/render-email'
 import { sendEmail } from '@/lib/email/mailer'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getRedisClient, markMessageAsProcessed, releaseLock } from '@/lib/redis'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 import { db } from '@/db'

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

@@ -75,7 +75,7 @@ describe('Chat Subdomain API Route', () => {
       executeWorkflowForChat: mockExecuteWorkflowForChat,
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         debug: vi.fn(),
         info: vi.fn(),

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

@@ -1,6 +1,6 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 import { db } from '@/db'
 import { chat, workflow } from '@/db/schema'

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

@@ -42,7 +42,7 @@ describe('Chat Edit API Route', () => {
       chat: { id: 'id', subdomain: 'subdomain', userId: 'userId' },
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         info: vi.fn(),
         error: vi.fn(),

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

@@ -3,7 +3,7 @@ import type { NextRequest } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { isDev } from '@/lib/environment'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getEmailDomain } from '@/lib/urls/utils'
 import { encryptSecret } from '@/lib/utils'
 import { checkChatAccess } from '@/app/api/chat/utils'

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

@@ -41,7 +41,7 @@ describe('Chat API Route', () => {
       workflow: { id: 'id', userId: 'userId', isDeployed: 'isDeployed' },
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         info: vi.fn(),
         error: vi.fn(),

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

@@ -5,7 +5,7 @@ import { z } from 'zod'
 import { getSession } from '@/lib/auth'
 import { env } from '@/lib/env'
 import { isDev } from '@/lib/environment'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { encryptSecret } from '@/lib/utils'
 import { checkWorkflowAccessForChatCreation } from '@/app/api/chat/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'

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

@@ -41,7 +41,7 @@ describe('Subdomain Validation API Route', () => {
     }))
 
     // Mock the logger
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         info: vi.fn(),
         error: vi.fn(),

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

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm'
 import { NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -18,8 +18,8 @@ vi.mock('@/lib/utils', () => ({
   decryptSecret: vi.fn().mockResolvedValue({ decrypted: 'test-secret' }),
 }))
 
-vi.mock('@/lib/logs/enhanced-logging-session', () => ({
+vi.mock('@/lib/logs/execution/logging-session', () => ({
-  EnhancedLoggingSession: vi.fn().mockImplementation(() => ({
+  LoggingSession: vi.fn().mockImplementation(() => ({
     safeStart: vi.fn().mockResolvedValue(undefined),
     safeComplete: vi.fn().mockResolvedValue(undefined),
     safeCompleteWithError: vi.fn().mockResolvedValue(undefined),
@@ -42,7 +42,7 @@ describe('Chat API Utils', () => {
   beforeEach(() => {
     vi.resetModules()
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         info: vi.fn(),
         error: vi.fn(),

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

@@ -2,9 +2,9 @@ import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { isDev } from '@/lib/environment'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
-import { EnhancedLoggingSession } from '@/lib/logs/enhanced-logging-session'
+import { LoggingSession } from '@/lib/logs/execution/logging-session'
-import { buildTraceSpans } from '@/lib/logs/trace-spans'
+import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
 import { hasAdminPermission } from '@/lib/permissions/utils'
 import { processStreamingBlockLogs } from '@/lib/tokenization'
 import { getEmailDomain } from '@/lib/urls/utils'
@@ -330,8 +330,8 @@ export async function executeWorkflowForChat(
   const workflowId = deployment.workflowId
   const executionId = uuidv4()
 
-  // Set up enhanced logging for chat execution
+  // Set up logging for chat execution
-  const loggingSession = new EnhancedLoggingSession(workflowId, executionId, 'chat', requestId)
+  const loggingSession = new LoggingSession(workflowId, executionId, 'chat', requestId)
 
   // Check for multi-output configuration in customizations
   const customizations = (deployment.customizations || {}) as Record<string, any>
@@ -494,7 +494,7 @@ export async function executeWorkflowForChat(
     {} as Record<string, Record<string, any>>
   )
 
-  // Start enhanced logging session
+  // Start logging session
   await loggingSession.safeStart({
     userId: deployment.userId,
     workspaceId: '', // TODO: Get from workflow
@@ -552,7 +552,7 @@ export async function executeWorkflowForChat(
         },
       })
 
-      // Set up enhanced logging on the executor
+      // Set up logging on the executor
       loggingSession.setupExecutor(executor)
 
       let result
@@ -624,7 +624,7 @@ export async function executeWorkflowForChat(
         )
       }
 
-      // Complete enhanced logging session (for both success and failure)
+      // Complete logging session (for both success and failure)
       if (result && 'success' in result) {
         const { traceSpans } = buildTraceSpans(result)
         await loggingSession.safeComplete({

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

@@ -51,7 +51,7 @@ describe('Codegen API Route', () => {
       env: mockEnv,
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
 

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

@@ -2,7 +2,7 @@ import { unstable_noStore as noStore } from 'next/cache'
 import { type NextRequest, NextResponse } from 'next/server'
 import OpenAI from 'openai'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 export const runtime = 'edge'

apps/sim/app/api/copilot/checkpoints/[id]/revert/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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { copilotCheckpoints, workflow as workflowTable } from '@/db/schema'
 

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

@@ -1,7 +1,7 @@
 import { and, 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 { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { copilotCheckpoints } from '@/db/schema'
 

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

@@ -10,7 +10,7 @@ import {
   sendMessage,
   updateChat,
 } from '@/lib/copilot/service'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CopilotAPI')
 

apps/sim/app/api/docs/search/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { searchDocumentation } from '@/lib/copilot/service'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('DocsSearchAPI')
 

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

@@ -2,7 +2,7 @@ import { 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 { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -2,7 +2,7 @@ import { existsSync } from 'fs'
 import { unlink } from 'fs/promises'
 import { join } from 'path'
 import type { NextRequest } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { deleteFile, isUsingCloudStorage } from '@/lib/uploads'
 import { UPLOAD_DIR } from '@/lib/uploads/setup'
 import '@/lib/uploads/setup.server'

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

@@ -5,7 +5,7 @@ import path from 'path'
 import binaryExtensionsList from 'binary-extensions'
 import { type NextRequest, NextResponse } from 'next/server'
 import { isSupportedFileType, parseFile } from '@/lib/file-parsers'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { downloadFile, isUsingCloudStorage } from '@/lib/uploads'
 import { UPLOAD_DIR } from '@/lib/uploads/setup'
 import '@/lib/uploads/setup.server'

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

@@ -2,7 +2,7 @@ import { PutObjectCommand } from '@aws-sdk/client-s3'
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getStorageProvider, isUsingCloudStorage } from '@/lib/uploads'
 import { getBlobServiceClient } from '@/lib/uploads/blob/blob-client'
 import { getS3Client, sanitizeFilenameForMetadata } from '@/lib/uploads/s3/s3-client'

apps/sim/app/api/files/serve/[...path]/route.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises'
 import type { NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { downloadFile, getStorageProvider, isUsingCloudStorage } from '@/lib/uploads'
 import { BLOB_KB_CONFIG, S3_KB_CONFIG } from '@/lib/uploads/setup'
 import '@/lib/uploads/setup.server'

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

@@ -2,7 +2,7 @@ import { writeFile } from 'fs/promises'
 import { join } from 'path'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { isUsingCloudStorage, uploadFile } from '@/lib/uploads'
 import { UPLOAD_DIR } from '@/lib/uploads/setup'
 // Import to ensure the uploads directory is created

apps/sim/app/api/folders/[id]/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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -1,7 +1,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 { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { workflowFolder } from '@/db/schema'

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

@@ -41,7 +41,7 @@ describe('Function Execute API Route', () => {
       },
     }))
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
 
@@ -657,7 +657,7 @@ describe('Function Execute API - Template Variable Edge Cases', () => {
     vi.resetModules()
     vi.resetAllMocks()
 
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue(mockLogger),
     }))
 

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

@@ -1,6 +1,6 @@
 import { createContext, Script } from 'vm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 export const runtime = 'nodejs'

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

@@ -2,7 +2,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { Resend } from 'resend'
 import { z } from 'zod'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+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

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

@@ -2,7 +2,7 @@ import { runs } from '@trigger.dev/sdk/v3'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 
 export const dynamic = 'force-dynamic'

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

@@ -3,7 +3,7 @@ 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 { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -3,7 +3,7 @@ import { and, asc, eq, ilike, inArray, 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 { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -2,7 +2,7 @@ import { 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 { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -3,7 +3,7 @@ import { and, desc, eq, inArray, isNull, 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 { createLogger } from '@/lib/logs/console/logger'
 import { getUserId } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { document } from '@/db/schema'

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

@@ -2,7 +2,7 @@ import { and, eq, isNull } 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 { createLogger } from '@/lib/logs/console/logger'
 import { checkKnowledgeBaseAccess, checkKnowledgeBaseWriteAccess } from '@/app/api/knowledge/utils'
 import { db } from '@/db'
 import { knowledgeBase } from '@/db/schema'

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

@@ -2,7 +2,7 @@ import { and, count, eq, isNotNull, isNull, or } 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 { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { document, knowledgeBase, permissions } from '@/db/schema'

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

@@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { retryWithExponentialBackoff } from '@/lib/documents/utils'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { estimateTokenCount } from '@/lib/tokenization/estimators'
 import { getUserId } from '@/app/api/auth/oauth/utils'
 import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'

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

@@ -3,7 +3,7 @@ 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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getUserEntityPermissions } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { document, embedding, knowledgeBase } from '@/db/schema'

apps/sim/app/api/logs/[executionId]/frozen-canvas/route.ts

@@ -1,6 +1,6 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { workflowExecutionLogs, workflowExecutionSnapshots } from '@/db/schema'
 

apps/sim/app/api/logs/cleanup/route.ts

@@ -3,8 +3,8 @@ import { and, eq, inArray, lt, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
-import { snapshotService } from '@/lib/logs/snapshot-service'
+import { snapshotService } from '@/lib/logs/execution/snapshot/service'
 import { getS3Client } from '@/lib/uploads/s3/s3-client'
 import { db } from '@/db'
 import { subscription, user, workflow, workflowExecutionLogs } from '@/db/schema'

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

@@ -2,11 +2,11 @@ import { and, desc, eq, gte, inArray, lte, or, type SQL, 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 { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { permissions, workflow, workflowExecutionLogs } from '@/db/schema'
 
-const logger = createLogger('EnhancedLogsAPI')
+const logger = createLogger('LogsAPI')
 
 // Helper function to extract block executions from trace spans
 function extractBlockExecutionsFromTraceSpans(traceSpans: any[]): any[] {
@@ -65,7 +65,7 @@ export async function GET(request: NextRequest) {
   try {
     const session = await getSession()
     if (!session?.user?.id) {
-      logger.warn(`[${requestId}] Unauthorized enhanced logs access attempt`)
+      logger.warn(`[${requestId}] Unauthorized logs access attempt`)
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
     }
 
@@ -100,7 +100,7 @@ export async function GET(request: NextRequest) {
         return NextResponse.json({ data: [], total: 0 }, { status: 200 })
       }
 
-      // Build conditions for enhanced logs
+      // Build conditions for logs
       let conditions: SQL | undefined = inArray(workflowExecutionLogs.workflowId, userWorkflowIds)
 
       // Filter by level
@@ -271,7 +271,7 @@ export async function GET(request: NextRequest) {
         }
       }
 
-      // Transform to clean enhanced log format
+      // Transform to clean log format
       const enhancedLogs = logs.map((log) => {
         const blockExecutions = blockExecutionsByExecution[log.executionId] || []
 
@@ -396,7 +396,7 @@ export async function GET(request: NextRequest) {
       )
     } catch (validationError) {
       if (validationError instanceof z.ZodError) {
-        logger.warn(`[${requestId}] Invalid enhanced logs request parameters`, {
+        logger.warn(`[${requestId}] Invalid logs request parameters`, {
           errors: validationError.errors,
         })
         return NextResponse.json(
@@ -410,7 +410,7 @@ export async function GET(request: NextRequest) {
       throw validationError
     }
   } catch (error: any) {
-    logger.error(`[${requestId}] Enhanced logs fetch error`, error)
+    logger.error(`[${requestId}] logs fetch error`, error)
     return NextResponse.json({ error: error.message }, { status: 500 })
   }
 }

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

@@ -1,6 +1,6 @@
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { memory } from '@/db/schema'
 

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

@@ -1,6 +1,6 @@
 import { and, eq, isNull, like } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { memory } from '@/db/schema'
 

apps/sim/app/api/organizations/[id]/invitations/route.ts

@@ -14,7 +14,7 @@ import {
 import { sendEmail } from '@/lib/email/mailer'
 import { validateAndNormalizeEmail } from '@/lib/email/utils'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { hasWorkspaceAdminAccess } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { invitation, member, organization, user, workspace, workspaceInvitation } from '@/db/schema'

apps/sim/app/api/organizations/[id]/members/[memberId]/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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member, user, userStats } from '@/db/schema'
 

apps/sim/app/api/organizations/[id]/members/route.ts

@@ -7,7 +7,7 @@ import { validateSeatAvailability } from '@/lib/billing/validation/seat-manageme
 import { sendEmail } from '@/lib/email/mailer'
 import { validateAndNormalizeEmail } from '@/lib/email/utils'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { invitation, member, organization, user, userStats } from '@/db/schema'
 

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

@@ -6,7 +6,7 @@ import {
   getOrganizationSeatInfo,
   updateOrganizationSeats,
 } from '@/lib/billing/validation/seat-management'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -1,7 +1,7 @@
 import { and, eq, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member, permissions, user, workspace } from '@/db/schema'
 

apps/sim/app/api/organizations/invitations/accept/route.ts

@@ -3,7 +3,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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { invitation, member, permissions, workspaceInvitation } from '@/db/schema'
 

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

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import type { StreamingExecution } from '@/executor/types'
 import { executeProviderRequest } from '@/providers'
 import { getApiKey } from '@/providers/utils'

apps/sim/app/api/proxy/image/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('ImageProxyAPI')
 

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

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server'
 import { isDev } from '@/lib/environment'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { executeTool } from '@/tools'
 import { getTool, validateToolRequest } from '@/tools/utils'
 

apps/sim/app/api/proxy/tts/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { uploadFile } from '@/lib/uploads/storage-client'
 import { getBaseUrl } from '@/lib/urls/utils'
 

apps/sim/app/api/proxy/tts/stream/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server'
 import { env } from '@/lib/env'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('ProxyTTSStreamAPI')
 

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

@@ -2,7 +2,7 @@ import crypto from 'crypto'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { workflow, workflowSchedule } from '@/db/schema'
 

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

@@ -20,7 +20,7 @@ const mockSchedule = {
 beforeEach(() => {
   vi.resetModules()
 
-  vi.doMock('@/lib/logs/console-logger', () => ({
+  vi.doMock('@/lib/logs/console/logger', () => ({
     createLogger: () => ({ info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() }),
   }))
 

apps/sim/app/api/schedules/[id]/status/route.ts

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 export const dynamic = 'force-dynamic'
 

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

@@ -4,9 +4,9 @@ import { NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { checkServerSideUsageLimits } from '@/lib/billing'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
-import { EnhancedLoggingSession } from '@/lib/logs/enhanced-logging-session'
+import { LoggingSession } from '@/lib/logs/execution/logging-session'
-import { buildTraceSpans } from '@/lib/logs/trace-spans'
+import { buildTraceSpans } from '@/lib/logs/execution/trace-spans/trace-spans'
 import {
   type BlockState,
   calculateNextRunTime as calculateNextTime,
@@ -173,7 +173,7 @@ export async function GET() {
             }
           )
 
-          // Error logging handled by enhanced logging session
+          // Error logging handled by logging session
 
           const retryDelay = 24 * 60 * 60 * 1000 // 24 hour delay for exceeded limits
           const nextRetryAt = new Date(now.getTime() + retryDelay)
@@ -202,7 +202,7 @@ export async function GET() {
         try {
           const executionSuccess = await (async () => {
             // Create logging session inside the execution callback
-            const loggingSession = new EnhancedLoggingSession(
+            const loggingSession = new LoggingSession(
               schedule.workflowId,
               executionId,
               'schedule',
@@ -386,7 +386,7 @@ export async function GET() {
               },
             }
 
-            // Start enhanced logging with environment variables
+            // Start logging with environment variables
             await loggingSession.safeStart({
               userId: workflowRecord.userId,
               workspaceId: workflowRecord.workspaceId || '',
@@ -401,7 +401,7 @@ export async function GET() {
               workflowVariables
             )
 
-            // Set up enhanced logging on the executor
+            // Set up logging on the executor
             loggingSession.setupExecutor(executor)
 
             const result = await executor.execute(
@@ -437,7 +437,7 @@ export async function GET() {
 
             const { traceSpans, totalDuration } = buildTraceSpans(executionResult)
 
-            // Complete enhanced logging
+            // Complete logging
             await loggingSession.safeComplete({
               endedAt: new Date().toISOString(),
               totalDurationMs: totalDuration || 0,
@@ -534,7 +534,7 @@ export async function GET() {
               error
             )
 
-            // Error logging handled by enhanced logging session inside sync executor
+            // Error logging handled by logging session inside sync executor
 
             let nextRunAt: Date
             try {

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

@@ -3,7 +3,7 @@ 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 { createLogger } from '@/lib/logs/console/logger'
 import {
   type BlockState,
   calculateNextRunTime,

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

@@ -1,7 +1,7 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { env } from '@/lib/env'
 import { isProd } from '@/lib/environment'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('TelemetryAPI')
 

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

@@ -1,7 +1,7 @@
 import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { templates } from '@/db/schema'
 

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

@@ -2,7 +2,7 @@ import { and, eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { templateStars, templates } from '@/db/schema'
 

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

@@ -2,7 +2,7 @@ import { eq, sql } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { templates, workflow, workflowBlocks, workflowEdges } from '@/db/schema'
 

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

@@ -3,7 +3,7 @@ import { type NextRequest, NextResponse } from 'next/server'
 import { v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { templateStars, templates, workflow } from '@/db/schema'
 

apps/sim/app/api/tools/confluence/pages/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getConfluenceCloudId } from '@/tools/confluence/utils'
 
 const logger = createLogger('ConfluencePages')

apps/sim/app/api/tools/custom/route.test.ts

@@ -128,7 +128,7 @@ describe('Custom Tools API Routes', () => {
     }))
 
     // Mock logger
-    vi.doMock('@/lib/logs/console-logger', () => ({
+    vi.doMock('@/lib/logs/console/logger', () => ({
       createLogger: vi.fn().mockReturnValue({
         info: vi.fn(),
         error: vi.fn(),

apps/sim/app/api/tools/custom/route.ts

@@ -2,7 +2,7 @@ import { 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 { createLogger } from '@/lib/logs/console/logger'
 import { getUserId } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { customTools } from '@/db/schema'

apps/sim/app/api/tools/discord/channels/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 interface DiscordChannel {
   id: string

apps/sim/app/api/tools/discord/servers/route.ts

@@ -1,5 +1,5 @@
 import { NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 
 interface DiscordServer {
   id: string

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

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { account } from '@/db/schema'

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

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { account } from '@/db/schema'

apps/sim/app/api/tools/edit-workflow/route.ts

@@ -1,7 +1,7 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { autoLayoutWorkflow } from '@/lib/autolayout/service'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import {
   loadWorkflowFromNormalizedTables,
   saveWorkflowToNormalizedTables,

apps/sim/app/api/tools/get-all-blocks/route.ts

@@ -1,5 +1,5 @@
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { registry as blockRegistry } from '@/blocks/registry'
 
 const logger = createLogger('GetAllBlocksAPI')

apps/sim/app/api/tools/get-blocks-metadata/route.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'fs'
 import { join } from 'path'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { registry as blockRegistry } from '@/blocks/registry'
 import { tools as toolsRegistry } from '@/tools/registry'
 

apps/sim/app/api/tools/get-user-workflow/route.ts

@@ -1,6 +1,6 @@
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/db-helpers'
 import { generateWorkflowYaml } from '@/lib/workflows/yaml-generator'
 import { getBlock } from '@/blocks'

apps/sim/app/api/tools/gmail/label/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 { createLogger } from '@/lib/logs/console-logger'
+import { createLogger } from '@/lib/logs/console/logger'
 import { refreshAccessTokenIfNeeded } from '@/app/api/auth/oauth/utils'
 import { db } from '@/db'
 import { account } from '@/db/schema'