address bugbot

Author: icecrasher321

apps/sim/app/api/webhooks/[id]/route.ts

@@ -242,7 +242,11 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
         historyId: existingConfig.historyId,
         lastCheckedTimestamp: existingConfig.lastCheckedTimestamp,
         setupCompleted: existingConfig.setupCompleted,
-        externalId: nextProviderConfig.externalId ?? existingConfig.externalId,
+      }
+      for (const [key, value] of Object.entries(nextProviderConfig)) {
+        if (!(key in originalProviderConfig)) {
+          ;(finalProviderConfig as Record<string, unknown>)[key] = value
+        }
       }
     }
 

apps/sim/lib/mcp/shared.ts

@@ -46,22 +46,3 @@ export function createMcpToolId(serverId: string, toolName: string): string {
   const normalizedServerId = isMcpTool(serverId) ? serverId : `${MCP.TOOL_PREFIX}${serverId}`
   return `${normalizedServerId}-${toolName}`
 }
-
-/**
- * Parse an MCP tool ID back into server ID and tool name
- */
-export function parseMcpToolId(toolId: string): { serverId: string; toolName: string } {
-  // Remove the MCP tool prefix if present to get the base ID
-  const baseId = toolId.startsWith(MCP.TOOL_PREFIX) ? toolId.slice(MCP.TOOL_PREFIX.length) : toolId
-
-  // Find the last hyphen to split server ID and tool name
-  const lastHyphenIndex = baseId.lastIndexOf('-')
-  if (lastHyphenIndex === -1) {
-    return { serverId: baseId, toolName: '' }
-  }
-
-  const serverId = baseId.slice(0, lastHyphenIndex)
-  const toolName = baseId.slice(lastHyphenIndex + 1)
-
-  return { serverId, toolName }
-}

apps/sim/lib/webhooks/env-resolver.ts

@@ -5,16 +5,18 @@ import { resolveEnvVarReferences } from '@/executor/utils/reference-validation'
  * Recursively resolves all environment variable references in a configuration object.
  * Supports both exact matches (`{{VAR_NAME}}`) and embedded patterns (`https://{{HOST}}/path`).
  *
+ * Uses `deep: true` because webhook configs have nested structures that need full resolution.
+ *
  * @param config - Configuration object that may contain env var references
  * @param userId - User ID to fetch environment variables for
  * @param workspaceId - Optional workspace ID for workspace-specific env vars
  * @returns A new object with all env var references resolved
  */
-export async function resolveEnvVarsInObject(
-  config: Record<string, any>,
+export async function resolveEnvVarsInObject<T extends Record<string, unknown>>(
+  config: T,
   userId: string,
   workspaceId?: string
-): Promise<Record<string, any>> {
+): Promise<T> {
   const envVars = await getEffectiveDecryptedEnv(userId, workspaceId)
-  return resolveEnvVarReferences(config, envVars, { deep: true }) as Record<string, any>
+  return resolveEnvVarReferences(config, envVars, { deep: true }) as T
 }