@mastra/playground-ui 5.0.5-alpha.0 → 5.1.0-alpha.1

package/dist/index.cjs.js

@@ -41,13 +41,13 @@ const jsonSchemaToZod = require('json-schema-to-zod');
 const superjson = require('superjson');
 const z = require('zod');
 const react$3 = require('@autoform/react');
-const LabelPrimitive = require('@radix-ui/react-label');
 const CheckboxPrimitive = require('@radix-ui/react-checkbox');
 const reactDayPicker = require('react-day-picker');
 const PopoverPrimitive = require('@radix-ui/react-popover');
 const SelectPrimitive = require('@radix-ui/react-select');
 const uuid = require('@lukeed/uuid');
 const zod = require('@autoform/zod');
+const LabelPrimitive = require('@radix-ui/react-label');
 const reactCodeBlock = require('react-code-block');
 const reactTable = require('@tanstack/react-table');
 
@@ -75,10 +75,10 @@ const TabsPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(TabsPrimi
 const CollapsiblePrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(CollapsiblePrimitive);
 const DialogPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(DialogPrimitive);
 const ScrollAreaPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(ScrollAreaPrimitive);
-const LabelPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(LabelPrimitive);
 const CheckboxPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(CheckboxPrimitive);
 const PopoverPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(PopoverPrimitive);
 const SelectPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(SelectPrimitive);
+const LabelPrimitive__namespace = /*#__PURE__*/_interopNamespaceDefault(LabelPrimitive);
 
 function r(e){var t,f,n="";if("string"==typeof e||"number"==typeof e)n+=e;else if("object"==typeof e)if(Array.isArray(e)){var o=e.length;for(t=0;t<o;t++)e[t]&&(f=r(e[t]))&&(n&&(n+=" "),n+=f);}else for(f in e)e[f]&&(n&&(n+=" "),n+=f);return n}function clsx(){for(var e,t,f=0,n="",o=arguments.length;f<o;f++)(e=arguments[f])&&(t=r(e))&&(n&&(n+=" "),n+=t);return n}
 
@@ -2922,6 +2922,46 @@ const AvatarFallback = React__namespace.forwardRef(({ className, ...props }, ref
 ));
 AvatarFallback.displayName = AvatarPrimitive__namespace.Fallback.displayName;
 
+const ImageWithFallback = ({ alt, src, ...rest }) => {
+  const [error, setError] = React.useState(false);
+  React.useEffect(() => {
+    setError(false);
+  }, [src]);
+  return error || !src ? /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(
+      "svg",
+      {
+        xmlns: "http://www.w3.org/2000/svg",
+        fill: "none",
+        viewBox: "0 0 24 24",
+        strokeWidth: "1.5",
+        stroke: "currentColor",
+        width: "150",
+        height: "150",
+        children: /* @__PURE__ */ jsxRuntime.jsx(
+          "path",
+          {
+            strokeLinecap: "round",
+            strokeLinejoin: "round",
+            d: "m2.25 15.75 5.159-5.159a2.25 2.25 0 0 1 3.182 0l5.159 5.159m-1.5-1.5 1.409-1.409a2.25 2.25 0 0 1 3.182 0l2.909 2.909m-18 3.75h16.5a1.5 1.5 0 0 0 1.5-1.5V6a1.5 1.5 0 0 0-1.5-1.5H3.75A1.5 1.5 0 0 0 2.25 6v12a1.5 1.5 0 0 0 1.5 1.5Zm10.5-11.25h.008v.008h-.008V8.25Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z"
+          }
+        )
+      }
+    ),
+    /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs italic text-muted-foreground -mt-[0.625rem] mb-[0.625rem]", children: "Image link is broken" })
+  ] }) : /* @__PURE__ */ jsxRuntime.jsx(
+    "img",
+    {
+      src,
+      alt,
+      ...rest,
+      onError: () => {
+        setError(true);
+      }
+    }
+  );
+};
+
 const SyntaxHighlighter$2 = reactSyntaxHighlighter.makePrismAsyncSyntaxHighlighter({
   style: prism.coldarkDark,
   customStyle: {
@@ -3141,7 +3181,8 @@ const defaultComponents = reactMarkdown.unstable_memoizeMarkdownComponents({
     );
   },
   CodeHeader,
-  SyntaxHighlighter: SyntaxHighlighter$2
+  SyntaxHighlighter: SyntaxHighlighter$2,
+  img: ImageWithFallback
 });
 
 const sizes = {
@@ -3524,10 +3565,10 @@ const GithubIcon = (props) => /* @__PURE__ */ jsxRuntime.jsxs("svg", { width: "1
     "path",
     {
       d: "M7.5 0.75C3.6325 0.75 0.5 3.8825 0.5 7.75C0.5 10.8475 2.50375 13.4637 5.28625 14.3912C5.63625 14.4525 5.7675 14.2425 5.7675 14.0587C5.7675 13.8925 5.75875 13.3412 5.75875 12.755C4 13.0787 3.545 12.3262 3.405 11.9325C3.32625 11.7312 2.985 11.11 2.6875 10.9437C2.4425 10.8125 2.0925 10.4887 2.67875 10.48C3.23 10.4712 3.62375 10.9875 3.755 11.1975C4.385 12.2562 5.39125 11.9587 5.79375 11.775C5.855 11.32 6.03875 11.0137 6.24 10.8387C4.6825 10.6637 3.055 10.06 3.055 7.3825C3.055 6.62125 3.32625 5.99125 3.7725 5.50125C3.7025 5.32625 3.4575 4.60875 3.8425 3.64625C3.8425 3.64625 4.42875 3.4625 5.7675 4.36375C6.3275 4.20625 6.9225 4.1275 7.5175 4.1275C8.1125 4.1275 8.7075 4.20625 9.2675 4.36375C10.6062 3.45375 11.1925 3.64625 11.1925 3.64625C11.5775 4.60875 11.3325 5.32625 11.2625 5.50125C11.7087 5.99125 11.98 6.6125 11.98 7.3825C11.98 10.0687 10.3438 10.6637 8.78625 10.8387C9.04 11.0575 9.25875 11.4775 9.25875 12.1337C9.25875 13.07 9.25 13.8225 9.25 14.0587C9.25 14.2425 9.38125 14.4612 9.73125 14.3912C11.1209 13.9221 12.3284 13.029 13.1839 11.8377C14.0393 10.6463 14.4996 9.21668 14.5 7.75C14.5 3.8825 11.3675 0.75 7.5 0.75Z",
-      fill: "white"
+      fill: "currentColor"
     }
   ) }),
-  /* @__PURE__ */ jsxRuntime.jsx("defs", { children: /* @__PURE__ */ jsxRuntime.jsx("clipPath", { id: "clip0_21999_22095", children: /* @__PURE__ */ jsxRuntime.jsx("rect", { width: "14", height: "14", fill: "white", transform: "translate(0.5 0.75)" }) }) })
+  /* @__PURE__ */ jsxRuntime.jsx("defs", { children: /* @__PURE__ */ jsxRuntime.jsx("clipPath", { id: "clip0_21999_22095", children: /* @__PURE__ */ jsxRuntime.jsx("rect", { width: "14", height: "14", fill: "currentColor", transform: "translate(0.5 0.75)" }) }) })
 ] });
 
 const GoogleIcon = (props) => /* @__PURE__ */ jsxRuntime.jsxs("svg", { width: "15", height: "15", viewBox: "0 0 15 15", fill: "none", xmlns: "http://www.w3.org/2000/svg", ...props, children: [
@@ -3756,7 +3797,7 @@ const WorkflowIcon = (props) => /* @__PURE__ */ jsxRuntime.jsx("svg", { width: "
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M6.24388 2.4018C6.24388 2.0394 6.53767 1.74561 6.90008 1.74561H10.0991C10.4614 1.74561 10.7553 2.0394 10.7553 2.4018V4.57546C10.7553 4.93787 10.4614 5.23166 10.0991 5.23166H9.31982V7.35469L10.0033 9.22664C9.90442 9.20146 9.80035 9.1761 9.6915 9.14986L9.62652 9.13422C9.30473 9.05687 8.92256 8.96501 8.61993 8.84491C8.5819 8.82981 8.54147 8.81292 8.49957 8.79391C8.45767 8.81292 8.41724 8.82981 8.3792 8.84491C8.07657 8.96501 7.6944 9.05687 7.37261 9.13422L7.30763 9.14986C7.19879 9.1761 7.09471 9.20146 6.99577 9.22664L7.67932 7.35469V5.23166H6.90008C6.53767 5.23166 6.24388 4.93787 6.24388 4.57546V2.4018ZM6.99577 9.22664C6.99577 9.22664 6.99578 9.22664 6.99577 9.22664L6.43283 10.7683H6.81806C7.18047 10.7683 7.47426 11.0622 7.47426 11.4245V13.5982C7.47426 13.9606 7.18047 14.2544 6.81806 14.2544H3.61909C3.25668 14.2544 2.96289 13.9606 2.96289 13.5982V11.4245C2.96289 11.0622 3.25668 10.7683 3.61909 10.7683H4.26617C4.2921 10.4663 4.32783 10.1494 4.37744 9.85171C4.43762 9.49063 4.52982 9.08135 4.68998 8.76102C4.93975 8.2615 5.44743 8.01751 5.7771 7.88788C6.14684 7.74249 6.57537 7.63889 6.92317 7.55505C7.24707 7.47696 7.49576 7.41679 7.67932 7.35469L6.99577 9.22664ZM6.43283 10.7683L6.99577 9.22664C6.75846 9.28705 6.55067 9.34646 6.37745 9.41458C6.22784 9.47341 6.1623 9.51712 6.14023 9.53254C6.09752 9.63631 6.04409 9.83055 5.99562 10.1214C5.96201 10.3231 5.93498 10.5439 5.91341 10.7683H6.43283ZM10.0033 9.22664L9.31982 7.35469C9.50338 7.41679 9.75206 7.47696 10.076 7.55505C10.4238 7.63889 10.8523 7.74249 11.2221 7.88788C11.5517 8.01751 12.0594 8.2615 12.3091 8.76102C12.4693 9.08135 12.5615 9.49063 12.6217 9.85171C12.6713 10.1494 12.707 10.4663 12.733 10.7683H13.38C13.7424 10.7683 14.0362 11.0622 14.0362 11.4245V13.5982C14.0362 13.9606 13.7424 14.2544 13.38 14.2544H10.1811C9.81867 14.2544 9.52488 13.9606 9.52488 13.5982V11.4245C9.52488 11.0622 9.81867 10.7683 10.1811 10.7683H10.5663L10.0033 9.22664ZM10.0033 9.22664L10.5663 10.7683H11.0857C11.0642 10.5439 11.0372 10.3231 11.0035 10.1214C10.9551 9.83055 10.9016 9.63631 10.8589 9.53254C10.8369 9.51712 10.7713 9.47341 10.6217 9.41458C10.4485 9.34646 10.2407 9.28705 10.0033 9.22664Z",
-    fill: "white"
+    fill: "currentColor"
   }
 ) });
 
@@ -3889,7 +3930,10 @@ const AssistantMessage = ({
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-icon6 text-ui-lg leading-ui-lg", children: /* @__PURE__ */ jsxRuntime.jsx(
       react.MessagePrimitive.Content,
       {
-        components: { Text: MarkdownText, tools: { Fallback: ToolFallbackCustom || ToolFallback$1 } }
+        components: {
+          Text: MarkdownText,
+          tools: { Fallback: ToolFallbackCustom || ToolFallback$1 }
+        }
       }
     ) }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-6 pt-1", children: !isSolelyToolCall && /* @__PURE__ */ jsxRuntime.jsx(AssistantActionBar, {}) })
@@ -3953,13 +3997,27 @@ const useAutoscroll = (ref, { enabled = true }) => {
   }, [enabled, ref]);
 };
 
