remove extraneous comments

Author: waleedlatif1

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

@@ -37,7 +37,7 @@ export async function POST(request: NextRequest) {
       azureApiVersion,
       responseFormat,
       workflowId,
-      workspaceId, // Extract workspaceId for MCP tools
+      workspaceId,
       stream,
       messages,
       environmentVariables,
@@ -106,7 +106,7 @@ export async function POST(request: NextRequest) {
       azureApiVersion,
       responseFormat,
       workflowId,
-      workspaceId, // Pass workspaceId for MCP tools
+      workspaceId,
       stream,
       messages,
       environmentVariables,

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

@@ -11,11 +11,10 @@ const logger = createLogger('GoogleDriveFileAPI')
  * Get a single file from Google Drive
  */
 export async function GET(request: NextRequest) {
-  const requestId = generateRequestId() // Generate a short request ID for correlation
+  const requestId = generateRequestId()
   logger.info(`[${requestId}] Google Drive file request received`)
 
   try {
-    // Get the credential ID and file ID from the query params
     const { searchParams } = new URL(request.url)
     const credentialId = searchParams.get('credentialId')
     const fileId = searchParams.get('fileId')
@@ -31,7 +30,6 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
     }
 
-    // Refresh access token if needed using the utility function
     const accessToken = await refreshAccessTokenIfNeeded(
       credentialId,
       authz.credentialOwnerUserId,
@@ -42,7 +40,6 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: 'Failed to obtain valid access token' }, { status: 401 })
     }
 
-    // Fetch the file from Google Drive API
     logger.info(`[${requestId}] Fetching file ${fileId} from Google Drive API`)
     const response = await fetch(
       `https://www.googleapis.com/drive/v3/files/${fileId}?fields=id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,exportLinks,shortcutDetails&supportsAllDrives=true`,
@@ -69,15 +66,13 @@ export async function GET(request: NextRequest) {
 
     const file = await response.json()
 
-    // In case of Google Docs, Sheets, etc., provide the export links
     const exportFormats: { [key: string]: string } = {
       'application/vnd.google-apps.document': 'application/pdf', // Google Docs to PDF
       'application/vnd.google-apps.spreadsheet':
         'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', // Google Sheets to XLSX
       'application/vnd.google-apps.presentation': 'application/pdf', // Google Slides to PDF
     }
 
-    // Resolve shortcuts transparently for UI stability
     if (
       file.mimeType === 'application/vnd.google-apps.shortcut' &&
       file.shortcutDetails?.targetId
@@ -105,20 +100,16 @@ export async function GET(request: NextRequest) {
       }
     }
 
-    // If the file is a Google Docs, Sheets, or Slides file, we need to provide the export link
     if (file.mimeType.startsWith('application/vnd.google-apps.')) {
       const format = exportFormats[file.mimeType] || 'application/pdf'
       if (!file.exportLinks) {
-        // If export links are not available in the response, try to construct one
         file.downloadUrl = `https://www.googleapis.com/drive/v3/files/${file.id}/export?mimeType=${encodeURIComponent(
           format
         )}`
       } else {
-        // Use the export link from the response if available
         file.downloadUrl = file.exportLinks[format]
       }
     } else {
-      // For regular files, use the download link
       file.downloadUrl = `https://www.googleapis.com/drive/v3/files/${file.id}?alt=media`
     }
 

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

@@ -12,20 +12,17 @@ const logger = createLogger('GoogleDriveFilesAPI')
  * Get files from Google Drive
  */
 export async function GET(request: NextRequest) {
-  const requestId = generateRequestId() // Generate a short request ID for correlation
+  const requestId = generateRequestId()
   logger.info(`[${requestId}] Google Drive files request received`)
 
   try {
-    // Get the session
     const session = await getSession()
 
-    // Check if the user is authenticated
     if (!session?.user?.id) {
       logger.warn(`[${requestId}] Unauthenticated request rejected`)
       return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
     }
 
-    // Get the credential ID from the query params
     const { searchParams } = new URL(request.url)
     const credentialId = searchParams.get('credentialId')
     const mimeType = searchParams.get('mimeType')
@@ -38,14 +35,12 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: 'Credential ID is required' }, { status: 400 })
     }
 
-    // Authorize use of the credential (supports collaborator credentials via workflow)
     const authz = await authorizeCredentialUse(request, { credentialId: credentialId!, workflowId })
     if (!authz.ok || !authz.credentialOwnerUserId) {
       logger.warn(`[${requestId}] Unauthorized credential access attempt`, authz)
       return NextResponse.json({ error: authz.error || 'Unauthorized' }, { status: 403 })
     }
 
-    // Refresh access token if needed using the utility function
     const accessToken = await refreshAccessTokenIfNeeded(
       credentialId!,
       authz.credentialOwnerUserId,
@@ -56,7 +51,6 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ error: 'Failed to obtain valid access token' }, { status: 401 })
     }
 
