From fec6074eae53756feb367c913e4c14d346857ba0 Mon Sep 17 00:00:00 2001
From: Vikhyath Mondreti <vikhyath@simstudio.ai>
Date: Wed, 28 Jan 2026 18:03:27 -0800
Subject: [PATCH] address bugbot comments and fix tests

---
 apps/sim/executor/handlers/workflow/workflow-handler.test.ts | 2 ++
 apps/sim/executor/handlers/workflow/workflow-handler.ts      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts b/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
index 9c8eb70a2..5218dbc05 100644
--- a/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.test.ts
@@ -198,6 +198,7 @@ describe('WorkflowBlockHandler', () => {
 
       expect(result).toEqual({
         success: true,
+        childWorkflowId: 'child-id',
         childWorkflowName: 'Child Workflow',
         result: { data: 'test result' },
         childTraceSpans: [],
@@ -235,6 +236,7 @@ describe('WorkflowBlockHandler', () => {
 
       expect(result).toEqual({
         success: true,
+        childWorkflowId: 'child-id',
         childWorkflowName: 'Child Workflow',
         result: { nested: 'data' },
         childTraceSpans: [],
diff --git a/apps/sim/executor/handlers/workflow/workflow-handler.ts b/apps/sim/executor/handlers/workflow/workflow-handler.ts
index 283a17f06..4d0c4d143 100644
--- a/apps/sim/executor/handlers/workflow/workflow-handler.ts
+++ b/apps/sim/executor/handlers/workflow/workflow-handler.ts
@@ -536,6 +536,7 @@ export class WorkflowBlockHandler implements BlockHandler {
         message: `"${childWorkflowName}" failed: ${childResult.error || 'Child workflow execution failed'}`,
         childWorkflowName,
         childTraceSpans: childTraceSpans || [],
+        childWorkflowSnapshotId,
       })
     }
 
@@ -543,7 +544,7 @@ export class WorkflowBlockHandler implements BlockHandler {
       success: true,
       childWorkflowName,
       childWorkflowId,
-      childWorkflowSnapshotId,
+      ...(childWorkflowSnapshotId ? { childWorkflowSnapshotId } : {}),
       result,
       childTraceSpans: childTraceSpans || [],
     } as Record<string, any>