-const Thread = ({ ToolFallback, agentName }) => {
+const variants = {
+  "header-md": "text-header-md leading-header-md",
+  "ui-lg": "text-ui-lg leading-ui-lg",
+  "ui-md": "text-ui-md leading-ui-md",
+  "ui-sm": "text-ui-sm leading-ui-sm",
+  "ui-xs": "text-ui-xs leading-ui-xs"
+};
+const fonts = {
+  mono: "font-mono"
+};
+const Txt = ({ as: Root = "p", className, variant = "ui-md", font, ...props }) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(Root, { className: clsx(variants[variant], font && fonts[font], className), ...props });
+};
+
+const Thread = ({ ToolFallback, agentName, hasMemory }) => {
   const areaRef = React.useRef(null);
   useAutoscroll(areaRef, { enabled: true });
   const WrappedAssistantMessage = (props) => {
     return /* @__PURE__ */ jsxRuntime.jsx(AssistantMessage, { ...props, ToolFallback });
   };
-  return /* @__PURE__ */ jsxRuntime.jsxs(react.ThreadPrimitive.Root, { className: "max-w-[568px] w-full mx-auto h-[calc(100%-100px)] px-4", children: [
+  return /* @__PURE__ */ jsxRuntime.jsxs(react.ThreadPrimitive.Root, { className: "max-w-[568px] w-full mx-auto h-[calc(100%-110px)] px-4", children: [
     /* @__PURE__ */ jsxRuntime.jsxs(react.ThreadPrimitive.Viewport, { className: "py-10 overflow-y-auto scroll-smooth h-full", ref: areaRef, autoScroll: false, children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
         /* @__PURE__ */ jsxRuntime.jsx(ThreadWelcome, { agentName }),
@@ -3976,7 +4034,7 @@ const Thread = ({ ToolFallback, agentName }) => {
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(react.ThreadPrimitive.If, { empty: false, children: /* @__PURE__ */ jsxRuntime.jsx("div", {}) })
     ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(Composer, {})
+    /* @__PURE__ */ jsxRuntime.jsx(Composer, { hasMemory })
   ] });
 };
 const ThreadWelcome = ({ agentName }) => {
@@ -3995,19 +4053,25 @@ const ThreadWelcome = ({ agentName }) => {
     /* @__PURE__ */ jsxRuntime.jsx("p", { className: "mt-4 font-medium", children: "How can I help you today?" })
   ] }) });
 };
-const Composer = () => {
-  return /* @__PURE__ */ jsxRuntime.jsxs(react.ComposerPrimitive.Root, { className: "w-full bg-surface3 rounded-lg border-sm border-border1 px-3 py-4 mt-auto h-[100px]", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(react.ComposerPrimitive.Input, { asChild: true, className: "w-full", children: /* @__PURE__ */ jsxRuntime.jsx(
-      "textarea",
-      {
-        className: "text-ui-lg leading-ui-lg placeholder:text-icon3 text-icon6 bg-transparent focus:outline-none resize-none",
-        autoFocus: true,
-        placeholder: "Enter your message...",
-        name: "",
-        id: ""
-      }
-    ) }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-end", children: /* @__PURE__ */ jsxRuntime.jsx(ComposerAction, {}) })
+const Composer = ({ hasMemory }) => {
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(react.ComposerPrimitive.Root, { className: "w-full bg-surface3 rounded-lg border-sm border-border1 px-3 py-4 mt-auto h-[100px]", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(react.ComposerPrimitive.Input, { asChild: true, className: "w-full", children: /* @__PURE__ */ jsxRuntime.jsx(
+        "textarea",
+        {
+          className: "text-ui-lg leading-ui-lg placeholder:text-icon3 text-icon6 bg-transparent focus:outline-none resize-none",
+          autoFocus: true,
+          placeholder: "Enter your message...",
+          name: "",
+          id: ""
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-end", children: /* @__PURE__ */ jsxRuntime.jsx(ComposerAction, {}) })
+    ] }),
+    !hasMemory && /* @__PURE__ */ jsxRuntime.jsxs(Txt, { variant: "ui-sm", className: "text-icon3 flex items-center gap-2 pt-0.5", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(InfoIcon, {}) }),
+      "Memory is not enabled. The conversation will not be persisted."
+    ] })
   ] });
 };
 const ComposerAction = () => {
@@ -4439,7 +4503,7 @@ const AgentChat = ({
       modelSettings,
       chatWithGenerate,
       runtimeContext,
-      children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full pb-4 bg-surface1", children: /* @__PURE__ */ jsxRuntime.jsx(Thread, { agentName: agentName ?? "" }) })
+      children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full pb-4 bg-surface1", children: /* @__PURE__ */ jsxRuntime.jsx(Thread, { agentName: agentName ?? "", hasMemory: memory }) })
     }
   );
 };
@@ -4499,18 +4563,18 @@ function FormattedDate({ date }) {
 }
 
 const inputVariants = cva(
-  "flex w-full text-mastra-el-6 rounded-sm border bg-transparent shadow-sm focus-visible:ring-ring transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50",
+  "flex w-full text-icon6 rounded-lg border bg-transparent shadow-sm focus-visible:ring-ring transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:cursor-not-allowed disabled:opacity-50",
   {
     variants: {
       variant: {
-        default: "border-mastra-border-1 border-border-1 placeholder:text-muted-foreground",
-        filled: "bg-inputFill border-border-1 placeholder:text-muted-foreground",
-        unstyled: "border-0 bg-transparent placeholder:text-muted-foreground focus-visible:ring-transparent focus-visible:outline-none"
+        default: "border-sm border-border1 placeholder:text-icon3",
+        filled: "border-sm bg-inputFill border-border1 placeholder:text-icon3",
+        unstyled: "border-0 bg-transparent placeholder:text-icon3 focus-visible:ring-transparent focus-visible:outline-none"
       },
       customSize: {
-        default: "px-[13px] text-[calc(13_/_16_*_1rem)] h-[34px]",
+        default: "px-[13px] text-[calc(13_/_16_*_1rem)] h-8",
         sm: "h-[30px] px-[13px] text-xs",
-        lg: "h-10 px-[17px] rounded-md text-[calc(13_/_16_*_1rem)]"
+        lg: "h-10 px-[17px] text-[calc(13_/_16_*_1rem)]"
       }
     },
     defaultVariants: {
@@ -4989,20 +5053,6 @@ const Row = ({ className, children, selected = false, onClick }) => {
   );
 };
 
-const variants = {
-  "header-md": "text-header-md leading-header-md",
-  "ui-lg": "text-ui-lg leading-ui-lg",
-  "ui-md": "text-ui-md leading-ui-md",
-  "ui-sm": "text-ui-sm leading-ui-sm",
-  "ui-xs": "text-ui-xs leading-ui-xs"
-};
-const fonts = {
-  mono: "font-mono"
-};
-const Txt = ({ as: Root = "p", className, variant = "ui-md", font, ...props }) => {
-  return /* @__PURE__ */ jsxRuntime.jsx(Root, { className: clsx(variants[variant], font && fonts[font], className), ...props });
-};
-
 const formatDateCell = (date) => {
   const month = new Intl.DateTimeFormat("en-US", { month: "short" }).format(date).toUpperCase();
   const day = date.getDate();
@@ -6184,7 +6234,7 @@ function WorkflowTracesInner({ traces, isLoading, error }) {
   ] });
 }
 
-const sanitizeVNexWorkflowWatchResult = (record) => {
+const sanitizeWorkflowWatchResult = (record) => {
   const formattedResults = Object.entries(record.payload.workflowState.steps || {}).reduce(
     (acc, [key, value]) => {
       let output = value.status === "success" ? value.output : void 0;
@@ -6219,8 +6269,8 @@ const sanitizeVNexWorkflowWatchResult = (record) => {
   };
   return sanitizedRecord;
 };
-const useWorkflow = (workflowId, baseUrl) => {
-  const [workflow, setWorkflow] = React.useState(null);
+const useLegacyWorkflow = (workflowId, baseUrl) => {
+  const [legacyWorkflow, setLegacyWorkflow] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(true);
   const client = createMastraClient(baseUrl);
   React.useEffect(() => {
@@ -6228,22 +6278,22 @@ const useWorkflow = (workflowId, baseUrl) => {
       setIsLoading(true);
       try {
         if (!workflowId) {
-          setWorkflow(null);
+          setLegacyWorkflow(null);
           setIsLoading(false);
           return;
         }
-        const res = await client.getWorkflow(workflowId).details();
+        const res = await client.getLegacyWorkflow(workflowId).details();
         if (!res) {
-          setWorkflow(null);
-          console.error("Error fetching workflow");
-          sonner.toast.error("Error fetching workflow");
+          setLegacyWorkflow(null);
+          console.error("Error fetching legacy workflow");
+          sonner.toast.error("Error fetching legacy workflow");
           return;
         }
         const steps = res.steps;
         const stepsWithWorkflow = await Promise.all(
           Object.values(steps)?.map(async (step) => {
             if (!step.workflowId) return step;
-            const wFlow = await client.getWorkflow(step.workflowId).details();
+            const wFlow = await client.getLegacyWorkflow(step.workflowId).details();
             if (!wFlow) return step;
             return { ...step, stepGraph: wFlow.stepGraph, stepSubscriberGraph: wFlow.stepSubscriberGraph };
           })
@@ -6251,21 +6301,21 @@ const useWorkflow = (workflowId, baseUrl) => {
         const _steps = stepsWithWorkflow.reduce((acc, b) => {
           return { ...acc, [b.id]: b };
         }, {});
-        setWorkflow({ ...res, steps: _steps });
+        setLegacyWorkflow({ ...res, steps: _steps });
       } catch (error) {
-        setWorkflow(null);
-        console.error("Error fetching workflow", error);
-        sonner.toast.error("Error fetching workflow");
+        setLegacyWorkflow(null);
+        console.error("Error fetching legacy workflow", error);
+        sonner.toast.error("Error fetching legacy workflow");
       } finally {
         setIsLoading(false);
       }
     };
     fetchWorkflow();
   }, [workflowId]);
-  return { workflow, isLoading };
+  return { legacyWorkflow, isLoading };
 };
-const useVNextWorkflow = (workflowId, baseUrl) => {
-  const [vNextWorkflow, setVNextWorkflow] = React.useState(null);
+const useWorkflow = (workflowId, baseUrl) => {
+  const [workflow, setWorkflow] = React.useState(null);
   const [isLoading, setIsLoading] = React.useState(true);
   const client = createMastraClient(baseUrl);
   React.useEffect(() => {
@@ -6273,14 +6323,14 @@ const useVNextWorkflow = (workflowId, baseUrl) => {
       setIsLoading(true);
       try {
         if (!workflowId) {
-          setVNextWorkflow(null);
+          setWorkflow(null);
           setIsLoading(false);
           return;
         }
-        const res = await client.getVNextWorkflow(workflowId).details();
-        setVNextWorkflow(res);
+        const res = await client.getWorkflow(workflowId).details();
+        setWorkflow(res);
       } catch (error) {
-        setVNextWorkflow(null);
+        setWorkflow(null);
         console.error("Error fetching workflow", error);
         sonner.toast.error("Error fetching workflow");
       } finally {
@@ -6289,13 +6339,13 @@ const useVNextWorkflow = (workflowId, baseUrl) => {
     };
     fetchWorkflow();
   }, [workflowId]);
-  return { vNextWorkflow, isLoading };
+  return { workflow, isLoading };
 };
 const useExecuteWorkflow = (baseUrl) => {
   const client = createMastraClient(baseUrl);
-  const createWorkflowRun = async ({ workflowId, prevRunId }) => {
+  const createLegacyWorkflowRun = async ({ workflowId, prevRunId }) => {
     try {
-      const workflow = client.getWorkflow(workflowId);
+      const workflow = client.getLegacyWorkflow(workflowId);
       const { runId: newRunId } = await workflow.createRun({ runId: prevRunId });
       return { runId: newRunId };
     } catch (error) {
@@ -6303,9 +6353,9 @@ const useExecuteWorkflow = (baseUrl) => {
       throw error;
     }
   };
-  const createVNextWorkflowRun = async ({ workflowId, prevRunId }) => {
+  const createWorkflowRun = async ({ workflowId, prevRunId }) => {
     try {
-      const workflow = client.getVNextWorkflow(workflowId);
+      const workflow = client.getWorkflow(workflowId);
       const { runId: newRunId } = await workflow.createRun({ runId: prevRunId });
       return { runId: newRunId };
     } catch (error) {
@@ -6313,16 +6363,20 @@ const useExecuteWorkflow = (baseUrl) => {
       throw error;
     }
   };
-  const startWorkflowRun = async ({ workflowId, runId, input }) => {
+  const startLegacyWorkflowRun = async ({
+    workflowId,
+    runId,
+    input
+  }) => {
     try {
-      const workflow = client.getWorkflow(workflowId);
+      const workflow = client.getLegacyWorkflow(workflowId);
       await workflow.start({ runId, triggerData: input || {} });
     } catch (error) {
       console.error("Error starting workflow run:", error);
       throw error;
     }
   };
-  const startVNextWorkflowRun = async ({
+  const startWorkflowRun = async ({
     workflowId,
     runId,
     input,
@@ -6333,14 +6387,14 @@ const useExecuteWorkflow = (baseUrl) => {
       Object.entries(playgroundRuntimeContext).forEach(([key, value]) => {
         runtimeContext$1.set(key, value);
       });
-      const workflow = client.getVNextWorkflow(workflowId);
+      const workflow = client.getWorkflow(workflowId);
       await workflow.start({ runId, inputData: input || {}, runtimeContext: runtimeContext$1 });
     } catch (error) {
       console.error("Error starting workflow run:", error);
       throw error;
     }
   };
-  const startAsyncVNextWorkflowRun = async ({
+  const startAsyncWorkflowRun = async ({
     workflowId,
     runId,
     input,
@@ -6351,7 +6405,7 @@ const useExecuteWorkflow = (baseUrl) => {
       Object.entries(playgroundRuntimeContext).forEach(([key, value]) => {
         runtimeContext$1.set(key, value);
       });
-      const workflow = client.getVNextWorkflow(workflowId);
+      const workflow = client.getWorkflow(workflowId);
       const result = await workflow.startAsync({ runId, inputData: input || {}, runtimeContext: runtimeContext$1 });
       return result;
     } catch (error) {
@@ -6362,17 +6416,17 @@ const useExecuteWorkflow = (baseUrl) => {
   return {
     startWorkflowRun,
     createWorkflowRun,
-    startVNextWorkflowRun,
-    createVNextWorkflowRun,
-    startAsyncVNextWorkflowRun
+    startLegacyWorkflowRun,
+    createLegacyWorkflowRun,
+    startAsyncWorkflowRun
   };
 };
 const useWatchWorkflow = (baseUrl) => {
+  const [isWatchingLegacyWorkflow, setIsWatchingLegacyWorkflow] = React.useState(false);
   const [isWatchingWorkflow, setIsWatchingWorkflow] = React.useState(false);
-  const [isWatchingVNextWorkflow, setIsWatchingVNextWorkflow] = React.useState(false);
+  const [legacyWatchResult, setLegacyWatchResult] = React.useState(null);
   const [watchResult, setWatchResult] = React.useState(null);
-  const [watchVNextResult, setWatchVNextResult] = React.useState(null);
-  const debouncedSetWatchResult = useDebounce.useDebouncedCallback((record) => {
+  const debouncedSetLegacyWorkflowWatchResult = useDebounce.useDebouncedCallback((record) => {
     const formattedResults = Object.entries(record.results || {}).reduce(
       (acc, [key, value]) => {
         let output = value.status === "success" ? value.output : void 0;
@@ -6395,19 +6449,19 @@ const useWatchWorkflow = (baseUrl) => {
       ...record,
       sanitizedOutput: record ? JSON.stringify({ ...record, results: formattedResults }, null, 2).slice(0, 5e4) : null
     };
-    setWatchResult(sanitizedRecord);
+    setLegacyWatchResult(sanitizedRecord);
   }, 100);
-  const watchWorkflow = async ({ workflowId, runId }) => {
+  const watchLegacyWorkflow = async ({ workflowId, runId }) => {
     try {
-      setIsWatchingWorkflow(true);
+      setIsWatchingLegacyWorkflow(true);
       const client = createMastraClient(baseUrl);
-      const workflow = client.getWorkflow(workflowId);
+      const workflow = client.getLegacyWorkflow(workflowId);
       await workflow.watch({ runId }, (record) => {
         try {
-          debouncedSetWatchResult(record);
+          debouncedSetLegacyWorkflowWatchResult(record);
         } catch (err) {
           console.error("Error processing workflow record:", err);
-          setWatchResult({
+          setLegacyWatchResult({
             ...record
           });
         }
@@ -6416,24 +6470,24 @@ const useWatchWorkflow = (baseUrl) => {
       console.error("Error watching workflow:", error);
       throw error;
     } finally {
-      setIsWatchingWorkflow(false);
+      setIsWatchingLegacyWorkflow(false);
     }
   };
-  const debouncedSetVNextWatchResult = useDebounce.useDebouncedCallback((record) => {
-    const sanitizedRecord = sanitizeVNexWorkflowWatchResult(record);
-    setWatchVNextResult(sanitizedRecord);
+  const debouncedSetWorkflowWatchResult = useDebounce.useDebouncedCallback((record) => {
+    const sanitizedRecord = sanitizeWorkflowWatchResult(record);
+    setWatchResult(sanitizedRecord);
   }, 100);
-  const watchVNextWorkflow = async ({ workflowId, runId }) => {
+  const watchWorkflow = async ({ workflowId, runId }) => {
     try {
-      setIsWatchingVNextWorkflow(true);
+      setIsWatchingWorkflow(true);
       const client = createMastraClient(baseUrl);
-      const workflow = client.getVNextWorkflow(workflowId);
+      const workflow = client.getWorkflow(workflowId);
       await workflow.watch({ runId }, (record) => {
         try {
-          debouncedSetVNextWatchResult(record);
+          debouncedSetWorkflowWatchResult(record);
         } catch (err) {
           console.error("Error processing workflow record:", err);
-          setWatchVNextResult({
+          setWatchResult({
             ...record
           });
         }
@@ -6442,40 +6496,40 @@ const useWatchWorkflow = (baseUrl) => {
       console.error("Error watching workflow:", error);
       throw error;
     } finally {
-      setIsWatchingVNextWorkflow(false);
+      setIsWatchingWorkflow(false);
     }
   };
   return {
+    watchLegacyWorkflow,
+    isWatchingLegacyWorkflow,
+    legacyWatchResult,
     watchWorkflow,
     isWatchingWorkflow,
-    watchResult,
-    watchVNextWorkflow,
-    isWatchingVNextWorkflow,
-    watchVNextResult
+    watchResult
   };
 };
 const useResumeWorkflow = (baseUrl) => {
+  const [isResumingLegacyWorkflow, setIsResumingLegacyWorkflow] = React.useState(false);
   const [isResumingWorkflow, setIsResumingWorkflow] = React.useState(false);
-  const [isResumingVNextWorkflow, setIsResumingVNextWorkflow] = React.useState(false);
-  const resumeWorkflow = async ({
+  const resumeLegacyWorkflow = async ({
     workflowId,
     stepId,
     runId,
     context
   }) => {
     try {
-      setIsResumingWorkflow(true);
+      setIsResumingLegacyWorkflow(true);
       const client = createMastraClient(baseUrl);
-      const response = await client.getWorkflow(workflowId).resume({ stepId, runId, context });
+      const response = await client.getLegacyWorkflow(workflowId).resume({ stepId, runId, context });
       return response;
     } catch (error) {
       console.error("Error resuming workflow:", error);
       throw error;
     } finally {
-      setIsResumingWorkflow(false);
+      setIsResumingLegacyWorkflow(false);
     }
   };
-  const resumeVNextWorkflow = async ({
+  const resumeWorkflow = async ({
     workflowId,
     step,
     runId,
@@ -6483,26 +6537,26 @@ const useResumeWorkflow = (baseUrl) => {
     runtimeContext: playgroundRuntimeContext
   }) => {
     try {
-      setIsResumingVNextWorkflow(true);
+      setIsResumingWorkflow(true);
       const client = createMastraClient(baseUrl);
       const runtimeContext$1 = new runtimeContext.RuntimeContext();
       Object.entries(playgroundRuntimeContext).forEach(([key, value]) => {
         runtimeContext$1.set(key, value);
       });
-      const response = await client.getVNextWorkflow(workflowId).resume({ step, runId, resumeData, runtimeContext: runtimeContext$1 });
+      const response = await client.getWorkflow(workflowId).resume({ step, runId, resumeData, runtimeContext: runtimeContext$1 });
       return response;
     } catch (error) {
       console.error("Error resuming workflow:", error);
       throw error;
     } finally {
-      setIsResumingVNextWorkflow(false);
+      setIsResumingWorkflow(false);
     }
   };
   return {
+    resumeLegacyWorkflow,
+    isResumingLegacyWorkflow,
     resumeWorkflow,
-    isResumingWorkflow,
-    resumeVNextWorkflow,
-    isResumingVNextWorkflow
+    isResumingWorkflow
   };
 };
 
@@ -6589,7 +6643,7 @@ const defaultEdgeOptions = {
     color: "#8e8e8e"
   }
 };
-const contructNodesAndEdges = ({
+const contructLegacyNodesAndEdges = ({
   stepGraph,
   stepSubscriberGraph,
   steps: mainSteps = {}
@@ -7040,7 +7094,7 @@ const getStepNodeAndEdge = ({
   }
   return { nodes: [], edges: [], nextPrevNodeIds: [] };
 };
-const constructVNextNodesAndEdges = ({
+const constructNodesAndEdges = ({
   stepGraph
 }) => {
   if (!stepGraph) {
@@ -7379,12 +7433,12 @@ function Spinner({ color = "#fff", className }) {
   );
 }
 
-function WorkflowNestedGraph({
+function LegacyWorkflowNestedGraph({
   stepGraph,
   stepSubscriberGraph,
   open
 }) {
-  const { nodes: initialNodes, edges: initialEdges } = contructNodesAndEdges({
+  const { nodes: initialNodes, edges: initialEdges } = contructLegacyNodesAndEdges({
     stepGraph,
     stepSubscriberGraph
   });
@@ -7422,10 +7476,10 @@ function WorkflowNestedGraph({
   ) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(Spinner, {}) }) });
 }
 
-const WorkflowNestedGraphContext = React.createContext(
+const LegacyWorkflowNestedGraphContext = React.createContext(
   {}
 );
-function WorkflowNestedGraphProvider({ children }) {
+function LegacyWorkflowNestedGraphProvider({ children }) {
   const [stepGraph, setStepGraph] = React.useState(null);
   const [stepSubscriberGraph, setStepSubscriberGraph] = React.useState(null);
   const [openDialog, setOpenDialog] = React.useState(false);
@@ -7447,7 +7501,7 @@ function WorkflowNestedGraphProvider({ children }) {
     setOpenDialog(true);
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(
-    WorkflowNestedGraphContext.Provider,
+    LegacyWorkflowNestedGraphContext.Provider,
     {
       value: {
         showNestedGraph,
@@ -7463,16 +7517,23 @@ function WorkflowNestedGraphProvider({ children }) {
               " workflow"
             ] })
           ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(WorkflowNestedGraph, { stepGraph, open: openDialog, stepSubscriberGraph }) })
+          /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(
+            LegacyWorkflowNestedGraph,
+            {
+              stepGraph,
+              open: openDialog,
+              stepSubscriberGraph
+            }
+          ) })
         ] }) }) })
       ]
     }
   );
 }
 
-function WorkflowNestedNode({ data }) {
+function LegacyWorkflowNestedNode({ data }) {
   const { label, withoutTopHandle, withoutBottomHandle, stepGraph, stepSubscriberGraph } = data;
-  const { showNestedGraph } = React.useContext(WorkflowNestedGraphContext);
+  const { showNestedGraph } = React.useContext(LegacyWorkflowNestedGraphContext);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("bg-[rgba(29,29,29,0.5)] rounded-md h-full overflow-scroll w-[274px]"), children: [
     !withoutTopHandle && /* @__PURE__ */ jsxRuntime.jsx(react$2.Handle, { type: "target", position: react$2.Position.Top, style: { visibility: "hidden" } }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2 cursor-pointer", onClick: () => showNestedGraph({ label, stepGraph, stepSubscriberGraph }), children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-sm bg-mastra-bg-9 flex items-center gap-1.5 rounded-sm p-2 cursor-pointer", children: [
@@ -7483,8 +7544,8 @@ function WorkflowNestedNode({ data }) {
   ] });
 }
 
-function WorkflowGraphInner({ workflow }) {
-  const { nodes: initialNodes, edges: initialEdges } = contructNodesAndEdges({
+function LegacyWorkflowGraphInner({ workflow }) {
+  const { nodes: initialNodes, edges: initialEdges } = contructLegacyNodesAndEdges({
     stepGraph: workflow.serializedStepGraph || workflow.stepGraph,
     stepSubscriberGraph: workflow.serializedStepSubscriberGraph || workflow.stepSubscriberGraph,
     steps: workflow.steps
@@ -7496,7 +7557,7 @@ function WorkflowGraphInner({ workflow }) {
     "condition-node": WorkflowConditionNode,
     "after-node": WorkflowAfterNode,
     "loop-result-node": WorkflowLoopResultNode,
-    "nested-node": WorkflowNestedNode
+    "nested-node": LegacyWorkflowNestedNode
   };
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full", children: /* @__PURE__ */ jsxRuntime.jsxs(
     react$2.ReactFlow,
@@ -7523,12 +7584,12 @@ const lodashTitleCase = (str) => {
   return camelCased.replace(/([A-Z])/g, " $1").replace(/^./, (str2) => str2.toUpperCase()).trim();
 };
 
-function WorkflowGraph({ workflowId, baseUrl }) {
-  const { workflow, isLoading } = useWorkflow(workflowId, baseUrl);
+function LegacyWorkflowGraph({ workflowId, baseUrl }) {
+  const { legacyWorkflow, isLoading } = useLegacyWorkflow(workflowId, baseUrl);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4", children: /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-[600px]" }) });
   }
-  if (!workflow) {
+  if (!legacyWorkflow) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid h-full place-items-center", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-center gap-2", children: [
       /* @__PURE__ */ jsxRuntime.jsx(lucideReact.AlertCircleIcon, {}),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
@@ -7538,28 +7599,24 @@ function WorkflowGraph({ workflowId, baseUrl }) {
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(WorkflowNestedGraphProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(WorkflowGraphInner, { workflow }) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(LegacyWorkflowNestedGraphProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(LegacyWorkflowGraphInner, { workflow: legacyWorkflow }) }) });
 }
 
 const Form = React.forwardRef(({ children, ...props }, ref) => {
   return /* @__PURE__ */ jsxRuntime.jsx("form", { ref, className: "space-y-4", ...props, children });
 });
 
-const labelVariants = cva("text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70");
-const Label = React__namespace.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsxRuntime.jsx(LabelPrimitive__namespace.Root, { ref, className: cn(labelVariants(), className), ...props }));
-Label.displayName = LabelPrimitive__namespace.Root.displayName;
-
 const DISABLED_LABELS = ["boolean", "object", "array"];
 const FieldWrapper = ({ label, children, id, field, error }) => {
   const isDisabled = DISABLED_LABELS.includes(field.type);
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-2", children: [
-    !isDisabled && /* @__PURE__ */ jsxRuntime.jsxs(Label, { htmlFor: id, children: [
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "pb-4 last:pb-0", children: [
+    !isDisabled && /* @__PURE__ */ jsxRuntime.jsxs(Txt, { as: "label", variant: "ui-sm", className: "text-icon3 pb-1 block", htmlFor: id, children: [
       label,
-      field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-destructive", children: " *" })
+      field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-accent2", children: " *" })
     ] }),
     children,
-    field.fieldConfig?.description && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-muted-foreground", children: field.fieldConfig.description }),
-    error && /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive", children: error })
+    field.fieldConfig?.description && /* @__PURE__ */ jsxRuntime.jsx(Txt, { as: "p", variant: "ui-sm", className: "text-icon6", children: field.fieldConfig.description }),
+    error && /* @__PURE__ */ jsxRuntime.jsx(Txt, { as: "p", variant: "ui-sm", className: "text-accent2", children: error })
   ] });
 };
 
@@ -7668,9 +7725,9 @@ const BooleanField = ({ field, label, id, inputProps, value }) => /* @__PURE__ *
       defaultChecked: field.default
     }
   ),
-  /* @__PURE__ */ jsxRuntime.jsxs(Label, { htmlFor: id, children: [
+  /* @__PURE__ */ jsxRuntime.jsxs(Txt, { as: "label", variant: "ui-sm", className: "text-icon3", htmlFor: id, children: [
     label,
-    field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-destructive", children: " *" })
+    field.required && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-accent2", children: " *" })
   ] })
 ] });
 
@@ -8017,34 +8074,53 @@ const SelectField = ({ field, inputProps, error, id, value }) => {
 };
 
 const ObjectWrapper = ({ label, children }) => {
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4 border p-2 rounded-md", children: [
-    label === "​" ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {}) : /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "text-sm font-medium", children: label }),
-    children
-  ] });
-};
-
-const ArrayWrapper = ({ label, children, onAddItem }) => {
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("h3", { className: "text-sm font-medium", children: label }),
-    children,
+  const hasLabel = label !== "​" && label !== "";
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "", children: [
+    hasLabel && /* @__PURE__ */ jsxRuntime.jsxs(Txt, { as: "h3", variant: "ui-sm", className: "text-icon3 flex items-center gap-1 pb-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "sm", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Braces, {}) }),
+      label
+    ] }),
     /* @__PURE__ */ jsxRuntime.jsx(
-      Button$1,
+      "div",
       {
-        className: "w-full flex items-center justify-center",
-        onClick: onAddItem,
-        variant: "outline",
-        size: "sm",
-        type: "button",
-        children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.PlusIcon, { className: "h-4 w-4" })
+        className: hasLabel ? "flex flex-col gap-1 [&>*]:border-dashed [&>*]:border-l [&>*]:border-l-border1 [&>*]:pl-4" : "",
+        children
       }
     )
   ] });
 };
 
+const ArrayWrapper = ({ label, children, onAddItem }) => {
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-2 justify-between", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs(Txt, { as: "h3", variant: "ui-sm", className: "text-icon3 pb-2 flex items-center gap-1", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "sm", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Brackets, {}) }),
+        label
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx(TooltipProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(Tooltip, { delayDuration: 0, children: [
+        /* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            onClick: onAddItem,
+            type: "button",
+            className: "text-icon3 bg-surface3 rounded-md p-1 hover:bg-surface4 hover:text-icon6 h-icon-sm w-icon-sm",
+            children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "sm", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.PlusIcon, {}) })
+          }
+        ) }),
+        /* @__PURE__ */ jsxRuntime.jsx(TooltipContent, { children: "Add item" })
+      ] }) })
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-1", children })
+  ] });
+};
+
 const ArrayElementWrapper = ({ children, onRemove }) => {
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative border p-4 rounded-md mt-2", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(Button$1, { onClick: onRemove, variant: "ghost", className: "absolute top-2 right-2", type: "button", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.TrashIcon, { className: "h-4 w-4" }) }),
-    children
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "pl-4 border-l border-border1", children: [
+    children,
+    /* @__PURE__ */ jsxRuntime.jsxs(Button, { onClick: onRemove, type: "button", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "sm", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.TrashIcon, {}) }),
+      "Delete"
+    ] })
   ] });
 };
 
@@ -8243,6 +8319,10 @@ class CustomZodProvider extends zod.ZodProvider {
   }
 }
 
+const labelVariants = cva("text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70");
+const Label = React__namespace.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsxRuntime.jsx(LabelPrimitive__namespace.Root, { ref, className: cn(labelVariants(), className), ...props }));
+Label.displayName = LabelPrimitive__namespace.Root.displayName;
+
 function isEmptyZodObject(schema) {
   if (schema instanceof z.ZodObject) {
     return Object.keys(schema.shape).length === 0;
@@ -8254,7 +8334,7 @@ function DynamicForm({
   onSubmit,
   defaultValues,
   isSubmitLoading,
-  submitButtonLabel = "Submit"
+  submitButtonLabel
 }) {
   if (!schema) {
     console.error("no form schema found");
@@ -8276,17 +8356,17 @@ function DynamicForm({
     },
     defaultValues: defaultValues ? { "​": defaultValues } : void 0,
     formProps: {
-      className: "space-y-4 p-4"
+      className: ""
     },
     uiComponents: {
-      SubmitButton: ({ children }) => /* @__PURE__ */ jsxRuntime.jsx(Button$1, { className: "w-full", type: "submit", disabled: isSubmitLoading, children: isSubmitLoading ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "h-4 w-4 animate-spin" }) : children || submitButtonLabel })
+      SubmitButton: ({ children }) => /* @__PURE__ */ jsxRuntime.jsx(Button, { variant: "light", className: "w-full", size: "lg", disabled: isSubmitLoading, children: isSubmitLoading ? /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "animate-spin" }) }) : submitButtonLabel || children })
     },
     formComponents: {
       Label: ({ value }) => /* @__PURE__ */ jsxRuntime.jsx(Label, { className: "text-sm font-normal", children: value })
     },
     withSubmit: true
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(ScrollArea, { className: "h-full w-full", children: /* @__PURE__ */ jsxRuntime.jsx(AutoForm, { ...formProps }) });
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full w-full", children: /* @__PURE__ */ jsxRuntime.jsx(AutoForm, { ...formProps }) });
 }
 
 function resolveSerializedZodOutput(obj) {
@@ -8316,22 +8396,22 @@ function CodeBlockDemo({
 
 const WorkflowRunContext = React.createContext({});
 function WorkflowRunProvider({ children }) {
+  const [legacyResult, setLegacyResult] = React.useState(null);
   const [result, setResult] = React.useState(null);
-  const [vNextResult, setVNextResult] = React.useState(null);
   const [payload, setPayload] = React.useState(null);
   const clearData = () => {
+    setLegacyResult(null);
     setResult(null);
-    setVNextResult(null);
     setPayload(null);
   };
   return /* @__PURE__ */ jsxRuntime.jsx(
     WorkflowRunContext.Provider,
     {
       value: {
+        legacyResult,
+        setLegacyResult,
         result,
         setResult,
-        vNextResult,
-        setVNextResult,
         payload,
         setPayload,
         clearData
@@ -8341,16 +8421,81 @@ function WorkflowRunProvider({ children }) {
   );
 }
 
-function WorkflowTrigger({
+const WorkflowCard = ({ header, children, footer }) => {
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border-sm border-border1 bg-surface4", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "py-1 px-2 flex items-center gap-3", children: header }),
+    children && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "border-t-sm border-border1", children }),
+    footer && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "py-1 px-2 border-t-sm border-border1", children: footer })
+  ] });
+};
+
+const LegacyWorkflowStatus = ({ stepId, pathStatus, path }) => {
+  const status = pathStatus === "completed" ? "Completed" : stepId === path ? pathStatus.charAt(0).toUpperCase() + pathStatus.slice(1) : pathStatus === "executing" ? "Executing" : "Completed";
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    WorkflowCard,
+    {
+      header: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(Icon, { children: [
+          status === "Completed" && /* @__PURE__ */ jsxRuntime.jsx(CheckIcon, { className: "text-accent1" }),
+          status === "Failed" && /* @__PURE__ */ jsxRuntime.jsx(CrossIcon, { className: "text-accent2" }),
+          status === "Executing" && /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "text-icon3 animate-spin" })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(Txt, { as: "span", variant: "ui-lg", className: "text-icon6 font-medium", children: path })
+      ] })
+    }
+  );
+};
+
+const WorkflowResult = ({ jsonResult, sanitizedJsonResult }) => {
+  const { handleCopy } = useCopyToClipboard({ text: jsonResult });
+  const [expanded, setExpanded] = React.useState(false);
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    WorkflowCard,
+    {
+      header: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2 justify-between w-full", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(Txt, { variant: "ui-lg", className: "text-icon6 flex items-center gap-3 font-medium", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(DeploymentIcon, {}) }),
+          "Results"
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsxs(Tooltip, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(
+            "button",
+            {
+              className: "p-2 rounded-lg hover:bg-surface5 transition-colors duration-150 ease-in-out text-icon3 hover:text-icon6",
+              onClick: () => handleCopy(),
+              children: /* @__PURE__ */ jsxRuntime.jsx(Icon, { size: "sm", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.CopyIcon, {}) })
+            }
+          ) }),
+          /* @__PURE__ */ jsxRuntime.jsx(TooltipContent, { children: "Copy result" })
+        ] })
+      ] }),
+      footer: /* @__PURE__ */ jsxRuntime.jsx(
+        "button",
+        {
+          className: "w-full h-full text-center text-icon2 hover:text-icon6 text-ui-md",
+          onClick: () => setExpanded((s) => !s),
+          children: expanded ? "collapse" : "expand"
+        }
+      ),
+      children: expanded ? /* @__PURE__ */ jsxRuntime.jsx(CodeBlockDemo, { className: "w-full overflow-x-auto", code: sanitizedJsonResult || jsonResult, language: "json" }) : null
+    }
+  );
+};
+
+function LegacyWorkflowTrigger({
   workflowId,
   baseUrl,
   setRunId
 }) {
-  const { result, setResult, payload, setPayload } = React.useContext(WorkflowRunContext);
-  const { isLoading, workflow } = useWorkflow(workflowId, baseUrl);
-  const { createWorkflowRun, startWorkflowRun } = useExecuteWorkflow(baseUrl);
-  const { watchWorkflow, watchResult, isWatchingWorkflow } = useWatchWorkflow(baseUrl);
-  const { resumeWorkflow, isResumingWorkflow } = useResumeWorkflow(baseUrl);
+  const { legacyResult: result, setLegacyResult: setResult, payload, setPayload } = React.useContext(WorkflowRunContext);
+  const { isLoading, legacyWorkflow: workflow } = useLegacyWorkflow(workflowId, baseUrl);
+  const { createLegacyWorkflowRun: createWorkflowRun, startLegacyWorkflowRun: startWorkflowRun } = useExecuteWorkflow(baseUrl);
+  const {
+    watchLegacyWorkflow: watchWorkflow,
+    legacyWatchResult: watchResult,
+    isWatchingLegacyWorkflow: isWatchingWorkflow
+  } = useWatchWorkflow(baseUrl);
+  const { resumeLegacyWorkflow: resumeWorkflow, isResumingLegacyWorkflow: isResumingWorkflow } = useResumeWorkflow(baseUrl);
   const [suspendedSteps, setSuspendedSteps] = React.useState([]);
   const [isRunning, setIsRunning] = React.useState(false);
   const triggerSchema = workflow?.triggerSchema;
@@ -8381,7 +8526,7 @@ function WorkflowTrigger({
     });
   };
   const watchResultToUse = result ?? watchResult;
-  const workflowActivePaths = watchResultToUse?.activePaths ?? [];
+  const workflowActivePaths = watchResultToUse?.activePaths ?? {};
   React.useEffect(() => {
     setIsRunning(isWatchingWorkflow);
   }, [isWatchingWorkflow]);
@@ -8409,50 +8554,34 @@ function WorkflowTrigger({
   const isSuspendedSteps = suspendedSteps.length > 0;
   const zodInputSchema = triggerSchema ? resolveSerializedZodOutput(jsonSchemaToZod(superjson.parse(triggerSchema))) : null;
   const { sanitizedOutput, ...restResult } = result ?? {};
-  return /* @__PURE__ */ jsxRuntime.jsx(ScrollArea, { className: "h-[calc(100vh-126px)] pt-2 px-4 pb-4 text-xs w-full", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
-    !isSuspendedSteps && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: zodInputSchema ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between w-full", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Input" }),
-        isResumingWorkflow ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-3 h-3 animate-spin text-mastra-el-accent" }),
-          " Resuming workflow"
-        ] }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        DynamicForm,
-        {
-          schema: zodInputSchema,
-          defaultValues: payload,
-          isSubmitLoading: isWatchingWorkflow,
-          onSubmit: (data) => {
-            setPayload(data);
-            handleExecuteWorkflow(data);
-          }
-        }
-      )
-    ] }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "px-4 space-y-4", children: [
-      isResumingWorkflow ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-3 h-3 animate-spin text-mastra-el-accent" }),
-        " Resuming workflow"
-      ] }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {}),
-      /* @__PURE__ */ jsxRuntime.jsx(Button$1, { className: "w-full", disabled: isRunning, onClick: () => handleExecuteWorkflow(null), children: isRunning ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-4 h-4 animate-spin" }) : "Trigger" })
-    ] }) }),
-    Object.values(workflowActivePaths).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Status" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-4 flex flex-col gap-4", children: Object.entries(workflowActivePaths)?.map(([stepId, { status: pathStatus, stepPath }]) => {
-        return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-1", children: stepPath?.map((path, idx) => {
-          const status = pathStatus === "completed" ? "Completed" : stepId === path ? pathStatus.charAt(0).toUpperCase() + pathStatus.slice(1) : "Completed";
-          const statusIcon = status === "Completed" ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-green-500 rounded-full" }) : status === "Failed" ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-red-500 rounded-full" }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-yellow-500 rounded-full animate-pulse" });
-          return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col overflow-hidden rounded-md border", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex items-center justify-between p-3`, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "text-mastra-el-3", size: "xs", children: path.charAt(0).toUpperCase() + path.slice(1) }),
-            /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-2", children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "text-mastra-el-3", size: "xs", children: statusIcon }),
-              status
-            ] })
-          ] }) }, idx);
-        }) });
-      }) })
+  const hasWorkflowActivePaths = Object.values(workflowActivePaths).length > 0;
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full px-5 pt-3 pb-12", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
+    isResumingWorkflow && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "py-2 px-5 flex items-center gap-2 bg-surface5 -mx-5 -mt-5 border-b-sm border-border1", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "animate-spin text-icon6" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(Txt, { children: "Resuming workflow" })
     ] }),
