cleanup & remove unused dep

Author: waleedlatif1

apps/sim/executor/consts.ts

@@ -10,7 +10,6 @@ export enum BlockType {
   FUNCTION = 'function',
   AGENT = 'agent',
   API = 'api',
-  MCP = 'mcp',
   EVALUATOR = 'evaluator',
   RESPONSE = 'response',
   WORKFLOW = 'workflow',

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -83,8 +83,6 @@ export class AgentBlockHandler implements BlockHandler {
       streaming: streamingConfig.shouldUseStreaming ?? false,
     })
 
-    this.logRequestDetails(providerRequest, messages, streamingConfig)
-
     return this.executeProviderRequest(providerRequest, block, responseFormat, context)
   }
 
@@ -153,16 +151,6 @@ export class AgentBlockHandler implements BlockHandler {
   private async formatTools(inputTools: ToolInput[], context: ExecutionContext): Promise<any[]> {
     if (!Array.isArray(inputTools)) return []
 
-    logger.info(`[AgentHandler] formatTools called with ${inputTools.length} tools`, {
-      tools: inputTools.map((t) => ({
-        type: t.type,
-        usageControl: t.usageControl,
-        params: t.params,
-      })),
-      hasWorkspaceId: !!context.workspaceId,
-      workspaceId: context.workspaceId,
-    })
-
     const tools = await Promise.all(
       inputTools
         .filter((tool) => {
@@ -235,7 +223,7 @@ export class AgentBlockHandler implements BlockHandler {
             isCustomTool: true,
             _context: {
               workflowId: context.workflowId,
-              workspaceId: context.workspaceId, // Include workspaceId for MCP tools
+              workspaceId: context.workspaceId,
             },
           },
           false, // skipProxy
@@ -254,20 +242,16 @@ export class AgentBlockHandler implements BlockHandler {
   }
 
   private async createMcpTool(tool: ToolInput, context: ExecutionContext): Promise<any> {
-    // Extract MCP tool information from the tool input
     const { serverId, toolName, params } = tool.params || {}
 
     if (!serverId || !toolName) {
       logger.error('MCP tool missing required parameters:', { serverId, toolName })
       return null
     }
 
-    // Fetch tool schema from MCP server via API
     try {
-      // Prepare headers with internal authentication
       const headers: Record<string, string> = { 'Content-Type': 'application/json' }
 
-      // Add internal authorization for server-side calls
       if (typeof window === 'undefined') {
         try {
           const { generateInternalToken } = await import('@/lib/auth/internal')
@@ -279,15 +263,13 @@ export class AgentBlockHandler implements BlockHandler {
         }
       }
 
-      // Add workspaceId and workflowId to the URL for workspace scoping (required by MCP API)
       const url = new URL(`${process.env.NEXT_PUBLIC_APP_URL}/api/mcp/tools/discover`)
       url.searchParams.set('serverId', serverId)
       if (context.workspaceId) {
         url.searchParams.set('workspaceId', context.workspaceId)
       } else {
         throw new Error('workspaceId is required for MCP tool discovery')
       }
-      // Add workflowId for internal JWT authentication context
       if (context.workflowId) {
         url.searchParams.set('workflowId', context.workflowId)
       } else {
@@ -312,8 +294,6 @@ export class AgentBlockHandler implements BlockHandler {
         throw new Error(`MCP tool ${toolName} not found on server ${serverId}`)
       }
 
-      // Transform MCP tool schema to agent-compatible format
-      // Don't double-prefix if serverId already starts with 'mcp-'
       const toolId = serverId.startsWith('mcp-')
         ? `${serverId}-${toolName}`
         : `mcp-${serverId}-${toolName}`
@@ -327,10 +307,8 @@ export class AgentBlockHandler implements BlockHandler {
         executeFunction: async (callParams: Record<string, any>) => {
           logger.info(`Executing MCP tool ${toolName} on server ${serverId}`)
 
-          // Prepare headers with internal authentication
           const headers: Record<string, string> = { 'Content-Type': 'application/json' }
 
-          // Add internal authorization for server-side calls
           if (typeof window === 'undefined') {
             try {
               const { generateInternalToken } = await import('@/lib/auth/internal')
@@ -342,7 +320,6 @@ export class AgentBlockHandler implements BlockHandler {
             }
           }
 
-          // Call MCP tool execution API
           const execResponse = await fetch(
             `${process.env.NEXT_PUBLIC_APP_URL}/api/mcp/tools/execute`,
             {
@@ -352,7 +329,7 @@ export class AgentBlockHandler implements BlockHandler {
                 serverId,
                 toolName,
                 arguments: { ...params, ...callParams },
-                workspaceId: context.workspaceId, // Pass workspace context for scoping
+                workspaceId: context.workspaceId,
               }),
             }
           )
@@ -368,7 +345,6 @@ export class AgentBlockHandler implements BlockHandler {
             throw new Error(result.error || 'MCP tool execution failed')
           }
 
-          // Transform MCP result to standard tool output format
           return {
             success: true,
             output: result.data.output || {},
@@ -558,7 +534,7 @@ export class AgentBlockHandler implements BlockHandler {
       azureApiVersion: inputs.azureApiVersion,
       responseFormat,
       workflowId: context.workflowId,
-      workspaceId: context.workspaceId, // Include workspaceId for MCP tools
+      workspaceId: context.workspaceId,
       stream: streaming,
       messages,
       environmentVariables: context.environmentVariables || {},
@@ -586,12 +562,6 @@ export class AgentBlockHandler implements BlockHandler {
     )
   }
 
-  private logRequestDetails(
-    providerRequest: any,
-    messages: Message[] | undefined,
-    _streamingConfig: StreamingConfig
-  ) {}
-
   private async executeProviderRequest(
     providerRequest: any,
     block: SerializedBlock,
@@ -655,7 +625,7 @@ export class AgentBlockHandler implements BlockHandler {
       azureApiVersion: providerRequest.azureApiVersion,
       responseFormat: providerRequest.responseFormat,
       workflowId: providerRequest.workflowId,
-      workspaceId: providerRequest.workspaceId, // Include workspaceId for MCP tools
+      workspaceId: providerRequest.workspaceId,
       stream: providerRequest.stream,
       messages: 'messages' in providerRequest ? providerRequest.messages : undefined,
       environmentVariables: context.environmentVariables || {},

apps/sim/executor/handlers/api/api-handler.ts

@@ -99,7 +99,7 @@ export class ApiBlockHandler implements BlockHandler {
           ...processedInputs,
           _context: {
             workflowId: context.workflowId,
-            workspaceId: context.workspaceId, // Include workspaceId for MCP tools
+            workspaceId: context.workspaceId,
           },
         },
         false, // skipProxy

apps/sim/executor/handlers/function/function-handler.ts

@@ -68,7 +68,7 @@ export class FunctionBlockHandler implements BlockHandler {
         blockNameMapping: blockNameMapping, // Pass block name to ID mapping
         _context: {
           workflowId: context.workflowId,
-          workspaceId: context.workspaceId, // Include workspaceId for MCP tools
+          workspaceId: context.workspaceId,
         },
       },
       false, // skipProxy

apps/sim/executor/handlers/generic/generic-handler.ts

@@ -13,7 +13,7 @@ const logger = createLogger('GenericBlockHandler')
  */
 export class GenericBlockHandler implements BlockHandler {
   canHandle(block: SerializedBlock): boolean {
-    // This handler can handle any block type as a fallback
+    // This handler can handle any block type
     // It should be the last handler checked.
     return true
   }
@@ -25,7 +25,7 @@ export class GenericBlockHandler implements BlockHandler {
   ): Promise<any> {
     logger.info(`Executing block: ${block.id} (Type: ${block.metadata?.id})`)
 
-    // Handle MCP tools specially - they're not in the static tools registry
+    // Handle MCP tools
     const isMcpTool = block.config.tool?.startsWith('mcp-')
     let tool = null
 
@@ -45,7 +45,7 @@ export class GenericBlockHandler implements BlockHandler {
       const blockConfig = getBlock(blockType)
       if (blockConfig?.tools?.config?.params) {
         try {
-          // Apply the block's parameter transformation function
+          // Apply the block's parameter transformation
           const transformedParams = blockConfig.tools.config.params(inputs)
           finalInputs = { ...transformedParams }
           logger.info(`Applied parameter transformation for block type: ${blockType}`, {
@@ -56,7 +56,6 @@ export class GenericBlockHandler implements BlockHandler {
           logger.warn(`Failed to apply parameter transformation for block type ${blockType}:`, {
             error: error instanceof Error ? error.message : String(error),
           })
-          // Continue with original inputs if transformation fails
         }
       }
     }
@@ -68,7 +67,7 @@ export class GenericBlockHandler implements BlockHandler {
           ...finalInputs,
           _context: {
             workflowId: context.workflowId,
-            workspaceId: context.workspaceId, // Include workspaceId for MCP tools
+            workspaceId: context.workspaceId,
           },
         },
         false, // skipProxy
@@ -85,10 +84,8 @@ export class GenericBlockHandler implements BlockHandler {
             ? errorDetails.join(' - ')
             : `Block execution of ${tool?.name || block.config.tool} failed with no error message`
 
-        // Create a detailed error object with formatted message
         const error = new Error(errorMessage)
 
-        // Add additional properties for debugging
         Object.assign(error, {
           toolId: block.config.tool,
           toolName: tool?.name || 'Unknown tool',
@@ -101,16 +98,13 @@ export class GenericBlockHandler implements BlockHandler {
         throw error
       }
 
-      // Extract cost information from tool response if available
       const output = result.output
       let cost = null
 
-      // Check if the tool is a knowledge tool and has cost information
       if (block.config.tool?.startsWith('knowledge_') && output?.cost) {
         cost = output.cost
       }
 
-      // Return the output with cost information if available
       if (cost) {
         return {
           ...output,
@@ -126,25 +120,20 @@ export class GenericBlockHandler implements BlockHandler {
 
       return output
     } catch (error: any) {
-      // Ensure we have a meaningful error message
       if (!error.message || error.message === 'undefined (undefined)') {
-        // Construct a detailed error message with available information
         let errorMessage = `Block execution of ${tool?.name || block.config.tool} failed`
 
-        // Add block name if available
         if (block.metadata?.name) {
           errorMessage += `: ${block.metadata.name}`
         }
 
-        // Add status code if available
         if (error.status) {
           errorMessage += ` (Status: ${error.status})`
         }
 
         error.message = errorMessage
       }
 
-      // Add additional context to the error
       if (typeof error === 'object' && error !== null) {
         if (!error.toolId) error.toolId = block.config.tool
         if (!error.blockName) error.blockName = block.metadata?.name || 'Unnamed Block'

apps/sim/hooks/use-mcp-tools.ts

@@ -23,7 +23,7 @@ export interface McpToolForUI {
   type: 'mcp'
   inputSchema: any
   bgColor: string
-  icon: React.ComponentType<any> // React component for MCP tools
+  icon: React.ComponentType<any>
 }
 
 export interface UseMcpToolsResult {
@@ -40,16 +40,15 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
   const [isLoading, setIsLoading] = useState(false)
   const [error, setError] = useState<string | null>(null)
 
-  // Subscribe to server changes to refresh tools when servers are modified
   const servers = useMcpServersStore((state) => state.servers)
 
-  // Track the last fingerprint we processed to prevent infinite loops
+  // Track the last fingerprint
   const lastProcessedFingerprintRef = useRef<string>('')
 
-  // Create a stable server fingerprint to detect meaningful changes
+  // Create a stable server fingerprint
   const serversFingerprint = useMemo(() => {
     return servers
-      .filter((s) => s.enabled && !s.deletedAt) // Only consider active servers
+      .filter((s) => s.enabled && !s.deletedAt)
       .map((s) => `${s.id}-${s.enabled}-${s.updatedAt}`)
       .sort()
       .join('|')
@@ -86,8 +85,8 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
           serverName: tool.serverName,
           type: 'mcp' as const,
           inputSchema: tool.inputSchema,
-          bgColor: '#6366F1', // Indigo color to match MCP block
-          icon: WrenchIcon, // Standard icon for MCP tools
+          bgColor: '#6366F1',
+          icon: WrenchIcon,
         }))
 
         setMcpTools(transformedTools)
@@ -99,7 +98,7 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
         const errorMessage = err instanceof Error ? err.message : 'Failed to discover MCP tools'
         logger.error('Error discovering MCP tools:', err)
         setError(errorMessage)
-        setMcpTools([]) // Clear tools on error
+        setMcpTools([])
       } finally {
         setIsLoading(false)
       }
@@ -121,27 +120,24 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
     [mcpTools]
   )
 
-  // Initial load on mount
   useEffect(() => {
     refreshTools()
-  }, []) // Remove refreshTools dependency
+  }, [])
 
-  // Refresh tools when servers change (added/removed/updated)
+  // Refresh tools when servers change
   useEffect(() => {
-    // Skip if no active servers or we already processed this fingerprint
     if (!serversFingerprint || serversFingerprint === lastProcessedFingerprintRef.current) return
 
     logger.info('Active servers changed, refreshing MCP tools', {
       serverCount: servers.filter((s) => s.enabled && !s.deletedAt).length,
       fingerprint: serversFingerprint,
     })
 
-    // Update the ref to track this fingerprint as processed
     lastProcessedFingerprintRef.current = serversFingerprint
     refreshTools()
-  }, [serversFingerprint]) // Only watch for fingerprint changes
+  }, [serversFingerprint])
 
-  // Auto-refresh every 5 minutes to keep tools up-to-date
+  // Auto-refresh every 5 minutes
   useEffect(() => {
     const interval = setInterval(
       () => {
@@ -150,10 +146,10 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
         }
       },
       5 * 60 * 1000
-    ) // 5 minutes
+    )
 
     return () => clearInterval(interval)
-  }, [isLoading]) // Remove refreshTools dependency
+  }, [isLoading])
 
   return {
     mcpTools,
@@ -165,12 +161,6 @@ export function useMcpTools(workspaceId: string): UseMcpToolsResult {
   }
 }
 
-/**
- * Hook for executing MCP tools
- *
- * This provides a consistent interface for executing MCP tools
- * that matches the existing tool execution patterns
- */
 export function useMcpToolExecution(workspaceId: string) {
   const executeTool = useCallback(
     async (serverId: string, toolName: string, args: Record<string, any>) => {
@@ -212,9 +202,3 @@ export function useMcpToolExecution(workspaceId: string) {
 
   return { executeTool }
 }
-
-/**
- * Hook for MCP server management
- *
- * Provides functions to manage MCP server connections
- */