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

Stuff

Browse Source
This commit is contained in:
Siddharth Ganesan
2025-08-30 15:46:20 -07:00
parent 396c9db204
commit a516325733
3 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1851,19 +1851,23 @@ export function DebugPanel() {
// Completed-state initialization for past executions
const blocksMap = state.blocks || {}
const triggerBlockId = executionData?.trigger?.data?.blockId as string | undefined
if (!triggerBlockId || !blocksMap[triggerBlockId]) {
return
// Determine starting block: prefer trigger block, otherwise fall back to starter for manual runs
let startingBlockId = executionData?.trigger?.data?.blockId as string | undefined
if (!startingBlockId || !blocksMap[startingBlockId]) {
startingBlockId = Object.keys(blocksMap).find((id) => (blocksMap as any)[id]?.type === 'starter')
if (!startingBlockId) {
return
}
}
// Build completed context: trigger + all executed blocks
const blockStates = new Map<string, any>()
const executedBlocks = new Set<string>()
// Trigger as executed with initial input
// Starting block (trigger or starter) as executed with initial input
const triggerOutput = (executionData?.initialInput as any) || {}
blockStates.set(triggerBlockId, { output: triggerOutput, executed: true, executionTime: 0 })
executedBlocks.add(triggerBlockId)
blockStates.set(startingBlockId, { output: triggerOutput, executed: true, executionTime: 0 })
executedBlocks.add(startingBlockId)
// Block executions
const execs = (executionData?.blockExecutions as any[]) || []
@@ -1904,7 +1908,7 @@ export function DebugPanel() {
for (const m of next) if (!seen.has(m)) q.push(m)
}
}
addPathFrom(triggerBlockId)
addPathFrom(startingBlockId)
const newDebugCtx: any = {
blockStates,
@@ -1938,7 +1942,7 @@ export function DebugPanel() {
const execStore = useExecutionStore.getState()
const lastExecId = execs.length > 0 ? String(execs[execs.length - 1]?.blockId || '') : null
execStore.setPendingBlocks([])
execStore.setPanelFocusedBlockId((lastExecId && blocksMap[lastExecId]) ? lastExecId : triggerBlockId)
execStore.setPanelFocusedBlockId((lastExecId && blocksMap[lastExecId]) ? lastExecId : startingBlockId)
execStore.setIsExecuting(false)
execStore.setIsDebugging(true)
@@ -1962,10 +1966,10 @@ export function DebugPanel() {
// Precompute and store initial (trigger-pending) state for fast Restart
try {
const initialBlockStates = new Map<string, any>()
initialBlockStates.set(triggerBlockId, { output: triggerOutput, executed: false, executionTime: 0 })
initialBlockStates.set(startingBlockId, { output: triggerOutput, executed: false, executionTime: 0 })
const initialActivePath = new Set<string>()
addPathFrom(triggerBlockId)
addPathFrom(startingBlockId)
forwardAdjLocal // reference to keep ts happy in transformed block
const initialDebugCtx: any = {
blockStates: initialBlockStates,
@@ -1987,7 +1991,7 @@ export function DebugPanel() {
lastFrozenRef.current = {
state,
executionData,
initial: { debugContext: initialDebugCtx, pendingBlocks: [triggerBlockId] },
initial: { debugContext: initialDebugCtx, pendingBlocks: [startingBlockId] },
}
} catch {
lastFrozenRef.current = { state, executionData }
@@ -2048,15 +2052,19 @@ export function DebugPanel() {
const { state, executionData, initial } = lastFrozenRef.current
try {
const blocksMap = state.blocks || {}
const triggerBlockId = (executionData?.trigger?.data?.blockId as string | undefined) || null
if (!triggerBlockId || !blocksMap[triggerBlockId]) return
// Determine starting block: prefer trigger, else starter for manual runs
let startingBlockId = (executionData?.trigger?.data?.blockId as string | undefined) || null
if (!startingBlockId || !blocksMap[startingBlockId]) {
startingBlockId = Object.keys(blocksMap).find((id) => (blocksMap as any)[id]?.type === 'starter') || null
}
if (!startingBlockId) return
const execStore = useExecutionStore.getState()
if (initial?.debugContext && Array.isArray(initial?.pendingBlocks)) {
// Use precomputed initial state
execStore.setPendingBlocks(initial.pendingBlocks)
execStore.setPanelFocusedBlockId(triggerBlockId)
execStore.setPanelFocusedBlockId(startingBlockId)
execStore.setIsExecuting(false)
execStore.setIsDebugging(true)

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

@@ -746,7 +746,7 @@ export class Executor {
Object.entries(this.initialBlockStates).forEach(([blockId, output]) => {
context.blockStates.set(blockId, {
output: output as NormalizedBlockOutput,
executed: false,
executed: true,
executionTime: 0,
})
})
@@ -961,9 +961,13 @@ export class Executor {
const connectedToStartBlock = this.actualWorkflow.connections
.filter((conn) => conn.source === initBlock.id)
.map((conn) => conn.target)
// Skip trigger-category targets when seeding from starter (manual/debug runs)
connectedToStartBlock.forEach((blockId) => {
context.activeExecutionPath.add(blockId)
const targetBlock = this.actualWorkflow.blocks.find((b) => b.id === blockId)
const isTriggerCategory = (targetBlock as any)?.metadata?.category === 'triggers'
if (!isTriggerCategory) {
context.activeExecutionPath.add(blockId)
}
})
}

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

@@ -203,10 +203,14 @@ export class PathTracker {
if (!context.activeExecutionPath.has(conn.target)) {
const targetBlock = this.getBlock(conn.target)
const targetBlockType = targetBlock?.metadata?.id
const isTriggerCategory = (targetBlock as any)?.metadata?.category === 'triggers'
// Use routing strategy to determine if this connection should be activated
if (!Routing.shouldSkipConnection(conn.sourceHandle, targetBlockType || '')) {
context.activeExecutionPath.add(conn.target)
// Do not activate 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 || '')) {
@@ -233,7 +237,11 @@ export class PathTracker {
)
for (const conn of targetConnections) {
context.activeExecutionPath.add(conn.target)
const targetBlock = this.getBlock(conn.target)
const isTriggerCategory = (targetBlock as any)?.metadata?.category === 'triggers'
if (!isTriggerCategory) {
context.activeExecutionPath.add(conn.target)
}
logger.debug(`Condition ${block.id} activated path to: ${conn.target}`)
// Check if the selected target should activate downstream paths
@@ -282,13 +290,16 @@ export class PathTracker {
if (this.shouldActivateConnection(conn, hasError, isPartOfLoop, blockLoops, context)) {
const targetBlock = this.getBlock(conn.target)
const targetBlockType = targetBlock?.metadata?.id
const isTriggerCategory = (targetBlock as any)?.metadata?.category === 'triggers'
// Use routing strategy to determine if this connection should be activated
if (Routing.shouldSkipConnection(conn.sourceHandle, targetBlockType || '')) {
continue
}
context.activeExecutionPath.add(conn.target)
if (!isTriggerCategory) {
context.activeExecutionPath.add(conn.target)
}
}
}
}