Refactor

Author: Sg312

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

@@ -11,7 +11,7 @@ import { env } from '@/lib/core/config/env'
 import { getCostMultiplier, isBillingEnabled } from '@/lib/core/config/feature-flags'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { verifyWorkspaceMembership } from '@/app/api/workflows/utils'
-import { extractResponseText, parseResponsesUsage } from '@/providers/responses-utils'
+import { extractResponseText, parseResponsesUsage } from '@/providers/openai/utils'
 import { getModelPricing } from '@/providers/utils'
 
 export const dynamic = 'force-dynamic'
@@ -386,12 +386,19 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
                       throw new Error(parsed?.error?.message || 'Responses stream error')
                     }
 
-                    if (eventType === 'response.output_text.delta') {
+                    if (
+                      eventType === 'response.output_text.delta' ||
+                      eventType === 'response.output_json.delta'
+                    ) {
                       let content = ''
                       if (typeof parsed.delta === 'string') {
                         content = parsed.delta
                       } else if (parsed.delta && typeof parsed.delta.text === 'string') {
                         content = parsed.delta.text
+                      } else if (parsed.delta && parsed.delta.json !== undefined) {
+                        content = JSON.stringify(parsed.delta.json)
+                      } else if (parsed.json !== undefined) {
+                        content = JSON.stringify(parsed.json)
                       } else if (typeof parsed.text === 'string') {
                         content = parsed.text
                       }

apps/sim/lib/copilot/chat-title.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { env } from '@/lib/core/config/env'
-import { extractResponseText } from '@/providers/responses-utils'
+import { extractResponseText } from '@/providers/openai/utils'
 
 const logger = createLogger('SimAgentUtils')
 

apps/sim/providers/azure-openai/index.ts

@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { env } from '@/lib/core/config/env'
 import type { StreamingExecution } from '@/executor/types'
 import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
-import { executeResponsesProviderRequest } from '@/providers/responses-provider'
+import { executeResponsesProviderRequest } from '@/providers/openai/core'
 import type { ProviderConfig, ProviderRequest, ProviderResponse } from '@/providers/types'
 
 const logger = createLogger('AzureOpenAIProvider')

apps/sim/providers/responses-provider.ts apps/sim/providers/openai/core.tsapps/sim/providers/responses-provider.ts renamed to apps/sim/providers/openai/core.ts

@@ -1,6 +1,14 @@
 import type { Logger } from '@sim/logger'
 import type { StreamingExecution } from '@/executor/types'
 import { MAX_TOOL_ITERATIONS } from '@/providers'
+import type { Message, ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
+import {
+  calculateCost,
+  prepareToolExecution,
+  prepareToolsWithUsageControl,
+  trackForcedToolUsage,
+} from '@/providers/utils'
+import { executeTool } from '@/tools'
 import {
   buildResponsesInputFromMessages,
   convertResponseOutputToInputItems,
@@ -12,19 +20,59 @@ import {
   type ResponsesInputItem,
   type ResponsesToolCall,
   toResponsesToolChoice,
-} from '@/providers/responses-utils'
-import type { Message, ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
-import {
-  calculateCost,
-  prepareToolExecution,
-  prepareToolsWithUsageControl,
-  trackForcedToolUsage,
-} from '@/providers/utils'
-import { executeTool } from '@/tools'
+} from './utils'
 
 type PreparedTools = ReturnType<typeof prepareToolsWithUsageControl>
 type ToolChoice = PreparedTools['toolChoice']
 
+/**
+ * Recursively enforces OpenAI strict mode requirements on a JSON schema.
+ * - Sets additionalProperties: false on all object types.
+ * - Ensures required includes ALL property keys.
+ */
+function enforceStrictSchema(schema: any): any {
+  if (!schema || typeof schema !== 'object') return schema
+
+  const result = { ...schema }
+
+  // If this is an object type, enforce strict requirements
+  if (result.type === 'object') {
+    result.additionalProperties = false
+
+    // Recursively process properties and ensure required includes all keys
+    if (result.properties && typeof result.properties === 'object') {
+      const propKeys = Object.keys(result.properties)
+      result.required = propKeys // Strict mode requires ALL properties
+      result.properties = Object.fromEntries(
+        Object.entries(result.properties).map(([key, value]) => [key, enforceStrictSchema(value)])
+      )
+    }
+  }
+
+  // Handle array items
+  if (result.type === 'array' && result.items) {
+    result.items = enforceStrictSchema(result.items)
+  }
+
+  // Handle anyOf, oneOf, allOf
+  for (const keyword of ['anyOf', 'oneOf', 'allOf']) {
+    if (Array.isArray(result[keyword])) {
+      result[keyword] = result[keyword].map(enforceStrictSchema)
+    }
+  }
+
+  // Handle $defs / definitions
+  for (const defKey of ['$defs', 'definitions']) {
+    if (result[defKey] && typeof result[defKey] === 'object') {
+      result[defKey] = Object.fromEntries(
+        Object.entries(result[defKey]).map(([key, value]) => [key, enforceStrictSchema(value)])
+      )
+    }
+  }
+
+  return result
+}
+
 export interface ResponsesProviderConfig {
   providerId: string
   providerLabel: string
@@ -97,15 +145,18 @@ export async function executeResponsesProviderRequest(
   }
 
   if (request.responseFormat) {
+    const isStrict = request.responseFormat.strict !== false
+    const rawSchema = request.responseFormat.schema || request.responseFormat
+    // OpenAI strict mode requires additionalProperties: false on ALL nested objects
+    const cleanedSchema = isStrict ? enforceStrictSchema(rawSchema) : rawSchema
+
     basePayload.text = {
       ...(basePayload.text ?? {}),
       format: {
         type: 'json_schema',
-        json_schema: {
-          name: request.responseFormat.name || 'response_schema',
-          schema: request.responseFormat.schema || request.responseFormat,
-          strict: request.responseFormat.strict !== false,
-        },
+        name: request.responseFormat.name || 'response_schema',
+        schema: cleanedSchema,
+        strict: isStrict,
       },
     }
 

apps/sim/providers/openai/index.ts

@@ -1,8 +1,8 @@
 import { createLogger } from '@sim/logger'
 import type { StreamingExecution } from '@/executor/types'
 import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
-import { executeResponsesProviderRequest } from '@/providers/responses-provider'
 import type { ProviderConfig, ProviderRequest, ProviderResponse } from '@/providers/types'
+import { executeResponsesProviderRequest } from './core'
 
 const logger = createLogger('OpenAIProvider')
 const responsesEndpoint = 'https://api.openai.com/v1/responses'

apps/sim/providers/responses-utils.ts apps/sim/providers/openai/utils.tsapps/sim/providers/responses-utils.ts renamed to apps/sim/providers/openai/utils.ts

@@ -146,12 +146,21 @@ function extractTextFromMessageItem(item: any): string {
 
   const textParts: string[] = []
   for (const part of item.content) {
-    if (
-      part &&
-      (part.type === 'output_text' || part.type === 'text') &&
-      typeof part.text === 'string'
-    ) {
+    if (!part || typeof part !== 'object') {
+      continue
+    }
+
+    if ((part.type === 'output_text' || part.type === 'text') && typeof part.text === 'string') {
       textParts.push(part.text)
+      continue
+    }
+
+    if (part.type === 'output_json') {
+      if (typeof part.text === 'string') {
+        textParts.push(part.text)
+      } else if (part.json !== undefined) {
+        textParts.push(JSON.stringify(part.json))
+      }
     }
   }
 
@@ -412,12 +421,19 @@ export function createReadableStreamFromResponses(
               return
             }
 
-            if (eventType === 'response.output_text.delta') {
+            if (
+              eventType === 'response.output_text.delta' ||
+              eventType === 'response.output_json.delta'
+            ) {
               let deltaText = ''
               if (typeof event.delta === 'string') {
                 deltaText = event.delta
               } else if (event.delta && typeof event.delta.text === 'string') {
                 deltaText = event.delta.text
+              } else if (event.delta && event.delta.json !== undefined) {
+                deltaText = JSON.stringify(event.delta.json)
+              } else if (event.json !== undefined) {
+                deltaText = JSON.stringify(event.json)
               } else if (typeof event.text === 'string') {
                 deltaText = event.text
               }