+    !isSuspendedSteps && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: zodInputSchema ? /* @__PURE__ */ jsxRuntime.jsx(
+      DynamicForm,
+      {
+        schema: zodInputSchema,
+        defaultValues: payload,
+        isSubmitLoading: isWatchingWorkflow,
+        submitButtonLabel: "Run",
+        onSubmit: (data) => {
+          setPayload(data);
+          handleExecuteWorkflow(data);
+        }
+      }
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
+      Button,
+      {
+        className: "w-full",
+        variant: "light",
+        disabled: isRunning,
+        onClick: () => handleExecuteWorkflow(null),
+        children: isRunning ? /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "animate-spin" }) }) : "Trigger"
+      }
+    ) }),
     isSuspendedSteps && suspendedSteps?.map((step) => {
       const stepDefinition = workflow.steps[step.stepId];
       const stepSchema = stepDefinition?.inputSchema ? resolveSerializedZodOutput(jsonSchemaToZod(superjson.parse(stepDefinition.inputSchema))) : z.z.record(z.z.string(), z.z.any());
@@ -8484,29 +8613,23 @@ function WorkflowTrigger({
         )
       ] });
     }),
-    result && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col group relative", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Output" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: /* @__PURE__ */ jsxRuntime.jsx(
-        CopyButton,
-        {
-          classname: "absolute z-40 w-8 h-8 p-0 transition-opacity duration-150 ease-in-out opacity-0 top-4 right-4 group-hover:opacity-100",
-          content: JSON.stringify(restResult, null, 2)
-        }
-      ) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        CodeBlockDemo,
-        {
-          className: "w-full overflow-x-auto",
-          code: sanitizedOutput || JSON.stringify(restResult, null, 2),
-          language: "json"
-        }
-      )
+    hasWorkflowActivePaths && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx("hr", { className: "border-border1 border-sm my-5" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-4", children: Object.entries(workflowActivePaths)?.map(([stepId, { status: pathStatus, stepPath }]) => {
+        return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-1", children: stepPath?.map((path, idx) => {
+          return /* @__PURE__ */ jsxRuntime.jsx(LegacyWorkflowStatus, { stepId, pathStatus, path }, idx);
+        }) }, stepId);
+      }) })
+    ] }),
+    result && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx("hr", { className: "border-border1 border-sm my-5" }),
+      /* @__PURE__ */ jsxRuntime.jsx(WorkflowResult, { sanitizedJsonResult: sanitizedOutput, jsonResult: JSON.stringify(restResult, null, 2) })
     ] })
   ] }) });
 }
 
