additional improvements

Author: waleedlatif1

apps/sim/app/api/mcp/servers/test-connection/route.ts

@@ -70,7 +70,6 @@ export const POST = withMcpAuth('write')(
         workspaceId,
       })
 
-      // Validate required fields
       if (!body.name || !body.transport) {
         return createMcpErrorResponse(
           new Error('Missing required fields: name and transport are required'),
@@ -79,7 +78,6 @@ export const POST = withMcpAuth('write')(
         )
       }
 
-      // Validate URL if provided
       if (
         (body.transport === 'http' ||
           body.transport === 'sse' ||
@@ -97,7 +95,6 @@ export const POST = withMcpAuth('write')(
         body.url = urlValidation.normalizedUrl
       }
 
-      // Resolve environment variables in config
       let resolvedUrl = body.url
       let resolvedHeaders = body.headers || {}
 
@@ -120,38 +117,33 @@ export const POST = withMcpAuth('write')(
         )
       }
 
-      // Create temporary server config for testing
       const testConfig: McpServerConfig = {
         id: `test-${requestId}`,
         name: body.name,
         transport: body.transport,
         url: resolvedUrl,
         headers: resolvedHeaders,
-        timeout: body.timeout || 10000, // Shorter timeout for testing
+        timeout: body.timeout || 10000,
         retries: 1, // Only one retry for tests
         enabled: true,
       }
 
-      // Test security policy (restrictive for testing)
       const testSecurityPolicy = {
-        requireConsent: false, // Skip consent for connection testing
+        requireConsent: false,
         auditLevel: 'none' as const,
-        maxToolExecutionsPerHour: 0, // Don't allow tool execution during tests
+        maxToolExecutionsPerHour: 0,
       }
 
       const result: TestConnectionResult = { success: false }
       let client: McpClient | null = null
 
       try {
-        // Create and connect to the test client
         client = new McpClient(testConfig, testSecurityPolicy)
         await client.connect()
 
-        // If we get here, connection was successful
         result.success = true
         result.negotiatedVersion = client.getNegotiatedVersion()
 
-        // Try to discover tools (with timeout)
         try {
           const tools = await client.listTools()
           result.toolCount = tools.length
@@ -161,7 +153,6 @@ export const POST = withMcpAuth('write')(
           result.warnings.push('Could not list tools from server')
         }
 
-        // Check for version compatibility warnings
         const clientVersionInfo = McpClient.getVersionInfo()
         if (result.negotiatedVersion !== clientVersionInfo.preferred) {
           result.warnings = result.warnings || []
@@ -186,7 +177,6 @@ export const POST = withMcpAuth('write')(
           result.error = 'Unknown connection error'
         }
       } finally {
-        // Always disconnect the test client
         if (client) {
           try {
             await client.disconnect()

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

@@ -201,11 +201,8 @@ async function executeWorkflow(
       }
     }
 
-    // Use the current block states as-is - parameter transformation will happen in the handlers
-    const transformedBlockStates = currentBlockStates
-
     // Process the block states to ensure response formats are properly parsed
-    const processedBlockStates = Object.entries(transformedBlockStates).reduce(
+    const processedBlockStates = Object.entries(currentBlockStates).reduce(
       (acc, [blockId, blockState]) => {
         // Check if this block has a responseFormat that needs to be parsed
         if (blockState.responseFormat && typeof blockState.responseFormat === 'string') {
@@ -265,42 +262,10 @@ async function executeWorkflow(
       logger.debug(`[${requestId}] No workflow variables found for: ${workflowId}`)
     }
 
-    // Create merged states that combine block metadata with transformed parameters
-    const finalMergedStates = Object.entries(mergedStates).reduce(
-      (acc, [blockId, blockData]) => {
-        const transformedParams = processedBlockStates[blockId]
-        if (transformedParams) {
-          // Update the block's subBlocks with transformed parameters
-          const updatedSubBlocks = Object.entries(transformedParams).reduce(
-            (subAcc, [key, value]) => {
-              // Preserve original subBlock structure but update the value
-              const originalSubBlock = blockData.subBlocks[key]
-              subAcc[key] = {
-                id: originalSubBlock?.id || key,
-                type: originalSubBlock?.type || 'text',
-                value,
-              }
-              return subAcc
-            },
-            {} as Record<string, any>
-          )
-
-          acc[blockId] = {
-            ...blockData,
-            subBlocks: updatedSubBlocks,
-          }
-        } else {
-          acc[blockId] = blockData
-        }
-        return acc
-      },
-      {} as typeof mergedStates
-    )
-
     // Serialize and execute the workflow
     logger.debug(`[${requestId}] Serializing workflow: ${workflowId}`)
     const serializedWorkflow = new Serializer().serializeWorkflow(
-      finalMergedStates,
+      mergedStates,
       edges,
       loops,
       parallels,

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

@@ -27,12 +27,9 @@ export function McpDynamicArgs({
   const [selectedTool] = useSubBlockValue(blockId, 'tool')
   const [toolArgs, setToolArgs] = useSubBlockValue(blockId, subBlockId)
 
-  // Find the selected tool's schema
-  // Note: selectedTool is the full tool ID (serverId-toolName), not just the name
   const selectedToolConfig = mcpTools.find((tool) => tool.id === selectedTool)
   const toolSchema = selectedToolConfig?.inputSchema
 
-  // Parse current arguments
   const currentArgs = useCallback(() => {
     if (isPreview && previewValue) {
       return typeof previewValue === 'string' ? JSON.parse(previewValue) : previewValue
@@ -47,27 +44,23 @@ export function McpDynamicArgs({
     return toolArgs || {}
   }, [toolArgs, previewValue, isPreview])
 
-  // Update a specific parameter
   const updateParameter = useCallback(
     (paramName: string, value: any) => {
       if (disabled) return
 
       const current = currentArgs()
       const updated = { ...current, [paramName]: value }
 
-      // Convert back to JSON string for storage
       const jsonString = JSON.stringify(updated, null, 2)
       setToolArgs(jsonString)
     },
     [currentArgs, setToolArgs, disabled]
   )
 
-  // Render parameter input based on schema type
   const renderParameterInput = (paramName: string, paramSchema: any) => {
     const current = currentArgs()
     const value = current[paramName]
 
-    // Determine input type based on schema
     const getInputType = () => {
       if (paramSchema.enum) return 'dropdown'
       if (paramSchema.type === 'boolean') return 'switch'
@@ -190,7 +183,6 @@ export function McpDynamicArgs({
               value={value || ''}
               onChange={(e) => {
                 let processedValue: any = e.target.value
-                // Convert to appropriate type for numeric fields
                 if (isNumeric && processedValue !== '') {
                   processedValue =
                     paramSchema.type === 'integer'
@@ -210,7 +202,6 @@ export function McpDynamicArgs({
     }
   }
 
-  // Show message when no tool is selected
   if (!selectedTool) {
     return (
       <div className='rounded-lg border border-gray-300 border-dashed p-8 text-center dark:border-gray-600'>
@@ -219,7 +210,6 @@ export function McpDynamicArgs({
     )
   }
 
-  // Show message when tool has no parameters
   if (!toolSchema?.properties || Object.keys(toolSchema.properties).length === 0) {
     return (
       <div className='rounded-lg border border-gray-300 border-dashed p-8 text-center dark:border-gray-600'>

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

@@ -13,13 +13,9 @@ import {
   CommandList,
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { createLogger } from '@/lib/logs/console/logger'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useEnabledServers, useMcpServersStore } from '@/stores/mcp-servers/store'
-import type { McpServerWithStatus } from '@/stores/mcp-servers/types'
-
-const logger = createLogger('McpServerSelector')
 
 interface McpServerSelectorProps {
   blockId: string
@@ -40,57 +36,36 @@ export function McpServerSelector({
   const workspaceId = params.workspaceId as string
   const [open, setOpen] = useState(false)
 
-  // Get MCP servers from store
   const { fetchServers, isLoading, error } = useMcpServersStore()
   const enabledServers = useEnabledServers()
 
-  // Use collaborative state management via useSubBlockValue hook
   const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id)
 
-  // Extract config values
   const label = subBlock.placeholder || 'Select MCP server'
 
-  // Get the effective value (preview or store value)
   const effectiveValue = isPreview && previewValue !== undefined ? previewValue : storeValue
   const selectedServerId = effectiveValue || ''
 
-  // Get the selected server
   const selectedServer = enabledServers.find((server) => server.id === selectedServerId)
 
-  // Fetch servers on initial mount
   useEffect(() => {
     fetchServers(workspaceId)
   }, [fetchServers, workspaceId])
 
-  // Handle popover open to fetch fresh servers
   const handleOpenChange = (isOpen: boolean) => {
     setOpen(isOpen)
     if (isOpen) {
       fetchServers(workspaceId)
     }
   }
 
-  // Handle server selection
   const handleSelect = (serverId: string) => {
     if (!isPreview) {
       setStoreValue(serverId)
     }
     setOpen(false)
   }
 
-  // Get server status indicator
-  const getStatusIndicator = (server: McpServerWithStatus) => {
-    switch (server.connectionStatus) {
-      case 'connected':
-        return <div className='h-2 w-2 rounded-full bg-green-500' />
-      case 'error':
-        return <div className='h-2 w-2 rounded-full bg-red-500' />
-      default:
-        return <div className='h-2 w-2 rounded-full bg-gray-400' />
-    }
-  }
-
-  // Get display text for selected server
   const getDisplayText = () => {
     if (selectedServer) {
       return <span className='truncate font-normal'>{selectedServer.name}</span>

apps/sim/blocks/blocks/agent.ts

@@ -422,7 +422,6 @@ Example 3 (Array Input):
               return usageControl !== 'none'
             })
             .map((tool: any) => {
-              // Get the base tool configuration
               const toolConfig = {
                 id:
                   tool.type === 'custom-tool'
@@ -431,9 +430,9 @@ Example 3 (Array Input):
                 name: tool.title,
                 description: tool.type === 'custom-tool' ? tool.schema?.function?.description : '',
                 params: tool.params || {},
-                parameters: tool.type === 'custom-tool' ? tool.schema?.function?.parameters : {}, // We'd need to get actual parameters for non-custom tools
+                parameters: tool.type === 'custom-tool' ? tool.schema?.function?.parameters : {},
                 usageControl: tool.usageControl || 'auto',
-                type: tool.type, // Preserve tool type for agent handler processing
+                type: tool.type,
               }
               return toolConfig
             })

apps/sim/blocks/blocks/mcp.ts

@@ -35,7 +35,7 @@ export const McpBlock: BlockConfig<McpResponse> = {
       required: true,
       placeholder: 'Select a tool',
       description: 'Available tools from the selected MCP server',
-      dependsOn: ['server'], // Tool options depend on selected server
+      dependsOn: ['server'],
       condition: {
         field: 'server',
         value: '',
@@ -55,25 +55,20 @@ export const McpBlock: BlockConfig<McpResponse> = {
       },
     },
   ],
-  // MCP blocks use the tools framework with dynamic tool IDs
   tools: {
     access: [], // No static tool access needed - tools are dynamically resolved
     config: {
       tool: (params: any) => {
-        // Build MCP tool ID from server and tool selections
         if (params.server && params.tool) {
           const serverId = params.server
           let toolName = params.tool
 
-          // Handle case where tool selection might include the full MCP tool ID
-          // If tool contains the server ID, extract just the tool name
           if (toolName.startsWith(`${serverId}-`)) {
             toolName = toolName.substring(`${serverId}-`.length)
           }
 
           return createMcpToolId(serverId, toolName)
         }
-        // Fallback when no selection is made yet
         return 'mcp-dynamic'
       },
     },

apps/sim/components/ui/env-var-dropdown.tsx

@@ -132,7 +132,7 @@ export const EnvVarDropdown: React.FC<EnvVarDropdownProps> = ({
     onClose?.()
   }
 
-  // Add and remove keyboard event listener with smooth scrolling
+  // Add and remove keyboard event listener
   useEffect(() => {
     if (visible) {
       const handleKeyboardEvent = (e: KeyboardEvent) => {
@@ -144,7 +144,6 @@ export const EnvVarDropdown: React.FC<EnvVarDropdownProps> = ({
             e.stopPropagation()
             setSelectedIndex((prev) => {
               const newIndex = prev < filteredEnvVars.length - 1 ? prev + 1 : prev
-              // Scroll to the newly selected item
               setTimeout(() => {
                 const selectedElement = document.querySelector(`[data-env-var-index="${newIndex}"]`)
                 if (selectedElement) {
@@ -159,7 +158,6 @@ export const EnvVarDropdown: React.FC<EnvVarDropdownProps> = ({
             e.stopPropagation()
             setSelectedIndex((prev) => {
               const newIndex = prev > 0 ? prev - 1 : prev
-              // Scroll to the newly selected item
               setTimeout(() => {
                 const selectedElement = document.querySelector(`[data-env-var-index="${newIndex}"]`)
                 if (selectedElement) {

apps/sim/components/ui/tag-dropdown.test.tsx

@@ -1,4 +1,4 @@
-import { describe, expect, vi } from 'vitest'
+import { describe, expect, it, vi } from 'vitest'
 import { checkTagTrigger } from '@/components/ui/tag-dropdown'
 import { extractFieldsFromSchema, parseResponseFormatSafely } from '@/lib/response-format'
 import type { BlockState } from '@/stores/workflows/workflow/types'

apps/sim/tools/index.ts

@@ -138,7 +138,6 @@ export async function executeTool(
         logger.error(`[${requestId}] Custom tool not found: ${toolId}`)
       }
     } else if (toolId.startsWith('mcp-')) {
-      // Handle MCP tools via server-side proxy
       return await executeMcpTool(toolId, params, executionContext, requestId, startTimeISO)
     } else {
       // For built-in tools, use the synchronous version
@@ -731,27 +730,21 @@ async function executeMcpTool(
   try {
     logger.info(`[${actualRequestId}] Executing MCP tool: ${toolId}`)
 
-    // Parse MCP tool ID to extract server ID and tool name
     const { serverId, toolName } = parseMcpToolId(toolId)
 
-    // Get base URL for API calls
     const baseUrl = getBaseUrl()
 
-    // Prepare headers for internal API call
     const headers: Record<string, string> = { 'Content-Type': 'application/json' }
 
-    // Add internal authorization if running on server
     if (typeof window === 'undefined') {
       try {
         const internalToken = await generateInternalToken()
         headers.Authorization = `Bearer ${internalToken}`
       } catch (error) {
         logger.error(`[${actualRequestId}] Failed to generate internal token:`, error)
-        // Still continue with the request, but it will likely fail auth
       }
     }
 
-    // Execute MCP tool via API
     // Handle two different parameter structures:
     // 1. Direct MCP blocks: arguments are stored as JSON string in 'arguments' field
     // 2. Agent blocks: arguments are passed directly as top-level parameters