Fix lint, address greptile comments

Author: Theodore Li

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

@@ -1,4 +1,4 @@
-import { createLogger, type Logger } from '@sim/logger'
+import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { validate as uuidValidate, v4 as uuidv4 } from 'uuid'
 import { z } from 'zod'
@@ -187,7 +187,13 @@ type AsyncExecutionParams = {
 async function handleAsyncExecution(params: AsyncExecutionParams): Promise<NextResponse> {
   const { requestId, workflowId, userId, workspaceId, input, triggerType, executionId, callChain } =
     params
-  const asyncLogger = logger.withMetadata({ requestId, workflowId, workspaceId, userId, executionId })
+  const asyncLogger = logger.withMetadata({
+    requestId,
+    workflowId,
+    workspaceId,
+    userId,
+    executionId,
+  })
 
   const correlation = {
     executionId,

apps/sim/executor/execution/block-executor.ts

@@ -49,20 +49,20 @@ import { SYSTEM_SUBBLOCK_IDS } from '@/triggers/constants'
 const logger = createLogger('BlockExecutor')
 
 export class BlockExecutor {
+  private execLogger: Logger
+
   constructor(
     private blockHandlers: BlockHandler[],
     private resolver: VariableResolver,
     private contextExtensions: ContextExtensions,
     private state: BlockStateWriter
-  ) {}
-
-  private loggerFor(ctx: ExecutionContext): Logger {
-    return logger.withMetadata({
-      workflowId: ctx.workflowId,
-      workspaceId: ctx.workspaceId,
-      executionId: ctx.executionId,
-      userId: ctx.userId,
-      requestId: ctx.metadata.requestId,
+  ) {
+    this.execLogger = logger.withMetadata({
+      workflowId: this.contextExtensions.metadata?.workflowId,
+      workspaceId: this.contextExtensions.workspaceId,
+      executionId: this.contextExtensions.executionId,
+      userId: this.contextExtensions.userId,
+      requestId: this.contextExtensions.metadata?.requestId,
     })
   }
 
@@ -71,7 +71,6 @@ export class BlockExecutor {
     node: DAGNode,
     block: SerializedBlock
   ): Promise<NormalizedBlockOutput> {
-    const execLogger = this.loggerFor(ctx)
     const handler = this.findHandler(block)
     if (!handler) {
       throw buildBlockExecutionError({
@@ -86,9 +85,9 @@ export class BlockExecutor {
 
     let blockLog: BlockLog | undefined
     if (!isSentinel) {
-      blockLog = this.createBlockLog(execLogger, ctx, node.id, block, node)
+      blockLog = this.createBlockLog(ctx, node.id, block, node)
       ctx.blockLogs.push(blockLog)
-      await this.callOnBlockStart(execLogger, ctx, node, block, blockLog.executionOrder)
+      await this.callOnBlockStart(ctx, node, block, blockLog.executionOrder)
     }
 
     const startTime = performance.now()
@@ -117,7 +116,6 @@ export class BlockExecutor {
     } catch (error) {
       cleanupSelfReference?.()
       return await this.handleBlockError(
-        execLogger,
         error,
         ctx,
         node,
@@ -145,7 +143,6 @@ export class BlockExecutor {
 
         if (ctx.onStream) {
           await this.handleStreamingExecution(
-            execLogger,
             ctx,
             node,
             block,
@@ -193,7 +190,6 @@ export class BlockExecutor {
           block,
         })
         await this.callOnBlockComplete(
-          execLogger,
           ctx,
           node,
           block,
@@ -210,7 +206,6 @@ export class BlockExecutor {
       return normalizedOutput
     } catch (error) {
       return await this.handleBlockError(
-        execLogger,
         error,
         ctx,
         node,
@@ -242,7 +237,6 @@ export class BlockExecutor {
   }
 
   private async handleBlockError(
-    execLogger: Logger,
     error: unknown,
     ctx: ExecutionContext,
     node: DAGNode,
@@ -289,7 +283,7 @@ export class BlockExecutor {
       }
     }
 
-    execLogger.error(
+    this.execLogger.error(
       phase === 'input_resolution' ? 'Failed to resolve block inputs' : 'Block execution failed',
       {
         blockId: node.id,
@@ -304,7 +298,6 @@ export class BlockExecutor {
         : undefined
       const displayOutput = filterOutputForLog(block.metadata?.id || '', errorOutput, { block })
       await this.callOnBlockComplete(
-        execLogger,
         ctx,
         node,
         block,
@@ -323,7 +316,7 @@ export class BlockExecutor {
       if (blockLog) {
         blockLog.errorHandled = true
       }
-      execLogger.info('Block has error port - returning error output instead of throwing', {
+      this.execLogger.info('Block has error port - returning error output instead of throwing', {
         blockId: node.id,
         error: errorMessage,
       })
@@ -353,7 +346,6 @@ export class BlockExecutor {
   }
 
   private createBlockLog(
-    execLogger: Logger,
     ctx: ExecutionContext,
     blockId: string,
     block: SerializedBlock,
@@ -376,7 +368,7 @@ export class BlockExecutor {
           blockName = `${blockName} (iteration ${loopScope.iteration})`
           iterationIndex = loopScope.iteration
         } else {
-          execLogger.warn('Loop scope not found for block', { blockId, loopId })
+          this.execLogger.warn('Loop scope not found for block', { blockId, loopId })
         }
       }
     }
@@ -458,7 +450,6 @@ export class BlockExecutor {
   }
 
   private async callOnBlockStart(
-    execLogger: Logger,
     ctx: ExecutionContext,
     node: DAGNode,
     block: SerializedBlock,
@@ -481,7 +472,7 @@ export class BlockExecutor {
           ctx.childWorkflowContext
         )
       } catch (error) {
-        execLogger.warn('Block start callback failed', {
+        this.execLogger.warn('Block start callback failed', {
           blockId,
           blockType,
           error: error instanceof Error ? error.message : String(error),
@@ -491,7 +482,6 @@ export class BlockExecutor {
   }
 
   private async callOnBlockComplete(
-    execLogger: Logger,
     ctx: ExecutionContext,
     node: DAGNode,
     block: SerializedBlock,
@@ -528,7 +518,7 @@ export class BlockExecutor {
           ctx.childWorkflowContext
         )
       } catch (error) {
-        execLogger.warn('Block completion callback failed', {
+        this.execLogger.warn('Block completion callback failed', {
           blockId,
           blockType,
           error: error instanceof Error ? error.message : String(error),
@@ -608,7 +598,6 @@ export class BlockExecutor {
   }
 
   private async handleStreamingExecution(
-    execLogger: Logger,
     ctx: ExecutionContext,
     node: DAGNode,
     block: SerializedBlock,
@@ -625,15 +614,7 @@ export class BlockExecutor {
 
     const stream = streamingExec.stream
     if (typeof stream.tee !== 'function') {
-      await this.forwardStream(
-        execLogger,
-        ctx,
-        blockId,
-        streamingExec,
-        stream,
-        responseFormat,
-        selectedOutputs
-      )
+      await this.forwardStream(ctx, blockId, streamingExec, stream, responseFormat, selectedOutputs)
       return
     }
 
@@ -652,7 +633,6 @@ export class BlockExecutor {
     }
 
     const executorConsumption = this.consumeExecutorStream(
-      execLogger,
       executorStream,
       streamingExec,
       blockId,
@@ -663,7 +643,7 @@ export class BlockExecutor {
       try {
         await ctx.onStream?.(clientStreamingExec)
       } catch (error) {
-        execLogger.error('Error in onStream callback', { blockId, error })
+        this.execLogger.error('Error in onStream callback', { blockId, error })
         // Cancel the client stream to release the tee'd buffer
         await processedClientStream.cancel().catch(() => {})
       }
@@ -673,7 +653,6 @@ export class BlockExecutor {
   }
 
   private async forwardStream(
-    execLogger: Logger,
     ctx: ExecutionContext,
     blockId: string,
     streamingExec: { stream: ReadableStream; execution: any },
@@ -694,13 +673,12 @@ export class BlockExecutor {
         stream: processedStream,
       })
     } catch (error) {
-      execLogger.error('Error in onStream callback', { blockId, error })
+      this.execLogger.error('Error in onStream callback', { blockId, error })
       await processedStream.cancel().catch(() => {})
     }
   }
 
   private async consumeExecutorStream(
-    execLogger: Logger,
     stream: ReadableStream,
     streamingExec: { execution: any },
     blockId: string,
@@ -719,7 +697,7 @@ export class BlockExecutor {
       const tail = decoder.decode()
       if (tail) chunks.push(tail)
     } catch (error) {
-      execLogger.error('Error reading executor stream for block', { blockId, error })
+      this.execLogger.error('Error reading executor stream for block', { blockId, error })
     } finally {
       try {
         await reader.cancel().catch(() => {})
@@ -750,7 +728,10 @@ export class BlockExecutor {
         }
         return
       } catch (error) {
-        execLogger.warn('Failed to parse streamed content for response format', { blockId, error })
+        this.execLogger.warn('Failed to parse streamed content for response format', {
+          blockId,
+          error,
+        })
       }
     }
 

apps/sim/lib/auth/hybrid.ts

@@ -25,7 +25,7 @@ const BEARER_PREFIX = 'Bearer '
 export function hasExternalApiCredentials(headers: Headers): boolean {
   if (headers.has(API_KEY_HEADER)) return true
   const auth = headers.get('authorization')
-  return auth !== null && auth.startsWith(BEARER_PREFIX)
+  return auth?.startsWith(BEARER_PREFIX)
 }
 
 export interface AuthResult {

apps/sim/lib/logs/execution/logger.ts

@@ -297,14 +297,20 @@ export class ExecutionLogger implements IExecutionLoggerService {
       status: statusOverride,
     } = params
 
-    const execLog = logger.withMetadata({ executionId })
+    let execLog = logger.withMetadata({ executionId })
     execLog.debug('Completing workflow execution', { isResume })
 
     const [existingLog] = await db
       .select()
       .from(workflowExecutionLogs)
       .where(eq(workflowExecutionLogs.executionId, executionId))
       .limit(1)
+    if (existingLog) {
+      execLog = execLog.withMetadata({
+        workflowId: existingLog.workflowId ?? undefined,
+        workspaceId: existingLog.workspaceId ?? undefined,
+      })
+    }
     const billingUserId = this.extractBillingUserId(existingLog?.executionData)
     const existingExecutionData = existingLog?.executionData as
       | WorkflowExecutionLog['executionData']

packages/logger/src/index.ts

@@ -185,11 +185,10 @@ export class Logger {
    * New metadata keys override existing ones with the same name.
    */
   withMetadata(metadata: LoggerMetadata): Logger {
-    const child = new Logger(this.module, {
-      logLevel: this.config.minLevel,
-      colorize: this.config.colorize,
-      enabled: this.config.enabled,
-    })
+    const child = Object.create(Logger.prototype) as Logger
+    child.module = this.module
+    child.config = this.config
+    child.isDev = this.isDev
     child.metadata = { ...this.metadata, ...metadata }
     return child
   }