Skip to content

fix(executor): copy the env map at the workflow-tool boundary #6618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 1 commit into from
Aug 12, 2026
+28 −1
Merged

fix(executor): copy the env map at the workflow-tool boundary #6618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions apps/sim/tools/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,6 +1550,29 @@ describe('executeTool Function', () => {
)
})

it('copies the env map so a child run cannot corrupt the parent context', async () => {
mockRunWorkflowTool.mockResolvedValueOnce({ success: true, output: { ok: true } })
const executionContext = createToolExecutionContext({
environmentVariables: { MY_API_KEY: 'parent-secret' },
})

await executeTool(
'workflow_executor_child-workflow',
{ workflowId: 'child-workflow' },
{ executionContext }
)

const forwarded = (mockRunWorkflowTool.mock.calls[0]?.[1] as Record<string, unknown>)
.environmentVariables as Record<string, string>
expect(forwarded).toEqual({ MY_API_KEY: 'parent-secret' })
expect(forwarded).not.toBe(executionContext.environmentVariables)

forwarded.MY_API_KEY = 'mutated-by-child'
forwarded.INJECTED = 'added-by-child'

expect(executionContext.environmentVariables).toEqual({ MY_API_KEY: 'parent-secret' })
})

it('leaves the custom-block runner without the consumer redaction policy', async () => {
mockRunCustomBlockTool.mockResolvedValueOnce({ success: true, output: { ok: true } })

Expand Down
6 changes: 5 additions & 1 deletion apps/sim/tools/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1792,7 +1792,11 @@ async function executeToolImplementation(
// Trusted `executionContext`, never `_context` — that bag spreads
// model-reachable `contextParams._context` first, so a model could otherwise
// inject its own env map or disable redaction.
environmentVariables: executionContext?.environmentVariables ?? {},
// Copied, not aliased: the child holds this map for its whole run, and a
// write through it would corrupt the parent's env and every later sibling
// tool call. Every other consumer of `ctx.environmentVariables` already
// copies (`normalizeStringRecord`); this boundary is the longest-lived one.
environmentVariables: { ...executionContext?.environmentVariables },
piiBlockOutputRedaction: executionContext?.piiBlockOutputRedaction,
}
)
Expand Down
Loading