-function VNextWorkflowNestedGraph({ stepGraph, open }) {
-  const { nodes: initialNodes, edges: initialEdges } = constructVNextNodesAndEdges({
+function WorkflowNestedGraph({ stepGraph, open }) {
+  const { nodes: initialNodes, edges: initialEdges } = constructNodesAndEdges({
     stepGraph
   });
   const [isMounted, setIsMounted] = React.useState(false);
@@ -8517,7 +8640,7 @@ function VNextWorkflowNestedGraph({ stepGraph, open }) {
     "condition-node": WorkflowConditionNode,
     "after-node": WorkflowAfterNode,
     "loop-result-node": WorkflowLoopResultNode,
-    "nested-node": VNextWorkflowNestedNode
+    "nested-node": WorkflowNestedNode
   };
   React.useEffect(() => {
     if (open) {
@@ -8544,10 +8667,10 @@ function VNextWorkflowNestedGraph({ stepGraph, open }) {
   ) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(Spinner, {}) }) });
 }
 
-const VNextWorkflowNestedGraphContext = React.createContext(
+const WorkflowNestedGraphContext = React.createContext(
   {}
 );
-function VNextWorkflowNestedGraphProvider({ children }) {
+function WorkflowNestedGraphProvider({ children }) {
   const [stepGraph, setStepGraph] = React.useState(null);
   const [parentStepGraphList, setParentStepGraphList] = React.useState([]);
   const [openDialog, setOpenDialog] = React.useState(false);
@@ -8585,7 +8708,7 @@ function VNextWorkflowNestedGraphProvider({ children }) {
     }, 500);
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(
-    VNextWorkflowNestedGraphContext.Provider,
+    WorkflowNestedGraphContext.Provider,
     {
       value: {
         showNestedGraph,
@@ -8601,16 +8724,16 @@ function VNextWorkflowNestedGraphProvider({ children }) {
               " workflow"
             ] })
           ] }),
-          switching ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(Spinner, {}) }) : /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(VNextWorkflowNestedGraph, { stepGraph, open: openDialog }) })
+          switching ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full flex items-center justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(Spinner, {}) }) : /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(WorkflowNestedGraph, { stepGraph, open: openDialog }) })
         ] }) }) })
       ]
     }
   );
 }
 
