github/sim
1
1
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-04-06 03:00:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

I hate thsi

Browse Source
This commit is contained in:
Siddharth Ganesan
2025-08-30 16:36:35 -07:00
parent 1feef4ce4b
commit 2e4945508c
3 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/debug/debug.tsx
View File

@@ -365,7 +365,7 @@ export function DebugPanel() {
if (d === (targetDepth as number)) {
const parents = reverseAdj[id] || []
const allParentsExec = parents.every((p) => !!rebuilt.get(p)?.executed)
if (allParentsExec) globalReady.push(id)
if (allParentsExec && !isTriggerBlockId(id)) globalReady.push(id)
}
})
@@ -373,6 +373,7 @@ export function DebugPanel() {
const pendingSelection = globalReady.length > 0 ? globalReady : initialPending
// Clear pending-and-downstream nodes so outputs refresh on next runs
const toClear = new Set<string>()
const qc: string[] = [...pendingSelection]
const seenC = new Set<string>()
@@ -399,10 +400,11 @@ export function DebugPanel() {
newCtx.currentVirtualBlockId = undefined
// Pending are either the global layer or the minimal ready layer/start positions
setPendingBlocks(pendingSelection)
const filteredPending = pendingSelection.filter((id) => !isTriggerBlockId(id))
setPendingBlocks(filteredPending)
setDebugContext(newCtx)
// Also update panel focus to first pending for clarity
setPanelFocusedBlockId(pendingSelection[0] || null)
setPanelFocusedBlockId(filteredPending[0] || null)
} catch {}
}
@@ -481,7 +483,7 @@ export function DebugPanel() {
if (seenC.has(n)) continue
seenC.add(n)
toClear.add(n)
const next = forwardAdj[n] || []
const next = (forwardAdj[n] || []).filter((m) => !isTriggerBlockId(m))
for (const m of next) if (!seenC.has(m)) qc.push(m)
}
toClear.forEach((id) => {
@@ -502,7 +504,7 @@ export function DebugPanel() {
if (seen.has(n)) continue
seen.add(n)
path.add(n)
const next = forwardAdj[n] || []
const next = (forwardAdj[n] || []).filter((m) => !isTriggerBlockId(m))
for (const m of next) if (!seen.has(m)) q.push(m)
}
newCtx.activeExecutionPath = path
@@ -549,7 +551,7 @@ export function DebugPanel() {
if (seenC.has(n)) continue
seenC.add(n)
toClear.add(n)
const next = forwardAdj[n] || []
const next = (forwardAdj[n] || []).filter((m) => !isTriggerBlockId(m))
for (const m of next) if (!seenC.has(m)) qc.push(m)
}
toClear.forEach((id) => {
@@ -570,7 +572,7 @@ export function DebugPanel() {
if (seen.has(n)) continue
seen.add(n)
path.add(n)
const next = forwardAdj[n] || []
const next = (forwardAdj[n] || []).filter((m) => !isTriggerBlockId(m))
for (const m of next) if (!seen.has(m)) q.push(m)
}
newCtx.activeExecutionPath = path
@@ -813,6 +815,22 @@ export function DebugPanel() {
// Matches executor virtual id scheme: `${baseId}_parallel_${parallelId}_iteration_${i}`
return id.startsWith(`${baseId}_parallel_`)
}
// Helper: detect trigger-category blocks (mirror executor/path logic)
const isTriggerBlockId = useCallback(
(id: string | null | undefined): boolean => {
if (!id) return false
const blk = blockById.get(id)
if (!blk) return false
try {
const cfg = getBlock(blk.type)
if ((blk as any)?.metadata?.category === 'triggers') return true
if (cfg?.category === 'triggers') return true
if ((blk as any)?.triggerMode && cfg?.triggers?.enabled) return true
} catch {}
return false
},
[blockById]
)
const starter = useMemo(
() => blocksList.find((b: any) => b.metadata?.id === 'starter' || b.type === 'starter'),
@@ -841,7 +859,7 @@ export function DebugPanel() {
for (const rawId of ids) {
const realId = resolveOriginalBlockId(rawId)
const blk = realId ? blockById.get(realId) : null
if (blk && !isInfraBlockType(blk.type)) return realId
if (blk && !isInfraBlockType(blk.type) && !isTriggerBlockId(realId)) return realId
}
return null
}
@@ -850,7 +868,7 @@ export function DebugPanel() {
if (panelFocusedBlockId) {
const real = resolveOriginalBlockId(panelFocusedBlockId)
const blk = real ? blockById.get(real) : null
if (blk && !isInfraBlockType(blk.type)) return real
if (blk && !isInfraBlockType(blk.type) && !isTriggerBlockId(real)) return real
}
// 2) Next, choose first pending that resolves to non-infra
if (pendingBlocks.length > 0) {
@@ -861,7 +879,7 @@ export function DebugPanel() {
if (lastFocusedIdRef.current) {
const real = resolveOriginalBlockId(lastFocusedIdRef.current)
const blk = real ? blockById.get(real) : null
if (blk && !isInfraBlockType(blk.type)) return real
if (blk && !isInfraBlockType(blk.type) && !isTriggerBlockId(real)) return real
}
// 4) Fallback to starter
if (starterId) return starterId
@@ -876,7 +894,7 @@ export function DebugPanel() {
for (const rawId of pendingBlocks) {
const real = resolveOriginalBlockId(rawId)
const blk = real ? blockById.get(real) : null
if (blk && !isInfraBlockType(blk.type)) return real
if (blk && !isInfraBlockType(blk.type) && !isTriggerBlockId(real)) return real
}
return pendingBlocks[0] || null
})()
@@ -1904,7 +1922,7 @@ export function DebugPanel() {
if (seen.has(n)) continue
seen.add(n)
activeExecutionPath.add(n)
const next = forwardAdjLocal[n] || []
const next = (forwardAdjLocal[n] || []).filter((m) => !isTriggerBlockId(m))
for (const m of next) if (!seen.has(m)) q.push(m)
}
}
@@ -2042,6 +2060,10 @@ export function DebugPanel() {
return
}
// Filter triggers from pending before stepping
const pend = [...useExecutionStore.getState().pendingBlocks].filter((id) => !isTriggerBlockId(id))
if (pend.length === 0) return
await handleStepDebug()
}
@@ -2154,7 +2176,8 @@ export function DebugPanel() {
const st = useExecutionStore.getState()
exec = st.executor
ctx = st.debugContext
pend = [...st.pendingBlocks]
// filter triggers from pending before each step
pend = [...st.pendingBlocks].filter((id) => !isTriggerBlockId(id))
if (!exec || !ctx) break
// Determine executable set
@@ -2178,7 +2201,9 @@ export function DebugPanel() {
setDebugContext(result.metadata.context)
}
if (result?.metadata?.pendingBlocks) {
setPendingBlocks(result.metadata.pendingBlocks)
// Filter triggers from pending updates from executor, to mirror manual behavior
const nextPend = (result.metadata.pendingBlocks as string[]).filter((id) => !isTriggerBlockId(id))
setPendingBlocks(nextPend)
} else {
break
}

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

@@ -166,10 +166,17 @@ export function useWorkflowExecution() {
} catch {}
}
if (result.metadata?.pendingBlocks) {
setPendingBlocks(result.metadata.pendingBlocks)
// Filter triggers from next pending
const filtered = (result.metadata.pendingBlocks as string[]).filter((id) => {
const block = currentWorkflow.blocks[id]
if (!block) return false
const cfg = getBlock(block.type)
return cfg?.category !== 'triggers'
})
setPendingBlocks(filtered)
}
},
[setDebugContext, setPendingBlocks]
[setDebugContext, setPendingBlocks, currentWorkflow.blocks]
)
/**
@@ -786,11 +793,25 @@ export function useWorkflowExecution() {
return
}
// Compute executable set without triggers
const nonTriggerPending = pendingBlocks.filter((id) => {
const block = currentWorkflow.blocks[id]
if (!block) return false
const cfg = getBlock(block.type)
return cfg?.category !== 'triggers'
})
if (nonTriggerPending.length === 0) {
// Nothing executable
setIsExecuting(false)
return
}
try {
logger.info('Executing debug step with blocks:', pendingBlocks)
logger.info('Executing debug step with blocks:', nonTriggerPending)
// Mark current pending blocks as executing for UI pulse
setExecutingBlockIds(new Set(pendingBlocks))
const result = await executor!.continueExecution(pendingBlocks, debugContext!)
setExecutingBlockIds(new Set(nonTriggerPending))
const result = await executor!.continueExecution(nonTriggerPending, debugContext!)
logger.info('Debug step execution result:', result)
// Clear executing state after step returns
setExecutingBlockIds(new Set())
@@ -816,6 +837,7 @@ export function useWorkflowExecution() {
handleDebugSessionComplete,
handleDebugSessionContinuation,
handleDebugExecutionError,
currentWorkflow.blocks,
])
/**
@@ -849,6 +871,14 @@ export function useWorkflowExecution() {
let currentContext = { ...debugContext! }
let currentPendingBlocks = [...pendingBlocks]
// Filter initial pending
currentPendingBlocks = currentPendingBlocks.filter((id) => {
const block = currentWorkflow.blocks[id]
if (!block) return false
const cfg = getBlock(block.type)
return cfg?.category !== 'triggers'
})
logger.info('Starting resume execution with blocks:', currentPendingBlocks)
// Continue execution until there are no more pending blocks
@@ -878,9 +908,14 @@ export function useWorkflowExecution() {
break
}
// Update pending blocks for next iteration
// Update pending blocks for next iteration, filtered
if (currentResult.metadata?.pendingBlocks) {
currentPendingBlocks = currentResult.metadata.pendingBlocks
currentPendingBlocks = (currentResult.metadata.pendingBlocks as string[]).filter((id) => {
const block = currentWorkflow.blocks[id]
if (!block) return false
const cfg = getBlock(block.type)
return cfg?.category !== 'triggers'
})
} else {
logger.info('No pending blocks in result, ending resume')
break
@@ -920,6 +955,7 @@ export function useWorkflowExecution() {
setExecutingBlockIds,
handleDebugSessionComplete,
handleDebugExecutionError,
currentWorkflow.blocks,
])
/**

10
apps/sim/executor/path/path.ts
View File

@@ -207,14 +207,14 @@ export class PathTracker {
// Use routing strategy to determine if this connection should be activated
if (!Routing.shouldSkipConnection(conn.sourceHandle, targetBlockType || '')) {
// Do not activate trigger blocks during downstream activation from manual paths
// Do not activate or traverse trigger blocks during downstream activation from manual paths
if (!isTriggerCategory) {
context.activeExecutionPath.add(conn.target)
}
// Recursively activate downstream paths if the target block should activate downstream
if (Routing.shouldActivateDownstream(targetBlockType || '')) {
this.activateDownstreamPathsSelectively(conn.target, context)
// Recursively activate downstream paths if the target block should activate downstream
if (Routing.shouldActivateDownstream(targetBlockType || '')) {
this.activateDownstreamPathsSelectively(conn.target, context)
}
}
}
}