fix(agent): forward the execution id through the provider payload

Author: TheodoreSpeaks

apps/sim/executor/handlers/agent/agent-handler.ts

@@ -1029,6 +1029,10 @@ export class AgentBlockHandler implements BlockHandler {
         isDeployedContext: ctx.isDeployedContext,
         callChain: ctx.callChain,
         billingAttribution: ctx.metadata.billingAttribution,
+        // Reaches tool `_context` via `prepareToolExecution`, so a tool that starts
+        // its own child execution (a custom block) correlates and cancels against
+        // this real run instead of minting a phantom id.
+        executionId: ctx.executionId,
         reasoningEffort: providerRequest.reasoningEffort,
         verbosity: providerRequest.verbosity,
         thinkingLevel: providerRequest.thinkingLevel,

apps/sim/providers/utils.test.ts

@@ -1730,3 +1730,40 @@ describe('transformBlockTool knowledge-base multi-instance unique IDs', () => {
     expect(result?.id).toBe('knowledge_search')
   })
 })
+
+describe('prepareToolExecution invoker identity hand-off', () => {
+  const tool = { params: {}, parameters: {} }
+
+  /**
+   * A custom block invoked as an agent tool starts its own child execution, and
+   * correlates + cancels against the INVOKING run. That id only reaches it via
+   * `_context`, so this asserts the hand-off rather than any single hop — three
+   * separate fixes each repaired one hop and left the chain broken elsewhere.
+   */
+  it("puts the invoking run's execution id on tool _context", () => {
+    const { executionParams } = prepareToolExecution(
+      tool,
+      {},
+      {
+        workflowId: 'wf-1',
+        workspaceId: 'ws-1',
+        executionId: 'real-execution-id',
+      }
+    )
+
+    expect(executionParams._context.executionId).toBe('real-execution-id')
+  })
+
+  it('omits the execution id when the request carries none', () => {
+    const { executionParams } = prepareToolExecution(
+      tool,
+      {},
+      {
+        workflowId: 'wf-1',
+        workspaceId: 'ws-1',
+      }
+    )
+
+    expect(executionParams._context.executionId).toBeUndefined()
+  })
+})