fix(model): validate default model against available options

apps/docs/content/docs/en/tools/google_books.mdx

@@ -7,7 +7,7 @@ import { BlockInfoCard } from "@/components/ui/block-info-card"
 
 <BlockInfoCard 
   type="google_books"
-  color="#E0E0E0"
+  color="#FFFFFF"
 />
 
 ## Usage Instructions

apps/docs/content/docs/en/tools/s3.mdx

@@ -71,7 +71,6 @@ Retrieve an object from an AWS S3 bucket
 | --------- | ---- | -------- | ----------- |
 | `accessKeyId` | string | Yes | Your AWS Access Key ID |
 | `secretAccessKey` | string | Yes | Your AWS Secret Access Key |
-| `region` | string | No | Optional region override when URL does not include region \(e.g., us-east-1, eu-west-1\) |
 | `s3Uri` | string | Yes | S3 Object URL \(e.g., https://bucket.s3.region.amazonaws.com/path/to/file\) |
 
 #### Output

apps/docs/content/docs/en/tools/slack.mdx

@@ -79,7 +79,7 @@ Send messages to Slack channels or direct messages. Supports Slack mrkdwn format
 | `channel` | string | No | Slack channel ID \(e.g., C1234567890\) |
 | `dmUserId` | string | No | Slack user ID for direct messages \(e.g., U1234567890\) |
 | `text` | string | Yes | Message text to send \(supports Slack mrkdwn formatting\) |
-| `threadTs` | string | No | Thread timestamp to reply to \(creates thread reply\) |
+| `thread_ts` | string | No | Thread timestamp to reply to \(creates thread reply\) |
 | `files` | file[] | No | Files to attach to the message |
 
 #### Output

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

@@ -238,11 +238,6 @@ Use this context to calculate relative dates like "yesterday", "last week", "beg
       finalSystemPrompt += currentTimeContext
     }
 
