)}
@@ -1299,7 +1301,7 @@ export function CredentialsManager() {
-
+
{member.userName || member.userEmail || member.userId}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
index 5fbe4188648..ab3c2c50e2b 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/integrations/integrations-manager.tsx
@@ -801,15 +801,16 @@ export function IntegrationsManager() {
{filteredServices.map((service) => {
const config = getServiceConfigByProviderId(service.value)
return (
- {
setCreateOAuthProviderId(service.value)
setCreateStep(2)
setServiceSearch('')
}}
- className='flex items-center gap-2.5 rounded-[6px] px-2 py-2 text-left hover:bg-[var(--surface-5)]'
+ className='h-auto w-full justify-start gap-2.5 rounded-[6px] px-2 py-2 text-left hover-hover:bg-[var(--surface-5)]'
>
{config ? (
@@ -823,7 +824,7 @@ export function IntegrationsManager() {
{service.label}
-
+
)
})}
{filteredServices.length === 0 && (
@@ -844,17 +845,18 @@ export function IntegrationsManager() {
<>
-
{
setCreateStep(1)
setCreateError(null)
}}
- className='flex h-6 w-6 items-center justify-center rounded-[4px] text-[var(--text-muted)] hover:bg-[var(--surface-5)] hover:text-[var(--text-primary)]'
+ className='h-6 w-6 rounded-[4px] p-0 text-[var(--text-muted)] hover-hover:bg-[var(--surface-5)] hover-hover:text-[var(--text-primary)]'
aria-label='Back'
>
←
-
+
Connect{' '}
{selectedOAuthService?.name || resolveProviderLabel(createOAuthProviderId)}
@@ -970,17 +972,18 @@ export function IntegrationsManager() {
<>
-
{
setCreateStep(1)
setSaError(null)
}}
- className='flex h-6 w-6 items-center justify-center rounded-[4px] text-[var(--text-muted)] hover:bg-[var(--surface-5)] hover:text-[var(--text-primary)]'
+ className='h-6 w-6 rounded-[4px] p-0 text-[var(--text-muted)] hover-hover:bg-[var(--surface-5)] hover-hover:text-[var(--text-primary)]'
aria-label='Back'
>
←
-
+
Add {selectedOAuthService?.name || resolveProviderLabel(createOAuthProviderId)}
@@ -1146,10 +1149,10 @@ export function IntegrationsManager() {
? This action cannot be undone.
{deleteError && (
-
+
-
-
{deleteError}
+
+
{deleteError}
)}
@@ -1240,9 +1243,10 @@ export function IntegrationsManager() {
Display Name
- {
navigator.clipboard.writeText(selectedCredential.id)
setCopyIdSuccess(true)
@@ -1251,11 +1255,11 @@ export function IntegrationsManager() {
aria-label='Copy value'
>
{copyIdSuccess ? (
-
+
{copyIdSuccess ? 'Copied!' : 'Copy credential ID'}
@@ -1288,7 +1292,7 @@ export function IntegrationsManager() {
{detailsError && (
-
+
{detailsError}
)}
diff --git a/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription.tsx b/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription.tsx
index 97b7f1d15b8..a6f8ed631a9 100644
--- a/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription.tsx
@@ -1135,12 +1135,15 @@ function TeamPlanModal({ open, onOpenChange, isAnnual, onConfirm }: TeamPlanModa
const [selectedTier, setSelectedTier] = useState
(PRO_TIER.credits)
const [selectedSeats, setSelectedSeats] = useState(1)
- useEffect(() => {
+ // Reset selections each time the modal opens.
+ const prevOpenRef = useRef(open)
+ if (prevOpenRef.current !== open) {
+ prevOpenRef.current = open
if (open) {
setSelectedTier(PRO_TIER.credits)
setSelectedSeats(1)
}
- }, [open])
+ }
const tier = CREDIT_TIERS.find((t) => t.credits === selectedTier) ?? PRO_TIER
const monthlyCostPerSeat = tier.dollars
@@ -1293,9 +1296,12 @@ function ManagePlanModal({
const [isSwitching, setIsSwitching] = useState(false)
const [error, setError] = useState(null)
- useEffect(() => {
+ // Clear the error each time the modal opens.
+ const prevOpenRef = useRef(open)
+ if (prevOpenRef.current !== open) {
+ prevOpenRef.current = open
if (open) setError(null)
- }, [open])
+ }
const isOnMax = currentPlanCredits === MAX_TIER.credits || (isLegacyPlan && isTeamPlan)
const currentTier = isOnMax ? MAX_TIER : PRO_TIER
diff --git a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
index 346fc336a2e..7f28b5bc246 100644
--- a/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/tables/[tableId]/components/table/table.tsx
@@ -251,11 +251,11 @@ export function Table({
const deleteColumnMutation = useDeleteColumn({ workspaceId, tableId })
const updateMetadataMutation = useUpdateTableMetadata({ workspaceId, tableId })
- const handleColumnOrderChange = useCallback((order: string[]) => {
+ function handleColumnOrderChange(order: string[]) {
setColumnOrder(order)
- }, [])
+ }
- const handleColumnRename = useCallback((oldName: string, newName: string) => {
+ function handleColumnRename(oldName: string, newName: string) {
let updatedWidths = columnWidthsRef.current
if (oldName in updatedWidths) {
const { [oldName]: width, ...rest } = updatedWidths
@@ -268,13 +268,15 @@ export function Table({
columnWidths: updatedWidths,
...(updatedOrder ? { columnOrder: updatedOrder } : {}),
})
- }, [])
+ }
- const getColumnWidths = useCallback(() => columnWidthsRef.current, [])
+ function getColumnWidths() {
+ return columnWidthsRef.current
+ }
- const handleColumnWidthsChange = useCallback((widths: Record) => {
+ function handleColumnWidthsChange(widths: Record) {
setColumnWidths(widths)
- }, [])
+ }
const { pushUndo, undo, redo } = useTableUndo({
workspaceId,
@@ -856,7 +858,7 @@ export function Table({
setDropTargetColumnName(null)
}, [])
- const handleScrollDragOver = useCallback((e: React.DragEvent) => {
+ function handleScrollDragOver(e: React.DragEvent) {
if (!dragColumnNameRef.current) return
e.preventDefault()
e.dataTransfer.dropEffect = 'move'
@@ -881,11 +883,11 @@ export function Table({
}
left += w
}
- }, [])
+ }
- const handleScrollDrop = useCallback((e: React.DragEvent) => {
+ function handleScrollDrop(e: React.DragEvent) {
e.preventDefault()
- }, [])
+ }
useEffect(() => {
if (!tableData?.metadata || metadataSeededRef.current) return
@@ -3211,36 +3213,30 @@ const ColumnHeaderMenu = React.memo(function ColumnHeaderMenu({
[onDragLeave]
)
- const handleHeaderClick = useCallback(
- (e: React.MouseEvent) => {
- if (didDragRef.current) {
- didDragRef.current = false
- return
- }
- if (isRenaming) return
- onColumnSelect(colIndex, e.shiftKey)
- },
- [colIndex, isRenaming, onColumnSelect]
- )
+ function handleHeaderClick(e: React.MouseEvent) {
+ if (didDragRef.current) {
+ didDragRef.current = false
+ return
+ }
+ if (isRenaming) return
+ onColumnSelect(colIndex, e.shiftKey)
+ }
- const handleChevronClick = useCallback((e: React.MouseEvent) => {
+ function handleChevronClick(e: React.MouseEvent) {
e.stopPropagation()
const rect = (e.currentTarget as HTMLElement).closest('th')?.getBoundingClientRect()
if (rect) {
setMenuPosition({ x: rect.left, y: rect.bottom })
}
setMenuOpen(true)
- }, [])
+ }
- const handleContextMenu = useCallback(
- (e: React.MouseEvent) => {
- if (readOnly || isRenaming) return
- e.preventDefault()
- setMenuPosition({ x: e.clientX, y: e.clientY })
- setMenuOpen(true)
- },
- [readOnly, isRenaming]
- )
+ function handleContextMenu(e: React.MouseEvent) {
+ if (readOnly || isRenaming) return
+ e.preventDefault()
+ setMenuPosition({ x: e.clientX, y: e.clientY })
+ setMenuOpen(true)
+ }
return (
(null)
const importMutation = useImportCsvIntoTable()
- const resetState = useCallback(() => {
+ function resetState() {
setParsed(null)
setParseError(null)
setSubmitError(null)
@@ -116,15 +116,18 @@ export function ImportCsvDialog({
setIsDragging(false)
setParsing(false)
if (fileInputRef.current) fileInputRef.current.value = ''
- }, [])
+ }
- useEffect(() => {
- if (!open) resetState()
- }, [open, resetState])
+ function handleOpenChange(newOpen: boolean) {
+ if (!newOpen) resetState()
+ onOpenChange(newOpen)
+ }
- useEffect(() => {
+ const prevTableIdRef = useRef(table.id)
+ if (prevTableIdRef.current !== table.id) {
+ prevTableIdRef.current = table.id
resetState()
- }, [table.id, resetState])
+ }
const columnOptions: ComboboxOption[] = useMemo(() => {
const options: ComboboxOption[] = [{ label: 'Do not import', value: SKIP_VALUE }]
@@ -137,82 +140,73 @@ export function ImportCsvDialog({
return options
}, [table.schema.columns])
- const handleFileSelected = useCallback(
- async (file: File) => {
- const ext = file.name.split('.').pop()?.toLowerCase()
- if (ext !== 'csv' && ext !== 'tsv') {
- setParseError('Only CSV and TSV files are supported')
- return
- }
- setParsing(true)
- setParseError(null)
- try {
- const arrayBuffer = await file.arrayBuffer()
- const delimiter = ext === 'tsv' ? '\t' : ','
- const { headers, rows } = await parseCsvBuffer(new Uint8Array(arrayBuffer), delimiter)
- const autoMapping = buildAutoMapping(headers, table.schema)
- setParsed({
- file,
- headers,
- sampleRows: rows.slice(0, MAX_SAMPLE_ROWS),
- totalRows: rows.length,
- })
- setMapping(autoMapping)
- } catch (err) {
- const message = err instanceof Error ? err.message : 'Failed to parse CSV'
- logger.error('CSV parse failed', err)
- setParseError(message)
- } finally {
- setParsing(false)
- }
- },
- [table.schema]
- )
+ async function handleFileSelected(file: File) {
+ const ext = file.name.split('.').pop()?.toLowerCase()
+ if (ext !== 'csv' && ext !== 'tsv') {
+ setParseError('Only CSV and TSV files are supported')
+ return
+ }
+ setParsing(true)
+ setParseError(null)
+ try {
+ const arrayBuffer = await file.arrayBuffer()
+ const delimiter = ext === 'tsv' ? '\t' : ','
+ const { headers, rows } = await parseCsvBuffer(new Uint8Array(arrayBuffer), delimiter)
+ const autoMapping = buildAutoMapping(headers, table.schema)
+ setParsed({
+ file,
+ headers,
+ sampleRows: rows.slice(0, MAX_SAMPLE_ROWS),
+ totalRows: rows.length,
+ })
+ setMapping(autoMapping)
+ } catch (err) {
+ const message = err instanceof Error ? err.message : 'Failed to parse CSV'
+ logger.error('CSV parse failed', err)
+ setParseError(message)
+ } finally {
+ setParsing(false)
+ }
+ }
- const handleFileInputChange = useCallback(
- (e: React.ChangeEvent) => {
- const file = e.target.files?.[0]
- if (file) void handleFileSelected(file)
- },
- [handleFileSelected]
- )
+ function handleFileInputChange(e: React.ChangeEvent) {
+ const file = e.target.files?.[0]
+ if (file) void handleFileSelected(file)
+ }
- const handleDragEnter = useCallback((e: React.DragEvent) => {
+ function handleDragEnter(e: React.DragEvent) {
e.preventDefault()
setIsDragging(true)
- }, [])
+ }
- const handleDragOver = useCallback((e: React.DragEvent) => {
+ function handleDragOver(e: React.DragEvent) {
e.preventDefault()
- }, [])
+ }
- const handleDragLeave = useCallback((e: React.DragEvent) => {
+ function handleDragLeave(e: React.DragEvent) {
e.preventDefault()
setIsDragging(false)
- }, [])
-
- const handleDrop = useCallback(
- (e: React.DragEvent) => {
- e.preventDefault()
- setIsDragging(false)
- const file = e.dataTransfer.files?.[0]
- if (file) void handleFileSelected(file)
- },
- [handleFileSelected]
- )
+ }
- const handleMappingChange = useCallback((header: string, value: string) => {
+ function handleDrop(e: React.DragEvent) {
+ e.preventDefault()
+ setIsDragging(false)
+ const file = e.dataTransfer.files?.[0]
+ if (file) void handleFileSelected(file)
+ }
+
+ function handleMappingChange(header: string, value: string) {
setSubmitError(null)
setMapping((prev) => ({
...prev,
[header]: value === SKIP_VALUE ? null : value,
}))
- }, [])
+ }
- const handleModeChange = useCallback((value: string) => {
+ function handleModeChange(value: string) {
setSubmitError(null)
setMode(value as CsvImportMode)
- }, [])
+ }
const { missingRequired, duplicateTargets, mappedCount, skipCount } = useMemo(() => {
const mappedTargets = new Map()
@@ -263,7 +257,7 @@ export function ImportCsvDialog({
appendCapacityDeficit === 0 &&
replaceCapacityDeficit === 0
- const handleSubmit = useCallback(async () => {
+ async function handleSubmit() {
if (!parsed || !canSubmit) return
setSubmitError(null)
try {
@@ -292,18 +286,7 @@ export function ImportCsvDialog({
setSubmitError(summarizeImportError(message))
logger.error('CSV import into existing table failed', err)
}
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, [
- canSubmit,
- mapping,
- mode,
- onImported,
- onOpenChange,
- parsed,
- table.id,
- table.name,
- workspaceId,
- ])
+ }
const hasWarning =
missingRequired.length > 0 ||
@@ -312,7 +295,7 @@ export function ImportCsvDialog({
replaceCapacityDeficit > 0
return (
-
+
Import CSV into {table.name}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
index 37873145533..449d1900338 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-upload/file-upload.tsx
@@ -1,6 +1,6 @@
'use client'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useMemo, useRef, useState } from 'react'
import { createLogger } from '@sim/logger'
import { X } from 'lucide-react'
import { useParams } from 'next/navigation'
@@ -69,39 +69,34 @@ function SingleFileSelector({
isDeleting,
}: SingleFileSelectorProps) {
const displayLabel = `${truncateMiddle(file.name, 20, 12)} (${formatFileSize(file.size)})`
- const [localInputValue, setLocalInputValue] = useState(displayLabel)
+ const [searchQuery, setSearchQuery] = useState('')
const [isEditing, setIsEditing] = useState(false)
-
- // Sync display label when file changes
- useEffect(() => {
- if (!isEditing) {
- setLocalInputValue(displayLabel)
- }
- }, [displayLabel, isEditing])
+ // When not editing, always show the file's display label. When editing, show the user's query.
+ const comboboxValue = isEditing ? searchQuery : displayLabel
return (
@@ -663,7 +661,7 @@ function SubflowConfigDisplay({ block, loop, parallel }: SubflowConfigDisplayPro
disabled
className='mb-1'
/>
-
+
Enter a number between 1 and {config.maxIterations}
+
{/* Header - styled like subflow header */}
+
@@ -1180,7 +1178,7 @@ function PreviewEditorContent({
: 'gray'
return (
-
+
{/* Header - styled like editor */}
{block.type !== 'note' && (
@@ -1188,10 +1186,7 @@ function PreviewEditorContent({
className='flex h-[18px] w-[18px] flex-shrink-0 items-center justify-center rounded-sm'
style={{ backgroundColor: blockConfig.bgColor }}
>
-
)}
@@ -1394,7 +1389,7 @@ function PreviewEditorContent({
className='h-[18px] w-[18px] animate-spin rounded-full'
style={{
background:
- 'conic-gradient(from 0deg, hsl(var(--muted-foreground)) 0deg 120deg, transparent 120deg 180deg, hsl(var(--muted-foreground)) 180deg 300deg, transparent 300deg 360deg)',
+ 'conic-gradient(from 0deg, var(--text-tertiary) 0deg 120deg, transparent 120deg 180deg, var(--text-tertiary) 180deg 300deg, transparent 300deg 360deg)',
mask: 'radial-gradient(farthest-side, transparent calc(100% - 1.5px), black calc(100% - 1.5px))',
WebkitMask:
'radial-gradient(farthest-side, transparent calc(100% - 1.5px), black calc(100% - 1.5px))',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
index ac19ec9d1d1..4d3e7fd45f5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
@@ -1,6 +1,7 @@
'use client'
-import { useCallback, useMemo, useState } from 'react'
+import type React from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
import { ArrowLeft } from 'lucide-react'
import { Button, Tooltip } from '@/components/emcn'
import { redactApiKeys } from '@/lib/core/security/redaction'
@@ -126,8 +127,14 @@ interface PreviewProps {
initialSelectedBlockId?: string | null
/** Whether to auto-select the leftmost block on mount */
autoSelectLeftmost?: boolean
+ /** Whether to show the close (X) button on the block detail panel */
+ showBlockCloseButton?: boolean
}
+const MIN_PANEL_WIDTH = 280
+const MAX_PANEL_WIDTH = 600
+const DEFAULT_PANEL_WIDTH = 320
+
/**
* Main preview component that combines PreviewCanvas with PreviewEditor
* and handles nested workflow navigation via a stack.
@@ -151,7 +158,47 @@ export function Preview({
showBorder = false,
initialSelectedBlockId,
autoSelectLeftmost = true,
+ showBlockCloseButton = true,
}: PreviewProps) {
+ const [panelWidth, setPanelWidth] = useState(DEFAULT_PANEL_WIDTH)
+ const panelWidthRef = useRef(DEFAULT_PANEL_WIDTH)
+ panelWidthRef.current = panelWidth
+ const isResizingRef = useRef(false)
+ const startXRef = useRef(0)
+ const startWidthRef = useRef(0)
+
+ function handleResizeMouseDown(e: React.MouseEvent) {
+ isResizingRef.current = true
+ startXRef.current = e.clientX
+ startWidthRef.current = panelWidthRef.current
+ document.body.style.cursor = 'ew-resize'
+ document.body.style.userSelect = 'none'
+ }
+
+ useEffect(() => {
+ const handleMouseMove = (e: MouseEvent) => {
+ if (!isResizingRef.current) return
+ const delta = startXRef.current - e.clientX
+ setPanelWidth(
+ Math.max(MIN_PANEL_WIDTH, Math.min(MAX_PANEL_WIDTH, startWidthRef.current + delta))
+ )
+ }
+ const handleMouseUp = () => {
+ if (!isResizingRef.current) return
+ isResizingRef.current = false
+ document.body.style.cursor = ''
+ document.body.style.userSelect = ''
+ }
+ document.addEventListener('mousemove', handleMouseMove)
+ document.addEventListener('mouseup', handleMouseUp)
+ return () => {
+ document.removeEventListener('mousemove', handleMouseMove)
+ document.removeEventListener('mouseup', handleMouseUp)
+ document.body.style.cursor = ''
+ document.body.style.userSelect = ''
+ }
+ }, [])
+
const [pinnedBlockId, setPinnedBlockId] = useState(() => {
if (initialSelectedBlockId) return initialSelectedBlockId
if (autoSelectLeftmost) {
@@ -173,67 +220,55 @@ export function Preview({
return buildBlockExecutions(rootTraceSpans)
}, [providedBlockExecutions, rootTraceSpans])
- const blockExecutions = useMemo(() => {
- if (workflowStack.length > 0) {
- return workflowStack[workflowStack.length - 1].blockExecutions
- }
- return rootBlockExecutions
- }, [workflowStack, rootBlockExecutions])
-
- const workflowState = useMemo(() => {
- if (workflowStack.length > 0) {
- return workflowStack[workflowStack.length - 1].workflowState
- }
- return rootWorkflowState
- }, [workflowStack, rootWorkflowState])
-
- const isExecutionMode = useMemo(() => {
- return Object.keys(blockExecutions).length > 0
- }, [blockExecutions])
-
- const handleDrillDown = useCallback(
- (blockId: string, childWorkflowState: WorkflowState) => {
- const blockExecution = blockExecutions[blockId]
- const childTraceSpans = extractChildTraceSpans(blockExecution)
- const childBlockExecutions = buildBlockExecutions(childTraceSpans)
-
- const workflowName =
- childWorkflowState.metadata?.name ||
- (blockExecution?.output as { childWorkflowName?: string } | undefined)?.childWorkflowName ||
- 'Nested Workflow'
-
- setWorkflowStack((prev) => [
- ...prev,
- {
- workflowState: childWorkflowState,
- traceSpans: childTraceSpans,
- blockExecutions: childBlockExecutions,
- workflowName,
- },
- ])
-
- const leftmostId = getLeftmostBlockId(childWorkflowState)
- setPinnedBlockId(leftmostId)
- },
- [blockExecutions]
- )
+ const currentStackEntry =
+ workflowStack.length > 0 ? workflowStack[workflowStack.length - 1] : null
+ const blockExecutions = currentStackEntry
+ ? currentStackEntry.blockExecutions
+ : rootBlockExecutions
+ const workflowState = currentStackEntry ? currentStackEntry.workflowState : rootWorkflowState
+
+ const isExecutionMode = Object.keys(blockExecutions).length > 0
+
+ function handleDrillDown(blockId: string, childWorkflowState: WorkflowState) {
+ const blockExecution = blockExecutions[blockId]
+ const childTraceSpans = extractChildTraceSpans(blockExecution)
+ const childBlockExecutions = buildBlockExecutions(childTraceSpans)
+
+ const workflowName =
+ childWorkflowState.metadata?.name ||
+ (blockExecution?.output as { childWorkflowName?: string } | undefined)?.childWorkflowName ||
+ 'Nested Workflow'
+
+ setWorkflowStack((prev) => [
+ ...prev,
+ {
+ workflowState: childWorkflowState,
+ traceSpans: childTraceSpans,
+ blockExecutions: childBlockExecutions,
+ workflowName,
+ },
+ ])
+
+ const leftmostId = getLeftmostBlockId(childWorkflowState)
+ setPinnedBlockId(leftmostId)
+ }
- const handleGoBack = useCallback(() => {
+ function handleGoBack() {
setWorkflowStack((prev) => prev.slice(0, -1))
setPinnedBlockId(null)
- }, [])
+ }
- const handleNodeClick = useCallback((blockId: string) => {
+ function handleNodeClick(blockId: string) {
setPinnedBlockId(blockId)
- }, [])
+ }
- const handlePaneClick = useCallback(() => {
+ function handlePaneClick() {
setPinnedBlockId(null)
- }, [])
+ }
- const handleEditorClose = useCallback(() => {
+ function handleEditorClose() {
setPinnedBlockId(null)
- }, [])
+ }
const isNested = workflowStack.length > 0
@@ -289,19 +324,26 @@ export function Preview({
{pinnedBlockId && workflowState.blocks[pinnedBlockId] && (
-
+
+ {/* Left-edge resize handle */}
+
+
+
)}
(null)
- const handleDragStart = useCallback(
- (e: React.DragEvent) => {
- e.dataTransfer.effectAllowed = 'copyMove'
- e.dataTransfer.setData(
- SIM_RESOURCES_DRAG_TYPE,
- JSON.stringify([{ type: 'task', id: task.id, title: task.name }])
- )
- const ghost = createSidebarDragGhost(task.name, { kind: 'task' })
- void ghost.offsetHeight
- e.dataTransfer.setDragImage(ghost, ghost.offsetWidth / 2, ghost.offsetHeight / 2)
- dragGhostRef.current = ghost
- },
- [task.id, task.name]
- )
+ function handleDragStart(e: React.DragEvent) {
+ e.dataTransfer.effectAllowed = 'copyMove'
+ e.dataTransfer.setData(
+ SIM_RESOURCES_DRAG_TYPE,
+ JSON.stringify([{ type: 'task', id: task.id, title: task.name }])
+ )
+ const ghost = createSidebarDragGhost(task.name, { kind: 'task' })
+ void ghost.offsetHeight
+ e.dataTransfer.setDragImage(ghost, ghost.offsetWidth / 2, ghost.offsetHeight / 2)
+ dragGhostRef.current = ghost
+ }
- const handleDragEnd = useCallback(() => {
+ function handleDragEnd() {
if (dragGhostRef.current) {
dragGhostRef.current.remove()
dragGhostRef.current = null
}
- }, [])
+ }
return (
diff --git a/apps/sim/blocks/blocks/sap_s4hana.ts b/apps/sim/blocks/blocks/sap_s4hana.ts
index fc5cd94c66c..30ff9b900b4 100644
--- a/apps/sim/blocks/blocks/sap_s4hana.ts
+++ b/apps/sim/blocks/blocks/sap_s4hana.ts
@@ -5,16 +5,16 @@ import type { SapProxyResponse } from '@/tools/sap_s4hana/types'
export const SapS4HanaBlock: BlockConfig = {
type: 'sap_s4hana',
- name: 'SAP S/4HANA',
- description: 'Read and write SAP S/4HANA Cloud business data via OData',
+ name: 'SAP S4HANA',
+ description: 'Read and write SAP S4HANA Cloud business data via OData',
authMode: AuthMode.ApiKey,
longDescription:
- 'Connect SAP S/4HANA Cloud Public Edition with per-tenant OAuth 2.0 client credentials configured in your Communication Arrangements. Read and create business partners, customers, suppliers, sales orders, deliveries (inbound/outbound), billing documents, products, stock and material documents, purchase requisitions, purchase orders, and supplier invoices, or run arbitrary OData v2 queries against any whitelisted Communication Scenario.',
+ 'Connect SAP S4HANA Cloud Public Edition with per-tenant OAuth 2.0 client credentials configured in your Communication Arrangements. Read and create business partners, customers, suppliers, sales orders, deliveries (inbound/outbound), billing documents, products, stock and material documents, purchase requisitions, purchase orders, and supplier invoices, or run arbitrary OData v2 queries against any whitelisted Communication Scenario.',
docsLink: 'https://docs.sim.ai/tools/sap_s4hana',
category: 'tools',
integrationType: IntegrationType.Other,
tags: ['automation'],
- bgColor: '#0A6ED1',
+ bgColor: '#FFFFFF',
icon: SapS4HanaIcon,
subBlocks: [
{
@@ -700,9 +700,9 @@ export const SapS4HanaBlock: BlockConfig = {
title: 'Deployment',
type: 'dropdown',
options: [
- { label: 'S/4HANA Cloud Public Edition', id: 'cloud_public' },
- { label: 'S/4HANA Cloud Private Edition (RISE)', id: 'cloud_private' },
- { label: 'S/4HANA On-Premise', id: 'on_premise' },
+ { label: 'S4HANA Cloud Public Edition', id: 'cloud_public' },
+ { label: 'S4HANA Cloud Private Edition (RISE)', id: 'cloud_private' },
+ { label: 'S4HANA On-Premise', id: 'on_premise' },
],
value: () => 'cloud_public',
required: true,
diff --git a/apps/sim/components/emcn/components/input/input.tsx b/apps/sim/components/emcn/components/input/input.tsx
index 662dc320dac..b216d67bb52 100644
--- a/apps/sim/components/emcn/components/input/input.tsx
+++ b/apps/sim/components/emcn/components/input/input.tsx
@@ -26,7 +26,7 @@ import { cn } from '@/lib/core/utils/cn'
* Currently supports a 'default' variant.
*/
const inputVariants = cva(
- 'flex w-full touch-manipulation rounded-sm border border-[var(--border-1)] bg-[var(--surface-5)] px-2 py-1.5 font-medium font-sans text-sm text-[var(--text-primary)] transition-colors placeholder:text-[var(--text-muted)] outline-none disabled:cursor-not-allowed disabled:opacity-50',
+ 'flex w-full touch-manipulation rounded-sm border border-[var(--border-1)] bg-[var(--surface-5)] px-2 py-1.5 font-medium font-sans text-sm text-[var(--text-primary)] transition-colors placeholder:text-[var(--text-muted)] outline-none disabled:cursor-not-allowed disabled:opacity-50 scroll-pr-1',
{
variants: {
variant: {
diff --git a/apps/sim/ee/access-control/hooks/permission-groups.ts b/apps/sim/ee/access-control/hooks/permission-groups.ts
index cd7bdf6b369..0bc9fcfc439 100644
--- a/apps/sim/ee/access-control/hooks/permission-groups.ts
+++ b/apps/sim/ee/access-control/hooks/permission-groups.ts
@@ -124,7 +124,7 @@ export function useCreatePermissionGroup() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: permissionGroupKeys.list(variables.workspaceId),
})
@@ -157,7 +157,7 @@ export function useUpdatePermissionGroup() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: permissionGroupKeys.list(variables.workspaceId),
})
@@ -191,7 +191,7 @@ export function useDeletePermissionGroup() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: permissionGroupKeys.list(variables.workspaceId),
})
@@ -221,7 +221,7 @@ export function useRemovePermissionGroupMember() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: permissionGroupKeys.members(variables.workspaceId, variables.permissionGroupId),
})
@@ -259,7 +259,7 @@ export function useBulkAddPermissionGroupMembers() {
}
return response.json() as Promise<{ added: number; moved: number }>
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: permissionGroupKeys.members(variables.workspaceId, variables.permissionGroupId),
})
diff --git a/apps/sim/executor/execution/block-executor.ts b/apps/sim/executor/execution/block-executor.ts
index 05019d953e9..340b2aab01a 100644
--- a/apps/sim/executor/execution/block-executor.ts
+++ b/apps/sim/executor/execution/block-executor.ts
@@ -85,14 +85,19 @@ export class BlockExecutor {
const blockType = block.metadata?.id ?? ''
const isSentinel = isSentinelBlockType(blockType)
+ // Capture startedAt and startTime at the same synchronous instant so
+ // blockLog.startedAt and performance.now()-derived durationMs share a
+ // single reference point. Any executor work below counts toward this block.
+ const startedAt = new Date().toISOString()
+ const startTime = performance.now()
+
let blockLog: BlockLog | undefined
if (!isSentinel) {
- blockLog = this.createBlockLog(ctx, node.id, block, node)
+ blockLog = this.createBlockLog(ctx, node.id, block, node, startedAt)
ctx.blockLogs.push(blockLog)
- await this.callOnBlockStart(ctx, node, block, blockLog.executionOrder)
+ this.fireBlockStartCallback(ctx, node, block, blockLog.executionOrder)
}
- const startTime = performance.now()
let resolvedInputs: Record = {}
const nodeMetadata = {
@@ -169,10 +174,11 @@ export class BlockExecutor {
})) as NormalizedBlockOutput
}
+ const endedAt = new Date().toISOString()
const duration = performance.now() - startTime
if (blockLog) {
- blockLog.endedAt = new Date().toISOString()
+ blockLog.endedAt = endedAt
blockLog.durationMs = duration
blockLog.success = true
blockLog.output = filterOutputForLog(block.metadata?.id || '', normalizedOutput, { block })
@@ -191,7 +197,7 @@ export class BlockExecutor {
const displayOutput = filterOutputForLog(block.metadata?.id || '', normalizedOutput, {
block,
})
- await this.callOnBlockComplete(
+ this.fireBlockCompleteCallback(
ctx,
node,
block,
@@ -249,6 +255,7 @@ export class BlockExecutor {
isSentinel: boolean,
phase: 'input_resolution' | 'execution'
): Promise {
+ const endedAt = new Date().toISOString()
const duration = performance.now() - startTime
const errorMessage = normalizeError(error)
const hasResolvedInputs =
@@ -273,7 +280,7 @@ export class BlockExecutor {
this.state.setBlockOutput(node.id, errorOutput, duration)
if (blockLog) {
- blockLog.endedAt = new Date().toISOString()
+ blockLog.endedAt = endedAt
blockLog.durationMs = duration
blockLog.success = false
blockLog.error = errorMessage
@@ -299,7 +306,7 @@ export class BlockExecutor {
? error.childWorkflowInstanceId
: undefined
const displayOutput = filterOutputForLog(block.metadata?.id || '', errorOutput, { block })
- await this.callOnBlockComplete(
+ this.fireBlockCompleteCallback(
ctx,
node,
block,
@@ -351,7 +358,8 @@ export class BlockExecutor {
ctx: ExecutionContext,
blockId: string,
block: SerializedBlock,
- node: DAGNode
+ node: DAGNode,
+ startedAt: string
): BlockLog {
let blockName = block.metadata?.name ?? blockId
let loopId: string | undefined
@@ -384,7 +392,7 @@ export class BlockExecutor {
blockId,
blockName,
blockType: block.metadata?.id ?? DEFAULTS.BLOCK_TYPE,
- startedAt: new Date().toISOString(),
+ startedAt,
executionOrder: getNextExecutionOrder(ctx),
endedAt: '',
durationMs: 0,
@@ -451,39 +459,47 @@ export class BlockExecutor {
return redactApiKeys(result)
}
- private async callOnBlockStart(
+ /**
+ * Fires the `onBlockStart` progress callback without blocking block execution.
+ * Any error is logged and swallowed so callback I/O never stalls the critical path.
+ */
+ private fireBlockStartCallback(
ctx: ExecutionContext,
node: DAGNode,
block: SerializedBlock,
executionOrder: number
- ): Promise {
+ ): void {
+ if (!this.contextExtensions.onBlockStart) return
+
const blockId = node.metadata?.originalBlockId ?? node.id
const blockName = block.metadata?.name ?? blockId
const blockType = block.metadata?.id ?? DEFAULTS.BLOCK_TYPE
-
const iterationContext = getIterationContext(ctx, node?.metadata)
- if (this.contextExtensions.onBlockStart) {
- try {
- await this.contextExtensions.onBlockStart(
- blockId,
- blockName,
- blockType,
- executionOrder,
- iterationContext,
- ctx.childWorkflowContext
- )
- } catch (error) {
+ void this.contextExtensions
+ .onBlockStart(
+ blockId,
+ blockName,
+ blockType,
+ executionOrder,
+ iterationContext,
+ ctx.childWorkflowContext
+ )
+ .catch((error) => {
this.execLogger.warn('Block start callback failed', {
blockId,
blockType,
error: toError(error).message,
})
- }
- }
+ })
}
- private async callOnBlockComplete(
+ /**
+ * Fires the `onBlockComplete` progress callback without blocking subsequent blocks.
+ * The callback typically performs DB writes for progress markers — awaiting it would
+ * add latency between blocks and skew wall-clock timing in the trace view.
+ */
+ private fireBlockCompleteCallback(
ctx: ExecutionContext,
node: DAGNode,
block: SerializedBlock,
@@ -494,39 +510,38 @@ export class BlockExecutor {
executionOrder: number,
endedAt: string,
childWorkflowInstanceId?: string
- ): Promise {
+ ): void {
+ if (!this.contextExtensions.onBlockComplete) return
+
const blockId = node.metadata?.originalBlockId ?? node.id
const blockName = block.metadata?.name ?? blockId
const blockType = block.metadata?.id ?? DEFAULTS.BLOCK_TYPE
-
const iterationContext = getIterationContext(ctx, node?.metadata)
- if (this.contextExtensions.onBlockComplete) {
- try {
- await this.contextExtensions.onBlockComplete(
- blockId,
- blockName,
- blockType,
- {
- input,
- output,
- executionTime: duration,
- startedAt,
- executionOrder,
- endedAt,
- childWorkflowInstanceId,
- },
- iterationContext,
- ctx.childWorkflowContext
- )
- } catch (error) {
+ void this.contextExtensions
+ .onBlockComplete(
+ blockId,
+ blockName,
+ blockType,
+ {
+ input,
+ output,
+ executionTime: duration,
+ startedAt,
+ executionOrder,
+ endedAt,
+ childWorkflowInstanceId,
+ },
+ iterationContext,
+ ctx.childWorkflowContext
+ )
+ .catch((error) => {
this.execLogger.warn('Block completion callback failed', {
blockId,
blockType,
error: toError(error).message,
})
- }
- }
+ })
}
private preparePauseResumeSelfReference(
diff --git a/apps/sim/executor/types.ts b/apps/sim/executor/types.ts
index b8b0d4cfa0d..7d844257d1e 100644
--- a/apps/sim/executor/types.ts
+++ b/apps/sim/executor/types.ts
@@ -74,19 +74,118 @@ export interface SerializedSnapshot {
triggerIds: string[]
}
+/**
+ * Identifies a tool call emitted by a model iteration. Matches the
+ * `tool_call.id` convention used by OpenAI, Anthropic, and the OTel GenAI
+ * spec so tool segments can be correlated back to the iteration that issued
+ * them.
+ */
+export interface IterationToolCall {
+ id: string
+ name: string
+ arguments: Record | string
+}
+
+/**
+ * A single phase of provider execution (model call or tool invocation).
+ *
+ * Providers emit these per iteration. Model segments carry the assistant's
+ * output for that iteration (text, thinking, tool_calls, tokens, finish
+ * reason) so the trace reveals *why* each tool was invoked — not just that
+ * it was. All content fields are optional; providers fill in what they have.
+ */
+export interface ProviderTimingSegment {
+ type: 'model' | 'tool'
+ name?: string
+ startTime: number
+ endTime: number
+ duration: number
+ assistantContent?: string
+ thinkingContent?: string
+ toolCalls?: IterationToolCall[]
+ toolCallId?: string
+ finishReason?: string
+ tokens?: BlockTokens
+ /** Cost for this segment in USD, derived from tokens + model pricing. */
+ cost?: { input?: number; output?: number; total?: number }
+ /** Time-to-first-token in ms (streaming only; first segment typically). */
+ ttft?: number
+ /** Provider system identifier (anthropic, openai, gemini, etc.) — `gen_ai.system`. */
+ provider?: string
+ /** Structured error class (e.g. `rate_limit`, `context_length`). */
+ errorType?: string
+ /** Human-readable error message when this segment failed. */
+ errorMessage?: string
+}
+
+/** Timing info reported by an LLM provider for a single block execution. */
+export interface BlockProviderTiming {
+ startTime: string
+ endTime: string
+ duration: number
+ modelTime?: number
+ toolsTime?: number
+ firstResponseTime?: number
+ iterations?: number
+ timeSegments?: ProviderTimingSegment[]
+}
+
+/** Cost breakdown from provider usage. */
+export interface BlockCost {
+ input: number
+ output: number
+ total: number
+ toolCost?: number
+ pricing?: {
+ input: number
+ output: number
+ cachedInput?: number
+ updatedAt: string
+ }
+}
+
+/** Token usage from provider. `prompt`/`completion` are legacy aliases. */
+export interface BlockTokens {
+ input?: number
+ output?: number
+ total?: number
+ prompt?: number
+ completion?: number
+ /** Input tokens served from the provider's prompt cache. */
+ cacheRead?: number
+ /** Input tokens newly written to the provider's prompt cache. */
+ cacheWrite?: number
+ /** Output tokens consumed by reasoning/thinking (o-series, Claude, Gemini). */
+ reasoning?: number
+}
+
+/** A single tool invocation recorded by an agent-type block. */
+export interface BlockToolCall {
+ name: string
+ duration?: number
+ startTime?: string
+ endTime?: string
+ error?: string
+ arguments?: Record
+ input?: Record
+ result?: Record
+ output?: Record
+}
+
+/** Normalized tool-call container emitted by providers. */
+export interface BlockToolCalls {
+ list: BlockToolCall[]
+ count: number
+}
+
export interface NormalizedBlockOutput {
[key: string]: any
content?: string
model?: string
- tokens?: {
- input?: number
- output?: number
- total?: number
- }
- toolCalls?: {
- list: any[]
- count: number
- }
+ tokens?: BlockTokens
+ toolCalls?: BlockToolCalls
+ providerTiming?: BlockProviderTiming
+ cost?: BlockCost
files?: UserFile[]
selectedPath?: {
blockId: string
@@ -115,8 +214,8 @@ export interface BlockLog {
endedAt: string
durationMs: number
success: boolean
- output?: any
- input?: any
+ output?: NormalizedBlockOutput
+ input?: Record
error?: string
/** Whether this error was handled by an error handler path (error port) */
errorHandled?: boolean
diff --git a/apps/sim/hooks/queries/a2a/tasks.ts b/apps/sim/hooks/queries/a2a/tasks.ts
index abb9bbb3acb..b32aace330a 100644
--- a/apps/sim/hooks/queries/a2a/tasks.ts
+++ b/apps/sim/hooks/queries/a2a/tasks.ts
@@ -132,10 +132,12 @@ export function useSendA2ATask() {
return useMutation({
mutationFn: sendA2ATask,
- onSuccess: (data, variables) => {
- queryClient.invalidateQueries({
- queryKey: a2aTaskKeys.detail(variables.agentUrl, data.taskId),
- })
+ onSettled: (data, _error, variables) => {
+ if (data) {
+ queryClient.invalidateQueries({
+ queryKey: a2aTaskKeys.detail(variables.agentUrl, data.taskId),
+ })
+ }
},
})
}
@@ -255,7 +257,7 @@ export function useCancelA2ATask() {
return useMutation({
mutationFn: cancelA2ATask,
- onSuccess: (data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: a2aTaskKeys.detail(variables.agentUrl, variables.taskId),
})
diff --git a/apps/sim/hooks/queries/chats.ts b/apps/sim/hooks/queries/chats.ts
index 1afe149113f..8b4e65e1de0 100644
--- a/apps/sim/hooks/queries/chats.ts
+++ b/apps/sim/hooks/queries/chats.ts
@@ -330,7 +330,7 @@ export function useCreateChat() {
logger.info('Chat deployed successfully:', result.chatUrl)
return { chatUrl: result.chatUrl, chatId: result.chatId }
},
- onSuccess: (_, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: deploymentKeys.chatStatus(variables.workflowId),
})
@@ -385,7 +385,7 @@ export function useUpdateChat() {
logger.info('Chat updated successfully:', result.chatUrl)
return { chatUrl: result.chatUrl, chatId }
},
- onSuccess: (_, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: deploymentKeys.chatStatus(variables.workflowId),
})
@@ -419,7 +419,7 @@ export function useDeleteChat() {
logger.info('Chat deleted successfully')
},
- onSuccess: (_, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: deploymentKeys.chatStatus(variables.workflowId),
})
diff --git a/apps/sim/hooks/queries/deployments.ts b/apps/sim/hooks/queries/deployments.ts
index 6e7498f13b6..d80ce3a2106 100644
--- a/apps/sim/hooks/queries/deployments.ts
+++ b/apps/sim/hooks/queries/deployments.ts
@@ -459,19 +459,20 @@ export function useUpdateDeploymentVersion() {
return response.json()
},
- onSuccess: (_, variables) => {
- logger.info('Deployment version updated', {
- workflowId: variables.workflowId,
- version: variables.version,
- })
+ onSettled: (_data, error, variables) => {
+ if (!error) {
+ logger.info('Deployment version updated', {
+ workflowId: variables.workflowId,
+ version: variables.version,
+ })
+ } else {
+ logger.error('Failed to update deployment version', { error })
+ }
queryClient.invalidateQueries({
queryKey: deploymentKeys.versions(variables.workflowId),
})
},
- onError: (error) => {
- logger.error('Failed to update deployment version', { error })
- },
})
}
@@ -696,18 +697,19 @@ export function useUpdatePublicApi() {
return response.json()
},
- onSuccess: (_, variables) => {
- logger.info('Public API setting updated', {
- workflowId: variables.workflowId,
- isPublicApi: variables.isPublicApi,
- })
+ onSettled: (_data, error, variables) => {
+ if (!error) {
+ logger.info('Public API setting updated', {
+ workflowId: variables.workflowId,
+ isPublicApi: variables.isPublicApi,
+ })
+ } else {
+ logger.error('Failed to update public API setting', { error })
+ }
queryClient.invalidateQueries({
queryKey: deploymentKeys.info(variables.workflowId),
})
},
- onError: (error) => {
- logger.error('Failed to update public API setting', { error })
- },
})
}
diff --git a/apps/sim/hooks/queries/invitations.ts b/apps/sim/hooks/queries/invitations.ts
index 7561ae9713a..ed530775a3c 100644
--- a/apps/sim/hooks/queries/invitations.ts
+++ b/apps/sim/hooks/queries/invitations.ts
@@ -196,7 +196,7 @@ export function useResendWorkspaceInvitation() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: invitationKeys.list(variables.workspaceId),
})
@@ -232,7 +232,7 @@ export function useRemoveWorkspaceMember() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: workspaceKeys.permissions(variables.workspaceId),
})
@@ -278,7 +278,7 @@ export function useLeaveWorkspace() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: workspaceKeys.permissions(variables.workspaceId),
})
@@ -313,7 +313,7 @@ export function useUpdateWorkspacePermissions() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: workspaceKeys.permissions(variables.workspaceId),
})
diff --git a/apps/sim/hooks/queries/kb/connectors.ts b/apps/sim/hooks/queries/kb/connectors.ts
index c8a528cccc7..ca85a3f6ff7 100644
--- a/apps/sim/hooks/queries/kb/connectors.ts
+++ b/apps/sim/hooks/queries/kb/connectors.ts
@@ -166,7 +166,7 @@ export function useCreateConnector() {
return useMutation({
mutationFn: createConnector,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -213,7 +213,7 @@ export function useUpdateConnector() {
return useMutation({
mutationFn: updateConnector,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: connectorKeys.all(knowledgeBaseId),
})
@@ -253,7 +253,7 @@ export function useDeleteConnector() {
return useMutation({
mutationFn: deleteConnector,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -282,7 +282,7 @@ export function useTriggerSync() {
return useMutation({
mutationFn: triggerSync,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -393,7 +393,7 @@ export function useExcludeConnectorDocument() {
return useMutation({
mutationFn: excludeConnectorDocuments,
- onSuccess: (_, { knowledgeBaseId, connectorId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, connectorId }) => {
queryClient.invalidateQueries({
queryKey: connectorDocumentKeys.list(knowledgeBaseId, connectorId),
})
@@ -432,7 +432,7 @@ export function useRestoreConnectorDocument() {
return useMutation({
mutationFn: restoreConnectorDocuments,
- onSuccess: (_, { knowledgeBaseId, connectorId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, connectorId }) => {
queryClient.invalidateQueries({
queryKey: connectorDocumentKeys.list(knowledgeBaseId, connectorId),
})
diff --git a/apps/sim/hooks/queries/kb/knowledge.ts b/apps/sim/hooks/queries/kb/knowledge.ts
index e1d3343a57d..a93e8b2204a 100644
--- a/apps/sim/hooks/queries/kb/knowledge.ts
+++ b/apps/sim/hooks/queries/kb/knowledge.ts
@@ -442,7 +442,7 @@ export function useUpdateChunk() {
return useMutation({
mutationFn: updateChunk,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -485,7 +485,7 @@ export function useDeleteChunk() {
return useMutation({
mutationFn: deleteChunk,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -533,7 +533,7 @@ export function useCreateChunk() {
return useMutation({
mutationFn: createChunk,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -584,7 +584,7 @@ export function useUpdateDocument() {
return useMutation({
mutationFn: updateDocument,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -624,7 +624,7 @@ export function useDeleteDocument() {
return useMutation({
mutationFn: deleteDocument,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -685,7 +685,7 @@ export function useBulkDocumentOperation() {
return useMutation({
mutationFn: bulkDocumentOperation,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -733,7 +733,7 @@ export function useCreateKnowledgeBase(workspaceId?: string) {
return useMutation({
mutationFn: createKnowledgeBase,
- onSuccess: () => {
+ onSettled: () => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.lists(),
})
@@ -781,7 +781,7 @@ export function useUpdateKnowledgeBase(workspaceId?: string) {
onError: (error) => {
toast.error(error.message, { duration: 5000 })
},
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.lists(),
})
@@ -819,7 +819,7 @@ export function useDeleteKnowledgeBase(workspaceId?: string) {
return useMutation({
mutationFn: deleteKnowledgeBase,
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.lists(),
})
@@ -875,7 +875,7 @@ export function useBulkChunkOperation() {
return useMutation({
mutationFn: bulkChunkOperation,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -921,7 +921,7 @@ export function useUpdateDocumentTags() {
return useMutation({
mutationFn: updateDocumentTags,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.detail(knowledgeBaseId),
})
@@ -1054,7 +1054,7 @@ export function useCreateTagDefinition() {
return useMutation({
mutationFn: createTagDefinition,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.tagDefinitions(knowledgeBaseId),
})
@@ -1092,7 +1092,7 @@ export function useDeleteTagDefinition() {
return useMutation({
mutationFn: deleteTagDefinition,
- onSuccess: (_, { knowledgeBaseId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.tagDefinitions(knowledgeBaseId),
})
@@ -1195,7 +1195,7 @@ export function useSaveDocumentTagDefinitions() {
return useMutation({
mutationFn: saveDocumentTagDefinitions,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.documentTagDefinitions(knowledgeBaseId, documentId),
})
@@ -1254,7 +1254,7 @@ export function useDeleteDocumentTagDefinitions() {
return useMutation({
mutationFn: deleteDocumentTagDefinitions,
- onSuccess: (_, { knowledgeBaseId, documentId }) => {
+ onSettled: (_data, _error, { knowledgeBaseId, documentId }) => {
queryClient.invalidateQueries({
queryKey: knowledgeKeys.documentTagDefinitions(knowledgeBaseId, documentId),
})
diff --git a/apps/sim/hooks/queries/logs.ts b/apps/sim/hooks/queries/logs.ts
index bbbcea5ba7c..edfd58f13d5 100644
--- a/apps/sim/hooks/queries/logs.ts
+++ b/apps/sim/hooks/queries/logs.ts
@@ -25,9 +25,9 @@ export const logKeys = {
[...logKeys.lists(), workspaceId ?? '', filters] as const,
details: () => [...logKeys.all, 'detail'] as const,
detail: (logId: string | undefined) => [...logKeys.details(), logId ?? ''] as const,
- statsAll: () => [...logKeys.all, 'stats'] as const,
- stats: (workspaceId: string | undefined, filters: object) =>
- [...logKeys.statsAll(), workspaceId ?? '', filters] as const,
+ stats: () => [...logKeys.all, 'stats'] as const,
+ stat: (workspaceId: string | undefined, filters: object) =>
+ [...logKeys.stats(), workspaceId ?? '', filters] as const,
executionSnapshots: () => [...logKeys.all, 'executionSnapshot'] as const,
executionSnapshot: (executionId: string | undefined) =>
[...logKeys.executionSnapshots(), executionId ?? ''] as const,
@@ -121,7 +121,7 @@ async function fetchLogsPage(
}
}
-async function fetchLogDetail(logId: string, signal?: AbortSignal): Promise {
+export async function fetchLogDetail(logId: string, signal?: AbortSignal): Promise {
const response = await fetch(`/api/logs/${logId}`, { signal })
if (!response.ok) {
@@ -170,7 +170,6 @@ export function useLogDetail(logId: string | undefined, options?: UseLogDetailOp
enabled: Boolean(logId) && (options?.enabled ?? true),
refetchInterval: options?.refetchInterval ?? false,
staleTime: 30 * 1000,
- placeholderData: keepPreviousData,
})
}
@@ -223,7 +222,7 @@ export function useDashboardStats(
options?: UseDashboardStatsOptions
) {
return useQuery({
- queryKey: logKeys.stats(workspaceId, filters),
+ queryKey: logKeys.stat(workspaceId, filters),
queryFn: ({ signal }) => fetchDashboardStats(workspaceId as string, filters, signal),
enabled: Boolean(workspaceId) && (options?.enabled ?? true),
refetchInterval: options?.refetchInterval ?? false,
@@ -328,7 +327,38 @@ export function useCancelExecution() {
onSettled: () => {
queryClient.invalidateQueries({ queryKey: logKeys.lists() })
queryClient.invalidateQueries({ queryKey: logKeys.details() })
- queryClient.invalidateQueries({ queryKey: logKeys.statsAll() })
+ queryClient.invalidateQueries({ queryKey: logKeys.stats() })
+ },
+ })
+}
+
+export function useRetryExecution() {
+ const queryClient = useQueryClient()
+ return useMutation({
+ mutationFn: async ({ workflowId, input }: { workflowId: string; input?: unknown }) => {
+ const res = await fetch(`/api/workflows/${workflowId}/execute`, {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ input, triggerType: 'manual', stream: true }),
+ })
+ if (!res.ok) {
+ const data = await res.json().catch(() => ({}))
+ throw new Error(data.error || 'Failed to retry execution')
+ }
+ // The ReadableStream is lazy — start() only runs when read.
+ // Read one chunk to trigger execution, then cancel. Execution continues
+ // server-side after client disconnect.
+ const reader = res.body?.getReader()
+ if (reader) {
+ await reader.read()
+ reader.cancel()
+ }
+ return { started: true }
+ },
+ onSettled: () => {
+ queryClient.invalidateQueries({ queryKey: logKeys.lists() })
+ queryClient.invalidateQueries({ queryKey: logKeys.details() })
+ queryClient.invalidateQueries({ queryKey: logKeys.stats() })
},
})
}
diff --git a/apps/sim/hooks/queries/mothership-admin.ts b/apps/sim/hooks/queries/mothership-admin.ts
index 592daea4d86..83194b9abb7 100644
--- a/apps/sim/hooks/queries/mothership-admin.ts
+++ b/apps/sim/hooks/queries/mothership-admin.ts
@@ -7,12 +7,14 @@ const BASE = '/api/admin/mothership'
async function mothershipPost(
endpoint: string,
environment: MothershipEnv,
- body?: Record
+ body?: Record,
+ signal?: AbortSignal
) {
const res = await fetch(`${BASE}?env=${environment}&endpoint=${endpoint}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
...(body ? { body: JSON.stringify(body) } : {}),
+ signal,
})
if (!res.ok) {
const err = await res.json().catch(() => ({ error: res.statusText }))
@@ -24,10 +26,11 @@ async function mothershipPost(
async function mothershipGet(
endpoint: string,
environment: MothershipEnv,
- params?: Record
+ params?: Record,
+ signal?: AbortSignal
) {
const qs = new URLSearchParams({ env: environment, endpoint, ...params })
- const res = await fetch(`${BASE}?${qs.toString()}`, { method: 'GET' })
+ const res = await fetch(`${BASE}?${qs.toString()}`, { method: 'GET', signal })
if (!res.ok) {
const err = await res.json().catch(() => ({ error: res.statusText }))
throw new Error(err.message || err.error || `Request failed (${res.status})`)
@@ -58,13 +61,19 @@ export function useMothershipRequests(
) {
return useQuery({
queryKey: mothershipKeys.requests(environment, start, end, userId),
- queryFn: () =>
- mothershipPost('requests', environment, {
- start,
- end,
- ...(userId ? { userId } : {}),
- }),
+ queryFn: ({ signal }) =>
+ mothershipPost(
+ 'requests',
+ environment,
+ {
+ start,
+ end,
+ ...(userId ? { userId } : {}),
+ },
+ signal
+ ),
enabled: !!start && !!end,
+ staleTime: 60 * 1000,
placeholderData: keepPreviousData,
})
}
@@ -72,8 +81,9 @@ export function useMothershipRequests(
export function useMothershipUserBreakdown(environment: MothershipEnv, start: string, end: string) {
return useQuery({
queryKey: mothershipKeys.userBreakdown(environment, start, end),
- queryFn: () => mothershipPost('user-breakdown', environment, { start, end }),
+ queryFn: ({ signal }) => mothershipPost('user-breakdown', environment, { start, end }, signal),
enabled: !!start && !!end,
+ staleTime: 60 * 1000,
placeholderData: keepPreviousData,
})
}
@@ -81,7 +91,8 @@ export function useMothershipUserBreakdown(environment: MothershipEnv, start: st
export function useMothershipLicenses(environment: MothershipEnv) {
return useQuery({
queryKey: mothershipKeys.licenses(environment),
- queryFn: () => mothershipGet('licenses', environment),
+ queryFn: ({ signal }) => mothershipGet('licenses', environment, undefined, signal),
+ staleTime: 60 * 1000,
})
}
@@ -92,12 +103,18 @@ export function useMothershipLicenseDetails(
) {
return useQuery({
queryKey: mothershipKeys.licenseDetails(environment, id, name),
- queryFn: () =>
- mothershipPost('licenses/details', environment, {
- ...(id ? { id } : {}),
- ...(name ? { name } : {}),
- }),
+ queryFn: ({ signal }) =>
+ mothershipPost(
+ 'licenses/details',
+ environment,
+ {
+ ...(id ? { id } : {}),
+ ...(name ? { name } : {}),
+ },
+ signal
+ ),
enabled: !!(id || name),
+ staleTime: 60 * 1000,
})
}
@@ -116,8 +133,10 @@ export function useMothershipEnterpriseStats(
) {
return useQuery({
queryKey: mothershipKeys.enterpriseStats(environment, customerType, start, end),
- queryFn: () => mothershipPost('enterprise-stats', environment, { customerType, start, end }),
+ queryFn: ({ signal }) =>
+ mothershipPost('enterprise-stats', environment, { customerType, start, end }, signal),
enabled: !!customerType && !!start && !!end,
+ staleTime: 60 * 1000,
placeholderData: keepPreviousData,
})
}
@@ -125,7 +144,8 @@ export function useMothershipEnterpriseStats(
export function useMothershipTrace(environment: MothershipEnv, requestId: string) {
return useQuery({
queryKey: mothershipKeys.trace(environment, requestId),
- queryFn: () => mothershipGet('traces', environment, { requestId }),
+ queryFn: ({ signal }) => mothershipGet('traces', environment, { requestId }, signal),
enabled: !!requestId,
+ staleTime: 60 * 1000,
})
}
diff --git a/apps/sim/hooks/queries/organization.ts b/apps/sim/hooks/queries/organization.ts
index 38c775a704e..6022baac6bf 100644
--- a/apps/sim/hooks/queries/organization.ts
+++ b/apps/sim/hooks/queries/organization.ts
@@ -396,7 +396,7 @@ export function useRemoveMember() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.billing(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.memberUsage(variables.orgId) })
@@ -433,7 +433,7 @@ export function useUpdateOrganizationMemberRole() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.roster(variables.orgId) })
},
@@ -468,7 +468,7 @@ export function useTransferOwnership() {
details?: Record
}>
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.roster(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.billing(variables.orgId) })
@@ -503,7 +503,7 @@ export function useUpdateInvitation() {
}
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.roster(variables.orgId) })
},
@@ -534,7 +534,7 @@ export function useCancelInvitation() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.roster(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.billing(variables.orgId) })
@@ -569,7 +569,7 @@ export function useResendInvitation() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.roster(variables.orgId) })
},
@@ -602,7 +602,7 @@ export function useUpdateSeats() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.subscription(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.billing(variables.orgId) })
@@ -640,7 +640,7 @@ export function useUpdateOrganization() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: organizationKeys.detail(variables.orgId) })
queryClient.invalidateQueries({ queryKey: organizationKeys.lists() })
},
@@ -682,7 +682,7 @@ export function useCreateOrganization() {
return data
},
- onSuccess: () => {
+ onSettled: () => {
queryClient.invalidateQueries({ queryKey: organizationKeys.lists() })
queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
},
diff --git a/apps/sim/hooks/queries/workspace.ts b/apps/sim/hooks/queries/workspace.ts
index 6fcc3e16f92..0a47479a242 100644
--- a/apps/sim/hooks/queries/workspace.ts
+++ b/apps/sim/hooks/queries/workspace.ts
@@ -200,7 +200,7 @@ export function useDeleteWorkspace() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
queryClient.invalidateQueries({ queryKey: workspaceKeys.detail(variables.workspaceId) })
},
@@ -237,7 +237,7 @@ export function useUpdateWorkspace() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({ queryKey: workspaceKeys.lists() })
queryClient.invalidateQueries({ queryKey: workspaceKeys.detail(variables.workspaceId) })
},
@@ -408,7 +408,7 @@ export function useUpdateWorkspaceSettings() {
return response.json()
},
- onSuccess: (_data, variables) => {
+ onSettled: (_data, _error, variables) => {
queryClient.invalidateQueries({
queryKey: workspaceKeys.settings(variables.workspaceId),
})
diff --git a/apps/sim/lib/copilot/tools/server/jobs/get-job-logs.ts b/apps/sim/lib/copilot/tools/server/jobs/get-job-logs.ts
index 2e222ed4a84..261a4f69065 100644
--- a/apps/sim/lib/copilot/tools/server/jobs/get-job-logs.ts
+++ b/apps/sim/lib/copilot/tools/server/jobs/get-job-logs.ts
@@ -4,6 +4,7 @@ import { createLogger } from '@sim/logger'
import { and, desc, eq } from 'drizzle-orm'
import { GetJobLogs } from '@/lib/copilot/generated/tool-catalog-v1'
import type { BaseServerTool, ServerToolContext } from '@/lib/copilot/tools/server/base-tool'
+import type { TraceSpan } from '@/lib/logs/types'
import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
const logger = createLogger('GetJobLogsServerTool')
@@ -38,29 +39,68 @@ interface JobLogEntry {
tokens?: unknown
}
-function extractToolCalls(traceSpan: any): ToolCallDetail[] {
- if (!traceSpan?.toolCalls || !Array.isArray(traceSpan.toolCalls)) return []
+/**
+ * Walks the trace-span tree and collects tool invocations from both data shapes:
+ * - New: `type: 'tool'` spans nested under agent blocks in `children`.
+ * - Legacy: a `toolCalls` array hanging off the agent span directly (pre-unification).
+ */
+function collectToolCalls(spans: TraceSpan[] | undefined): ToolCallDetail[] {
+ if (!spans?.length) return []
+ const collected: ToolCallDetail[] = []
+
+ const visit = (span: TraceSpan) => {
+ if (span.type === 'tool') {
+ const output = span.output as { result?: unknown } | undefined
+ collected.push({
+ name: span.name || 'unknown',
+ input: span.input ?? {},
+ output: output?.result ?? span.output,
+ error: span.status === 'error' ? errorMessageFromSpan(span) : undefined,
+ duration: span.duration || 0,
+ })
+ return
+ }
+
+ if (span.toolCalls?.length) {
+ for (const tc of span.toolCalls) {
+ collected.push({
+ name: tc.name || 'unknown',
+ input: tc.input ?? {},
+ output: tc.output ?? undefined,
+ error: tc.error || undefined,
+ duration: tc.duration || 0,
+ })
+ }
+ }
+
+ if (span.children?.length) {
+ for (const child of span.children) visit(child)
+ }
+ }
+
+ for (const span of spans) visit(span)
+ return collected
+}
- return traceSpan.toolCalls.map((tc: any) => ({
- name: tc.name || 'unknown',
- input: tc.input || tc.arguments || {},
- output: tc.output || tc.result || undefined,
- error: tc.error || undefined,
- duration: tc.duration || 0,
- }))
+function errorMessageFromSpan(span: TraceSpan): string | undefined {
+ const out = span.output as { error?: unknown } | undefined
+ if (typeof out?.error === 'string') return out.error
+ return undefined
}
-function extractOutputAndError(executionData: any): {
+function extractOutputAndError(
+ executionData: { traceSpans?: TraceSpan[] } & Record
+): {
output: unknown
error: string | undefined
toolCalls: ToolCallDetail[]
cost: unknown
tokens: unknown
} {
- const traceSpans = executionData?.traceSpans || []
+ const traceSpans = executionData?.traceSpans ?? []
const mainSpan = traceSpans[0]
- const toolCalls = mainSpan ? extractToolCalls(mainSpan) : []
+ const toolCalls = collectToolCalls(traceSpans)
const output = mainSpan?.output || executionData?.finalOutput || undefined
const cost = mainSpan?.cost || executionData?.cost || undefined
const tokens = mainSpan?.tokens || undefined
diff --git a/apps/sim/lib/copilot/tools/server/workflow/get-workflow-logs.ts b/apps/sim/lib/copilot/tools/server/workflow/get-workflow-logs.ts
index 3ab0cc2d573..0daf2aa07d0 100644
--- a/apps/sim/lib/copilot/tools/server/workflow/get-workflow-logs.ts
+++ b/apps/sim/lib/copilot/tools/server/workflow/get-workflow-logs.ts
@@ -5,7 +5,7 @@ import { authorizeWorkflowByWorkspacePermission } from '@sim/workflow-authz'
import { and, desc, eq } from 'drizzle-orm'
import { GetWorkflowLogs } from '@/lib/copilot/generated/tool-catalog-v1'
import type { BaseServerTool } from '@/lib/copilot/tools/server/base-tool'
-import type { TraceSpan } from '@/stores/logs/filters/types'
+import type { TraceSpan } from '@/lib/logs/types'
const logger = createLogger('GetWorkflowLogsServerTool')
diff --git a/apps/sim/lib/core/telemetry.ts b/apps/sim/lib/core/telemetry.ts
index 9dd1f409580..34af72809f1 100644
--- a/apps/sim/lib/core/telemetry.ts
+++ b/apps/sim/lib/core/telemetry.ts
@@ -100,6 +100,9 @@ const BLOCK_TYPE_MAPPING: Record<
}
if (span.tokens) {
+ // `TraceSpan.tokens` is typed as an object, but older persisted logs
+ // stored it as a bare number (total). Keep the numeric branch for those
+ // legacy rows.
if (typeof span.tokens === 'number') {
attrs[GenAIAttributes.USAGE_TOTAL_TOKENS] = span.tokens
} else {
diff --git a/apps/sim/lib/credentials/environment.ts b/apps/sim/lib/credentials/environment.ts
index d9dbdce8c9c..0ace9884075 100644
--- a/apps/sim/lib/credentials/environment.ts
+++ b/apps/sim/lib/credentials/environment.ts
@@ -61,43 +61,6 @@ export async function getUserWorkspaceIds(userId: string): Promise {
return Array.from(workspaceIds)
}
-async function upsertCredentialAdminMember(credentialId: string, adminUserId: string) {
- const now = new Date()
- const [existingMembership] = await db
- .select({ id: credentialMember.id, joinedAt: credentialMember.joinedAt })
- .from(credentialMember)
- .where(
- and(eq(credentialMember.credentialId, credentialId), eq(credentialMember.userId, adminUserId))
- )
- .limit(1)
-
- if (existingMembership) {
- await db
- .update(credentialMember)
- .set({
- role: 'admin',
- status: 'active',
- joinedAt: existingMembership.joinedAt ?? now,
- invitedBy: adminUserId,
- updatedAt: now,
- })
- .where(eq(credentialMember.id, existingMembership.id))
- return
- }
-
- await db.insert(credentialMember).values({
- id: generateId(),
- credentialId,
- userId: adminUserId,
- role: 'admin',
- status: 'active',
- joinedAt: now,
- invitedBy: adminUserId,
- createdAt: now,
- updatedAt: now,
- })
-}
-
async function ensureWorkspaceCredentialMemberships(
credentialId: string,
memberUserIds: string[],
@@ -342,78 +305,88 @@ export async function syncPersonalEnvCredentialsForUser(params: {
const normalizedKeys = Array.from(new Set(envKeys.filter(Boolean)))
const now = new Date()
- for (const workspaceId of workspaceIds) {
- const existingCredentials = await db
- .select({
- id: credential.id,
- envKey: credential.envKey,
- })
- .from(credential)
- .where(
- and(
- eq(credential.workspaceId, workspaceId),
- eq(credential.type, 'env_personal'),
- eq(credential.envOwnerUserId, userId)
- )
- )
-
- const existingByKey = new Map(
- existingCredentials
- .filter((row): row is { id: string; envKey: string } => Boolean(row.envKey))
- .map((row) => [row.envKey, row.id])
- )
-
- for (const envKey of normalizedKeys) {
- const existingId = existingByKey.get(envKey)
- if (existingId) {
- await upsertCredentialAdminMember(existingId, userId)
- continue
+ await Promise.all(
+ workspaceIds.map(async (workspaceId) => {
+ if (normalizedKeys.length > 0) {
+ await db
+ .insert(credential)
+ .values(
+ normalizedKeys.map((envKey) => ({
+ id: generateId(),
+ workspaceId,
+ type: 'env_personal' as const,
+ displayName: envKey,
+ envKey,
+ envOwnerUserId: userId,
+ createdBy: userId,
+ createdAt: now,
+ updatedAt: now,
+ }))
+ )
+ .onConflictDoNothing()
}
- const createdId = generateId()
- try {
- await db.insert(credential).values({
- id: createdId,
- workspaceId,
- type: 'env_personal',
- displayName: envKey,
- envKey,
- envOwnerUserId: userId,
- createdBy: userId,
- createdAt: now,
- updatedAt: now,
- })
- await upsertCredentialAdminMember(createdId, userId)
- } catch (error: unknown) {
- const code = getPostgresErrorCode(error)
- if (code !== '23505') throw error
+ const currentCredentials =
+ normalizedKeys.length > 0
+ ? await db
+ .select({ id: credential.id })
+ .from(credential)
+ .where(
+ and(
+ eq(credential.workspaceId, workspaceId),
+ eq(credential.type, 'env_personal'),
+ eq(credential.envOwnerUserId, userId),
+ inArray(credential.envKey, normalizedKeys)
+ )
+ )
+ : []
+
+ if (currentCredentials.length > 0) {
+ await db
+ .insert(credentialMember)
+ .values(
+ currentCredentials.map(({ id: credentialId }) => ({
+ id: generateId(),
+ credentialId,
+ userId,
+ role: 'admin' as const,
+ status: 'active' as const,
+ joinedAt: now,
+ invitedBy: userId,
+ createdAt: now,
+ updatedAt: now,
+ }))
+ )
+ .onConflictDoUpdate({
+ target: [credentialMember.credentialId, credentialMember.userId],
+ set: { role: 'admin', status: 'active', updatedAt: now },
+ })
}
- }
- if (normalizedKeys.length > 0) {
- await db
- .delete(credential)
- .where(
- and(
- eq(credential.workspaceId, workspaceId),
- eq(credential.type, 'env_personal'),
- eq(credential.envOwnerUserId, userId),
- notInArray(credential.envKey, normalizedKeys)
+ if (normalizedKeys.length > 0) {
+ await db
+ .delete(credential)
+ .where(
+ and(
+ eq(credential.workspaceId, workspaceId),
+ eq(credential.type, 'env_personal'),
+ eq(credential.envOwnerUserId, userId),
+ notInArray(credential.envKey, normalizedKeys)
+ )
)
- )
- continue
- }
-
- await db
- .delete(credential)
- .where(
- and(
- eq(credential.workspaceId, workspaceId),
- eq(credential.type, 'env_personal'),
- eq(credential.envOwnerUserId, userId)
- )
- )
- }
+ } else {
+ await db
+ .delete(credential)
+ .where(
+ and(
+ eq(credential.workspaceId, workspaceId),
+ eq(credential.type, 'env_personal'),
+ eq(credential.envOwnerUserId, userId)
+ )
+ )
+ }
+ })
+ )
}
export async function getAccessibleEnvCredentials(
diff --git a/apps/sim/lib/logs/execution/logger.ts b/apps/sim/lib/logs/execution/logger.ts
index d538ab738ad..07b7af219bb 100644
--- a/apps/sim/lib/logs/execution/logger.ts
+++ b/apps/sim/lib/logs/execution/logger.ts
@@ -47,17 +47,6 @@ const TRIGGER_COUNTER_MAP: Record = {
a2a: { key: 'totalA2aExecutions', column: 'total_a2a_executions' },
} as const
-export interface ToolCall {
- name: string
- duration: number // in milliseconds
- startTime: string // ISO timestamp
- endTime: string // ISO timestamp
- status: 'success' | 'error'
- input?: Record
- output?: Record
- error?: string
-}
-
const logger = createLogger('ExecutionLogger')
function countTraceSpans(traceSpans?: TraceSpan[]): number {
@@ -84,6 +73,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
models: NonNullable
}
executionState?: SerializableExecutionState
+ workflowInput?: unknown
}): WorkflowExecutionLog['executionData'] {
const {
existingExecutionData,
@@ -93,6 +83,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
completionFailure,
executionCost,
executionState,
+ workflowInput,
} = params
const traceSpanCount = countTraceSpans(traceSpans)
@@ -128,6 +119,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
},
models: executionCost.models,
...(executionState ? { executionState } : {}),
+ ...(workflowInput !== undefined ? { workflowInput } : {}),
}
}
@@ -376,6 +368,7 @@ export class ExecutionLogger implements IExecutionLoggerService {
completionFailure,
executionCost,
executionState,
+ workflowInput,
})
const [updatedLog] = await db
diff --git a/apps/sim/lib/logs/execution/logging-session.ts b/apps/sim/lib/logs/execution/logging-session.ts
index d8390468324..df08172abe0 100644
--- a/apps/sim/lib/logs/execution/logging-session.ts
+++ b/apps/sim/lib/logs/execution/logging-session.ts
@@ -285,6 +285,46 @@ export class LoggingSession {
blockType: string,
output: any
): Promise {
+ // Accumulate cost synchronously before any await so that fire-and-forget
+ // callers still capture the full cost even if DB writes are not awaited.
+ const blockOutput = output?.output
+ if (
+ blockOutput?.cost &&
+ typeof blockOutput.cost.total === 'number' &&
+ blockOutput.cost.total > 0
+ ) {
+ const { cost, tokens, model } = blockOutput
+
+ this.accumulatedCost.total += cost.total || 0
+ this.accumulatedCost.input += cost.input || 0
+ this.accumulatedCost.output += cost.output || 0
+
+ if (tokens) {
+ this.accumulatedCost.tokens.input += tokens.input || 0
+ this.accumulatedCost.tokens.output += tokens.output || 0
+ this.accumulatedCost.tokens.total += tokens.total || 0
+ }
+
+ if (model) {
+ if (!this.accumulatedCost.models[model]) {
+ this.accumulatedCost.models[model] = {
+ input: 0,
+ output: 0,
+ total: 0,
+ tokens: { input: 0, output: 0, total: 0 },
+ }
+ }
+ this.accumulatedCost.models[model].input += cost.input || 0
+ this.accumulatedCost.models[model].output += cost.output || 0
+ this.accumulatedCost.models[model].total += cost.total || 0
+ if (tokens) {
+ this.accumulatedCost.models[model].tokens.input += tokens.input || 0
+ this.accumulatedCost.models[model].tokens.output += tokens.output || 0
+ this.accumulatedCost.models[model].tokens.total += tokens.total || 0
+ }
+ }
+ }
+
await this.trackProgressWrite(
this.persistLastCompletedBlock({
blockId,
@@ -295,47 +335,13 @@ export class LoggingSession {
})
)
- const blockOutput = output?.output
if (
- !blockOutput?.cost ||
- typeof blockOutput.cost.total !== 'number' ||
- blockOutput.cost.total <= 0
+ blockOutput?.cost &&
+ typeof blockOutput.cost.total === 'number' &&
+ blockOutput.cost.total > 0
) {
- return
+ void this.trackProgressWrite(this.flushAccumulatedCost())
}
-
- const { cost, tokens, model } = blockOutput
-
- this.accumulatedCost.total += cost.total || 0
- this.accumulatedCost.input += cost.input || 0
- this.accumulatedCost.output += cost.output || 0
-
- if (tokens) {
- this.accumulatedCost.tokens.input += tokens.input || 0
- this.accumulatedCost.tokens.output += tokens.output || 0
- this.accumulatedCost.tokens.total += tokens.total || 0
- }
-
- if (model) {
- if (!this.accumulatedCost.models[model]) {
- this.accumulatedCost.models[model] = {
- input: 0,
- output: 0,
- total: 0,
- tokens: { input: 0, output: 0, total: 0 },
- }
- }
- this.accumulatedCost.models[model].input += cost.input || 0
- this.accumulatedCost.models[model].output += cost.output || 0
- this.accumulatedCost.models[model].total += cost.total || 0
- if (tokens) {
- this.accumulatedCost.models[model].tokens.input += tokens.input || 0
- this.accumulatedCost.models[model].tokens.output += tokens.output || 0
- this.accumulatedCost.models[model].tokens.total += tokens.total || 0
- }
- }
-
- void this.trackProgressWrite(this.flushAccumulatedCost())
}
private async flushAccumulatedCost(): Promise {
diff --git a/apps/sim/lib/logs/execution/trace-spans/iteration-grouping.ts b/apps/sim/lib/logs/execution/trace-spans/iteration-grouping.ts
new file mode 100644
index 00000000000..832b5eeeca7
--- /dev/null
+++ b/apps/sim/lib/logs/execution/trace-spans/iteration-grouping.ts
@@ -0,0 +1,324 @@
+import { createLogger } from '@sim/logger'
+import type { TraceSpan } from '@/lib/logs/types'
+import { stripCloneSuffixes } from '@/executor/utils/subflow-utils'
+
+const logger = createLogger('IterationGrouping')
+
+/** Counter state for generating sequential container names. */
+interface ContainerNameCounters {
+ loopNumbers: Map
+ parallelNumbers: Map
+ loopCounter: number
+ parallelCounter: number
+}
+
+/**
+ * Builds a container-level TraceSpan (iteration wrapper or top-level container)
+ * from its source spans and resolved children.
+ */
+function buildContainerSpan(opts: {
+ id: string
+ name: string
+ type: string
+ sourceSpans: TraceSpan[]
+ children: TraceSpan[]
+}): TraceSpan {
+ const startTimes = opts.sourceSpans.map((s) => new Date(s.startTime).getTime())
+ const endTimes = opts.sourceSpans.map((s) => new Date(s.endTime).getTime())
+
+ // Guard against empty sourceSpans — Math.min/max of empty array returns ±Infinity
+ // which produces NaN durations and invalid Dates downstream.
+ const nowMs = Date.now()
+ const earliestStart = startTimes.length > 0 ? Math.min(...startTimes) : nowMs
+ const latestEnd = endTimes.length > 0 ? Math.max(...endTimes) : nowMs
+
+ const hasErrors = opts.sourceSpans.some((s) => s.status === 'error')
+ const allErrorsHandled =
+ hasErrors && opts.children.every((s) => s.status !== 'error' || s.errorHandled)
+
+ return {
+ id: opts.id,
+ name: opts.name,
+ type: opts.type,
+ duration: Math.max(0, latestEnd - earliestStart),
+ startTime: new Date(earliestStart).toISOString(),
+ endTime: new Date(latestEnd).toISOString(),
+ status: hasErrors ? 'error' : 'success',
+ ...(allErrorsHandled && { errorHandled: true }),
+ children: opts.children,
+ }
+}
+
+/**
+ * Resolves a container name from normal (non-iteration) spans or assigns a sequential number.
+ * Strips clone suffixes so all clones of the same container share one name/number.
+ */
+function resolveContainerName(
+ containerId: string,
+ containerType: 'parallel' | 'loop',
+ normalSpans: TraceSpan[],
+ counters: ContainerNameCounters
+): string {
+ const originalId = stripCloneSuffixes(containerId)
+
+ const matchingBlock = normalSpans.find(
+ (s) => s.blockId === originalId && s.type === containerType
+ )
+ if (matchingBlock?.name) return matchingBlock.name
+
+ if (containerType === 'parallel') {
+ if (!counters.parallelNumbers.has(originalId)) {
+ counters.parallelNumbers.set(originalId, counters.parallelCounter++)
+ }
+ return `Parallel ${counters.parallelNumbers.get(originalId)}`
+ }
+ if (!counters.loopNumbers.has(originalId)) {
+ counters.loopNumbers.set(originalId, counters.loopCounter++)
+ }
+ return `Loop ${counters.loopNumbers.get(originalId)}`
+}
+
+/**
+ * Classifies a span's immediate container ID and type from its metadata.
+ * Returns undefined for non-iteration spans.
+ */
+function classifySpanContainer(
+ span: TraceSpan
+): { containerId: string; containerType: 'parallel' | 'loop' } | undefined {
+ if (span.parallelId) {
+ return { containerId: span.parallelId, containerType: 'parallel' }
+ }
+ if (span.loopId) {
+ return { containerId: span.loopId, containerType: 'loop' }
+ }
+ if (span.blockId?.includes('_parallel_')) {
+ const match = span.blockId.match(/_parallel_([^_]+)_iteration_/)
+ if (match) {
+ return { containerId: match[1], containerType: 'parallel' }
+ }
+ }
+ return undefined
+}
+
+/**
+ * Finds the outermost container for a span. For nested spans, this is parentIterations[0].
+ * For flat spans, this is the span's own immediate container.
+ */
+function getOutermostContainer(
+ span: TraceSpan
+): { containerId: string; containerType: 'parallel' | 'loop' } | undefined {
+ if (span.parentIterations && span.parentIterations.length > 0) {
+ const outermost = span.parentIterations[0]
+ return {
+ containerId: outermost.iterationContainerId,
+ containerType: outermost.iterationType as 'parallel' | 'loop',
+ }
+ }
+ return classifySpanContainer(span)
+}
+
+/**
+ * Builds the iteration-level hierarchy for a container, recursively nesting
+ * any deeper subflows. Works with both:
+ * - Direct spans (spans whose immediate container matches)
+ * - Nested spans (spans with parentIterations pointing through this container)
+ */
+function buildContainerChildren(
+ containerType: 'parallel' | 'loop',
+ containerId: string,
+ spans: TraceSpan[],
+ normalSpans: TraceSpan[],
+ counters: ContainerNameCounters
+): TraceSpan[] {
+ const iterationType = containerType === 'parallel' ? 'parallel-iteration' : 'loop-iteration'
+
+ const iterationGroups = new Map()
+
+ for (const span of spans) {
+ let iterIdx: number | undefined
+
+ if (
+ span.parentIterations &&
+ span.parentIterations.length > 0 &&
+ span.parentIterations[0].iterationContainerId === containerId
+ ) {
+ iterIdx = span.parentIterations[0].iterationCurrent
+ } else {
+ iterIdx = span.iterationIndex
+ }
+
+ if (iterIdx === undefined) {
+ logger.warn('Skipping iteration span without iterationIndex', {
+ spanId: span.id,
+ blockId: span.blockId,
+ containerId,
+ })
+ continue
+ }
+
+ if (!iterationGroups.has(iterIdx)) iterationGroups.set(iterIdx, [])
+ iterationGroups.get(iterIdx)!.push(span)
+ }
+
+ const iterationChildren: TraceSpan[] = []
+ const sortedIterations = Array.from(iterationGroups.entries()).sort(([a], [b]) => a - b)
+
+ for (const [iterationIndex, iterSpans] of sortedIterations) {
+ const directLeaves: TraceSpan[] = []
+ const deeperSpans: TraceSpan[] = []
+
+ for (const span of iterSpans) {
+ if (
+ span.parentIterations &&
+ span.parentIterations.length > 0 &&
+ span.parentIterations[0].iterationContainerId === containerId
+ ) {
+ deeperSpans.push({
+ ...span,
+ parentIterations: span.parentIterations.slice(1),
+ })
+ } else {
+ directLeaves.push({
+ ...span,
+ name: span.name.replace(/ \(iteration \d+\)$/, ''),
+ })
+ }
+ }
+
+ const nestedResult = groupIterationBlocksRecursive(
+ [...directLeaves, ...deeperSpans],
+ normalSpans,
+ counters
+ )
+
+ iterationChildren.push(
+ buildContainerSpan({
+ id: `${containerId}-iteration-${iterationIndex}`,
+ name: `Iteration ${iterationIndex}`,
+ type: iterationType,
+ sourceSpans: iterSpans,
+ children: nestedResult,
+ })
+ )
+ }
+
+ return iterationChildren
+}
+
+/**
+ * Core recursive algorithm for grouping iteration blocks.
+ *
+ * Handles two cases:
+ * 1. **Flat** (backward compat): spans have loopId/parallelId + iterationIndex but no
+ * parentIterations. Grouped by immediate container -> iteration -> leaf.
+ * 2. **Nested** (new): spans have parentIterations chains. The outermost ancestor in the
+ * chain determines the top-level container. Iteration spans are peeled one level at a
+ * time and recursed.
+ */
+function groupIterationBlocksRecursive(
+ spans: TraceSpan[],
+ normalSpans: TraceSpan[],
+ counters: ContainerNameCounters
+): TraceSpan[] {
+ const result: TraceSpan[] = []
+ const iterationSpans: TraceSpan[] = []
+ const nonIterationSpans: TraceSpan[] = []
+
+ for (const span of spans) {
+ if (
+ (span.name.match(/^(.+) \(iteration (\d+)\)$/) &&
+ (span.loopId || span.parallelId || span.blockId?.includes('_parallel_'))) ||
+ (span.parentIterations && span.parentIterations.length > 0)
+ ) {
+ iterationSpans.push(span)
+ } else {
+ nonIterationSpans.push(span)
+ }
+ }
+
+ const containerIdsWithIterations = new Set()
+ for (const span of iterationSpans) {
+ const outermost = getOutermostContainer(span)
+ if (outermost) containerIdsWithIterations.add(outermost.containerId)
+ }
+
+ const nonContainerSpans = nonIterationSpans.filter(
+ (span) =>
+ (span.type !== 'parallel' && span.type !== 'loop') ||
+ span.status === 'error' ||
+ (span.blockId && !containerIdsWithIterations.has(span.blockId))
+ )
+
+ if (iterationSpans.length === 0) {
+ result.push(...nonContainerSpans)
+ result.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+ return result
+ }
+
+ const containerGroups = new Map<
+ string,
+ { type: 'parallel' | 'loop'; containerId: string; containerName: string; spans: TraceSpan[] }
+ >()
+
+ for (const span of iterationSpans) {
+ const outermost = getOutermostContainer(span)
+ if (!outermost) continue
+
+ const { containerId, containerType } = outermost
+ const groupKey = `${containerType}_${containerId}`
+
+ if (!containerGroups.has(groupKey)) {
+ const containerName = resolveContainerName(containerId, containerType, normalSpans, counters)
+ containerGroups.set(groupKey, {
+ type: containerType,
+ containerId,
+ containerName,
+ spans: [],
+ })
+ }
+ containerGroups.get(groupKey)!.spans.push(span)
+ }
+
+ for (const [, group] of containerGroups) {
+ const { type, containerId, containerName, spans: containerSpans } = group
+
+ const iterationChildren = buildContainerChildren(
+ type,
+ containerId,
+ containerSpans,
+ normalSpans,
+ counters
+ )
+
+ result.push(
+ buildContainerSpan({
+ id: `${type === 'parallel' ? 'parallel' : 'loop'}-execution-${containerId}`,
+ name: containerName,
+ type,
+ sourceSpans: containerSpans,
+ children: iterationChildren,
+ })
+ )
+ }
+
+ result.push(...nonContainerSpans)
+ result.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+
+ return result
+}
+
+/**
+ * Groups iteration-based blocks (parallel and loop) by organizing their iteration spans
+ * into a hierarchical structure with proper parent-child relationships.
+ * Supports recursive nesting via parentIterations (e.g., parallel-in-parallel, loop-in-loop).
+ */
+export function groupIterationBlocks(spans: TraceSpan[]): TraceSpan[] {
+ const normalSpans = spans.filter((s) => !s.name.match(/^(.+) \(iteration (\d+)\)$/))
+ const counters: ContainerNameCounters = {
+ loopNumbers: new Map(),
+ parallelNumbers: new Map(),
+ loopCounter: 1,
+ parallelCounter: 1,
+ }
+ return groupIterationBlocksRecursive(spans, normalSpans, counters)
+}
diff --git a/apps/sim/lib/logs/execution/trace-spans/span-factory.ts b/apps/sim/lib/logs/execution/trace-spans/span-factory.ts
new file mode 100644
index 00000000000..30329a8b9b5
--- /dev/null
+++ b/apps/sim/lib/logs/execution/trace-spans/span-factory.ts
@@ -0,0 +1,384 @@
+import { createLogger } from '@sim/logger'
+import type { ProviderTiming, TraceSpan } from '@/lib/logs/types'
+import {
+ isConditionBlockType,
+ isWorkflowBlockType,
+ stripCustomToolPrefix,
+} from '@/executor/constants'
+import type {
+ BlockLog,
+ BlockToolCall,
+ NormalizedBlockOutput,
+ ProviderTimingSegment,
+} from '@/executor/types'
+
+const logger = createLogger('SpanFactory')
+
+/** A BlockLog that has already passed the id/type validity check. */
+type ValidBlockLog = BlockLog & { blockType: string }
+
+/**
+ * Creates a TraceSpan from a BlockLog. Returns null for invalid logs.
+ *
+ * Children are unified under `span.children` regardless of source:
+ * - Provider `timeSegments` become model/tool child spans with tool I/O merged in
+ * - `output.toolCalls` (no segments) become tool child spans
+ * - Child workflow spans are flattened into children
+ */
+export function createSpanFromLog(log: BlockLog): TraceSpan | null {
+ if (!log.blockId || !log.blockType) return null
+ const validLog = log as ValidBlockLog
+
+ const span = createBaseSpan(validLog)
+
+ if (!isConditionBlockType(validLog.blockType)) {
+ enrichWithProviderMetadata(span, validLog)
+
+ if (!isWorkflowBlockType(validLog.blockType)) {
+ const segments = validLog.output?.providerTiming?.timeSegments
+ span.children = segments
+ ? buildChildrenFromTimeSegments(span, validLog, segments)
+ : buildChildrenFromToolCalls(span, validLog)
+ }
+ }
+
+ if (isWorkflowBlockType(validLog.blockType)) {
+ attachChildWorkflowSpans(span, validLog)
+ }
+
+ return span
+}
+
+/** Creates the base span with id, name, type, timing, status, and metadata. */
+function createBaseSpan(log: ValidBlockLog): TraceSpan {
+ const spanId = `${log.blockId}-${new Date(log.startedAt).getTime()}`
+ const output = extractDisplayOutput(log)
+ const childIds = extractChildWorkflowIds(log.output)
+
+ return {
+ id: spanId,
+ name: log.blockName ?? log.blockId,
+ type: log.blockType,
+ duration: log.durationMs,
+ startTime: log.startedAt,
+ endTime: log.endedAt,
+ status: log.error ? 'error' : 'success',
+ children: [],
+ blockId: log.blockId,
+ input: log.input,
+ output,
+ ...(childIds ?? {}),
+ ...(log.errorHandled && { errorHandled: true }),
+ ...(log.loopId && { loopId: log.loopId }),
+ ...(log.parallelId && { parallelId: log.parallelId }),
+ ...(log.iterationIndex !== undefined && { iterationIndex: log.iterationIndex }),
+ ...(log.parentIterations?.length && { parentIterations: log.parentIterations }),
+ }
+}
+
+/**
+ * Strips internal fields from the block output for display and merges
+ * the block-level error into output so the UI renders it alongside data.
+ */
+function extractDisplayOutput(log: ValidBlockLog): Record {
+ const { childWorkflowSnapshotId, childWorkflowId, ...rest } = log.output ?? {}
+ return log.error ? { ...rest, error: log.error } : rest
+}
+
+/** Pulls child-workflow identifiers off the output so they can live on the span. */
+function extractChildWorkflowIds(
+ output: NormalizedBlockOutput | undefined
+): { childWorkflowSnapshotId?: string; childWorkflowId?: string } | undefined {
+ if (!output) return undefined
+ const ids: { childWorkflowSnapshotId?: string; childWorkflowId?: string } = {}
+ if (typeof output.childWorkflowSnapshotId === 'string') {
+ ids.childWorkflowSnapshotId = output.childWorkflowSnapshotId
+ }
+ if (typeof output.childWorkflowId === 'string') {
+ ids.childWorkflowId = output.childWorkflowId
+ }
+ return ids.childWorkflowSnapshotId || ids.childWorkflowId ? ids : undefined
+}
+
+/** Enriches a span with provider timing, cost, tokens, and model from block output. */
+function enrichWithProviderMetadata(span: TraceSpan, log: ValidBlockLog): void {
+ const output = log.output
+ if (!output) return
+
+ if (output.providerTiming) {
+ const pt = output.providerTiming
+ const timing: ProviderTiming = {
+ duration: pt.duration,
+ startTime: pt.startTime,
+ endTime: pt.endTime,
+ segments: pt.timeSegments ?? [],
+ }
+ span.providerTiming = timing
+ }
+
+ if (output.cost) {
+ const { input, output: out, total } = output.cost
+ span.cost = { input, output: out, total }
+ }
+
+ if (output.tokens) {
+ const t = output.tokens
+ const input =
+ typeof t.input === 'number' ? t.input : typeof t.prompt === 'number' ? t.prompt : undefined
+ const outputTokens =
+ typeof t.output === 'number'
+ ? t.output
+ : typeof t.completion === 'number'
+ ? t.completion
+ : undefined
+ const totalExplicit = typeof t.total === 'number' ? t.total : undefined
+ const total =
+ totalExplicit ??
+ (input !== undefined || outputTokens !== undefined
+ ? (input ?? 0) + (outputTokens ?? 0)
+ : undefined)
+ span.tokens = {
+ ...(input !== undefined && { input }),
+ ...(outputTokens !== undefined && { output: outputTokens }),
+ ...(total !== undefined && { total }),
+ }
+ }
+
+ if (typeof output.model === 'string') {
+ span.model = output.model
+ }
+}
+
+/**
+ * Builds child spans from provider `timeSegments`, matching tool segments to
+ * their corresponding tool call I/O by name in sequential order.
+ */
+function buildChildrenFromTimeSegments(
+ span: TraceSpan,
+ log: ValidBlockLog,
+ segments: ProviderTimingSegment[]
+): TraceSpan[] {
+ const toolCallsByName = groupToolCallsByName(resolveToolCallsList(log.output))
+ const toolCallIndices = new Map()
+
+ return segments.map((segment, index) => {
+ const segmentStartTime = new Date(segment.startTime).toISOString()
+ let segmentEndTime = new Date(segment.endTime).toISOString()
+ let segmentDuration = segment.duration
+
+ // The final model segment sometimes closes before the block ends (e.g. when
+ // post-processing runs after the stream). Extend it to the block endTime so
+ // the Gantt bar fills to the edge rather than leaving a trailing gap.
+ if (index === segments.length - 1 && segment.type === 'model' && log.endedAt) {
+ const blockEndMs = new Date(log.endedAt).getTime()
+ const segmentEndMs = new Date(segment.endTime).getTime()
+ if (blockEndMs > segmentEndMs) {
+ segmentEndTime = log.endedAt
+ segmentDuration = blockEndMs - new Date(segment.startTime).getTime()
+ }
+ }
+
+ if (segment.type === 'tool') {
+ const normalizedName = stripCustomToolPrefix(segment.name ?? '')
+ const callsForName = toolCallsByName.get(normalizedName) ?? []
+ const currentIndex = toolCallIndices.get(normalizedName) ?? 0
+ const match = callsForName[currentIndex]
+ toolCallIndices.set(normalizedName, currentIndex + 1)
+
+ const toolChild: TraceSpan = {
+ id: `${span.id}-segment-${index}`,
+ name: normalizedName,
+ type: 'tool',
+ duration: segment.duration,
+ startTime: segmentStartTime,
+ endTime: segmentEndTime,
+ status: match?.error || segment.errorMessage ? 'error' : 'success',
+ input: match?.arguments ?? match?.input,
+ output: match?.error
+ ? { error: match.error, ...(match.result ?? match.output ?? {}) }
+ : (match?.result ?? match?.output),
+ }
+ if (segment.toolCallId) toolChild.toolCallId = segment.toolCallId
+ if (segment.errorType) toolChild.errorType = segment.errorType
+ if (segment.errorMessage) toolChild.errorMessage = segment.errorMessage
+ return toolChild
+ }
+
+ const modelChild: TraceSpan = {
+ id: `${span.id}-segment-${index}`,
+ name: segment.name ?? 'Model',
+ type: 'model',
+ duration: segmentDuration,
+ startTime: segmentStartTime,
+ endTime: segmentEndTime,
+ status: segment.errorMessage ? 'error' : 'success',
+ }
+
+ if (segment.assistantContent) {
+ modelChild.output = { content: segment.assistantContent }
+ }
+ if (segment.thinkingContent) {
+ modelChild.thinking = segment.thinkingContent
+ }
+ if (segment.toolCalls && segment.toolCalls.length > 0) {
+ modelChild.modelToolCalls = segment.toolCalls
+ }
+ if (segment.finishReason) {
+ modelChild.finishReason = segment.finishReason
+ }
+ if (segment.tokens) {
+ modelChild.tokens = segment.tokens
+ }
+ if (segment.cost) {
+ modelChild.cost = segment.cost
+ }
+ if (typeof segment.ttft === 'number' && segment.ttft >= 0) {
+ modelChild.ttft = segment.ttft
+ }
+ if (span.model) {
+ modelChild.model = span.model
+ }
+ if (segment.provider) {
+ modelChild.provider = segment.provider
+ }
+ if (segment.errorType) {
+ modelChild.errorType = segment.errorType
+ }
+ if (segment.errorMessage) {
+ modelChild.errorMessage = segment.errorMessage
+ }
+
+ return modelChild
+ })
+}
+
+/**
+ * Builds tool-call child spans when the provider did not emit `timeSegments`.
+ * Each tool call becomes a full TraceSpan of `type: 'tool'`.
+ */
+function buildChildrenFromToolCalls(span: TraceSpan, log: ValidBlockLog): TraceSpan[] {
+ const toolCalls = resolveToolCallsList(log.output)
+ if (toolCalls.length === 0) return []
+
+ return toolCalls.map((tc, index) => {
+ const startTime = tc.startTime ?? log.startedAt
+ const endTime = tc.endTime ?? log.endedAt
+ return {
+ id: `${span.id}-tool-${index}`,
+ name: stripCustomToolPrefix(tc.name ?? 'unnamed-tool'),
+ type: 'tool',
+ duration: tc.duration ?? 0,
+ startTime,
+ endTime,
+ status: tc.error ? 'error' : 'success',
+ input: tc.arguments ?? tc.input,
+ output: tc.error
+ ? { error: tc.error, ...(tc.result ?? tc.output ?? {}) }
+ : (tc.result ?? tc.output),
+ }
+ })
+}
+
+/** Groups tool calls by their stripped name for sequential matching against segments. */
+function groupToolCallsByName(toolCalls: BlockToolCall[]): Map {
+ const byName = new Map()
+ for (const tc of toolCalls) {
+ const name = stripCustomToolPrefix(tc.name ?? '')
+ const list = byName.get(name)
+ if (list) list.push(tc)
+ else byName.set(name, [tc])
+ }
+ return byName
+}
+
+/**
+ * Resolves the tool calls list from block output. Providers write a normalized
+ * `{list, count}` container; a legacy streaming path embeds calls under
+ * `executionData.output.toolCalls`. The `Array.isArray` branches guard against
+ * persisted logs from before the container shape was normalized, where
+ * `toolCalls` was stored as a plain array — still observed in older DB rows.
+ */
+function resolveToolCallsList(output: NormalizedBlockOutput | undefined): BlockToolCall[] {
+ if (!output) return []
+
+ const direct = output.toolCalls
+ if (direct) {
+ if (Array.isArray(direct)) return direct
+ if (direct.list) return direct.list
+ logger.warn('Unexpected toolCalls shape on block output — no list extracted', {
+ shape: typeof direct,
+ })
+ return []
+ }
+
+ const legacy = (output.executionData as { output?: { toolCalls?: unknown } } | undefined)?.output
+ ?.toolCalls
+ if (!legacy) return []
+ if (Array.isArray(legacy)) return legacy as BlockToolCall[]
+ if (typeof legacy === 'object' && legacy !== null && 'list' in legacy) {
+ return ((legacy as { list?: BlockToolCall[] }).list ?? []) as BlockToolCall[]
+ }
+ logger.warn('Unexpected legacy executionData.output.toolCalls shape — no list extracted', {
+ shape: typeof legacy,
+ })
+ return []
+}
+
+/** Extracts and flattens child workflow trace spans into the parent span's children. */
+function attachChildWorkflowSpans(span: TraceSpan, log: ValidBlockLog): void {
+ const childTraceSpans = log.childTraceSpans ?? log.output?.childTraceSpans
+ if (!childTraceSpans?.length) return
+
+ span.children = flattenWorkflowChildren(childTraceSpans)
+ span.output = stripChildTraceSpansFromOutput(span.output)
+}
+
+/** True when a span is a synthetic workflow wrapper (no blockId). */
+function isSyntheticWorkflowWrapper(span: TraceSpan): boolean {
+ return span.type === 'workflow' && !span.blockId
+}
+
+/** Reads nested `childTraceSpans` off a span's output, or `[]` if absent. */
+function extractOutputChildren(output: TraceSpan['output']): TraceSpan[] {
+ const nested = (output as { childTraceSpans?: TraceSpan[] } | undefined)?.childTraceSpans
+ return Array.isArray(nested) ? nested : []
+}
+
+/** Returns a copy of `output` with `childTraceSpans` removed, or undefined unchanged. */
+function stripChildTraceSpansFromOutput(
+ output: TraceSpan['output']
+): TraceSpan['output'] | undefined {
+ if (!output || !('childTraceSpans' in output)) return output
+ const { childTraceSpans: _, ...rest } = output as Record
+ return rest
+}
+
+/** Recursively flattens synthetic workflow wrappers, preserving real block spans. */
+function flattenWorkflowChildren(spans: TraceSpan[]): TraceSpan[] {
+ const flattened: TraceSpan[] = []
+
+ for (const span of spans) {
+ if (isSyntheticWorkflowWrapper(span)) {
+ if (span.children?.length) {
+ flattened.push(...flattenWorkflowChildren(span.children))
+ }
+ continue
+ }
+
+ const directChildren = span.children ?? []
+ const outputChildren = extractOutputChildren(span.output)
+ const allChildren = [...directChildren, ...outputChildren]
+
+ const nextSpan: TraceSpan = { ...span }
+ if (allChildren.length > 0) {
+ nextSpan.children = flattenWorkflowChildren(allChildren)
+ }
+ if (outputChildren.length > 0) {
+ nextSpan.output = stripChildTraceSpansFromOutput(nextSpan.output)
+ }
+
+ flattened.push(nextSpan)
+ }
+
+ return flattened
+}
diff --git a/apps/sim/lib/logs/execution/trace-spans/trace-spans.test.ts b/apps/sim/lib/logs/execution/trace-spans/trace-spans.test.ts
index dd226ee857a..f15ff6f2fc2 100644
--- a/apps/sim/lib/logs/execution/trace-spans/trace-spans.test.ts
+++ b/apps/sim/lib/logs/execution/trace-spans/trace-spans.test.ts
@@ -174,11 +174,12 @@ describe('buildTraceSpans', () => {
expect(traceSpans).toHaveLength(1)
const agentSpan = traceSpans[0]
expect(agentSpan.type).toBe('agent')
- expect(agentSpan.toolCalls).toBeDefined()
- expect(agentSpan.toolCalls).toHaveLength(2)
+ expect(agentSpan.children).toBeDefined()
+ expect(agentSpan.children).toHaveLength(2)
// Check first tool call
- const firstToolCall = agentSpan.toolCalls![0]
+ const firstToolCall = agentSpan.children![0]
+ expect(firstToolCall.type).toBe('tool')
expect(firstToolCall.name).toBe('test_tool') // custom_ prefix should be stripped
expect(firstToolCall.duration).toBe(1000)
expect(firstToolCall.status).toBe('success')
@@ -186,7 +187,8 @@ describe('buildTraceSpans', () => {
expect(firstToolCall.output).toEqual({ output: 'test output' })
// Check second tool call
- const secondToolCall = agentSpan.toolCalls![1]
+ const secondToolCall = agentSpan.children![1]
+ expect(secondToolCall.type).toBe('tool')
expect(secondToolCall.name).toBe('http_request')
expect(secondToolCall.duration).toBe(2000)
expect(secondToolCall.status).toBe('success')
@@ -238,10 +240,11 @@ describe('buildTraceSpans', () => {
expect(traceSpans).toHaveLength(1)
const agentSpan = traceSpans[0]
- expect(agentSpan.toolCalls).toBeDefined()
- expect(agentSpan.toolCalls).toHaveLength(1)
+ expect(agentSpan.children).toBeDefined()
+ expect(agentSpan.children).toHaveLength(1)
- const toolCall = agentSpan.toolCalls![0]
+ const toolCall = agentSpan.children![0]
+ expect(toolCall.type).toBe('tool')
expect(toolCall.name).toBe('serper_search')
expect(toolCall.duration).toBe(1500)
expect(toolCall.status).toBe('success')
@@ -293,10 +296,11 @@ describe('buildTraceSpans', () => {
expect(traceSpans).toHaveLength(1)
const agentSpan = traceSpans[0]
- expect(agentSpan.toolCalls).toBeDefined()
- expect(agentSpan.toolCalls).toHaveLength(1)
+ expect(agentSpan.children).toBeDefined()
+ expect(agentSpan.children).toHaveLength(1)
- const toolCall = agentSpan.toolCalls![0]
+ const toolCall = agentSpan.children![0]
+ expect(toolCall.type).toBe('tool')
expect(toolCall.name).toBe('analysis_tool') // custom_ prefix should be stripped
expect(toolCall.duration).toBe(2000)
expect(toolCall.status).toBe('success')
@@ -2082,4 +2086,124 @@ describe('nested subflow grouping via parentIterations', () => {
expect(parallel!.children).toHaveLength(2)
}
)
+
+ it.concurrent('propagates per-iteration segment content to model child spans', () => {
+ const result: ExecutionResult = {
+ success: true,
+ output: { content: 'final' },
+ logs: [
+ {
+ blockId: 'agent-1',
+ blockName: 'Agent',
+ blockType: 'agent',
+ startedAt: '2024-01-01T10:00:00.000Z',
+ endedAt: '2024-01-01T10:00:04.000Z',
+ durationMs: 4000,
+ success: true,
+ input: { userPrompt: 'hi' },
+ output: {
+ content: 'final',
+ model: 'claude-3-7-sonnet',
+ providerTiming: {
+ duration: 4000,
+ startTime: '2024-01-01T10:00:00.000Z',
+ endTime: '2024-01-01T10:00:04.000Z',
+ timeSegments: [
+ {
+ type: 'model',
+ name: 'claude-3-7-sonnet',
+ startTime: 1704103200000,
+ endTime: 1704103202000,
+ duration: 2000,
+ assistantContent: 'reasoning about request',
+ thinkingContent: 'let me think step by step',
+ toolCalls: [{ id: 'call_abc', name: 'lookup', arguments: { q: 'test' } }],
+ finishReason: 'tool_use',
+ tokens: { input: 100, output: 20, total: 120, cacheRead: 5, reasoning: 8 },
+ cost: { input: 0.001, output: 0.002, total: 0.003 },
+ ttft: 450,
+ provider: 'anthropic',
+ },
+ {
+ type: 'tool',
+ name: 'lookup',
+ startTime: 1704103202000,
+ endTime: 1704103203000,
+ duration: 1000,
+ toolCallId: 'call_abc',
+ errorType: 'TimeoutError',
+ errorMessage: 'tool timed out',
+ },
+ {
+ type: 'model',
+ name: 'claude-3-7-sonnet',
+ startTime: 1704103203000,
+ endTime: 1704103204000,
+ duration: 1000,
+ assistantContent: 'final answer',
+ finishReason: 'end_turn',
+ tokens: { input: 130, output: 10, total: 140 },
+ cost: { input: 0.002, output: 0.001, total: 0.003 },
+ provider: 'anthropic',
+ errorType: 'RateLimitError',
+ errorMessage: 'too many requests',
+ },
+ ],
+ },
+ toolCalls: {
+ list: [
+ {
+ name: 'lookup',
+ arguments: { q: 'test' },
+ result: { hit: true },
+ duration: 1000,
+ },
+ ],
+ count: 1,
+ },
+ },
+ },
+ ],
+ }
+
+ const { traceSpans } = buildTraceSpans(result)
+ const children = traceSpans[0].children!
+ expect(children).toHaveLength(3)
+
+ const [firstModel, tool, secondModel] = children
+
+ expect(firstModel.type).toBe('model')
+ expect(firstModel.output).toEqual({ content: 'reasoning about request' })
+ expect(firstModel.thinking).toBe('let me think step by step')
+ expect(firstModel.modelToolCalls).toEqual([
+ { id: 'call_abc', name: 'lookup', arguments: { q: 'test' } },
+ ])
+ expect(firstModel.finishReason).toBe('tool_use')
+ expect(firstModel.tokens).toEqual({
+ input: 100,
+ output: 20,
+ total: 120,
+ cacheRead: 5,
+ reasoning: 8,
+ })
+ expect(firstModel.cost).toEqual({ input: 0.001, output: 0.002, total: 0.003 })
+ expect(firstModel.ttft).toBe(450)
+ expect(firstModel.provider).toBe('anthropic')
+ expect(firstModel.status).toBe('success')
+
+ expect(tool.type).toBe('tool')
+ expect(tool.toolCallId).toBe('call_abc')
+ expect(tool.errorType).toBe('TimeoutError')
+ expect(tool.errorMessage).toBe('tool timed out')
+ expect(tool.status).toBe('error')
+
+ expect(secondModel.type).toBe('model')
+ expect(secondModel.output).toEqual({ content: 'final answer' })
+ expect(secondModel.thinking).toBeUndefined()
+ expect(secondModel.modelToolCalls).toBeUndefined()
+ expect(secondModel.finishReason).toBe('end_turn')
+ expect(secondModel.errorType).toBe('RateLimitError')
+ expect(secondModel.errorMessage).toBe('too many requests')
+ expect(secondModel.status).toBe('error')
+ })
})
diff --git a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
index f367058fd6f..815c5159351 100644
--- a/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
+++ b/apps/sim/lib/logs/execution/trace-spans/trace-spans.ts
@@ -1,14 +1,7 @@
-import { createLogger } from '@sim/logger'
-import type { ToolCall, TraceSpan } from '@/lib/logs/types'
-import {
- isConditionBlockType,
- isWorkflowBlockType,
- stripCustomToolPrefix,
-} from '@/executor/constants'
-import type { ExecutionResult } from '@/executor/types'
-import { stripCloneSuffixes } from '@/executor/utils/subflow-utils'
-
-const logger = createLogger('TraceSpans')
+import { groupIterationBlocks } from '@/lib/logs/execution/trace-spans/iteration-grouping'
+import { createSpanFromLog } from '@/lib/logs/execution/trace-spans/span-factory'
+import type { TraceSpan } from '@/lib/logs/types'
+import type { BlockLog, ExecutionResult } from '@/executor/types'
/**
* Keys that should be recursively filtered from output display.
@@ -43,820 +36,95 @@ export function filterHiddenOutputKeys(value: unknown): unknown {
return value
}
-function isSyntheticWorkflowWrapper(span: TraceSpan | undefined): boolean {
- if (!span || span.type !== 'workflow') return false
- return !span.blockId
-}
-
-function flattenWorkflowChildren(spans: TraceSpan[]): TraceSpan[] {
- const flattened: TraceSpan[] = []
-
- spans.forEach((span) => {
- if (isSyntheticWorkflowWrapper(span)) {
- if (span.children && Array.isArray(span.children)) {
- flattened.push(...flattenWorkflowChildren(span.children))
- }
- return
- }
-
- const processedSpan: TraceSpan = { ...span }
-
- const directChildren = Array.isArray(span.children) ? span.children : []
- const outputChildren =
- span.output &&
- typeof span.output === 'object' &&
- Array.isArray((span.output as { childTraceSpans?: TraceSpan[] }).childTraceSpans)
- ? ((span.output as { childTraceSpans?: TraceSpan[] }).childTraceSpans as TraceSpan[])
- : []
-
- const allChildren = [...directChildren, ...outputChildren]
- if (allChildren.length > 0) {
- processedSpan.children = flattenWorkflowChildren(allChildren)
- }
-
- if (outputChildren.length > 0 && processedSpan.output) {
- const { childTraceSpans: _, ...cleanOutput } = processedSpan.output as {
- childTraceSpans?: TraceSpan[]
- } & Record
- processedSpan.output = cleanOutput
- }
-
- flattened.push(processedSpan)
- })
-
- return flattened
-}
-
+/**
+ * Builds a hierarchical trace span tree from execution logs.
+ *
+ * Pipeline:
+ * 1. Each BlockLog becomes a TraceSpan via `createSpanFromLog`.
+ * 2. Spans are sorted by start time to form a flat list of root spans.
+ * 3. Loop/parallel iterations are grouped into container spans via `groupIterationBlocks`.
+ * 4. A synthetic "Workflow Execution" root wraps the grouped spans and provides
+ * relative timestamps + total duration derived from the earliest start / latest end.
+ */
export function buildTraceSpans(result: ExecutionResult): {
traceSpans: TraceSpan[]
totalDuration: number
} {
- if (!result.logs || result.logs.length === 0) {
+ if (!result.logs?.length) {
return { traceSpans: [], totalDuration: 0 }
}
- const spanMap = new Map()
-
- const parentChildMap = new Map()
-
- type Connection = { source: string; target: string }
- const workflowConnections: Connection[] = result.metadata?.workflowConnections || []
- if (workflowConnections.length > 0) {
- workflowConnections.forEach((conn: Connection) => {
- if (conn.source && conn.target) {
- parentChildMap.set(conn.target, conn.source)
- }
- })
- }
-
- result.logs.forEach((log) => {
- if (!log.blockId || !log.blockType) return
-
- const spanId = `${log.blockId}-${new Date(log.startedAt).getTime()}`
- const isCondition = isConditionBlockType(log.blockType)
-
- const duration = log.durationMs || 0
-
- let output = log.output || {}
- let childWorkflowSnapshotId: string | undefined
- let childWorkflowId: string | undefined
-
- if (output && typeof output === 'object') {
- const outputRecord = output as Record
- childWorkflowSnapshotId =
- typeof outputRecord.childWorkflowSnapshotId === 'string'
- ? outputRecord.childWorkflowSnapshotId
- : undefined
- childWorkflowId =
- typeof outputRecord.childWorkflowId === 'string' ? outputRecord.childWorkflowId : undefined
- if (childWorkflowSnapshotId || childWorkflowId) {
- const {
- childWorkflowSnapshotId: _childSnapshotId,
- childWorkflowId: _childWorkflowId,
- ...outputRest
- } = outputRecord
- output = outputRest
- }
- }
-
- if (log.error) {
- output = {
- ...output,
- error: log.error,
- }
- }
-
- const displayName = log.blockName || log.blockId
-
- const span: TraceSpan = {
- id: spanId,
- name: displayName,
- type: log.blockType,
- duration: duration,
- startTime: log.startedAt,
- endTime: log.endedAt,
- status: log.error ? 'error' : 'success',
- children: [],
- blockId: log.blockId,
- input: log.input || {},
- output: output,
- ...(childWorkflowSnapshotId ? { childWorkflowSnapshotId } : {}),
- ...(childWorkflowId ? { childWorkflowId } : {}),
- ...(log.errorHandled && { errorHandled: true }),
- ...(log.loopId && { loopId: log.loopId }),
- ...(log.parallelId && { parallelId: log.parallelId }),
- ...(log.iterationIndex !== undefined && { iterationIndex: log.iterationIndex }),
- ...(log.parentIterations?.length && { parentIterations: log.parentIterations }),
- }
-
- if (!isCondition && log.output?.providerTiming) {
- const providerTiming = log.output.providerTiming as {
- duration: number
- startTime: string
- endTime: string
- timeSegments?: Array<{
- type: string
- name?: string
- startTime: string | number
- endTime: string | number
- duration: number
- }>
- }
-
- span.providerTiming = {
- duration: providerTiming.duration,
- startTime: providerTiming.startTime,
- endTime: providerTiming.endTime,
- segments: providerTiming.timeSegments || [],
- }
- }
-
- if (!isCondition && log.output?.cost) {
- span.cost = log.output.cost as {
- input?: number
- output?: number
- total?: number
- }
- }
-
- if (!isCondition && log.output?.tokens) {
- const t = log.output.tokens as
- | number
- | {
- input?: number
- output?: number
- total?: number
- prompt?: number
- completion?: number
- }
- if (typeof t === 'number') {
- span.tokens = t
- } else if (typeof t === 'object') {
- const input = t.input ?? t.prompt
- const output = t.output ?? t.completion
- const total =
- t.total ??
- (typeof input === 'number' || typeof output === 'number'
- ? (input || 0) + (output || 0)
- : undefined)
- span.tokens = {
- ...(typeof input === 'number' ? { input } : {}),
- ...(typeof output === 'number' ? { output } : {}),
- ...(typeof total === 'number' ? { total } : {}),
- }
- } else {
- span.tokens = t
- }
- }
-
- if (!isCondition && log.output?.model) {
- span.model = log.output.model as string
- }
-
- if (
- !isWorkflowBlockType(log.blockType) &&
- !isCondition &&
- log.output?.providerTiming?.timeSegments &&
- Array.isArray(log.output.providerTiming.timeSegments)
- ) {
- const timeSegments = log.output.providerTiming.timeSegments
- const toolCallsData = log.output?.toolCalls?.list || log.output?.toolCalls || []
-
- const toolCallsByName = new Map>>()
- for (const tc of toolCallsData as Array<{ name?: string; [key: string]: unknown }>) {
- const normalizedName = stripCustomToolPrefix(tc.name || '')
- if (!toolCallsByName.has(normalizedName)) {
- toolCallsByName.set(normalizedName, [])
- }
- toolCallsByName.get(normalizedName)!.push(tc)
- }
-
- const toolCallIndices = new Map()
-
- span.children = timeSegments.map(
- (
- segment: {
- type: string
- name?: string
- startTime: string | number
- endTime: string | number
- duration: number
- },
- index: number
- ) => {
- const segmentStartTime = new Date(segment.startTime).toISOString()
- let segmentEndTime = new Date(segment.endTime).toISOString()
- let segmentDuration = segment.duration
-
- if (segment.name?.toLowerCase().includes('streaming') && log.endedAt) {
- const blockEndTime = new Date(log.endedAt).getTime()
- const segmentEndTimeMs = new Date(segment.endTime).getTime()
-
- if (blockEndTime > segmentEndTimeMs) {
- segmentEndTime = log.endedAt
- segmentDuration = blockEndTime - new Date(segment.startTime).getTime()
- }
- }
-
- if (segment.type === 'tool') {
- const normalizedName = stripCustomToolPrefix(segment.name || '')
-
- const toolCallsForName = toolCallsByName.get(normalizedName) || []
- const currentIndex = toolCallIndices.get(normalizedName) || 0
- const matchingToolCall = toolCallsForName[currentIndex] as
- | {
- error?: string
- arguments?: Record
- input?: Record
- result?: Record
- output?: Record
- }
- | undefined
-
- toolCallIndices.set(normalizedName, currentIndex + 1)
-
- return {
- id: `${span.id}-segment-${index}`,
- name: normalizedName,
- type: 'tool',
- duration: segment.duration,
- startTime: segmentStartTime,
- endTime: segmentEndTime,
- status: matchingToolCall?.error ? 'error' : 'success',
- input: matchingToolCall?.arguments || matchingToolCall?.input,
- output: matchingToolCall?.error
- ? {
- error: matchingToolCall.error,
- ...(matchingToolCall.result || matchingToolCall.output || {}),
- }
- : matchingToolCall?.result || matchingToolCall?.output,
- }
- }
- return {
- id: `${span.id}-segment-${index}`,
- name: segment.name,
- type: 'model',
- duration: segmentDuration,
- startTime: segmentStartTime,
- endTime: segmentEndTime,
- status: 'success',
- }
- }
- )
- } else if (!isCondition) {
- let toolCallsList = null
-
- try {
- if (log.output?.toolCalls?.list) {
- toolCallsList = log.output.toolCalls.list
- } else if (Array.isArray(log.output?.toolCalls)) {
- toolCallsList = log.output.toolCalls
- } else if (log.output?.executionData?.output?.toolCalls) {
- const tcObj = log.output.executionData.output.toolCalls
- toolCallsList = Array.isArray(tcObj) ? tcObj : tcObj.list || []
- }
-
- if (toolCallsList && !Array.isArray(toolCallsList)) {
- logger.warn(`toolCallsList is not an array: ${typeof toolCallsList}`, {
- blockId: log.blockId,
- blockType: log.blockType,
- })
- toolCallsList = []
- }
- } catch (error) {
- logger.error(`Error extracting toolCalls from block ${log.blockId}:`, error)
- toolCallsList = []
- }
-
- if (toolCallsList && toolCallsList.length > 0) {
- const processedToolCalls: ToolCall[] = []
-
- for (const tc of toolCallsList as Array<{
- name?: string
- duration?: number
- startTime?: string
- endTime?: string
- error?: string
- arguments?: Record
- input?: Record
- result?: Record
- output?: Record
- }>) {
- if (!tc) continue
-
- try {
- const toolCall: ToolCall = {
- name: stripCustomToolPrefix(tc.name || 'unnamed-tool'),
- duration: tc.duration || 0,
- startTime: tc.startTime || log.startedAt,
- endTime: tc.endTime || log.endedAt,
- status: tc.error ? 'error' : 'success',
- }
-
- if (tc.arguments || tc.input) {
- toolCall.input = tc.arguments || tc.input
- }
-
- if (tc.result || tc.output) {
- toolCall.output = tc.result || tc.output
- }
-
- if (tc.error) {
- toolCall.error = tc.error
- }
-
- processedToolCalls.push(toolCall)
- } catch (tcError) {
- logger.error(`Error processing tool call in block ${log.blockId}:`, tcError)
- }
- }
-
- span.toolCalls = processedToolCalls
- }
- }
-
- if (isWorkflowBlockType(log.blockType)) {
- const childTraceSpans = Array.isArray(log.childTraceSpans)
- ? log.childTraceSpans
- : Array.isArray(log.output?.childTraceSpans)
- ? (log.output.childTraceSpans as TraceSpan[])
- : null
-
- if (childTraceSpans) {
- const flattenedChildren = flattenWorkflowChildren(childTraceSpans)
- span.children = flattenedChildren
-
- if (span.output && typeof span.output === 'object' && 'childTraceSpans' in span.output) {
- const { childTraceSpans: _, ...cleanOutput } = span.output as {
- childTraceSpans?: TraceSpan[]
- } & Record
- span.output = cleanOutput
- }
- }
- }
-
- spanMap.set(spanId, span)
- })
-
- const sortedLogs = [...result.logs].sort((a, b) => {
- const aTime = new Date(a.startedAt).getTime()
- const bTime = new Date(b.startedAt).getTime()
- return aTime - bTime
- })
-
- const rootSpans: TraceSpan[] = []
-
- sortedLogs.forEach((log) => {
- if (!log.blockId) return
-
- const spanId = `${log.blockId}-${new Date(log.startedAt).getTime()}`
- const span = spanMap.get(spanId)
- if (span) {
- rootSpans.push(span)
- }
- })
-
- if (rootSpans.length === 0 && workflowConnections.length === 0) {
- const spanStack: TraceSpan[] = []
-
- sortedLogs.forEach((log) => {
- if (!log.blockId || !log.blockType) return
-
- const spanId = `${log.blockId}-${new Date(log.startedAt).getTime()}`
- const span = spanMap.get(spanId)
- if (!span) return
-
- if (spanStack.length > 0) {
- const potentialParent = spanStack[spanStack.length - 1]
- const parentStartTime = new Date(potentialParent.startTime).getTime()
- const parentEndTime = new Date(potentialParent.endTime).getTime()
- const spanStartTime = new Date(span.startTime).getTime()
-
- if (spanStartTime >= parentStartTime && spanStartTime <= parentEndTime) {
- if (!potentialParent.children) potentialParent.children = []
- potentialParent.children.push(span)
- } else {
- while (
- spanStack.length > 0 &&
- new Date(spanStack[spanStack.length - 1].endTime).getTime() < spanStartTime
- ) {
- spanStack.pop()
- }
+ const spans = buildRootSpansFromLogs(result.logs)
+ const grouped = groupIterationBlocks(spans)
- if (spanStack.length > 0) {
- const newParent = spanStack[spanStack.length - 1]
- if (!newParent.children) newParent.children = []
- newParent.children.push(span)
- } else {
- rootSpans.push(span)
- }
- }
- } else {
- rootSpans.push(span)
- }
-
- if (log.blockType === 'agent' || isWorkflowBlockType(log.blockType)) {
- spanStack.push(span)
- }
- })
+ if (grouped.length === 0 || !result.metadata) {
+ const totalDuration = grouped.reduce((sum, span) => sum + span.duration, 0)
+ return { traceSpans: grouped, totalDuration }
}
- const groupedRootSpans = groupIterationBlocks(rootSpans)
-
- const totalDuration = groupedRootSpans.reduce((sum, span) => sum + span.duration, 0)
-
- if (groupedRootSpans.length > 0 && result.metadata) {
- const allSpansList = Array.from(spanMap.values())
-
- const earliestStart = allSpansList.reduce((earliest, span) => {
- const startTime = new Date(span.startTime).getTime()
- return startTime < earliest ? startTime : earliest
- }, Number.POSITIVE_INFINITY)
-
- const latestEnd = allSpansList.reduce((latest, span) => {
- const endTime = new Date(span.endTime).getTime()
- return endTime > latest ? endTime : latest
- }, 0)
-
- const actualWorkflowDuration = latestEnd - earliestStart
-
- const addRelativeTimestamps = (spans: TraceSpan[], workflowStartMs: number) => {
- spans.forEach((span) => {
- span.relativeStartMs = new Date(span.startTime).getTime() - workflowStartMs
- if (span.children && span.children.length > 0) {
- addRelativeTimestamps(span.children, workflowStartMs)
- }
- })
- }
- addRelativeTimestamps(groupedRootSpans, earliestStart)
-
- const checkForUnhandledErrors = (s: TraceSpan): boolean => {
- if (s.status === 'error' && !s.errorHandled) return true
- return s.children ? s.children.some(checkForUnhandledErrors) : false
- }
- const hasUnhandledErrors = groupedRootSpans.some(checkForUnhandledErrors)
-
- const workflowSpan: TraceSpan = {
- id: 'workflow-execution',
- name: 'Workflow Execution',
- type: 'workflow',
- duration: actualWorkflowDuration, // Always use actual duration for the span
- startTime: new Date(earliestStart).toISOString(),
- endTime: new Date(latestEnd).toISOString(),
- status: hasUnhandledErrors ? 'error' : 'success',
- children: groupedRootSpans,
- }
+ return wrapInWorkflowRoot(grouped, spans)
+}
- return { traceSpans: [workflowSpan], totalDuration: actualWorkflowDuration }
+/** Converts each BlockLog into a TraceSpan, sorted chronologically by start time. */
+function buildRootSpansFromLogs(logs: BlockLog[]): TraceSpan[] {
+ const spans: TraceSpan[] = []
+ for (const log of logs) {
+ const span = createSpanFromLog(log)
+ if (span) spans.push(span)
}
-
- return { traceSpans: groupedRootSpans, totalDuration }
+ spans.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
+ return spans
}
/**
- * Builds a container-level TraceSpan (iteration wrapper or top-level container)
- * from its source spans and resolved children.
+ * Wraps grouped spans in a synthetic workflow-execution root span using the
+ * true workflow bounds (earliest start / latest end across all leaf spans).
*/
-function buildContainerSpan(opts: {
- id: string
- name: string
- type: string
- sourceSpans: TraceSpan[]
- children: TraceSpan[]
-}): TraceSpan {
- const startTimes = opts.sourceSpans.map((s) => new Date(s.startTime).getTime())
- const endTimes = opts.sourceSpans.map((s) => new Date(s.endTime).getTime())
- const earliestStart = Math.min(...startTimes)
- const latestEnd = Math.max(...endTimes)
-
- const hasErrors = opts.sourceSpans.some((s) => s.status === 'error')
- const allErrorsHandled =
- hasErrors && opts.children.every((s) => s.status !== 'error' || s.errorHandled)
-
- return {
- id: opts.id,
- name: opts.name,
- type: opts.type,
- duration: latestEnd - earliestStart,
+function wrapInWorkflowRoot(
+ grouped: TraceSpan[],
+ leafSpans: TraceSpan[]
+): { traceSpans: TraceSpan[]; totalDuration: number } {
+ let earliestStart = Number.POSITIVE_INFINITY
+ let latestEnd = 0
+ for (const span of leafSpans) {
+ const startTime = new Date(span.startTime).getTime()
+ const endTime = new Date(span.endTime).getTime()
+ if (startTime < earliestStart) earliestStart = startTime
+ if (endTime > latestEnd) latestEnd = endTime
+ }
+
+ const actualWorkflowDuration = latestEnd - earliestStart
+ addRelativeTimestamps(grouped, earliestStart)
+
+ const totalCost = leafSpans.reduce((sum, s) => sum + (s.cost?.total ?? 0), 0)
+
+ const workflowSpan: TraceSpan = {
+ id: 'workflow-execution',
+ name: 'Workflow Execution',
+ type: 'workflow',
+ duration: actualWorkflowDuration,
startTime: new Date(earliestStart).toISOString(),
endTime: new Date(latestEnd).toISOString(),
- status: hasErrors ? 'error' : 'success',
- ...(allErrorsHandled && { errorHandled: true }),
- children: opts.children,
+ status: grouped.some(hasUnhandledError) ? 'error' : 'success',
+ children: grouped,
+ ...(totalCost > 0 && { cost: { total: totalCost } }),
}
-}
-/** Counter state for generating sequential container names. */
-interface ContainerNameCounters {
- loopNumbers: Map
- parallelNumbers: Map
- loopCounter: number
- parallelCounter: number
+ return { traceSpans: [workflowSpan], totalDuration: actualWorkflowDuration }
}
-/**
- * Resolves a container name from normal (non-iteration) spans or assigns a sequential number.
- * Strips clone suffixes so all clones of the same container share one name/number.
- */
-function resolveContainerName(
- containerId: string,
- containerType: 'parallel' | 'loop',
- normalSpans: TraceSpan[],
- counters: ContainerNameCounters
-): string {
- const originalId = stripCloneSuffixes(containerId)
-
- const matchingBlock = normalSpans.find(
- (s) => s.blockId === originalId && s.type === containerType
- )
- if (matchingBlock?.name) return matchingBlock.name
-
- if (containerType === 'parallel') {
- if (!counters.parallelNumbers.has(originalId)) {
- counters.parallelNumbers.set(originalId, counters.parallelCounter++)
- }
- return `Parallel ${counters.parallelNumbers.get(originalId)}`
- }
- if (!counters.loopNumbers.has(originalId)) {
- counters.loopNumbers.set(originalId, counters.loopCounter++)
- }
- return `Loop ${counters.loopNumbers.get(originalId)}`
-}
-
-/**
- * Classifies a span's immediate container ID and type from its metadata.
- * Returns undefined for non-iteration spans.
- */
-function classifySpanContainer(
- span: TraceSpan
-): { containerId: string; containerType: 'parallel' | 'loop' } | undefined {
- if (span.parallelId) {
- return { containerId: span.parallelId, containerType: 'parallel' }
- }
- if (span.loopId) {
- return { containerId: span.loopId, containerType: 'loop' }
- }
- // Fallback: parse from blockId for legacy data
- if (span.blockId?.includes('_parallel_')) {
- const match = span.blockId.match(/_parallel_([^_]+)_iteration_/)
- if (match) {
- return { containerId: match[1], containerType: 'parallel' }
- }
- }
- return undefined
-}
-
-/**
- * Finds the outermost container for a span. For nested spans, this is parentIterations[0].
- * For flat spans, this is the span's own immediate container.
- */
-function getOutermostContainer(
- span: TraceSpan
-): { containerId: string; containerType: 'parallel' | 'loop' } | undefined {
- if (span.parentIterations && span.parentIterations.length > 0) {
- const outermost = span.parentIterations[0]
- return {
- containerId: outermost.iterationContainerId,
- containerType: outermost.iterationType as 'parallel' | 'loop',
- }
- }
- return classifySpanContainer(span)
-}
-
-/**
- * Builds the iteration-level hierarchy for a container, recursively nesting
- * any deeper subflows. Works with both:
- * - Direct spans (spans whose immediate container matches)
- * - Nested spans (spans with parentIterations pointing through this container)
- */
-function buildContainerChildren(
- containerType: 'parallel' | 'loop',
- containerId: string,
- spans: TraceSpan[],
- normalSpans: TraceSpan[],
- counters: ContainerNameCounters
-): TraceSpan[] {
- const iterationType = containerType === 'parallel' ? 'parallel-iteration' : 'loop-iteration'
-
- // Group spans by iteration index at this level.
- // Each span's iteration index at this level comes from:
- // - parentIterations[0].iterationCurrent if parentIterations[0].containerId === containerId
- // - span.iterationIndex if span's immediate container === containerId
- const iterationGroups = new Map()
-
- for (const span of spans) {
- let iterIdx: number | undefined
-
- if (
- span.parentIterations &&
- span.parentIterations.length > 0 &&
- span.parentIterations[0].iterationContainerId === containerId
- ) {
- iterIdx = span.parentIterations[0].iterationCurrent
- } else {
- // The span's immediate container is this container
- iterIdx = span.iterationIndex
- }
-
- if (iterIdx === undefined) continue
-
- if (!iterationGroups.has(iterIdx)) iterationGroups.set(iterIdx, [])
- iterationGroups.get(iterIdx)!.push(span)
- }
-
- const iterationChildren: TraceSpan[] = []
- const sortedIterations = Array.from(iterationGroups.entries()).sort(([a], [b]) => a - b)
-
- for (const [iterationIndex, iterSpans] of sortedIterations) {
- // For each span in this iteration, strip one level of ancestry and determine
- // whether it belongs to this container directly or to a deeper subflow
- const directLeaves: TraceSpan[] = []
- const deeperSpans: TraceSpan[] = []
-
- for (const span of iterSpans) {
- if (
- span.parentIterations &&
- span.parentIterations.length > 0 &&
- span.parentIterations[0].iterationContainerId === containerId
- ) {
- // Strip the outermost parentIteration (this container level)
- deeperSpans.push({
- ...span,
- parentIterations: span.parentIterations.slice(1),
- })
- } else {
- // This span's immediate container IS this container — it's a direct leaf
- directLeaves.push({
- ...span,
- name: span.name.replace(/ \(iteration \d+\)$/, ''),
- })
- }
- }
-
- // Recursively group the deeper spans (they'll form nested containers)
- const nestedResult = groupIterationBlocksRecursive(
- [...directLeaves, ...deeperSpans],
- normalSpans,
- counters
- )
-
- iterationChildren.push(
- buildContainerSpan({
- id: `${containerId}-iteration-${iterationIndex}`,
- name: `Iteration ${iterationIndex}`,
- type: iterationType,
- sourceSpans: iterSpans,
- children: nestedResult,
- })
- )
- }
-
- return iterationChildren
-}
-
-/**
- * Core recursive algorithm for grouping iteration blocks.
- *
- * Handles two cases:
- * 1. **Flat** (backward compat): spans have loopId/parallelId + iterationIndex but no
- * parentIterations. Grouped by immediate container → iteration → leaf.
- * 2. **Nested** (new): spans have parentIterations chains. The outermost ancestor in the
- * chain determines the top-level container. Iteration spans are peeled one level at a
- * time and recursed.
- *
- * Container BlockLogs (parallel/loop) are produced on skip (empty collection), error, and
- * successful completion. When present, they supply the user-configured container name via
- * `resolveContainerName`; otherwise the container is synthesized from iteration data with a
- * counter-based fallback name.
- */
-function groupIterationBlocksRecursive(
- spans: TraceSpan[],
- normalSpans: TraceSpan[],
- counters: ContainerNameCounters
-): TraceSpan[] {
- const result: TraceSpan[] = []
- const iterationSpans: TraceSpan[] = []
- const nonIterationSpans: TraceSpan[] = []
-
+/** Recursively annotates spans with `relativeStartMs` (ms since workflow start). */
+function addRelativeTimestamps(spans: TraceSpan[], workflowStartMs: number): void {
for (const span of spans) {
- if (
- span.name.match(/^(.+) \(iteration (\d+)\)$/) ||
- (span.parentIterations && span.parentIterations.length > 0)
- ) {
- iterationSpans.push(span)
- } else {
- nonIterationSpans.push(span)
- }
- }
-
- const containerIdsWithIterations = new Set()
- for (const span of iterationSpans) {
- const outermost = getOutermostContainer(span)
- if (outermost) containerIdsWithIterations.add(outermost.containerId)
- }
-
- const nonContainerSpans = nonIterationSpans.filter(
- (span) =>
- (span.type !== 'parallel' && span.type !== 'loop') ||
- span.status === 'error' ||
- (span.blockId && !containerIdsWithIterations.has(span.blockId))
- )
-
- if (iterationSpans.length === 0) {
- result.push(...nonContainerSpans)
- result.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
- return result
- }
-
- // Group iteration spans by outermost container
- const containerGroups = new Map<
- string,
- { type: 'parallel' | 'loop'; containerId: string; containerName: string; spans: TraceSpan[] }
- >()
-
- for (const span of iterationSpans) {
- const outermost = getOutermostContainer(span)
- if (!outermost) continue
-
- const { containerId, containerType } = outermost
- const groupKey = `${containerType}_${containerId}`
-
- if (!containerGroups.has(groupKey)) {
- const containerName = resolveContainerName(containerId, containerType, normalSpans, counters)
- containerGroups.set(groupKey, {
- type: containerType,
- containerId,
- containerName,
- spans: [],
- })
+ span.relativeStartMs = new Date(span.startTime).getTime() - workflowStartMs
+ if (span.children?.length) {
+ addRelativeTimestamps(span.children, workflowStartMs)
}
- containerGroups.get(groupKey)!.spans.push(span)
- }
-
- // Build each container with recursive nesting
- for (const [, group] of containerGroups) {
- const { type, containerId, containerName, spans: containerSpans } = group
-
- const iterationChildren = buildContainerChildren(
- type,
- containerId,
- containerSpans,
- normalSpans,
- counters
- )
-
- result.push(
- buildContainerSpan({
- id: `${type === 'parallel' ? 'parallel' : 'loop'}-execution-${containerId}`,
- name: containerName,
- type,
- sourceSpans: containerSpans,
- children: iterationChildren,
- })
- )
}
-
- result.push(...nonContainerSpans)
- result.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
-
- return result
}
-/**
- * Groups iteration-based blocks (parallel and loop) by organizing their iteration spans
- * into a hierarchical structure with proper parent-child relationships.
- * Supports recursive nesting via parentIterations (e.g., parallel-in-parallel, loop-in-loop).
- *
- * @param spans - Array of root spans to process
- * @returns Array of spans with iteration blocks properly grouped
- */
-function groupIterationBlocks(spans: TraceSpan[]): TraceSpan[] {
- const normalSpans = spans.filter((s) => !s.name.match(/^(.+) \(iteration (\d+)\)$/))
- const counters: ContainerNameCounters = {
- loopNumbers: new Map(),
- parallelNumbers: new Map(),
- loopCounter: 1,
- parallelCounter: 1,
- }
- return groupIterationBlocksRecursive(spans, normalSpans, counters)
+/** True if this span (or any descendant) has an unhandled error. */
+function hasUnhandledError(span: TraceSpan): boolean {
+ if (span.status === 'error' && !span.errorHandled) return true
+ return span.children?.some(hasUnhandledError) ?? false
}
diff --git a/apps/sim/lib/logs/types.ts b/apps/sim/lib/logs/types.ts
index 20f568ab41c..e64fc91d56c 100644
--- a/apps/sim/lib/logs/types.ts
+++ b/apps/sim/lib/logs/types.ts
@@ -1,7 +1,13 @@
import type { Edge } from 'reactflow'
import type { AsyncExecutionCorrelation } from '@/lib/core/async-jobs/types'
import type { ParentIteration, SerializableExecutionState } from '@/executor/execution/types'
-import type { BlockLog, NormalizedBlockOutput } from '@/executor/types'
+import type {
+ BlockLog,
+ BlockTokens,
+ IterationToolCall,
+ NormalizedBlockOutput,
+ ProviderTimingSegment,
+} from '@/executor/types'
import type { Loop, Parallel, WorkflowState } from '@/stores/workflows/workflow/types'
export type { WorkflowState, Loop, Parallel }
@@ -149,6 +155,7 @@ export interface WorkflowExecutionLog {
>
executionState?: SerializableExecutionState
finalOutput?: any
+ workflowInput?: unknown
errorDetails?: {
blockId: string
blockName: string
@@ -179,25 +186,13 @@ export interface WorkflowExecutionLog {
export type WorkflowExecutionLogInsert = Omit
export type WorkflowExecutionLogSelect = WorkflowExecutionLog
-export interface TokenInfo {
- input?: number
- output?: number
- total?: number
- prompt?: number
- completion?: number
-}
+export type TokenInfo = BlockTokens
export interface ProviderTiming {
duration: number
startTime: string
endTime: string
- segments: Array<{
- type: string
- name?: string
- startTime: string | number
- endTime: string | number
- duration: number
- }>
+ segments: ProviderTimingSegment[]
}
export interface TraceSpan {
@@ -208,11 +203,15 @@ export interface TraceSpan {
startTime: string
endTime: string
children?: TraceSpan[]
+ /**
+ * @deprecated Tool invocations are emitted as `children` with `type: 'tool'`.
+ * This field only appears on legacy trace spans persisted before the unification.
+ */
toolCalls?: ToolCall[]
status?: 'success' | 'error'
/** Whether this block's error was handled by an error handler path */
errorHandled?: boolean
- tokens?: number | TokenInfo
+ tokens?: TokenInfo
relativeStartMs?: number
blockId?: string
input?: Record
@@ -230,6 +229,43 @@ export interface TraceSpan {
parallelId?: string
iterationIndex?: number
parentIterations?: ParentIteration[]
+ /**
+ * For model child spans: the assistant's thinking/reasoning blocks from this
+ * iteration, stringified. Surfaces Anthropic extended thinking and equivalents.
+ */
+ thinking?: string
+ /**
+ * For model child spans: the tool calls the assistant requested in this
+ * iteration. `id` is the provider-assigned `tool_call.id`, used to correlate
+ * the following tool child span via its `toolCallId` field.
+ */
+ modelToolCalls?: IterationToolCall[]
+ /**
+ * For model child spans: the provider-reported stop reason
+ * (`stop`, `tool_use`, `length`, …).
+ */
+ finishReason?: string
+ /**
+ * For tool child spans: the `tool_call.id` this tool invocation satisfies.
+ * Matches one of the preceding model child's `modelToolCalls[i].id`.
+ */
+ toolCallId?: string
+ /**
+ * For model child spans: time-to-first-token in ms (streaming runs only).
+ */
+ ttft?: number
+ /**
+ * For model child spans: the provider system identifier
+ * (`anthropic`, `openai`, `gemini`, …) — aligns with OTel `gen_ai.system`.
+ */
+ provider?: string
+ /**
+ * For failed child spans: structured error class
+ * (e.g. `rate_limit`, `context_length`).
+ */
+ errorType?: string
+ /** For failed child spans: human-readable error message. */
+ errorMessage?: string
}
export interface WorkflowExecutionSummary {
diff --git a/apps/sim/lib/tokenization/streaming.ts b/apps/sim/lib/tokenization/streaming.ts
index 047fd0b8b38..ca552fa8292 100644
--- a/apps/sim/lib/tokenization/streaming.ts
+++ b/apps/sim/lib/tokenization/streaming.ts
@@ -49,13 +49,19 @@ export function processStreamingBlockLog(log: BlockLog, streamedContent: string)
const inputText = extractTextContent(log.input)
// Calculate streaming cost
+ const systemPrompt =
+ typeof log.input?.systemPrompt === 'string' ? log.input.systemPrompt : undefined
+ const context = typeof log.input?.context === 'string' ? log.input.context : undefined
+ const messages = Array.isArray(log.input?.messages)
+ ? (log.input.messages as Array<{ role: string; content: string }>)
+ : undefined
const result = calculateStreamingCost(
model,
inputText,
streamedContent,
- log.input?.systemPrompt,
- log.input?.context,
- log.input?.messages
+ systemPrompt,
+ context,
+ messages
)
// Update the log output with tokenization data
@@ -102,8 +108,9 @@ function getModelForBlock(log: BlockLog): string {
}
// Try to get model from input
- if (log.input?.model?.trim()) {
- return log.input.model
+ const inputModel = log.input?.model
+ if (typeof inputModel === 'string' && inputModel.trim()) {
+ return inputModel
}
// Use block type specific defaults
diff --git a/apps/sim/lib/tokenization/utils.ts b/apps/sim/lib/tokenization/utils.ts
index e3c3c3287d0..72bcf9ac420 100644
--- a/apps/sim/lib/tokenization/utils.ts
+++ b/apps/sim/lib/tokenization/utils.ts
@@ -11,6 +11,7 @@ import {
} from '@/lib/tokenization/constants'
import { createTokenizationError } from '@/lib/tokenization/errors'
import type { ProviderTokenizationConfig, TokenUsage } from '@/lib/tokenization/types'
+import type { BlockTokens } from '@/executor/types'
import { getProviderFromModel } from '@/providers/utils'
const logger = createLogger('TokenizationUtils')
@@ -56,9 +57,11 @@ export function isTokenizableBlockType(blockType?: string): boolean {
/**
* Checks if tokens/cost data is meaningful (non-zero)
*/
-export function hasRealTokenData(tokens?: TokenUsage): boolean {
+export function hasRealTokenData(
+ tokens?: Pick
+): boolean {
if (!tokens) return false
- return tokens.total > 0 || tokens.input > 0 || tokens.output > 0
+ return (tokens.total ?? 0) > 0 || (tokens.input ?? 0) > 0 || (tokens.output ?? 0) > 0
}
/**
diff --git a/apps/sim/providers/anthropic/core.ts b/apps/sim/providers/anthropic/core.ts
index c51d1420188..bda5c2f6f4a 100644
--- a/apps/sim/providers/anthropic/core.ts
+++ b/apps/sim/providers/anthropic/core.ts
@@ -3,7 +3,7 @@ import { transformJSONSchema } from '@anthropic-ai/sdk/lib/transform-json-schema
import type { RawMessageStreamEvent } from '@anthropic-ai/sdk/resources/messages/messages'
import type { Logger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
-import type { StreamingExecution } from '@/executor/types'
+import type { BlockTokens, IterationToolCall, StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import {
checkForForcedToolUsage,
@@ -15,6 +15,7 @@ import {
supportsNativeStructuredOutputs,
supportsTemperature,
} from '@/providers/models'
+import { enrichLastModelSegment } from '@/providers/trace-enrichment'
import type { ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
import { ProviderError } from '@/providers/types'
import {
@@ -446,7 +447,7 @@ export async function executeAnthropicProviderRequest(
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -516,7 +517,7 @@ export async function executeAnthropicProviderRequest(
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -546,6 +547,11 @@ export async function executeAnthropicProviderRequest(
}
const toolUses = currentResponse.content.filter((item) => item.type === 'tool_use')
+
+ enrichLastModelSegmentFromAnthropicResponse(timeSegments, currentResponse, textContent, {
+ model: request.model,
+ })
+
if (!toolUses || toolUses.length === 0) {
break
}
@@ -622,6 +628,7 @@ export async function executeAnthropicProviderRequest(
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolUse.id,
})
let resultContent: unknown
@@ -751,7 +758,7 @@ export async function executeAnthropicProviderRequest(
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -768,6 +775,16 @@ export async function executeAnthropicProviderRequest(
iterationCount++
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ const trailingText = currentResponse.content
+ .filter((item) => item.type === 'text')
+ .map((item) => item.text)
+ .join('\n')
+ enrichLastModelSegmentFromAnthropicResponse(timeSegments, currentResponse, trailingText, {
+ model: request.model,
+ })
+ }
} catch (error) {
logger.error(`Error in ${providerLabel} request:`, { error })
throw error
@@ -930,7 +947,7 @@ export async function executeAnthropicProviderRequest(
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -960,6 +977,11 @@ export async function executeAnthropicProviderRequest(
}
const toolUses = currentResponse.content.filter((item) => item.type === 'tool_use')
+
+ enrichLastModelSegmentFromAnthropicResponse(timeSegments, currentResponse, textContent, {
+ model: request.model,
+ })
+
if (!toolUses || toolUses.length === 0) {
break
}
@@ -1038,6 +1060,7 @@ export async function executeAnthropicProviderRequest(
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolUseId,
})
let resultContent: unknown
@@ -1165,7 +1188,7 @@ export async function executeAnthropicProviderRequest(
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -1191,6 +1214,16 @@ export async function executeAnthropicProviderRequest(
iterationCount++
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ const trailingText = currentResponse.content
+ .filter((item) => item.type === 'text')
+ .map((item) => item.text)
+ .join('\n')
+ enrichLastModelSegmentFromAnthropicResponse(timeSegments, currentResponse, trailingText, {
+ model: request.model,
+ })
+ }
} catch (error) {
logger.error(`Error in ${providerLabel} request:`, { error })
throw error
@@ -1336,3 +1369,87 @@ export async function executeAnthropicProviderRequest(
})
}
}
+
+/**
+ * Enriches the last model segment with content from an Anthropic `Message`:
+ * assistant text, thinking/redacted_thinking blocks, tool_use calls (with IDs),
+ * stop_reason, and per-iteration tokens.
+ */
+function enrichLastModelSegmentFromAnthropicResponse(
+ timeSegments: TimeSegment[],
+ response: Anthropic.Messages.Message,
+ textContent: string,
+ extras?: {
+ model?: string
+ ttft?: number
+ errorType?: string
+ errorMessage?: string
+ }
+): void {
+ const thinkingBlocks = response.content.filter(
+ (item): item is Anthropic.Messages.ThinkingBlock | Anthropic.Messages.RedactedThinkingBlock =>
+ item.type === 'thinking' || item.type === 'redacted_thinking'
+ )
+ const thinkingContent = thinkingBlocks
+ .map((b) => (b.type === 'thinking' ? b.thinking : '[redacted]'))
+ .join('\n\n')
+
+ const toolUseBlocks = response.content.filter(
+ (item): item is Anthropic.Messages.ToolUseBlock => item.type === 'tool_use'
+ )
+ const toolCalls: IterationToolCall[] = toolUseBlocks.map((t) => ({
+ id: t.id,
+ name: t.name,
+ arguments:
+ t.input && typeof t.input === 'object' && !Array.isArray(t.input)
+ ? (t.input as Record)
+ : {},
+ }))
+
+ const segmentTokens = response.usage ? buildAnthropicSegmentTokens(response.usage) : undefined
+
+ let cost: { input: number; output: number; total: number } | undefined
+ if (
+ extras?.model &&
+ segmentTokens &&
+ typeof segmentTokens.input === 'number' &&
+ typeof segmentTokens.output === 'number'
+ ) {
+ const useCached = (segmentTokens.cacheRead ?? 0) > 0
+ const full = calculateCost(extras.model, segmentTokens.input, segmentTokens.output, useCached)
+ cost = { input: full.input, output: full.output, total: full.total }
+ }
+
+ enrichLastModelSegment(timeSegments, {
+ assistantContent: textContent || undefined,
+ thinkingContent: thinkingContent || undefined,
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+ finishReason: response.stop_reason ?? undefined,
+ tokens: segmentTokens,
+ cost,
+ provider: 'anthropic',
+ ttft: extras?.ttft,
+ errorType: extras?.errorType,
+ errorMessage: extras?.errorMessage,
+ })
+}
+
+/**
+ * Builds a segment token breakdown from Anthropic usage data, surfacing prompt
+ * cache reads/writes separately and producing a corrected `total` that includes
+ * cache_creation tokens (which Anthropic bills as input tokens but omits from
+ * `input_tokens`).
+ */
+function buildAnthropicSegmentTokens(usage: Anthropic.Messages.Message['usage']): BlockTokens {
+ const input = usage.input_tokens ?? 0
+ const output = usage.output_tokens ?? 0
+ const cacheRead = usage.cache_read_input_tokens ?? 0
+ const cacheWrite = usage.cache_creation_input_tokens ?? 0
+ return {
+ input,
+ output,
+ total: input + output + cacheRead + cacheWrite,
+ ...(cacheRead > 0 && { cacheRead }),
+ ...(cacheWrite > 0 && { cacheWrite }),
+ }
+}
diff --git a/apps/sim/providers/azure-openai/index.ts b/apps/sim/providers/azure-openai/index.ts
index d60354c77af..a5c9fcd633f 100644
--- a/apps/sim/providers/azure-openai/index.ts
+++ b/apps/sim/providers/azure-openai/index.ts
@@ -25,6 +25,7 @@ import {
} from '@/providers/azure-openai/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
import { executeResponsesProviderRequest } from '@/providers/openai/core'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
FunctionCallResponse,
ProviderConfig,
@@ -223,7 +224,7 @@ async function executeChatCompletionsRequest(
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -272,13 +273,20 @@ async function executeChatCompletionsRequest(
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
},
]
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'azure_openai' }
+ )
+
const firstCheckResult = checkForForcedToolUsage(
currentResponse,
originalToolChoice ?? 'auto',
@@ -450,12 +458,19 @@ async function executeChatCompletionsRequest(
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
})
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'azure_openai' }
+ )
+
modelTime += thisModelTime
if (currentResponse.choices[0]?.message?.content) {
diff --git a/apps/sim/providers/bedrock/index.ts b/apps/sim/providers/bedrock/index.ts
index f054d781999..31c8d14cfc6 100644
--- a/apps/sim/providers/bedrock/index.ts
+++ b/apps/sim/providers/bedrock/index.ts
@@ -5,6 +5,7 @@ import {
type ContentBlock,
type ConversationRole,
ConverseCommand,
+ type ConverseResponse,
ConverseStreamCommand,
type SystemContentBlock,
type Tool,
@@ -14,7 +15,7 @@ import {
} from '@aws-sdk/client-bedrock-runtime'
import { createLogger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
-import type { StreamingExecution } from '@/executor/types'
+import type { IterationToolCall, StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import {
checkForForcedToolUsage,
@@ -23,6 +24,7 @@ import {
getBedrockInferenceProfileId,
} from '@/providers/bedrock/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegment } from '@/providers/trace-enrichment'
import type {
FunctionCallResponse,
ProviderConfig,
@@ -41,6 +43,62 @@ import { executeTool } from '@/tools'
const logger = createLogger('BedrockProvider')
+function enrichLastModelSegmentFromBedrockResponse(
+ timeSegments: TimeSegment[],
+ response: ConverseResponse,
+ extras: { model: string }
+): void {
+ const blocks: ContentBlock[] = response.output?.message?.content ?? []
+
+ const assistantText = blocks
+ .filter((b): b is ContentBlock & { text: string } => 'text' in b && typeof b.text === 'string')
+ .map((b) => b.text)
+ .join('\n')
+ const assistantContent = assistantText.length > 0 ? assistantText : undefined
+
+ const toolCalls: IterationToolCall[] = blocks
+ .filter((b): b is ContentBlock & { toolUse: ToolUseBlock } => 'toolUse' in b && !!b.toolUse)
+ .map((b) => {
+ const input = b.toolUse.input
+ return {
+ id: b.toolUse.toolUseId ?? '',
+ name: b.toolUse.name ?? '',
+ arguments:
+ input && typeof input === 'object' && !Array.isArray(input)
+ ? (input as Record)
+ : {},
+ }
+ })
+
+ const inputTokens = response.usage?.inputTokens
+ const outputTokens = response.usage?.outputTokens
+
+ let cost: { input: number; output: number; total: number } | undefined
+ if (typeof inputTokens === 'number' && typeof outputTokens === 'number') {
+ const full = calculateCost(extras.model, inputTokens, outputTokens)
+ cost = { input: full.input, output: full.output, total: full.total }
+ }
+
+ enrichLastModelSegment(timeSegments, {
+ assistantContent,
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+ finishReason: response.stopReason ?? undefined,
+ tokens:
+ inputTokens !== undefined || outputTokens !== undefined
+ ? {
+ input: inputTokens,
+ output: outputTokens,
+ total:
+ typeof inputTokens === 'number' && typeof outputTokens === 'number'
+ ? inputTokens + outputTokens
+ : undefined,
+ }
+ : undefined,
+ cost,
+ provider: 'aws.bedrock',
+ })
+}
+
export const bedrockProvider: ProviderConfig = {
id: 'bedrock',
name: 'AWS Bedrock',
@@ -345,7 +403,7 @@ export const bedrockProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -444,13 +502,17 @@ export const bedrockProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
},
]
+ enrichLastModelSegmentFromBedrockResponse(timeSegments, currentResponse, {
+ model: request.model,
+ })
+
const initialToolUseContentBlocks = (currentResponse.output?.message?.content || []).filter(
(block): block is ContentBlock & { toolUse: ToolUseBlock } => 'toolUse' in block
)
@@ -668,12 +730,16 @@ export const bedrockProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
})
+ enrichLastModelSegmentFromBedrockResponse(timeSegments, currentResponse, {
+ model: request.model,
+ })
+
modelTime += thisModelTime
if (currentResponse.usage) {
@@ -725,6 +791,10 @@ export const bedrockProvider: ProviderConfig = {
duration: structuredOutputEndTime - structuredOutputStartTime,
})
+ enrichLastModelSegmentFromBedrockResponse(timeSegments, structuredResponse, {
+ model: request.model,
+ })
+
modelTime += structuredOutputEndTime - structuredOutputStartTime
const structuredOutputCall = structuredResponse.output?.message?.content?.find(
diff --git a/apps/sim/providers/cerebras/index.ts b/apps/sim/providers/cerebras/index.ts
index 2bdfcdc1722..fe6f0bba76c 100644
--- a/apps/sim/providers/cerebras/index.ts
+++ b/apps/sim/providers/cerebras/index.ts
@@ -6,6 +6,7 @@ import { MAX_TOOL_ITERATIONS } from '@/providers'
import type { CerebrasResponse } from '@/providers/cerebras/types'
import { createReadableStreamFromCerebrasStream } from '@/providers/cerebras/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
ProviderConfig,
ProviderRequest,
@@ -161,7 +162,7 @@ export const cerebrasProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -206,7 +207,7 @@ export const cerebrasProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -219,6 +220,13 @@ export const cerebrasProvider: ProviderConfig = {
while (iterationCount < MAX_TOOL_ITERATIONS) {
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'cerebras' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
if (currentResponse.choices[0]?.message?.content) {
content = currentResponse.choices[0].message.content
@@ -313,6 +321,7 @@ export const cerebrasProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
if (result.success && result.output) {
@@ -382,7 +391,7 @@ export const cerebrasProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: 'Final response',
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -399,6 +408,13 @@ export const cerebrasProvider: ProviderConfig = {
tokens.total += finalResponse.usage.total_tokens || 0
}
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ finalResponse,
+ finalResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'cerebras' }
+ )
+
break
}
@@ -419,7 +435,7 @@ export const cerebrasProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -435,6 +451,15 @@ export const cerebrasProvider: ProviderConfig = {
iterationCount++
}
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'cerebras' }
+ )
+ }
} catch (error) {
logger.error('Error in Cerebras tool processing:', { error })
}
@@ -564,3 +589,8 @@ export const cerebrasProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/deepseek/index.ts b/apps/sim/providers/deepseek/index.ts
index bd4abf1ace4..6f5c0612e3d 100644
--- a/apps/sim/providers/deepseek/index.ts
+++ b/apps/sim/providers/deepseek/index.ts
@@ -5,6 +5,7 @@ import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import { createReadableStreamFromDeepseekStream } from '@/providers/deepseek/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
ProviderConfig,
ProviderRequest,
@@ -161,7 +162,7 @@ export const deepseekProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -217,7 +218,7 @@ export const deepseekProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -248,6 +249,14 @@ export const deepseekProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'deepseek' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -324,6 +333,7 @@ export const deepseekProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -410,7 +420,7 @@ export const deepseekProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -432,6 +442,15 @@ export const deepseekProvider: ProviderConfig = {
iterationCount++
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'deepseek' }
+ )
+ }
} catch (error) {
logger.error('Error in Deepseek request:', { error })
}
diff --git a/apps/sim/providers/fireworks/index.ts b/apps/sim/providers/fireworks/index.ts
index 08d24584f96..6aa336ec7b9 100644
--- a/apps/sim/providers/fireworks/index.ts
+++ b/apps/sim/providers/fireworks/index.ts
@@ -10,6 +10,7 @@ import {
supportsNativeStructuredOutputs,
} from '@/providers/fireworks/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
FunctionCallResponse,
Message,
@@ -209,7 +210,7 @@ export const fireworksProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -257,7 +258,7 @@ export const fireworksProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -279,6 +280,14 @@ export const fireworksProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'fireworks' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -358,6 +367,7 @@ export const fireworksProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -423,7 +433,7 @@ export const fireworksProvider: ProviderConfig = {
const thisModelTime = nextModelEndTime - nextModelStartTime
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -440,6 +450,15 @@ export const fireworksProvider: ProviderConfig = {
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'fireworks' }
+ )
+ }
+
if (request.stream) {
const accumulatedCost = calculateCost(requestedModel, tokens.input, tokens.output)
@@ -572,6 +591,13 @@ export const fireworksProvider: ProviderConfig = {
tokens.output += finalResponse.usage.completion_tokens || 0
tokens.total += finalResponse.usage.total_tokens || 0
}
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ finalResponse,
+ finalResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'fireworks' }
+ )
}
const providerEndTime = Date.now()
@@ -622,3 +648,8 @@ export const fireworksProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/gemini/core.ts b/apps/sim/providers/gemini/core.ts
index 786975eabcc..e22baeda8e7 100644
--- a/apps/sim/providers/gemini/core.ts
+++ b/apps/sim/providers/gemini/core.ts
@@ -13,7 +13,7 @@ import {
} from '@google/genai'
import { createLogger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
-import type { StreamingExecution } from '@/executor/types'
+import type { IterationToolCall, StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import {
checkForForcedToolUsage,
@@ -26,7 +26,13 @@ import {
extractTextContent,
mapToThinkingLevel,
} from '@/providers/google/utils'
-import type { FunctionCallResponse, ProviderRequest, ProviderResponse } from '@/providers/types'
+import { enrichLastModelSegment } from '@/providers/trace-enrichment'
+import type {
+ FunctionCallResponse,
+ ProviderRequest,
+ ProviderResponse,
+ TimeSegment,
+} from '@/providers/types'
import {
calculateCost,
isDeepResearchModel,
@@ -71,7 +77,7 @@ function createInitialState(
timeSegments: [
{
type: 'model',
- name: 'Initial response',
+ name: model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -218,6 +224,7 @@ async function executeToolCallsBatch(
startTime: r.startTime,
endTime: r.endTime,
duration: r.duration,
+ toolCallId: r.part.functionCall?.id ?? undefined,
})
totalToolsTime += r.duration
@@ -279,7 +286,7 @@ function updateStateWithResponse(
...state.timeSegments,
{
type: 'model',
- name: `Model response (iteration ${state.iterationCount + 1})`,
+ name: model,
startTime,
endTime,
duration,
@@ -1074,6 +1081,9 @@ export async function executeGeminiRequest(
model,
toolConfig
)
+ enrichLastModelSegmentFromGeminiResponse(state.timeSegments, response, {
+ model,
+ })
const forcedTools = preparedTools?.forcedTools ?? []
let currentResponse = response
@@ -1122,6 +1132,9 @@ export async function executeGeminiRequest(
config: nextConfig,
})
state = updateStateWithResponse(state, checkResponse, model, Date.now() - 100, Date.now())
+ enrichLastModelSegmentFromGeminiResponse(state.timeSegments, checkResponse, {
+ model,
+ })
if (checkResponse.functionCalls?.length) {
currentResponse = checkResponse
@@ -1207,6 +1220,9 @@ export async function executeGeminiRequest(
config: nextConfig,
})
state = updateStateWithResponse(state, nextResponse, model, nextModelStartTime, Date.now())
+ enrichLastModelSegmentFromGeminiResponse(state.timeSegments, nextResponse, {
+ model,
+ })
currentResponse = nextResponse
}
@@ -1257,3 +1273,80 @@ export async function executeGeminiRequest(
throw enhancedError
}
}
+
+/**
+ * Enriches the last model segment with per-iteration content extracted from a
+ * Gemini response: assistant text, thinking (thought) parts, function calls,
+ * finish reason, and token usage.
+ */
+function enrichLastModelSegmentFromGeminiResponse(
+ timeSegments: TimeSegment[],
+ response: GenerateContentResponse,
+ extras?: {
+ model?: string
+ ttft?: number
+ errorType?: string
+ errorMessage?: string
+ }
+): void {
+ const candidate = response.candidates?.[0]
+ const assistantText = extractTextContent(candidate)
+
+ const thinkingParts =
+ candidate?.content?.parts?.filter((p): p is Part & { text: string } =>
+ Boolean(p.text && p.thought === true)
+ ) ?? []
+ const thinkingContent = thinkingParts.map((p) => p.text).join('\n\n')
+
+ const functionCallParts = extractAllFunctionCallParts(candidate)
+ const toolCalls: IterationToolCall[] = functionCallParts
+ .filter((p): p is Part & { functionCall: NonNullable } =>
+ Boolean(p.functionCall)
+ )
+ .map((p) => ({
+ id: p.functionCall.id ?? '',
+ name: p.functionCall.name ?? '',
+ arguments: (p.functionCall.args ?? {}) as Record,
+ }))
+
+ const usage = convertUsageMetadata(response.usageMetadata)
+ const cachedContentTokens = response.usageMetadata?.cachedContentTokenCount ?? 0
+ const thoughtsTokens = response.usageMetadata?.thoughtsTokenCount ?? 0
+
+ let cost: { input: number; output: number; total: number } | undefined
+ if (
+ extras?.model &&
+ response.usageMetadata &&
+ typeof usage.promptTokenCount === 'number' &&
+ typeof usage.candidatesTokenCount === 'number'
+ ) {
+ const full = calculateCost(
+ extras.model,
+ usage.promptTokenCount,
+ usage.candidatesTokenCount,
+ cachedContentTokens > 0
+ )
+ cost = { input: full.input, output: full.output, total: full.total }
+ }
+
+ enrichLastModelSegment(timeSegments, {
+ assistantContent: assistantText || undefined,
+ thinkingContent: thinkingContent || undefined,
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+ finishReason: candidate?.finishReason ?? undefined,
+ tokens: response.usageMetadata
+ ? {
+ input: usage.promptTokenCount,
+ output: usage.candidatesTokenCount,
+ total: usage.totalTokenCount,
+ ...(cachedContentTokens > 0 && { cacheRead: cachedContentTokens }),
+ ...(thoughtsTokens > 0 && { reasoning: thoughtsTokens }),
+ }
+ : undefined,
+ cost,
+ provider: 'google',
+ ttft: extras?.ttft,
+ errorType: extras?.errorType,
+ errorMessage: extras?.errorMessage,
+ })
+}
diff --git a/apps/sim/providers/groq/index.ts b/apps/sim/providers/groq/index.ts
index fba8984e86b..192e1412d94 100644
--- a/apps/sim/providers/groq/index.ts
+++ b/apps/sim/providers/groq/index.ts
@@ -5,6 +5,7 @@ import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import { createReadableStreamFromGroqStream } from '@/providers/groq/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
ProviderConfig,
ProviderRequest,
@@ -162,7 +163,7 @@ export const groqProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -212,7 +213,7 @@ export const groqProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -226,6 +227,14 @@ export const groqProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'groq' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -302,6 +311,7 @@ export const groqProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -373,7 +383,7 @@ export const groqProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -393,6 +403,15 @@ export const groqProvider: ProviderConfig = {
iterationCount++
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'groq' }
+ )
+ }
} catch (error) {
logger.error('Error in Groq request:', { error })
}
diff --git a/apps/sim/providers/mistral/index.ts b/apps/sim/providers/mistral/index.ts
index 32e24c1f329..ffe1ecad930 100644
--- a/apps/sim/providers/mistral/index.ts
+++ b/apps/sim/providers/mistral/index.ts
@@ -6,6 +6,7 @@ import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import { createReadableStreamFromMistralStream } from '@/providers/mistral/utils'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
ProviderConfig,
ProviderRequest,
@@ -200,7 +201,7 @@ export const mistralProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -272,7 +273,7 @@ export const mistralProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -287,6 +288,14 @@ export const mistralProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'mistral' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -365,6 +374,7 @@ export const mistralProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -433,7 +443,7 @@ export const mistralProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -454,6 +464,15 @@ export const mistralProvider: ProviderConfig = {
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'mistral' }
+ )
+ }
+
if (request.stream) {
logger.info('Using streaming for final response after tool processing')
@@ -576,3 +595,8 @@ export const mistralProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/ollama/index.ts b/apps/sim/providers/ollama/index.ts
index 45ea3802b9c..045dd1d462a 100644
--- a/apps/sim/providers/ollama/index.ts
+++ b/apps/sim/providers/ollama/index.ts
@@ -7,6 +7,7 @@ import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import type { ModelsObject } from '@/providers/ollama/types'
import { createReadableStreamFromOllamaStream } from '@/providers/ollama/utils'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
ProviderConfig,
ProviderRequest,
@@ -230,7 +231,7 @@ export const ollamaProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -282,7 +283,7 @@ export const ollamaProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -295,6 +296,14 @@ export const ollamaProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'ollama' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -375,6 +384,7 @@ export const ollamaProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -426,7 +436,7 @@ export const ollamaProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -449,6 +459,15 @@ export const ollamaProvider: ProviderConfig = {
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'ollama' }
+ )
+ }
+
if (request.stream) {
logger.info('Using streaming for final response after tool processing')
@@ -579,3 +598,8 @@ export const ollamaProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/openai/core.ts b/apps/sim/providers/openai/core.ts
index 6a0104e0651..1f025269235 100644
--- a/apps/sim/providers/openai/core.ts
+++ b/apps/sim/providers/openai/core.ts
@@ -1,8 +1,9 @@
import type { Logger } from '@sim/logger'
import { toError } from '@sim/utils/errors'
import type OpenAI from 'openai'
-import type { StreamingExecution } from '@/executor/types'
+import type { IterationToolCall, StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
+import { enrichLastModelSegment, parseToolCallArguments } from '@/providers/trace-enrichment'
import type { Message, ProviderRequest, ProviderResponse, TimeSegment } from '@/providers/types'
import { ProviderError } from '@/providers/types'
import {
@@ -18,6 +19,7 @@ import {
convertResponseOutputToInputItems,
convertToolsToResponses,
createReadableStreamFromResponses,
+ extractResponseReasoning,
extractResponseText,
extractResponseToolCalls,
parseResponsesUsage,
@@ -347,7 +349,7 @@ export async function executeResponsesProviderRequest(
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -416,7 +418,7 @@ export async function executeResponsesProviderRequest(
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -435,6 +437,15 @@ export async function executeResponsesProviderRequest(
}
const toolCallsInResponse = extractResponseToolCalls(currentResponse.output)
+
+ enrichLastModelSegmentFromOpenAIResponse(
+ timeSegments,
+ currentResponse,
+ responseText,
+ toolCallsInResponse,
+ { model: request.model }
+ )
+
if (!toolCallsInResponse.length) {
break
}
@@ -511,6 +522,7 @@ export async function executeResponsesProviderRequest(
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: Record
@@ -586,7 +598,7 @@ export async function executeResponsesProviderRequest(
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -604,6 +616,18 @@ export async function executeResponsesProviderRequest(
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ const trailingText = extractResponseText(currentResponse.output)
+ const trailingToolCalls = extractResponseToolCalls(currentResponse.output)
+ enrichLastModelSegmentFromOpenAIResponse(
+ timeSegments,
+ currentResponse,
+ trailingText,
+ trailingToolCalls,
+ { model: request.model }
+ )
+ }
+
// For Azure with deferred format: make a final call with the response format applied
// This happens whenever we have a deferred format, even if no tools were called
// (the initial call was made without the format, so we need to apply it now)
@@ -685,6 +709,14 @@ export async function executeResponsesProviderRequest(
content = formattedText
}
+ enrichLastModelSegmentFromOpenAIResponse(
+ timeSegments,
+ currentResponse,
+ formattedText,
+ extractResponseToolCalls(currentResponse.output),
+ { model: request.model }
+ )
+
appliedDeferredFormat = true
}
@@ -821,3 +853,82 @@ export async function executeResponsesProviderRequest(
})
}
}
+
+/**
+ * Determines a finish reason for an OpenAI Responses API response.
+ * Maps to conventional values: 'tool_calls' | 'length' | 'stop'.
+ */
+function deriveOpenAIFinishReason(
+ response: OpenAI.Responses.Response,
+ toolCalls: ResponsesToolCall[]
+): string | undefined {
+ const incompleteReason = response.incomplete_details?.reason
+ if (incompleteReason === 'max_output_tokens') return 'length'
+ if (incompleteReason === 'content_filter') return 'content_filter'
+ if (toolCalls.length > 0) return 'tool_calls'
+ if (incompleteReason) return incompleteReason
+ if (response.status === 'failed') return 'error'
+ if (response.status === 'incomplete') return 'length'
+ if (response.status && response.status !== 'completed') return response.status
+ return 'stop'
+}
+
+/**
+ * Enriches the last model segment with per-iteration content extracted from an
+ * OpenAI Responses API response: assistant text, tool calls, finish reason,
+ * and token usage for the iteration.
+ */
+function enrichLastModelSegmentFromOpenAIResponse(
+ timeSegments: TimeSegment[],
+ response: OpenAI.Responses.Response,
+ assistantText: string,
+ toolCallsInResponse: ResponsesToolCall[],
+ extras?: {
+ model?: string
+ ttft?: number
+ errorType?: string
+ errorMessage?: string
+ }
+): void {
+ const toolCalls: IterationToolCall[] = toolCallsInResponse.map((tc) => ({
+ id: tc.id,
+ name: tc.name,
+ arguments:
+ typeof tc.arguments === 'string' ? parseToolCallArguments(tc.arguments) : tc.arguments,
+ }))
+
+ const usage = parseResponsesUsage(response.usage)
+ const thinkingContent = extractResponseReasoning(response.output)
+
+ let cost: { input: number; output: number; total: number } | undefined
+ if (extras?.model && usage) {
+ const full = calculateCost(
+ extras.model,
+ usage.promptTokens,
+ usage.completionTokens,
+ usage.cachedTokens > 0
+ )
+ cost = { input: full.input, output: full.output, total: full.total }
+ }
+
+ enrichLastModelSegment(timeSegments, {
+ assistantContent: assistantText || undefined,
+ thinkingContent: thinkingContent || undefined,
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+ finishReason: deriveOpenAIFinishReason(response, toolCallsInResponse),
+ tokens: usage
+ ? {
+ input: usage.promptTokens,
+ output: usage.completionTokens,
+ total: usage.totalTokens,
+ ...(usage.cachedTokens > 0 && { cacheRead: usage.cachedTokens }),
+ ...(usage.reasoningTokens > 0 && { reasoning: usage.reasoningTokens }),
+ }
+ : undefined,
+ cost,
+ provider: 'openai',
+ ttft: extras?.ttft,
+ errorType: extras?.errorType,
+ errorMessage: extras?.errorMessage,
+ })
+}
diff --git a/apps/sim/providers/openai/utils.ts b/apps/sim/providers/openai/utils.ts
index f1575473ada..88efec06e2e 100644
--- a/apps/sim/providers/openai/utils.ts
+++ b/apps/sim/providers/openai/utils.ts
@@ -199,6 +199,29 @@ export function extractResponseText(output: OpenAI.Responses.ResponseOutputItem[
return textParts.join('')
}
+/**
+ * Extracts reasoning summary text from Responses API output items. Reasoning
+ * items (emitted by o1/o3/gpt-5) carry a `summary[]` of `{ type, text }` entries
+ * — we join the text for trace display. The raw `encrypted_content` is left
+ * alone; it's opaque plumbing for round-tripping across turns.
+ */
+export function extractResponseReasoning(output: OpenAI.Responses.ResponseOutputItem[]): string {
+ if (!Array.isArray(output)) return ''
+
+ const parts: string[] = []
+ for (const item of output) {
+ if (!item || item.type !== 'reasoning') continue
+ const summary = (item as unknown as { summary?: Array<{ text?: string | null } | null> })
+ .summary
+ if (!Array.isArray(summary)) continue
+ for (const entry of summary) {
+ const text = entry?.text
+ if (typeof text === 'string' && text.length > 0) parts.push(text)
+ }
+ }
+ return parts.join('\n\n')
+}
+
/**
* Converts Responses API output items into input items for subsequent calls.
*/
diff --git a/apps/sim/providers/openrouter/index.ts b/apps/sim/providers/openrouter/index.ts
index 89ae932c32d..87ff07fcfef 100644
--- a/apps/sim/providers/openrouter/index.ts
+++ b/apps/sim/providers/openrouter/index.ts
@@ -10,6 +10,7 @@ import {
createReadableStreamFromOpenAIStream,
supportsNativeStructuredOutputs,
} from '@/providers/openrouter/utils'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
FunctionCallResponse,
Message,
@@ -210,7 +211,7 @@ export const openRouterProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -258,7 +259,7 @@ export const openRouterProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -280,6 +281,14 @@ export const openRouterProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'openrouter' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -359,6 +368,7 @@ export const openRouterProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -424,7 +434,7 @@ export const openRouterProvider: ProviderConfig = {
const thisModelTime = nextModelEndTime - nextModelStartTime
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -441,6 +451,15 @@ export const openRouterProvider: ProviderConfig = {
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'openrouter' }
+ )
+ }
+
if (request.stream) {
const accumulatedCost = calculateCost(requestedModel, tokens.input, tokens.output)
@@ -573,6 +592,13 @@ export const openRouterProvider: ProviderConfig = {
tokens.output += finalResponse.usage.completion_tokens || 0
tokens.total += finalResponse.usage.total_tokens || 0
}
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ finalResponse,
+ finalResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'openrouter' }
+ )
}
const providerEndTime = Date.now()
@@ -623,3 +649,8 @@ export const openRouterProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/trace-enrichment.ts b/apps/sim/providers/trace-enrichment.ts
new file mode 100644
index 00000000000..0d3c3232b28
--- /dev/null
+++ b/apps/sim/providers/trace-enrichment.ts
@@ -0,0 +1,221 @@
+import type { BlockTokens, IterationToolCall, ProviderTimingSegment } from '@/executor/types'
+import { calculateCost } from '@/providers/utils'
+
+/**
+ * Minimal structural shape shared by OpenAI Chat Completions and every
+ * OpenAI-compatible SDK (Groq, Cerebras, DeepSeek, xAI, Mistral, Ollama,
+ * OpenRouter, vLLM, Fireworks). Captures only the fields the trace enrichment
+ * helper reads, so providers can pass their own SDK's response type without
+ * a cast.
+ */
+interface ChatCompletionLike {
+ choices: Array<{
+ message?: {
+ content?: string | null
+ tool_calls?: Array | null
+ } | null
+ finish_reason?: string | null
+ } | null>
+ usage?: {
+ prompt_tokens?: number | null
+ completion_tokens?: number | null
+ total_tokens?: number | null
+ prompt_tokens_details?: { cached_tokens?: number | null } | null
+ completion_tokens_details?: { reasoning_tokens?: number | null } | null
+ /** DeepSeek's legacy cache shape (not nested under prompt_tokens_details). */
+ prompt_cache_hit_tokens?: number | null
+ } | null
+}
+
+interface ChatCompletionToolCallLike {
+ id: string
+ function: { name: string; arguments: string }
+}
+
+/**
+ * Content to attach to a model segment for a single provider iteration.
+ * All fields are optional — providers populate what the response carries.
+ */
+export interface ModelSegmentContent {
+ assistantContent?: string
+ thinkingContent?: string
+ toolCalls?: IterationToolCall[]
+ finishReason?: string
+ tokens?: BlockTokens
+ cost?: { input?: number; output?: number; total?: number }
+ ttft?: number
+ provider?: string
+ errorType?: string
+ errorMessage?: string
+}
+
+/**
+ * Enriches the most recent `type: 'model'` segment in `timeSegments` with
+ * content from the model response for that iteration. Writes only the fields
+ * provided; undefined fields are skipped so repeat calls can layer data.
+ *
+ * Call at the point where the response for the latest model segment is in hand
+ * — typically right after the provider call returns, before tool execution.
+ */
+export function enrichLastModelSegment(
+ timeSegments: ProviderTimingSegment[],
+ content: ModelSegmentContent
+): void {
+ for (let i = timeSegments.length - 1; i >= 0; i--) {
+ const segment = timeSegments[i]
+ if (segment.type !== 'model') continue
+
+ if (content.assistantContent !== undefined) {
+ segment.assistantContent = content.assistantContent
+ }
+ if (content.thinkingContent !== undefined) {
+ segment.thinkingContent = content.thinkingContent
+ }
+ if (content.toolCalls !== undefined) {
+ segment.toolCalls = content.toolCalls
+ }
+ if (content.finishReason !== undefined) {
+ segment.finishReason = content.finishReason
+ }
+ if (content.tokens !== undefined) {
+ segment.tokens = content.tokens
+ }
+ if (content.cost !== undefined) {
+ segment.cost = content.cost
+ }
+ if (content.ttft !== undefined) {
+ segment.ttft = content.ttft
+ }
+ if (content.provider !== undefined) {
+ segment.provider = content.provider
+ }
+ if (content.errorType !== undefined) {
+ segment.errorType = content.errorType
+ }
+ if (content.errorMessage !== undefined) {
+ segment.errorMessage = content.errorMessage
+ }
+ return
+ }
+}
+
+/**
+ * Parses a tool call's `function.arguments` JSON string into an object, or
+ * returns the raw string if it is not valid JSON.
+ */
+function parseToolCallArguments(rawArguments: string): Record | string {
+ try {
+ const parsed = JSON.parse(rawArguments)
+ if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+ return parsed as Record
+ }
+ return rawArguments
+ } catch {
+ return rawArguments
+ }
+}
+
+/**
+ * Extracts reasoning/thinking content from a Chat Completions message. Covers
+ * non-OpenAI extensions emitted by reasoning-capable providers:
+ * - `reasoning_content`: DeepSeek, xAI, vLLM, Fireworks
+ * - `reasoning`: Groq, Cerebras, OpenRouter (flat)
+ * - `reasoning_details[]`: OpenRouter (structured per-block reasoning)
+ */
+function extractChatCompletionsReasoning(
+ message: NonNullable['message']
+): string | undefined {
+ if (!message) return undefined
+ const msg = message as unknown as {
+ reasoning_content?: string | null
+ reasoning?: string | null
+ reasoning_details?: Array<{ text?: string | null; summary?: string | null } | null> | null
+ }
+
+ if (typeof msg.reasoning_content === 'string' && msg.reasoning_content.length > 0) {
+ return msg.reasoning_content
+ }
+ if (typeof msg.reasoning === 'string' && msg.reasoning.length > 0) {
+ return msg.reasoning
+ }
+ if (Array.isArray(msg.reasoning_details)) {
+ const joined = msg.reasoning_details
+ .map((d) => d?.text ?? d?.summary ?? '')
+ .filter((s): s is string => typeof s === 'string' && s.length > 0)
+ .join('\n')
+ if (joined.length > 0) return joined
+ }
+ return undefined
+}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, thinking/reasoning, tool calls, finish
+ * reason, token usage. Shared by all OpenAI-compat providers.
+ */
+export function enrichLastModelSegmentFromChatCompletions(
+ timeSegments: ProviderTimingSegment[],
+ response: ChatCompletionLike,
+ toolCallsInResponse: ChatCompletionToolCallLike[] | undefined,
+ extras?: {
+ /** Model id used for this call — enables automatic cost calculation. */
+ model?: string
+ /** Provider system identifier (`gen_ai.system`). */
+ provider?: string
+ /** Time-to-first-token in ms (streaming path only). */
+ ttft?: number
+ /** Structured error class when the call failed. */
+ errorType?: string
+ /** Human-readable error message when the call failed. */
+ errorMessage?: string
+ /** Override the automatically derived cost. */
+ cost?: { input?: number; output?: number; total?: number }
+ }
+): void {
+ const choice = response.choices[0]
+ const assistantText = choice?.message?.content ?? ''
+ const thinkingText = extractChatCompletionsReasoning(choice?.message)
+
+ const toolCalls: IterationToolCall[] = (toolCallsInResponse ?? []).map((tc) => ({
+ id: tc.id,
+ name: tc.function.name,
+ arguments: parseToolCallArguments(tc.function.arguments),
+ }))
+
+ const usage = response.usage
+ const cacheRead =
+ usage?.prompt_tokens_details?.cached_tokens ?? usage?.prompt_cache_hit_tokens ?? 0
+ const reasoning = usage?.completion_tokens_details?.reasoning_tokens ?? 0
+
+ const promptTokens = usage?.prompt_tokens ?? undefined
+ const completionTokens = usage?.completion_tokens ?? undefined
+
+ let derivedCost = extras?.cost
+ if (!derivedCost && extras?.model && promptTokens != null && completionTokens != null) {
+ const full = calculateCost(extras.model, promptTokens, completionTokens, cacheRead > 0)
+ derivedCost = { input: full.input, output: full.output, total: full.total }
+ }
+
+ enrichLastModelSegment(timeSegments, {
+ assistantContent: assistantText || undefined,
+ thinkingContent: thinkingText,
+ toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
+ finishReason: choice?.finish_reason ?? undefined,
+ tokens: usage
+ ? {
+ input: promptTokens,
+ output: completionTokens,
+ total: usage.total_tokens ?? undefined,
+ ...(cacheRead > 0 && { cacheRead }),
+ ...(reasoning > 0 && { reasoning }),
+ }
+ : undefined,
+ cost: derivedCost,
+ ttft: extras?.ttft,
+ provider: extras?.provider,
+ errorType: extras?.errorType,
+ errorMessage: extras?.errorMessage,
+ })
+}
+
+export { parseToolCallArguments }
diff --git a/apps/sim/providers/types.ts b/apps/sim/providers/types.ts
index 69c36079df7..468d0f8bdaa 100644
--- a/apps/sim/providers/types.ts
+++ b/apps/sim/providers/types.ts
@@ -1,4 +1,4 @@
-import type { StreamingExecution } from '@/executor/types'
+import type { ProviderTimingSegment, StreamingExecution } from '@/executor/types'
export type ProviderId =
| 'openai'
@@ -63,13 +63,12 @@ export interface FunctionCallResponse {
success?: boolean
}
-export interface TimeSegment {
- type: 'model' | 'tool'
- name: string
- startTime: number
- endTime: number
- duration: number
-}
+/**
+ * Provider-side alias for the canonical segment type. Providers push these into
+ * `providerTiming.timeSegments` during execution; the trace pipeline reads them
+ * verbatim when constructing child spans.
+ */
+export type TimeSegment = ProviderTimingSegment
export interface ProviderResponse {
content: string
diff --git a/apps/sim/providers/vllm/index.ts b/apps/sim/providers/vllm/index.ts
index 66027c43f96..db25ba45ec0 100644
--- a/apps/sim/providers/vllm/index.ts
+++ b/apps/sim/providers/vllm/index.ts
@@ -6,6 +6,7 @@ import { env } from '@/lib/core/config/env'
import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
Message,
ProviderConfig,
@@ -252,7 +253,7 @@ export const vllmProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -329,7 +330,7 @@ export const vllmProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -347,6 +348,14 @@ export const vllmProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'vllm' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -427,6 +436,7 @@ export const vllmProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
@@ -495,7 +505,7 @@ export const vllmProvider: ProviderConfig = {
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -519,6 +529,15 @@ export const vllmProvider: ProviderConfig = {
iterationCount++
}
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'vllm' }
+ )
+ }
+
if (request.stream) {
logger.info('Using streaming for final response after tool processing')
@@ -662,3 +681,8 @@ export const vllmProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/providers/xai/index.ts b/apps/sim/providers/xai/index.ts
index fdbed7f5c47..309a9fd8f3b 100644
--- a/apps/sim/providers/xai/index.ts
+++ b/apps/sim/providers/xai/index.ts
@@ -5,6 +5,7 @@ import type { ChatCompletionCreateParamsStreaming } from 'openai/resources/chat/
import type { StreamingExecution } from '@/executor/types'
import { MAX_TOOL_ITERATIONS } from '@/providers'
import { getProviderDefaultModel, getProviderModels } from '@/providers/models'
+import { enrichLastModelSegmentFromChatCompletions } from '@/providers/trace-enrichment'
import type {
Message,
ProviderConfig,
@@ -156,7 +157,7 @@ export const xAIProvider: ProviderConfig = {
timeSegments: [
{
type: 'model',
- name: 'Streaming response',
+ name: request.model,
startTime: providerStartTime,
endTime: Date.now(),
duration: Date.now() - providerStartTime,
@@ -227,7 +228,7 @@ export const xAIProvider: ProviderConfig = {
const timeSegments: TimeSegment[] = [
{
type: 'model',
- name: 'Initial response',
+ name: request.model,
startTime: initialCallTime,
endTime: initialCallTime + firstResponseTime,
duration: firstResponseTime,
@@ -251,6 +252,14 @@ export const xAIProvider: ProviderConfig = {
}
const toolCallsInResponse = currentResponse.choices[0]?.message?.tool_calls
+
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ toolCallsInResponse,
+ { model: request.model, provider: 'xai' }
+ )
+
if (!toolCallsInResponse || toolCallsInResponse.length === 0) {
break
}
@@ -331,6 +340,7 @@ export const xAIProvider: ProviderConfig = {
startTime: startTime,
endTime: endTime,
duration: duration,
+ toolCallId: toolCall.id,
})
let resultContent: any
if (result.success && result.output) {
@@ -441,7 +451,7 @@ export const xAIProvider: ProviderConfig = {
const thisModelTime = nextModelEndTime - nextModelStartTime
timeSegments.push({
type: 'model',
- name: `Model response (iteration ${iterationCount + 1})`,
+ name: request.model,
startTime: nextModelStartTime,
endTime: nextModelEndTime,
duration: thisModelTime,
@@ -461,6 +471,15 @@ export const xAIProvider: ProviderConfig = {
iterationCount++
}
+
+ if (iterationCount === MAX_TOOL_ITERATIONS) {
+ enrichLastModelSegmentFromChatCompletions(
+ timeSegments,
+ currentResponse,
+ currentResponse.choices[0]?.message?.tool_calls,
+ { model: request.model, provider: 'xai' }
+ )
+ }
} catch (error) {
logger.error('XAI Provider - Error in tool processing loop:', {
error: toError(error).message,
@@ -614,3 +633,8 @@ export const xAIProvider: ProviderConfig = {
}
},
}
+
+/**
+ * Enriches the last model segment with per-iteration content from a Chat
+ * Completions response: assistant text, tool calls, finish reason, token usage.
+ */
diff --git a/apps/sim/stores/logs/filters/types.ts b/apps/sim/stores/logs/filters/types.ts
index bdd103f16e9..3fbd85bfaee 100644
--- a/apps/sim/stores/logs/filters/types.ts
+++ b/apps/sim/stores/logs/filters/types.ts
@@ -1,3 +1,7 @@
+import type { ProviderTiming, TokenInfo, ToolCall, TraceSpan } from '@/lib/logs/types'
+
+export type { ProviderTiming, TokenInfo, ToolCall, TraceSpan }
+
export interface WorkflowData {
id: string
name: string
@@ -6,17 +10,6 @@ export interface WorkflowData {
state: any
}
-export interface ToolCall {
- name: string
- duration: number // in milliseconds
- startTime: string // ISO timestamp
- endTime: string // ISO timestamp
- status: 'success' | 'error' // Status of the tool call
- input?: Record // Input parameters (optional)
- output?: Record // Output data (optional)
- error?: string // Error message if status is 'error'
-}
-
export interface ToolCallMetadata {
toolCalls?: ToolCall[]
}
@@ -55,52 +48,6 @@ export interface CostMetadata {
}
}
-export interface TokenInfo {
- input?: number
- output?: number
- total?: number
- prompt?: number
- completion?: number
-}
-
-export interface ProviderTiming {
- duration: number
- startTime: string
- endTime: string
- segments: Array<{
- type: string
- name?: string
- startTime: string | number
- endTime: string | number
- duration: number
- }>
-}
-
-export interface TraceSpan {
- id: string
- name: string
- type: string
- duration: number // in milliseconds
- startTime: string
- endTime: string
- children?: TraceSpan[]
- toolCalls?: ToolCall[]
- status?: 'success' | 'error'
- errorHandled?: boolean
- tokens?: number | TokenInfo
- relativeStartMs?: number // Time in ms from the start of the parent span
- blockId?: string // Added to track the original block ID for relationship mapping
- input?: Record // Added to store input data for this span
- output?: Record // Added to store output data for this span
- model?: string
- cost?: {
- input?: number
- output?: number
- total?: number
- }
- providerTiming?: ProviderTiming
-}
-
export interface WorkflowLog {
id: string
workflowId: string | null
diff --git a/apps/sim/stores/logs/store.ts b/apps/sim/stores/logs/store.ts
index f9e0361e2c8..0360e7e7bb4 100644
--- a/apps/sim/stores/logs/store.ts
+++ b/apps/sim/stores/logs/store.ts
@@ -26,6 +26,11 @@ export const useLogDetailsUIStore = create()(
{
name: 'log-details-ui-state',
partialize: (state) => ({ panelWidth: state.panelWidth }),
+ onRehydrateStorage: () => (state) => {
+ if (state) {
+ state.panelWidth = clampPanelWidth(state.panelWidth)
+ }
+ },
}
)
)
diff --git a/apps/sim/stores/logs/utils.ts b/apps/sim/stores/logs/utils.ts
index 4b5d043d1d3..778320066c0 100644
--- a/apps/sim/stores/logs/utils.ts
+++ b/apps/sim/stores/logs/utils.ts
@@ -1,8 +1,8 @@
/**
* Width constraints for the log details panel.
*/
-export const MIN_LOG_DETAILS_WIDTH = 400
-export const DEFAULT_LOG_DETAILS_WIDTH = 400
+export const MIN_LOG_DETAILS_WIDTH = 600
+export const DEFAULT_LOG_DETAILS_WIDTH = 600
export const MAX_LOG_DETAILS_WIDTH_RATIO = 0.65
/**