Skip to content

fix(env-vars): refactor for workspace/personal env vars to work with server side execution correctly #2197

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
icecrasher321 merged 13 commits into from
Dec 5, 2025
Merged

fix(env-vars): refactor for workspace/personal env vars to work with server side execution correctly #2197

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
89fe02b
fix(env-var-resolution): new executor env var resolution changes
icecrasher321 Dec 4, 2025
4679ed3
Merge staging into fix/env-vars-new-exec - resolve skeleton loading c…
icecrasher321 Dec 4, 2025
18dfa39
add sessionuser id"
icecrasher321 Dec 4, 2025
dd73d94
cleanup code
icecrasher321 Dec 4, 2025
2a5b9ae
Merge staging into fix/env-vars-new-exec
icecrasher321 Dec 4, 2025
e836ad2
add doc update
icecrasher321 Dec 4, 2025
7e943ec
fix build
icecrasher321 Dec 4, 2025
f440af7
fix client session pass through"
icecrasher321 Dec 5, 2025
a010ebd
add type change
icecrasher321 Dec 5, 2025
05c9ed8
Merge branch 'staging' into fix/env-vars-new-exec
icecrasher321 Dec 5, 2025
f7dbfd5
Merge branch 'staging' into fix/env-vars-new-exec
icecrasher321 Dec 5, 2025
3a15516
fix env var with hitl
icecrasher321 Dec 5, 2025
02396d5
fix types
icecrasher321 Dec 5, 2025
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
Next Next commit
fix(env-var-resolution): new executor env var resolution changes
  • Loading branch information
@icecrasher321
icecrasher321 committed Dec 4, 2025
commit 89fe02b3ddd6c2d635d57bd2a66e4eaf59de5762
6 changes: 5 additions & 1 deletion apps/sim/app/api/workflows/[id]/execute/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const ExecuteWorkflowSchema = z.object({
stream: z.boolean().optional(),
useDraftState: z.boolean().optional(),
input: z.any().optional(),
// Optional workflow state override (for executing diff workflows)
isClientSession: z.boolean().optional(),
workflowStateOverride: z
.object({
blocks: z.record(z.any()),
Expand Down Expand Up @@ -95,6 +95,7 @@ export async function executeWorkflow(
triggerType,
useDraftState: false,
startTime: new Date().toISOString(),
isClientSession: false,
}

const snapshot = new ExecutionSnapshot(
Expand Down Expand Up @@ -329,6 +330,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
stream: streamParam,
useDraftState,
input: validatedInput,
isClientSession = false,
workflowStateOverride,
} = validation.data

Expand Down Expand Up @@ -506,6 +508,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
triggerType,
useDraftState: shouldUseDraftState,
startTime: new Date().toISOString(),
isClientSession,
workflowStateOverride: effectiveWorkflowStateOverride,
}

Expand Down Expand Up @@ -772,6 +775,7 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
triggerType,
useDraftState: shouldUseDraftState,
startTime: new Date().toISOString(),
isClientSession,
workflowStateOverride: effectiveWorkflowStateOverride,
}

Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-execution-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ export async function executeWorkflowWithFullLogging(
const executionId = options.executionId || uuidv4()
const { addConsole } = useTerminalConsoleStore.getState()

// Build request payload
const payload: any = {
input: options.workflowInput,
stream: true,
triggerType: options.overrideTriggerType || 'manual',
useDraftState: true,
isClientSession: true,
}

const response = await fetch(`/api/workflows/${activeWorkflowId}/execute`, {
Expand Down
Loading