Merge staging into fix/async

Resolve conflict in env.ts - keep staging's sync timeout values (3000)
while adding async timeout variants (5400)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: waleedlatif1

apps/docs/content/docs/en/execution/costs.mdx

@@ -220,9 +220,9 @@ Workflows have maximum execution time limits based on your subscription plan:
 | Plan | Sync Execution | Async Execution |
 |------|----------------|-----------------|
 | **Free** | 5 minutes | 10 minutes |
-| **Pro** | 60 minutes | 90 minutes |
-| **Team** | 60 minutes | 90 minutes |
-| **Enterprise** | 60 minutes | 90 minutes |
+| **Pro** | 50 minutes | 90 minutes |
+| **Team** | 50 minutes | 90 minutes |
+| **Enterprise** | 50 minutes | 90 minutes |
 
 **Sync executions** run immediately and return results directly. These are triggered via the API with `async: false` (default) or through the UI.
 **Async executions** (triggered via API with `async: true`, webhooks, or schedules) run in the background. Async time limits are up to 2x the sync limit, capped at 90 minutes.

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/plan-configs.ts

@@ -15,7 +15,7 @@ import type { PlanFeature } from '@/app/workspace/[workspaceId]/w/components/sid
 export const PRO_PLAN_FEATURES: PlanFeature[] = [
   { icon: Zap, text: '150 runs per minute (sync)' },
   { icon: Clock, text: '1,000 runs per minute (async)' },
-  { icon: Timer, text: '60 min sync execution limit' },
+  { icon: Timer, text: '50 min sync execution limit' },
   { icon: HardDrive, text: '50GB file storage' },
   { icon: Users, text: 'Unlimited invites' },
   { icon: Database, text: 'Unlimited log retention' },
@@ -24,7 +24,7 @@ export const PRO_PLAN_FEATURES: PlanFeature[] = [
 export const TEAM_PLAN_FEATURES: PlanFeature[] = [
   { icon: Zap, text: '300 runs per minute (sync)' },
   { icon: Clock, text: '2,500 runs per minute (async)' },
-  { icon: Timer, text: '60 min sync execution limit' },
+  { icon: Timer, text: '50 min sync execution limit' },
   { icon: HardDrive, text: '500GB file storage (pooled)' },
   { icon: Users, text: 'Unlimited invites' },
   { icon: Database, text: 'Unlimited log retention' },

apps/sim/lib/core/config/env.ts

@@ -170,11 +170,13 @@ export const env = createEnv({
     RATE_LIMIT_ENTERPRISE_SYNC:            z.string().optional().default('600'),   // Enterprise tier sync API executions per minute
     RATE_LIMIT_ENTERPRISE_ASYNC:           z.string().optional().default('5000'),  // Enterprise tier async API executions per minute
 
-    // Timeout Configuration
+    // Sync execution timeouts in seconds (applies to synchronous API calls)
     EXECUTION_TIMEOUT_FREE:                z.string().optional().default('300'),   // 5 minutes
-    EXECUTION_TIMEOUT_PRO:                 z.string().optional().default('3600'),  // 1 hour
-    EXECUTION_TIMEOUT_TEAM:                z.string().optional().default('3600'),  // 1 hour
-    EXECUTION_TIMEOUT_ENTERPRISE:          z.string().optional().default('3600'),  // 1 hour
+    EXECUTION_TIMEOUT_PRO:                 z.string().optional().default('3000'),  // 50 minutes
+    EXECUTION_TIMEOUT_TEAM:                z.string().optional().default('3000'),  // 50 minutes
+    EXECUTION_TIMEOUT_ENTERPRISE:          z.string().optional().default('3000'),  // 50 minutes
+
+    // Async execution timeouts in seconds (applies to async/background job executions)
     EXECUTION_TIMEOUT_ASYNC_FREE:          z.string().optional().default('5400'),  // 90 minutes
     EXECUTION_TIMEOUT_ASYNC_PRO:           z.string().optional().default('5400'),  // 90 minutes
     EXECUTION_TIMEOUT_ASYNC_TEAM:          z.string().optional().default('5400'),  // 90 minutes

apps/sim/lib/core/execution-limits/types.ts

@@ -1,4 +1,5 @@
 import { env } from '@/lib/core/config/env'
+import { isBillingEnabled } from '@/lib/core/config/feature-flags'
 import type { SubscriptionPlan } from '@/lib/core/rate-limiter/types'
 
 interface ExecutionTimeoutConfig {
@@ -8,9 +9,9 @@ interface ExecutionTimeoutConfig {
 
 const DEFAULT_SYNC_TIMEOUTS_SECONDS = {
   free: 300,
-  pro: 3600,
-  team: 3600,
-  enterprise: 3600,
+  pro: 3000,
+  team: 3000,
+  enterprise: 3000,
 } as const
 
 const DEFAULT_ASYNC_TIMEOUTS_SECONDS = {
@@ -63,14 +64,19 @@ export function getExecutionTimeout(
   plan: SubscriptionPlan | undefined,
   type: 'sync' | 'async' = 'sync'
 ): number {
+  if (!isBillingEnabled) {
+    return EXECUTION_TIMEOUTS.enterprise[type]
+  }
   return EXECUTION_TIMEOUTS[plan || 'free'][type]
 }
 
 export function getMaxExecutionTimeout(): number {
   return EXECUTION_TIMEOUTS.enterprise.async
 }
 
-export const DEFAULT_EXECUTION_TIMEOUT_MS = EXECUTION_TIMEOUTS.free.sync
+export const DEFAULT_EXECUTION_TIMEOUT_MS = isBillingEnabled
+  ? EXECUTION_TIMEOUTS.free.sync
+  : EXECUTION_TIMEOUTS.enterprise.sync
 
 export function isTimeoutError(error: unknown): boolean {
   if (!error) return false

apps/sim/lib/mcp/client.ts

@@ -156,7 +156,7 @@ export class McpClient {
       return result.tools.map((tool: Tool) => ({
         name: tool.name,
         description: tool.description,
-        inputSchema: tool.inputSchema,
+        inputSchema: tool.inputSchema as McpTool['inputSchema'],
         serverId: this.config.id,
         serverName: this.config.name,
       }))

apps/sim/lib/mcp/types.ts

@@ -57,14 +57,29 @@ export interface McpSecurityPolicy {
   auditLevel: 'none' | 'basic' | 'detailed'
 }
 
+/**
+ * JSON Schema property definition for tool parameters.
+ * Follows JSON Schema specification with description support.
+ */
+export interface McpToolSchemaProperty {
+  type: string
+  description?: string
+  items?: McpToolSchemaProperty
+  properties?: Record<string, McpToolSchemaProperty>
+  required?: string[]
+  enum?: Array<string | number | boolean>
+  default?: unknown
+}
+
 /**
  * JSON Schema for tool input parameters.
  * Aligns with MCP SDK's Tool.inputSchema structure.
  */
 export interface McpToolSchema {
   type: 'object'
-  properties?: Record<string, unknown>
+  properties?: Record<string, McpToolSchemaProperty>
   required?: string[]
+  description?: string
 }
 
 /**

apps/sim/providers/anthropic/index.ts

@@ -6,7 +6,6 @@ import { MAX_TOOL_ITERATIONS } from '@/providers'
 import {
   checkForForcedToolUsage,
   createReadableStreamFromAnthropicStream,
-  generateToolUseId,
 } from '@/providers/anthropic/utils'
 import {
   getMaxOutputTokensForModel,
@@ -433,11 +432,32 @@ export const anthropicProvider: ProviderConfig = {
 
             const executionResults = await Promise.allSettled(toolExecutionPromises)
 
+            // Collect all tool_use and tool_result blocks for batching
+            const toolUseBlocks: Array<{
+              type: 'tool_use'
+              id: string
+              name: string
+              input: Record<string, unknown>
+            }> = []
+            const toolResultBlocks: Array<{
+              type: 'tool_result'
+              tool_use_id: string
+              content: string
+            }> = []
+
             for (const settledResult of executionResults) {
               if (settledResult.status === 'rejected' || !settledResult.value) continue
 
-              const { toolName, toolArgs, toolParams, result, startTime, endTime, duration } =
-                settledResult.value
+              const {
+                toolUse,
+                toolName,
+                toolArgs,
+                toolParams,
+                result,
+                startTime,
+                endTime,
+                duration,
+              } = settledResult.value
 
               timeSegments.push({
                 type: 'tool',
@@ -447,7 +467,7 @@ export const anthropicProvider: ProviderConfig = {
                 duration: duration,
               })
 
-              let resultContent: any
+              let resultContent: unknown
               if (result.success) {
                 toolResults.push(result.output)
                 resultContent = result.output
@@ -469,29 +489,34 @@ export const anthropicProvider: ProviderConfig = {
                 success: result.success,
               })
 
-              const toolUseId = generateToolUseId(toolName)
+              // Add to batched arrays using the ORIGINAL ID from Claude's response
+              toolUseBlocks.push({
+                type: 'tool_use',
+                id: toolUse.id,
+                name: toolName,
+                input: toolArgs,
+              })
+
+              toolResultBlocks.push({
+                type: 'tool_result',
+                tool_use_id: toolUse.id,
+                content: JSON.stringify(resultContent),
+              })
+            }
 
+            // Add ONE assistant message with ALL tool_use blocks
+            if (toolUseBlocks.length > 0) {
               currentMessages.push({
                 role: 'assistant',
-                content: [
-                  {
-                    type: 'tool_use',
-                    id: toolUseId,
-                    name: toolName,
-                    input: toolArgs,
-                  } as any,
-                ],
+                content: toolUseBlocks as unknown as Anthropic.Messages.ContentBlock[],
               })
+            }
 
+            // Add ONE user message with ALL tool_result blocks
+            if (toolResultBlocks.length > 0) {
               currentMessages.push({
                 role: 'user',
-                content: [
-                  {
-                    type: 'tool_result',
-                    tool_use_id: toolUseId,
-                    content: JSON.stringify(resultContent),
-                  } as any,
-                ],
+                content: toolResultBlocks as unknown as Anthropic.Messages.ContentBlockParam[],
               })
             }
 
@@ -777,6 +802,8 @@ export const anthropicProvider: ProviderConfig = {
             const toolCallStartTime = Date.now()
             const toolName = toolUse.name
             const toolArgs = toolUse.input as Record<string, any>
+            // Preserve the original tool_use ID from Claude's response
+            const toolUseId = toolUse.id
 
             try {
               const tool = request.tools?.find((t) => t.id === toolName)
@@ -787,6 +814,7 @@ export const anthropicProvider: ProviderConfig = {
               const toolCallEndTime = Date.now()
 
               return {
+                toolUseId,
                 toolName,
                 toolArgs,
                 toolParams,
@@ -800,6 +828,7 @@ export const anthropicProvider: ProviderConfig = {
               logger.error('Error processing tool call:', { error, toolName })
 
               return {
+                toolUseId,
                 toolName,
                 toolArgs,
                 toolParams: {},
@@ -817,11 +846,32 @@ export const anthropicProvider: ProviderConfig = {
 
           const executionResults = await Promise.allSettled(toolExecutionPromises)
 
+          // Collect all tool_use and tool_result blocks for batching
+          const toolUseBlocks: Array<{
+            type: 'tool_use'
+            id: string
+            name: string
+            input: Record<string, unknown>
+          }> = []
+          const toolResultBlocks: Array<{
+            type: 'tool_result'
+            tool_use_id: string
+            content: string
+          }> = []
+
           for (const settledResult of executionResults) {
             if (settledResult.status === 'rejected' || !settledResult.value) continue
 
-            const { toolName, toolArgs, toolParams, result, startTime, endTime, duration } =
-              settledResult.value
+            const {
+              toolUseId,
+              toolName,
+              toolArgs,
+              toolParams,
+              result,
+              startTime,
+              endTime,
+              duration,
+            } = settledResult.value
 
             timeSegments.push({
               type: 'tool',
@@ -831,7 +881,7 @@ export const anthropicProvider: ProviderConfig = {
               duration: duration,
             })
 
-            let resultContent: any
+            let resultContent: unknown
             if (result.success) {
               toolResults.push(result.output)
               resultContent = result.output
@@ -853,29 +903,34 @@ export const anthropicProvider: ProviderConfig = {
               success: result.success,
             })
 
-            const toolUseId = generateToolUseId(toolName)
+            // Add to batched arrays using the ORIGINAL ID from Claude's response
+            toolUseBlocks.push({
+              type: 'tool_use',
+              id: toolUseId,
+              name: toolName,
+              input: toolArgs,
+            })
+
+            toolResultBlocks.push({
+              type: 'tool_result',
+              tool_use_id: toolUseId,
+              content: JSON.stringify(resultContent),
+            })
+          }
 
+          // Add ONE assistant message with ALL tool_use blocks
+          if (toolUseBlocks.length > 0) {
             currentMessages.push({
               role: 'assistant',
-              content: [
-                {
-                  type: 'tool_use',
-                  id: toolUseId,
-                  name: toolName,
-                  input: toolArgs,
-                } as any,
-              ],
+              content: toolUseBlocks as unknown as Anthropic.Messages.ContentBlock[],
             })
+          }
 
+          // Add ONE user message with ALL tool_result blocks
+          if (toolResultBlocks.length > 0) {
             currentMessages.push({
               role: 'user',
-              content: [
-                {
-                  type: 'tool_result',
-                  tool_use_id: toolUseId,
-                  content: JSON.stringify(resultContent),
-                } as any,
-              ],
+              content: toolResultBlocks as unknown as Anthropic.Messages.ContentBlockParam[],
             })
           }
 
@@ -1061,7 +1116,7 @@ export const anthropicProvider: ProviderConfig = {
                 startTime: tc.startTime,
                 endTime: tc.endTime,
                 duration: tc.duration,
-                result: tc.result,
+                result: tc.result as Record<string, unknown> | undefined,
               }))
             : undefined,
         toolResults: toolResults.length > 0 ? toolResults : undefined,

apps/sim/providers/bedrock/utils.ts

@@ -67,8 +67,17 @@ export function checkForForcedToolUsage(
   return null
 }
 
+/**
+ * Generates a unique tool use ID for Bedrock.
+ * AWS Bedrock requires toolUseId to be 1-64 characters, pattern [a-zA-Z0-9_-]+
+ */
 export function generateToolUseId(toolName: string): string {
-  return `${toolName}-${Date.now()}-${Math.random().toString(36).substring(2, 7)}`
+  const timestamp = Date.now().toString(36) // Base36 timestamp (9 chars)
+  const random = Math.random().toString(36).substring(2, 7) // 5 random chars
+  const suffix = `-${timestamp}-${random}` // ~15 chars
+  const maxNameLength = 64 - suffix.length
+  const truncatedName = toolName.substring(0, maxNameLength).replace(/[^a-zA-Z0-9_-]/g, '_')
+  return `${truncatedName}${suffix}`
 }
 
 /**

apps/sim/providers/deepseek/index.ts

@@ -76,7 +76,7 @@ export const deepseekProvider: ProviderConfig = {
         : undefined
 
       const payload: any = {
-        model: 'deepseek-chat',
+        model: request.model,
         messages: allMessages,
       }