Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
fix(schedules): preserve paused state on edit, stricter cron validation, schedule UX (#7235)
Shuchang Zhengb4e6c8f1cc41
diff --git a/skyvern-frontend/src/routes/schedules/CreateOrgScheduleDialog.tsx b/skyvern-frontend/src/routes/schedules/CreateOrgScheduleDialog.tsxindex 29b4548b7..301491974 100644--- a/skyvern-frontend/src/routes/schedules/CreateOrgScheduleDialog.tsx+++ b/skyvern-frontend/src/routes/schedules/CreateOrgScheduleDialog.tsx@@ -26,6 +26,7 @@ import {getNextRuns,getTimezones,isValidCron,+ meetsMinCronInterval,} from "@/routes/workflows/editor/panels/schedulePanel/cronUtils";import { cn } from "@/util/utils";import { useWorkflowQuery } from "@/routes/workflows/hooks/useWorkflowQuery";@@ -134,6 +135,8 @@ function CreateOrgScheduleDialog({ open, onOpenChange }: Readonly<Props>) {}, [timezoneFilter, allTimezones]);const valid = isValidCron(cronExpression);+ const intervalTooShort = valid && !meetsMinCronInterval(cronExpression);+ const cronAccepted = valid && !intervalTooShort;const humanReadable = valid ? cronToHumanReadable(cronExpression) : null;const nextRuns = valid ? getNextRuns(cronExpression, timezone, 5) : [];@@ -152,7 +155,7 @@ function CreateOrgScheduleDialog({ open, onOpenChange }: Readonly<Props>) {function handleSubmit() {if (!selectedWorkflow || !workflowDetailLoaded) return;const parametersValid = validateParameters();- if (!valid || !parametersValid) return;+ if (!cronAccepted || !parametersValid) return;const payload = buildScheduleParametersPayload(parameters,workflowParameters,@@ -300,7 +303,9 @@ function CreateOrgScheduleDialog({ open, onOpenChange }: Readonly<Props>) {value={cronExpression}onChange={(e) => setCronExpression(e.target.value)}placeholder="* * * * *"- className={cn(!valid && cronExpression && "border-destructive")}+ className={cn(+ cronExpression && !cronAccepted && "border-destructive",+ )}/>{humanReadable && (<p className="text-sm text-slate-400">{humanReadable}</p>@@ -310,6 +315,11 @@ function CreateOrgScheduleDialog({ open, onOpenChange }: Readonly<Props>) {Invalid cron expression</p>)}+ {intervalTooShort && (+ <p className="text-sm text-destructive">+ Schedule runs must be at least 5 minutes apart.+ </p>+ )}</div>{/* Timezone Selector */}@@ -383,7 +393,7 @@ function CreateOrgScheduleDialog({ open, onOpenChange }: Readonly<Props>) {</Button><Buttondisabled={- !valid || !workflowDetailLoaded || createMutation.isPending+ !cronAccepted || !workflowDetailLoaded || createMutation.isPending}onClick={handleSubmit}>diff --git a/skyvern-frontend/src/routes/schedules/ScheduleDetailPage.tsx b/skyvern-frontend/src/routes/schedules/ScheduleDetailPage.tsxindex a35de9394..e9dd13fe1 100644--- a/skyvern-frontend/src/routes/schedules/ScheduleDetailPage.tsx+++ b/skyvern-frontend/src/routes/schedules/ScheduleDetailPage.tsx@@ -33,8 +33,10 @@ import {getNextRuns,getTimezones,isValidCron,+ meetsMinCronInterval,} from "@/routes/workflows/editor/panels/schedulePanel/cronUtils";import { cn } from "@/util/utils";+import { getErrorDetail } from "@/util/getErrorDetail";import { basicLocalTimeFormat, basicTimeFormat } from "@/util/timeFormat";import { ScheduleParametersSection } from "@/routes/workflows/components/ScheduleParametersSection";import {@@ -52,7 +54,7 @@ function ScheduleDetailPage() {const navigate = useNavigate();const location = useLocation();const { workflowPermanentId, scheduleId } = useParams();- const { data, isLoading, isError } = useScheduleDetailQuery(+ const { data, isLoading, isError, error } = useScheduleDetailQuery(workflowPermanentId,scheduleId,);@@ -106,6 +108,8 @@ function ScheduleDetailPage() {// ! end TODOconst editValid = isValidCron(editCron);+ const editIntervalTooShort = editValid && !meetsMinCronInterval(editCron);+ const editCronAccepted = editValid && !editIntervalTooShort;const editHumanReadable = editValid ? cronToHumanReadable(editCron) : null;const editNextRuns = editValid ? getNextRuns(editCron, editTimezone, 5) : [];@@ -118,15 +122,22 @@ function ScheduleDetailPage() {}if (isError || !data) {+ const detail = getErrorDetail(error);return (<div className="py-20 text-center text-sm text-red-400">Failed to load schedule details.+ {detail && (+ <span className="mt-1 block text-xs text-slate-500">{detail}</span>+ )}</div>);}const { schedule, next_runs } = data;const humanReadable = cronToHumanReadable(schedule.cron_expression);+ const scheduleCronTooFrequent =+ isValidCron(schedule.cron_expression) &&+ !meetsMinCronInterval(schedule.cron_expression);function startEditing() {setEditCron(schedule.cron_expression);@@ -149,7 +160,7 @@ function ScheduleDetailPage() {function handleSave() {if (!workflowPermanentId || !scheduleId) return;const parametersValid = validateParameters();- if (!editValid || !parametersValid) return;+ if (!editCronAccepted || !parametersValid) return;// Only persist explicitly-set overrides. The form is seeded from// workflow defaults, so blindly sending the whole values dict would// pin the current default into the schedule and change semantics from@@ -163,9 +174,10 @@ function ScheduleDetailPage() {workflowPermanentId,scheduleId,request: {+ // `enabled` is intentionally omitted so the edit preserves whatever+ // the enable/disable toggle set, even if this detail query is stale.cron_expression: editCron,timezone: editTimezone,- enabled: schedule.enabled,parameters: payload,...(editName && { name: editName }),description: editDescription || undefined,@@ -346,7 +358,7 @@ function ScheduleDetailPage() {placeholder="* * * * *"className={cn("h-8 text-sm",- !editValid && editCron && "border-destructive",+ editCron && !editCronAccepted && "border-destructive",)}/>{editHumanReadable && (@@ -357,6 +369,11 @@ function ScheduleDetailPage() {Invalid cron expression</p>)}+ {editIntervalTooShort && (+ <p className="text-xs text-destructive">+ Schedule runs must be at least 5 minutes apart.+ </p>+ )}</div>{/* Timezone */}@@ -431,7 +448,7 @@ function ScheduleDetailPage() {<Buttonsize="sm"className="h-7 text-xs"- disabled={!editValid || updateMutation.isPending}+ disabled={!editCronAccepted || updateMutation.isPending}onClick={handleSave}>{updateMutation.isPending ? "Saving..." : "Save"}@@ -464,6 +481,12 @@ function ScheduleDetailPage() {{schedule.cron_expression}</code></div>+ {scheduleCronTooFrequent && (+ <div className="rounded border border-amber-600/40 bg-amber-900/20 px-2 py-1 text-xs text-amber-200">+ This schedule fires more often than the 5-minute minimum.+ Saving any change requires updating its cron expression first.+ </div>+ )}</div>)}</div>diff --git a/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx b/skyvern-frontend/src/routes/schedules/SchedulesPage.tsxindex c45f5a728..b2dcea744 100644--- a/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx+++ b/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx@@ -1,16 +1,19 @@-import { useState } from "react";+import { useMemo, useState } from "react";import { useNavigate, useSearchParams } from "react-router-dom";import { useDebounce } from "use-debounce";+import { getErrorDetail } from "@/util/getErrorDetail";import {ChevronDownIcon,CopyIcon,DotsHorizontalIcon,+ ExclamationTriangleIcon,PauseIcon,PlayIcon,PlusIcon,ReloadIcon,TrashIcon,} from "@radix-ui/react-icons";+import { Tip } from "@/components/Tip";import {Table,TableBody,@@ -49,6 +52,7 @@ import {SelectValue,} from "@/components/ui/select";import { useQueryClient } from "@tanstack/react-query";+import { toast } from "@/components/ui/use-toast";import { Button } from "@/components/ui/button";import { Checkbox } from "@/components/ui/checkbox";import { SelectionBar } from "@/components/SelectionBar";@@ -73,7 +77,11 @@ import {useDuplicateScheduleMutation,useEnableScheduleMutation,} from "./useScheduleActions";-import { cronToHumanReadable } from "@/routes/workflows/editor/panels/schedulePanel/cronUtils";+import {+ cronToHumanReadable,+ isValidCron,+ meetsMinCronInterval,+} from "@/routes/workflows/editor/panels/schedulePanel/cronUtils";import { basicLocalTimeFormat, basicTimeFormat } from "@/util/timeFormat";import type { OrganizationScheduleItem } from "@/routes/workflows/types/scheduleTypes";import { CreateOrgScheduleDialog } from "./CreateOrgScheduleDialog";@@ -126,16 +134,32 @@ function SchedulesPage() {statusFilter,search: debouncedSearch || undefined,});+ const errorDetail = getErrorDetail(error);const enableMutation = useEnableScheduleMutation();const disableMutation = useDisableScheduleMutation();const deleteMutation = useDeleteOrgScheduleMutation();const duplicateMutation = useDuplicateScheduleMutation();- const schedules = data?.schedules ?? [];+ const schedules = useMemo(() => data?.schedules ?? [], [data]);const totalCount = data?.total_count ?? 0;const totalPages = Math.max(1, Math.ceil(totalCount / pageSize));+ // meetsMinCronInterval samples up to 2000 future fires; memoize per cron string+ // so unrelated re-renders (selection, dialogs) don't re-run it for every row.+ const cronsBelowMinInterval = useMemo(() => {+ const violations = new Set<string>();+ for (const schedule of schedules) {+ if (+ isValidCron(schedule.cron_expression) &&+ !meetsMinCronInterval(schedule.cron_expression)+ ) {+ violations.add(schedule.cron_expression);+ }+ }+ return violations;+ }, [schedules]);+const {selected,selectedItems: selectedSchedules,@@ -224,6 +248,10 @@ function SchedulesPage() {function handleBulkActivate() {const toActivate = selectedSchedules.filter((s) => !s.enabled);+ if (toActivate.length === 0) {+ toast({ title: "All selected schedules are already active." });+ return;+ }void runBulkOperation(toActivate,(client, item) =>@@ -237,6 +265,10 @@ function SchedulesPage() {function handleBulkPause() {const toPause = selectedSchedules.filter((s) => s.enabled);+ if (toPause.length === 0) {+ toast({ title: "All selected schedules are already paused." });+ return;+ }void runBulkOperation(toPause,(client, item) =>@@ -393,9 +425,9 @@ function SchedulesPage() {className="py-8 text-center text-sm text-red-400">Failed to load schedules.- {error?.message && (+ {errorDetail && (<span className="block text-xs text-slate-500">- {error.message}+ {errorDetail}</span>)}</TableCell>@@ -455,7 +487,16 @@ function SchedulesPage() {{schedule.name ?? "\u2014"}</TableCell><TableCell className="text-slate-400">- {cronToHumanReadable(schedule.cron_expression)}+ <div className="flex items-center gap-1.5">+ <span className="truncate">+ {cronToHumanReadable(schedule.cron_expression)}+ </span>+ {cronsBelowMinInterval.has(schedule.cron_expression) && (+ <Tip content="This schedule fires more often than the 5-minute minimum. Saving any change requires updating its cron expression first.">+ <ExclamationTriangleIcon className="size-3.5 shrink-0 text-amber-400" />+ </Tip>+ )}+ </div></TableCell><TableCell className="text-slate-400">{schedule.next_run ? (diff --git a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsxindex 4e29dd4fb..fd6747c21 100644--- a/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx+++ b/skyvern-frontend/src/routes/workflows/RunWorkflowForm.tsx@@ -21,6 +21,7 @@ import {AccordionItem,AccordionTrigger,} from "@/components/ui/accordion";+import { Badge } from "@/components/ui/badge";import {Form,FormControl,@@ -36,6 +37,7 @@ import {SelectTrigger,SelectValue,} from "@/components/ui/select";+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";import { Switch } from "@/components/ui/switch";import { CopyApiCommandDropdown } from "@/components/CopyApiCommandDropdown";import { Input } from "@/components/ui/input";@@ -59,10 +61,11 @@ import { parseHeaderJson } from "@/util/secretHeaders";import { MAX_SCREENSHOT_SCROLLS_DEFAULT } from "./editor/nodes/Taskv2Node/types";import { getLabelForWorkflowParameterType } from "./editor/workflowEditorUtils";import {+ CredentialParameter,WorkflowApiResponse,WorkflowBlock,WorkflowParameter,- isNestedLoopWorkflowBlock,+ WorkflowParameterTypes,} from "./types/workflowTypes";import { WorkflowParameterInput } from "./WorkflowParameterInput";import { BrowserProfileSelector } from "./components/BrowserProfileSelector";@@ -72,6 +75,12 @@ import {parseJsonWorkflowParameterValue,validateJsonWorkflowParameterValue,} from "./utils";+import {+ getLoginCredentialInputs,+ getRotatingCredentialIds,+} from "./runWorkflowCredentials";+import { useCredentialsQuery } from "./hooks/useCredentialsQuery";+import { visitWorkflowBlocks } from "./workflowBlockUtils";/*** Recursively finds all login blocks that don't have any credential parameters selected.@@ -82,18 +91,14 @@ function getLoginBlocksWithoutCredentials(): Array<{ label: string }> {const result: Array<{ label: string }> = [];- for (const block of blocks) {+ visitWorkflowBlocks(blocks, (block) => {if (block.block_type === "login") {// Login block requires at least one parameter (credential) to be selectedif (!block.parameters || block.parameters.length === 0) {result.push({ label: block.label });}}-- if (isNestedLoopWorkflowBlock(block) && block.loop_blocks) {- result.push(...getLoginBlocksWithoutCredentials(block.loop_blocks));- }- }+ });return result;}@@ -191,6 +196,14 @@ function parseValuesForWorkflowRun();}+function omitUndefinedValues(+ values: Record<string, unknown>,+): Record<string, unknown> {+ return Object.fromEntries(+ Object.entries(values).filter(([, value]) => value !== undefined),+ );+}+type RunWorkflowRequestBody = {data: Record<string, unknown>; // workflow parameters and valuesproxy_location: ProxyLocation | null;@@ -227,12 +240,13 @@ function getRunWorkflowRequestBody(parameters,workflowParameters,);+ const data = omitUndefinedValues(parsedParameters);const bsi = browserSessionId?.trim() === "" ? null : browserSessionId;const bpi = browserProfileId?.trim() === "" ? null : browserProfileId;const body: RunWorkflowRequestBody = {- data: parsedParameters,+ data,proxy_location: proxyLocation,browser_session_id: bsi,browser_profile_id: bpi,@@ -303,6 +317,57 @@ function deriveRunWith(return "agent";}+function formatCredentialSelectionStrategy(+ selectionStrategy: CredentialParameter["selection_strategy"],+) {+ if (selectionStrategy === "random") {+ return "Random";+ }++ return "Round robin";+}++function formatLoginBlockList(labels: Array<string>) {+ if (labels.length <= 1) {+ return labels[0] ?? "";+ }++ if (labels.length === 2) {+ return `${labels[0]} and ${labels[1]}`;+ }++ const lastLabel = labels[labels.length - 1];+ return `${labels.slice(0, -1).join(", ")}, and ${lastLabel}`;+}++function getLoginCredentialDisplayText(+ parameter: WorkflowParameter | CredentialParameter,+ loginBlockLabels: Array<string>,+) {+ const parameterLabel = parameter.description || parameter.key;++ // Prefer the login block label for single-use credentials, but use the+ // parameter label plus "Used by ..." copy when one credential is shared.+ if (loginBlockLabels.length === 1) {+ return {+ title: loginBlockLabels[0] ?? parameterLabel,+ description: parameterLabel,+ };+ }++ if (loginBlockLabels.length === 0) {+ return {+ title: parameterLabel,+ description: parameter.key,+ };+ }++ return {+ title: parameterLabel,+ description: `Used by ${formatLoginBlockList(loginBlockLabels)}`,+ };+}+type RunWorkflowFormType = Record<string, unknown> & {webhookCallbackUrl: string;proxyLocation: ProxyLocation;@@ -328,6 +393,34 @@ function RunWorkflowForm({const queryClient = useQueryClient();const apiCredential = useApiCredential();const { data: workflow } = useWorkflowQuery({ workflowPermanentId });+ const loginCredentialInputs = useMemo(+ () => getLoginCredentialInputs({ workflow, workflowParameters }),+ [workflow, workflowParameters],+ );+ const { data: credentials = [] } = useCredentialsQuery({ page_size: 100 });+ const credentialNamesById = useMemo(+ () =>+ new Map(+ credentials.map((credential) => [+ credential.credential_id,+ credential.name,+ ]),+ ),+ [credentials],+ );+ const loginCredentialParameterKeys = useMemo(+ () => new Set(loginCredentialInputs.map((input) => input.parameter.key)),+ [loginCredentialInputs],+ );+ const visibleWorkflowParameters = useMemo(+ () =>+ workflowParameters.filter(+ (parameter) => !loginCredentialParameterKeys.has(parameter.key),+ ),+ [loginCredentialParameterKeys, workflowParameters],+ );+ const showGenericInputs =+ visibleWorkflowParameters.length > 0 || loginCredentialInputs.length === 0;// Validate login blocks have credentials selectedconst loginBlocksWithoutCredentials = useMemo(@@ -680,134 +773,354 @@ function RunWorkflowForm({</Alert>)}- <div className="space-y-8 rounded-lg bg-slate-elevation3 px-6 py-5">- <header>- <h1 className="text-lg">Inputs</h1>- </header>- {workflowParameters?.map((parameter) => {- return (- <FormField- key={parameter.key}- control={form.control}- name={parameter.key}- rules={{- validate: (value) => {- if (parameter.workflow_parameter_type === "json") {- return validateJsonWorkflowParameterValue(value);- }-- // Boolean parameters are required - show error and block submission- if (parameter.workflow_parameter_type === "boolean") {- if (value === null || value === undefined) {- return "This field is required";+ {loginCredentialInputs.length > 0 && (+ <div className="space-y-8 rounded-lg bg-slate-elevation3 px-6 py-5">+ <header>+ <h1 className="text-lg">Login credentials</h1>+ </header>+ {loginCredentialInputs.map(({ parameter, loginBlockLabels }) => {+ const { title, description } = getLoginCredentialDisplayText(+ parameter,+ loginBlockLabels,+ );++ if (+ parameter.parameter_type === WorkflowParameterTypes.Workflow+ ) {+ return (+ <FormField+ key={parameter.key}+ control={form.control}+ name={parameter.key}+ rules={{+ validate: (value) => {+ if (+ value === null ||+ value === undefined ||+ value === ""+ ) {+ return "Warning: you left this field empty";+ }+ },+ }}+ render={({ field }) => (+ <FormItem>+ <div className="flex gap-16">+ <FormLabel className="!text-slate-50">+ <div className="w-72">+ <div className="flex items-center gap-2 text-lg">+ {title}+ <span className="text-sm text-slate-400">+ credential+ </span>+ </div>+ <h2 className="text-sm text-slate-400">+ {description}+ </h2>+ </div>+ </FormLabel>+ <div className="w-full space-y-2">+ <FormControl>+ <WorkflowParameterInput+ type={parameter.workflow_parameter_type}+ value={field.value}+ onChange={(value) => {+ field.onChange(value);+ form.trigger(parameter.key);+ }}+ />+ </FormControl>+ {form.formState.errors[parameter.key] && (+ <div className="text-xs text-warning">+ {form.formState.errors[parameter.key]?.message}+ </div>+ )}+ </div>+ </div>+ </FormItem>+ )}+ />+ );+ }++ const credentialIds = getRotatingCredentialIds(parameter);+ return (+ <FormField+ key={parameter.key}+ control={form.control}+ name={parameter.key}+ render={({ field }) => {+ const forcedCredentialId =+ typeof field.value === "string" ? field.value : "";+ const mode = forcedCredentialId ? "force" : "rotation";+ const forceSelectValue =+ forcedCredentialId || credentialIds[0] || "";++ return (+ <FormItem>+ <div className="flex gap-16">+ <FormLabel className="!text-slate-50">+ <div className="w-72">+ <div className="flex items-center gap-2 text-lg">+ {title}+ <span className="text-sm text-slate-400">+ credential rotation+ </span>+ </div>+ <h2 className="text-sm text-slate-400">+ {description}+ </h2>+ </div>+ </FormLabel>+ <div className="w-full space-y-3">+ <FormControl>+ <RadioGroup+ value={mode}+ onValueChange={(value) => {+ if (value === "force") {+ field.onChange(forceSelectValue);+ } else {+ field.onChange(undefined);+ }+ form.trigger(parameter.key);+ }}+ className="gap-3"+ >+ <label+ className="flex cursor-pointer items-start gap-3 rounded-md border border-slate-700 bg-slate-900/40 p-3"+ htmlFor={`${parameter.key}-rotation`}+ >+ <RadioGroupItem+ id={`${parameter.key}-rotation`}+ value="rotation"+ className="mt-1"+ />+ <div className="min-w-0 flex-1 space-y-2">+ <div className="flex flex-wrap items-center gap-2">+ <span className="text-sm font-medium text-slate-100">+ Use configured rotation+ </span>+ <Badge+ variant="outline"+ className="text-xs font-normal"+ >+ {formatCredentialSelectionStrategy(+ parameter.selection_strategy,+ )}+ </Badge>+ </div>+ <div className="grid gap-2 md:grid-cols-2">+ {credentialIds.map((credentialId) => (+ <div+ key={credentialId}+ className="min-w-0 rounded border border-slate-700/60 bg-slate-950/40 px-2 py-1.5 text-xs text-slate-200"+ >+ <span className="block truncate">+ {credentialNamesById.get(+ credentialId,+ ) ?? credentialId}+ </span>+ </div>+ ))}+ </div>+ </div>+ </label>++ <label+ className="flex cursor-pointer items-start gap-3 rounded-md border border-slate-700 bg-slate-900/40 p-3"+ htmlFor={`${parameter.key}-force`}+ >+ <RadioGroupItem+ id={`${parameter.key}-force`}+ value="force"+ className="mt-1"+ />+ <div className="min-w-0 flex-1 space-y-2">+ <div className="flex flex-wrap items-center gap-2">+ <span className="text-sm font-medium text-slate-100">+ Force one credential for this run+ </span>+ {mode === "force" && (+ <Badge+ variant="outline"+ className="text-xs font-normal"+ >+ Run only+ </Badge>+ )}+ </div>+ <Select+ disabled={mode !== "force"}+ value={forceSelectValue}+ onValueChange={(value) => {+ field.onChange(value);+ form.trigger(parameter.key);+ }}+ >+ <SelectTrigger className="w-full">+ <SelectValue placeholder="Select a credential" />+ </SelectTrigger>+ <SelectContent>+ {credentialIds.map((credentialId) => (+ <SelectItem+ key={credentialId}+ value={credentialId}+ >+ {credentialNamesById.get(+ credentialId,+ ) ?? credentialId}+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ </label>+ </RadioGroup>+ </FormControl>+ </div>+ </div>+ </FormItem>+ );+ }}+ />+ );+ })}+ </div>+ )}++ {showGenericInputs && (+ <div className="space-y-8 rounded-lg bg-slate-elevation3 px-6 py-5">+ <header>+ <h1 className="text-lg">+ {loginCredentialInputs.length > 0 ? "Other inputs" : "Inputs"}+ </h1>+ </header>+ {visibleWorkflowParameters?.map((parameter) => {+ return (+ <FormField+ key={parameter.key}+ control={form.control}+ name={parameter.key}+ rules={{+ validate: (value) => {+ if (parameter.workflow_parameter_type === "json") {+ return validateJsonWorkflowParameterValue(value);+ }++ // Boolean parameters are required - show error and block submission+ if (parameter.workflow_parameter_type === "boolean") {+ if (value === null || value === undefined) {+ return "This field is required";+ }+ return;}- return;- }-- // Numeric parameters are required - show error and block submission- if (- parameter.workflow_parameter_type === "integer" ||- parameter.workflow_parameter_type === "float"- ) {++ // Numeric parameters are required - show error and block submissionif (- value === null ||- value === undefined ||- Number.isNaN(value)+ parameter.workflow_parameter_type === "integer" ||+ parameter.workflow_parameter_type === "float") {- return "This field is required";+ if (+ value === null ||+ value === undefined ||+ Number.isNaN(value)+ ) {+ return "This field is required";+ }+ return;+ }++ if (parameter.workflow_parameter_type === "file_url") {+ if (+ value === null ||+ value === undefined ||+ (typeof value === "string" && value.trim() === "") ||+ (typeof value === "object" &&+ value !== null &&+ "s3uri" in value &&+ !value.s3uri)+ ) {+ return "This field is required";+ }+ return;}- return;- }- if (parameter.workflow_parameter_type === "file_url") {+ // For string parameters, show warning but don't blockif (- value === null ||- value === undefined ||- (typeof value === "string" && value.trim() === "") ||- (typeof value === "object" &&- value !== null &&- "s3uri" in value &&- !value.s3uri)+ parameter.workflow_parameter_type === "string" &&+ (value === null || value === "")) {- return "This field is required";+ return "Warning: you left this field empty";+ }++ // For all other non-boolean types, show warning but don't block+ if (value === null || value === undefined) {+ return "Warning: you left this field empty";}- return;- }-- // For string parameters, show warning but don't block- if (- parameter.workflow_parameter_type === "string" &&- (value === null || value === "")- ) {- return "Warning: you left this field empty";- }-- // For all other non-boolean types, show warning but don't block- if (value === null || value === undefined) {- return "Warning: you left this field empty";- }- },- }}- render={({ field }) => {- return (- <FormItem>- <div className="flex gap-16">- <FormLabel className="!text-slate-50">- <div className="w-72">- <div className="flex items-center gap-2 text-lg">- {parameter.key}- <span className="text-sm text-slate-400">- {getLabelForWorkflowParameterType(- parameter.workflow_parameter_type,- )}- </span>+ },+ }}+ render={({ field }) => {+ return (+ <FormItem>+ <div className="flex gap-16">+ <FormLabel className="!text-slate-50">+ <div className="w-72">+ <div className="flex items-center gap-2 text-lg">+ {parameter.key}+ <span className="text-sm text-slate-400">+ {getLabelForWorkflowParameterType(+ parameter.workflow_parameter_type,+ )}+ </span>+ </div>+ <h2 className="text-sm text-slate-400">+ {parameter.description}+ </h2></div>- <h2 className="text-sm text-slate-400">- {parameter.description}- </h2>+ </FormLabel>+ <div className="w-full space-y-2">+ <FormControl>+ <WorkflowParameterInput+ type={parameter.workflow_parameter_type}+ value={field.value}+ onChange={(value) => {+ field.onChange(value);+ form.trigger(parameter.key);+ }}+ />+ </FormControl>+ {form.formState.errors[parameter.key] && (+ <div+ className={`text-xs ${+ parameter.workflow_parameter_type ===+ "boolean" ||+ parameter.workflow_parameter_type ===+ "integer" ||+ parameter.workflow_parameter_type ===+ "float" ||+ parameter.workflow_parameter_type ===+ "file_url" ||+ parameter.workflow_parameter_type === "json"+ ? "text-destructive"+ : "text-warning"+ }`}+ >+ {form.formState.errors[parameter.key]?.message}+ </div>+ )}</div>- </FormLabel>- <div className="w-full space-y-2">- <FormControl>- <WorkflowParameterInput- type={parameter.workflow_parameter_type}- value={field.value}- onChange={(value) => {- field.onChange(value);- form.trigger(parameter.key);- }}- />- </FormControl>- {form.formState.errors[parameter.key] && (- <div- className={`text-xs ${- parameter.workflow_parameter_type ===- "boolean" ||- parameter.workflow_parameter_type ===- "integer" ||- parameter.workflow_parameter_type === "float" ||- parameter.workflow_parameter_type ===- "file_url" ||- parameter.workflow_parameter_type === "json"- ? "text-destructive"- : "text-warning"- }`}- >- {form.formState.errors[parameter.key]?.message}- </div>- )}</div>- </div>- </FormItem>- );- }}- />- );- })}- {workflowParameters.length === 0 && (- <div>This agent doesn't have any inputs</div>- )}- </div>+ </FormItem>+ );+ }}+ />+ );+ })}+ {visibleWorkflowParameters.length === 0 && (+ <div>This agent doesn't have any inputs</div>+ )}+ </div>+ )}<div className="space-y-8 rounded-lg bg-slate-elevation3 px-6 py-5"><header>diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.test.ts b/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.test.tsnew file mode 100644index 000000000..dcfa2b333--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.test.ts@@ -0,0 +1,31 @@+import { describe, expect, it } from "vitest";+import { meetsMinCronInterval } from "./cronUtils";++describe("meetsMinCronInterval", () => {+ it("accepts a cron that fires exactly at the minimum interval", () => {+ expect(meetsMinCronInterval("*/5 * * * *")).toBe(true);+ });++ it("rejects a cron whose tight gap is hidden outside a short sample window", () => {+ // Fires every 5 min except a cluster at :55/:59 (4 min apart) and the+ // :59 -> :00-next-hour wrap (1 min apart) -- both violate the 5-minute+ // floor, but only show up if the scan covers a full cycle, not just the+ // first couple of runs.+ expect(+ meetsMinCronInterval("0,5,10,15,20,25,30,35,40,45,50,55,59 * * * *"),+ ).toBe(false);+ });++ it("rejects a cron that fires more often than the minimum everywhere", () => {+ expect(meetsMinCronInterval("*/1 * * * *")).toBe(false);+ });++ it("returns false for an invalid cron expression instead of throwing", () => {+ expect(meetsMinCronInterval("not a cron")).toBe(false);+ });++ it("honors a custom minimum interval override", () => {+ expect(meetsMinCronInterval("*/10 * * * *", 5 * 60)).toBe(true);+ expect(meetsMinCronInterval("*/10 * * * *", 15 * 60)).toBe(false);+ });+});diff --git a/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.ts b/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.tsindex 2387bfe70..095bca5dd 100644--- a/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.ts+++ b/skyvern-frontend/src/routes/workflows/editor/panels/schedulePanel/cronUtils.ts@@ -29,6 +29,43 @@ export function isValidCron(expression: string): boolean {}}+// Mirror of the backend MIN_CRON_INTERVAL_SECONDS guard so the UI can reject+// too-frequent schedules before submitting (and avoid a bare 400 with no+// inline preview feedback).+export const MIN_CRON_INTERVAL_SECONDS = 5 * 60;+// Sample a full day of firings (matching the backend) so a tight cluster outside+// a small fixed window can't slip past, e.g. "0,5,...,55,59 * * * *" hiding the+// 55->59 / 59->00 gaps. 25h covers any minute/hour cycle; the cap bounds "*/1".+const CRON_INTERVAL_SAMPLE_WINDOW_SECONDS = 25 * 60 * 60;+const CRON_INTERVAL_MAX_SAMPLES = 2000;++export function meetsMinCronInterval(+ expression: string,+ minimumIntervalSeconds: number = MIN_CRON_INTERVAL_SECONDS,+): boolean {+ try {+ const interval = CronExpressionParser.parse(expression);+ const runs: number[] = [];+ runs.push(interval.next().toDate().getTime());+ while (runs.length < CRON_INTERVAL_MAX_SAMPLES) {+ runs.push(interval.next().toDate().getTime());+ if (+ (runs[runs.length - 1]! - runs[0]!) / 1000 >=+ CRON_INTERVAL_SAMPLE_WINDOW_SECONDS+ ) {+ break;+ }+ }+ let minGapSeconds = Infinity;+ for (let i = 0; i < runs.length - 1; i++) {+ minGapSeconds = Math.min(minGapSeconds, (runs[i + 1]! - runs[i]!) / 1000);+ }+ return minGapSeconds >= minimumIntervalSeconds;+ } catch {+ return false;+ }+}+export function getNextRuns(expression: string,timezone: string,diff --git a/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.test.ts b/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.test.tsnew file mode 100644index 000000000..bc44848aa--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.test.ts@@ -0,0 +1,151 @@+import { describe, expect, test } from "vitest";++import {+ CredentialParameter,+ WorkflowApiResponse,+ WorkflowBlock,+ WorkflowParameter,+ WorkflowParameterTypes,+ WorkflowParameterValueType,+} from "./types/workflowTypes";+import { getLoginCredentialInputs } from "./runWorkflowCredentials";++function workflowParameter(key: string): WorkflowParameter {+ return {+ parameter_type: WorkflowParameterTypes.Workflow,+ workflow_id: "w_1",+ workflow_parameter_id: `wp_${key}`,+ workflow_parameter_type: WorkflowParameterValueType.CredentialId,+ default_value: `cred_${key}`,+ key,+ description: null,+ created_at: "2026-07-08T00:00:00Z",+ modified_at: "2026-07-08T00:00:00Z",+ deleted_at: null,+ };+}++function rotatingCredentialParameter(+ key: string,+ credentialIds: Array<string> = ["cred_1", "cred_2"],+): CredentialParameter {+ return {+ parameter_type: WorkflowParameterTypes.Credential,+ workflow_id: "w_1",+ credential_parameter_id: `cp_${key}`,+ credential_id: credentialIds[0]!,+ credential_ids: credentialIds,+ selection_strategy: "round_robin",+ key,+ description: null,+ created_at: "2026-07-08T00:00:00Z",+ modified_at: "2026-07-08T00:00:00Z",+ deleted_at: null,+ };+}++function workflowWithBlocks(+ blocks: Array<WorkflowBlock>,+ parameters: WorkflowApiResponse["workflow_definition"]["parameters"] = [],+): WorkflowApiResponse {+ return {+ workflow_definition: {+ blocks,+ parameters,+ },+ } as unknown as WorkflowApiResponse;+}++function loginBlock(label: string, parameters: Array<unknown>): WorkflowBlock {+ return {+ block_type: "login",+ label,+ parameters,+ } as WorkflowBlock;+}++describe("getLoginCredentialInputs", () => {+ test("returns credential_id workflow parameters referenced by login blocks", () => {+ const loginCredential = workflowParameter("login_credential");+ const unrelatedCredential = workflowParameter("api_credential");++ const inputs = getLoginCredentialInputs({+ workflow: workflowWithBlocks([+ loginBlock("Portal login", [loginCredential]),+ ]),+ workflowParameters: [loginCredential, unrelatedCredential],+ });++ expect(inputs).toEqual([+ {+ parameter: loginCredential,+ loginBlockLabels: ["Portal login"],+ },+ ]);+ });++ test("deduplicates shared credential parameters across nested login blocks", () => {+ const credential = workflowParameter("account_credential");++ const inputs = getLoginCredentialInputs({+ workflow: workflowWithBlocks([+ loginBlock("Primary login", [credential]),+ {+ block_type: "for_loop",+ label: "Loop accounts",+ loop_blocks: [loginBlock("Nested login", [credential])],+ } as WorkflowBlock,+ ]),+ workflowParameters: [credential],+ });++ expect(inputs).toEqual([+ {+ parameter: credential,+ loginBlockLabels: ["Primary login", "Nested login"],+ },+ ]);+ });++ test("returns block-scoped credential rotation parameters", () => {+ const credential = rotatingCredentialParameter("account_credential");++ const inputs = getLoginCredentialInputs({+ workflow: workflowWithBlocks(+ [loginBlock("Rotating login", [credential])],+ [credential],+ ),+ workflowParameters: [],+ });++ expect(inputs).toEqual([+ {+ parameter: credential,+ loginBlockLabels: ["Rotating login"],+ },+ ]);+ });++ test("ignores block-scoped single credentials", () => {+ const credential = rotatingCredentialParameter("account_credential", [+ "cred_1",+ ]);++ const inputs = getLoginCredentialInputs({+ workflow: workflowWithBlocks([+ loginBlock("Fixed login", [+ {+ parameter_type: WorkflowParameterTypes.Credential,+ key: credential.key,+ credential_id: "cred_1",+ credential_ids: null,+ selection_strategy: null,+ },+ ]),+ ]),+ workflowParameters: [],+ });++ expect(inputs).toEqual([]);+ });+});diff --git a/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.ts b/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.tsnew file mode 100644index 000000000..62d8eba99--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/runWorkflowCredentials.ts@@ -0,0 +1,133 @@+import {+ CredentialParameter,+ WorkflowApiResponse,+ WorkflowParameter,+ WorkflowParameterTypes,+ WorkflowParameterValueType,+} from "./types/workflowTypes";+import { visitWorkflowBlocks } from "./workflowBlockUtils";++export type LoginCredentialInput = {+ parameter: WorkflowParameter | CredentialParameter;+ loginBlockLabels: Array<string>;+};++function isCredentialIdWorkflowParameter(+ parameter: unknown,+): parameter is WorkflowParameter {+ if (parameter === null || typeof parameter !== "object") {+ return false;+ }++ const maybeParameter = parameter as Partial<WorkflowParameter>;+ return (+ maybeParameter.parameter_type === WorkflowParameterTypes.Workflow &&+ maybeParameter.workflow_parameter_type ===+ WorkflowParameterValueType.CredentialId &&+ typeof maybeParameter.key === "string"+ );+}++export function getRotatingCredentialIds(+ parameter: CredentialParameter,+): Array<string> {+ return (parameter.credential_ids ?? []).filter(+ (credentialId, index, allCredentialIds): credentialId is string =>+ typeof credentialId === "string" &&+ credentialId.length > 0 &&+ allCredentialIds.indexOf(credentialId) === index,+ );+}++function isRotatingCredentialParameter(+ parameter: unknown,+): parameter is CredentialParameter {+ if (parameter === null || typeof parameter !== "object") {+ return false;+ }++ const maybeParameter = parameter as Partial<CredentialParameter>;+ return (+ maybeParameter.parameter_type === WorkflowParameterTypes.Credential &&+ typeof maybeParameter.key === "string" &&+ getRotatingCredentialIds(maybeParameter as CredentialParameter).length > 1+ );+}++function collectLoginCredentialLabels(+ blocks: WorkflowApiResponse["workflow_definition"]["blocks"],+ credentialParametersByKey: Map<+ string,+ WorkflowParameter | CredentialParameter+ >,+ labelsByKey: Map<string, Set<string>>,+ keyOrder: Array<string>,+) {+ visitWorkflowBlocks(blocks, (block) => {+ if (block.block_type === "login") {+ for (const parameter of block.parameters ?? []) {+ if (+ !isCredentialIdWorkflowParameter(parameter) &&+ !isRotatingCredentialParameter(parameter)+ ) {+ continue;+ }++ if (!credentialParametersByKey.has(parameter.key)) {+ continue;+ }++ if (!labelsByKey.has(parameter.key)) {+ labelsByKey.set(parameter.key, new Set());+ keyOrder.push(parameter.key);+ }+ labelsByKey.get(parameter.key)?.add(block.label);+ }+ }+ });+}++export function getLoginCredentialInputs({+ workflow,+ workflowParameters,+}: {+ workflow: WorkflowApiResponse | undefined;+ workflowParameters: Array<WorkflowParameter>;+}): Array<LoginCredentialInput> {+ if (!workflow) {+ return [];+ }++ const credentialParametersByKey = new Map(+ [+ ...workflowParameters.filter(isCredentialIdWorkflowParameter),+ ...workflow.workflow_definition.parameters.filter(+ isRotatingCredentialParameter,+ ),+ ].map((parameter) => [parameter.key, parameter]),+ );+ const labelsByKey = new Map<string, Set<string>>();+ const keyOrder: Array<string> = [];++ collectLoginCredentialLabels(+ workflow.workflow_definition.blocks,+ credentialParametersByKey,+ labelsByKey,+ keyOrder,+ );++ return keyOrder.flatMap((key) => {+ const parameter = credentialParametersByKey.get(key);+ const labels = labelsByKey.get(key);+ if (!parameter || !labels) {+ return [];+ }++ return [+ {+ parameter,+ loginBlockLabels: Array.from(labels),+ },+ ];+ });+}diff --git a/skyvern-frontend/src/routes/workflows/types/scheduleTypes.ts b/skyvern-frontend/src/routes/workflows/types/scheduleTypes.tsindex b836d9106..fb46e0e93 100644--- a/skyvern-frontend/src/routes/workflows/types/scheduleTypes.ts+++ b/skyvern-frontend/src/routes/workflows/types/scheduleTypes.ts@@ -35,7 +35,8 @@ export type CreateScheduleRequest = {export type UpdateScheduleRequest = {cron_expression: string;timezone: string;- enabled: boolean;+ // Omit to preserve the schedule's current enable/disable state on the server.+ enabled?: boolean;parameters?: Record<string, unknown> | null;name?: string;description?: string;diff --git a/skyvern-frontend/src/routes/workflows/workflowBlockUtils.test.ts b/skyvern-frontend/src/routes/workflows/workflowBlockUtils.test.tsindex 8e92fb716..f46f78eb4 100644--- a/skyvern-frontend/src/routes/workflows/workflowBlockUtils.test.ts+++ b/skyvern-frontend/src/routes/workflows/workflowBlockUtils.test.ts@@ -4,6 +4,7 @@ import {buildCodeStepsByLabel,findCodeStepForLine,getCodeStepPlainText,+ visitWorkflowBlocks,} from "./workflowBlockUtils";import type {CodeBlock,@@ -73,6 +74,41 @@ describe("buildCodeStepsByLabel", () => {});});+describe("visitWorkflowBlocks", () => {+ it("visits top-level and loop body blocks in display order", () => {+ const visited: Array<string> = [];++ visitWorkflowBlocks(+ [+ codeBlock("top", []),+ forLoop("loop", [codeBlock("nested", []), codeBlock("nested_2", [])]),+ ],+ (block) => {+ visited.push(block.label);+ },+ );++ expect(visited).toEqual(["top", "loop", "nested", "nested_2"]);+ });++ it("stops walking when the visitor returns false", () => {+ const visited: Array<string> = [];++ visitWorkflowBlocks(+ [+ codeBlock("top", []),+ forLoop("loop", [codeBlock("nested", []), codeBlock("nested_2", [])]),+ ],+ (block) => {+ visited.push(block.label);+ return block.label === "nested" ? false : undefined;+ },+ );++ expect(visited).toEqual(["top", "loop", "nested"]);+ });+});+describe("getCodeStepPlainText", () => {it("prefers the step title", () => {expect(diff --git a/skyvern-frontend/src/routes/workflows/workflowBlockUtils.ts b/skyvern-frontend/src/routes/workflows/workflowBlockUtils.tsindex aa9599ef8..68a100052 100644--- a/skyvern-frontend/src/routes/workflows/workflowBlockUtils.ts+++ b/skyvern-frontend/src/routes/workflows/workflowBlockUtils.ts@@ -11,18 +11,35 @@ export function findWorkflowBlockByLabel(blocks: Array<WorkflowBlock>,label: string,): WorkflowBlock | null {+ let found: WorkflowBlock | null = null;++ visitWorkflowBlocks(blocks, (block) => {+ if (!found && block.label === label) {+ found = block;+ return false;+ }+ });++ return found;+}++export function visitWorkflowBlocks(+ blocks: Array<WorkflowBlock>,+ visit: (block: WorkflowBlock) => void | false,+) {for (const block of blocks) {- if (block.label === label) {- return block;+ if (visit(block) === false) {+ return false;}+if (isNestedLoopWorkflowBlock(block) && block.loop_blocks.length > 0) {- const nested = findWorkflowBlockByLabel(block.loop_blocks, label);- if (nested) {- return nested;+ if (visitWorkflowBlocks(block.loop_blocks, visit) === false) {+ return false;}}}- return null;++ return true;}export function isBlockOfType<T extends WorkflowBlockType>(@@ -41,21 +58,13 @@ export function buildCodeStepsByLabel(blocks: Array<WorkflowBlock>,): Map<string, Array<CodeBlockStep>> {const stepsByLabel = new Map<string, Array<CodeBlockStep>>();- const visit = (items: Array<WorkflowBlock>) => {- for (const block of items) {- if (- block.block_type === "code" &&- block.steps &&- block.steps.length > 0- ) {- stepsByLabel.set(block.label, block.steps);- }- if (isNestedLoopWorkflowBlock(block) && block.loop_blocks.length > 0) {- visit(block.loop_blocks);- }++ visitWorkflowBlocks(blocks, (block) => {+ if (block.block_type === "code" && block.steps && block.steps.length > 0) {+ stepsByLabel.set(block.label, block.steps);}- };- visit(blocks);+ });+return stepsByLabel;}diff --git a/skyvern-frontend/src/util/getErrorDetail.ts b/skyvern-frontend/src/util/getErrorDetail.tsnew file mode 100644index 000000000..97dc2364c--- /dev/null+++ b/skyvern-frontend/src/util/getErrorDetail.ts@@ -0,0 +1,19 @@+// API errors carry the actionable text in the FastAPI `detail`, not the generic+// axios "Request failed with status code N" message. Prefer the detail and fall+// back to the message so error UI surfaces the server's guidance.+function getErrorDetail(error: unknown): string | undefined {+ if (error && typeof error === "object") {+ const detail = (error as { response?: { data?: { detail?: unknown } } })+ .response?.data?.detail;+ if (typeof detail === "string") {+ return detail;+ }+ const message = (error as { message?: unknown }).message;+ if (typeof message === "string") {+ return message;+ }+ }+ return undefined;+}++export { getErrorDetail };diff --git a/skyvern/forge/sdk/db/repositories/schedules.py b/skyvern/forge/sdk/db/repositories/schedules.pyindex 49c6b5993..61dd9c333 100644--- a/skyvern/forge/sdk/db/repositories/schedules.py+++ b/skyvern/forge/sdk/db/repositories/schedules.py@@ -213,7 +213,7 @@ class SchedulesRepository(BaseRepository):organization_id: str,cron_expression: str,timezone: str,- enabled: bool,+ enabled: bool | object = _UNSET,parameters: dict[str, Any] | None = None,backend_schedule_id: str | None | object = _UNSET,name: str | None | object = _UNSET,@@ -235,7 +235,8 @@ class SchedulesRepository(BaseRepository):workflow_schedule.cron_expression = cron_expressionworkflow_schedule.timezone = timezone- workflow_schedule.enabled = enabled+ if enabled is not _UNSET:+ workflow_schedule.enabled = enabledworkflow_schedule.parameters = parametersif backend_schedule_id is not _UNSET:workflow_schedule.backend_schedule_id = backend_schedule_iddiff --git a/skyvern/forge/sdk/routes/workflow_schedules.py b/skyvern/forge/sdk/routes/workflow_schedules.pyindex 9a2a412e8..8353cca38 100644--- a/skyvern/forge/sdk/routes/workflow_schedules.py+++ b/skyvern/forge/sdk/routes/workflow_schedules.py@@ -8,6 +8,7 @@ from fastapi import Depends, HTTPException, Query, statusfrom skyvern.forge import appfrom skyvern.forge.sdk.core.permissions.schedule_limit_checker import ScheduleLimitCheckerFactory+from skyvern.forge.sdk.db._sentinels import _UNSETfrom skyvern.forge.sdk.db.agent_db import ScheduleLimitExceededErrorfrom skyvern.forge.sdk.routes.routers import base_router, legacy_base_routerfrom skyvern.forge.sdk.schemas.organizations import Organization@@ -245,6 +246,7 @@ async def create_workflow_schedule(request_data=body.parameters,)stored_parameters = _strip_none_parameters(body.parameters)+ enabled = body.enabled if body.enabled is not None else Truemax_schedules = await ScheduleLimitCheckerFactory.get_instance().get_schedule_limit(organization,@@ -257,7 +259,7 @@ async def create_workflow_schedule(max_schedules=max_schedules,cron_expression=body.cron_expression,timezone=body.timezone,- enabled=body.enabled,+ enabled=enabled,parameters=stored_parameters,name=body.name,description=body.description,@@ -324,7 +326,7 @@ async def create_workflow_schedule(workflow_schedule_id=schedule.workflow_schedule_id,cron_expression=body.cron_expression,timezone=body.timezone,- enabled=body.enabled,+ enabled=enabled,parameters=stored_parameters,max_elapsed_time_minutes=workflow.max_elapsed_time_minutes,)@@ -356,7 +358,7 @@ async def create_workflow_schedule(workflow_permanent_id=workflow_permanent_id,workflow_schedule_id=schedule.workflow_schedule_id,cron_expression=body.cron_expression,- enabled=body.enabled,+ enabled=enabled,)return WorkflowScheduleResponse(schedule=schedule, next_runs=_next_runs(schedule))@@ -466,12 +468,23 @@ async def update_workflow_schedule(old_name = existing.nameold_description = existing.description+ # A missing `enabled` means "leave the enable/disable state as-is", so an+ # edit never reverts a pause/resume that the dedicated endpoints applied.+ # The schema default is True (for create), so an omitted field must be+ # detected via model_fields_set, not `is not None`, or every edit would+ # silently re-enable a paused schedule. An explicit `"enabled": null` is+ # treated the same as omitted, since null isn't a valid enabled value.+ # Pass _UNSET (not existing.enabled) when omitted so this write can't clobber+ # a concurrent pause/resume that lands between the read above and this write.+ enabled_explicit = "enabled" in body.model_fields_set and body.enabled is not None+ enabled_for_write = body.enabled if enabled_explicit else _UNSET+schedule = await app.DATABASE.schedules.update_workflow_schedule(workflow_schedule_id=workflow_schedule_id,organization_id=organization.organization_id,cron_expression=body.cron_expression,timezone=body.timezone,- enabled=body.enabled,+ enabled=enabled_for_write,parameters=stored_parameters,backend_schedule_id=backend_schedule_id,name=body.name,@@ -483,6 +496,10 @@ async def update_workflow_schedule(detail=f"Schedule {workflow_schedule_id} not found",)+ # Read back the persisted value instead of reusing enabled_for_write: when the+ # field was omitted, the row may hold a value a concurrent request just wrote.+ enabled = schedule.enabled+try:await app.AGENT_FUNCTION.upsert_workflow_schedule(backend_schedule_id=backend_schedule_id,@@ -491,7 +508,7 @@ async def update_workflow_schedule(workflow_schedule_id=workflow_schedule_id,cron_expression=body.cron_expression,timezone=body.timezone,- enabled=body.enabled,+ enabled=enabled,parameters=stored_parameters,max_elapsed_time_minutes=workflow.max_elapsed_time_minutes,)@@ -508,7 +525,7 @@ async def update_workflow_schedule(organization_id=organization.organization_id,cron_expression=old_cron,timezone=old_timezone,- enabled=old_enabled,+ enabled=old_enabled if enabled_explicit else _UNSET,parameters=old_parameters,backend_schedule_id=backend_schedule_id,name=old_name,@@ -530,7 +547,7 @@ async def update_workflow_schedule(workflow_permanent_id=workflow_permanent_id,workflow_schedule_id=workflow_schedule_id,cron_expression=body.cron_expression,- enabled=body.enabled,+ enabled=enabled,)return WorkflowScheduleResponse(schedule=schedule, next_runs=_next_runs(schedule))diff --git a/skyvern/forge/sdk/schemas/workflow_schedules.py b/skyvern/forge/sdk/schemas/workflow_schedules.pyindex dec4f8fb4..3718be758 100644--- a/skyvern/forge/sdk/schemas/workflow_schedules.py+++ b/skyvern/forge/sdk/schemas/workflow_schedules.py@@ -94,7 +94,11 @@ class DeleteScheduleResponse(BaseModel):class WorkflowScheduleUpsertRequest(BaseModel):cron_expression: strtimezone: str- enabled: bool = True+ # Default True is the create default (new schedules start enabled). On+ # update the route inspects model_fields_set, so an omitted `enabled`+ # preserves the existing state (never clobbering a concurrent+ # enable/disable) while an explicit true/false is honored.+ enabled: bool | None = Trueparameters: dict[str, Any] | None = Nonename: str | None = Nonedescription: str | None = Nonediff --git a/skyvern/forge/sdk/workflow/context_manager.py b/skyvern/forge/sdk/workflow/context_manager.pyindex d6224af72..f42c94de8 100644--- a/skyvern/forge/sdk/workflow/context_manager.py+++ b/skyvern/forge/sdk/workflow/context_manager.py@@ -270,6 +270,9 @@ class WorkflowRunContext:def set_value(self, key: str, value: Any) -> None:self.values[key] = value+ def get_resolved_credential_parameter_id(self, key: str) -> str | None:+ return self.resolved_credential_parameter_ids.get(key)+def update_block_metadata(self, label: str, metadata: BlockMetadata) -> None:if label in self.blocks_metadata:self.blocks_metadata[label].update(metadata)@@ -642,6 +645,8 @@ class WorkflowRunContext:if db_credential is None:raise CredentialParameterNotFoundError(credential_id)+ self.resolved_credential_parameter_ids[parameter.key] = credential_id+vault_type = db_credential.vault_type or CredentialVaultType.BITWARDENcredential_service = app.CREDENTIAL_VAULT_SERVICES.get(vault_type)if credential_service is None:diff --git a/skyvern/forge/sdk/workflow/models/block.py b/skyvern/forge/sdk/workflow/models/block.pyindex 0feea4511..2acaa370a 100644--- a/skyvern/forge/sdk/workflow/models/block.py+++ b/skyvern/forge/sdk/workflow/models/block.py@@ -32,7 +32,7 @@ import pandas as pdimport structlogfrom charset_normalizer import from_bytesfrom email_validator import EmailNotValidError, validate_email-from jinja2 import StrictUndefined, TemplateSyntaxError+from jinja2 import StrictUndefined, TemplateSyntaxError, nodesfrom jinja2.sandbox import SandboxedEnvironmentfrom jsonschema import Draft202012Validatorfrom jsonschema.exceptions import ValidationError@@ -10396,6 +10396,10 @@ class WorkflowTriggerBlock(Block):workflow_run_context: WorkflowRunContext,) -> Any:"""Render a single Jinja2 template string, handling the | json filter marker."""+ credential_id = self._resolve_exact_credential_id_payload_template(value, workflow_run_context)+ if credential_id is not None:+ return credential_id+rendered = self.format_block_parameter_template_from_workflow_run_context(value, workflow_run_context, env=jinja_json_finalize_strict_env)@@ -10414,6 +10418,46 @@ class WorkflowTriggerBlock(Block):)return rendered+ def _resolve_exact_credential_id_payload_template(+ self,+ value: str,+ workflow_run_context: WorkflowRunContext,+ ) -> str | None:+ """Preserve raw credential IDs when a trigger payload forwards a credential input."""+ try:+ parsed = jinja_sandbox_env.parse(value)+ except TemplateSyntaxError:+ return None++ if len(parsed.body) != 1 or not isinstance(parsed.body[0], nodes.Output):+ return None++ rendered_nodes = [+ node+ for node in parsed.body[0].nodes+ if not (isinstance(node, nodes.TemplateData) and not node.data.strip())+ ]+ if len(rendered_nodes) != 1:+ return None+ expression = rendered_nodes[0]+ if isinstance(expression, nodes.Name):+ parameter_key = expression.name+ elif (+ isinstance(expression, nodes.Filter)+ and expression.name == "json"+ and isinstance(expression.node, nodes.Name)+ ):+ parameter_key = expression.node.name+ else:+ return None++ get_credential_id = getattr(workflow_run_context, "get_resolved_credential_parameter_id", None)+ if not callable(get_credential_id):+ return None++ credential_id = get_credential_id(parameter_key)+ return credential_id if isinstance(credential_id, str) and credential_id else None+def _render_scalar_with_path(self,value: str,diff --git a/skyvern/forge/sdk/workflow/schedules.py b/skyvern/forge/sdk/workflow/schedules.pyindex 177116b04..564852dd3 100644--- a/skyvern/forge/sdk/workflow/schedules.py+++ b/skyvern/forge/sdk/workflow/schedules.py@@ -8,6 +8,8 @@ from croniter import croniter # type: ignore[import-untyped]LOG = structlog.get_logger()+# Mirrored in the frontend's cronUtils.ts (MIN_CRON_INTERVAL_SECONDS,+# meetsMinCronInterval) — keep both copies of these three constants in sync.MIN_CRON_INTERVAL_SECONDS = 5 * 60@@ -18,15 +20,28 @@ def validate_timezone_name(timezone: str) -> None:raise ValueError(f"Invalid timezone '{timezone}'") from e+# Sample a full day of firings so the minimum-gap check can't be bypassed by a+# tight cluster that falls outside a small fixed sample (e.g.+# "0,5,...,55,59 * * * *" hides the 55->59 and 59->00 gaps from a 10-run window).+# A 25h span covers any minute/hour-field cycle (incl. the hour wraparound); the+# count cap bounds dense crons like "*/1 * * * *".+CRON_INTERVAL_SAMPLE_WINDOW_SECONDS = 25 * 60 * 60+CRON_INTERVAL_MAX_SAMPLES = 2000++def validate_cron_expression(cron_expression: str, minimum_interval_seconds: int = MIN_CRON_INTERVAL_SECONDS) -> None:if not croniter.is_valid(cron_expression):raise ValueError("Invalid cron expression")now = datetime.now(UTC)cron = croniter(cron_expression, now)- first = cron.get_next(datetime)- second = cron.get_next(datetime)- if (second - first).total_seconds() < minimum_interval_seconds:+ runs = [cron.get_next(datetime)]+ while len(runs) < CRON_INTERVAL_MAX_SAMPLES:+ runs.append(cron.get_next(datetime))+ if (runs[-1] - runs[0]).total_seconds() >= CRON_INTERVAL_SAMPLE_WINDOW_SECONDS:+ break+ min_gap_seconds = min((runs[i + 1] - runs[i]).total_seconds() for i in range(len(runs) - 1))+ if min_gap_seconds < minimum_interval_seconds:raise ValueError(f"Cron interval must be at least {minimum_interval_seconds // 60} minutes")diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.pyindex 5d12dc718..538762564 100644--- a/skyvern/forge/sdk/workflow/service.py+++ b/skyvern/forge/sdk/workflow/service.py@@ -1053,16 +1053,104 @@ class WorkflowService:if isinstance(parameter, CredentialParameter) and bool(parameter.credential_ids)]+ def _get_run_credential_parameter_overrides(+ self,+ *,+ workflow: Workflow,+ request_data: dict[str, Any] | None,+ ) -> dict[str, str]:+ if not request_data:+ return {}++ overrides: dict[str, str] = {}+ for parameter in self._get_rotating_credential_parameters(workflow):+ if parameter.key not in request_data:+ continue++ override = request_data[parameter.key]+ if override is None or override == "":+ continue+ if not isinstance(override, str):+ raise InvalidCredentialId(f"<non-string value of type {type(override).__name__}>")++ credential_ids = parameter.credential_ids or []+ if override not in credential_ids:+ raise SkyvernHTTPException(+ message=(+ f"Credential override for parameter {parameter.key} must be one of the configured "+ "rotation credentials."+ ),+ status_code=400,+ )++ overrides[parameter.key] = override++ return overrides++ async def _apply_run_credential_parameter_overrides(+ self,+ *,+ workflow: Workflow,+ workflow_run: WorkflowRun,+ organization_id: str,+ request_data: dict[str, Any] | None,+ ) -> dict[str, str]:+ overrides = self._get_run_credential_parameter_overrides(+ workflow=workflow,+ request_data=request_data,+ )+ if not overrides:+ return {}++ repo = app.DATABASE.workflow_run_credential_selections+ for parameter_key, credential_id in overrides.items():+ existing = await repo.get_selection(+ workflow_run_id=workflow_run.workflow_run_id,+ parameter_key=parameter_key,+ )+ if existing:+ if existing != credential_id:+ raise SkyvernHTTPException(+ message=(+ f"Credential override for parameter {parameter_key} conflicts with an existing "+ "credential selection for this run."+ ),+ status_code=400,+ )+ continue++ try:+ await repo.create_selection(+ organization_id=organization_id,+ workflow_run_id=workflow_run.workflow_run_id,+ workflow_permanent_id=workflow.workflow_permanent_id,+ parameter_key=parameter_key,+ credential_id=credential_id,+ )+ except IntegrityError:+ existing = await repo.get_selection(+ workflow_run_id=workflow_run.workflow_run_id,+ parameter_key=parameter_key,+ )+ if existing == credential_id:+ continue+ raise++ return overrides+async def _select_rotating_credential_parameters_for_render(self,*,workflow: Workflow,workflow_run: WorkflowRun,organization_id: str,+ credential_parameter_overrides: dict[str, str] | None = None,) -> dict[str, str]:+ selections = dict(credential_parameter_overrides or {})try:- selections: dict[str, str] = {}for parameter in self._get_rotating_credential_parameters(workflow):+ if parameter.key in selections:+ continuecredential_ids = parameter.credential_idsif not credential_ids:continue@@ -1084,7 +1172,7 @@ class WorkflowService:)if workflow.browser_profile_key:raise- return {}+ return selectionsasync def validate_schedule_parameters(self,@@ -1403,10 +1491,17 @@ class WorkflowService:)parameter_values = {param.key: value for param, value in workflow_parameter_values}+ run_credential_parameter_overrides = await self._apply_run_credential_parameter_overrides(+ workflow=workflow,+ workflow_run=workflow_run,+ organization_id=organization.organization_id,+ request_data=workflow_request.data,+ )rotating_credential_selections = await self._select_rotating_credential_parameters_for_render(workflow=workflow,workflow_run=workflow_run,organization_id=organization.organization_id,+ credential_parameter_overrides=run_credential_parameter_overrides,)parameter_values.update(rotating_credential_selections)workflow_run = await self._prepare_persisted_workflow_browser_profile(@@ -5563,6 +5658,15 @@ class WorkflowService:},)if force_browser_session:+ workflow = await self.get_workflow(workflow_id=workflow_id)+ # Forced session creation happens before setup_workflow_run persists+ # run-level credential selections. This validates override inputs+ # before best-effort profile-key rendering, then setup_workflow_run+ # persists the same override after the workflow_run_id exists.+ run_credential_parameter_overrides = self._get_run_credential_parameter_overrides(+ workflow=workflow,+ request_data=workflow_request.data,+ )workflow_run = await app.DATABASE.workflow_runs.create_workflow_run(workflow_permanent_id=workflow_permanent_id,workflow_id=workflow_id,@@ -5600,7 +5704,6 @@ class WorkflowService:effective_proxy_location = workflow_request.proxy_locationpin_required = Falsetry:- workflow = await self.get_workflow(workflow_id=workflow_id)# pin_required must be known before any awaited call that can raise, so the# except path never falls through to creating an unprofiled pinned session.effective_proxy_location = (@@ -5618,6 +5721,7 @@ class WorkflowService:workflow=workflow,workflow_run=workflow_run,organization_id=organization_id,+ credential_parameter_overrides=run_credential_parameter_overrides,)forced_browser_profile_id = await self._resolve_managed_browser_profile_for_run_request(workflow=workflow,diff --git a/tests/unit/test_credential_rotation.py b/tests/unit/test_credential_rotation.pyindex 8046a5f2b..7261cf0c8 100644--- a/tests/unit/test_credential_rotation.py+++ b/tests/unit/test_credential_rotation.py@@ -29,14 +29,15 @@ from skyvern.schemas.workflows import CredentialParameterYAML, WorkflowDefinitiodef _credential_parameter(*,+ key: str = "login_cred",credential_id: str = "cred_a",credential_ids: list[str] | None = None,selection_strategy: str | None = None,) -> CredentialParameter:now = datetime.now(timezone.utc)return CredentialParameter(- key="login_cred",- credential_parameter_id="cp_test",+ key=key,+ credential_parameter_id=f"cp_{key}",workflow_id="wf_test",credential_id=credential_id,credential_ids=credential_ids,@@ -198,6 +199,98 @@ async def test_selection_is_idempotent_for_run_and_key() -> None:assert repo.created == []+async def test_run_credential_override_persists_for_rotation_parameter() -> None:+ service = WorkflowService()+ workflow = _setup_workflow_with_rotating_credential()+ workflow_run = _setup_workflow_run()+ repo = _SelectionRepo()++ with patch("skyvern.forge.sdk.workflow.service.app") as mock_app:+ mock_app.DATABASE.workflow_run_credential_selections = repo+ overrides = await service._apply_run_credential_parameter_overrides(+ workflow=workflow,+ workflow_run=workflow_run,+ organization_id="org_test",+ request_data={"login_cred": "cred_b"},+ )++ assert overrides == {"login_cred": "cred_b"}+ assert repo.created == [+ {+ "organization_id": "org_test",+ "workflow_run_id": "wr_test",+ "workflow_permanent_id": "wpid_test",+ "parameter_key": "login_cred",+ "credential_id": "cred_b",+ }+ ]+++async def test_run_credential_override_rejects_credentials_outside_rotation_pool() -> None:+ service = WorkflowService()+ workflow = _setup_workflow_with_rotating_credential()++ with pytest.raises(SkyvernHTTPException, match="configured rotation credentials"):+ await service._apply_run_credential_parameter_overrides(+ workflow=workflow,+ workflow_run=_setup_workflow_run(),+ organization_id="org_test",+ request_data={"login_cred": "cred_other"},+ )+++async def test_run_credential_override_rejects_conflicting_existing_selection() -> None:+ service = WorkflowService()+ workflow = _setup_workflow_with_rotating_credential()+ repo = _SelectionRepo(existing={("wr_test", "login_cred"): "cred_a"})++ with (+ patch("skyvern.forge.sdk.workflow.service.app") as mock_app,+ pytest.raises(SkyvernHTTPException, match="conflicts with an existing credential selection"),+ ):+ mock_app.DATABASE.workflow_run_credential_selections = repo+ await service._apply_run_credential_parameter_overrides(+ workflow=workflow,+ workflow_run=_setup_workflow_run(),+ organization_id="org_test",+ request_data={"login_cred": "cred_b"},+ )++ assert repo.created == []+++async def test_select_rotating_credentials_keeps_override_and_selects_remaining() -> None:+ service = WorkflowService()+ workflow = _setup_workflow_with_rotating_credential(browser_profile_key="{{ login_cred }}-{{ backup_cred }}")+ workflow.workflow_definition.parameters = [+ _credential_parameter(key="login_cred", credential_ids=["cred_a", "cred_b"]),+ _credential_parameter(key="backup_cred", credential_id="cred_c", credential_ids=["cred_c", "cred_d"]),+ ]+ select_mock = AsyncMock(return_value="cred_d")++ with patch("skyvern.forge.sdk.workflow.service.select_credential_for_run", select_mock):+ selections = await service._select_rotating_credential_parameters_for_render(+ workflow=workflow,+ workflow_run=_setup_workflow_run(),+ organization_id="org_test",+ credential_parameter_overrides={"login_cred": "cred_b"},+ )++ assert selections == {"login_cred": "cred_b", "backup_cred": "cred_d"}+ select_mock.assert_awaited_once_with(+ workflow_run_id="wr_test",+ organization_id="org_test",+ workflow_permanent_id="wpid_test",+ parameter_key="backup_cred",+ credential_ids=["cred_c", "cred_d"],+ selection_strategy=None,+ )++@pytest.mark.asyncioasync def test_random_selection_returns_member(monkeypatch: pytest.MonkeyPatch) -> None:repo = _SelectionRepo()diff --git a/tests/unit/test_saved_session_proxy_pin.py b/tests/unit/test_saved_session_proxy_pin.pyindex 9ad4b87b1..a29de3b83 100644--- a/tests/unit/test_saved_session_proxy_pin.py+++ b/tests/unit/test_saved_session_proxy_pin.py@@ -361,7 +361,6 @@ async def test_force_browser_session_rotating_profile_key_selects_after_run_creamonkeypatch,workflow=workflow,workflow_request=WorkflowRequestBody(- data={"login_cred": "cred_request"},proxy_location=ProxyLocation.RESIDENTIAL_ISP,),update_profile=update_profile,@@ -399,6 +398,48 @@ async def test_force_browser_session_rotating_profile_key_selects_after_run_creaassert forced.result is forced.update_workflow_run.return_value+async def test_force_browser_session_rotating_profile_key_uses_run_override(+ monkeypatch: pytest.MonkeyPatch,+) -> None:+ select_credential_for_run = AsyncMock(return_value="cred_selected")+ monkeypatch.setattr(+ "skyvern.forge.sdk.workflow.service.select_credential_for_run",+ select_credential_for_run,+ )+ update_profile = AsyncMock(return_value=_profile())+ workflow = _workflow(+ browser_profile_key="{{ login_cred }}",+ parameters=[+ _credential_parameter(+ "login_cred",+ credential_ids=["cred_a", "cred_selected"],+ selection_strategy="round_robin",+ )+ ],+ )++ forced = await _create_forced_workflow_run(+ monkeypatch,+ workflow=workflow,+ workflow_request=WorkflowRequestBody(+ data={"login_cred": "cred_selected"},+ proxy_location=ProxyLocation.RESIDENTIAL_ISP,+ ),+ update_profile=update_profile,+ )++ digest = build_browser_profile_key_digest("cred_selected")+ select_credential_for_run.assert_not_awaited()+ forced.get_or_create_profile.assert_awaited_once_with(+ organization_id="org_test",+ workflow_permanent_id="wpid_test",+ browser_profile_key_digest=digest,+ name="Workflow (auto-saved: cred_selected)",+ )+ forced.create_session.assert_awaited_once()++@pytest.mark.asyncioasync def test_force_browser_session_rotating_profile_key_selection_failure_returns_run(monkeypatch: pytest.MonkeyPatch,diff --git a/tests/unit/test_totp_identifier_fallback.py b/tests/unit/test_totp_identifier_fallback.pyindex 673de895b..ce4f44c6b 100644--- a/tests/unit/test_totp_identifier_fallback.py+++ b/tests/unit/test_totp_identifier_fallback.py@@ -71,6 +71,7 @@ async def test_register_credential_parameter_uses_db_totp_identifier(monkeypatchawait context._register_credential_parameter_value("cred-1", parameter, organization)assert context.get_credential_totp_identifier("credential_param") == "[email protected]"+ assert context.get_resolved_credential_parameter_id("credential_param") == "cred-1"async def _register_with_credential(monkeypatch: pytest.MonkeyPatch, credential: object) -> WorkflowRunContext:diff --git a/tests/unit/workflow/test_workflow_trigger_block.py b/tests/unit/workflow/test_workflow_trigger_block.pyindex e1a74944e..3e404956e 100644--- a/tests/unit/workflow/test_workflow_trigger_block.py+++ b/tests/unit/workflow/test_workflow_trigger_block.py@@ -252,12 +252,14 @@ class TestPayloadJsonSerialization:block: WorkflowTriggerBlock,payload: dict[str, Any],values: dict[str, Any],+ credential_ids: dict[str, str] | None = None,) -> dict[str, Any]:ctx = MagicMock()ctx.values = valuesctx.secrets = {}ctx.include_secrets_in_templates = Falsectx.get_block_metadata = MagicMock(return_value={})+ ctx.get_resolved_credential_parameter_id.side_effect = lambda key: (credential_ids or {}).get(key)return block._render_templates_in_payload(payload, ctx)def test_list_value_renders_as_json(self) -> None:@@ -296,6 +298,32 @@ class TestPayloadJsonSerialization:)assert result == {"file_number": "ABC-123"}+ def test_credential_id_value_renders_as_raw_id(self) -> None:+ block = _make_block()+ result = self._render_payload_live(+ block,+ {"credentialId": "{{ credentialId }}"},+ {+ "credentialId": {+ "context": "placeholder",+ "username": "secret_username",+ "password": "secret_password",+ }+ },+ credential_ids={"credentialId": "cred_selected"},+ )+ assert result == {"credentialId": "cred_selected"}++ def test_credential_id_json_filter_renders_as_raw_id(self) -> None:+ block = _make_block()+ result = self._render_payload_live(+ block,+ {"credentialId": "{{ credentialId | json }}"},+ {"credentialId": {"context": "placeholder"}},+ credential_ids={"credentialId": "cred_selected"},+ )+ assert result == {"credentialId": "cred_selected"}+def test_int_value_renders_as_decimal_string(self) -> None:block = _make_block()result = self._render_payload_live(