-function VNextWorkflowNestedNode({ data }) {
+function WorkflowNestedNode({ data }) {
   const { label, withoutTopHandle, withoutBottomHandle, stepGraph } = data;
-  const { showNestedGraph } = React.useContext(VNextWorkflowNestedGraphContext);
+  const { showNestedGraph } = React.useContext(WorkflowNestedGraphContext);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("bg-[rgba(29,29,29,0.5)] rounded-md h-full overflow-scroll w-[274px]"), children: [
     !withoutTopHandle && /* @__PURE__ */ jsxRuntime.jsx(react$2.Handle, { type: "target", position: react$2.Position.Top, style: { visibility: "hidden" } }),
     /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-2 cursor-pointer", onClick: () => showNestedGraph({ label, stepGraph }), children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-sm bg-mastra-bg-9 flex items-center gap-1.5 rounded-sm p-2 cursor-pointer", children: [
@@ -8621,8 +8744,8 @@ function VNextWorkflowNestedNode({ data }) {
   ] });
 }
 
-function VNextWorkflowGraphInner({ workflow }) {
-  const { nodes: initialNodes, edges: initialEdges } = constructVNextNodesAndEdges(workflow);
+function WorkflowGraphInner({ workflow }) {
+  const { nodes: initialNodes, edges: initialEdges } = constructNodesAndEdges(workflow);
   const [nodes, _, onNodesChange] = react$2.useNodesState(initialNodes);
   const [edges] = react$2.useEdgesState(initialEdges);
   const nodeTypes = {
@@ -8630,7 +8753,7 @@ function VNextWorkflowGraphInner({ workflow }) {
     "condition-node": WorkflowConditionNode,
     "after-node": WorkflowAfterNode,
     "loop-result-node": WorkflowLoopResultNode,
-    "nested-node": VNextWorkflowNestedNode
+    "nested-node": WorkflowNestedNode
   };
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full", children: /* @__PURE__ */ jsxRuntime.jsxs(
     react$2.ReactFlow,
@@ -8652,12 +8775,12 @@ function VNextWorkflowGraphInner({ workflow }) {
   ) });
 }
 
-function VNextWorkflowGraph({ workflowId, baseUrl }) {
-  const { vNextWorkflow, isLoading } = useVNextWorkflow(workflowId, baseUrl);
+function WorkflowGraph({ workflowId, baseUrl }) {
+  const { workflow, isLoading } = useWorkflow(workflowId, baseUrl);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-4", children: /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-[600px]" }) });
   }