-    if (generationType === 'cron-expression') {
-      finalSystemPrompt +=
-        '\n\nIMPORTANT: Return ONLY the raw cron expression (e.g., "0 9 * * 1-5"). Do NOT wrap it in markdown code blocks, backticks, or quotes. Do NOT include any explanation or text before or after the expression.'
-    }
-
     if (generationType === 'json-object') {
       finalSystemPrompt +=
         '\n\nIMPORTANT: Return ONLY the raw JSON object. Do NOT wrap it in markdown code blocks (no ```json or ```). Do NOT include any explanation or text before or after the JSON. The response must start with { and end with }.'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/components/tools/sub-block-renderer.tsx

@@ -1,10 +1,9 @@
 'use client'
 
 import { useEffect, useRef } from 'react'
+import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
 import { SubBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block'
 import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 interface ToolSubBlockRendererProps {
   blockId: string
@@ -45,43 +44,53 @@ export function ToolSubBlockRenderer({
   canonicalToggle,
 }: ToolSubBlockRendererProps) {
   const syntheticId = `${subBlockId}-tool-${toolIndex}-${effectiveParamId}`
+  const [storeValue, setStoreValue] = useSubBlockValue(blockId, syntheticId)
+
   const toolParamValue = toolParams?.[effectiveParamId] ?? ''
   const isObjectType = OBJECT_SUBBLOCK_TYPES.has(subBlock.type)
 
-  const syncedRef = useRef<string | null>(null)
-  const onParamChangeRef = useRef(onParamChange)
-  onParamChangeRef.current = onParamChange
+  const lastPushedToStoreRef = useRef<string | null>(null)
+  const lastPushedToParamsRef = useRef<string | null>(null)
 
   useEffect(() => {
-    const unsub = useSubBlockStore.subscribe((state, prevState) => {
-      const wfId = useWorkflowRegistry.getState().activeWorkflowId
-      if (!wfId) return
-      const newVal = state.workflowValues[wfId]?.[blockId]?.[syntheticId]
-      const oldVal = prevState.workflowValues[wfId]?.[blockId]?.[syntheticId]
-      if (newVal === oldVal) return
-      const stringified =
-        newVal == null ? '' : typeof newVal === 'string' ? newVal : JSON.stringify(newVal)
-      if (stringified === syncedRef.current) return
-      syncedRef.current = stringified
-      onParamChangeRef.current(toolIndex, effectiveParamId, stringified)
-    })
-    return unsub
-  }, [blockId, syntheticId, toolIndex, effectiveParamId])
+    if (!toolParamValue && lastPushedToStoreRef.current === null) {
+      lastPushedToStoreRef.current = toolParamValue
+      lastPushedToParamsRef.current = toolParamValue
+      return
+    }
+    if (toolParamValue !== lastPushedToStoreRef.current) {
+      lastPushedToStoreRef.current = toolParamValue
+      lastPushedToParamsRef.current = toolParamValue
 
-  useEffect(() => {
-    if (toolParamValue === syncedRef.current) return
-    syncedRef.current = toolParamValue
-    if (isObjectType && toolParamValue) {
+      if (isObjectType && typeof toolParamValue === 'string' && toolParamValue) {
         try {
           const parsed = JSON.parse(toolParamValue)
           if (typeof parsed === 'object' && parsed !== null) {
-          useSubBlockStore.getState().setValue(blockId, syntheticId, parsed)
+            setStoreValue(parsed)
             return
           }
-      } catch {}
+        } catch {
+          // Not valid JSON — fall through to set as string
         }
-    useSubBlockStore.getState().setValue(blockId, syntheticId, toolParamValue)
-  }, [toolParamValue, blockId, syntheticId, isObjectType])
+      }
+      setStoreValue(toolParamValue)
+    }
+  }, [toolParamValue, setStoreValue, isObjectType])
+
+  useEffect(() => {
+    if (storeValue == null && lastPushedToParamsRef.current === null) return
+    const stringValue =
+      storeValue == null
+        ? ''
+        : typeof storeValue === 'string'
+          ? storeValue
+          : JSON.stringify(storeValue)
+    if (stringValue !== lastPushedToParamsRef.current) {
+      lastPushedToParamsRef.current = stringValue
+      lastPushedToStoreRef.current = stringValue
+      onParamChange(toolIndex, effectiveParamId, stringValue)
+    }
+  }, [storeValue, toolIndex, effectiveParamId, onParamChange])
 
   const visibility = subBlock.paramVisibility ?? 'user-or-llm'
   const isOptionalForUser = visibility !== 'user-only'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx

@@ -1741,22 +1741,10 @@ export const ToolInput = memo(function ToolInput({
                     ) : null
                   })()}
 
-                  {(() => {
-                    const renderedElements: React.ReactNode[] = []
-
-                    const showOAuth =
-                      requiresOAuth && oauthConfig && tool.params?.authMethod !== 'bot_token'
-
-                    const renderOAuthAccount = (): React.ReactNode => {
-                      if (!showOAuth || !oauthConfig) return null
-                      const credentialSubBlock = toolBlock?.subBlocks?.find(
-                        (s) => s.type === 'oauth-input'
-                      )
-                      return (
-                        <div key='oauth-account' className='relative min-w-0 space-y-[6px]'>
+                  {requiresOAuth && oauthConfig && (
+                    <div className='relative min-w-0 space-y-[6px]'>
                       <div className='font-medium text-[13px] text-[var(--text-primary)]'>
-                            {credentialSubBlock?.title || 'Account'}{' '}
-                            <span className='ml-0.5'>*</span>
+                        Account <span className='ml-0.5'>*</span>
                       </div>
                       <div className='w-full min-w-0'>
                         <ToolCredentialSelector
@@ -1766,7 +1754,8 @@ export const ToolInput = memo(function ToolInput({
                           }
                           provider={oauthConfig.provider as OAuthProvider}
                           requiredScopes={
-                                credentialSubBlock?.requiredScopes ||
+                            toolBlock?.subBlocks?.find((sb) => sb.id === 'credential')
+                              ?.requiredScopes ||
                             getCanonicalScopesForProvider(oauthConfig.provider)
                           }
                           serviceId={oauthConfig.provider}
@@ -1774,10 +1763,29 @@ export const ToolInput = memo(function ToolInput({
                         />
                       </div>
                     </div>
-                      )
-                    }
+                  )}
 
-                    const renderSubBlock = (sb: BlockSubBlockConfig): React.ReactNode => {
+                  {(() => {
+                    const renderedElements: React.ReactNode[] = []
+
+                    if (useSubBlocks && displaySubBlocks.length > 0) {
+                      const coveredParamIds = new Set(
+                        displaySubBlocks.flatMap((sb) => {
+                          const ids = [sb.id]
+                          if (sb.canonicalParamId) ids.push(sb.canonicalParamId)
+                          const cId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
+                          if (cId) {
+                            const group = toolCanonicalIndex?.groupsById[cId]
+                            if (group) {
+                              if (group.basicId) ids.push(group.basicId)
+                              ids.push(...group.advancedIds)
+                            }
+                          }
+                          return ids
+                        })
+                      )
+
+                      displaySubBlocks.forEach((sb) => {
                         const effectiveParamId = sb.id
                         const canonicalId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
                         const canonicalGroup = canonicalId
@@ -1798,7 +1806,8 @@ export const ToolInput = memo(function ToolInput({
                             ? {
                                 mode: canonicalMode,
                                 onToggle: () => {
-                                const nextMode = canonicalMode === 'advanced' ? 'basic' : 'advanced'
+                                  const nextMode =
+                                    canonicalMode === 'advanced' ? 'basic' : 'advanced'
                                   collaborativeSetBlockCanonicalMode(
                                     blockId,
                                     `${tool.type}:${canonicalId}`,
@@ -1812,7 +1821,7 @@ export const ToolInput = memo(function ToolInput({
                           ? sb
                           : { ...sb, title: formatParameterLabel(effectiveParamId) }
 
-                      return (
+                        renderedElements.push(
                           <ToolSubBlockRenderer
                             key={sb.id}
                             blockId={blockId}
@@ -1826,65 +1835,7 @@ export const ToolInput = memo(function ToolInput({
                             canonicalToggle={canonicalToggleProp}
                           />
                         )
-                    }
-
-                    if (useSubBlocks && displaySubBlocks.length > 0) {
-                      const allBlockSubBlocks = toolBlock?.subBlocks || []
-                      const coveredParamIds = new Set(
-                        allBlockSubBlocks.flatMap((sb) => {
-                          const ids = [sb.id]
-                          if (sb.canonicalParamId) ids.push(sb.canonicalParamId)
-                          const cId = toolCanonicalIndex?.canonicalIdBySubBlockId[sb.id]
-                          if (cId) {
-                            const group = toolCanonicalIndex?.groupsById[cId]
-                            if (group) {
-                              if (group.basicId) ids.push(group.basicId)
-                              ids.push(...group.advancedIds)
-                            }
-                          }
-                          return ids
                       })
-                      )
-
-                      type RenderItem =
-                        | { kind: 'subblock'; sb: BlockSubBlockConfig }
-                        | { kind: 'oauth' }
-
-                      const renderOrder: RenderItem[] = displaySubBlocks.map((sb) => ({
-                        kind: 'subblock' as const,
-                        sb,
-                      }))
-
-                      if (showOAuth) {
-                        const credentialIdx = allBlockSubBlocks.findIndex(
-                          (sb) => sb.type === 'oauth-input'
-                        )
-                        if (credentialIdx >= 0) {
-                          const sbPositions = new Map(allBlockSubBlocks.map((sb, i) => [sb.id, i]))
-                          const insertAt = renderOrder.findIndex(
-                            (item) =>
-                              item.kind === 'subblock' &&
-                              (sbPositions.get(item.sb.id) ?? Number.POSITIVE_INFINITY) >
-                                credentialIdx
-                          )
-                          if (insertAt === -1) {
-                            renderOrder.push({ kind: 'oauth' })
-                          } else {
-                            renderOrder.splice(insertAt, 0, { kind: 'oauth' })
-                          }
-                        } else {
-                          renderOrder.unshift({ kind: 'oauth' })
-                        }
-                      }
-
-                      for (const item of renderOrder) {
-                        if (item.kind === 'oauth') {
-                          const el = renderOAuthAccount()
-                          if (el) renderedElements.push(el)
-                        } else {
-                          renderedElements.push(renderSubBlock(item.sb))
-                        }
-                      }
 
                       const uncoveredParams = displayParams.filter(
                         (param) =>
@@ -1922,11 +1873,6 @@ export const ToolInput = memo(function ToolInput({
                       )
                     }
 
-                    {
-                      const el = renderOAuthAccount()
-                      if (el) renderedElements.push(el)
-                    }
-
                     const filteredParams = displayParams.filter((param) =>
                       evaluateParameterCondition(param, tool)
                     )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/hooks/use-terminal-filters.ts

@@ -88,38 +88,21 @@ export function useTerminalFilters() {
       let result = entries
 
       if (hasActiveFilters) {
-        // Determine which top-level entries pass the filters
-        const visibleBlockIds = new Set<string>()
-        for (const entry of entries) {
-          if (entry.parentWorkflowBlockId) continue
-
-          let passes = true
+        result = entries.filter((entry) => {
+          // Block ID filter
           if (filters.blockIds.size > 0 && !filters.blockIds.has(entry.blockId)) {
-            passes = false
+            return false
           }
-          if (passes && filters.statuses.size > 0) {
+
+          // Status filter
+          if (filters.statuses.size > 0) {
             const isError = !!entry.error
             const hasStatus = isError ? filters.statuses.has('error') : filters.statuses.has('info')
-            if (!hasStatus) passes = false
-          }
-          if (passes) {
-            visibleBlockIds.add(entry.blockId)
-          }
+            if (!hasStatus) return false
           }
 
-        // Propagate visibility to child workflow entries (handles arbitrary nesting).
-        // Keep iterating until no new children are discovered.
-        let prevSize = 0
-        while (visibleBlockIds.size !== prevSize) {
-          prevSize = visibleBlockIds.size
-          for (const entry of entries) {
-            if (entry.parentWorkflowBlockId && visibleBlockIds.has(entry.parentWorkflowBlockId)) {
-              visibleBlockIds.add(entry.blockId)
-            }
-          }
-        }
-
-        result = entries.filter((entry) => visibleBlockIds.has(entry.blockId))
+          return true
+        })
       }
 
       // Sort by executionOrder (monotonically increasing integer from server)

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx

@@ -339,8 +339,7 @@ const SubflowNodeRow = memo(function SubflowNodeRow({
 })
 
 /**
- * Entry node component - dispatches to appropriate component based on node type.
- * Handles recursive rendering for workflow nodes with arbitrarily nested children.
+ * Entry node component - dispatches to appropriate component based on node type
  */
 const EntryNodeRow = memo(function EntryNodeRow({
   node,
@@ -381,98 +380,6 @@ const EntryNodeRow = memo(function EntryNodeRow({
     )
   }
 
-  if (nodeType === 'workflow') {
-    const { entry, children } = node
-    const BlockIcon = getBlockIcon(entry.blockType)
-    const hasError = Boolean(entry.error) || children.some((c) => c.entry.error)
-    const bgColor = getBlockColor(entry.blockType)
-    const nodeId = entry.id
-    const isExpanded = expandedNodes.has(nodeId)
-    const hasChildren = children.length > 0
-    const isSelected = selectedEntryId === entry.id
-    const isRunning = Boolean(entry.isRunning)
-    const isCanceled = Boolean(entry.isCanceled)
-
-    return (
-      <div className='flex min-w-0 flex-col'>
-        {/* Workflow Block Header */}
-        <div
-          data-entry-id={entry.id}
-          className={clsx(
-            ROW_STYLES.base,
-            'h-[26px]',
-            isSelected ? ROW_STYLES.selected : ROW_STYLES.hover
-          )}
-          onClick={(e) => {
-            e.stopPropagation()
-            if (hasChildren) {
-              onToggleNode(nodeId)
-            }
-            onSelectEntry(entry)
-          }}
-        >
-          <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
-            <div
-              className='flex h-[14px] w-[14px] flex-shrink-0 items-center justify-center rounded-[4px]'
-              style={{ background: bgColor }}
-            >
-              {BlockIcon && <BlockIcon className='h-[9px] w-[9px] text-white' />}
-            </div>
-            <span
-              className={clsx(
-                'min-w-0 truncate font-medium text-[13px]',
-                hasError
-                  ? 'text-[var(--text-error)]'
-                  : isSelected || isExpanded
-                    ? 'text-[var(--text-primary)]'
-                    : 'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
-              )}
-            >
-              {entry.blockName}
-            </span>
-            {hasChildren && (
-              <ChevronDown
-                className={clsx(
-                  'h-[8px] w-[8px] flex-shrink-0 text-[var(--text-tertiary)] transition-transform duration-100 group-hover:text-[var(--text-primary)]',
-                  !isExpanded && '-rotate-90'
-                )}
-              />
-            )}
-          </div>
-          <span
-            className={clsx(
-              'flex-shrink-0 font-medium text-[13px]',
-              !isRunning &&
-                (isCanceled ? 'text-[var(--text-secondary)]' : 'text-[var(--text-tertiary)]')
-            )}
-          >
-            <StatusDisplay
-              isRunning={isRunning}
-              isCanceled={isCanceled}
-              formattedDuration={formatDuration(entry.durationMs, { precision: 2 }) ?? '-'}
-            />
-          </span>
-        </div>
-
-        {/* Nested Child Workflow Blocks (recursive) */}
-        {isExpanded && hasChildren && (
-          <div className={ROW_STYLES.nested}>
-            {children.map((child) => (
-              <EntryNodeRow
-                key={child.entry.id}
-                node={child}
-                selectedEntryId={selectedEntryId}
-                onSelectEntry={onSelectEntry}
-                expandedNodes={expandedNodes}
-                onToggleNode={onToggleNode}
-              />
-            ))}
-          </div>
-        )}
-      </div>
-    )
-  }
-
   // Regular block
   return (
     <BlockRow
@@ -648,8 +555,6 @@ export const Terminal = memo(function Terminal() {
   const uniqueBlocks = useMemo(() => {
     const blocksMap = new Map<string, { blockId: string; blockName: string; blockType: string }>()
     allWorkflowEntries.forEach((entry) => {
-      // Skip child workflow entries — they use synthetic IDs and shouldn't appear in filters
-      if (entry.parentWorkflowBlockId) return
       if (!blocksMap.has(entry.blockId)) {
         blocksMap.set(entry.blockId, {
           blockId: entry.blockId,
@@ -762,22 +667,19 @@ export const Terminal = memo(function Terminal() {
 
     const newestExec = executionGroups[0]
 
-    // Collect all expandable node IDs recursively (subflows, iterations, and workflow nodes)
+    // Collect all node IDs that should be expanded (subflows and their iterations)
     const nodeIdsToExpand: string[] = []
-    const collectExpandableNodes = (nodes: EntryNode[]) => {
-      for (const node of nodes) {
-        if (node.children.length === 0) continue
-        if (
-          node.nodeType === 'subflow' ||
-          node.nodeType === 'iteration' ||
-          node.nodeType === 'workflow'
-        ) {
+    for (const node of newestExec.entryTree) {
+      if (node.nodeType === 'subflow' && node.children.length > 0) {
         nodeIdsToExpand.push(node.entry.id)
-          collectExpandableNodes(node.children)
+        // Also expand all iteration children
+        for (const iterNode of node.children) {
+          if (iterNode.nodeType === 'iteration') {
+            nodeIdsToExpand.push(iterNode.entry.id)
+          }
         }
       }
     }
-    collectExpandableNodes(newestExec.entryTree)
 
     if (nodeIdsToExpand.length > 0) {
       setExpandedNodes((prev) => {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/utils.ts

@@ -120,10 +120,10 @@ export function isSubflowBlockType(blockType: string): boolean {
 /**
  * Node type for the tree structure
  */
-export type EntryNodeType = 'block' | 'subflow' | 'iteration' | 'workflow'
+export type EntryNodeType = 'block' | 'subflow' | 'iteration'
 
 /**
- * Entry node for tree structure - represents a block, subflow, iteration, or workflow
+ * Entry node for tree structure - represents a block, subflow, or iteration
  */
 export interface EntryNode {
   /** The console entry (for blocks) or synthetic entry (for subflows/iterations) */
@@ -175,17 +175,12 @@ interface IterationGroup {
  * Sorts by start time to ensure chronological order.
  */
 function buildEntryTree(entries: ConsoleEntry[]): EntryNode[] {
-  // Separate regular blocks from iteration entries and child workflow entries
+  // Separate regular blocks from iteration entries
   const regularBlocks: ConsoleEntry[] = []
   const iterationEntries: ConsoleEntry[] = []
-  const childWorkflowEntries = new Map<string, ConsoleEntry[]>()
 
   for (const entry of entries) {
-    if (entry.parentWorkflowBlockId) {
-      const existing = childWorkflowEntries.get(entry.parentWorkflowBlockId) || []
-      existing.push(entry)
-      childWorkflowEntries.set(entry.parentWorkflowBlockId, existing)
-    } else if (entry.iterationType && entry.iterationCurrent !== undefined) {
+    if (entry.iterationType && entry.iterationCurrent !== undefined) {
       iterationEntries.push(entry)
     } else {
       regularBlocks.push(entry)
@@ -343,53 +338,12 @@ function buildEntryTree(entries: ConsoleEntry[]): EntryNode[] {
     })
   }
 
-  /**
-   * Recursively builds child nodes for workflow blocks.
-   * Handles multi-level nesting where a child workflow block itself has children.
-   */
-  const buildWorkflowChildNodes = (parentBlockId: string): EntryNode[] => {
-    const childEntries = childWorkflowEntries.get(parentBlockId)
-    if (!childEntries || childEntries.length === 0) return []
-
-    childEntries.sort((a, b) => {
-      const aTime = new Date(a.startedAt || a.timestamp).getTime()
-      const bTime = new Date(b.startedAt || b.timestamp).getTime()
-      return aTime - bTime
-    })
-
-    return childEntries.map((child) => {
-      const nestedChildren = buildWorkflowChildNodes(child.blockId)
-      if (nestedChildren.length > 0) {
-        return {
-          entry: child,
-          children: nestedChildren,
-          nodeType: 'workflow' as const,
-        }
-      }
-      return {
-        entry: child,
-        children: [],
-        nodeType: 'block' as const,
-      }
-    })
-  }
-
-  // Build nodes for regular blocks, promoting workflow blocks with children to 'workflow' nodes
-  const regularNodes: EntryNode[] = regularBlocks.map((entry) => {
-    const childNodes = buildWorkflowChildNodes(entry.blockId)
-    if (childNodes.length > 0) {
-      return {
-        entry,
-        children: childNodes,
-        nodeType: 'workflow' as const,
-      }
-    }
-    return {
+  // Build nodes for regular blocks
+  const regularNodes: EntryNode[] = regularBlocks.map((entry) => ({
     entry,
     children: [],
     nodeType: 'block' as const,
-    }
-  })
+  }))
 
   // Combine all nodes and sort by executionOrder ascending (oldest first, top-down)
   const allNodes = [...subflowNodes, ...regularNodes]

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts

@@ -38,11 +38,7 @@ import { useCurrentWorkflowExecution, useExecutionStore } from '@/stores/executi
 import { useNotificationStore } from '@/stores/notifications'
 import { useVariablesStore } from '@/stores/panel'
 import { useEnvironmentStore } from '@/stores/settings/environment'
-import {
-  extractChildWorkflowEntries,
-  hasChildTraceSpans,
-  useTerminalConsoleStore,
-} from '@/stores/terminal'
+import { useTerminalConsoleStore } from '@/stores/terminal'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { mergeSubblockState } from '@/stores/workflows/utils'
@@ -67,7 +63,6 @@ interface BlockEventHandlerConfig {
   executionIdRef: { current: string }
   workflowEdges: Array<{ id: string; target: string; sourceHandle?: string | null }>
   activeBlocksSet: Set<string>
-  activeBlockRefCounts: Map<string, number>
   accumulatedBlockLogs: BlockLog[]
   accumulatedBlockStates: Map<string, BlockState>
   executedBlockIds: Set<string>
@@ -314,7 +309,6 @@ export function useWorkflowExecution() {
         executionIdRef,
         workflowEdges,
         activeBlocksSet,
-        activeBlockRefCounts,
         accumulatedBlockLogs,
         accumulatedBlockStates,
         executedBlockIds,
@@ -334,18 +328,9 @@ export function useWorkflowExecution() {
       const updateActiveBlocks = (blockId: string, isActive: boolean) => {
         if (!workflowId) return
         if (isActive) {
-          const count = activeBlockRefCounts.get(blockId) ?? 0
-          activeBlockRefCounts.set(blockId, count + 1)
           activeBlocksSet.add(blockId)
         } else {
-          const count = activeBlockRefCounts.get(blockId) ?? 1
-          const next = count - 1
-          if (next <= 0) {
-            activeBlockRefCounts.delete(blockId)
           activeBlocksSet.delete(blockId)
-          } else {
-            activeBlockRefCounts.set(blockId, next)
-          }
         }
         setActiveBlocks(workflowId, new Set(activeBlocksSet))
       }
@@ -521,20 +506,6 @@ export function useWorkflowExecution() {
           addConsoleEntry(data, data.output as NormalizedBlockOutput)
         }
 
-        // Extract child workflow trace spans into separate console entries
-        if (data.blockType === 'workflow' && hasChildTraceSpans(data.output)) {
-          const childEntries = extractChildWorkflowEntries({
-            parentBlockId: data.blockId,
-            executionId: executionIdRef.current,
-            executionOrder: data.executionOrder,
-            workflowId: workflowId!,
-            childTraceSpans: data.output.childTraceSpans,
-          })
-          for (const entry of childEntries) {
-            addConsole(entry)
-          }
-        }
-
         if (onBlockCompleteCallback) {
           onBlockCompleteCallback(data.blockId, data.output).catch((error) => {
             logger.error('Error in onBlockComplete callback:', error)
@@ -1309,7 +1280,6 @@ export function useWorkflowExecution() {
       }
 
       const activeBlocksSet = new Set<string>()
-      const activeBlockRefCounts = new Map<string, number>()
       const streamedContent = new Map<string, string>()
       const accumulatedBlockLogs: BlockLog[] = []
       const accumulatedBlockStates = new Map<string, BlockState>()
@@ -1322,7 +1292,6 @@ export function useWorkflowExecution() {
           executionIdRef,
           workflowEdges,
           activeBlocksSet,
-          activeBlockRefCounts,
           accumulatedBlockLogs,
           accumulatedBlockStates,
           executedBlockIds,
@@ -1933,7 +1902,6 @@ export function useWorkflowExecution() {
       const accumulatedBlockStates = new Map<string, BlockState>()
       const executedBlockIds = new Set<string>()
       const activeBlocksSet = new Set<string>()
-      const activeBlockRefCounts = new Map<string, number>()
 
       try {
         const blockHandlers = buildBlockEventHandlers({
@@ -1941,7 +1909,6 @@ export function useWorkflowExecution() {
           executionIdRef,
           workflowEdges,
           activeBlocksSet,
-          activeBlockRefCounts,
           accumulatedBlockLogs,
           accumulatedBlockStates,
           executedBlockIds,
@@ -2137,7 +2104,6 @@ export function useWorkflowExecution() {
 
     const workflowEdges = useWorkflowStore.getState().edges
     const activeBlocksSet = new Set<string>()
-    const activeBlockRefCounts = new Map<string, number>()
     const accumulatedBlockLogs: BlockLog[] = []
     const accumulatedBlockStates = new Map<string, BlockState>()
     const executedBlockIds = new Set<string>()
@@ -2149,7 +2115,6 @@ export function useWorkflowExecution() {
       executionIdRef,
       workflowEdges,
       activeBlocksSet,
-      activeBlockRefCounts,
       accumulatedBlockLogs,
       accumulatedBlockStates,
       executedBlockIds,

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts

@@ -1,11 +1,7 @@
 import { v4 as uuidv4 } from 'uuid'
 import type { ExecutionResult, StreamingExecution } from '@/executor/types'
 import { useExecutionStore } from '@/stores/execution'
-import {
-  extractChildWorkflowEntries,
-  hasChildTraceSpans,
-  useTerminalConsoleStore,
-} from '@/stores/terminal'
+import { useTerminalConsoleStore } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
@@ -43,7 +39,6 @@ export async function executeWorkflowWithFullLogging(
   const workflowEdges = useWorkflowStore.getState().edges
 
   const activeBlocksSet = new Set<string>()
-  const activeBlockRefCounts = new Map<string, number>()
 
   const payload: any = {
     input: options.workflowInput,
@@ -108,8 +103,6 @@ export async function executeWorkflowWithFullLogging(
 
           switch (event.type) {
             case 'block:started': {
-              const startCount = activeBlockRefCounts.get(event.data.blockId) ?? 0
-              activeBlockRefCounts.set(event.data.blockId, startCount + 1)
               activeBlocksSet.add(event.data.blockId)
               setActiveBlocks(wfId, new Set(activeBlocksSet))
 
@@ -122,14 +115,8 @@ export async function executeWorkflowWithFullLogging(
               break
             }
 
-            case 'block:completed': {
-              const completeCount = activeBlockRefCounts.get(event.data.blockId) ?? 1
-              if (completeCount <= 1) {
-                activeBlockRefCounts.delete(event.data.blockId)
+            case 'block:completed':
               activeBlocksSet.delete(event.data.blockId)
-              } else {
-                activeBlockRefCounts.set(event.data.blockId, completeCount - 1)
-              }
               setActiveBlocks(wfId, new Set(activeBlocksSet))
 
               setBlockRunStatus(wfId, event.data.blockId, 'success')
@@ -153,34 +140,13 @@ export async function executeWorkflowWithFullLogging(
                 iterationContainerId: event.data.iterationContainerId,
               })
 
-              // Extract child workflow trace spans into separate console entries
-              if (event.data.blockType === 'workflow' && hasChildTraceSpans(event.data.output)) {
-                const childEntries = extractChildWorkflowEntries({
-                  parentBlockId: event.data.blockId,
-                  executionId,
-                  executionOrder: event.data.executionOrder,
-                  workflowId: activeWorkflowId,
-                  childTraceSpans: event.data.output.childTraceSpans,
-                })
-                for (const entry of childEntries) {
-                  addConsole(entry)
-                }
-              }
-
               if (options.onBlockComplete) {
                 options.onBlockComplete(event.data.blockId, event.data.output).catch(() => {})
               }
               break
-            }
 
-            case 'block:error': {
-              const errorCount = activeBlockRefCounts.get(event.data.blockId) ?? 1
-              if (errorCount <= 1) {
-                activeBlockRefCounts.delete(event.data.blockId)
+            case 'block:error':
               activeBlocksSet.delete(event.data.blockId)
-              } else {
-                activeBlockRefCounts.set(event.data.blockId, errorCount - 1)
-              }
               setActiveBlocks(wfId, new Set(activeBlocksSet))
 
               setBlockRunStatus(wfId, event.data.blockId, 'error')
@@ -205,7 +171,6 @@ export async function executeWorkflowWithFullLogging(
                 iterationContainerId: event.data.iterationContainerId,
               })
               break
-            }
 
             case 'execution:completed':
               executionResult = {

apps/sim/blocks/blocks/schedule.ts

@@ -122,25 +122,6 @@ export const ScheduleBlock: BlockConfig = {
       required: true,
       mode: 'trigger',
       condition: { field: 'scheduleType', value: 'custom' },
-      wandConfig: {
-        enabled: true,
-        prompt: `You are an expert at writing cron expressions. Generate a valid cron expression based on the user's description.
-
-Cron format: minute hour day-of-month month day-of-week
-- minute: 0-59
-- hour: 0-23
-- day-of-month: 1-31
-- month: 1-12
-- day-of-week: 0-7 (0 and 7 are Sunday)
-
-Special characters: * (any), , (list), - (range), / (step)
-
-{context}
-
-Return ONLY the cron expression, nothing else. No explanation, no backticks, no quotes.`,
-        placeholder: 'Describe your schedule (e.g., "every weekday at 9am")',
-        generationType: 'cron-expression',
-      },
     },
 
     {

apps/sim/blocks/blocks/slack.ts

@@ -604,7 +604,7 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
           case 'send': {
             baseParams.text = text
             if (threadTs) {
-              baseParams.threadTs = threadTs
+              baseParams.thread_ts = threadTs
             }
             // files is the canonical param from attachmentFiles (basic) or files (advanced)
             const normalizedFiles = normalizeFileInput(files)

apps/sim/blocks/types.ts

@@ -40,7 +40,6 @@ export type GenerationType =
   | 'neo4j-parameters'
   | 'timestamp'
   | 'timezone'
-  | 'cron-expression'
 
 export type SubBlockType =
   | 'short-input' // Single line input

apps/sim/executor/execution/block-executor.ts

@@ -428,7 +428,7 @@ export class BlockExecutor {
     block: SerializedBlock,
     executionOrder: number
   ): void {
-    const blockId = node.metadata?.originalBlockId ?? node.id
+    const blockId = node.id
     const blockName = block.metadata?.name ?? blockId
     const blockType = block.metadata?.id ?? DEFAULTS.BLOCK_TYPE
 
@@ -456,7 +456,7 @@ export class BlockExecutor {
     executionOrder: number,
     endedAt: string
   ): void {
-    const blockId = node.metadata?.originalBlockId ?? node.id
+    const blockId = node.id
     const blockName = block.metadata?.name ?? blockId
     const blockType = block.metadata?.id ?? DEFAULTS.BLOCK_TYPE
 

apps/sim/stores/terminal/console/index.ts

@@ -1,4 +1,3 @@
 export { indexedDBStorage } from './storage'
 export { useTerminalConsoleStore } from './store'
 export type { ConsoleEntry, ConsoleStore, ConsoleUpdate } from './types'
-export { extractChildWorkflowEntries, hasChildTraceSpans } from './utils'

apps/sim/stores/terminal/console/store.ts

@@ -224,11 +224,7 @@ export const useTerminalConsoleStore = create<ConsoleStore>()(
 
           const newEntry = get().entries[0]
 
-          if (
-            newEntry?.error &&
-            newEntry.blockType !== 'cancelled' &&
-            !newEntry.parentWorkflowBlockId
-          ) {
+          if (newEntry?.error && newEntry.blockType !== 'cancelled') {
             notifyBlockError({
               error: newEntry.error,
               blockName: newEntry.blockName || 'Unknown Block',
@@ -253,9 +249,7 @@ export const useTerminalConsoleStore = create<ConsoleStore>()(
           })),
 
         exportConsoleCSV: (workflowId: string) => {
-          const entries = get().entries.filter(
-            (entry) => entry.workflowId === workflowId && !entry.parentWorkflowBlockId
-          )
+          const entries = get().entries.filter((entry) => entry.workflowId === workflowId)
 
           if (entries.length === 0) {
             return

apps/sim/stores/terminal/console/types.ts

@@ -22,7 +22,6 @@ export interface ConsoleEntry {
   iterationTotal?: number
   iterationType?: SubflowType
   iterationContainerId?: string
-  parentWorkflowBlockId?: string
   isRunning?: boolean
   isCanceled?: boolean
 }
@@ -45,7 +44,6 @@ export interface ConsoleUpdate {
   iterationTotal?: number
   iterationType?: SubflowType
   iterationContainerId?: string
-  parentWorkflowBlockId?: string
 }
 
 export interface ConsoleStore {

apps/sim/stores/terminal/console/utils.ts

@@ -1,78 +0,0 @@
-import type { TraceSpan } from '@/lib/logs/types'
-import type { ConsoleEntry } from '@/stores/terminal/console/types'
-
-/**
- * Parameters for extracting child workflow entries from trace spans
- */
-interface ExtractChildWorkflowEntriesParams {
-  parentBlockId: string
-  executionId: string
-  executionOrder: number
-  workflowId: string
-  childTraceSpans: TraceSpan[]
-}
-
-/**
- * Extracts child workflow trace spans into console entry payloads.
- * Handles recursive nesting for multi-level child workflows by flattening
- * nested children with a parent block ID chain.
- */
-export function extractChildWorkflowEntries(
-  params: ExtractChildWorkflowEntriesParams
-): Omit<ConsoleEntry, 'id' | 'timestamp'>[] {
-  const { parentBlockId, executionId, executionOrder, workflowId, childTraceSpans } = params
-  const entries: Omit<ConsoleEntry, 'id' | 'timestamp'>[] = []
-
-  for (const span of childTraceSpans) {
-    if (!span.blockId) continue
-
-    const childBlockId = `child-${parentBlockId}-${span.blockId}`
-
-    entries.push({
-      blockId: childBlockId,
-      blockName: span.name || 'Unknown Block',
-      blockType: span.type || 'unknown',
-      parentWorkflowBlockId: parentBlockId,
-      input: span.input || {},
-      output: (span.output || {}) as ConsoleEntry['output'],
-      durationMs: span.duration,
-      startedAt: span.startTime,
-      endedAt: span.endTime,
-      success: span.status !== 'error',
-      error:
-        span.status === 'error'
-          ? (span.output?.error as string) || `${span.name || 'Block'} failed`
-          : undefined,
-      executionId,
-      executionOrder,
-      workflowId,
-    })
-
-    // Recursively extract nested child workflow spans
-    if (span.children && span.children.length > 0 && span.type === 'workflow') {
-      const nestedEntries = extractChildWorkflowEntries({
-        parentBlockId: childBlockId,
-        executionId,
-        executionOrder,
-        workflowId,
-        childTraceSpans: span.children,
-      })
-      entries.push(...nestedEntries)
-    }
-  }
-
-  return entries
-}
-
-/**
- * Checks if a block completed event output contains child trace spans
- */
-export function hasChildTraceSpans(output: unknown): output is Record<string, unknown> & {
-  childTraceSpans: TraceSpan[]
-} {
-  return (
-    output !== null &&
-    typeof output === 'object' &&
-    Array.isArray((output as Record<string, unknown>).childTraceSpans)
-  )
-}

apps/sim/stores/terminal/index.ts

@@ -1,4 +1,4 @@
 export type { ConsoleEntry, ConsoleStore, ConsoleUpdate } from './console'
-export { extractChildWorkflowEntries, hasChildTraceSpans, useTerminalConsoleStore } from './console'
+export { useTerminalConsoleStore } from './console'
 export { useTerminalStore } from './store'
 export type { TerminalState } from './types'

apps/sim/tools/params.ts

@@ -827,10 +827,11 @@ export function formatParameterLabel(paramId: string): string {
 }
 
 /**
- * SubBlock IDs that control tool routing, not user-facing parameters.
- * Excluded from tool-input rendering unless they have an explicit paramVisibility set.
+ * SubBlock IDs that are "structural" — they control tool routing or auth,
+ * not user-facing parameters. These are excluded from tool-input rendering
+ * unless they have an explicit paramVisibility set.
  */
-const STRUCTURAL_SUBBLOCK_IDS = new Set(['operation'])
+const STRUCTURAL_SUBBLOCK_IDS = new Set(['operation', 'authMethod', 'destinationType'])
 
 /**
  * SubBlock types that represent auth/credential inputs handled separately
@@ -954,8 +955,12 @@ export function getSubBlocksForToolInput(
         } else if (sb.id in toolParamVisibility) {
           visibility = toolParamVisibility[sb.id]
         } else if (sb.canonicalParamId) {
+          // SubBlock has a canonicalParamId that doesn't directly match a tool param.
+          // This means the block's params() function transforms it before sending to the tool
+          // (e.g. listFolderId → folderId). These are user-facing inputs, default to user-or-llm.
           visibility = 'user-or-llm'
         } else {
+          // SubBlock has no corresponding tool param — skip it
           continue
         }
       }

apps/sim/tools/slack/message.ts

@@ -57,7 +57,7 @@ export const slackMessageTool: ToolConfig<SlackMessageParams, SlackMessageRespon
       visibility: 'user-or-llm',
       description: 'Message text to send (supports Slack mrkdwn formatting)',
     },
-    threadTs: {
+    thread_ts: {
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
@@ -84,7 +84,7 @@ export const slackMessageTool: ToolConfig<SlackMessageParams, SlackMessageRespon
         channel: isDM ? undefined : params.channel,
         userId: isDM ? params.dmUserId : params.userId,
         text: params.text,
-        thread_ts: params.threadTs || undefined,
+        thread_ts: params.thread_ts || undefined,
         files: params.files || null,
       }
     },

apps/sim/tools/slack/types.ts

@@ -516,7 +516,7 @@ export interface SlackMessageParams extends SlackBaseParams {
   dmUserId?: string
   userId?: string
   text: string
-  threadTs?: string
+  thread_ts?: string
   files?: UserFile[]
 }