Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
feat: update Trigger Block UI browser session and completion controls (#SKY-8220) (#5014)
Celal Zamanoğlu53d74acf20eb
diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/BrowserSessionSelector.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/BrowserSessionSelector.tsxnew file mode 100644index 000000000..90afc6018--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/BrowserSessionSelector.tsx@@ -0,0 +1,44 @@+import {+ Select,+ SelectContent,+ SelectGroup,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/ui/select";+import {+ PARENT_SESSION_VALUE,+ FRESH_SESSION_VALUE,+} from "./browserSessionConstants";++type Props = {+ value: string;+ onChange: (value: string) => void;+ waitForCompletion: boolean;+};++function BrowserSessionSelector({ value, onChange, waitForCompletion }: Props) {+ return (+ <Select value={value} onValueChange={onChange}>+ <SelectTrigger className="w-full text-xs">+ <SelectValue placeholder="Select browser session" />+ </SelectTrigger>+ <SelectContent>+ <SelectGroup>+ <SelectItem+ value={PARENT_SESSION_VALUE}+ disabled={!waitForCompletion}+ className="text-xs"+ >+ Continue in the same session+ </SelectItem>+ <SelectItem value={FRESH_SESSION_VALUE} className="text-xs">+ Create a new browser+ </SelectItem>+ </SelectGroup>+ </SelectContent>+ </Select>+ );+}++export { BrowserSessionSelector };diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/PayloadParameterFields.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/PayloadParameterFields.tsxindex d1189aa44..27e214ee4 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/PayloadParameterFields.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/PayloadParameterFields.tsx@@ -1,4 +1,4 @@-import { useCallback, useRef } from "react";+import { useCallback, useRef, useState } from "react";import { Label } from "@/components/ui/label";import { WorkflowBlockInputTextarea } from "@/components/WorkflowBlockInputTextarea";import {@@ -7,6 +7,7 @@ import {} from "@/routes/workflows/types/workflowTypes";import { Skeleton } from "@/components/ui/skeleton";import { CredentialSelector } from "../../../components/CredentialSelector";+import { useCredentialsQuery } from "../../../hooks/useCredentialsQuery";interface PayloadParameterFieldsProps {parameters: Array<WorkflowParameter>;@@ -16,6 +17,22 @@ interface PayloadParameterFieldsProps {isLoading: boolean;}+function getDynamicInputPlaceholder(+ param: WorkflowParameter,+ isCredential: boolean,+): string {+ if (isCredential) return "e.g. {{ credential }}";+ if (param.default_value != null)+ return `Default: ${String(param.default_value)}`;+ return `Enter ${param.key}...`;+}++function isCredentialParam(param: WorkflowParameter): boolean {+ return (+ param.workflow_parameter_type === WorkflowParameterValueType.CredentialId+ );+}+function parsePayload(payload: string): Record<string, string> {try {const parsed = JSON.parse(payload);@@ -39,6 +56,11 @@ function PayloadParameterFields({nodeId,isLoading,}: PayloadParameterFieldsProps) {+ const { data: credentials } = useCredentialsQuery({ page_size: 100 });+ const credentialNameById = new Map(+ credentials?.map((c) => [c.credential_id, c.name]),+ );+const payloadRef = useRef(payload);payloadRef.current = payload;@@ -57,6 +79,37 @@ function PayloadParameterFields({[onChange],);+ const [dynamicCredentialKeys, setDynamicCredentialKeys] = useState<+ Set<string>+ >(() => {+ const currentValues = parsePayload(payload);+ return new Set(+ parameters+ .filter((p) => isCredentialParam(p))+ .filter((p) => {+ const v = currentValues[p.key] ?? "";+ return v !== "" && !v.startsWith("cred_");+ })+ .map((p) => p.key),+ );+ });++ const toggleDynamicCredential = useCallback(+ (key: string) => {+ setDynamicCredentialKeys((prev) => {+ const next = new Set(prev);+ if (next.has(key)) {+ next.delete(key);+ handleFieldChange(key, "");+ } else {+ next.add(key);+ }+ return next;+ });+ },+ [handleFieldChange],+ );+if (isLoading) {return (<div className="space-y-3">@@ -82,43 +135,66 @@ function PayloadParameterFields({return (<div className="space-y-3">- {parameters.map((param) => (- <div key={param.key} className="space-y-1.5">- <div className="flex items-baseline gap-2">- <Label className="text-xs text-slate-300">{param.key}</Label>- <span className="text-[10px] text-slate-500">- {param.workflow_parameter_type}- </span>+ {parameters.map((param) => {+ const isCredential = isCredentialParam(param);+ const isDynamic = dynamicCredentialKeys.has(param.key);++ return (+ <div key={param.key} className="space-y-1.5">+ <div className="flex items-center justify-between">+ <div className="flex items-baseline gap-2">+ <Label className="text-xs text-slate-300">{param.key}</Label>+ <span className="text-[10px] text-slate-500">+ {param.workflow_parameter_type}+ </span>+ </div>+ {isCredential && (+ <button+ type="button"+ className="text-xs text-blue-400 hover:underline"+ onClick={() => toggleDynamicCredential(param.key)}+ >+ {isDynamic ? "Use selector" : "Use dynamic value"}+ </button>+ )}+ </div>+ {param.description && (+ <p className="text-[10px] text-slate-500">{param.description}</p>+ )}+ {isCredential && !isDynamic ? (+ <CredentialSelector+ value={payloadValues[param.key] ?? ""}+ onChange={(val) => handleFieldChange(param.key, val)}+ placeholder={(() => {+ if (param.default_value == null) return "Select a credential";+ const defaultId = String(param.default_value);+ const name = credentialNameById.get(defaultId);+ return name ? `Default: ${name}` : `Default: ${defaultId}`;+ })()}+ />+ ) : (+ <>+ <WorkflowBlockInputTextarea+ nodeId={nodeId}+ onChange={(val) => handleFieldChange(param.key, val)}+ value={payloadValues[param.key] ?? ""}+ placeholder={getDynamicInputPlaceholder(param, isCredential)}+ className="nopan text-xs"+ />+ {isCredential &&+ !payloadValues[param.key] &&+ param.default_value != null && (+ <p className="text-[10px] text-slate-500">+ Default:{" "}+ {credentialNameById.get(String(param.default_value)) ??+ String(param.default_value)}+ </p>+ )}+ </>+ )}</div>- {param.description && (- <p className="text-[10px] text-slate-500">{param.description}</p>- )}- {param.workflow_parameter_type ===- WorkflowParameterValueType.CredentialId ? (- <CredentialSelector- value={payloadValues[param.key] ?? ""}- onChange={(val) => handleFieldChange(param.key, val)}- placeholder={- param.default_value != null- ? `Default: ${String(param.default_value)}`- : "Select a credential"- }- />- ) : (- <WorkflowBlockInputTextarea- nodeId={nodeId}- onChange={(val) => handleFieldChange(param.key, val)}- value={payloadValues[param.key] ?? ""}- placeholder={- param.default_value != null- ? `Default: ${String(param.default_value)}`- : `Enter ${param.key}...`- }- className="nopan text-xs"- />- )}- </div>- ))}+ );+ })}</div>);}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/WorkflowTriggerNode.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/WorkflowTriggerNode.tsxindex 19125bc82..7fc29f79e 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/WorkflowTriggerNode.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/WorkflowTriggerNode.tsx@@ -1,4 +1,4 @@-import { useCallback, useEffect } from "react";+import { useCallback, useEffect, useState } from "react";import {Accordion,AccordionContent,@@ -32,17 +32,20 @@ import { useRecordingStore } from "@/store/useRecordingStore";import { useWorkflowHasChangesStore } from "@/store/WorkflowHasChangesStore";import { cn } from "@/util/utils";import { BlockExecutionOptions } from "../components/BlockExecutionOptions";+import { BrowserSessionSelector } from "./BrowserSessionSelector";+import {+ PARENT_SESSION_VALUE,+ FRESH_SESSION_VALUE,+} from "./browserSessionConstants";const workflowPermanentIdTooltip ="Select the workflow to trigger when this block runs.";const payloadTooltip ="Parameters to pass to the triggered workflow. Values support Jinja2 templates like {{ some_parameter }}.";const waitForCompletionTooltip =- "If enabled, this block will wait for the triggered workflow to complete before continuing to the next block. If disabled, the workflow is triggered asynchronously and execution continues immediately.";-const useParentBrowserSessionTooltip =- "When enabled, the triggered workflow will use the same browser session as the parent workflow, continuing where it left off (same tabs, cookies, login state).";-const browserSessionIdTooltip =- "Optional browser session ID to pass to the triggered workflow. This allows the triggered workflow to reuse an existing browser session. Overrides the parent session toggle if set.";+ "If enabled, this block will wait for the triggered workflow to complete before continuing to the next block. If disabled, the workflow is triggered asynchronously and the parent continues immediately. When disabled, the triggered workflow cannot continue in the same session because the parent may close it before the child finishes.";+const browserSessionTooltip =+ "Choose which browser session the triggered workflow should use. Continuing in the same session shares tabs, cookies, and login state. Creating a new browser gives the triggered workflow a fresh browser.";function WorkflowTriggerNode({ id, data }: NodeProps<WorkflowTriggerNodeType>) {const { editable, label } = data;@@ -74,6 +77,45 @@ function WorkflowTriggerNode({ id, data }: NodeProps<WorkflowTriggerNodeType>) {workflowTitle: fetchedTitle,} = useTargetWorkflowParametersQuery(data.workflowPermanentId);+ const isCustomBrowserSession =+ !data.useParentBrowserSession && data.browserSessionId !== "";++ const [useDynamicBrowserSession, setUseDynamicBrowserSession] = useState(+ isCustomBrowserSession,+ );++ const browserSessionValue = data.useParentBrowserSession+ ? PARENT_SESSION_VALUE+ : data.browserSessionId || FRESH_SESSION_VALUE;++ const handleBrowserSessionChange = useCallback(+ (value: string) => {+ if (value === PARENT_SESSION_VALUE) {+ update({ useParentBrowserSession: true, browserSessionId: "" });+ } else if (value === FRESH_SESSION_VALUE) {+ update({ useParentBrowserSession: false, browserSessionId: "" });+ } else {+ update({ useParentBrowserSession: false, browserSessionId: value });+ }+ },+ [update],+ );++ const handleWaitForCompletionChange = useCallback(+ (checked: boolean) => {+ if (!checked && data.useParentBrowserSession) {+ update({+ waitForCompletion: checked,+ useParentBrowserSession: false,+ browserSessionId: "",+ });+ } else {+ update({ waitForCompletion: checked });+ }+ },+ [update, data.useParentBrowserSession],+ );+// Hydrate title from fetched workflow data (single API call, no duplicate)// Mark as internal update to prevent triggering "unsaved changes" dialoguseEffect(() => {@@ -186,28 +228,82 @@ function WorkflowTriggerNode({ id, data }: NodeProps<WorkflowTriggerNodeType>) {)}</div><Separator />+ <div className="space-y-2">+ <div className="flex items-center justify-between">+ <div className="flex gap-2">+ <Label className="text-xs text-slate-300">+ Browser Session+ </Label>+ <HelpTooltip content={browserSessionTooltip} />+ </div>+ <button+ type="button"+ className="text-xs text-blue-400 hover:underline"+ onClick={() => {+ const next = !useDynamicBrowserSession;+ setUseDynamicBrowserSession(next);+ if (!next) {+ update({+ useParentBrowserSession: data.waitForCompletion,+ browserSessionId: "",+ });+ }+ }}+ >+ {useDynamicBrowserSession+ ? "Use selector"+ : "Use dynamic value"}+ </button>+ </div>+ {useDynamicBrowserSession ? (+ <WorkflowBlockInputTextarea+ nodeId={id}+ onChange={(value) => {+ update({+ useParentBrowserSession: false,+ browserSessionId: value,+ });+ }}+ value={data.browserSessionId}+ placeholder="e.g. {{ browser_session_id }}"+ className="nopan text-xs"+ />+ ) : (+ <BrowserSessionSelector+ value={browserSessionValue}+ onChange={handleBrowserSessionChange}+ waitForCompletion={data.waitForCompletion}+ />+ )}+ </div>+ <div className="flex items-center justify-between">+ <div className="flex gap-2">+ <Label className="text-xs text-slate-300">+ Wait for Completion+ </Label>+ <HelpTooltip content={waitForCompletionTooltip} />+ </div>+ <div className="w-52">+ <Switch+ checked={data.waitForCompletion}+ onCheckedChange={handleWaitForCompletionChange}+ />+ </div>+ </div>+ {!data.waitForCompletion && !useDynamicBrowserSession && (+ <p className="text-xs text-slate-400">+ "Continue in the same session" is disabled because the+ parent workflow may close its browser before the triggered+ workflow finishes.+ </p>+ )}+ <Separator /><Accordion type="single" collapsible>- <AccordionItem value="advanced" className="border-b-0">+ <AccordionItem value="advanced" className="border-0"><AccordionTrigger className="py-0">Advanced Settings</AccordionTrigger><AccordionContent className="space-y-4 pl-6 pr-1 pt-4">- <div className="flex items-center justify-between">- <div className="flex gap-2">- <Label className="text-xs font-normal text-slate-300">- Wait for Completion- </Label>- <HelpTooltip content={waitForCompletionTooltip} />- </div>- <div className="w-52">- <Switch- checked={data.waitForCompletion}- onCheckedChange={(checked) => {- update({ waitForCompletion: checked });- }}- />- </div>- </div><BlockExecutionOptionscontinueOnFailure={data.continueOnFailure}nextLoopOnFailure={data.nextLoopOnFailure}@@ -220,50 +316,8 @@ function WorkflowTriggerNode({ id, data }: NodeProps<WorkflowTriggerNodeType>) {onNextLoopOnFailureChange={(checked) => {update({ nextLoopOnFailure: checked });}}+ hideTopSeparator/>- <div className="space-y-2">- <div className="flex items-center justify-between">- <div className="flex gap-2">- <Label className="text-xs font-normal text-slate-300">- Use Parent Browser Session- </Label>- <HelpTooltip content={useParentBrowserSessionTooltip} />- </div>- <div className="w-52">- <Switch- checked={data.useParentBrowserSession}- onCheckedChange={(checked) => {- update({ useParentBrowserSession: checked });- }}- />- </div>- </div>- {!data.waitForCompletion && data.useParentBrowserSession && (- <p className="text-xs text-yellow-500">- Using the parent browser session while "Wait for- Completion" is off may cause the triggered workflow to- fail if the parent finishes and closes the browser first.- </p>- )}- </div>- <div className="space-y-2">- <div className="flex gap-2">- <Label className="text-xs font-normal text-slate-300">- Browser Session ID- </Label>- <HelpTooltip content={browserSessionIdTooltip} />- </div>- <WorkflowBlockInputTextarea- nodeId={id}- onChange={(value) => {- update({ browserSessionId: value });- }}- value={data.browserSessionId}- placeholder="Optional: {{ browser_session_id }}"- className="nopan text-xs"- />- </div>- <Separator /><ParametersMultiSelectavailableOutputParameters={availableOutputParameterKeys}parameters={data.parameterKeys}diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/browserSessionConstants.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/browserSessionConstants.tsnew file mode 100644index 000000000..3f6bad443--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/browserSessionConstants.ts@@ -0,0 +1,4 @@+const PARENT_SESSION_VALUE = "__parent__";+const FRESH_SESSION_VALUE = "__fresh__";++export { FRESH_SESSION_VALUE, PARENT_SESSION_VALUE };diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/types.ts b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/types.tsindex ef1cebd54..c1160bdae 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/types.ts+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/WorkflowTriggerNode/types.ts@@ -28,7 +28,7 @@ export const workflowTriggerNodeDefaultData: WorkflowTriggerNodeData = {payload: "{}",waitForCompletion: true,browserSessionId: "",- useParentBrowserSession: false,+ useParentBrowserSession: true,parameterKeys: [],};diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/components/BlockExecutionOptions.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/components/BlockExecutionOptions.tsxindex 679c9f8cc..5c66e3c42 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/components/BlockExecutionOptions.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/components/BlockExecutionOptions.tsx@@ -19,6 +19,7 @@ interface BlockExecutionOptionsProps {nextLoopOnFailure?: boolean;includeActionHistoryInVerification?: boolean;};+ hideTopSeparator?: boolean;}export function BlockExecutionOptions({@@ -36,6 +37,7 @@ export function BlockExecutionOptions({nextLoopOnFailure: true,includeActionHistoryInVerification: false,},+ hideTopSeparator = false,}: BlockExecutionOptionsProps) {const showContinueOnFailure = showOptions.continueOnFailure ?? true;const showNextLoopOnFailure = showOptions.nextLoopOnFailure ?? true;@@ -44,7 +46,7 @@ export function BlockExecutionOptions({return (<>- <Separator />+ {!hideTopSeparator && <Separator />}{showIncludeActionHistory &&onIncludeActionHistoryInVerificationChange && (<div className="flex items-center justify-between">diff --git a/tests/unit/test_setup_quickstart.py b/tests/unit/test_setup_quickstart.pyindex eca0ea23a..bf77532ff 100644--- a/tests/unit/test_setup_quickstart.py+++ b/tests/unit/test_setup_quickstart.py@@ -108,6 +108,8 @@ def test_subcommand_still_works(tmp_path: Path, monkeypatch: pytest.MonkeyPatch)config = tmp_path / ".claude.json"_patch_env(monkeypatch)monkeypatch.setattr("skyvern.cli.setup_commands._claude_code_global_config_path", lambda: config)+ # Prevent _install_skills from writing into the repo's .claude/skills/ during CI+ monkeypatch.setattr("skyvern.cli.setup_commands._install_skills", lambda *a, **kw: None)result = CliRunner().invoke(setup_app, ["claude-code", "--yes"])assert result.exit_code == 0