-  if (!vNextWorkflow) {
+  if (!workflow) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid h-full place-items-center", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col items-center gap-2", children: [
       /* @__PURE__ */ jsxRuntime.jsx(lucideReact.AlertCircleIcon, {}),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
@@ -8667,43 +8790,60 @@ function VNextWorkflowGraph({ workflowId, baseUrl }) {
       ] })
     ] }) });
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(VNextWorkflowNestedGraphProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(VNextWorkflowGraphInner, { workflow: vNextWorkflow }) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(WorkflowNestedGraphProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(react$2.ReactFlowProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(WorkflowGraphInner, { workflow }) }) });
 }
 
-function VNextWorkflowTrigger({
+const WorkflowStatus = ({ stepId, status }) => {
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    WorkflowCard,
+    {
+      header: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(Icon, { children: [
+          status === "success" && /* @__PURE__ */ jsxRuntime.jsx(CheckIcon, { className: "text-accent1" }),
+          status === "failed" && /* @__PURE__ */ jsxRuntime.jsx(CrossIcon, { className: "text-accent2" }),
+          status === "suspended" && /* @__PURE__ */ jsxRuntime.jsx(lucideReact.CirclePause, { className: "text-icon3" }),
+          status === "running" && /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "text-icon3 animate-spin" })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(Txt, { as: "span", variant: "ui-lg", className: "text-icon6 font-medium", children: stepId.charAt(0).toUpperCase() + stepId.slice(1) })
+      ] })
+    }
+  );
+};
+
+function WorkflowTrigger({
   workflowId,
   baseUrl,
   setRunId
 }) {
   const { runtimeContext } = usePlaygroundStore();
-  const { vNextResult, setVNextResult, payload, setPayload } = React.useContext(WorkflowRunContext);
-  const { isLoading, vNextWorkflow } = useVNextWorkflow(workflowId, baseUrl);
-  const { createVNextWorkflowRun, startVNextWorkflowRun } = useExecuteWorkflow(baseUrl);
-  const { watchVNextWorkflow, watchVNextResult, isWatchingVNextWorkflow } = useWatchWorkflow(baseUrl);
-  const { resumeVNextWorkflow, isResumingVNextWorkflow } = useResumeWorkflow(baseUrl);
+  const { result, setResult, payload, setPayload } = React.useContext(WorkflowRunContext);
+  const { isLoading, workflow } = useWorkflow(workflowId, baseUrl);
+  const { createWorkflowRun, startWorkflowRun } = useExecuteWorkflow(baseUrl);
+  const { watchWorkflow, watchResult, isWatchingWorkflow } = useWatchWorkflow(baseUrl);
+  const { resumeWorkflow, isResumingWorkflow } = useResumeWorkflow(baseUrl);
   const [suspendedSteps, setSuspendedSteps] = React.useState([]);
   const [isRunning, setIsRunning] = React.useState(false);
-  const triggerSchema = vNextWorkflow?.inputSchema;
+  const triggerSchema = workflow?.inputSchema;
   const handleExecuteWorkflow = async (data) => {
     try {
-      if (!vNextWorkflow) return;
+      if (!workflow) return;
       setIsRunning(true);
-      setVNextResult(null);
-      const { runId } = await createVNextWorkflowRun({ workflowId });
+      setResult(null);
+      const { runId } = await createWorkflowRun({ workflowId });
       setRunId?.(runId);
-      watchVNextWorkflow({ workflowId, runId });
-      startVNextWorkflowRun({ workflowId, runId, input: data, runtimeContext });
+      watchWorkflow({ workflowId, runId });
+      startWorkflowRun({ workflowId, runId, input: data, runtimeContext });
     } catch (err) {
       setIsRunning(false);
       sonner.toast.error("Error executing workflow");
     }
   };
   const handleResumeWorkflow = async (step) => {
-    if (!vNextWorkflow) return;
+    if (!workflow) return;
     const { stepId, runId: prevRunId, resumeData } = step;
-    const { runId } = await createVNextWorkflowRun({ workflowId, prevRunId });
-    watchVNextWorkflow({ workflowId, runId });
-    await resumeVNextWorkflow({
+    const { runId } = await createWorkflowRun({ workflowId, prevRunId });
+    watchWorkflow({ workflowId, runId });
+    await resumeWorkflow({
       step: stepId,
       runId,
       resumeData,
@@ -8711,78 +8851,65 @@ function VNextWorkflowTrigger({
       runtimeContext
     });
   };
-  const watchResultToUse = vNextResult ?? watchVNextResult;
+  const watchResultToUse = result ?? watchResult;
   const workflowActivePaths = watchResultToUse?.payload?.workflowState?.steps ?? {};
   React.useEffect(() => {
-    setIsRunning(isWatchingVNextWorkflow);
-  }, [isWatchingVNextWorkflow]);
+    setIsRunning(isWatchingWorkflow);
+  }, [isWatchingWorkflow]);
   React.useEffect(() => {
-    if (!watchResultToUse?.payload?.workflowState?.steps || !vNextResult?.runId) return;
+    if (!watchResultToUse?.payload?.workflowState?.steps || !result?.runId) return;
     const suspended = Object.entries(watchResultToUse.payload.workflowState.steps).filter(([_, { status }]) => status === "suspended").map(([stepId, { payload: payload2 }]) => ({
       stepId,
-      runId: vNextResult.runId,
+      runId: result.runId,
       suspendPayload: payload2
     }));
     setSuspendedSteps(suspended);
-  }, [watchResultToUse, vNextResult]);
+  }, [watchResultToUse, result]);
   React.useEffect(() => {
-    if (watchVNextResult) {
-      setVNextResult(watchVNextResult);
+    if (watchResult) {
+      setResult(watchResult);
     }
-  }, [watchVNextResult]);
+  }, [watchResult]);
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx(ScrollArea, { className: "h-[calc(100vh-126px)] pt-2 px-4 pb-4 text-xs", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
       /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-10" }),
       /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-10" })
     ] }) });
   }
