Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
SKY-10589: simplify workflows UI top bar + fix Agent System Prompt rendering (#6309)
Suchintan797bdce5be02
diff --git a/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx b/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsxindex d921930de..4494ff478 100644--- a/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/WorkflowHeader.tsx@@ -2,19 +2,16 @@ import {CalendarIcon,ChevronDownIcon,ChevronUpIcon,- CodeIcon,CopyIcon,PlayIcon,ReloadIcon,} from "@radix-ui/react-icons";-import { type ReactNode, useEffect, useRef, useState } from "react";+import { type ReactNode } from "react";import { useNavigate, useParams } from "react-router-dom";import { BrowserIcon } from "@/components/icons/BrowserIcon";import { SaveIcon } from "@/components/icons/SaveIcon";-import { VersionHistoryIcon } from "@/components/icons/VersionHistoryIcon";import { Button } from "@/components/ui/button";-import { Input } from "@/components/ui/input";import {Tooltip,TooltipContent,@@ -23,7 +20,6 @@ import {} from "@/components/ui/tooltip";import { statusIsRunningOrQueued } from "@/routes/tasks/types";import { useGlobalWorkflowsQuery } from "../hooks/useGlobalWorkflowsQuery";-import { useCacheKeyValuesQuery } from "@/routes/workflows/hooks/useCacheKeyValuesQuery";import { useCreateWorkflowMutation } from "../hooks/useCreateWorkflowMutation";import { useWorkflowQuery } from "@/routes/workflows/hooks/useWorkflowQuery";import { useWorkflowRunQuery } from "@/routes/workflows/hooks/useWorkflowRunQuery";@@ -40,7 +36,6 @@ import { EditorOverflowMenu } from "./header/EditorOverflowMenu";import { useIsGeneratingCode } from "./hooks/useIsGeneratingCode";import { useSaveWorkflow } from "./hooks/useSaveWorkflow";import { useToggleCodeView } from "./hooks/useToggleCodeView";-import { useToggleHistoryPanel } from "./hooks/useToggleHistoryPanel";import { useWorkflowHeaderCollapseStore } from "./useWorkflowHeaderCollapseStore";import { WorkflowHeaderCollapseTab } from "./WorkflowHeaderCollapseTab";import { convert } from "./workflowEditorUtils";@@ -55,145 +50,6 @@ function useIsGlobalWorkflow(): boolean {);}-function ShowCodeButton() {- const showAllCode = useShowAllCodeStore((s) => s.showAllCode);- const toggleCodeView = useToggleCodeView();-- return (- <Button- className="pl-2 pr-3"- size="lg"- variant={showAllCode ? "default" : "tertiary"}- onClick={toggleCodeView}- >- <CodeIcon className="mr-2 h-6 w-6" />- Show Code- </Button>- );-}--function CacheKeyValueDropdown() {- const cacheKeyValue = useCacheKeyValueStore((s) => s.cacheKeyValue);- const cacheKeyValueFilter = useCacheKeyValueStore((s) => s.filter);- const setExplicitCacheKeyValue = useCacheKeyValueStore((s) => s.setExplicit);- const setCacheKeyValueFilter = useCacheKeyValueStore((s) => s.setFilter);- const workflowPanelState = useWorkflowPanelStore((s) => s.workflowPanelState);- const setWorkflowPanelState = useWorkflowPanelStore(- (s) => s.setWorkflowPanelState,- );- const closeWorkflowPanel = useWorkflowPanelStore((s) => s.closeWorkflowPanel);- const cacheKeyValuesPanelOpen =- workflowPanelState.active &&- workflowPanelState.content === "cacheKeyValues";-- const { workflowPermanentId } = useParams();- const { data: workflow } = useWorkflowQuery({ workflowPermanentId });- const cacheKey = workflow?.cache_key ?? "";- const { data: cacheKeyValues } = useCacheKeyValuesQuery({- cacheKey,- debounceMs: 100,- filter: cacheKeyValueFilter || undefined,- page: 1,- workflowPermanentId,- });-- const [chosenCacheKeyValue, setChosenCacheKeyValue] = useState<string | null>(- cacheKeyValue ?? null,- );-- const inputRef = useRef<HTMLInputElement>(null);-- // Sync local input state when the external store value changes. The- // functional setter form lets us read the current local value without- // listing it as a dependency — including chosenCacheKeyValue would- // refire the effect on every keystroke even though the user-typed value- // shouldn't pull the store value back.- useEffect(() => {- setChosenCacheKeyValue((current) =>- current === (cacheKeyValue ?? null) ? current : (cacheKeyValue ?? null),- );- }, [cacheKeyValue]);-- const openCacheKeyValuesPanel = () => {- setWorkflowPanelState({ active: true, content: "cacheKeyValues" });- };-- const acceptOnEnter = () => {- const numFiltered = cacheKeyValues?.values?.length ?? 0;- if (numFiltered === 1) {- const first = cacheKeyValues?.values?.[0];- if (first) {- setChosenCacheKeyValue(first);- setExplicitCacheKeyValue(first);- setCacheKeyValueFilter(null);- closeWorkflowPanel();- }- return;- }- setExplicitCacheKeyValue(chosenCacheKeyValue ?? "");- setCacheKeyValueFilter(null);- closeWorkflowPanel();- };-- const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {- if (e.key === "Enter") {- acceptOnEnter();- }- if (e.key !== "Tab") {- openCacheKeyValuesPanel();- }- };-- return (- <div className="flex max-w-[10rem] items-center justify-center gap-1 rounded-md border border-input pr-1 focus-within:ring-1 focus-within:ring-ring">- <Input- ref={inputRef}- className="focus-visible:transparent focus-visible:none h-[2.75rem] text-ellipsis whitespace-nowrap border-none focus-visible:outline-none focus-visible:ring-0"- onChange={(e) => {- setChosenCacheKeyValue(e.target.value);- setCacheKeyValueFilter(e.target.value);- }}- onMouseDown={() => {- if (!cacheKeyValuesPanelOpen) {- openCacheKeyValuesPanel();- }- }}- onKeyDown={handleKeyDown}- placeholder="Code Key Value"- value={chosenCacheKeyValue ?? undefined}- onBlur={(e) => {- setExplicitCacheKeyValue(e.target.value);- setChosenCacheKeyValue(e.target.value);- }}- />- {cacheKeyValuesPanelOpen ? (- <ChevronUpIcon- className="h-6 w-6 cursor-pointer"- onClick={() => closeWorkflowPanel()}- />- ) : (- <ChevronDownIcon- className="h-6 w-6 cursor-pointer"- onClick={() => {- inputRef.current?.focus();- openCacheKeyValuesPanel();- }}- />- )}- </div>- );-}--function CacheKeyValueControls() {- const debugStore = useDebugStore();- return (- <>- {debugStore.isDebugMode && <ShowCodeButton />}- <CacheKeyValueDropdown />- </>- );-}-function GeneratingCodeButton() {const showAllCode = useShowAllCodeStore((s) => s.showAllCode);const toggleCodeView = useToggleCodeView();@@ -307,32 +163,6 @@ function SaveButton() {);}-function HistoryButton() {- const isRecording = useRecordingStore().isRecording;- const toggleHistoryPanel = useToggleHistoryPanel();-- return (- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <Button- disabled={isRecording}- size="icon"- variant="tertiary"- className="size-10 min-w-[2.5rem]"- onClick={() => {- toggleHistoryPanel();- }}- >- <VersionHistoryIcon size={24} />- </Button>- </TooltipTrigger>- <TooltipContent>History</TooltipContent>- </Tooltip>- </TooltipProvider>- );-}-type PanelToggleContent = "schedules" | "parameters";type PanelToggleButtonProps = {@@ -425,26 +255,21 @@ function RunButton() {}function EditorActionToolbar() {- const { data: workflowRun } = useWorkflowRunQuery();- const workflowRunIsRunningOrQueued = Boolean(- workflowRun && statusIsRunningOrQueued(workflowRun),- );-return (- <>- <EditorOverflowMenu />+ <div className="flex items-center gap-2"><BrowserModeButton /><SaveButton />- {!workflowRunIsRunningOrQueued && <HistoryButton />}+ <EditorOverflowMenu />+ <div className="mx-1 h-6 w-px bg-slate-700" aria-hidden="true" />+ <PanelToggleButton content="parameters" label="Inputs" /><PanelToggleButtoncontent="schedules"label="Schedule"leadingIcon={<CalendarIcon className="h-5 w-5" />}iconOnly/>- <PanelToggleButton content="parameters" label="Inputs" /><RunButton />- </>+ </div>);}@@ -480,8 +305,6 @@ function WorkflowHeader() {const collapsed = useWorkflowHeaderCollapseStore((s) => s.collapsed);const toggleCollapsed = useWorkflowHeaderCollapseStore((s) => s.toggle);const cacheKeyValue = useCacheKeyValueStore((s) => s.cacheKeyValue);- const cacheKeyValueFilter = useCacheKeyValueStore((s) => s.filter);- const isRecording = useRecordingStore().isRecording;const isGeneratingCode = useIsGeneratingCode({cacheKey,@@ -489,17 +312,6 @@ function WorkflowHeader() {workflowPermanentId,});- const { data: cacheKeyValues } = useCacheKeyValuesQuery({- cacheKey,- debounceMs: 100,- filter: cacheKeyValueFilter || undefined,- page: 1,- workflowPermanentId,- });-- const shouldShowCacheControls =- !isRecording && !isGeneratingCode && (cacheKeyValues?.total_count ?? 0) > 0;-if (!globalWorkflows) {return null; // this should be loaded already by some other components}@@ -521,7 +333,6 @@ function WorkflowHeader() {><TitleSection /><div className="flex h-full shrink-0 items-center justify-end gap-4">- {shouldShowCacheControls && <CacheKeyValueControls />}{isGeneratingCode && <GeneratingCodeButton />}{isGlobalWorkflow ? <MakeACopyButton /> : <EditorActionToolbar />}</div>diff --git a/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx b/skyvern-frontend/src/routes/workflows/editor/Workspace.tsxindex 20348d39c..305ff99f7 100644--- a/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/Workspace.tsx@@ -1525,6 +1525,8 @@ function Workspace({cacheKeyValues={cacheKeyValues}pending={cacheKeyValuesLoading}scriptKey={workflow.cache_key ?? "default"}+ filter={cacheKeyValueFilter ?? undefined}+ onFilterChange={setCacheKeyValueFilter}onDelete={(cacheKeyValue) => {deleteCacheKeyValue.mutate({workflowPermanentId: workflowPermanentId!,@@ -1615,6 +1617,8 @@ function Workspace({cacheKeyValues={cacheKeyValues}pending={cacheKeyValuesLoading}scriptKey={workflow.cache_key ?? "default"}+ filter={cacheKeyValueFilter ?? undefined}+ onFilterChange={setCacheKeyValueFilter}onDelete={(cacheKeyValue) => {deleteCacheKeyValue.mutate({workflowPermanentId: workflowPermanentId!,@@ -1683,6 +1687,8 @@ function Workspace({cacheKeyValues={cacheKeyValues}pending={cacheKeyValuesLoading}scriptKey={workflow.cache_key ?? "default"}+ filter={cacheKeyValueFilter ?? undefined}+ onFilterChange={setCacheKeyValueFilter}onDelete={(cacheKeyValue) => {deleteCacheKeyValue.mutate({workflowPermanentId: workflowPermanentId!,diff --git a/skyvern-frontend/src/routes/workflows/editor/header/CodeSubmenu.tsx b/skyvern-frontend/src/routes/workflows/editor/header/CodeSubmenu.tsxnew file mode 100644index 000000000..f72477e32--- /dev/null+++ b/skyvern-frontend/src/routes/workflows/editor/header/CodeSubmenu.tsx@@ -0,0 +1,111 @@+import { CodeIcon } from "@radix-ui/react-icons";+import { useParams } from "react-router-dom";++import {+ DropdownMenuCheckboxItem,+ DropdownMenuItem,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+} from "@/components/ui/dropdown-menu";+import { useCacheKeyValuesQuery } from "@/routes/workflows/hooks/useCacheKeyValuesQuery";+import { useWorkflowQuery } from "@/routes/workflows/hooks/useWorkflowQuery";+import { useCacheKeyValueStore } from "@/store/CacheKeyValueStore";+import { useDebugStore } from "@/store/useDebugStore";+import { useRecordingStore } from "@/store/useRecordingStore";+import { useShowAllCodeStore } from "@/store/ShowAllCodeStore";+import { useWorkflowPanelStore } from "@/store/WorkflowPanelStore";++import { useIsGeneratingCode } from "../hooks/useIsGeneratingCode";+import { useToggleCodeView } from "../hooks/useToggleCodeView";++/**+ * Code controls (show/hide the generated code + pick which cached variant to+ * view) live in the overflow menu rather than the main toolbar — they only+ * matter once a run has produced cached code, which is rare and advanced.+ * Renders nothing until that's the case, mirroring the old inline controls.+ */+function CodeSubmenu() {+ const { workflowPermanentId } = useParams();+ const { data: workflow } = useWorkflowQuery({ workflowPermanentId });+ const cacheKey = workflow?.cache_key ?? "";++ const isDebugMode = useDebugStore().isDebugMode;+ const isRecording = useRecordingStore((s) => s.isRecording);+ const showAllCode = useShowAllCodeStore((s) => s.showAllCode);+ const toggleCodeView = useToggleCodeView();++ const cacheKeyValue = useCacheKeyValueStore((s) => s.cacheKeyValue);+ const setExplicitCacheKeyValue = useCacheKeyValueStore((s) => s.setExplicit);+ const setWorkflowPanelState = useWorkflowPanelStore(+ (s) => s.setWorkflowPanelState,+ );++ const isGeneratingCode = useIsGeneratingCode({+ cacheKey,+ cacheKeyValue,+ workflowPermanentId,+ });++ const { data: cacheKeyValues } = useCacheKeyValuesQuery({+ cacheKey,+ page: 1,+ workflowPermanentId,+ });++ const values = cacheKeyValues?.values ?? [];+ const totalCount = cacheKeyValues?.total_count ?? 0;++ if (isRecording || isGeneratingCode || totalCount === 0) {+ return null;+ }++ return (+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>+ <CodeIcon className="mr-2 size-4" />+ Code+ </DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="max-h-80 overflow-y-auto">+ {isDebugMode && (+ <>+ <DropdownMenuCheckboxItem+ checked={showAllCode}+ onCheckedChange={() => toggleCodeView()}+ onSelect={(event) => event.preventDefault()}+ >+ Show code+ </DropdownMenuCheckboxItem>+ <DropdownMenuSeparator />+ </>+ )}+ <DropdownMenuRadioGroup+ value={cacheKeyValue || undefined}+ onValueChange={(value) => setExplicitCacheKeyValue(value)}+ >+ {values.map((value) => (+ <DropdownMenuRadioItem key={value} value={value}>+ {value}+ </DropdownMenuRadioItem>+ ))}+ </DropdownMenuRadioGroup>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ onSelect={() =>+ setWorkflowPanelState({+ active: true,+ content: "cacheKeyValues",+ })+ }+ >+ Search or add value…+ </DropdownMenuItem>+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ );+}++export { CodeSubmenu };diff --git a/skyvern-frontend/src/routes/workflows/editor/header/EditorOverflowMenu.tsx b/skyvern-frontend/src/routes/workflows/editor/header/EditorOverflowMenu.tsxindex 41600691b..659dadba1 100644--- a/skyvern-frontend/src/routes/workflows/editor/header/EditorOverflowMenu.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/header/EditorOverflowMenu.tsx@@ -1,4 +1,8 @@-import { DotsHorizontalIcon } from "@radix-ui/react-icons";+import {+ CounterClockwiseClockIcon,+ DotsHorizontalIcon,+ ResetIcon,+} from "@radix-ui/react-icons";import { useMutation, useQueryClient } from "@tanstack/react-query";import { type AxiosError } from "axios";import { useParams } from "react-router-dom";@@ -9,6 +13,8 @@ import {DropdownMenu,DropdownMenuContent,DropdownMenuItem,+ DropdownMenuSeparator,+ DropdownMenuShortcut,DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";import {@@ -19,15 +25,22 @@ import {} from "@/components/ui/tooltip";import { toast } from "@/components/ui/use-toast";import { useCredentialGetter } from "@/hooks/useCredentialGetter";+import { statusIsRunningOrQueued } from "@/routes/tasks/types";import { useWorkflowQuery } from "@/routes/workflows/hooks/useWorkflowQuery";+import { useWorkflowRunQuery } from "@/routes/workflows/hooks/useWorkflowRunQuery";import { useRecordingStore } from "@/store/useRecordingStore";import { useWorkflowHasChangesStore } from "@/store/WorkflowHasChangesStore";+import { useWorkflowHistoryAccessStore } from "@/store/WorkflowHistoryAccessStore";+import { useUndoRedoShortcutLabels } from "../controls/useUndoRedoShortcutLabels";import { useSaveWorkflow } from "../hooks/useSaveWorkflow";+import { useToggleHistoryPanel } from "../hooks/useToggleHistoryPanel";+import { CodeSubmenu } from "./CodeSubmenu";export function EditorOverflowMenu() {const { workflowPermanentId } = useParams();const { data: workflow } = useWorkflowQuery({ workflowPermanentId });+ const { data: workflowRun } = useWorkflowRunQuery();const isTemplate = workflow?.is_template ?? false;const saving = useWorkflowHasChangesStore((s) => s.saveIsPending);const isRecording = useRecordingStore((s) => s.isRecording);@@ -35,6 +48,18 @@ export function EditorOverflowMenu() {const credentialGetter = useCredentialGetter();const queryClient = useQueryClient();+ const canUndo = useWorkflowHistoryAccessStore((s) => s.canUndo);+ const onUndo = useWorkflowHistoryAccessStore((s) => s.undo);+ const canRedo = useWorkflowHistoryAccessStore((s) => s.canRedo);+ const onRedo = useWorkflowHistoryAccessStore((s) => s.redo);+ const { undoShortcutLabel, redoShortcutLabel } = useUndoRedoShortcutLabels();++ const toggleHistoryPanel = useToggleHistoryPanel();++ const workflowRunIsRunningOrQueued = Boolean(+ workflowRun && statusIsRunningOrQueued(workflowRun),+ );+const templateMutation = useMutation({mutationFn: async (newIsTemplate: boolean) => {const client = await getClient(credentialGetter, "sans-api-v1");@@ -79,7 +104,7 @@ export function EditorOverflowMenu() {<TooltipTrigger asChild><DropdownMenuTrigger asChild><Button- disabled={disabled}+ disabled={isRecording}size="icon"variant="tertiary"className="size-10 min-w-[2.5rem]"@@ -92,7 +117,40 @@ export function EditorOverflowMenu() {<TooltipContent>More actions</TooltipContent></Tooltip></TooltipProvider>- <DropdownMenuContent align="end">+ <DropdownMenuContent align="end" className="min-w-[12rem]">+ <CodeSubmenu />+ <DropdownMenuItem+ disabled={!canUndo || isRecording}+ onSelect={(event) => {+ event.preventDefault();+ onUndo();+ }}+ >+ <ResetIcon className="mr-2 size-4" />+ Undo+ <DropdownMenuShortcut>{undoShortcutLabel}</DropdownMenuShortcut>+ </DropdownMenuItem>+ <DropdownMenuItem+ disabled={!canRedo || isRecording}+ onSelect={(event) => {+ event.preventDefault();+ onRedo();+ }}+ >+ <ResetIcon className="mr-2 size-4 -scale-x-100" />+ Redo+ <DropdownMenuShortcut>{redoShortcutLabel}</DropdownMenuShortcut>+ </DropdownMenuItem>+ {!workflowRunIsRunningOrQueued && (+ <DropdownMenuItem+ disabled={isRecording}+ onSelect={() => toggleHistoryPanel()}+ >+ <CounterClockwiseClockIcon className="mr-2 size-4" />+ Version history+ </DropdownMenuItem>+ )}+ <DropdownMenuSeparator /><DropdownMenuItemdisabled={disabled}onSelect={(event) => {diff --git a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/WorkflowSettingsEditor.tsx b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/WorkflowSettingsEditor.tsxindex c09b037e7..610e31a29 100644--- a/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/WorkflowSettingsEditor.tsx+++ b/skyvern-frontend/src/routes/workflows/editor/nodes/StartNode/WorkflowSettingsEditor.tsx@@ -7,12 +7,6 @@ import { BrowserProfileSelector } from "@/routes/workflows/components/BrowserProimport { HelpTooltip } from "@/components/HelpTooltip";import { KeyValueInput } from "@/components/KeyValueInput";import { ModelSelector } from "@/components/ModelSelector";-import {- Accordion,- AccordionContent,- AccordionItem,- AccordionTrigger,-} from "@/components/ui/accordion";import { ProxySelector } from "@/components/ProxySelector";import { TestWebhookDialog } from "@/components/TestWebhookDialog";import { WorkflowBlockInputTextarea } from "@/components/WorkflowBlockInputTextarea";@@ -140,32 +134,23 @@ function WorkflowSettingsEditorBody({onChange={(value) => update({ model: value })}/></div>- <Accordion type="single" collapsible>- <AccordionItem value="systemPrompt" className="border-b-0">- <AccordionTrigger className="py-0 text-xs text-slate-300">- Agent System Prompt- </AccordionTrigger>- <AccordionContent className="pt-2">- <div className="space-y-2">- <div className="flex items-center gap-2">- <Label>Agent System Prompt</Label>- <HelpTooltip content="Applied to every LLM call in this agent, including any sub-agents." />- </div>- <WorkflowBlockInputTextarea- nodeId={blockId}- onChange={(value) =>- update({- workflowSystemPrompt: value.length ? value : null,- })- }- value={data.workflowSystemPrompt ?? ""}- placeholder="e.g. Format all dates as YYYY-MM-DD and all currency values as USD with two decimals."- className="nopan text-xs"- />- </div>- </AccordionContent>- </AccordionItem>- </Accordion>+ <div className="space-y-2">+ <div className="flex items-center gap-2">+ <Label>Agent System Prompt</Label>+ <HelpTooltip content="Applied to every LLM call in this agent, including any sub-agents." />+ </div>+ <WorkflowBlockInputTextarea+ nodeId={blockId}+ onChange={(value) =>+ update({+ workflowSystemPrompt: value.length ? value : null,+ })+ }+ value={data.workflowSystemPrompt ?? ""}+ placeholder="e.g. Format all dates as YYYY-MM-DD and all currency values as USD with two decimals."+ className="nopan text-xs"+ />+ </div><div className="space-y-2"><div className="flex gap-2"><Label>Webhook Callback URL</Label>