v0.2.3: fix (#592)

* fix(variable resolution): use variable references to not have escaping issues (#587)

* fix(variable-resolution): don't inject stringified json, use var refs

* fix lint

* remove unused var

---------

Co-authored-by: Vikhyath Mondreti <[email protected]>

* fix(subblock updates): special selectors persistence (#591)

* fix(knowledge-base-selector): should trigger sockets event for persistence

* fix subblock value updates for non useSubblockValue components

* fix lint

---------

Co-authored-by: Vikhyath Mondreti <[email protected]>

* fix(race-cond): for auto-connect rare race condition between adding edge + block (#582)

* auto connect race condition

* fix lint

* Update apps/sim/hooks/use-collaborative-workflow.ts

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Update apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* fix lint

---------

Co-authored-by: Vikhyath Mondreti <[email protected]>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Co-authored-by: Vikhyath Mondreti <[email protected]>

---------

Co-authored-by: Vikhyath Mondreti <[email protected]>
Co-authored-by: Vikhyath Mondreti <[email protected]>
Co-authored-by: Vikhyath Mondreti <[email protected]>
Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

Author: 5 people

apps/sim/app/api/function/execute/route.ts

@@ -58,14 +58,12 @@ function resolveCodeVariables(
 
       // Find the block ID by looking for a block name that normalizes to this value
       let blockId = null
-      let matchedBlockName = null
 
       for (const [blockName, id] of Object.entries(blockNameMapping)) {
         // Apply the same normalization logic as the UI: remove spaces and lowercase
         const normalizedName = blockName.replace(/\s+/g, '').toLowerCase()
         if (normalizedName === normalizedBlockName) {
           blockId = id
-          matchedBlockName = blockName
           break
         }
       }
@@ -151,9 +149,6 @@ export async function POST(req: NextRequest) {
     })
 
     // Resolve variables in the code with workflow environment variables
-    logger.info(`[${requestId}] Original code:`, code.substring(0, 200))
-    logger.info(`[${requestId}] Execution params keys:`, Object.keys(executionParams))
-
     const { resolvedCode, contextVariables } = resolveCodeVariables(
       code,
       executionParams,
@@ -162,9 +157,6 @@ export async function POST(req: NextRequest) {
       blockNameMapping
     )
 
-    logger.info(`[${requestId}] Resolved code:`, resolvedCode.substring(0, 200))
-    logger.info(`[${requestId}] Context variables keys:`, Object.keys(contextVariables))
-
     const executionMethod = 'vm' // Default execution method
 
     // // Try to use Freestyle if the API key is available

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-selector/document-selector.tsx

@@ -13,6 +13,7 @@ import {
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import type { SubBlockConfig } from '@/blocks/types'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
 interface DocumentData {
@@ -50,7 +51,8 @@ export function DocumentSelector({
   isPreview = false,
   previewValue,
 }: DocumentSelectorProps) {
-  const { getValue, setValue } = useSubBlockStore()
+  const { getValue } = useSubBlockStore()
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
 
   const [documents, setDocuments] = useState<DocumentData[]>([])
   const [error, setError] = useState<string | null>(null)
@@ -117,7 +119,7 @@ export function DocumentSelector({
       if (selectedId && !fetchedDocuments.some((doc: DocumentData) => doc.id === selectedId)) {
         setSelectedId('')
         if (!isPreview) {
-          setValue(blockId, subBlock.id, '')
+          collaborativeSetSubblockValue(blockId, subBlock.id, '')
         }
       }
 
@@ -131,7 +133,7 @@ export function DocumentSelector({
           setSelectedId(singleDoc.id)
           setSelectedDocument(singleDoc)
           if (!isPreview) {
-            setValue(blockId, subBlock.id, singleDoc.id)
+            collaborativeSetSubblockValue(blockId, subBlock.id, singleDoc.id)
           }
           onDocumentSelect?.(singleDoc.id)
         }
@@ -141,7 +143,15 @@ export function DocumentSelector({
       setError((err as Error).message)
       setDocuments([])
     }
-  }, [knowledgeBaseId, selectedId, setValue, blockId, subBlock.id, isPreview, onDocumentSelect])
+  }, [
+    knowledgeBaseId,
+    selectedId,
+    collaborativeSetSubblockValue,
+    blockId,
+    subBlock.id,
+    isPreview,
+    onDocumentSelect,
+  ])
 
   // Handle dropdown open/close - fetch documents when opening
   const handleOpenChange = (isOpen: boolean) => {
@@ -163,7 +173,7 @@ export function DocumentSelector({
     setSelectedId(document.id)
 
     if (!isPreview) {
-      setValue(blockId, subBlock.id, document.id)
+      collaborativeSetSubblockValue(blockId, subBlock.id, document.id)
     }
 
     onDocumentSelect?.(document.id)
@@ -193,10 +203,10 @@ export function DocumentSelector({
       setInitialFetchDone(false)
       setError(null)
       if (!isPreview) {
-        setValue(blockId, subBlock.id, '')
+        collaborativeSetSubblockValue(blockId, subBlock.id, '')
       }
     }
-  }, [knowledgeBaseId, blockId, subBlock.id, setValue, isPreview])
+  }, [knowledgeBaseId, blockId, subBlock.id, collaborativeSetSubblockValue, isPreview])
 
   // Fetch documents when knowledge base is available and we haven't fetched yet
   useEffect(() => {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-selector/file-selector-input.tsx

@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import { env } from '@/lib/env'
 import type { SubBlockConfig } from '@/blocks/types'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import type { ConfluenceFileInfo } from './components/confluence-file-selector'
@@ -36,7 +37,8 @@ export function FileSelectorInput({
   isPreview = false,
   previewValue,
 }: FileSelectorInputProps) {
-  const { getValue, setValue } = useSubBlockStore()
+  const { getValue } = useSubBlockStore()
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
   const { activeWorkflowId } = useWorkflowRegistry()
   const [selectedFileId, setSelectedFileId] = useState<string>('')
   const [_fileInfo, setFileInfo] = useState<FileInfo | ConfluenceFileInfo | null>(null)
@@ -115,34 +117,34 @@ export function FileSelectorInput({
   const handleFileChange = (fileId: string, info?: any) => {
     setSelectedFileId(fileId)
     setFileInfo(info || null)
-    setValue(blockId, subBlock.id, fileId)
+    collaborativeSetSubblockValue(blockId, subBlock.id, fileId)
   }
 
   // Handle issue selection
   const handleIssueChange = (issueKey: string, info?: JiraIssueInfo) => {
     setSelectedIssueId(issueKey)
     setIssueInfo(info || null)
-    setValue(blockId, subBlock.id, issueKey)
+    collaborativeSetSubblockValue(blockId, subBlock.id, issueKey)
 
     // Clear the fields when a new issue is selected
     if (isJira) {
-      setValue(blockId, 'summary', '')
-      setValue(blockId, 'description', '')
+      collaborativeSetSubblockValue(blockId, 'summary', '')
+      collaborativeSetSubblockValue(blockId, 'description', '')
     }
   }
 
   // Handle channel selection
   const handleChannelChange = (channelId: string, info?: DiscordChannelInfo) => {
     setSelectedChannelId(channelId)
     setChannelInfo(info || null)
-    setValue(blockId, subBlock.id, channelId)
+    collaborativeSetSubblockValue(blockId, subBlock.id, channelId)
   }
 
   // Handle calendar selection
   const handleCalendarChange = (calendarId: string, info?: GoogleCalendarInfo) => {
     setSelectedCalendarId(calendarId)
     setCalendarInfo(info || null)
-    setValue(blockId, subBlock.id, calendarId)
+    collaborativeSetSubblockValue(blockId, subBlock.id, calendarId)
   }
 
   // For Google Drive
@@ -337,7 +339,7 @@ export function FileSelectorInput({
                 onChange={(value, info) => {
                   setSelectedMessageId(value)
                   setMessageInfo(info || null)
-                  setValue(blockId, subBlock.id, value)
+                  collaborativeSetSubblockValue(blockId, subBlock.id, value)
                 }}
                 provider='microsoft-teams'
                 requiredScopes={subBlock.requiredScopes || []}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-upload.tsx

@@ -4,9 +4,9 @@ import { useRef, useState } from 'react'
 import { X } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Progress } from '@/components/ui/progress'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useNotificationStore } from '@/stores/notifications/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import { useSubBlockValue } from '../hooks/use-sub-block-value'
 
@@ -58,6 +58,7 @@ export function FileUpload({
   // Stores
   const { addNotification } = useNotificationStore()
   const { activeWorkflowId } = useWorkflowRegistry()
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
 
   // Use preview value when in preview mode, otherwise use store value
   const value = isPreview ? previewValue : storeValue
@@ -298,15 +299,15 @@ export function FileUpload({
 
         setStoreValue(newFiles)
 
-        // Make sure to update the subblock store value for the workflow execution
-        useSubBlockStore.getState().setValue(blockId, subBlockId, newFiles)
+        // Use collaborative update for persistence
+        collaborativeSetSubblockValue(blockId, subBlockId, newFiles)
         useWorkflowStore.getState().triggerUpdate()
       } else {
         // For single file: Replace with last uploaded file
         setStoreValue(uploadedFiles[0] || null)
 
-        // Make sure to update the subblock store value for the workflow execution
-        useSubBlockStore.getState().setValue(blockId, subBlockId, uploadedFiles[0] || null)
+        // Use collaborative update for persistence
+        collaborativeSetSubblockValue(blockId, subBlockId, uploadedFiles[0] || null)
         useWorkflowStore.getState().triggerUpdate()
       }
     } catch (error) {
@@ -363,16 +364,18 @@ export function FileUpload({
         const updatedFiles = filesArray.filter((f) => f.path !== file.path)
         setStoreValue(updatedFiles.length > 0 ? updatedFiles : null)
 
-        // Make sure to update the subblock store value for the workflow execution
-        useSubBlockStore
-          .getState()
-          .setValue(blockId, subBlockId, updatedFiles.length > 0 ? updatedFiles : null)
+        // Use collaborative update for persistence
+        collaborativeSetSubblockValue(
+          blockId,
+          subBlockId,
+          updatedFiles.length > 0 ? updatedFiles : null
+        )
       } else {
         // For single file: Clear the value
         setStoreValue(null)
 
-        // Make sure to update the subblock store
-        useSubBlockStore.getState().setValue(blockId, subBlockId, null)
+        // Use collaborative update for persistence
+        collaborativeSetSubblockValue(blockId, subBlockId, null)
       }
 
       useWorkflowStore.getState().triggerUpdate()
@@ -413,7 +416,7 @@ export function FileUpload({
 
     // Clear input state immediately for better UX
     setStoreValue(null)
-    useSubBlockStore.getState().setValue(blockId, subBlockId, null)
+    collaborativeSetSubblockValue(blockId, subBlockId, null)
     useWorkflowStore.getState().triggerUpdate()
 
     if (fileInputRef.current) {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/knowledge-base-selector/knowledge-base-selector.tsx

@@ -14,6 +14,7 @@ import {
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import type { SubBlockConfig } from '@/blocks/types'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { type KnowledgeBaseData, useKnowledgeStore } from '@/stores/knowledge/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
@@ -36,7 +37,8 @@ export function KnowledgeBaseSelector({
 }: KnowledgeBaseSelectorProps) {
   const { getKnowledgeBasesList, knowledgeBasesList, loadingKnowledgeBasesList } =
     useKnowledgeStore()
-  const { getValue, setValue } = useSubBlockStore()
+  const { getValue } = useSubBlockStore()
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
 
   const [knowledgeBases, setKnowledgeBases] = useState<KnowledgeBaseData[]>([])
   const [loading, setLoading] = useState(false)
@@ -90,7 +92,8 @@ export function KnowledgeBaseSelector({
     setSelectedKnowledgeBases([knowledgeBase])
 
     if (!isPreview) {
-      setValue(blockId, subBlock.id, knowledgeBase.id)
+      // Use collaborative update for both local store and persistence
+      collaborativeSetSubblockValue(blockId, subBlock.id, knowledgeBase.id)
     }
 
     onKnowledgeBaseSelect?.(knowledgeBase.id)
@@ -117,7 +120,8 @@ export function KnowledgeBaseSelector({
     if (!isPreview) {
       const selectedIds = newSelected.map((kb) => kb.id)
       const valueToStore = selectedIds.length === 1 ? selectedIds[0] : selectedIds.join(',')
-      setValue(blockId, subBlock.id, valueToStore)
+      // Use collaborative update for both local store and persistence
+      collaborativeSetSubblockValue(blockId, subBlock.id, valueToStore)
     }
 
     onKnowledgeBaseSelect?.(newSelected.map((kb) => kb.id))
@@ -133,7 +137,8 @@ export function KnowledgeBaseSelector({
     if (!isPreview) {
       const selectedIds = newSelected.map((kb) => kb.id)
       const valueToStore = selectedIds.length === 1 ? selectedIds[0] : selectedIds.join(',')
-      setValue(blockId, subBlock.id, valueToStore)
+      // Use collaborative update for both local store and persistence
+      collaborativeSetSubblockValue(blockId, subBlock.id, valueToStore)
     }
 
     onKnowledgeBaseSelect?.(newSelected.map((kb) => kb.id))

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/project-selector/project-selector-input.tsx

@@ -3,6 +3,7 @@
 import { useEffect, useState } from 'react'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 import type { SubBlockConfig } from '@/blocks/types'
+import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { type DiscordServerInfo, DiscordServerSelector } from './components/discord-server-selector'
 import { type JiraProjectInfo, JiraProjectSelector } from './components/jira-project-selector'
@@ -26,7 +27,8 @@ export function ProjectSelectorInput({
   isPreview = false,
   previewValue,
 }: ProjectSelectorInputProps) {
-  const { getValue, setValue } = useSubBlockStore()
+  const { getValue } = useSubBlockStore()
+  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
   const [selectedProjectId, setSelectedProjectId] = useState<string>('')
   const [_projectInfo, setProjectInfo] = useState<JiraProjectInfo | DiscordServerInfo | null>(null)
 
@@ -58,21 +60,21 @@ export function ProjectSelectorInput({
   ) => {
     setSelectedProjectId(projectId)
     setProjectInfo(info || null)
-    setValue(blockId, subBlock.id, projectId)
+    collaborativeSetSubblockValue(blockId, subBlock.id, projectId)
 
     // Clear the issue-related fields when a new project is selected
     if (provider === 'jira') {
-      setValue(blockId, 'summary', '')
-      setValue(blockId, 'description', '')
-      setValue(blockId, 'issueKey', '')
+      collaborativeSetSubblockValue(blockId, 'summary', '')
+      collaborativeSetSubblockValue(blockId, 'description', '')
+      collaborativeSetSubblockValue(blockId, 'issueKey', '')
     } else if (provider === 'discord') {
-      setValue(blockId, 'channelId', '')
+      collaborativeSetSubblockValue(blockId, 'channelId', '')
     } else if (provider === 'linear') {
       if (subBlock.id === 'teamId') {
-        setValue(blockId, 'teamId', projectId)
-        setValue(blockId, 'projectId', '')
+        collaborativeSetSubblockValue(blockId, 'teamId', projectId)
+        collaborativeSetSubblockValue(blockId, 'projectId', '')
       } else if (subBlock.id === 'projectId') {
-        setValue(blockId, 'projectId', projectId)
+        collaborativeSetSubblockValue(blockId, 'projectId', projectId)
       }
     }