address greptile

Author: icecrasher321

apps/sim/lib/mcp/resolve-config.ts

@@ -35,6 +35,14 @@ export async function resolveMcpConfigEnvVars(
   const { strict = true } = options
   const allMissingVars: string[] = []
 
+  let envVars: Record<string, string> = {}
+  try {
+    envVars = await getEffectiveDecryptedEnv(userId, workspaceId)
+  } catch (error) {
+    logger.error('Failed to fetch environment variables for MCP config:', error)
+    return { config, missingVars: [] }
+  }
+
   const resolveValue = (value: string): string => {
     const missingVars: string[] = []
     const resolved = resolveEnvVarReferences(value, envVars, {
@@ -44,14 +52,6 @@ export async function resolveMcpConfigEnvVars(
     return resolved
   }
 
-  let envVars: Record<string, string> = {}
-  try {
-    envVars = await getEffectiveDecryptedEnv(userId, workspaceId)
-  } catch (error) {
-    logger.error('Failed to fetch environment variables for MCP config:', error)
-    return { config, missingVars: [] }
-  }
-
   const resolvedConfig = { ...config }
 
   if (resolvedConfig.url) {