-    // Build Drive 'q' expression safely
     const qParts: string[] = ['trashed = false']
     if (folderId) {
       qParts.push(`'${folderId.replace(/'/g, "\\'")}' in parents`)
@@ -69,7 +63,6 @@ export async function GET(request: NextRequest) {
     }
     const q = encodeURIComponent(qParts.join(' and '))
 
-    // Fetch files from Google Drive API with shared drives support
     const response = await fetch(
       `https://www.googleapis.com/drive/v3/files?q=${q}&supportsAllDrives=true&includeItemsFromAllDrives=true&spaces=drive&fields=files(id,name,mimeType,iconLink,webViewLink,thumbnailLink,createdTime,modifiedTime,size,owners,parents)`,
       {

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

@@ -39,34 +39,25 @@ export function McpToolSelector({
   const workspaceId = params.workspaceId as string
   const [open, setOpen] = useState(false)
 
-  // Get MCP tools from hook
   const { mcpTools, isLoading, error, refreshTools, getToolsByServer } = useMcpTools(workspaceId)
 
-  // Use collaborative state management via useSubBlockValue hook
   const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id)
 
-  // Get the server selection from the dependent field
   const [serverValue] = useSubBlockValue(blockId, 'server')
 
-  // Extract config values
   const label = subBlock.placeholder || 'Select tool'
 
-  // Get the effective value (preview or store value)
   const effectiveValue = isPreview && previewValue !== undefined ? previewValue : storeValue
   const selectedToolId = effectiveValue || ''
 
-  // Get available tools for the selected server
   const availableTools = useMemo(() => {
     if (!serverValue) return []
     return getToolsByServer(serverValue)
   }, [serverValue, getToolsByServer])
 
-  // Get the selected tool
   const selectedTool = availableTools.find((tool) => tool.id === selectedToolId)
 
-  // Clear tool selection when server changes (but not when tools are still loading)
   useEffect(() => {
-    // Only clear if we have a stored value, tools are loaded, and the tool doesn't exist
     if (
       storeValue &&
       availableTools.length > 0 &&
@@ -78,23 +69,20 @@ export function McpToolSelector({
     }
   }, [serverValue, availableTools, storeValue, setStoreValue, isPreview])
 
-  // Handle popover open to refresh tools
   const handleOpenChange = (isOpen: boolean) => {
     setOpen(isOpen)
     if (isOpen && serverValue) {
       refreshTools()
     }
   }
 
-  // Handle tool selection
   const handleSelect = (toolId: string) => {
     if (!isPreview) {
       setStoreValue(toolId)
     }
     setOpen(false)
   }
 
-  // Get display text for selected tool
   const getDisplayText = () => {
     if (selectedTool) {
       return <span className='truncate font-normal'>{selectedTool.name}</span>
@@ -106,7 +94,6 @@ export function McpToolSelector({
     )
   }
 
-  // Don't show anything if no server is selected
   const isDisabled = disabled || !serverValue
 
   return (

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

@@ -258,11 +258,11 @@ export class AgentBlockHandler implements BlockHandler {
           headers.Authorization = `Bearer ${internalToken}`
         } catch (error) {
           logger.error(`Failed to generate internal token for MCP tool discovery:`, error)
-          // Still continue with the request, but it will likely fail auth
         }
       }
 
-      const url = new URL(`${process.env.NEXT_PUBLIC_APP_URL}/api/mcp/tools/discover`)
+      const appUrl = getEnv('NEXT_PUBLIC_APP_URL')
+      const url = new URL(`${appUrl}/api/mcp/tools/discover`)
       url.searchParams.set('serverId', serverId)
       if (context.workspaceId) {
         url.searchParams.set('workspaceId', context.workspaceId)
@@ -313,23 +313,19 @@ export class AgentBlockHandler implements BlockHandler {
               headers.Authorization = `Bearer ${internalToken}`
             } catch (error) {
               logger.error(`Failed to generate internal token for MCP tool ${toolName}:`, error)
-              // Still continue with the request, but it will likely fail auth
             }
           }
 
-          const execResponse = await fetch(
-            `${process.env.NEXT_PUBLIC_APP_URL}/api/mcp/tools/execute`,
-            {
-              method: 'POST',
-              headers,
-              body: JSON.stringify({
-                serverId,
-                toolName,
-                arguments: { ...params, ...callParams },
-                workspaceId: context.workspaceId,
-              }),
-            }
-          )
+          const execResponse = await fetch(`${appUrl}/api/mcp/tools/execute`, {
+            method: 'POST',
+            headers,
+            body: JSON.stringify({
+              serverId,
+              toolName,
+              arguments: { ...params, ...callParams },
+              workspaceId: context.workspaceId,
+            }),
+          })
 
           if (!execResponse.ok) {
             throw new Error(

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

@@ -25,7 +25,6 @@ export class GenericBlockHandler implements BlockHandler {
   ): Promise<any> {
     logger.info(`Executing block: ${block.id} (Type: ${block.metadata?.id})`)
 
-    // Handle MCP tools
     const isMcpTool = block.config.tool?.startsWith('mcp-')
     let tool = null
 
@@ -36,16 +35,13 @@ export class GenericBlockHandler implements BlockHandler {
       }
     }
 
-    // Apply block-level parameter transformation if available
     let finalInputs = { ...inputs }
 
-    // Get the block configuration to check for parameter transformation
     const blockType = block.metadata?.id
     if (blockType) {
       const blockConfig = getBlock(blockType)
       if (blockConfig?.tools?.config?.params) {
         try {
-          // Apply the block's parameter transformation
           const transformedParams = blockConfig.tools.config.params(inputs)
           finalInputs = { ...transformedParams }
           logger.info(`Applied parameter transformation for block type: ${blockType}`, {

apps/sim/hooks/use-mcp-server-test.ts

@@ -59,7 +59,6 @@ export function useMcpServerTest() {
       setTestResult(null)
 
       try {
-        // Filter out empty headers before sending to API
         const cleanConfig = {
           ...config,
           headers: config.headers
@@ -134,7 +133,6 @@ export function getTestResultSummary(result: McpServerTestResult): string {
 export function isServerSafeToAdd(result: McpServerTestResult): boolean {
   if (!result.success) return false
 
-  // Check for version compatibility issues
   if (result.warnings?.some((w) => w.toLowerCase().includes('version'))) {
     return false
   }