fix lint

Author: icecrasher321

apps/sim/app/api/mcp/serve/[serverId]/route.ts

@@ -16,7 +16,7 @@ import {
 } from '@modelcontextprotocol/sdk/types.js'
 import { db } from '@sim/db'
 import { workflow, workflowMcpServer, workflowMcpTool } from '@sim/db/schema'
-import { eq } from 'drizzle-orm'
+import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { getBaseUrl } from '@/lib/core/utils/urls'
@@ -209,15 +209,14 @@ async function handleToolsCall(
       })
     }
 
-    const tools = await db
+    const [tool] = await db
       .select({
         toolName: workflowMcpTool.toolName,
         workflowId: workflowMcpTool.workflowId,
       })
       .from(workflowMcpTool)
-      .where(eq(workflowMcpTool.serverId, serverId))
-
-    const tool = tools.find((t) => t.toolName === params.name)
+      .where(and(eq(workflowMcpTool.serverId, serverId), eq(workflowMcpTool.toolName, params.name)))
+      .limit(1)
     if (!tool) {
       return NextResponse.json(
         createError(id, ErrorCode.InvalidParams, `Tool not found: ${params.name}`),
@@ -252,6 +251,7 @@ async function handleToolsCall(
       method: 'POST',
       headers,
       body: JSON.stringify({ input: params.arguments || {}, triggerType: 'mcp' }),
+      signal: AbortSignal.timeout(300000), // 5 minute timeout
     })
 
     const executeResult = await response.json()

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/mcp-tool/mcp-tool.tsx

@@ -33,6 +33,8 @@ interface McpToolDeployProps {
   workflowDescription?: string | null
   isDeployed: boolean
   onAddedToServer?: () => void
+  onSubmittingChange?: (submitting: boolean) => void
+  onCanSaveChange?: (canSave: boolean) => void
 }
 
 /**
@@ -79,6 +81,8 @@ export function McpToolDeploy({
   workflowDescription,
   isDeployed,
   onAddedToServer,
+  onSubmittingChange,
+  onCanSaveChange,
 }: McpToolDeployProps) {
   const params = useParams()
   const workspaceId = params.workspaceId as string
@@ -200,11 +204,47 @@ export function McpToolDeploy({
     }
   }, [servers, serverToolsMap])
 
+  // Track saved values to detect changes (use state so updates trigger re-render)
+  const [savedValues, setSavedValues] = useState<{
+    toolName: string
+    toolDescription: string
+    parameterDescriptions: Record<string, string>
+  } | null>(null)
+
+  // Store saved values once loaded
+  useEffect(() => {
+    if (hasLoadedInitialData.current && !savedValues) {
+      setSavedValues({
+        toolName,
+        toolDescription,
+        parameterDescriptions: { ...parameterDescriptions },
+      })
+    }
+  }, [toolName, toolDescription, parameterDescriptions, savedValues])
+
+  // Determine if there are unsaved changes
+  const hasDeployedTools = selectedServerIds.length > 0
+  const hasChanges = useMemo(() => {
+    if (!savedValues || !hasDeployedTools) return false
+    if (toolName !== savedValues.toolName) return true
+    if (toolDescription !== savedValues.toolDescription) return true
+    if (
+      JSON.stringify(parameterDescriptions) !== JSON.stringify(savedValues.parameterDescriptions)
+    ) {
+      return true
+    }
+    return false
+  }, [toolName, toolDescription, parameterDescriptions, hasDeployedTools, savedValues])
+
+  // Notify parent about save availability
+  useEffect(() => {
+    onCanSaveChange?.(hasChanges && hasDeployedTools && !!toolName.trim())
+  }, [hasChanges, hasDeployedTools, toolName, onCanSaveChange])
+
   /**
-   * Sync tool configuration changes to all deployed servers (debounced)
+   * Save tool configuration to all deployed servers
    */
-  useEffect(() => {
-    if (!hasLoadedInitialData.current) return
+  const handleSave = useCallback(async () => {
     if (!toolName.trim()) return
 
     const toolsToUpdate: Array<{ serverId: string; toolId: string }> = []
@@ -217,32 +257,41 @@ export function McpToolDeploy({
 
     if (toolsToUpdate.length === 0) return
 
-    const timeoutId = setTimeout(async () => {
+    onSubmittingChange?.(true)
+    try {
       for (const { serverId, toolId } of toolsToUpdate) {
-        try {
-          await updateToolMutation.mutateAsync({
-            workspaceId,
-            serverId,
-            toolId,
-            toolName: toolName.trim(),
-            toolDescription: toolDescription.trim() || undefined,
-            parameterSchema,
-          })
-        } catch (error) {
-          logger.error(`Failed to sync tool ${toolId}:`, error)
-        }
+        await updateToolMutation.mutateAsync({
+          workspaceId,
+          serverId,
+          toolId,
+          toolName: toolName.trim(),
+          toolDescription: toolDescription.trim() || undefined,
+          parameterSchema,
+        })
       }
-    }, 500)
-
-    return () => clearTimeout(timeoutId)
+      // Update saved values after successful save (triggers re-render → hasChanges becomes false)
+      setSavedValues({
+        toolName,
+        toolDescription,
+        parameterDescriptions: { ...parameterDescriptions },
+      })
+      onCanSaveChange?.(false)
+      onSubmittingChange?.(false)
+    } catch (error) {
+      logger.error('Failed to save tool configuration:', error)
+      onSubmittingChange?.(false)
+    }
   }, [
     toolName,
     toolDescription,
+    parameterDescriptions,
     parameterSchema,
     servers,
     serverToolsMap,
     workspaceId,
     updateToolMutation,
+    onSubmittingChange,
+    onCanSaveChange,
   ])
 
   const serverOptions: ComboboxOption[] = useMemo(() => {
@@ -393,7 +442,17 @@ export function McpToolDeploy({
   }
 
   return (
-    <div className='-mx-1 space-y-4 overflow-y-auto px-1'>
+    <form
+      id='mcp-tool-deploy-form'
+      className='-mx-1 space-y-4 overflow-y-auto px-1'
+      onSubmit={(e) => {
+        e.preventDefault()
+        handleSave()
+      }}
+    >
+      {/* Hidden submit button for parent modal to trigger */}
+      <button type='submit' className='hidden' />
+
       {servers.map((server) => (
         <ServerToolsQuery
           key={server.id}
@@ -501,6 +560,6 @@ export function McpToolDeploy({
           {addToolMutation.error?.message || 'Failed to add tool'}
         </p>
       )}
-    </div>
+    </form>
   )
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx

@@ -88,6 +88,8 @@ export function DeployModal({
   const [showUndeployConfirm, setShowUndeployConfirm] = useState(false)
   const [templateFormValid, setTemplateFormValid] = useState(false)
   const [templateSubmitting, setTemplateSubmitting] = useState(false)
+  const [mcpToolSubmitting, setMcpToolSubmitting] = useState(false)
+  const [mcpToolCanSave, setMcpToolCanSave] = useState(false)
   const [hasExistingTemplate, setHasExistingTemplate] = useState(false)
   const [templateStatus, setTemplateStatus] = useState<{
     status: 'pending' | 'approved' | 'rejected' | null
@@ -531,6 +533,11 @@ export function DeployModal({
     form?.requestSubmit()
   }, [])
 
+  const handleMcpToolFormSubmit = useCallback(() => {
+    const form = document.getElementById('mcp-tool-deploy-form') as HTMLFormElement
+    form?.requestSubmit()
+  }, [])
+
   const handleTemplateDelete = useCallback(() => {
     const form = document.getElementById('template-deploy-form')
     const deleteTrigger = form?.querySelector('[data-template-delete-trigger]') as HTMLButtonElement
@@ -620,6 +627,8 @@ export function DeployModal({
                     workflowName={workflowMetadata?.name || 'Workflow'}
                     workflowDescription={workflowMetadata?.description}
                     isDeployed={isDeployed}
+                    onSubmittingChange={setMcpToolSubmitting}
+                    onCanSaveChange={setMcpToolCanSave}
                   />
                 )}
               </ModalTabsContent>
@@ -667,6 +676,18 @@ export function DeployModal({
               </div>
             </ModalFooter>
           )}
+          {activeTab === 'mcp-tool' && isDeployed && (
+            <ModalFooter className='items-center'>
+              <Button
+                type='button'
+                variant='primary'
+                onClick={handleMcpToolFormSubmit}
+                disabled={mcpToolSubmitting || !mcpToolCanSave}
+              >
+                {mcpToolSubmitting ? 'Saving...' : 'Save Tool Schema'}
+              </Button>
+            </ModalFooter>
+          )}
           {activeTab === 'template' && (
             <ModalFooter
               className={`items-center ${hasExistingTemplate && templateStatus ? 'justify-between' : ''}`}