fix(resolvers): agent response format, input formats, root level

icecrasher321 · icecrasher321 · commit db654d883964 · 2026-01-21T14:16:38.000-08:00
diff --git a/apps/sim/app/api/function/execute/route.ts b/apps/sim/app/api/function/execute/route.ts
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
@@ -35,9 +35,9 @@ import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/comp
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
 import type { GenerationType } from '@/blocks/types'
+import { normalizeName } from '@/executor/constants'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/kb/use-tag-selection'
-import { normalizeName } from '@/stores/workflows/utils'
 
 const logger = createLogger('Code')
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/condition-input/condition-input.tsx
@@ -32,9 +32,9 @@ import {
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
+import { normalizeName } from '@/executor/constants'
 import { createEnvVarPattern, createReferencePattern } from '@/executor/utils/reference-validation'
 import { useTagSelection } from '@/hooks/kb/use-tag-selection'
-import { normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('ConditionInput')
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text.tsx
@@ -2,9 +2,8 @@
 
 import type { ReactNode } from 'react'
 import { splitReferenceSegment } from '@/lib/workflows/sanitization/references'
-import { REFERENCE } from '@/executor/constants'
+import { normalizeName, REFERENCE } from '@/executor/constants'
 import { createCombinedPattern } from '@/executor/utils/reference-validation'
-import { normalizeName } from '@/stores/workflows/utils'
 
 export interface HighlightContext {
   accessiblePrefixes?: Set<string>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -35,11 +35,11 @@ import type {
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { getBlock } from '@/blocks'
 import type { BlockConfig } from '@/blocks/types'
+import { normalizeName } from '@/executor/constants'
 import type { Variable } from '@/stores/panel'
 import { useVariablesStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 
diff --git a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
@@ -17,6 +17,7 @@ import {
 } from '@/executor/human-in-the-loop/utils'
 import type { BlockHandler, ExecutionContext, PauseMetadata } from '@/executor/types'
 import { collectBlockData } from '@/executor/utils/block-data'
+import { parseObjectStrings } from '@/executor/utils/json'
 import type { SerializedBlock } from '@/serializer/types'
 import { executeTool } from '@/tools'
 
@@ -265,7 +266,7 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
 
     if (dataMode === 'structured' && inputs.builderData) {
       const convertedData = this.convertBuilderDataToJson(inputs.builderData)
-      return this.parseObjectStrings(convertedData)
+      return parseObjectStrings(convertedData)
     }
 
     return inputs.data || {}
@@ -485,29 +486,6 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
     )
   }
 
-  private parseObjectStrings(data: any): any {
-    if (typeof data === 'string') {
-      try {
-        const parsed = JSON.parse(data)
-        if (typeof parsed === 'object' && parsed !== null) {
-          return this.parseObjectStrings(parsed)
-        }
-        return parsed
-      } catch {
-        return data
-      }
-    } else if (Array.isArray(data)) {
-      return data.map((item) => this.parseObjectStrings(item))
-    } else if (typeof data === 'object' && data !== null) {
-      const result: any = {}
-      for (const [key, value] of Object.entries(data)) {
-        result[key] = this.parseObjectStrings(value)
-      }
-      return result
-    }
-    return data
-  }
-
   private parseStatus(status?: string): number {
     if (!status) return HTTP.STATUS.OK
     const parsed = Number(status)
diff --git a/apps/sim/executor/handlers/response/response-handler.ts b/apps/sim/executor/handlers/response/response-handler.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { BlockType, HTTP, REFERENCE } from '@/executor/constants'
 import type { BlockHandler, ExecutionContext, NormalizedBlockOutput } from '@/executor/types'
+import { parseObjectStrings } from '@/executor/utils/json'
 import type { SerializedBlock } from '@/serializer/types'
 
 const logger = createLogger('ResponseBlockHandler')
@@ -73,7 +74,7 @@ export class ResponseBlockHandler implements BlockHandler {
 
     if (dataMode === 'structured' && inputs.builderData) {
       const convertedData = this.convertBuilderDataToJson(inputs.builderData)
-      return this.parseObjectStrings(convertedData)
+      return parseObjectStrings(convertedData)
     }
 
     return inputs.data || {}
@@ -222,29 +223,6 @@ export class ResponseBlockHandler implements BlockHandler {
     )
   }
 
-  private parseObjectStrings(data: any): any {
-    if (typeof data === 'string') {
-      try {
-        const parsed = JSON.parse(data)
-        if (typeof parsed === 'object' && parsed !== null) {
-          return this.parseObjectStrings(parsed)
-        }
-        return parsed
-      } catch {
-        return data
-      }
-    } else if (Array.isArray(data)) {
-      return data.map((item) => this.parseObjectStrings(item))
-    } else if (typeof data === 'object' && data !== null) {
-      const result: any = {}
-      for (const [key, value] of Object.entries(data)) {
-        result[key] = this.parseObjectStrings(value)
-      }
-      return result
-    }
-    return data
-  }
-
   private parseStatus(status?: string): number {
     if (!status) return HTTP.STATUS.OK
     const parsed = Number(status)
diff --git a/apps/sim/executor/utils/json.ts b/apps/sim/executor/utils/json.ts
@@ -40,3 +40,30 @@ export function isJSONString(value: string): boolean {
   const trimmed = value.trim()
   return trimmed.startsWith('{') || trimmed.startsWith('[')
 }
+
+/**
+ * Recursively parses JSON strings within an object or array.
+ * Useful for normalizing data that may contain stringified JSON at various levels.
+ */
+export function parseObjectStrings(data: unknown): unknown {
+  if (typeof data === 'string') {
+    try {
+      const parsed = JSON.parse(data)
+      if (typeof parsed === 'object' && parsed !== null) {
+        return parseObjectStrings(parsed)
+      }
+      return parsed
+    } catch {
+      return data
+    }
+  } else if (Array.isArray(data)) {
+    return data.map((item) => parseObjectStrings(item))
+  } else if (typeof data === 'object' && data !== null) {
+    const result: Record<string, unknown> = {}
+    for (const [key, value] of Object.entries(data)) {
+      result[key] = parseObjectStrings(value)
+    }
+    return result
+  }
+  return data
+}
diff --git a/apps/sim/executor/variables/resolvers/block.test.ts b/apps/sim/executor/variables/resolvers/block.test.ts
@@ -298,45 +298,6 @@ describe('BlockResolver', () => {
     })
   })
 
-  describe('tryParseJSON', () => {
-    it.concurrent('should parse valid JSON object string', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      expect(resolver.tryParseJSON('{"key": "value"}')).toEqual({ key: 'value' })
-    })
-
-    it.concurrent('should parse valid JSON array string', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      expect(resolver.tryParseJSON('[1, 2, 3]')).toEqual([1, 2, 3])
-    })
-
-    it.concurrent('should return original value for non-string input', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      const obj = { key: 'value' }
-      expect(resolver.tryParseJSON(obj)).toBe(obj)
-      expect(resolver.tryParseJSON(123)).toBe(123)
-      expect(resolver.tryParseJSON(null)).toBe(null)
-    })
-
-    it.concurrent('should return original string for non-JSON strings', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      expect(resolver.tryParseJSON('plain text')).toBe('plain text')
-      expect(resolver.tryParseJSON('123')).toBe('123')
-      expect(resolver.tryParseJSON('')).toBe('')
-    })
-
-    it.concurrent('should return original string for invalid JSON', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      expect(resolver.tryParseJSON('{invalid json}')).toBe('{invalid json}')
-      expect(resolver.tryParseJSON('[1, 2,')).toBe('[1, 2,')
-    })
-
-    it.concurrent('should handle whitespace around JSON', () => {
-      const resolver = new BlockResolver(createTestWorkflow())
-      expect(resolver.tryParseJSON('  {"key": "value"}  ')).toEqual({ key: 'value' })
-      expect(resolver.tryParseJSON('\n[1, 2]\n')).toEqual([1, 2])
-    })
-  })
-
   describe('Response block backwards compatibility', () => {
     it.concurrent('should resolve new format: <responseBlock.data>', () => {
       const workflow = createTestWorkflow([
diff --git a/apps/sim/executor/variables/resolvers/block.ts b/apps/sim/executor/variables/resolvers/block.ts
@@ -1,3 +1,4 @@
+import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { USER_FILE_ACCESSIBLE_PROPERTIES } from '@/lib/workflows/types'
 import {
   isReference,
@@ -229,9 +230,15 @@ export class BlockResolver implements Resolver {
       }
     }
 
+    const blockType = block?.metadata?.id
+    const params = block?.config?.params as Record<string, unknown> | undefined
+    const subBlocks = params
+      ? Object.fromEntries(Object.entries(params).map(([k, v]) => [k, { value: v }]))
+      : undefined
     const toolId = block?.config?.tool
     const toolConfig = toolId ? getTool(toolId) : undefined
-    const outputSchema = toolConfig?.outputs ?? block?.outputs
+    const outputSchema =
+      toolConfig?.outputs ?? (blockType ? getBlockOutputs(blockType, subBlocks) : block?.outputs)
     const schemaFields = getSchemaFieldNames(outputSchema)
     if (schemaFields.length > 0 && !isPathInOutputSchema(outputSchema, pathParts)) {
       throw new Error(
@@ -336,21 +343,4 @@ export class BlockResolver implements Resolver {
     }
     return String(value)
   }
-
-  tryParseJSON(value: any): any {
-    if (typeof value !== 'string') {
-      return value
-    }
-
-    const trimmed = value.trim()
-    if (trimmed.length > 0 && (trimmed.startsWith('{') || trimmed.startsWith('['))) {
-      try {
-        return JSON.parse(trimmed)
-      } catch {
-        return value
-      }
-    }
-
-    return value
-  }
 }
diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -5,6 +5,7 @@ import { useShallow } from 'zustand/react/shallow'
 import { useSession } from '@/lib/auth/auth-client'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
+import { normalizeName } from '@/executor/constants'
 import { useUndoRedo } from '@/hooks/use-undo-redo'
 import {
   BLOCK_OPERATIONS,
@@ -23,7 +24,7 @@ import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { filterNewEdges, mergeSubblockState, normalizeName } from '@/stores/workflows/utils'
+import { filterNewEdges, mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState, Loop, Parallel, Position } from '@/stores/workflows/workflow/types'
 
diff --git a/apps/sim/lib/workflows/blocks/block-outputs.ts b/apps/sim/lib/workflows/blocks/block-outputs.ts
@@ -1,4 +1,8 @@
 import { createLogger } from '@sim/logger'
+import {
+  extractFieldsFromSchema,
+  parseResponseFormatSafely,
+} from '@/lib/core/utils/response-format'
 import { normalizeInputFormatValue } from '@/lib/workflows/input-format'
 import {
   classifyStartBlockType,
@@ -305,6 +309,26 @@ export function getBlockOutputs(
     return getLegacyStarterOutputs(subBlocks)
   }
 
+  if (blockType === 'agent') {
+    const responseFormatValue = subBlocks?.responseFormat?.value
+    if (responseFormatValue) {
+      const parsed = parseResponseFormatSafely(responseFormatValue, 'agent')
+      if (parsed) {
+        const fields = extractFieldsFromSchema(parsed)
+        if (fields.length > 0) {
+          const outputs: OutputDefinition = {}
+          for (const field of fields) {
+            outputs[field.name] = {
+              type: (field.type || 'any') as any,
+              description: field.description || `Field from Agent: ${field.name}`,
+            }
+          }
+          return outputs
+        }
+      }
+    }
+  }
+
   const baseOutputs = { ...(blockConfig.outputs || {}) }
   const filteredOutputs = filterOutputsByCondition(baseOutputs, subBlocks)
   return applyInputFormatToOutputs(blockType, blockConfig, subBlocks, filteredOutputs)
diff --git a/apps/sim/stores/panel/variables/store.ts b/apps/sim/stores/panel/variables/store.ts
@@ -1,11 +1,11 @@
 import { createLogger } from '@sim/logger'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
+import { normalizeName } from '@/executor/constants'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
 import type { Variable, VariablesStore } from '@/stores/panel/variables/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { normalizeName } from '@/stores/workflows/utils'
 
 const logger = createLogger('VariablesStore')
 
diff --git a/apps/sim/stores/variables/store.ts b/apps/sim/stores/variables/store.ts
@@ -2,6 +2,7 @@ import { createLogger } from '@sim/logger'
 import { v4 as uuidv4 } from 'uuid'
 import { create } from 'zustand'
 import { devtools, persist } from 'zustand/middleware'
+import { normalizeName } from '@/executor/constants'
 import type {
   Variable,
   VariablesDimensions,
@@ -11,7 +12,6 @@ import type {
 } from '@/stores/variables/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import { normalizeName } from '@/stores/workflows/utils'
 
 const logger = createLogger('VariablesModalStore')
 
diff --git a/apps/sim/stores/workflows/utils.ts b/apps/sim/stores/workflows/utils.ts
@@ -17,8 +17,6 @@ import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
 
 const WEBHOOK_SUBBLOCK_FIELDS = ['webhookId', 'triggerPath']
 
-export { normalizeName }
-
 export function filterNewEdges(edgesToAdd: Edge[], currentEdges: Edge[]): Edge[] {
   return edgesToAdd.filter((edge) => {
     if (edge.source === edge.target) return false
diff --git a/apps/sim/stores/workflows/workflow/store.ts b/apps/sim/stores/workflows/workflow/store.ts
@@ -7,14 +7,10 @@ import { getBlockOutputs } from '@/lib/workflows/blocks/block-outputs'
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
 import { getBlock } from '@/blocks'
 import type { SubBlockConfig } from '@/blocks/types'
+import { normalizeName } from '@/executor/constants'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
-import {
-  filterNewEdges,
-  getUniqueBlockName,
-  mergeSubblockState,
-  normalizeName,
-} from '@/stores/workflows/utils'
+import { filterNewEdges, getUniqueBlockName, mergeSubblockState } from '@/stores/workflows/utils'
 import type {
   Position,
   SubBlockState,