-  if (!vNextWorkflow) return null;
+  if (!workflow) return null;
   const isSuspendedSteps = suspendedSteps.length > 0;
   const zodInputSchema = triggerSchema ? resolveSerializedZodOutput(jsonSchemaToZod(superjson.parse(triggerSchema))) : null;
-  const { sanitizedOutput, ...restResult } = vNextResult ?? {};
-  return /* @__PURE__ */ jsxRuntime.jsx(ScrollArea, { className: "h-[calc(100vh-126px)] pt-2 px-4 pb-4 text-xs w-full", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
-    !isSuspendedSteps && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: zodInputSchema ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between w-full", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Input" }),
-        isResumingVNextWorkflow ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-3 h-3 animate-spin text-mastra-el-accent" }),
-          " Resuming workflow"
-        ] }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {})
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        DynamicForm,
-        {
-          schema: zodInputSchema,
-          defaultValues: payload,
-          isSubmitLoading: isWatchingVNextWorkflow,
-          onSubmit: (data) => {
-            setPayload(data);
-            handleExecuteWorkflow(data);
-          }
-        }
-      )
-    ] }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "px-4 space-y-4", children: [
-      isResumingVNextWorkflow ? /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-3 h-3 animate-spin text-mastra-el-accent" }),
-        " Resuming workflow"
-      ] }) : /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, {}),
-      /* @__PURE__ */ jsxRuntime.jsx(Button$1, { className: "w-full", disabled: isRunning, onClick: () => handleExecuteWorkflow(null), children: isRunning ? /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "w-4 h-4 animate-spin" }) : "Trigger" })
-    ] }) }),
-    Object.values(workflowActivePaths).length > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Status" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-4 flex flex-col gap-4", children: Object.entries(workflowActivePaths)?.filter(([key, _]) => key !== "input" && !key.endsWith(".input"))?.map(([stepId, { status }]) => {
-        const statusIcon = status === "success" ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-green-500 rounded-full" }) : status === "failed" ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-red-500 rounded-full" }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-2 h-2 bg-yellow-500 rounded-full animate-pulse" });
-        return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-1", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col overflow-hidden rounded-md border", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `flex items-center justify-between p-3`, children: [
-          /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "text-mastra-el-3", size: "xs", children: stepId.charAt(0).toUpperCase() + stepId.slice(1) }),
-          /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex items-center gap-2 capitalize", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "text-mastra-el-3", size: "xs", children: statusIcon }),
-            status
-          ] })
-        ] }) }, stepId) });
-      }) })
+  const { sanitizedOutput, ...restResult } = result ?? {};
+  const hasWorkflowActivePaths = Object.values(workflowActivePaths).length > 0;
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full px-5 pt-3 pb-12", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-4", children: [
+    isResumingWorkflow && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "py-2 px-5 flex items-center gap-2 bg-surface5 -mx-5 -mt-5 border-b-sm border-border1", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "animate-spin text-icon6" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(Txt, { children: "Resuming workflow" })
     ] }),
-    !isWatchingVNextWorkflow && isSuspendedSteps && suspendedSteps?.map((step) => {
-      const stepDefinition = vNextWorkflow.steps[step.stepId];
+    !isSuspendedSteps && /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: zodInputSchema ? /* @__PURE__ */ jsxRuntime.jsx(
+      DynamicForm,
+      {
+        schema: zodInputSchema,
+        defaultValues: payload,
+        isSubmitLoading: isWatchingWorkflow,
+        submitButtonLabel: "Run",
+        onSubmit: (data) => {
+          setPayload(data);
+          handleExecuteWorkflow(data);
+        }
+      }
+    ) : /* @__PURE__ */ jsxRuntime.jsx(
+      Button,
+      {
+        className: "w-full",
+        variant: "light",
+        disabled: isRunning,
+        onClick: () => handleExecuteWorkflow(null),
+        children: isRunning ? /* @__PURE__ */ jsxRuntime.jsx(Icon, { children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Loader2, { className: "animate-spin" }) }) : "Trigger"
+      }
+    ) }),
+    !isWatchingWorkflow && isSuspendedSteps && suspendedSteps?.map((step) => {
+      const stepDefinition = workflow.steps[step.stepId];
       const stepSchema = stepDefinition?.resumeSchema ? resolveSerializedZodOutput(jsonSchemaToZod(superjson.parse(stepDefinition.resumeSchema))) : z.z.record(z.z.string(), z.z.any());
       return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col px-4", children: [
         /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "text-mastra-el-3", size: "xs", children: step.stepId }),
@@ -8798,7 +8925,7 @@ function VNextWorkflowTrigger({
           DynamicForm,
           {
             schema: stepSchema,
-            isSubmitLoading: isResumingVNextWorkflow,
+            isSubmitLoading: isResumingWorkflow,
             submitButtonLabel: "Resume",
             onSubmit: (data) => {
               handleResumeWorkflow({
@@ -8812,23 +8939,18 @@ function VNextWorkflowTrigger({
         )
       ] });
     }),
-    vNextResult && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col group relative", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Output" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: /* @__PURE__ */ jsxRuntime.jsx(
-        CopyButton,
-        {
-          classname: "absolute z-40 w-8 h-8 p-0 transition-opacity duration-150 ease-in-out opacity-0 top-4 right-4 group-hover:opacity-100",
-          content: JSON.stringify(restResult, null, 2)
-        }
-      ) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        CodeBlockDemo,
-        {
-          className: "w-full overflow-x-auto",
-          code: sanitizedOutput || JSON.stringify(restResult, null, 2),
-          language: "json"
-        }
-      )
+    hasWorkflowActivePaths && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx("hr", { className: "border-border1 border-sm my-5" }),
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(Text, { variant: "secondary", className: "px-4 text-mastra-el-3", size: "xs", children: "Status" }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-4 flex flex-col gap-4", children: Object.entries(workflowActivePaths)?.filter(([key, _]) => key !== "input" && !key.endsWith(".input"))?.map(([stepId, { status }]) => {
+          return /* @__PURE__ */ jsxRuntime.jsx(WorkflowStatus, { stepId, status });
+        }) })
+      ] })
+    ] }),
+    result && /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx("hr", { className: "border-border1 border-sm my-5" }),
+      /* @__PURE__ */ jsxRuntime.jsx(WorkflowResult, { sanitizedJsonResult: sanitizedOutput, jsonResult: JSON.stringify(restResult, null, 2) })
     ] })
   ] }) });
 }
@@ -8842,7 +8964,8 @@ const DataTable = ({
   getRowId,
   selectedRowId,
   isLoading,
-  emptyText
+  emptyText,
+  onClick
 }) => {
   const [sorting, setSorting] = React.useState([]);
   const [{ pageIndex, pageSize }, setPagination] = React.useState({
@@ -8884,7 +9007,16 @@ const DataTable = ({
         const meta = header.column.columnDef.meta;
         return /* @__PURE__ */ jsxRuntime.jsx(Th, { style: { width: meta?.width || size || "auto" }, children: header.isPlaceholder ? null : reactTable.flexRender(header.column.columnDef.header, header.getContext()) }, header.id);
       }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(Tbody, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: Array.from({ length: 3 }).map((_, rowIndex) => /* @__PURE__ */ jsxRuntime.jsx(Row, { children: Array.from({ length: columns.length }).map((_2, cellIndex) => /* @__PURE__ */ jsxRuntime.jsx(Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-4 w-1/2" }) }, `row-${rowIndex}-cell-${cellIndex}`)) }, rowIndex)) }) : rows?.length > 0 ? rows.map((row) => /* @__PURE__ */ jsxRuntime.jsx(Row, { "data-state": (row.getIsSelected() || row.id === selectedRowId) && "selected", children: row.getVisibleCells().map((cell) => reactTable.flexRender(cell.column.columnDef.cell, cell.getContext())) }, row.id)) : emptyNode })
+      /* @__PURE__ */ jsxRuntime.jsx(Tbody, { children: isLoading ? /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: Array.from({ length: 3 }).map((_, rowIndex) => /* @__PURE__ */ jsxRuntime.jsx(Row, { onClick: () => {
+      }, children: Array.from({ length: columns.length }).map((_2, cellIndex) => /* @__PURE__ */ jsxRuntime.jsx(Cell, { children: /* @__PURE__ */ jsxRuntime.jsx(Skeleton, { className: "h-4 w-1/2" }) }, `row-${rowIndex}-cell-${cellIndex}`)) }, rowIndex)) }) : rows?.length > 0 ? rows.map((row) => /* @__PURE__ */ jsxRuntime.jsx(
+        Row,
+        {
+          "data-state": (row.getIsSelected() || row.id === selectedRowId) && "selected",
+          onClick: () => onClick?.(row.original),
+          children: row.getVisibleCells().map((cell) => reactTable.flexRender(cell.column.columnDef.cell, cell.getContext()))
+        },
+        row.id
+      )) : emptyNode })
     ] }),
     pagination && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-4 flex items-center justify-between px-2", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-muted-foreground text-sm", children: [
@@ -9259,6 +9391,8 @@ exports.Icon = Icon;
 exports.InfoIcon = InfoIcon;
 exports.JudgeIcon = JudgeIcon;
 exports.LatencyIcon = LatencyIcon;
+exports.LegacyWorkflowGraph = LegacyWorkflowGraph;
+exports.LegacyWorkflowTrigger = LegacyWorkflowTrigger;
 exports.LogsIcon = LogsIcon;
 exports.MastraResizablePanel = MastraResizablePanel;
 exports.MemoryIcon = MemoryIcon;
@@ -9289,8 +9423,6 @@ exports.TsIcon = TsIcon;
 exports.Txt = Txt;
 exports.TxtCell = TxtCell;
 exports.UnitCell = UnitCell;
-exports.VNextWorkflowGraph = VNextWorkflowGraph;
-exports.VNextWorkflowTrigger = VNextWorkflowTrigger;
 exports.VariablesIcon = VariablesIcon;
 exports.WorkflowCoinIcon = WorkflowCoinIcon;
 exports.WorkflowGraph = WorkflowGraph;