From 2761a354ff6892a64b64dca0c037f8d905d67941 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 16:19:43 +0100
Subject: [PATCH 1/8] chore(webapp): upgrade @conform-to to v1

Migrate the dashboard form layer from @conform-to 0.9 to the 1.x API.
conform 1.x peer-depends on zod ^3.21 || ^4, so it runs on the current
zod 3 and unblocks the zod 4 upgrade (conform 0.9 cannot bundle against
zod 4, which removed ZodNativeEnum, ZodEffects, and ZodPipeline).
---
 .server-changes/conform-v1.md                 |   6 +
 apps/webapp/app/components/Feedback.tsx       |  27 +-
 .../errors/ConfigureErrorAlerts.tsx           |  29 +-
 .../components/runs/v3/ReplayRunDialog.tsx    |  98 ++++---
 .../schedules/PurchaseSchedulesModal.tsx      |  16 +-
 .../route.tsx                                 |  27 +-
 .../route.tsx                                 |  44 ++--
 .../route.tsx                                 |  37 ++-
 .../route.tsx                                 |  72 ++---
 .../route.tsx                                 |  76 +++---
 .../route.tsx                                 |  87 +++---
 .../route.tsx                                 |  63 +++--
 .../route.tsx                                 |   8 +-
 .../route.tsx                                 |   8 +-
 .../route.tsx                                 |   8 +-
 .../route.tsx                                 |  34 +--
 .../route.tsx                                 |  35 ++-
 .../route.tsx                                 | 247 +++++++++---------
 .../route.tsx                                 |  34 +--
 .../route.tsx                                 |  39 +--
 .../route.tsx                                 |  28 +-
 .../route.tsx                                 |  61 ++---
 .../route.tsx                                 |  24 +-
 .../webapp/app/routes/_app.orgs.new/route.tsx |  20 +-
 .../app/routes/account._index/route.tsx       |  31 ++-
 .../app/routes/account.tokens/route.tsx       |  30 +--
 .../app/routes/confirm-basic-details.tsx      |  32 +--
 apps/webapp/app/routes/invite-resend.tsx      |   8 +-
 apps/webapp/app/routes/invite-revoke.tsx      |   8 +-
 apps/webapp/app/routes/invites.tsx            |  28 +-
 ...deployments.$deploymentShortCode.cancel.ts |   8 +-
 ...eployments.$deploymentShortCode.promote.ts |  14 +-
 ...ployments.$deploymentShortCode.rollback.ts |  14 +-
 ...urces.batches.$batchId.check-completion.ts |   8 +-
 .../app/routes/resources.branches.archive.tsx |  20 +-
 apps/webapp/app/routes/resources.feedback.ts  |  15 +-
 ...cts.$projectParam.env.$envParam.github.tsx |  40 +--
 ...ectParam.env.$envParam.runs.bulkaction.tsx |   6 +-
 .../route.tsx                                 |  44 ++--
 ...cts.$projectParam.env.$envParam.vercel.tsx |  18 +-
 .../route.tsx                                 |   8 +-
 ....orgs.$organizationSlug.schedules-addon.ts |  18 +-
 .../resources.sessions.$sessionParam.close.ts |  14 +-
 .../resources.taskruns.$runParam.cancel.ts    |  14 +-
 .../resources.taskruns.$runParam.replay.ts    |   8 +-
 apps/webapp/package.json                      |   4 +-
 pnpm-lock.yaml                                |  35 +--
 47 files changed, 779 insertions(+), 774 deletions(-)
 create mode 100644 .server-changes/conform-v1.md

diff --git a/.server-changes/conform-v1.md b/.server-changes/conform-v1.md
new file mode 100644
index 00000000000..5e187829460
--- /dev/null
+++ b/.server-changes/conform-v1.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Upgrade the dashboard form layer from `@conform-to` 0.9 to 1.x. conform 1.x supports both zod 3 and zod 4, which unblocks the upcoming zod 4 upgrade.
diff --git a/apps/webapp/app/components/Feedback.tsx b/apps/webapp/app/components/Feedback.tsx
index 0848359e219..f8b4e8b3985 100644
--- a/apps/webapp/app/components/Feedback.tsx
+++ b/apps/webapp/app/components/Feedback.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getSelectProps, getInputProps, getTextareaProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { InformationCircleIcon, ArrowUpCircleIcon } from "@heroicons/react/20/solid";
 import { EnvelopeIcon, ShieldCheckIcon } from "@heroicons/react/24/solid";
 import { Form, useActionData, useLocation, useNavigation, useSearchParams } from "@remix-run/react";
@@ -34,11 +34,11 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
   const navigation = useNavigation();
   const [type, setType] = useState<FeedbackType>(defaultValue);
 
-  const [form, { path, feedbackType, message }] = useForm({
+  const [form, fields] = useForm({
     id: "accept-invite",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onInput",
   });
@@ -47,8 +47,7 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
     if (
       navigation.formAction === "/resources/feedback" &&
       navigation.state === "loading" &&
-      form.error === undefined &&
-      form.errors.length === 0
+      (form.errors === undefined || form.errors.length === 0)
     ) {
       setOpen(false);
     }
@@ -90,9 +89,9 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
             type === "concurrency" ||
             type === "hipaa"
           ) && <hr className="border-grid-dimmed" />}
-          <Form method="post" action="/resources/feedback" {...form.props} className="w-full">
+          <Form method="post" action="/resources/feedback" {...getFormProps(form)} className="w-full">
             <Fieldset className="max-w-full gap-y-3">
-              <input value={location.pathname} {...conform.input(path, { type: "hidden" })} />
+              <input value={location.pathname} {...getInputProps(fields.path, { type: "hidden" })} />
               <InputGroup className="max-w-full">
                 {type === "feature" && (
                   <InfoPanel
@@ -149,7 +148,7 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
                   </InfoPanel>
                 )}
                 <Select
-                  {...conform.select(feedbackType)}
+                  {...getSelectProps(fields.feedbackType)}
                   variant="tertiary/medium"
                   value={type}
                   defaultValue={type}
@@ -164,14 +163,14 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
                     </SelectItem>
                   ))}
                 </Select>
-                <FormError id={feedbackType.errorId}>{feedbackType.error}</FormError>
+                <FormError id={fields.feedbackType.errorId}>{fields.feedbackType.errors}</FormError>
               </InputGroup>
               <InputGroup className="max-w-full">
                 <Label>Message</Label>
-                <TextArea {...conform.textarea(message)} />
-                <FormError id={message.errorId}>{message.error}</FormError>
+                <TextArea {...getTextareaProps(fields.message)} />
+                <FormError id={fields.message.errorId}>{fields.message.errors}</FormError>
               </InputGroup>
-              <FormError>{form.error}</FormError>
+              <FormError>{form.errors}</FormError>
               <FormButtons
                 confirmButton={
                   <Button type="submit" variant="primary/medium">
diff --git a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
index 32ed778f877..49ac595491b 100644
--- a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
+++ b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
@@ -1,5 +1,5 @@
-import { conform, list, requestIntent, useFieldList, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   EnvelopeIcon,
   GlobeAltIcon,
@@ -104,10 +104,10 @@ export function ConfigureErrorAlerts({
     existingWebhooks.length > 0 ? [...existingWebhooks.map((w) => w.url), ""] : [""]
   );
 
-  const [form, { emails, webhooks, slackChannel, slackIntegrationId }] = useForm({
+  const [form, fields] = useForm<z.infer<typeof ErrorAlertsFormSchema>>({
     id: "configure-error-alerts",
     onValidate({ formData }) {
-      return parse(formData, { schema: ErrorAlertsFormSchema });
+      return parseWithZod(formData, { schema: ErrorAlertsFormSchema });
     },
     shouldRevalidate: "onSubmit",
     defaultValue: {
@@ -115,9 +115,10 @@ export function ConfigureErrorAlerts({
       webhooks: webhookFieldValues.current,
     },
   });
+  const { emails, webhooks, slackChannel, slackIntegrationId } = fields;
 
-  const emailFields = useFieldList(form.ref, emails);
-  const webhookFields = useFieldList(form.ref, webhooks);
+  const emailFields = emails.getFieldList();
+  const webhookFields = webhooks.getFieldList();
 
   return (
     <div className="grid h-full grid-rows-[auto_1fr_auto] overflow-hidden">
@@ -138,7 +139,7 @@ export function ConfigureErrorAlerts({
       <fetcher.Form
         method="post"
         action={formAction}
-        {...form.props}
+        {...getFormProps(form)}
         className="contents"
       >
         <div className="flex-1 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
@@ -160,7 +161,7 @@ export function ConfigureErrorAlerts({
                   {emailFields.map((emailField, index) => (
                     <Fragment key={emailField.key}>
                       <Input
-                        {...conform.input(emailField, { type: "email" })}
+                        {...getInputProps(emailField, { type: "email" })}
                         placeholder={index === 0 ? "Enter an email address" : "Add another email"}
                         icon={EnvelopeIcon}
                         onChange={(e) => {
@@ -169,11 +170,11 @@ export function ConfigureErrorAlerts({
                             emailFields.length === emailFieldValues.current.length &&
                             emailFieldValues.current.every((v) => v !== "")
                           ) {
-                            requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+                            form.insert({ name: emails.name });
                           }
                         }}
                       />
-                      <FormError id={emailField.errorId}>{emailField.error}</FormError>
+                      <FormError id={emailField.errorId}>{emailField.errors}</FormError>
                     </Fragment>
                   ))}
                 </InputGroup>
@@ -320,7 +321,7 @@ export function ConfigureErrorAlerts({
                 {webhookFields.map((webhookField, index) => (
                   <Fragment key={webhookField.key}>
                     <Input
-                      {...conform.input(webhookField, { type: "url" })}
+                      {...getInputProps(webhookField, { type: "url" })}
                       placeholder={
                         index === 0 ? "https://example.com/webhook" : "Add another webhook URL"
                       }
@@ -331,18 +332,18 @@ export function ConfigureErrorAlerts({
                           webhookFields.length === webhookFieldValues.current.length &&
                           webhookFieldValues.current.every((v) => v !== "")
                         ) {
-                          requestIntent(form.ref.current ?? undefined, list.append(webhooks.name));
+                          form.insert({ name: webhooks.name });
                         }
                       }}
                     />
-                    <FormError id={webhookField.errorId}>{webhookField.error}</FormError>
+                    <FormError id={webhookField.errorId}>{webhookField.errors}</FormError>
                   </Fragment>
                 ))}
                 <Hint>We'll issue POST requests to these URLs with a JSON payload.</Hint>
               </InputGroup>
             </div>
 
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
           </Fieldset>
         </div>
 
diff --git a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
index e42a2122abe..827452e4d04 100644
--- a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
+++ b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { Form, useActionData, useNavigation, useParams, useSubmit } from "@remix-run/react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -184,49 +184,47 @@ function ReplayForm({
   }));
 
   const lastSubmission = useActionData();
-  const [
-    form,
-    {
-      environment,
-      payload,
-      metadata,
-      delaySeconds,
-      ttlSeconds,
-      idempotencyKey,
-      idempotencyKeyTTLSeconds,
-      queue,
-      concurrencyKey,
-      maxAttempts,
-      maxDurationSeconds,
-      tags,
-      version,
-      machine,
-      region,
-      prioritySeconds,
-    },
-  ] = useForm({
+  const [form, fields] = useForm({
     id: "replay-task",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onSubmit(event, { formData }) {
       event.preventDefault();
       if (editablePayload) {
-        formData.set(payload.name, currentPayloadJson.current);
+        formData.set(fields.payload.name, currentPayloadJson.current);
       }
-      formData.set(metadata.name, currentMetadataJson.current);
+      formData.set(fields.metadata.name, currentMetadataJson.current);
 
       submit(formData, { method: "POST", action: formAction });
     },
     onValidate({ formData }) {
-      return parse(formData, { schema: ReplayRunData });
+      return parseWithZod(formData, { schema: ReplayRunData });
     },
   });
+  const {
+    environment,
+    payload,
+    metadata,
+    delaySeconds,
+    ttlSeconds,
+    idempotencyKey,
+    idempotencyKeyTTLSeconds,
+    queue,
+    concurrencyKey,
+    maxAttempts,
+    maxDurationSeconds,
+    tags,
+    version,
+    machine,
+    region,
+    prioritySeconds,
+  } = fields;
 
   return (
     <Form
       action={formAction}
       method="post"
       className="flex flex-1 flex-col overflow-hidden px-3"
-      {...form.props}
+      {...getFormProps(form)}
     >
       <input type="hidden" name="failedRedirect" value={failedRedirect} />
 
@@ -313,7 +311,7 @@ function ReplayForm({
                   Machine
                 </Label>
                 <Select
-                  {...conform.select(machine)}
+                  {...getSelectProps(machine)}
                   variant="tertiary/small"
                   placeholder="Select machine type"
                   dropdownIcon
@@ -327,14 +325,14 @@ function ReplayForm({
                   ))}
                 </Select>
                 <Hint>Overrides the machine preset.</Hint>
-                <FormError id={machine.errorId}>{machine.error}</FormError>
+                <FormError id={machine.errorId}>{machine.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label htmlFor={version.id} variant="small">
                   Version
                 </Label>
                 <Select
-                  {...conform.select(version)}
+                  {...getSelectProps(version)}
                   defaultValue="latest"
                   variant="tertiary/small"
                   placeholder="Select version"
@@ -356,7 +354,7 @@ function ReplayForm({
                 ) : (
                   <Hint>Runs task on a specific version.</Hint>
                 )}
-                <FormError id={version.errorId}>{version.error}</FormError>
+                <FormError id={version.errorId}>{version.errors}</FormError>
               </InputGroup>
               {replayData.regions.length > 1 && (
                 <InputGroup>
@@ -364,7 +362,7 @@ function ReplayForm({
                     Region
                   </Label>
                   <Select
-                    {...conform.select(region)}
+                    {...getSelectProps(region)}
                     variant="tertiary/small"
                     placeholder={replayData.disableVersionSelection ? "–" : undefined}
                     dropdownIcon
@@ -384,7 +382,7 @@ function ReplayForm({
                   ) : (
                     <Hint>Overrides the region for this run.</Hint>
                   )}
-                  <FormError id={region.errorId}>{region.error}</FormError>
+                  <FormError id={region.errorId}>{region.errors}</FormError>
                 </InputGroup>
               )}
               <InputGroup>
@@ -393,7 +391,7 @@ function ReplayForm({
                 </Label>
                 {replayData.allowArbitraryQueues ? (
                   <Input
-                    {...conform.input(queue, { type: "text" })}
+                    {...getInputProps(queue, { type: "text" })}
                     variant="small"
                     defaultValue={replayData.queue}
                   />
@@ -437,7 +435,7 @@ function ReplayForm({
                   </Select>
                 )}
                 <Hint>Assign run to a specific queue.</Hint>
-                <FormError id={queue.errorId}>{queue.error}</FormError>
+                <FormError id={queue.errorId}>{queue.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label htmlFor={tags.id} variant="small">
@@ -450,14 +448,14 @@ function ReplayForm({
                   defaultTags={replayData.runTags}
                 />
                 <Hint>Add tags to easily filter runs.</Hint>
-                <FormError id={tags.errorId}>{tags.error}</FormError>
+                <FormError id={tags.errorId}>{tags.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label htmlFor={maxAttempts.id} variant="small">
                   Max attempts
                 </Label>
                 <Input
-                  {...conform.input(maxAttempts, { type: "number" })}
+                  {...getInputProps(maxAttempts, { type: "number" })}
                   className="[&::-webkit-inner-spin-button]:appearance-none"
                   variant="small"
                   min={1}
@@ -476,7 +474,7 @@ function ReplayForm({
                   }}
                 />
                 <Hint>Retries failed runs up to the specified number of attempts.</Hint>
-                <FormError id={maxAttempts.errorId}>{maxAttempts.error}</FormError>
+                <FormError id={maxAttempts.errorId}>{maxAttempts.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label variant="small">Max duration</Label>
@@ -486,14 +484,14 @@ function ReplayForm({
                   defaultValueSeconds={replayData.maxDurationSeconds ?? undefined}
                 />
                 <Hint>Overrides the maximum compute time limit for the run.</Hint>
-                <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.error}</FormError>
+                <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label htmlFor={idempotencyKey.id} variant="small">
                   Idempotency key
                 </Label>
-                <Input {...conform.input(idempotencyKey, { type: "text" })} variant="small" />
-                <FormError id={idempotencyKey.errorId}>{idempotencyKey.error}</FormError>
+                <Input {...getInputProps(idempotencyKey, { type: "text" })} variant="small" />
+                <FormError id={idempotencyKey.errorId}>{idempotencyKey.errors}</FormError>
                 <Hint>
                   Specify an idempotency key to ensure that a task is only triggered once with the
                   same key.
@@ -507,7 +505,7 @@ function ReplayForm({
                 />
                 <Hint>Keys expire after 30 days by default.</Hint>
                 <FormError id={idempotencyKeyTTLSeconds.errorId}>
-                  {idempotencyKeyTTLSeconds.error}
+                  {idempotencyKeyTTLSeconds.errors}
                 </FormError>
               </InputGroup>
               <InputGroup>
@@ -515,26 +513,26 @@ function ReplayForm({
                   Concurrency key
                 </Label>
                 <Input
-                  {...conform.input(concurrencyKey, { type: "text" })}
+                  {...getInputProps(concurrencyKey, { type: "text" })}
                   variant="small"
                   defaultValue={replayData.concurrencyKey ?? undefined}
                 />
                 <Hint>
                   Limits concurrency by creating a separate queue for each value of the key.
                 </Hint>
-                <FormError id={concurrencyKey.errorId}>{concurrencyKey.error}</FormError>
+                <FormError id={concurrencyKey.errorId}>{concurrencyKey.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label variant="small">Delay</Label>
                 <DurationPicker name={delaySeconds.name} id={delaySeconds.id} />
                 <Hint>Delays run by a specific duration.</Hint>
-                <FormError id={delaySeconds.errorId}>{delaySeconds.error}</FormError>
+                <FormError id={delaySeconds.errorId}>{delaySeconds.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label variant="small">Priority</Label>
                 <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
                 <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
-                <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+                <FormError id={prioritySeconds.errorId}>{prioritySeconds.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label variant="small">TTL</Label>
@@ -544,9 +542,9 @@ function ReplayForm({
                   defaultValueSeconds={replayData.ttlSeconds}
                 />
                 <Hint>Expires the run if it hasn't started within the TTL.</Hint>
-                <FormError id={ttlSeconds.errorId}>{ttlSeconds.error}</FormError>
+                <FormError id={ttlSeconds.errorId}>{ttlSeconds.errors}</FormError>
               </InputGroup>
-              <FormError>{form.error}</FormError>
+              <FormError>{form.errors}</FormError>
             </Fieldset>
           </div>
         </ResizablePanel>
@@ -560,7 +558,7 @@ function ReplayForm({
           <InputGroup className="flex flex-row items-center gap-3">
             <Label>Replay this run in</Label>
             <Select
-              {...conform.select(environment)}
+              {...getSelectProps(environment)}
               placeholder="Select an environment"
               defaultValue={replayData.environment.id}
               items={replayData.environments}
diff --git a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
index 9de9775614e..87c378b266a 100644
--- a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
+++ b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
@@ -1,5 +1,5 @@
-import { useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { EnvelopeIcon } from "@heroicons/react/20/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { useFetcher } from "@remix-run/react";
@@ -59,9 +59,9 @@ export function PurchaseSchedulesModal({
       : undefined;
   const [form, { amount }] = useForm({
     id: "purchase-schedules",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: PurchaseSchema });
+      return parseWithZod(formData, { schema: PurchaseSchema });
     },
     shouldRevalidate: "onSubmit",
   });
@@ -128,7 +128,7 @@ export function PurchaseSchedulesModal({
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>{title}</DialogHeader>
-        <fetcher.Form method="post" action={actionPath} {...form.props}>
+        <fetcher.Form method="post" action={actionPath} {...getFormProps(form)}>
           <div className="flex flex-col gap-4 pt-2">
             <div className="flex flex-col gap-1">
               <Paragraph variant="small/bright">
@@ -155,10 +155,8 @@ export function PurchaseSchedulesModal({
                   {formatNumber(bundles)} {bundles === 1 ? "bundle" : "bundles"} ={" "}
                   {formatNumber(amountValue)} schedules
                 </Paragraph>
-                <FormError id={amount.errorId}>
-                  {amount.error ?? amount.initialError?.[""]?.[0]}
-                </FormError>
-                <FormError>{form.error}</FormError>
+                <FormError id={amount.errorId}>{amount.errors}</FormError>
+                <FormError>{form.errors}</FormError>
               </InputGroup>
             </Fieldset>
             {state === "need_to_delete" ? (
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
index 52dbdda680b..e6173da559f 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
@@ -1,5 +1,5 @@
-import { conform, list, requestIntent, useFieldList, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   ArrowUpCircleIcon,
   EnvelopeIcon,
@@ -176,10 +176,10 @@ export const action = dashboardAction(
     const { organizationSlug } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema });
+    const submission = parseWithZod(formData, { schema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     // Resolve the RBAC role choice. NO_RBAC_ROLE / undefined / unknown
@@ -287,20 +287,21 @@ export default function Page() {
   const defaultRoleId = showRolePicker ? offerable[offerable.length - 1].id : NO_RBAC_ROLE;
   const [selectedRoleId, setSelectedRoleId] = useState(defaultRoleId);
 
-  const [form, { emails }] = useForm({
+  const [form, fields] = useForm<z.infer<typeof schema>>({
     id: "invite-members",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     defaultValue: {
       emails: [""],
     },
   });
+  const { emails } = fields;
 
   const fieldValues = useRef<string[]>([""]);
-  const emailFields = useFieldList(form.ref, emails);
+  const emailFields = emails.getFieldList();
 
   return (
     <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
@@ -359,14 +360,14 @@ export default function Page() {
               </Paragraph>
             </InfoPanel>
           ))}
-        <Form method="post" {...form.props}>
+        <Form method="post" {...getFormProps(form)}>
           <Fieldset>
             <InputGroup>
               <Label htmlFor={emails.id}>Email addresses</Label>
               {emailFields.map((email, index) => (
                 <Fragment key={email.key}>
                   <Input
-                    {...conform.input(email, { type: "email" })}
+                    {...getInputProps(email, { type: "email" })}
                     placeholder={index === 0 ? "Enter an email address" : "Add another email"}
                     icon={EnvelopeIcon}
                     autoFocus={index === 0}
@@ -378,11 +379,11 @@ export default function Page() {
                         emailFields.length === fieldValues.current.length &&
                         fieldValues.current.every((v) => v !== "")
                       ) {
-                        requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+                        form.insert({ name: emails.name });
                       }
                     }}
                   />
-                  <FormError id={email.errorId}>{email.error}</FormError>
+                  <FormError id={email.errorId}>{email.errors}</FormError>
                 </Fragment>
               ))}
             </InputGroup>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
index e408d82aa59..976a5cb5221 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { HashtagIcon, LockClosedIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useNavigate, useNavigation } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/router";
@@ -177,17 +177,16 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 
   const formData = await request.formData();
 
-  const submission = parse(formData, { schema: FormSchema });
+  const submission = parseWithZod(formData, { schema: FormSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const project = await findProjectBySlug(organizationSlug, projectParam, userId);
 
   if (!project) {
-    submission.error.key = ["Project not found"];
-    return json(submission);
+    return json(submission.reply({ formErrors: ["Project not found"] }));
   }
 
   const service = new CreateAlertChannelService();
@@ -198,8 +197,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   );
 
   if (!alertChannel) {
-    submission.error.key = ["Failed to create alert channel"];
-    return json(submission);
+    return json(submission.reply({ formErrors: ["Failed to create alert channel"] }));
   }
 
   return redirectWithSuccessMessage(
@@ -235,9 +233,9 @@ export default function Page() {
     useForm({
       id: "create-alert",
       // TODO: type this
-      lastSubmission: lastSubmission as any,
+      lastResult: lastSubmission as any,
       onValidate({ formData }) {
-        return parse(formData, { schema: FormSchema });
+        return parseWithZod(formData, { schema: FormSchema });
       },
       shouldRevalidate: "onSubmit",
     });
@@ -250,7 +248,7 @@ export default function Page() {
     if (navigation.state !== "idle") return;
     if (lastSubmission !== undefined) return;
 
-    form.ref.current?.reset();
+    form.reset();
   }, [navigation.state, lastSubmission]);
 
   return (
@@ -264,11 +262,11 @@ export default function Page() {
     >
       <DialogContent>
         <DialogHeader>New alert</DialogHeader>
-        <Form method="post" {...form.props}>
+        <Form method="post" {...getFormProps(form)}>
           <Fieldset className="mt-2">
             <InputGroup fullWidth>
               <SegmentedControl
-                {...conform.input(type)}
+                {...getInputProps(type, { type: "text" })}
                 options={[
                   { label: "Email", value: "EMAIL" },
                   { label: "Slack", value: "SLACK" },
@@ -287,12 +285,12 @@ export default function Page() {
                 <InputGroup fullWidth>
                   <Label>Email</Label>
                   <Input
-                    {...conform.input(channelValue)}
+                    {...getInputProps(channelValue, { type: "text" })}
                     placeholder="email@youremail.com"
                     type="email"
                     autoFocus
                   />
-                  <FormError id={channelValue.errorId}>{channelValue.error}</FormError>
+                  <FormError id={channelValue.errorId}>{channelValue.errors}</FormError>
                 </InputGroup>
               ) : (
                 <Callout variant="warning">
@@ -305,7 +303,7 @@ export default function Page() {
                 {slack.status === "READY" ? (
                   <>
                     <Select
-                      {...conform.select(channelValue)}
+                      {...getSelectProps(channelValue)}
                       placeholder="Select a Slack channel"
                       heading="Filter channels…"
                       defaultValue={undefined}
@@ -347,7 +345,7 @@ export default function Page() {
                       </Callout>
                     )}
 
-                    <FormError id={channelValue.errorId}>{channelValue.error}</FormError>
+                    <FormError id={channelValue.errorId}>{channelValue.errors}</FormError>
                     <input type="hidden" name="integrationId" value={slack.integrationId} />
                   </>
                 ) : slack.status === "NOT_CONFIGURED" ? (
@@ -392,12 +390,12 @@ export default function Page() {
               <InputGroup fullWidth>
                 <Label>URL</Label>
                 <Input
-                  {...conform.input(channelValue)}
+                  {...getInputProps(channelValue, { type: "text" })}
                   placeholder="https://foobar.com/webhooks"
                   type="url"
                   autoFocus
                 />
-                <FormError id={channelValue.errorId}>{channelValue.error}</FormError>
+                <FormError id={channelValue.errorId}>{channelValue.errors}</FormError>
                 <Hint>We'll issue POST requests to this URL with a JSON payload.</Hint>
               </InputGroup>
             )}
@@ -436,15 +434,15 @@ export default function Page() {
                 defaultChecked
               />
 
-              <FormError id={alertTypes.errorId}>{alertTypes.error}</FormError>
+              <FormError id={alertTypes.errorId}>{alertTypes.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label>Environment</Label>
               <input type="hidden" name={environmentTypes.name} value={environment.type} />
               <EnvironmentCombo environment={{ type: environment.type }} />
-              <FormError id={environmentTypes.errorId}>{environmentTypes.error}</FormError>
+              <FormError id={environmentTypes.errorId}>{environmentTypes.errors}</FormError>
             </InputGroup>
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
             <FormButtons
               confirmButton={
                 <Button variant="primary/medium" disabled={isLoading} name="action" value="create">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
index 3824c6a44d5..72f9c85ee59 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
@@ -1,5 +1,5 @@
-import { useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   BellAlertIcon,
   BellSlashIcon,
@@ -116,17 +116,16 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const project = await findProjectBySlug(organizationSlug, projectParam, userId);
 
   if (!project) {
-    submission.error.key = ["Project not found"];
-    return json(submission);
+    return json(submission.reply({ formErrors: ["Project not found"] }));
   }
 
   switch (submission.value.action) {
@@ -385,18 +384,18 @@ function DeleteAlertChannelButton(props: { id: string }) {
     navigation.formMethod === "post" &&
     navigation.formData?.get("action") === "delete";
 
-  const [form, { id }] = useForm({
+  const [form] = useForm({
     id: "delete-alert-channel",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
   });
 
   return (
-    <Form method="post" {...form.props}>
+    <Form method="post" {...getFormProps(form)}>
       <input type="hidden" name="id" value={props.id} />
       <Button
         name="action"
@@ -424,18 +423,18 @@ function DisableAlertChannelButton(props: { id: string }) {
     navigation.formMethod === "post" &&
     navigation.formData?.get("action") === "delete";
 
-  const [form, { id }] = useForm({
+  const [form] = useForm({
     id: "disable-alert-channel",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
   });
 
   return (
-    <Form method="post" {...form.props}>
+    <Form method="post" {...getFormProps(form)}>
       <input type="hidden" name="id" value={props.id} />
 
       <Button
@@ -464,18 +463,18 @@ function EnableAlertChannelButton(props: { id: string }) {
     navigation.formMethod === "post" &&
     navigation.formData?.get("action") === "delete";
 
-  const [form, { id }] = useForm({
+  const [form] = useForm({
     id: "enable-alert-channel",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
   });
 
   return (
-    <Form method="post" {...form.props}>
+    <Form method="post" {...getFormProps(form)}>
       <input type="hidden" name="id" value={props.id} />
 
       <Button
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index dfcaff0db48..7c253bd8a70 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { ArrowUpCircleIcon, CheckIcon, EnvelopeIcon, PlusIcon } from "@heroicons/react/20/solid";
 import { BookOpenIcon } from "@heroicons/react/24/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
@@ -173,10 +173,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
       );
     }
 
-    const submission = parse(formData, { schema: PurchaseSchema });
+    const submission = parseWithZod(formData, { schema: PurchaseSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     const service = new SetBranchesAddOnService();
@@ -190,21 +190,23 @@ export async function action({ request, params }: ActionFunctionArgs) {
     );
 
     if (error) {
-      submission.error.amount = [error instanceof Error ? error.message : "Unknown error"];
-      return json(submission);
+      return json(
+        submission.reply({
+          fieldErrors: { amount: [error instanceof Error ? error.message : "Unknown error"] },
+        })
+      );
     }
 
     if (!result.success) {
-      submission.error.amount = [result.error];
-      return json(submission);
+      return json(submission.reply({ fieldErrors: { amount: [result.error] } }));
     }
 
     return json({ ok: true } as const);
   }
 
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value) {
+  if (submission.status !== "success") {
     return redirectWithErrorMessage("/", request, "Invalid form data");
   }
 
@@ -216,12 +218,15 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   if (result.success) {
     if (result.alreadyExisted) {
-      submission.error = {
-        branchName: [
-          `Branch "${result.branch.branchName}" already exists. You can archive it and create a new one with the same name.`,
-        ],
-      };
-      return json(submission);
+      return json(
+        submission.reply({
+          fieldErrors: {
+            branchName: [
+              `Branch "${result.branch.branchName}" already exists. You can archive it and create a new one with the same name.`,
+            ],
+          },
+        })
+      );
     }
 
     return redirectWithSuccessMessage(
@@ -231,8 +236,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     );
   }
 
-  submission.error = { branchName: [result.error] };
-  return json(submission);
+  return json(submission.reply({ fieldErrors: { branchName: [result.error] } }));
 }
 
 export default function Page() {
@@ -675,9 +679,9 @@ function PurchaseBranchesModal({
       : undefined;
   const [form, { amount }] = useForm({
     id: "purchase-branches",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: PurchaseSchema });
+      return parseWithZod(formData, { schema: PurchaseSchema });
     },
     shouldRevalidate: "onSubmit",
   });
@@ -735,7 +739,7 @@ function PurchaseBranchesModal({
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>{title}</DialogHeader>
-        <fetcher.Form method="post" {...form.props}>
+        <fetcher.Form method="post" {...getFormProps(form)}>
           <input type="hidden" name="_formType" value="purchase-branches" />
           <div className="flex flex-col gap-4 pt-2">
             <div className="flex flex-col gap-1">
@@ -751,7 +755,7 @@ function PurchaseBranchesModal({
                   Total extra branches
                 </Label>
                 <InputNumberStepper
-                  {...conform.input(amount, { type: "number" })}
+                  {...getInputProps(amount, { type: "number" })}
                   step={branchPricing.stepSize}
                   min={0}
                   max={undefined}
@@ -759,10 +763,8 @@ function PurchaseBranchesModal({
                   onChange={(e) => setAmountValue(Number(e.target.value))}
                   disabled={isLoading}
                 />
-                <FormError id={amount.errorId}>
-                  {amount.error ?? amount.initialError?.[""]?.[0]}
-                </FormError>
-                <FormError>{form.error}</FormError>
+                <FormError id={amount.errorId}>{amount.errors}</FormError>
+                <FormError>{form.errors}</FormError>
               </InputGroup>
             </Fieldset>
             {state === "need_to_archive" ? (
@@ -936,9 +938,9 @@ export function NewBranchPanel({
 
   const [form, { parentEnvironmentId, branchName, failurePath }] = useForm({
     id: "create-branch",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onInput",
   });
@@ -959,19 +961,19 @@ export function NewBranchPanel({
       <DialogContent>
         <DialogHeader>New branch</DialogHeader>
         <div className="mt-2 flex flex-col gap-4">
-          <Form method="post" {...form.props} className="w-full">
+          <Form method="post" {...getFormProps(form)} className="w-full">
             <Fieldset className="max-w-full gap-y-3">
               <input
                 value={parentEnvironment.id}
-                {...conform.input(parentEnvironmentId, { type: "hidden" })}
+                {...getInputProps(parentEnvironmentId, { type: "hidden" })}
               />
               <input
                 value={location.pathname}
-                {...conform.input(failurePath, { type: "hidden" })}
+                {...getInputProps(failurePath, { type: "hidden" })}
               />
               <InputGroup className="max-w-full">
                 <Label>Branch name</Label>
-                <Input {...conform.input(branchName)} />
+                <Input {...getInputProps(branchName, { type: "text" })} />
                 <Hint>
                   Must not contain: spaces <InlineCode variant="extra-small">~</InlineCode>{" "}
                   <InlineCode variant="extra-small">^</InlineCode>{" "}
@@ -985,9 +987,9 @@ export function NewBranchPanel({
                   <InlineCode variant="extra-small">{"@{"}</InlineCode>{" "}
                   <InlineCode variant="extra-small">.lock</InlineCode>
                 </Hint>
-                <FormError id={branchName.errorId}>{branchName.error}</FormError>
+                <FormError id={branchName.errorId}>{branchName.errors}</FormError>
               </InputGroup>
-              <FormError>{form.error}</FormError>
+              <FormError>{form.errors}</FormError>
               <FormButtons
                 confirmButton={
                   <Button type="submit" variant="primary/medium">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
index e2b535a1892..db0cb0e4608 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useFieldList, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   ArrowDownIcon,
   EnvelopeIcon,
@@ -158,10 +158,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: FormSchema });
+  const submission = parseWithZod(formData, { schema: FormSchema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   if (submission.value.action === "allocate") {
@@ -176,13 +176,17 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
     );
 
     if (error) {
-      submission.error.environments = [error instanceof Error ? error.message : "Unknown error"];
-      return json(submission);
+      return json(
+        submission.reply({
+          fieldErrors: {
+            environments: [error instanceof Error ? error.message : "Unknown error"],
+          },
+        })
+      );
     }
 
     if (!result.success) {
-      submission.error.environments = [result.error];
-      return json(submission);
+      return json(submission.reply({ fieldErrors: { environments: [result.error] } }));
     }
 
     return redirectWithSuccessMessage(
@@ -195,12 +199,18 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   const currentPlan = await getCurrentPlan(project.organizationId);
   const purchaseBlockReason = getSelfServePurchaseBlockReason(currentPlan);
   if (purchaseBlockReason === "plan_unavailable") {
-    submission.error.amount = ["Unable to verify billing status. Please try again."];
-    return json(submission, { status: 503 });
+    return json(
+      submission.reply({
+        fieldErrors: { amount: ["Unable to verify billing status. Please try again."] },
+      }),
+      { status: 503 }
+    );
   }
   if (purchaseBlockReason === "managed_billing") {
-    submission.error.amount = ["Contact us to request more concurrency."];
-    return json(submission, { status: 403 });
+    return json(
+      submission.reply({ fieldErrors: { amount: ["Contact us to request more concurrency."] } }),
+      { status: 403 }
+    );
   }
 
   const service = new SetConcurrencyAddOnService();
@@ -215,13 +225,15 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   );
 
   if (error) {
-    submission.error.amount = [error instanceof Error ? error.message : "Unknown error"];
-    return json(submission);
+    return json(
+      submission.reply({
+        fieldErrors: { amount: [error instanceof Error ? error.message : "Unknown error"] },
+      })
+    );
   }
 
   if (!result.success) {
-    submission.error.amount = [result.error];
-    return json(submission);
+    return json(submission.reply({ fieldErrors: { amount: [result.error] } }));
   }
 
   return redirectWithSuccessMessage(
@@ -307,15 +319,16 @@ function Upgradable({
   maxQuota,
 }: ConcurrencyResult) {
   const lastSubmission = useActionData();
-  const [form, { environments: formEnvironments }] = useForm({
+  const [form, fields] = useForm({
     id: "allocate-concurrency",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: FormSchema });
+      return parseWithZod(formData, { schema: FormSchema });
     },
     shouldRevalidate: "onSubmit",
   });
+  const { environments: formEnvironments } = fields;
 
   const navigation = useNavigation();
   const isLoading = navigation.state !== "idle" && navigation.formMethod === "POST";
@@ -463,11 +476,9 @@ function Upgradable({
               </TableRow>
             </TableBody>
           </Table>
-          <FormError id={formEnvironments.id}>
-            {formEnvironments.error ?? formEnvironments.initialError?.[""]?.[0]}
-          </FormError>
+          <FormError id={formEnvironments.id}>{formEnvironments.errors}</FormError>
         </div>
-        <Form className="flex flex-col gap-2" method="post" {...form.props} id="allocate">
+        <Form className="flex flex-col gap-2" method="post" {...getFormProps(form)} id="allocate">
           <input type="hidden" name="action" value="allocate" />
           <div className="flex items-center pb-1">
             <Header3 className="grow">Concurrency allocation</Header3>
@@ -615,15 +626,16 @@ function PurchaseConcurrencyModal({
 }) {
   const showSelfServe = useShowSelfServe();
   const lastSubmission = useActionData();
-  const [form, { amount }] = useForm({
+  const [form, fields] = useForm({
     id: "purchase-concurrency",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: FormSchema });
+      return parseWithZod(formData, { schema: FormSchema });
     },
     shouldRevalidate: "onSubmit",
   });
+  const { amount } = fields;
 
   const [amountValue, setAmountValue] = useState(extraConcurrency);
   const navigation = useNavigation();
@@ -679,7 +691,7 @@ function PurchaseConcurrencyModal({
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>{title}</DialogHeader>
-        <Form method="post" {...form.props}>
+        <Form method="post" {...getFormProps(form)}>
           <div className="flex flex-col gap-4 pt-2">
             <Paragraph variant="base/bright" spacing>
               You can purchase bundles of {concurrencyPricing.stepSize} concurrency for{" "}
@@ -693,7 +705,7 @@ function PurchaseConcurrencyModal({
                   Total extra concurrency
                 </Label>
                 <InputNumberStepper
-                  {...conform.input(amount, { type: "number" })}
+                  {...getInputProps(amount, { type: "number" })}
                   step={concurrencyPricing.stepSize}
                   min={0}
                   max={undefined}
@@ -701,10 +713,8 @@ function PurchaseConcurrencyModal({
                   onChange={(e) => setAmountValue(Number(e.target.value))}
                   disabled={isLoading}
                 />
-                <FormError id={amount.errorId}>
-                  {amount.error ?? amount.initialError?.[""]?.[0]}
-                </FormError>
-                <FormError>{form.error}</FormError>
+                <FormError id={amount.errorId}>{amount.errors}</FormError>
+                <FormError>{form.errors}</FormError>
               </InputGroup>
             </Fieldset>
             {state === "need_to_increase_unallocated" ? (
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
index 06847acd1de..130d68031d0 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
@@ -1,12 +1,11 @@
 import {
-  type FieldConfig,
-  list,
-  requestIntent,
-  useFieldList,
-  useFieldset,
+  type FieldMetadata,
+  type FormMetadata,
+  getFormProps,
+  getInputProps,
   useForm,
 } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import {
   LockClosedIcon,
   LockOpenIcon,
@@ -17,7 +16,7 @@ import {
 import { Form, useActionData, useNavigate, useNavigation } from "@remix-run/react";
 import { json } from "@remix-run/server-runtime";
 import dotenv from "dotenv";
-import { type RefObject, useCallback, useRef, useState } from "react";
+import { useCallback, useState } from "react";
 import { redirect } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import { z } from "zod";
@@ -121,10 +120,10 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema });
+    const submission = parseWithZod(formData, { schema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     // Enforce env-tier write:envvars for every targeted environment, so a role
@@ -138,10 +137,15 @@ export const action = dashboardAction(
       (env) => !ability.can("write", { type: "envvars", envType: env.type })
     );
     if (hasDeniedEnvironment) {
-      submission.error.environmentIds = [
-        "You don't have permission to manage environment variables in one of the selected environments.",
-      ];
-      return json(submission);
+      return json(
+        submission.reply({
+          fieldErrors: {
+            environmentIds: [
+              "You don't have permission to manage environment variables in one of the selected environments.",
+            ],
+          },
+        })
+      );
     }
 
     const project = await prisma.project.findUnique({
@@ -160,8 +164,7 @@ export const action = dashboardAction(
       },
     });
     if (!project) {
-      submission.error.key = ["Project not found"];
-      return json(submission);
+      return json(submission.reply({ fieldErrors: { key: ["Project not found"] } }));
     }
 
     const repository = new EnvironmentVariablesRepository(prisma);
@@ -174,19 +177,20 @@ export const action = dashboardAction(
     });
 
     if (!result.success) {
+      const fieldErrors: Record<string, string[]> = {};
       if (result.variableErrors) {
         for (const { key, error } of result.variableErrors) {
           const index = submission.value.variables.findIndex((v) => v.key === key);
 
           if (index !== -1) {
-            submission.error[`variables[${index}].key`] = [error];
+            fieldErrors[`variables[${index}].key`] = [error];
           }
         }
       } else {
-        submission.error.variables = [result.error];
+        fieldErrors.variables = [result.error];
       }
 
-      return json(submission);
+      return json(submission.reply({ fieldErrors }));
     }
 
     return redirect(
@@ -229,18 +233,19 @@ export default function Page() {
 
   const isLoading = navigation.state !== "idle" && navigation.formMethod === "post";
 
-  const [form, { environmentIds, variables }] = useForm({
+  const [form, fields] = useForm<z.infer<typeof schema>>({
     id: "create-environment-variables",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
     defaultValue: {
       variables: [{ key: "", value: "" }],
     },
   });
+  const { environmentIds, variables } = fields;
 
   const handleEnvironmentChange = (
     environmentId: string,
@@ -294,7 +299,7 @@ export default function Page() {
     >
       <DialogContent className="p-0 pt-2.5 md:max-w-2xl lg:max-w-3xl">
         <DialogHeader className="px-4">New environment variables</DialogHeader>
-        <Form method="post" {...form.props}>
+        <Form method="post" {...getFormProps(form)}>
           <Fieldset className="max-h-[70vh] overflow-y-auto p-4 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
             <InputGroup fullWidth>
               <Label>Environments</Label>
@@ -390,7 +395,7 @@ export default function Page() {
                   </>
                 )}
               </div>
-              <FormError id={environmentIds.errorId}>{environmentIds.error}</FormError>
+              <FormError id={environmentIds.errorId}>{environmentIds.errors}</FormError>
               <Hint>
                 Dev environment variables specified here will be overridden by ones in your .env
                 file when running locally.
@@ -468,13 +473,13 @@ export default function Page() {
               <VariableFields
                 revealValues={revealAll}
                 formId={form.id}
-                formRef={form.ref}
+                form={form}
                 variablesFields={variables}
               />
-              <FormError id={variables.errorId}>{variables.error}</FormError>
+              <FormError id={variables.errorId}>{variables.errors}</FormError>
             </InputGroup>
 
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
           </Fieldset>
           <FormButtons
             className="px-4 pb-4"
@@ -522,12 +527,12 @@ function VariableFields({
   revealValues,
   formId,
   variablesFields,
-  formRef,
+  form,
 }: {
   revealValues: boolean;
   formId?: string;
-  variablesFields: FieldConfig<any>;
-  formRef: RefObject<HTMLFormElement>;
+  variablesFields: FieldMetadata<Variable[]>;
+  form: FormMetadata<any>;
 }) {
   const {
     items,
@@ -557,12 +562,12 @@ function VariableFields({
     update(index, firstPair);
 
     for (const pair of rest) {
-      requestIntent(formRef.current ?? undefined, list.append(variablesFields.name));
+      form.insert({ name: variablesFields.name });
     }
     insertAfter(index, rest);
   }, []);
 
-  const fields = useFieldList(formRef, variablesFields);
+  const fields = variablesFields.getFieldList();
 
   return (
     <>
@@ -578,10 +583,7 @@ function VariableFields({
             onChange={(value) => update(index, value)}
             onPaste={(e) => handlePaste(index, e)}
             onDelete={() => {
-              requestIntent(
-                formRef.current ?? undefined,
-                list.remove(variablesFields.name, { index })
-              );
+              form.remove({ name: variablesFields.name, index });
               remove(index);
             }}
             showDeleteButton={items.length > 1}
@@ -599,7 +601,7 @@ function VariableFields({
           className="w-fit"
           type="button"
           onClick={() => {
-            requestIntent(formRef.current ?? undefined, list.append(variablesFields.name));
+            form.insert({ name: variablesFields.name });
             append([{ key: "", value: "" }]);
           }}
           LeadingIcon={PlusIcon}
@@ -630,14 +632,13 @@ function VariableField({
   onDelete: () => void;
   showDeleteButton: boolean;
   showValue: boolean;
-  config: FieldConfig<Variable>;
+  config: FieldMetadata<Variable>;
 }) {
-  const ref = useRef<HTMLFieldSetElement>(null);
-  const fields = useFieldset(ref, config);
+  const fields = config.getFieldset();
   const baseFieldName = `variables[${index}]`;
 
   return (
-    <fieldset ref={ref}>
+    <fieldset>
       <FieldLayout>
         <div className="space-y-2">
           <Input
@@ -649,7 +650,7 @@ function VariableField({
             autoFocus={index === 0}
             onPaste={onPaste}
           />
-          <FormError id={fields.key.errorId}>{fields.key.error}</FormError>
+          <FormError id={fields.key.errorId}>{fields.key.errors}</FormError>
         </div>
         <div className={cn("flex items-start gap-1")}>
           <div className="grow space-y-2">
@@ -661,7 +662,7 @@ function VariableField({
               value={value.value}
               onChange={(e) => onChange({ ...value, value: e.currentTarget.value })}
             />
-            <FormError id={fields.value.errorId}>{fields.value.error}</FormError>
+            <FormError id={fields.value.errorId}>{fields.value.errors}</FormError>
           </div>
           {showDeleteButton && (
             <Button
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
index d59d1c40b73..afea881feb1 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   BookOpenIcon,
   InformationCircleIcon,
@@ -222,10 +222,10 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema });
+    const submission = parseWithZod(formData, { schema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     // Enforce env-tier write:envvars on the targeted environment, so a role
@@ -240,10 +240,13 @@ export const action = dashboardAction(
             })
           )?.type;
     if (targetEnvType && !ability.can("write", { type: "envvars", envType: targetEnvType })) {
-      submission.error.key = [
-        "You don't have permission to manage environment variables in this environment.",
-      ];
-      return json(submission);
+      return json(
+        submission.reply({
+          formErrors: [
+            "You don't have permission to manage environment variables in this environment.",
+          ],
+        })
+      );
     }
 
     const project = await prisma.project.findUnique({
@@ -262,8 +265,7 @@ export const action = dashboardAction(
       },
     });
     if (!project) {
-      submission.error.key = ["Project not found"];
-      return json(submission);
+      return json(submission.reply({ formErrors: ["Project not found"] }));
     }
 
     switch (submission.value.action) {
@@ -278,19 +280,17 @@ export const action = dashboardAction(
         });
 
         if (!result.success) {
-          submission.error.key = [result.error];
-          return json(submission);
+          return json(submission.reply({ formErrors: [result.error] }));
         }
 
-        return json({ ...submission, success: true });
+        return json({ ...submission.reply(), success: true });
       }
       case "delete": {
         const repository = new EnvironmentVariablesRepository(prisma);
         const result = await repository.deleteValue(project.id, submission.value);
 
         if (!result.success) {
-          submission.error.key = [result.error];
-          return json(submission);
+          return json(submission.reply({ formErrors: [result.error] }));
         }
 
         // Clean up syncEnvVarsMapping if Vercel integration exists (best-effort)
@@ -334,8 +334,7 @@ export const action = dashboardAction(
         const integration = await vercelService.getVercelProjectIntegration(project.id);
 
         if (!integration) {
-          submission.error.key = ["Vercel integration not found"];
-          return json(submission);
+          return json(submission.reply({ formErrors: ["Vercel integration not found"] }));
         }
 
         // Update the sync mapping for the specific env var and environment
@@ -789,9 +788,9 @@ function EditEnvironmentVariablePanel({
   const [form, { id, environmentId, value }] = useForm({
     id: `edit-environment-variable-${variable.id}-${variable.environment.id}`,
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
   });
@@ -808,15 +807,15 @@ function EditEnvironmentVariablePanel({
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>Edit environment variable</DialogHeader>
-        <fetcher.Form method="post" {...form.props}>
+        <fetcher.Form method="post" {...getFormProps(form)}>
           <input type="hidden" name="action" value="edit" />
-          <input {...conform.input(id, { type: "hidden" })} value={variable.id} />
+          <input {...getInputProps(id, { type: "hidden" })} value={variable.id} />
           <input
-            {...conform.input(environmentId, { type: "hidden" })}
+            {...getInputProps(environmentId, { type: "hidden" })}
             value={variable.environment.id}
           />
-          <FormError id={id.errorId}>{id.error}</FormError>
-          <FormError id={environmentId.errorId}>{environmentId.error}</FormError>
+          <FormError id={id.errorId}>{id.errors}</FormError>
+          <FormError id={environmentId.errorId}>{environmentId.errors}</FormError>
           <Fieldset>
             <InputGroup fullWidth className="mt-2 gap-0">
               <Label>Key</Label>
@@ -831,15 +830,15 @@ function EditEnvironmentVariablePanel({
             <InputGroup fullWidth>
               <Label>Value</Label>
               <Input
-                {...conform.input(value, { type: "text" })}
+                {...getInputProps(value, { type: "text" })}
                 placeholder={variable.isSecret ? "Set new secret value" : "Not set"}
                 defaultValue={variable.value}
                 type={"text"}
               />
-              <FormError id={value.errorId}>{value.error}</FormError>
+              <FormError id={value.errorId}>{value.errors}</FormError>
             </InputGroup>
 
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
 
             <FormButtons
               confirmButton={
@@ -873,18 +872,18 @@ function DeleteEnvironmentVariableButton({
     navigation.formMethod === "post" &&
     navigation.formData?.get("action") === "delete";
 
-  const [form, { id }] = useForm({
+  const [form] = useForm({
     id: "delete-environment-variable",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
   });
 
   return (
-    <Form method="post" {...form.props}>
+    <Form method="post" {...getFormProps(form)}>
       <input type="hidden" name="id" value={variable.id} />
       <input type="hidden" name="key" value={variable.key} />
       <input type="hidden" name="environmentId" value={variable.environment.id} />
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
index a84e445539d..d9cd3b8f006 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { BellAlertIcon } from "@heroicons/react/20/solid";
 import { type MetaFunction, useFetcher, useRevalidator } from "@remix-run/react";
 import { type ActionFunctionArgs, json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
@@ -140,10 +140,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: actionSchema });
+  const submission = parseWithZod(formData, { schema: actionSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const actions = new ErrorGroupActions();
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
index dd9a5f6d593..3ffe35908a5 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { Outlet, useNavigate } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { useCallback } from "react";
@@ -79,10 +79,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: ErrorAlertsFormSchema });
+  const submission = parseWithZod(formData, { schema: ErrorAlertsFormSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const { emails, webhooks, slackChannel, slackIntegrationId } = submission.value;
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
index 2407d308fee..cd433467c77 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { useLocation } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
@@ -69,10 +69,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
     v3ScheduleParams.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   // `_format=json` → return JSON instead of redirecting; caller stays put.
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
index d66bdb0e0da..ff106157a5a 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod";
 import { ExclamationTriangleIcon, FolderIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { type ActionFunction, json } from "@remix-run/server-runtime";
@@ -44,7 +44,7 @@ function createSchema(
         if (constraints.getSlugMatch === undefined) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: conform.VALIDATION_UNDEFINED,
+            message: conformZodMessage.VALIDATION_UNDEFINED,
           });
         } else {
           const { isMatch, projectSlug } = constraints.getSlugMatch(slug);
@@ -76,10 +76,10 @@ export const action: ActionFunction = async ({ request, params }) => {
       return { isMatch: slug === projectParam, projectSlug: projectParam };
     },
   });
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const projectSettingsService = new ProjectSettingsService();
@@ -162,10 +162,10 @@ export default function GeneralSettingsPage() {
   const [renameForm, { projectName }] = useForm({
     id: "rename-project",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: createSchema(),
       });
     },
@@ -178,11 +178,11 @@ export default function GeneralSettingsPage() {
   const [deleteForm, { projectSlug }] = useForm({
     id: "delete-project",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     shouldValidate: "onInput",
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: createSchema({
           getSlugMatch: (slug) => ({ isMatch: slug === project.slug, projectSlug: project.slug }),
         }),
@@ -212,12 +212,12 @@ export default function GeneralSettingsPage() {
                 </Hint>
               </InputGroup>
             </Fieldset>
-            <Form method="post" {...renameForm.props}>
+            <Form method="post" {...getFormProps(renameForm)}>
               <Fieldset>
                 <InputGroup fullWidth>
                   <Label htmlFor={projectName.id}>Project name</Label>
                   <Input
-                    {...conform.input(projectName, { type: "text" })}
+                    {...getInputProps(projectName, { type: "text" })}
                     defaultValue={project.name}
                     placeholder="Project name"
                     icon={FolderIcon}
@@ -226,7 +226,7 @@ export default function GeneralSettingsPage() {
                       setHasRenameFormChanges(e.target.value !== project.name);
                     }}
                   />
-                  <FormError id={projectName.errorId}>{projectName.error}</FormError>
+                  <FormError id={projectName.errorId}>{projectName.errors}</FormError>
                 </InputGroup>
                 <FormButtons
                   confirmButton={
@@ -250,18 +250,18 @@ export default function GeneralSettingsPage() {
         <div>
           <Header2 spacing>Danger zone</Header2>
           <div className="w-full rounded-sm border border-rose-500/40 p-4">
-            <Form method="post" {...deleteForm.props}>
+            <Form method="post" {...getFormProps(deleteForm)}>
               <Fieldset>
                 <InputGroup fullWidth>
                   <Label htmlFor={projectSlug.id}>Delete project</Label>
                   <Input
-                    {...conform.input(projectSlug, { type: "text" })}
+                    {...getInputProps(projectSlug, { type: "text" })}
                     placeholder="Your project slug"
                     icon={ExclamationTriangleIcon}
                     onChange={(e) => setDeleteInputValue(e.target.value)}
                   />
-                  <FormError id={projectSlug.errorId}>{projectSlug.error}</FormError>
-                  <FormError>{deleteForm.error}</FormError>
+                  <FormError id={projectSlug.errorId}>{projectSlug.errors}</FormError>
+                  <FormError>{deleteForm.errors}</FormError>
                   <Hint>
                     This change is irreversible, so please be certain. Type in the Project slug
                     <InlineCode variant="extra-small">{project.slug}</InlineCode> and then press
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
index 66bf300e002..6fc8d2f8b6d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { json } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData, useTypedFetcher } from "remix-typedjson";
@@ -152,10 +152,10 @@ export const action = dashboardAction(
     const { organizationSlug, projectParam } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: UpdateBuildSettingsFormSchema });
+    const submission = parseWithZod(formData, { schema: UpdateBuildSettingsFormSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     const projectSettingsService = new ProjectSettingsService();
@@ -445,10 +445,10 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
 
   const [buildSettingsForm, fields] = useForm({
     id: "update-build-settings",
-    lastSubmission: lastSubmission,
+    lastResult: lastSubmission,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: UpdateBuildSettingsFormSchema,
       });
     },
@@ -459,12 +459,12 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
     (navigation.state === "submitting" || navigation.state === "loading");
 
   return (
-    <Form method="post" {...buildSettingsForm.props}>
+    <Form method="post" {...getFormProps(buildSettingsForm)}>
       <Fieldset>
         <InputGroup fullWidth>
           <Label htmlFor={fields.triggerConfigFilePath.id}>Trigger config file</Label>
           <Input
-            {...conform.input(fields.triggerConfigFilePath, { type: "text" })}
+            {...getInputProps(fields.triggerConfigFilePath, { type: "text" })}
             defaultValue={buildSettings?.triggerConfigFilePath || ""}
             placeholder="trigger.config.ts"
             onChange={(e) => {
@@ -478,14 +478,14 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
             Path to your Trigger configuration file, relative to the root directory of your repo.
           </Hint>
           <FormError id={fields.triggerConfigFilePath.errorId}>
-            {fields.triggerConfigFilePath.error}
+            {fields.triggerConfigFilePath.errors}
           </FormError>
         </InputGroup>
 
         <InputGroup fullWidth>
           <Label htmlFor={fields.installCommand.id}>Install command</Label>
           <Input
-            {...conform.input(fields.installCommand, { type: "text" })}
+            {...getInputProps(fields.installCommand, { type: "text" })}
             defaultValue={buildSettings?.installCommand || ""}
             placeholder="e.g., `npm install`, `pnpm install`, or `bun install`"
             onChange={(e) => {
@@ -499,12 +499,12 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
             Command to install your project dependencies. This will be run from the root directory
             of your repo. Auto-detected by default.
           </Hint>
-          <FormError id={fields.installCommand.errorId}>{fields.installCommand.error}</FormError>
+          <FormError id={fields.installCommand.errorId}>{fields.installCommand.errors}</FormError>
         </InputGroup>
         <InputGroup fullWidth>
           <Label htmlFor={fields.preBuildCommand.id}>Pre-build command</Label>
           <Input
-            {...conform.input(fields.preBuildCommand, { type: "text" })}
+            {...getInputProps(fields.preBuildCommand, { type: "text" })}
             defaultValue={buildSettings?.preBuildCommand || ""}
             placeholder="e.g., `npm run prisma:generate`"
             onChange={(e) => {
@@ -518,13 +518,12 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
             Any command that needs to run before we build and deploy your project. This will be run
             from the root directory of your repo.
           </Hint>
-          <FormError id={fields.preBuildCommand.errorId}>{fields.preBuildCommand.error}</FormError>
+          <FormError id={fields.preBuildCommand.errorId}>{fields.preBuildCommand.errors}</FormError>
         </InputGroup>
         <div className="border-t border-grid-dimmed pt-4">
           <InputGroup>
             <CheckboxWithLabel
-              id={fields.useNativeBuildServer.id}
-              {...conform.input(fields.useNativeBuildServer, { type: "checkbox" })}
+              {...getInputProps(fields.useNativeBuildServer, { type: "checkbox" })}
               label="Use native build server"
               variant="simple/small"
               defaultChecked={buildSettings?.useNativeBuildServer || false}
@@ -540,11 +539,11 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
               default in the future. Version 4.2.0 or newer is required.
             </Hint>
             <FormError id={fields.useNativeBuildServer.errorId}>
-              {fields.useNativeBuildServer.error}
+              {fields.useNativeBuildServer.errors}
             </FormError>
           </InputGroup>
         </div>
-        <FormError>{buildSettingsForm.error}</FormError>
+        <FormError>{buildSettingsForm.errors}</FormError>
         <FormButtons
           confirmButton={
             <Button
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
index 00dcb37f4e5..64842ca692f 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import {
   CheckCircleIcon,
   RectangleStackIcon,
@@ -160,10 +160,10 @@ export const action: ActionFunction = async ({ request, params }) => {
 
   switch (formAction) {
     case "create-template": {
-      const submission = parse(formData, { schema: RunTemplateData });
-      if (!submission.value) {
+      const submission = parseWithZod(formData, { schema: RunTemplateData });
+      if (submission.status !== "success") {
         return json({
-          ...submission,
+          ...submission.reply(),
           formAction,
         });
       }
@@ -173,7 +173,7 @@ export const action: ActionFunction = async ({ request, params }) => {
         const template = await templateService.call(environment, submission.value);
 
         return json({
-          ...submission,
+          ...submission.reply(),
           success: true,
           templateLabel: template.label,
           formAction,
@@ -184,11 +184,11 @@ export const action: ActionFunction = async ({ request, params }) => {
       }
     }
     case "delete-template": {
-      const submission = parse(formData, { schema: DeleteTaskRunTemplateData });
+      const submission = parseWithZod(formData, { schema: DeleteTaskRunTemplateData });
 
-      if (!submission.value) {
+      if (submission.status !== "success") {
         return json({
-          ...submission,
+          ...submission.reply(),
           formAction,
         });
       }
@@ -198,7 +198,7 @@ export const action: ActionFunction = async ({ request, params }) => {
         await deleteService.call(environment, submission.value.templateId);
 
         return json({
-          ...submission,
+          ...submission.reply(),
           success: true,
           formAction,
         });
@@ -209,11 +209,11 @@ export const action: ActionFunction = async ({ request, params }) => {
     }
     case "run-scheduled":
     case "run-standard": {
-      const submission = parse(formData, { schema: TestTaskData });
+      const submission = parseWithZod(formData, { schema: TestTaskData });
 
-      if (!submission.value) {
+      if (submission.status !== "success") {
         return json({
-          ...submission,
+          ...submission.reply(),
           formAction,
         });
       }
@@ -430,50 +430,48 @@ function StandardTaskForm({
 
   const [showTemplateCreatedSuccessMessage, setShowTemplateCreatedSuccessMessage] = useState(false);
 
-  const [
-    form,
-    {
-      environmentId,
-      payload,
-      metadata,
-      taskIdentifier,
-      delaySeconds,
-      ttlSeconds,
-      idempotencyKey,
-      idempotencyKeyTTLSeconds,
-      queue,
-      concurrencyKey,
-      maxAttempts,
-      maxDurationSeconds,
-      triggerSource,
-      tags,
-      version,
-      machine,
-      region,
-      prioritySeconds,
-    },
-  ] = useForm({
+  const [form, fields] = useForm({
     id: "test-task",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onSubmit(event, { formData }) {
       event.preventDefault();
 
-      formData.set(payload.name, currentPayloadJson.current);
-      formData.set(metadata.name, currentMetadataJson.current);
+      formData.set(fields.payload.name, currentPayloadJson.current);
+      formData.set(fields.metadata.name, currentMetadataJson.current);
 
       submit(formData, { method: "POST" });
     },
     onValidate({ formData }) {
-      return parse(formData, { schema: TestTaskData });
+      return parseWithZod(formData, { schema: TestTaskData });
     },
   });
+  const {
+    environmentId,
+    payload,
+    metadata,
+    taskIdentifier,
+    delaySeconds,
+    ttlSeconds,
+    idempotencyKey,
+    idempotencyKeyTTLSeconds,
+    queue,
+    concurrencyKey,
+    maxAttempts,
+    maxDurationSeconds,
+    triggerSource,
+    tags,
+    version,
+    machine,
+    region,
+    prioritySeconds,
+  } = fields;
 
   return (
-    <Form className="flex h-full max-h-full flex-col" method="post" {...form.props}>
-      <input {...conform.input(taskIdentifier, { type: "hidden" })} value={task.taskIdentifier} />
-      <input {...conform.input(environmentId, { type: "hidden" })} value={environment.id} />
-      <input {...conform.input(triggerSource, { type: "hidden" })} value={"STANDARD"} />
+    <Form className="flex h-full max-h-full flex-col" method="post" {...getFormProps(form)}>
+      <input {...getInputProps(taskIdentifier, { type: "hidden" })} value={task.taskIdentifier} />
+      <input {...getInputProps(environmentId, { type: "hidden" })} value={environment.id} />
+      <input {...getInputProps(triggerSource, { type: "hidden" })} value={"STANDARD"} />
       <div className="flex items-center justify-between gap-1.5 border-b border-grid-bright p-2">
         <div className="flex items-center gap-1.5">
           <TaskTriggerSourceIcon source={"STANDARD"} />
@@ -578,7 +576,7 @@ function StandardTaskForm({
                     Machine
                   </Label>
                   <Select
-                    {...conform.select(machine)}
+                    {...getSelectProps(machine)}
                     variant="tertiary/small"
                     placeholder="Select machine type"
                     dropdownIcon
@@ -597,14 +595,14 @@ function StandardTaskForm({
                     ))}
                   </Select>
                   <Hint>Overrides the machine preset.</Hint>
-                  <FormError id={machine.errorId}>{machine.error}</FormError>
+                  <FormError id={machine.errorId}>{machine.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label htmlFor={version.id} variant="small">
                     Version
                   </Label>
                   <Select
-                    {...conform.select(version)}
+                    {...getSelectProps(version)}
                     defaultValue="latest"
                     variant="tertiary/small"
                     placeholder="Select version"
@@ -624,7 +622,7 @@ function StandardTaskForm({
                   ) : (
                     <Hint>Runs task on a specific version.</Hint>
                   )}
-                  <FormError id={version.errorId}>{version.error}</FormError>
+                  <FormError id={version.errorId}>{version.errors}</FormError>
                 </InputGroup>
                 {regionItems.length > 1 && (
                   <InputGroup>
@@ -636,8 +634,8 @@ function StandardTaskForm({
                         switching environments. The key forces a remount so it reinitializes
                         with the correct defaultValue. */}
                     <Select
+                      {...getSelectProps(region)}
                       key={`region-${environment.id}`}
-                      {...conform.select(region)}
                       variant="tertiary/small"
                       placeholder={isDev ? "–" : undefined}
                       dropdownIcon
@@ -666,7 +664,7 @@ function StandardTaskForm({
                     ) : (
                       <Hint>Overrides the region for this run.</Hint>
                     )}
-                    <FormError id={region.errorId}>{region.error}</FormError>
+                    <FormError id={region.errorId}>{region.errors}</FormError>
                   </InputGroup>
                 )}
                 <InputGroup>
@@ -675,7 +673,7 @@ function StandardTaskForm({
                   </Label>
                   {allowArbitraryQueues ? (
                     <Input
-                      {...conform.input(queue, { type: "text" })}
+                      {...getInputProps(queue, { type: "text" })}
                       variant="small"
                       value={queueValue ?? ""}
                       onChange={(e) => setQueueValue(e.target.value)}
@@ -721,7 +719,7 @@ function StandardTaskForm({
                     </Select>
                   )}
                   <Hint>Assign run to a specific queue.</Hint>
-                  <FormError id={queue.errorId}>{queue.error}</FormError>
+                  <FormError id={queue.errorId}>{queue.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label htmlFor={tags.id} variant="small">
@@ -735,14 +733,14 @@ function StandardTaskForm({
                     onTagsChange={setTagsValue}
                   />
                   <Hint>Add tags to easily filter runs.</Hint>
-                  <FormError id={tags.errorId}>{tags.error}</FormError>
+                  <FormError id={tags.errorId}>{tags.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label htmlFor={maxAttempts.id} variant="small">
                     Max attempts
                   </Label>
                   <Input
-                    {...conform.input(maxAttempts, { type: "number" })}
+                    {...getInputProps(maxAttempts, { type: "number" })}
                     className="[&::-webkit-inner-spin-button]:appearance-none"
                     variant="small"
                     min={1}
@@ -764,7 +762,7 @@ function StandardTaskForm({
                     }}
                   />
                   <Hint>Retries failed runs up to the specified number of attempts.</Hint>
-                  <FormError id={maxAttempts.errorId}>{maxAttempts.error}</FormError>
+                  <FormError id={maxAttempts.errorId}>{maxAttempts.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label variant="small">Max duration</Label>
@@ -775,14 +773,14 @@ function StandardTaskForm({
                     onChange={setMaxDurationValue}
                   />
                   <Hint>Overrides the maximum compute time limit for the run.</Hint>
-                  <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.error}</FormError>
+                  <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label htmlFor={idempotencyKey.id} variant="small">
                     Idempotency key
                   </Label>
-                  <Input {...conform.input(idempotencyKey, { type: "text" })} variant="small" />
-                  <FormError id={idempotencyKey.errorId}>{idempotencyKey.error}</FormError>
+                  <Input {...getInputProps(idempotencyKey, { type: "text" })} variant="small" />
+                  <FormError id={idempotencyKey.errorId}>{idempotencyKey.errors}</FormError>
                   <Hint>
                     Specify an idempotency key to ensure that a task is only triggered once with the
                     same key.
@@ -796,7 +794,7 @@ function StandardTaskForm({
                   />
                   <Hint>Keys expire after 30 days by default.</Hint>
                   <FormError id={idempotencyKeyTTLSeconds.errorId}>
-                    {idempotencyKeyTTLSeconds.error}
+                    {idempotencyKeyTTLSeconds.errors}
                   </FormError>
                 </InputGroup>
                 <InputGroup>
@@ -804,7 +802,7 @@ function StandardTaskForm({
                     Concurrency key
                   </Label>
                   <Input
-                    {...conform.input(concurrencyKey, { type: "text" })}
+                    {...getInputProps(concurrencyKey, { type: "text" })}
                     variant="small"
                     value={concurrencyKeyValue ?? ""}
                     onChange={(e) => setConcurrencyKeyValue(e.target.value)}
@@ -812,19 +810,19 @@ function StandardTaskForm({
                   <Hint>
                     Limits concurrency by creating a separate queue for each value of the key.
                   </Hint>
-                  <FormError id={concurrencyKey.errorId}>{concurrencyKey.error}</FormError>
+                  <FormError id={concurrencyKey.errorId}>{concurrencyKey.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label variant="small">Delay</Label>
                   <DurationPicker name={delaySeconds.name} id={delaySeconds.id} />
                   <Hint>Delays run by a specific duration.</Hint>
-                  <FormError id={delaySeconds.errorId}>{delaySeconds.error}</FormError>
+                  <FormError id={delaySeconds.errorId}>{delaySeconds.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label variant="small">Priority</Label>
                   <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
                   <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
-                  <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+                  <FormError id={prioritySeconds.errorId}>{prioritySeconds.errors}</FormError>
                 </InputGroup>
                 <InputGroup>
                   <Label variant="small">TTL</Label>
@@ -835,9 +833,9 @@ function StandardTaskForm({
                     onChange={setTtlValue}
                   />
                   <Hint>Expires the run if it hasn't started within the TTL.</Hint>
-                  <FormError id={ttlSeconds.errorId}>{ttlSeconds.error}</FormError>
+                  <FormError id={ttlSeconds.errorId}>{ttlSeconds.errors}</FormError>
                 </InputGroup>
-                <FormError>{form.error}</FormError>
+                <FormError>{form.errors}</FormError>
               </Fieldset>
             }
             aiContent={
@@ -1005,9 +1003,9 @@ function ScheduledTaskForm({
   ] = useForm({
     id: "test-task-scheduled",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: TestTaskData });
+      return parseWithZod(formData, { schema: TestTaskData });
     },
   });
 
@@ -1015,21 +1013,18 @@ function ScheduledTaskForm({
     <Form
       className="grid h-full max-h-full grid-rows-[1fr_auto]"
       method="post"
-      {...form.props}
+      {...getFormProps(form)}
     >
       <input
-        type="hidden"
-        {...conform.input(triggerSource, { type: "hidden" })}
+        {...getInputProps(triggerSource, { type: "hidden" })}
         value={"SCHEDULED"}
       />
       <input
-        type="hidden"
-        {...conform.input(taskIdentifier, { type: "hidden" })}
+        {...getInputProps(taskIdentifier, { type: "hidden" })}
         value={task.taskIdentifier}
       />
       <input
-        type="hidden"
-        {...conform.input(environmentId, { type: "hidden" })}
+        {...getInputProps(environmentId, { type: "hidden" })}
         value={environment.id}
       />
       {/* Main area: scrolling form with the toolbar floating on top-right in the same grid cell */}
@@ -1046,8 +1041,7 @@ function ScheduledTaskForm({
                 Timestamp UTC
               </Label>
               <input
-                type="hidden"
-                {...conform.input(timestamp, { type: "hidden" })}
+                {...getInputProps(timestamp, { type: "hidden" })}
                 value={timestampValue?.toISOString() ?? ""}
               />
               <DateField
@@ -1062,15 +1056,14 @@ function ScheduledTaskForm({
               <Hint>
                 This is the timestamp of the CRON, it will come through to your run in the payload.
               </Hint>
-              <FormError id={timestamp.errorId}>{timestamp.error}</FormError>
+              <FormError id={timestamp.errorId}>{timestamp.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={lastTimestamp.id} variant="small">
                 Last timestamp UTC
               </Label>
               <input
-                type="hidden"
-                {...conform.input(lastTimestamp, { type: "hidden" })}
+                {...getInputProps(lastTimestamp, { type: "hidden" })}
                 value={lastTimestampValue?.toISOString() ?? ""}
               />
               <DateField
@@ -1087,14 +1080,14 @@ function ScheduledTaskForm({
                 This is the timestamp of the previous run. You can use this in your code to find new
                 data since the previous run.
               </Hint>
-              <FormError id={lastTimestamp.errorId}>{lastTimestamp.error}</FormError>
+              <FormError id={lastTimestamp.errorId}>{lastTimestamp.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={timezone.id} variant="small">
                 Timezone
               </Label>
               <Select
-                {...conform.select(timezone)}
+                {...getSelectProps(timezone)}
                 placeholder="Select a timezone"
                 defaultValue={timezoneValue}
                 value={timezoneValue}
@@ -1113,14 +1106,14 @@ function ScheduledTaskForm({
                 The Timestamp and Last timestamp are in UTC so this just changes the timezone string
                 that comes through in the payload.
               </Hint>
-              <FormError id={timezone.errorId}>{timezone.error}</FormError>
+              <FormError id={timezone.errorId}>{timezone.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={externalId.id} variant="small">
                 External ID
               </Label>
               <Input
-                {...conform.input(externalId, { type: "text" })}
+                {...getInputProps(externalId, { type: "text" })}
                 placeholder="Optionally specify your own ID, e.g. user id"
                 value={externalIdValue ?? ""}
                 onChange={(e) => setExternalIdValue(e.target.value)}
@@ -1131,7 +1124,7 @@ function ScheduledTaskForm({
                 run function of your task.{" "}
                 <TextLink to={docsPath("v3/tasks-scheduled")}>Read the docs.</TextLink>
               </Hint>
-              <FormError id={externalId.errorId}>{externalId.error}</FormError>
+              <FormError id={externalId.errorId}>{externalId.errors}</FormError>
             </InputGroup>
             <div className="w-full border-b border-grid-bright" />
             <Hint>
@@ -1143,7 +1136,7 @@ function ScheduledTaskForm({
                 Machine
               </Label>
               <Select
-                {...conform.select(machine)}
+                {...getSelectProps(machine)}
                 variant="tertiary/small"
                 placeholder="Select machine type"
                 dropdownIcon
@@ -1162,14 +1155,14 @@ function ScheduledTaskForm({
                 ))}
               </Select>
               <Hint>Overrides the machine preset.</Hint>
-              <FormError id={machine.errorId}>{machine.error}</FormError>
+              <FormError id={machine.errorId}>{machine.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={version.id} variant="small">
                 Version
               </Label>
               <Select
-                {...conform.select(version)}
+                {...getSelectProps(version)}
                 defaultValue="latest"
                 variant="tertiary/small"
                 placeholder="Select version"
@@ -1187,7 +1180,7 @@ function ScheduledTaskForm({
               ) : (
                 <Hint>Runs task on a specific version.</Hint>
               )}
-              <FormError id={version.errorId}>{version.error}</FormError>
+              <FormError id={version.errorId}>{version.errors}</FormError>
             </InputGroup>
             {regionItems.length > 1 && (
               <InputGroup>
@@ -1199,8 +1192,8 @@ function ScheduledTaskForm({
                   switching environments. The key forces a remount so it reinitializes
                   with the correct defaultValue. */}
                 <Select
+                  {...getSelectProps(region)}
                   key={`region-${environment.id}`}
-                  {...conform.select(region)}
                   variant="tertiary/small"
                   placeholder={isDev ? "–" : undefined}
                   dropdownIcon
@@ -1229,7 +1222,7 @@ function ScheduledTaskForm({
                 ) : (
                   <Hint>Overrides the region for this run.</Hint>
                 )}
-                <FormError id={region.errorId}>{region.error}</FormError>
+                <FormError id={region.errorId}>{region.errors}</FormError>
               </InputGroup>
             )}
             <InputGroup>
@@ -1238,7 +1231,7 @@ function ScheduledTaskForm({
               </Label>
               {allowArbitraryQueues ? (
                 <Input
-                  {...conform.input(queue, { type: "text" })}
+                  {...getInputProps(queue, { type: "text" })}
                   variant="small"
                   value={queueValue ?? ""}
                   onChange={(e) => setQueueValue(e.target.value)}
@@ -1284,7 +1277,7 @@ function ScheduledTaskForm({
                 </Select>
               )}
               <Hint>Assign run to a specific queue.</Hint>
-              <FormError id={queue.errorId}>{queue.error}</FormError>
+              <FormError id={queue.errorId}>{queue.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={tags.id} variant="small">
@@ -1298,14 +1291,14 @@ function ScheduledTaskForm({
                 onTagsChange={setTagsValue}
               />
               <Hint>Add tags to easily filter runs.</Hint>
-              <FormError id={tags.errorId}>{tags.error}</FormError>
+              <FormError id={tags.errorId}>{tags.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={maxAttempts.id} variant="small">
                 Max attempts
               </Label>
               <Input
-                {...conform.input(maxAttempts, { type: "number" })}
+                {...getInputProps(maxAttempts, { type: "number" })}
                 className="[&::-webkit-inner-spin-button]:appearance-none"
                 variant="small"
                 min={1}
@@ -1327,7 +1320,7 @@ function ScheduledTaskForm({
                 }}
               />
               <Hint>Retries failed runs up to the specified number of attempts.</Hint>
-              <FormError id={maxAttempts.errorId}>{maxAttempts.error}</FormError>
+              <FormError id={maxAttempts.errorId}>{maxAttempts.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={maxDurationSeconds.id} variant="small">
@@ -1340,14 +1333,14 @@ function ScheduledTaskForm({
                 onChange={setMaxDurationValue}
               />
               <Hint>Overrides the maximum compute time limit for the run.</Hint>
-              <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.error}</FormError>
+              <FormError id={maxDurationSeconds.errorId}>{maxDurationSeconds.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={idempotencyKey.id} variant="small">
                 Idempotency key
               </Label>
-              <Input {...conform.input(idempotencyKey, { type: "text" })} variant="small" />
-              <FormError id={idempotencyKey.errorId}>{idempotencyKey.error}</FormError>
+              <Input {...getInputProps(idempotencyKey, { type: "text" })} variant="small" />
+              <FormError id={idempotencyKey.errorId}>{idempotencyKey.errors}</FormError>
               <Hint>
                 Specify an idempotency key to ensure that a task is only triggered once with the
                 same key.
@@ -1363,7 +1356,7 @@ function ScheduledTaskForm({
               />
               <Hint>Keys expire after 30 days by default.</Hint>
               <FormError id={idempotencyKeyTTLSeconds.errorId}>
-                {idempotencyKeyTTLSeconds.error}
+                {idempotencyKeyTTLSeconds.errors}
               </FormError>
             </InputGroup>
             <InputGroup>
@@ -1371,7 +1364,7 @@ function ScheduledTaskForm({
                 Concurrency key
               </Label>
               <Input
-                {...conform.input(concurrencyKey, { type: "text" })}
+                {...getInputProps(concurrencyKey, { type: "text" })}
                 variant="small"
                 value={concurrencyKeyValue ?? ""}
                 onChange={(e) => setConcurrencyKeyValue(e.target.value)}
@@ -1379,7 +1372,7 @@ function ScheduledTaskForm({
               <Hint>
                 Limits concurrency by creating a separate queue for each value of the key.
               </Hint>
-              <FormError id={concurrencyKey.errorId}>{concurrencyKey.error}</FormError>
+              <FormError id={concurrencyKey.errorId}>{concurrencyKey.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={prioritySeconds.id} variant="small">
@@ -1387,7 +1380,7 @@ function ScheduledTaskForm({
               </Label>
               <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
               <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
-              <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+              <FormError id={prioritySeconds.errorId}>{prioritySeconds.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label htmlFor={ttlSeconds.id} variant="small">
@@ -1400,7 +1393,7 @@ function ScheduledTaskForm({
                 onChange={setTtlValue}
               />
               <Hint>Expires the run if it hasn't started within the TTL.</Hint>
-              <FormError id={ttlSeconds.errorId}>{ttlSeconds.error}</FormError>
+              <FormError id={ttlSeconds.errorId}>{ttlSeconds.errors}</FormError>
             </InputGroup>
           </Fieldset>
           </div>
@@ -1579,7 +1572,7 @@ function RunTemplatesPopover({
   const [deleteForm, { templateId }] = useForm({
     id: "delete-template",
     onValidate({ formData }) {
-      return parse(formData, { schema: DeleteTaskRunTemplateData });
+      return parseWithZod(formData, { schema: DeleteTaskRunTemplateData });
     },
   });
 
@@ -1695,9 +1688,9 @@ function RunTemplatesPopover({
             >
               Cancel
             </Button>
-            <Form method="post" {...deleteForm.props}>
+            <Form method="post" {...getFormProps(deleteForm)}>
               <input
-                {...conform.input(templateId, { type: "hidden" })}
+                {...getInputProps(templateId, { type: "hidden" })}
                 value={templateIdToDelete || ""}
               />
               <Button
@@ -1790,7 +1783,7 @@ function CreateTemplateModal({
     },
   ] = useForm({
     id: "save-template",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onSubmit(event, { formData }) {
       event.preventDefault();
 
@@ -1800,7 +1793,7 @@ function CreateTemplateModal({
       submit(formData, { method: "POST" });
     },
     onValidate({ formData }) {
-      return parse(formData, { schema: RunTemplateData });
+      return parseWithZod(formData, { schema: RunTemplateData });
     },
     shouldRevalidate: "onInput",
   });
@@ -1818,62 +1811,62 @@ function CreateTemplateModal({
       <DialogContent>
         <DialogHeader>Create run template</DialogHeader>
         <div className="mt-2 flex flex-col gap-4">
-          <Form method="post" {...form.props} className="w-full">
+          <Form method="post" {...getFormProps(form)} className="w-full">
             <input
-              {...conform.input(taskIdentifier, { type: "hidden" })}
+              {...getInputProps(taskIdentifier, { type: "hidden" })}
               value={rawTestTaskFormData.taskIdentifier}
             />
             <input
-              {...conform.input(environmentId, { type: "hidden" })}
+              {...getInputProps(environmentId, { type: "hidden" })}
               value={rawTestTaskFormData.environmentId}
             />
             <input
-              {...conform.input(triggerSource, { type: "hidden" })}
+              {...getInputProps(triggerSource, { type: "hidden" })}
               value={rawTestTaskFormData.triggerSource}
             />
             <input
-              {...conform.input(delaySeconds, { type: "hidden" })}
+              {...getInputProps(delaySeconds, { type: "hidden" })}
               value={rawTestTaskFormData.delaySeconds}
             />
             <input
-              {...conform.input(ttlSeconds, { type: "hidden" })}
+              {...getInputProps(ttlSeconds, { type: "hidden" })}
               value={rawTestTaskFormData.ttlSeconds}
             />
             <input
-              {...conform.input(queue, { type: "hidden" })}
+              {...getInputProps(queue, { type: "hidden" })}
               value={rawTestTaskFormData.queue}
             />
             <input
-              {...conform.input(concurrencyKey, { type: "hidden" })}
+              {...getInputProps(concurrencyKey, { type: "hidden" })}
               value={rawTestTaskFormData.concurrencyKey}
             />
             <input
-              {...conform.input(maxAttempts, { type: "hidden" })}
+              {...getInputProps(maxAttempts, { type: "hidden" })}
               value={rawTestTaskFormData.maxAttempts}
             />
             <input
-              {...conform.input(maxDurationSeconds, { type: "hidden" })}
+              {...getInputProps(maxDurationSeconds, { type: "hidden" })}
               value={rawTestTaskFormData.maxDurationSeconds}
             />
-            <input {...conform.input(tags, { type: "hidden" })} value={rawTestTaskFormData.tags} />
+            <input {...getInputProps(tags, { type: "hidden" })} value={rawTestTaskFormData.tags} />
             <input
-              {...conform.input(machine, { type: "hidden" })}
+              {...getInputProps(machine, { type: "hidden" })}
               value={rawTestTaskFormData.machine}
             />
             <input
-              {...conform.input(externalId, { type: "hidden" })}
+              {...getInputProps(externalId, { type: "hidden" })}
               value={rawTestTaskFormData.externalId}
             />
             <input
-              {...conform.input(timestamp, { type: "hidden" })}
+              {...getInputProps(timestamp, { type: "hidden" })}
               value={rawTestTaskFormData.timestamp}
             />
             <input
-              {...conform.input(lastTimestamp, { type: "hidden" })}
+              {...getInputProps(lastTimestamp, { type: "hidden" })}
               value={rawTestTaskFormData.lastTimestamp}
             />
             <input
-              {...conform.input(timezone, { type: "hidden" })}
+              {...getInputProps(timezone, { type: "hidden" })}
               value={rawTestTaskFormData.timezone}
             />
             <Paragraph className="mb-3">
@@ -1884,13 +1877,13 @@ function CreateTemplateModal({
               <InputGroup className="max-w-full">
                 <Label htmlFor={label.id}>Template label</Label>
                 <Input
-                  {...conform.input(label)}
+                  {...getInputProps(label, { type: "text" })}
                   placeholder="Enter a name for this template"
                   maxLength={42}
                 />
-                <FormError id={label.errorId}>{label.error}</FormError>
+                <FormError id={label.errorId}>{label.errors}</FormError>
               </InputGroup>
-              <FormError>{form.error}</FormError>
+              <FormError>{form.errors}</FormError>
               <FormButtons
                 confirmButton={
                   <Button
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
index 0eb496880a4..772315db08b 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
@@ -1,6 +1,6 @@
 import colorWheelIcon from "../../assets/images/color-wheel.png";
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod";
 import {
   CheckIcon,
   ExclamationTriangleIcon,
@@ -129,7 +129,7 @@ export function createSchema(
         if (constraints.getSlugMatch === undefined) {
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: conform.VALIDATION_UNDEFINED,
+            message: conformZodMessage.VALIDATION_UNDEFINED,
           });
         } else {
           const { isMatch, organizationSlug } = constraints.getSlugMatch(slug);
@@ -160,10 +160,10 @@ export const action: ActionFunction = async ({ request, params }) => {
       return { isMatch: slug === organizationSlug, organizationSlug };
     },
   });
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
@@ -287,10 +287,10 @@ export default function Page() {
   const [renameForm, { organizationName }] = useForm({
     id: "rename-organization",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: createSchema(),
       });
     },
@@ -299,11 +299,11 @@ export default function Page() {
   const [deleteForm, { organizationSlug }] = useForm({
     id: "delete-organization",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     shouldValidate: "onInput",
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: createSchema({
           getSlugMatch: (slug) => ({
             isMatch: slug === organization.slug,
@@ -339,19 +339,19 @@ export default function Page() {
             </div>
 
             <div>
-              <Form method="post" {...renameForm.props}>
+              <Form method="post" {...getFormProps(renameForm)}>
                 <input type="hidden" name="action" value="rename" />
                 <Fieldset className="gap-y-0">
                   <InputGroup fullWidth>
                     <Label htmlFor={organizationName.id}>Organization name</Label>
                     <Input
-                      {...conform.input(organizationName, { type: "text" })}
+                      {...getInputProps(organizationName, { type: "text" })}
                       defaultValue={organization.title}
                       placeholder="Your organization name"
                       icon={FolderIcon}
                       autoFocus
                     />
-                    <FormError id={organizationName.errorId}>{organizationName.error}</FormError>
+                    <FormError id={organizationName.errorId}>{organizationName.errors}</FormError>
                   </InputGroup>
                   <FormButtons
                     confirmButton={
@@ -374,7 +374,7 @@ export default function Page() {
               <Header2 spacing>Danger zone</Header2>
               <Form
                 method="post"
-                {...deleteForm.props}
+                {...getFormProps(deleteForm)}
                 className="w-full rounded-sm border border-rose-500/40"
               >
                 <input type="hidden" name="action" value="delete" />
@@ -382,13 +382,13 @@ export default function Page() {
                   <InputGroup>
                     <Label htmlFor={organizationSlug.id}>Delete organization</Label>
                     <Input
-                      {...conform.input(organizationSlug, { type: "text" })}
+                      {...getInputProps(organizationSlug, { type: "text" })}
                       placeholder="Your organization slug"
                       icon={ExclamationTriangleIcon}
                       fullWidth
                     />
-                    <FormError id={organizationSlug.errorId}>{organizationSlug.error}</FormError>
-                    <FormError>{deleteForm.error}</FormError>
+                    <FormError id={organizationSlug.errorId}>{organizationSlug.errors}</FormError>
+                    <FormError>{deleteForm.errors}</FormError>
                     <Hint>
                       This change is irreversible, so please be certain. Type in the Organization
                       slug <InlineCode variant="extra-small">{organization.slug}</InlineCode> and
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
index 89437424053..1d1b5fd1bbb 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
@@ -1,5 +1,5 @@
-import { conform, list, requestIntent, useFieldList, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { Form, useActionData, type MetaFunction } from "@remix-run/react";
 import { json } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core";
@@ -163,10 +163,10 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema });
+    const submission = parseWithZod(formData, { schema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
@@ -215,20 +215,21 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
 
   const lastSubmission = useActionData();
 
-  const [form, { emails, amount, alertLevels }] = useForm({
+  const [form, fields] = useForm<z.infer<typeof schema>>({
     id: "invite-members",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     defaultValue: {
-      emails: [""],
+      emails: alerts.emails.length > 0 ? alerts.emails : [""],
     },
   });
+  const { emails, amount, alertLevels } = fields;
 
   const fieldValues = useRef<string[]>(alerts.emails);
-  const emailFields = useFieldList(form.ref, { ...emails, defaultValue: alerts.emails });
+  const emailFields = emails.getFieldList();
 
   const checkboxLevels = [0.75, 0.9, 1.0, 2.0, 5.0];
 
@@ -236,9 +237,9 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
 
   useEffect(() => {
     if (alerts.emails.length > 0) {
-      requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+      form.insert({ name: emails.name });
     }
-  }, [emails.name, form.ref]);
+  }, [emails.name]);
   const isFree = !plan?.v3Subscription?.isPaying;
 
   return (
@@ -263,7 +264,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                 .
               </Paragraph>
             </div>
-            <Form method="post" {...form.props}>
+            <Form method="post" {...getFormProps(form)}>
               <Fieldset>
                 <InputGroup fullWidth>
                   <Label htmlFor={amount.id}>Amount</Label>
@@ -276,7 +277,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                     </>
                   ) : (
                     <Input
-                      {...conform.input(amount, { type: "number" })}
+                      {...getInputProps(amount, { type: "number" })}
                       value={dollarAmount}
                       onChange={(e) => {
                         const numberValue = Number(e.target.value);
@@ -297,7 +298,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                       readOnly={isFree}
                     />
                   )}
-                  <FormError id={amount.errorId}>{amount.error}</FormError>
+                  <FormError id={amount.errorId}>{amount.errors}</FormError>
                 </InputGroup>
                 <InputGroup fullWidth>
                   <Label htmlFor={alertLevels.id}>Alert me when I reach</Label>
@@ -321,7 +322,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                       readOnly={level === 1.0}
                     />
                   ))}
-                  <FormError id={alertLevels.errorId}>{alertLevels.error}</FormError>
+                  <FormError id={alertLevels.errorId}>{alertLevels.errors}</FormError>
                 </InputGroup>
                 <InputGroup fullWidth>
                   <div className="flex items-center gap-1">
@@ -361,7 +362,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                   {emailFields.map((email, index) => (
                     <Fragment key={email.key}>
                       <Input
-                        {...conform.input(email, { type: "email" })}
+                        {...getInputProps(email, { type: "email" })}
                         placeholder={index === 0 ? "Enter an email address" : "Add another email"}
                         autoFocus={index === 0}
                         onChange={(e) => {
@@ -370,12 +371,12 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
                             emailFields.length === fieldValues.current.length &&
                             fieldValues.current.every((v) => v !== "")
                           ) {
-                            requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+                            form.insert({ name: emails.name });
                           }
                         }}
                         fullWidth
                       />
-                      <FormError id={email.errorId}>{email.error}</FormError>
+                      <FormError id={email.errorId}>{email.errors}</FormError>
                     </Fragment>
                   ))}
                 </InputGroup>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
index 142d2796172..fd18aa37684 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { Form, useActionData, useParams, type MetaFunction } from "@remix-run/react";
 import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core/utils";
@@ -101,10 +101,10 @@ export const action: ActionFunction = async ({ request, params }) => {
   const { organizationSlug } = OrganizationParamsSchema.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const organization = await prisma.organization.findFirst({
@@ -544,9 +544,9 @@ export default function Page() {
 
   const [form, { name, endpointServiceName, targetRegion }] = useForm({
     id: "create-private-connection",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
   });
 
@@ -724,30 +724,30 @@ export default function Page() {
             {/* Connection form (always visible) */}
             <div className="rounded-lg border border-grid-dimmed p-4">
               <Header3 spacing>Connection Details</Header3>
-              <Form method="post" {...form.props}>
+              <Form method="post" {...getFormProps(form)}>
                 <Fieldset>
                   <InputGroup fullWidth>
                     <Label htmlFor={name.id} required>
                       Friendly name
                     </Label>
                     <Input
-                      {...conform.input(name, { type: "text" })}
+                      {...getInputProps(name, { type: "text" })}
                       placeholder="e.g., Production Database, Redis Cache"
                       fullWidth
                     />
-                    <FormError id={name.errorId}>{name.error}</FormError>
+                    <FormError id={name.errorId}>{name.errors}</FormError>
                   </InputGroup>
                   <InputGroup fullWidth>
                     <Label htmlFor={endpointServiceName.id} required>
                       VPC Endpoint Service name
                     </Label>
                     <Input
-                      {...conform.input(endpointServiceName, { type: "text" })}
+                      {...getInputProps(endpointServiceName, { type: "text" })}
                       placeholder="com.amazonaws.vpce.us-east-1.vpce-svc-0123456789abcdef0"
                       fullWidth
                     />
                     <FormError id={endpointServiceName.errorId}>
-                      {endpointServiceName.error}
+                      {endpointServiceName.errors}
                     </FormError>
                   </InputGroup>
                   <InputGroup fullWidth>
@@ -755,7 +755,7 @@ export default function Page() {
                       Target region
                     </Label>
                     <select
-                      {...conform.input(targetRegion)}
+                      {...getInputProps(targetRegion, { type: "text" })}
                       defaultValue={defaultRegion}
                       className="w-full rounded-md border border-charcoal-700 bg-charcoal-800 px-3 py-2 text-sm text-text-bright"
                     >
@@ -765,7 +765,7 @@ export default function Page() {
                         </option>
                       ))}
                     </select>
-                    <FormError id={targetRegion.errorId}>{targetRegion.error}</FormError>
+                    <FormError id={targetRegion.errorId}>{targetRegion.errors}</FormError>
                     {activeRegions.length > 0 && (
                       <Paragraph variant="extra-small" className="text-text-dimmed">
                         Your tasks have recently run in: {activeRegions.join(", ")}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
index 044444c17ee..218f668d363 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { EnvelopeIcon, NoSymbolIcon, UserPlusIcon } from "@heroicons/react/20/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
 import {
@@ -169,9 +169,9 @@ export const action = dashboardAction(
       if (!orgId) {
         return json({ ok: false, error: "Organization not found" } as const, { status: 404 });
       }
-      const submission = parse(formData, { schema: SetRoleSchema });
-      if (!submission.value || submission.intent !== "submit") {
-        return json(submission);
+      const submission = parseWithZod(formData, { schema: SetRoleSchema });
+      if (submission.status !== "success") {
+        return json(submission.reply());
       }
       const result = await rbac.setUserRole({
         userId: submission.value.userId,
@@ -218,10 +218,10 @@ export const action = dashboardAction(
         });
       }
 
-      const submission = parse(formData, { schema: PurchaseSchema });
+      const submission = parseWithZod(formData, { schema: PurchaseSchema });
 
-      if (!submission.value || submission.intent !== "submit") {
-        return json(submission);
+      if (submission.status !== "success") {
+        return json(submission.reply());
       }
 
       const service = new SetSeatsAddOnService();
@@ -235,22 +235,24 @@ export const action = dashboardAction(
       );
 
       if (error) {
-        submission.error.amount = [error instanceof Error ? error.message : "Unknown error"];
-        return json(submission);
+        return json(
+          submission.reply({
+            fieldErrors: { amount: [error instanceof Error ? error.message : "Unknown error"] },
+          })
+        );
       }
 
       if (!result.success) {
-        submission.error.amount = [result.error];
-        return json(submission);
+        return json(submission.reply({ fieldErrors: { amount: [result.error] } }));
       }
 
       return json({ ok: true } as const);
     }
 
-    const submission = parse(formData, { schema });
+    const submission = parseWithZod(formData, { schema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     // Default intent: remove a member or leave the org. Scope the target to
@@ -728,12 +730,12 @@ function LeaveTeamModal({
   const [open, setOpen] = useState(false);
   const lastSubmission = useActionData();
 
-  const [form, { memberId }] = useForm({
+  const [form, fields] = useForm({
     id: "remove-member",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
   });
 
@@ -751,9 +753,9 @@ function LeaveTeamModal({
           <AlertCancel asChild>
             <Button variant="secondary/small">Cancel</Button>
           </AlertCancel>
-          <Form method="post" {...form.props} onSubmit={() => setOpen(false)}>
+          <Form method="post" {...getFormProps(form)} onSubmit={() => setOpen(false)}>
             <input type="hidden" value={member.id} name="memberId" />
-            <Button type="submit" variant="danger/small" form={form.props.id}>
+            <Button type="submit" variant="danger/small" form={form.id}>
               {actionText}
             </Button>
           </Form>
@@ -880,17 +882,18 @@ export function PurchaseSeatsModal({
   const fetcher = useFetcher();
   const organization = useOrganization();
   const lastSubmission =
-    fetcher.data && typeof fetcher.data === "object" && "intent" in fetcher.data
+    fetcher.data && typeof fetcher.data === "object" && "status" in fetcher.data
       ? fetcher.data
       : undefined;
-  const [form, { amount }] = useForm({
+  const [form, fields] = useForm({
     id: "purchase-seats",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: PurchaseSchema });
+      return parseWithZod(formData, { schema: PurchaseSchema });
     },
     shouldRevalidate: "onSubmit",
   });
+  const amount = fields.amount;
 
   const [amountValue, setAmountValue] = useState(extraSeats);
   useEffect(() => {
@@ -960,7 +963,7 @@ export function PurchaseSeatsModal({
       <DialogTrigger asChild>{trigger}</DialogTrigger>
       <DialogContent>
         <DialogHeader>{title}</DialogHeader>
-        <fetcher.Form method="post" action={organizationTeamPath(organization)} {...form.props}>
+        <fetcher.Form method="post" action={organizationTeamPath(organization)} {...getFormProps(form)}>
           <input type="hidden" name="_formType" value="purchase-seats" />
           <div className="flex flex-col gap-4 pt-2">
             <div className="flex flex-col gap-1">
@@ -976,7 +979,7 @@ export function PurchaseSeatsModal({
                   Total extra seats
                 </Label>
                 <InputNumberStepper
-                  {...conform.input(amount, { type: "number" })}
+                  {...getInputProps(amount, { type: "number" })}
                   step={seatPricing.stepSize}
                   min={0}
                   max={undefined}
@@ -984,10 +987,8 @@ export function PurchaseSeatsModal({
                   onChange={(e) => setAmountValue(Number(e.target.value))}
                   disabled={isLoading}
                 />
-                <FormError id={amount.errorId}>
-                  {amount.error ?? amount.initialError?.[""]?.[0]}
-                </FormError>
-                <FormError>{form.error}</FormError>
+                <FormError id={amount.errorId}>{amount.errors}</FormError>
+                <FormError>{form.errors}</FormError>
               </InputGroup>
             </Fieldset>
             {state === "need_to_remove_members" ? (
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index 39cde0cf2d0..e1862cd76e4 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { CommandLineIcon, FolderIcon } from "@heroicons/react/20/solid";
 import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
@@ -179,10 +179,10 @@ export const action: ActionFunction = async ({ request, params }) => {
   invariant(organizationSlug, "organizationSlug is required");
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const url = new URL(request.url);
@@ -328,9 +328,9 @@ export default function Page() {
 
   const [form, { projectName, projectVersion }] = useForm({
     id: "create-project",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
   });
 
@@ -368,7 +368,7 @@ export default function Page() {
               title="Create a new project"
               description={`This will create a new project in your "${organization.title}" organization.`}
             />
-            <Form method="post" {...form.props}>
+            <Form method="post" {...getFormProps(form)}>
               {message && (
                 <Callout variant="success" className="mb-4">
                   {message}
@@ -380,17 +380,17 @@ export default function Page() {
                     Project name <span className="text-text-bright">*</span>
                   </Label>
                   <Input
-                    {...conform.input(projectName, { type: "text" })}
+                    {...getInputProps(projectName, { type: "text" })}
                     placeholder="Your project name"
                     icon={FolderIcon}
                     autoFocus
                   />
-                  <FormError id={projectName.errorId}>{projectName.error}</FormError>
+                  <FormError id={projectName.errorId}>{projectName.errors}</FormError>
                 </InputGroup>
                 {canCreateV3Projects ? (
-                  <input {...conform.input(projectVersion, { type: "hidden" })} value={"v3"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden" })} value={"v3"} />
                 ) : (
-                  <input {...conform.input(projectVersion, { type: "hidden" })} value={"v2"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden" })} value={"v2"} />
                 )}
 
                 <div className="border-t border-charcoal-700" />
diff --git a/apps/webapp/app/routes/_app.orgs.new/route.tsx b/apps/webapp/app/routes/_app.orgs.new/route.tsx
index f4f7f995bf9..9a3eadc18e1 100644
--- a/apps/webapp/app/routes/_app.orgs.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.new/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { BuildingOffice2Icon, GlobeAltIcon } from "@heroicons/react/20/solid";
 import { RadioGroup } from "@radix-ui/react-radio-group";
 import { json, redirect, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/node";
@@ -46,10 +46,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 export const action: ActionFunction = async ({ request }) => {
   const user = await requireUser(request);
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
@@ -115,9 +115,9 @@ export default function NewOrganizationPage() {
 
   const [form, { orgName }] = useForm({
     id: "create-organization",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onSubmit",
     shouldValidate: "onSubmit",
@@ -148,18 +148,18 @@ export default function NewOrganizationPage() {
             LeadingIcon={<BuildingOffice2Icon className="size-6 text-fuchsia-600" />}
             title="Create an Organization"
           />
-          <Form method="post" {...form.props}>
+          <Form method="post" {...getFormProps(form)}>
             <Fieldset>
               <InputGroup>
                 <Label htmlFor={orgName.id}>Organization name *</Label>
                 <Input
-                  {...conform.input(orgName, { type: "text" })}
+                  {...getInputProps(orgName, { type: "text" })}
                   placeholder="Your Organization name"
                   icon={BuildingOffice2Icon}
                   autoFocus
                 />
                 <Hint>Normally your company name.</Hint>
-                <FormError id={orgName.errorId}>{orgName.error}</FormError>
+                <FormError id={orgName.errorId}>{orgName.errors}</FormError>
               </InputGroup>
               {isManagedCloud && (
                 <>
diff --git a/apps/webapp/app/routes/account._index/route.tsx b/apps/webapp/app/routes/account._index/route.tsx
index 9761c7c1454..78e8d4e572b 100644
--- a/apps/webapp/app/routes/account._index/route.tsx
+++ b/apps/webapp/app/routes/account._index/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod";
 import { Form, type MetaFunction, useActionData } from "@remix-run/react";
 import { type ActionFunction, json } from "@remix-run/server-runtime";
 import { z } from "zod";
@@ -55,7 +55,7 @@ function createSchema(
           //client-side validation skips this
           ctx.addIssue({
             code: z.ZodIssueCode.custom,
-            message: conform.VALIDATION_UNDEFINED,
+            message: conformZodMessage.VALIDATION_UNDEFINED,
           });
         } else {
           // Tell zod this is an async validation by returning the promise
@@ -100,10 +100,10 @@ export const action: ActionFunction = async ({ request }) => {
     },
   });
 
-  const submission = await parse(formData, { schema: formSchema, async: true });
+  const submission = await parseWithZod(formData, { schema: formSchema, async: true });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
@@ -131,9 +131,9 @@ export default function Page() {
   const [form, { name, email, marketingEmails }] = useForm({
     id: "account",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: createSchema() });
+      return parseWithZod(formData, { schema: createSchema() });
     },
   });
 
@@ -148,7 +148,7 @@ export default function Page() {
           <div className="mb-3 w-full border-b border-grid-dimmed pb-3">
             <Header2>Profile</Header2>
           </div>
-          <Form method="post" {...form.props} className="w-full">
+          <Form method="post" {...getFormProps(form)} className="w-full">
             <InputGroup className="mb-4">
               <Label htmlFor={name.id}>Profile picture</Label>
               <UserProfilePhoto className="size-24" />
@@ -157,34 +157,33 @@ export default function Page() {
               <InputGroup fullWidth>
                 <Label htmlFor={name.id}>Full name</Label>
                 <Input
-                  {...conform.input(name, { type: "text" })}
+                  {...getInputProps(name, { type: "text" })}
                   placeholder="Your full name"
                   defaultValue={user?.name ?? ""}
                   icon={AvatarCircleIcon}
                 />
                 <Hint>Your teammates will see this</Hint>
-                <FormError id={name.errorId}>{name.error}</FormError>
+                <FormError id={name.errorId}>{name.errors}</FormError>
               </InputGroup>
               <InputGroup fullWidth>
                 <Label htmlFor={email.id}>Email address</Label>
                 <Input
-                  {...conform.input(email, { type: "text" })}
+                  {...getInputProps(email, { type: "text" })}
                   placeholder="Your email"
                   defaultValue={user?.email ?? ""}
                   icon={EnvelopeIcon}
                 />
-                <FormError id={email.errorId}>{email.error}</FormError>
+                <FormError id={email.errorId}>{email.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label>Notifications</Label>
                 <CheckboxWithLabel
-                  id="marketingEmails"
-                  {...conform.input(marketingEmails, { type: "checkbox" })}
+                  {...getInputProps(marketingEmails, { type: "checkbox" })}
                   label="Receive onboarding emails"
                   variant="simple/small"
                   defaultChecked={user.marketingEmails}
                 />
-                <FormError id={marketingEmails.errorId}>{marketingEmails.error}</FormError>
+                <FormError id={marketingEmails.errorId}>{marketingEmails.errors}</FormError>
               </InputGroup>
 
               <FormButtons
diff --git a/apps/webapp/app/routes/account.tokens/route.tsx b/apps/webapp/app/routes/account.tokens/route.tsx
index d2ef3b5f822..931d5487ae4 100644
--- a/apps/webapp/app/routes/account.tokens/route.tsx
+++ b/apps/webapp/app/routes/account.tokens/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { BookOpenIcon, ShieldCheckIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { ShieldExclamationIcon } from "@heroicons/react/24/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
@@ -187,10 +187,10 @@ const CreateTokenSchema = z.discriminatedUnion("action", [
 export const action: ActionFunction = async ({ request }) => {
   const userId = await requireUserId(request);
   const formData = await request.formData();
-  const submission = parse(formData, { schema: CreateTokenSchema });
+  const submission = parseWithZod(formData, { schema: CreateTokenSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   switch (submission.value.action) {
@@ -219,7 +219,7 @@ export const action: ActionFunction = async ({ request }) => {
           roleId: submittedRoleId,
         });
 
-        return json({ ...submission, payload: { token: tokenResult } });
+        return json({ ...submission.reply(), payload: { token: tokenResult } });
       } catch (error: any) {
         return json({ errors: { body: error.message } }, { status: 400 });
       }
@@ -345,9 +345,9 @@ function CreatePersonalAccessToken({
   const [form, { tokenName }] = useForm({
     id: "create-personal-access-token",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: CreateTokenSchema });
+      return parseWithZod(formData, { schema: CreateTokenSchema });
     },
   });
 
@@ -381,14 +381,14 @@ function CreatePersonalAccessToken({
           />
         </div>
       ) : (
-        <fetcher.Form method="post" {...form.props}>
+        <fetcher.Form method="post" {...getFormProps(form)}>
           <input type="hidden" name="action" value="create" />
           {showRolePicker && <input type="hidden" name="roleId" value={selectedRoleId} />}
           <Fieldset className="mt-3">
             <InputGroup>
               <Label htmlFor={tokenName.id}>Name</Label>
               <Input
-                {...conform.input(tokenName, { type: "text" })}
+                {...getInputProps(tokenName, { type: "text" })}
                 placeholder="Name your Personal Access Token"
                 defaultValue=""
                 icon={ShieldCheckIcon}
@@ -398,7 +398,7 @@ function CreatePersonalAccessToken({
                 This will help you to identify your token. Tokens called "cli" are automatically
                 generated when you login with our CLI.
               </Hint>
-              <FormError id={tokenName.errorId}>{tokenName.error}</FormError>
+              <FormError id={tokenName.errorId}>{tokenName.errors}</FormError>
             </InputGroup>
 
             {showRolePicker && (
@@ -451,12 +451,12 @@ function CreatePersonalAccessToken({
 function RevokePersonalAccessToken({ token }: { token: ObfuscatedPersonalAccessToken }) {
   const lastSubmission = useActionData();
 
-  const [form, { tokenId }] = useForm({
+  const [form, fields] = useForm({
     id: "revoke-personal-access-token",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: CreateTokenSchema });
+      return parseWithZod(formData, { schema: CreateTokenSchema });
     },
   });
 
@@ -478,7 +478,7 @@ function RevokePersonalAccessToken({ token }: { token: ObfuscatedPersonalAccessT
               </Paragraph>
               <FormButtons
                 confirmButton={
-                  <Form method="post" {...form.props}>
+                  <Form method="post" {...getFormProps(form)}>
                     <input type="hidden" name="action" value="revoke" />
                     <input type="hidden" name="tokenId" value={token.id} />
                     <Button type="submit" variant="danger/medium">
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index 2430af764e1..7eda5c7ccb3 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod";
 import { ArrowRightIcon, EnvelopeIcon, UserIcon } from "@heroicons/react/20/solid";
 import { UserGroupIcon } from "~/assets/icons/UserGroupIcon";
 import { HandRaisedIcon } from "@heroicons/react/24/solid";
@@ -80,7 +80,7 @@ function createSchema(
           if (constraints.isEmailUnique === undefined) {
             ctx.addIssue({
               code: z.ZodIssueCode.custom,
-              message: conform.VALIDATION_UNDEFINED,
+              message: conformZodMessage.VALIDATION_UNDEFINED,
             });
           } else {
             return constraints.isEmailUnique(email).then((isUnique) => {
@@ -133,10 +133,10 @@ export const action: ActionFunction = async ({ request }) => {
     },
   });
 
-  const submission = await parse(formData, { schema: formSchema, async: true });
+  const submission = await parseWithZod(formData, { schema: formSchema, async: true });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
@@ -230,9 +230,9 @@ export default function Page() {
 
   const [form, { name, email, confirmEmail }] = useForm({
     id: "confirm-basic-details",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema: createSchema() });
+      return parseWithZod(formData, { schema: createSchema() });
     },
     shouldRevalidate: "onSubmit",
   });
@@ -243,7 +243,7 @@ export default function Page() {
     <AppContainer className="bg-charcoal-900">
       <BackgroundWrapper>
         <MainCenteredContainer variant="onboarding" className="max-w-[29rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
-          <Form method="post" {...form.props}>
+          <Form method="post" {...getFormProps(form)}>
             <FormTitle
               title="Welcome to Trigger.dev"
               LeadingIcon={
@@ -274,20 +274,20 @@ export default function Page() {
                   Full name <span className="text-text-bright">*</span>
                 </Label>
                 <Input
-                  {...conform.input(name, { type: "text" })}
+                  {...getInputProps(name, { type: "text" })}
                   defaultValue={user.name ?? ""}
                   placeholder="Your full name"
                   icon={UserIcon}
                   autoFocus
                 />
-                <FormError id={name.errorId}>{name.error}</FormError>
+                <FormError id={name.errorId}>{name.errors}</FormError>
               </InputGroup>
               <InputGroup>
                 <Label htmlFor={email.id}>
                   Email <span className="text-text-bright">*</span>
                 </Label>
                 <Input
-                  {...conform.input(email, { type: "email" })}
+                  {...getInputProps(email, { type: "email" })}
                   defaultValue={enteredEmail}
                   onChange={(e) => {
                     setEnteredEmail(e.target.value);
@@ -296,23 +296,23 @@ export default function Page() {
                   icon={EnvelopeIcon}
                   spellCheck={false}
                 />
-                <FormError id={email.errorId}>{email.error}</FormError>
+                <FormError id={email.errorId}>{email.errors}</FormError>
               </InputGroup>
 
               {shouldShowConfirm ? (
                 <InputGroup>
                   <Label htmlFor={confirmEmail.id}>Confirm email</Label>
                   <Input
-                    {...conform.input(confirmEmail, { type: "email" })}
+                    {...getInputProps(confirmEmail, { type: "email" })}
                     placeholder="Your email, again"
                     icon={EnvelopeIcon}
                     spellCheck={false}
                   />
-                  <FormError id={confirmEmail.errorId}>{confirmEmail.error}</FormError>
+                  <FormError id={confirmEmail.errorId}>{confirmEmail.errors}</FormError>
                 </InputGroup>
               ) : (
                 <>
-                  <input {...conform.input(confirmEmail, { type: "hidden" })} value={user.email} />
+                  <input {...getInputProps(confirmEmail, { type: "hidden" })} value={user.email} />
                 </>
               )}
 
diff --git a/apps/webapp/app/routes/invite-resend.tsx b/apps/webapp/app/routes/invite-resend.tsx
index 9d3f8363653..f2938b67a61 100644
--- a/apps/webapp/app/routes/invite-resend.tsx
+++ b/apps/webapp/app/routes/invite-resend.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/server-runtime";
 import { env } from "process";
 import { z } from "zod";
@@ -32,10 +32,10 @@ export const action = dashboardAction(
   },
   async ({ request, user }) => {
     const formData = await request.formData();
-    const submission = parse(formData, { schema: resendSchema });
+    const submission = parseWithZod(formData, { schema: resendSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
diff --git a/apps/webapp/app/routes/invite-revoke.tsx b/apps/webapp/app/routes/invite-revoke.tsx
index 457a69eafeb..fc1e4d0b79e 100644
--- a/apps/webapp/app/routes/invite-revoke.tsx
+++ b/apps/webapp/app/routes/invite-revoke.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { $replica } from "~/db.server";
@@ -31,10 +31,10 @@ export const action = dashboardAction(
   },
   async ({ request, user }) => {
     const formData = await request.formData();
-    const submission = parse(formData, { schema: revokeSchema });
+    const submission = parseWithZod(formData, { schema: revokeSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
diff --git a/apps/webapp/app/routes/invites.tsx b/apps/webapp/app/routes/invites.tsx
index 7b234d4129b..c419ba0d5cc 100644
--- a/apps/webapp/app/routes/invites.tsx
+++ b/apps/webapp/app/routes/invites.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { type ActionFunction, type LoaderFunctionArgs, json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
@@ -39,14 +39,16 @@ export const action: ActionFunction = async ({ request }) => {
   const user = await requireUser(request);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
+  const intent = formData.get("intent");
+
   try {
-    if (submission.intent === "accept") {
+    if (intent === "accept") {
       const { remainingInvites, organization } = await acceptInvite({
         inviteId: submission.value.inviteId,
         user: { id: user.id, email: user.email },
@@ -61,7 +63,7 @@ export const action: ActionFunction = async ({ request }) => {
           `You joined ${organization.title}`
         );
       }
-    } else if (submission.intent === "decline") {
+    } else if (intent === "decline") {
       const { remainingInvites, organization } = await declineInvite({
         inviteId: submission.value.inviteId,
         user: { id: user.id, email: user.email },
@@ -89,12 +91,12 @@ export default function Page() {
   const { invites } = useTypedLoaderData<typeof loader>();
   const lastSubmission = useActionData();
 
-  const [form, { inviteId }] = useForm({
+  const [form, fields] = useForm({
     id: "accept-invite",
     // TODO: type this
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
   });
 
@@ -109,7 +111,7 @@ export default function Page() {
               title={simplur`You have ${invites.length} new invitation[|s]`}
             />
             {invites.map((invite) => (
-              <Form key={invite.id} method="post" {...form.props}>
+              <Form key={invite.id} method="post" {...getFormProps(form)}>
                 <Fieldset>
                   <InputGroup className="flex items-center justify-between border-b border-charcoal-800 py-4">
                     <div className="flex flex-col gap-y-0.5 overflow-hidden">
@@ -122,7 +124,7 @@ export default function Page() {
                     <div className="flex flex-col gap-y-1">
                       <Button
                         type="submit"
-                        name={conform.INTENT}
+                        name="intent"
                         value="accept"
                         variant={"primary/small"}
                       >
@@ -130,7 +132,7 @@ export default function Page() {
                       </Button>
                       <Button
                         type="submit"
-                        name={conform.INTENT}
+                        name="intent"
                         value="decline"
                         variant={"secondary/small"}
                       >
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
index ffc7e4315c6..dd1c452c51c 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/node";
 import { errAsync, fromPromise, okAsync } from "neverthrow";
 import { z } from "zod";
@@ -39,10 +39,10 @@ export const action = dashboardAction(
     const userId = user.id;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: cancelSchema });
+    const submission = parseWithZod(formData, { schema: cancelSchema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     const verifyProjectMembership = () =>
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
index 734f7c8259e..979264516d1 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
@@ -37,10 +37,10 @@ export const action = dashboardAction(
     const { projectId, deploymentShortCode } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: promoteSchema });
+    const submission = parseWithZod(formData, { schema: promoteSchema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
@@ -93,12 +93,10 @@ export const action = dashboardAction(
             stack: error.stack,
           },
         });
-        submission.error = { "": [error.message] };
-        return json(submission);
+        return json(submission.reply({ formErrors: [error.message] }));
       } else {
         logger.error("Failed to promote deployment", { error });
-        submission.error = { "": [JSON.stringify(error)] };
-        return json(submission);
+        return json(submission.reply({ formErrors: [JSON.stringify(error)] }));
       }
     }
   }
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
index d7387185ffa..d109e97c9d5 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
@@ -37,10 +37,10 @@ export const action = dashboardAction(
     const { projectId, deploymentShortCode } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: rollbackSchema });
+    const submission = parseWithZod(formData, { schema: rollbackSchema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
@@ -93,12 +93,10 @@ export const action = dashboardAction(
             stack: error.stack,
           },
         });
-        submission.error = { "": [error.message] };
-        return json(submission);
+        return json(submission.reply({ formErrors: [error.message] }));
       } else {
         logger.error("Failed to roll back deployment", { error });
-        submission.error = { "": [JSON.stringify(error)] };
-        return json(submission);
+        return json(submission.reply({ formErrors: [JSON.stringify(error)] }));
       }
     }
   }
diff --git a/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts b/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
index 5fff969e6a2..40c4565a93a 100644
--- a/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
+++ b/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { ActionFunction, json } from "@remix-run/node";
 import { assertExhaustive } from "@trigger.dev/core/utils";
 import { z } from "zod";
@@ -18,10 +18,10 @@ export const action: ActionFunction = async ({ request, params }) => {
   const { batchId } = ParamSchema.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: checkCompletionSchema });
+  const submission = parseWithZod(formData, { schema: checkCompletionSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
diff --git a/apps/webapp/app/routes/resources.branches.archive.tsx b/apps/webapp/app/routes/resources.branches.archive.tsx
index 6421e5588e1..336dd9afca8 100644
--- a/apps/webapp/app/routes/resources.branches.archive.tsx
+++ b/apps/webapp/app/routes/resources.branches.archive.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { Form, useActionData, useFetcher, useLocation } from "@remix-run/react";
 import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";
@@ -29,9 +29,9 @@ export async function action({ request }: ActionFunctionArgs) {
   const userId = await requireUserId(request);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value) {
+  if (submission.status !== "success") {
     return redirectWithErrorMessage("/", request, "Invalid form data");
   }
 
@@ -65,9 +65,9 @@ export function ArchiveButton({
 
   const [form, { environmentId, redirectPath }] = useForm({
     id: "archive-branch",
-    lastSubmission: lastSubmission as any,
+    lastResult: lastSubmission as any,
     onValidate({ formData }) {
-      return parse(formData, { schema });
+      return parseWithZod(formData, { schema });
     },
     shouldRevalidate: "onInput",
   });
@@ -92,13 +92,13 @@ export function ArchiveButton({
           <Form
             method="post"
             action="/resources/branches/archive"
-            {...form.props}
+            {...getFormProps(form)}
             className="w-full"
           >
-            <input value={environment.id} {...conform.input(environmentId, { type: "hidden" })} />
+            <input value={environment.id} {...getInputProps(environmentId, { type: "hidden" })} />
             <input
               value={`${location.pathname}${location.search}`}
-              {...conform.input(redirectPath, { type: "hidden" })}
+              {...getInputProps(redirectPath, { type: "hidden" })}
             />
             <Paragraph spacing>
               This will <span className="text-text-bright">permanently</span> make this branch{" "}
@@ -111,7 +111,7 @@ export function ArchiveButton({
             <Paragraph spacing>
               Once archived you can create a new branch with the same name.
             </Paragraph>
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
             <FormButtons
               confirmButton={
                 <Button LeadingIcon={ArchiveIcon} type="submit" variant="danger/medium">
diff --git a/apps/webapp/app/routes/resources.feedback.ts b/apps/webapp/app/routes/resources.feedback.ts
index 62b13b518b3..e6787aa916a 100644
--- a/apps/webapp/app/routes/resources.feedback.ts
+++ b/apps/webapp/app/routes/resources.feedback.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { type PlainClient, uiComponent } from "@team-plain/typescript-sdk";
 import { z } from "zod";
@@ -76,10 +76,10 @@ export async function action({ request }: ActionFunctionArgs) {
   const user = await requireUser(request);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema });
+  const submission = parseWithZod(formData, { schema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const inquiry = feedbackTypes[submission.value.feedbackType as FeedbackType];
@@ -121,7 +121,10 @@ export async function action({ request }: ActionFunctionArgs) {
       "Thanks for your feedback! We'll get back to you soon."
     );
   } catch (e) {
-    submission.error.message = [e instanceof Error ? e.message : "Unknown error"];
-    return json(submission);
+    return json(
+      submission.reply({
+        fieldErrors: { message: [e instanceof Error ? e.message : "Unknown error"] },
+      })
+    );
   }
 }
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
index d0f662b2b76..38fed23c753 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { CheckCircleIcon, LockClosedIcon, PlusIcon } from "@heroicons/react/20/solid";
 import {
   Form,
@@ -208,10 +208,10 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: GitHubActionSchema });
+    const submission = parseWithZod(formData, { schema: GitHubActionSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     const projectSettingsService = new ProjectSettingsService();
@@ -415,10 +415,10 @@ export function ConnectGitHubRepoModal({
 
   const [form, { installationId, repositoryId }] = useForm({
     id: "connect-repo",
-    lastSubmission: lastSubmission,
+    lastResult: lastSubmission,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: ConnectGitHubRepoFormSchema,
       });
     },
@@ -484,7 +484,7 @@ export function ConnectGitHubRepoModal({
       >
         <DialogHeader>Connect GitHub repository</DialogHeader>
         <div className="mt-2 flex flex-col gap-4">
-          <Form method="post" action={actionUrl} {...form.props} className="w-full">
+          <Form method="post" action={actionUrl} {...getFormProps(form)} className="w-full">
             {redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
             <Paragraph className="mb-3">
               Choose a GitHub repository to connect to your project.
@@ -540,7 +540,7 @@ export function ConnectGitHubRepoModal({
                     </SelectItem>,
                   ]}
                 </Select>
-                <FormError id={installationId.errorId}>{installationId.error}</FormError>
+                <FormError id={installationId.errorId}>{installationId.errors}</FormError>
               </InputGroup>
               <InputGroup className="max-w-full">
                 <Label htmlFor={repositoryId.id}>Repository</Label>
@@ -586,9 +586,9 @@ export function ConnectGitHubRepoModal({
                   </TextLink>
                   .
                 </Hint>
-                <FormError id={repositoryId.errorId}>{repositoryId.error}</FormError>
+                <FormError id={repositoryId.errorId}>{repositoryId.errors}</FormError>
               </InputGroup>
-              <FormError>{form.error}</FormError>
+              <FormError>{form.errors}</FormError>
               <FormButtons
                 confirmButton={
                   <Button
@@ -719,10 +719,10 @@ export function ConnectedGitHubRepoForm({
 
   const [gitSettingsForm, fields] = useForm({
     id: "update-git-settings",
-    lastSubmission: lastSubmission,
+    lastResult: lastSubmission,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: UpdateGitSettingsFormSchema,
       });
     },
@@ -803,7 +803,7 @@ export function ConnectedGitHubRepoForm({
         </Dialog>
       </div>
 
-      <Form method="post" action={actionUrl} {...gitSettingsForm.props}>
+      <Form method="post" action={actionUrl} {...getFormProps(gitSettingsForm)}>
         {redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
         <Fieldset>
           <InputGroup fullWidth>
@@ -819,7 +819,7 @@ export function ConnectedGitHubRepoForm({
                 </span>
               </div>
               <Input
-                {...conform.input(fields.productionBranch, { type: "text" })}
+                {...getInputProps(fields.productionBranch, { type: "text" })}
                 defaultValue={connectedGitHubRepo.branchTracking?.prod?.branch}
                 placeholder="none"
                 variant="tertiary"
@@ -839,7 +839,7 @@ export function ConnectedGitHubRepoForm({
                 </span>
               </div>
               <Input
-                {...conform.input(fields.stagingBranch, { type: "text" })}
+                {...getInputProps(fields.stagingBranch, { type: "text" })}
                 defaultValue={connectedGitHubRepo.branchTracking?.staging?.branch}
                 placeholder="none"
                 variant="tertiary"
@@ -888,10 +888,10 @@ export function ConnectedGitHubRepoForm({
                 )}
               </div>
             </div>
-            <FormError>{fields.productionBranch?.error}</FormError>
-            <FormError>{fields.stagingBranch?.error}</FormError>
-            <FormError>{fields.previewDeploymentsEnabled?.error}</FormError>
-            <FormError>{gitSettingsForm.error}</FormError>
+            <FormError>{fields.productionBranch?.errors}</FormError>
+            <FormError>{fields.stagingBranch?.errors}</FormError>
+            <FormError>{fields.previewDeploymentsEnabled?.errors}</FormError>
+            <FormError>{gitSettingsForm.errors}</FormError>
           </InputGroup>
 
           <FormButtons
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
index 483e0ea5725..41192916692 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { ArrowPathIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
 import { XCircleIcon } from "@heroicons/react/24/outline";
 import { Form } from "@remix-run/react";
@@ -150,9 +150,9 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: CreateBulkActionPayload });
+    const submission = parseWithZod(formData, { schema: CreateBulkActionPayload });
 
-    if (!submission.value) {
+    if (submission.status !== "success") {
       logger.error("Invalid bulk action", {
         submission,
         formData: Object.fromEntries(formData),
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
index 1f7a2add413..8dbfbda1511 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
@@ -1,5 +1,5 @@
-import { conform, useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { CheckIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import {
   type FetcherWithComponents,
@@ -74,10 +74,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: UpsertSchedule });
+  const submission = parseWithZod(formData, { schema: UpsertSchedule });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   // `_format=json` → return JSON instead of redirecting; caller toasts.
@@ -162,10 +162,10 @@ export function UpsertScheduleForm({
   submitFetcher?: FetcherWithComponents<unknown>;
 }) {
   const actionData = useActionData();
-  // Only feed conform-shaped data (`intent`) to `useForm` — `{ ok, message }`
-  // envelopes lack `payload` and crash conform.
+  // Only feed conform-shaped data (`status`) to `useForm` — `{ ok, message }`
+  // envelopes lack it and crash conform.
   const fetcherSubmission =
-    submitFetcher?.data && typeof submitFetcher.data === "object" && "intent" in submitFetcher.data
+    submitFetcher?.data && typeof submitFetcher.data === "object" && "status" in submitFetcher.data
       ? submitFetcher.data
       : undefined;
   const lastSubmission = submitFetcher ? fetcherSubmission : actionData;
@@ -185,10 +185,10 @@ export function UpsertScheduleForm({
       // coexist without duplicate DOM ids breaking `htmlFor` / conform.
       id: schedule?.friendlyId ? `edit-schedule-${schedule.friendlyId}` : "create-schedule",
       // TODO: type this
-      lastSubmission: lastSubmission as any,
+      lastResult: lastSubmission as any,
       shouldRevalidate: "onSubmit",
       onValidate({ formData }) {
-        return parse(formData, { schema: UpsertSchedule });
+        return parseWithZod(formData, { schema: UpsertSchedule });
       },
     });
 
@@ -233,7 +233,7 @@ export function UpsertScheduleForm({
     <FormComponent
       method="post"
       action={`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/schedules/new`}
-      {...form.props}
+      {...getFormProps(form)}
       className="grid h-full max-h-full grid-rows-[2.5rem_1fr_auto] overflow-hidden bg-background-bright"
     >
       <div className="mx-3 flex min-w-0 items-center justify-between gap-2 overflow-hidden border-b border-grid-dimmed">
@@ -259,7 +259,7 @@ export function UpsertScheduleForm({
                 <InputGroup>
                   <Label htmlFor={taskIdentifier.id}>Task</Label>
                   <Select
-                    {...conform.select(taskIdentifier)}
+                    {...getSelectProps(taskIdentifier)}
                     placeholder="Select a task"
                     defaultValue={schedule?.taskIdentifier}
                     heading={"Filter..."}
@@ -278,7 +278,7 @@ export function UpsertScheduleForm({
                       </>
                     )}
                   </Select>
-                  <FormError id={taskIdentifier.errorId}>{taskIdentifier.error}</FormError>
+                  <FormError id={taskIdentifier.errorId}>{taskIdentifier.errors}</FormError>
                 </InputGroup>
               );
             })()}
@@ -299,7 +299,7 @@ export function UpsertScheduleForm({
                 CRON pattern (UTC)
               </Label>
               <Input
-                {...conform.input(cron, { type: "text" })}
+                {...getInputProps(cron, { type: "text" })}
                 placeholder="? ? ? ? ?"
                 required={true}
                 value={cronPattern}
@@ -318,7 +318,7 @@ export function UpsertScheduleForm({
             <InputGroup>
               <Label htmlFor={timezone.id}>Timezone</Label>
               <Select
-                {...conform.select(timezone)}
+                {...getSelectProps(timezone)}
                 placeholder="Select a timezone"
                 defaultValue={selectedTimezone}
                 value={selectedTimezone}
@@ -338,7 +338,7 @@ export function UpsertScheduleForm({
                   ? "UTC will not change with daylight savings time."
                   : "This will automatically adjust for daylight savings time."}
               </Hint>
-              <FormError id={timezone.errorId}>{timezone.error}</FormError>
+              <FormError id={timezone.errorId}>{timezone.errors}</FormError>
             </InputGroup>
             {nextRuns !== undefined && (
               <div className="flex flex-col gap-1">
@@ -406,14 +406,14 @@ export function UpsertScheduleForm({
                   connected with the dev CLI.
                 </Hint>
               )}
-              <FormError id={environments.errorId}>{environments.error}</FormError>
+              <FormError id={environments.errorId}>{environments.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label required={false} htmlFor={externalId.id}>
                 External ID
               </Label>
               <Input
-                {...conform.input(externalId, { type: "text" })}
+                {...getInputProps(externalId, { type: "text" })}
                 placeholder="Optionally specify your own ID, e.g. user id"
                 defaultValue={schedule?.externalId ?? undefined}
               />
@@ -422,14 +422,14 @@ export function UpsertScheduleForm({
                 run function of your task. This allows you to have per-user CRON tasks.{" "}
                 <TextLink to={docsPath("v3/tasks-scheduled")}>Read the docs.</TextLink>
               </Hint>
-              <FormError id={externalId.errorId}>{externalId.error}</FormError>
+              <FormError id={externalId.errorId}>{externalId.errors}</FormError>
             </InputGroup>
             <InputGroup>
               <Label required={false} htmlFor={deduplicationKey.id}>
                 Deduplication key
               </Label>
               <Input
-                {...conform.input(deduplicationKey, { type: "text" })}
+                {...getInputProps(deduplicationKey, { type: "text" })}
                 disabled={schedule !== undefined}
                 defaultValue={
                   schedule?.userProvidedDeduplicationKey ? schedule?.deduplicationKey : undefined
@@ -445,9 +445,9 @@ export function UpsertScheduleForm({
                 very useful when using the SDK and you don't want to create duplicate schedules for
                 a user.
               </Hint>
-              <FormError id={deduplicationKey.errorId}>{deduplicationKey.error}</FormError>
+              <FormError id={deduplicationKey.errorId}>{deduplicationKey.errors}</FormError>
             </InputGroup>
-            <FormError>{form.error}</FormError>
+            <FormError>{form.errors}</FormError>
           </Fieldset>
         </div>
       </div>
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
index 72a2e4758b5..e55baa8dc9f 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
@@ -1,5 +1,5 @@
-import { useForm } from "@conform-to/react";
-import { parse } from "@conform-to/zod";
+import { getFormProps, useForm } from "@conform-to/react";
+import { parseWithZod } from "@conform-to/zod";
 import { CheckCircleIcon, ExclamationTriangleIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useFetcher, useNavigation, useLocation } from "@remix-run/react";
 import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
@@ -252,10 +252,10 @@ export const action = dashboardAction(
     }
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: VercelActionSchema });
+    const submission = parseWithZod(formData, { schema: VercelActionSchema });
 
-    if (!submission.value || submission.intent !== "submit") {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     const settingsPath = v3ProjectSettingsIntegrationsPath(
@@ -736,10 +736,10 @@ function ConnectedVercelProjectForm({
 
   const [configForm, fields] = useForm({
     id: "update-vercel-config",
-    lastSubmission: lastSubmission,
+    lastResult: lastSubmission,
     shouldRevalidate: "onSubmit",
     onValidate({ formData }) {
-      return parse(formData, {
+      return parseWithZod(formData, {
         schema: UpdateVercelConfigFormSchema,
       });
     },
@@ -860,7 +860,7 @@ function ConnectedVercelProjectForm({
       </div>
 
       {/* Configuration form */}
-      <Form method="post" action={actionUrl} {...configForm.props}>
+      <Form method="post" action={actionUrl} {...getFormProps(configForm)}>
         <input
           type="hidden"
           name="atomicBuilds"
@@ -1006,7 +1006,7 @@ function ConnectedVercelProjectForm({
               )}
             </div>
 
-            <FormError>{configForm.error}</FormError>
+            <FormError>{configForm.errors}</FormError>
           </InputGroup>
 
           <FormButtons
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
index 670aee165c1..7343aa411fb 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
@@ -1,5 +1,5 @@
 import { env } from "~/env.server";
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { Form, useLocation, useNavigation, useSubmit } from "@remix-run/react";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { stringifyIO, timeoutError, WaitpointTokenStatus } from "@trigger.dev/core/v3";
@@ -51,10 +51,10 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   const { organizationSlug, projectParam, envParam, waitpointFriendlyId } = Params.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: CompleteWaitpointFormData });
+  const submission = parseWithZod(formData, { schema: CompleteWaitpointFormData });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   try {
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts b/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
index f765da3534c..dbeeccc4722 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core/v3";
 import { z } from "zod";
@@ -51,10 +51,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
   }
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: PurchaseSchema });
+  const submission = parseWithZod(formData, { schema: PurchaseSchema });
 
-  if (!submission.value || submission.intent !== "submit") {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const service = new SetSchedulesAddOnService();
@@ -68,13 +68,15 @@ export async function action({ request, params }: ActionFunctionArgs) {
   );
 
   if (error) {
-    submission.error.amount = [error instanceof Error ? error.message : "Unknown error"];
-    return json(submission);
+    return json(
+      submission.reply({
+        fieldErrors: { amount: [error instanceof Error ? error.message : "Unknown error"] },
+      })
+    );
   }
 
   if (!result.success) {
-    submission.error.amount = [result.error];
-    return json(submission);
+    return json(submission.reply({ fieldErrors: { amount: [result.error] } }));
   }
 
   return json({ ok: true } as const);
diff --git a/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts b/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
index 27ffec56716..47f8092993d 100644
--- a/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
+++ b/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { type ActionFunction, json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
@@ -22,10 +22,10 @@ export const action: ActionFunction = async ({ request, params }) => {
   const { sessionParam } = ParamSchema.parse(params);
 
   const formData = await request.formData();
-  const submission = parse(formData, { schema: closeSessionSchema });
+  const submission = parseWithZod(formData, { schema: closeSessionSchema });
 
-  if (!submission.value) {
-    return json(submission);
+  if (submission.status !== "success") {
+    return json(submission.reply());
   }
 
   const { redirectUrl, environmentId, reason } = submission.value;
@@ -45,8 +45,7 @@ export const action: ActionFunction = async ({ request, params }) => {
     });
 
     if (!environment) {
-      submission.error = { environmentId: ["Environment not found"] };
-      return json(submission);
+      return json(submission.reply({ fieldErrors: { environmentId: ["Environment not found"] } }));
     }
 
     const session = await resolveSessionByIdOrExternalId(
@@ -56,8 +55,7 @@ export const action: ActionFunction = async ({ request, params }) => {
     );
 
     if (!session) {
-      submission.error = { sessionParam: ["Session not found"] };
-      return json(submission);
+      return json(submission.reply({ fieldErrors: { sessionParam: ["Session not found"] } }));
     }
 
     if (session.closedAt) {
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
index 072e0226691..672b9f99ba4 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
@@ -61,10 +61,10 @@ export const action = dashboardAction(
     const { runParam } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: cancelSchema });
+    const submission = parseWithZod(formData, { schema: cancelSchema });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
@@ -98,8 +98,7 @@ export const action = dashboardAction(
       const buffer = getMollifierBuffer();
       const entry = buffer ? await buffer.getEntry(runParam) : null;
       if (!entry) {
-        submission.error = { runParam: ["Run not found"] };
-        return json(submission);
+        return json(submission.reply({ fieldErrors: { runParam: ["Run not found"] } }));
       }
 
       // Tenancy: verify the requesting user is a member of the buffered
@@ -111,8 +110,7 @@ export const action = dashboardAction(
         select: { id: true },
       });
       if (!member) {
-        submission.error = { runParam: ["Run not found"] };
-        return json(submission);
+        return json(submission.reply({ fieldErrors: { runParam: ["Run not found"] } }));
       }
 
       const result = await buffer!.mutateSnapshot(runParam, {
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
index 9d106fca8dc..d44e6535780 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
@@ -1,4 +1,4 @@
-import { parse } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { type EnvironmentType, prettyPrintPacket } from "@trigger.dev/core/v3";
 import { typedjson } from "remix-typedjson";
@@ -304,10 +304,10 @@ export const action = dashboardAction(
     const { runParam } = params;
 
     const formData = await request.formData();
-    const submission = parse(formData, { schema: ReplayRunData });
+    const submission = parseWithZod(formData, { schema: ReplayRunData });
 
-    if (!submission.value) {
-      return json(submission);
+    if (submission.status !== "success") {
+      return json(submission.reply());
     }
 
     try {
diff --git a/apps/webapp/package.json b/apps/webapp/package.json
index ca72374fcfe..aec1291096c 100644
--- a/apps/webapp/package.json
+++ b/apps/webapp/package.json
@@ -50,8 +50,8 @@
     "@codemirror/search": "6.2.3",
     "@codemirror/state": "6.2.0",
     "@codemirror/view": "6.7.2",
-    "@conform-to/react": "0.9.2",
-    "@conform-to/zod": "0.9.2",
+    "@conform-to/react": "^1.2.2",
+    "@conform-to/zod": "^1.2.2",
     "@depot/cli": "0.0.1-cli.2.80.0",
     "@depot/sdk-node": "^1.0.0",
     "@electric-sql/react": "^0.3.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8918eafb1df..8dd348ad8ba 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -333,11 +333,11 @@ importers:
         specifier: 6.7.2
         version: 6.7.2
       '@conform-to/react':
-        specifier: 0.9.2
-        version: 0.9.2(react@18.3.1)
+        specifier: ^1.2.2
+        version: 1.19.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@conform-to/zod':
-        specifier: 0.9.2
-        version: 0.9.2(@conform-to/dom@0.9.2)(zod@3.25.76)
+        specifier: ^1.2.2
+        version: 1.19.4(zod@3.25.76)
       '@depot/cli':
         specifier: 0.0.1-cli.2.80.0
         version: 0.0.1-cli.2.80.0
@@ -3501,19 +3501,19 @@ packages:
     resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
     engines: {node: '>=0.1.90'}
 
-  '@conform-to/dom@0.9.2':
-    resolution: {integrity: sha512-vYJvXMRxa9Ieslv5eVcak5+0QbcTv+HwdLqRPZ8lhSFZx5qQWJwdou+Iz+ERzsSQHh7QS3DDYG5HmzaN4evf9g==}
+  '@conform-to/dom@1.19.4':
+    resolution: {integrity: sha512-P/mBdVRl946iE74TXmF5YLY9+1IDrQzxKdj9A7qv7Cd4l/O02EvJskg3X7cHwhmFFIXXgNzSmf/y4B597SS4gg==}
 
-  '@conform-to/react@0.9.2':
-    resolution: {integrity: sha512-0eApSadAkM5/l1JNfQqpU+O/9lkjY89riG6jnrW8DWepyGfmN/COZtT7sRXla0SVOspXGJqGcKh+nk1f7Zbpaw==}
+  '@conform-to/react@1.19.4':
+    resolution: {integrity: sha512-Xyw4hbD9467q8PTWW+Nvmf523y814w70eeABRJzVvfnpghGOAWAGt1lpOboAs6sqaKG/eouqifibz/r+PDFZLg==}
     peerDependencies:
       react: 18.3.1
+      react-dom: 18.3.1
 
-  '@conform-to/zod@0.9.2':
-    resolution: {integrity: sha512-treG9ZcuNuRERQ1uYvJSWT0zZuqHnYTzRwucg20+/WdjgKNSb60Br+Cy6BAHvVQ8dN6wJsGkHenkX2mSVw3xOA==}
+  '@conform-to/zod@1.19.4':
+    resolution: {integrity: sha512-g80QtotXLcXWCF86Xou/VpI6i+NBOQxYgLS9YCQYrgV27yilZFJYpgWWBsA8YwodmJVBIYm9RawJba7WnUoddA==}
     peerDependencies:
-      '@conform-to/dom': 0.9.2
-      zod: ^3.21.0
+      zod: ^3.21.0 || ^4.0.0
 
   '@connectrpc/connect-node@1.4.0':
     resolution: {integrity: sha512-0ANnrr6SvsjevsWEgdzHy7BaHkluZyS6s4xNoVt7RBHFR5V/kT9lPokoIbYUOU9JHzdRgTaS3x5595mwUsu15g==}
@@ -20255,16 +20255,17 @@ snapshots:
   '@colors/colors@1.5.0':
     optional: true
 
-  '@conform-to/dom@0.9.2': {}
+  '@conform-to/dom@1.19.4': {}
 
-  '@conform-to/react@0.9.2(react@18.3.1)':
+  '@conform-to/react@1.19.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@conform-to/dom': 0.9.2
+      '@conform-to/dom': 1.19.4
       react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
 
-  '@conform-to/zod@0.9.2(@conform-to/dom@0.9.2)(zod@3.25.76)':
+  '@conform-to/zod@1.19.4(zod@3.25.76)':
     dependencies:
-      '@conform-to/dom': 0.9.2
+      '@conform-to/dom': 1.19.4
       zod: 3.25.76
 
   '@connectrpc/connect-node@1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))':

From 971ffeae04e6e76f99c494ed79fb804dad19d6e6 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 17:09:01 +0100
Subject: [PATCH 2/8] fix(webapp): conform v1 form fixes from review

Address CodeRabbit feedback on the conform 1.x migration: use defaultValue
(not value) on hidden inputs so they stay uncontrolled, return the env-var
project-lookup failure as a form-level error, join multi-message field
errors when rendering, and clone alerts.emails before using it as mutable
field-list state.
---
 .../route.tsx                                             | 2 +-
 .../route.tsx                                             | 8 ++++++--
 .../route.tsx                                             | 2 +-
 .../_app.orgs.$organizationSlug_.projects.new/route.tsx   | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
index 130d68031d0..1170225fd4e 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
@@ -164,7 +164,7 @@ export const action = dashboardAction(
       },
     });
     if (!project) {
-      return json(submission.reply({ fieldErrors: { key: ["Project not found"] } }));
+      return json(submission.reply({ formErrors: ["Project not found"] }));
     }
 
     const repository = new EnvironmentVariablesRepository(prisma);
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
index 6fc8d2f8b6d..ffe79fab6ba 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
@@ -499,7 +499,9 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
             Command to install your project dependencies. This will be run from the root directory
             of your repo. Auto-detected by default.
           </Hint>
-          <FormError id={fields.installCommand.errorId}>{fields.installCommand.errors}</FormError>
+          <FormError id={fields.installCommand.errorId}>
+            {fields.installCommand.errors?.join(", ")}
+          </FormError>
         </InputGroup>
         <InputGroup fullWidth>
           <Label htmlFor={fields.preBuildCommand.id}>Pre-build command</Label>
@@ -518,7 +520,9 @@ function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings })
             Any command that needs to run before we build and deploy your project. This will be run
             from the root directory of your repo.
           </Hint>
-          <FormError id={fields.preBuildCommand.errorId}>{fields.preBuildCommand.errors}</FormError>
+          <FormError id={fields.preBuildCommand.errorId}>
+            {fields.preBuildCommand.errors?.join(", ")}
+          </FormError>
         </InputGroup>
         <div className="border-t border-grid-dimmed pt-4">
           <InputGroup>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
index 1d1b5fd1bbb..8739eaea3ec 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
@@ -228,7 +228,7 @@ function BillingAlerts({ alerts }: { alerts: BillingAlertsData["alerts"] }) {
   });
   const { emails, amount, alertLevels } = fields;
 
-  const fieldValues = useRef<string[]>(alerts.emails);
+  const fieldValues = useRef<string[]>([...alerts.emails]);
   const emailFields = emails.getFieldList();
 
   const checkboxLevels = [0.75, 0.9, 1.0, 2.0, 5.0];
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index e1862cd76e4..a917aeb34db 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -388,9 +388,9 @@ export default function Page() {
                   <FormError id={projectName.errorId}>{projectName.errors}</FormError>
                 </InputGroup>
                 {canCreateV3Projects ? (
-                  <input {...getInputProps(projectVersion, { type: "hidden" })} value={"v3"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden" })} defaultValue={"v3"} />
                 ) : (
-                  <input {...getInputProps(projectVersion, { type: "hidden" })} value={"v2"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden" })} defaultValue={"v2"} />
                 )}
 
                 <div className="border-t border-charcoal-700" />

From e5d7cff5011362989979513740975c9c627a1e88 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 17:47:12 +0100
Subject: [PATCH 3/8] fix(webapp): show conform v1 server errors in purchase
 modals

The schedules and branches add-on purchase modals detected conform
responses with "intent" in fetcher.data, but conform v1's
submission.reply() returns a status field, not intent, so lastResult was
always undefined and server-side errors never rendered. Switch the guard
to "status" in fetcher.data, matching the rest of the migration.
---
 apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx | 2 +-
 .../route.tsx                                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
index 87c378b266a..8a6623739c2 100644
--- a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
+++ b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
@@ -54,7 +54,7 @@ export function PurchaseSchedulesModal({
   const showSelfServe = useShowSelfServe();
   const fetcher = useFetcher();
   const lastSubmission =
-    fetcher.data && typeof fetcher.data === "object" && "intent" in fetcher.data
+    fetcher.data && typeof fetcher.data === "object" && "status" in fetcher.data
       ? fetcher.data
       : undefined;
   const [form, { amount }] = useForm({
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index 7c253bd8a70..976557ee9e5 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -674,7 +674,7 @@ function PurchaseBranchesModal({
   const showSelfServe = useShowSelfServe();
   const fetcher = useFetcher();
   const lastSubmission =
-    fetcher.data && typeof fetcher.data === "object" && "intent" in fetcher.data
+    fetcher.data && typeof fetcher.data === "object" && "status" in fetcher.data
       ? fetcher.data
       : undefined;
   const [form, { amount }] = useForm({

From df95d9b3487aac44177addedea0497e658a6c2bb Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 13:02:52 +0100
Subject: [PATCH 4/8] chore: upgrade to zod v4

---
 .changeset/zod-4-support.md                   |   9 +
 apps/supervisor/package.json                  |   2 +-
 .../app/components/metrics/QueryWidget.tsx    |   2 +-
 .../app/models/orgIntegration.server.ts       |   2 +-
 .../app/models/vercelIntegration.server.ts    |   2 +-
 .../app/models/vercelSdkRecovery.server.ts    |   4 +-
 .../v3/MetricDashboardPresenter.server.ts     |   2 +-
 .../app/presenters/v3/SpanPresenter.server.ts |   3 +
 .../route.tsx                                 |   2 +-
 .../route.tsx                                 |   2 +-
 .../route.tsx                                 |   2 +-
 .../app/routes/account._index/route.tsx       |   2 +-
 .../app/routes/account.tokens/route.tsx       |   2 +-
 .../webapp/app/routes/admin.feature-flags.tsx |   2 +-
 .../app/routes/api.v1.plain.customer-cards.ts |   2 +-
 .../webapp/app/routes/api.v1.prompts.$slug.ts |   2 +-
 apps/webapp/app/routes/api.v1.query.ts        |   2 +-
 apps/webapp/app/routes/api.v1.schedules.ts    |   1 +
 apps/webapp/app/routes/resources.feedback.ts  |   3 +-
 .../route.tsx                                 |   2 +-
 apps/webapp/app/services/apiAuth.server.ts    |   4 +-
 ...authorizationRateLimitMiddleware.server.ts |   2 +-
 .../app/services/queryService.server.ts       |   4 +-
 .../routeBuilders/apiBuilder.server.ts        |   2 +-
 .../routeBuilders/dashboardBuilder.server.ts  |   2 +-
 .../routeBuilders/dashboardBuilder.ts         |   2 +-
 apps/webapp/app/utils/json.ts                 |   4 +-
 apps/webapp/app/utils/timeGranularity.ts      |   2 +-
 apps/webapp/app/v3/featureFlags.server.ts     |   4 +-
 apps/webapp/app/v3/featureFlags.ts            |  33 +-
 apps/webapp/app/v3/marqs/types.ts             |   2 +-
 apps/webapp/app/v3/schedules.ts               |  37 +--
 .../v3/services/aiRunFilterService.server.ts  |   2 +-
 .../app/v3/services/replayTaskRun.server.ts   |   4 +-
 apps/webapp/app/v3/utils/zodPubSub.server.ts  |   2 +-
 .../vercel/vercelProjectIntegrationSchema.ts  |   2 +-
 apps/webapp/package.json                      |   2 +-
 internal-packages/clickhouse/package.json     |   2 +-
 .../clickhouse/src/client/tsql.ts             |   4 +-
 .../clickhouse/src/tsqlFunctions.test.ts      |   2 +-
 internal-packages/compute/package.json        |   2 +-
 internal-packages/compute/src/types.ts        |  18 +-
 internal-packages/emails/package.json         |   2 +-
 internal-packages/run-engine/package.json     |   4 +-
 .../run-engine/src/batch-queue/types.ts       |   6 +-
 .../schedule-engine/package.json              |   4 +-
 internal-packages/tsql/package.json           |   2 +-
 internal-packages/zod-worker/package.json     |   4 +-
 internal-packages/zod-worker/src/index.ts     |   8 +-
 package.json                                  |   4 +-
 packages/cli-v3/package.json                  |   7 +-
 packages/cli-v3/src/cli/common.ts             |   4 +-
 packages/cli-v3/src/commands/analyze.ts       |   4 +-
 packages/cli-v3/src/mcp/tools/agentChat.ts    |   2 +-
 packages/cli-v3/src/utilities/configFiles.ts  |   4 +-
 packages/core/package.json                    |   9 +-
 packages/core/src/schemas/eventFilter.ts      |   2 +-
 packages/core/src/schemas/json.ts             |   4 +-
 packages/core/src/v3/apiClient/index.ts       |   2 +-
 .../v3/runEngineWorker/supervisor/schemas.ts  |   4 +-
 packages/core/src/v3/schemas/api.ts           |  42 +--
 packages/core/src/v3/schemas/build.ts         |  14 +-
 packages/core/src/v3/schemas/common.ts        |  12 +-
 packages/core/src/v3/schemas/eventFilter.ts   |   2 +-
 packages/core/src/v3/schemas/messages.ts      |   4 +-
 packages/core/src/v3/schemas/openTelemetry.ts |   2 +-
 packages/core/src/v3/schemas/query.ts         |   2 +-
 packages/core/src/v3/schemas/resources.ts     |   2 +-
 packages/core/src/v3/schemas/runEngine.ts     |   2 +-
 packages/core/src/v3/schemas/schemas.ts       |  14 +-
 packages/core/src/v3/serverOnly/httpServer.ts |   5 +-
 packages/core/src/v3/types/tools.ts           |   2 +-
 packages/core/src/v3/zodIpc.ts                |   5 +-
 packages/core/src/v3/zodMessageHandler.ts     |   9 +-
 packages/core/src/v3/zodNamespace.ts          |   6 +-
 packages/core/src/v3/zodSocket.ts             |   5 +-
 packages/redis-worker/package.json            |   9 +-
 .../redis-worker/src/mollifier/schemas.ts     |   6 +-
 packages/redis-worker/src/queue.ts            |   5 +-
 packages/redis-worker/src/worker.ts           |   4 +-
 packages/schema-to-json/package.json          |   7 +-
 packages/trigger-sdk/package.json             |   4 +-
 pnpm-lock.yaml                                | 304 +++++++++---------
 83 files changed, 386 insertions(+), 345 deletions(-)
 create mode 100644 .changeset/zod-4-support.md

diff --git a/.changeset/zod-4-support.md b/.changeset/zod-4-support.md
new file mode 100644
index 00000000000..292c759d7cb
--- /dev/null
+++ b/.changeset/zod-4-support.md
@@ -0,0 +1,9 @@
+---
+"@trigger.dev/core": patch
+"@trigger.dev/sdk": patch
+"trigger.dev": patch
+"@trigger.dev/redis-worker": patch
+"@trigger.dev/schema-to-json": patch
+---
+
+Add zod v4 compatibility. The `zod` peer dependency is widened to `^3.25.0 || ^4.0.0`, so projects can use zod 3.25+ or zod 4. Internal code was updated for zod v4 API changes (`ZodError.errors` → `.issues`, single-arg `z.record` → keyed, unified `error` option, `z.ZodSchema`/`z.AnyZodObject` → `z.ZodType`/`z.ZodObject`, `z.any()` object fields made `.optional()` to preserve v3 inference). No runtime behavior change for existing zod 3 users.
diff --git a/apps/supervisor/package.json b/apps/supervisor/package.json
index 2725fe2b729..d4555061708 100644
--- a/apps/supervisor/package.json
+++ b/apps/supervisor/package.json
@@ -23,7 +23,7 @@
     "prom-client": "^15.1.0",
     "socket.io": "4.7.4",
     "std-env": "^3.8.0",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@internal/testcontainers": "workspace:*",
diff --git a/apps/webapp/app/components/metrics/QueryWidget.tsx b/apps/webapp/app/components/metrics/QueryWidget.tsx
index cde5465721b..0754d365dec 100644
--- a/apps/webapp/app/components/metrics/QueryWidget.tsx
+++ b/apps/webapp/app/components/metrics/QueryWidget.tsx
@@ -55,7 +55,7 @@ const chartConfigOptions = {
   sortByColumn: z.string().nullable(),
   sortDirection: SortDirection,
   aggregation: AggregationType,
-  seriesColors: z.record(z.string()).optional(),
+  seriesColors: z.record(z.string(), z.string()).optional(),
 };
 
 const ChartConfiguration = z.object({ ...chartConfigOptions });
diff --git a/apps/webapp/app/models/orgIntegration.server.ts b/apps/webapp/app/models/orgIntegration.server.ts
index a69aa917671..79bc2fb3205 100644
--- a/apps/webapp/app/models/orgIntegration.server.ts
+++ b/apps/webapp/app/models/orgIntegration.server.ts
@@ -20,7 +20,7 @@ const SlackSecretSchema = z.object({
   refreshToken: z.string().optional(),
   botScopes: z.array(z.string()).optional(),
   userScopes: z.array(z.string()).optional(),
-  raw: z.record(z.any()).optional(),
+  raw: z.record(z.string(), z.any()).optional(),
 });
 
 type SlackSecret = z.infer<typeof SlackSecretSchema>;
diff --git a/apps/webapp/app/models/vercelIntegration.server.ts b/apps/webapp/app/models/vercelIntegration.server.ts
index b75446a8062..6ffa5cdfd9f 100644
--- a/apps/webapp/app/models/vercelIntegration.server.ts
+++ b/apps/webapp/app/models/vercelIntegration.server.ts
@@ -151,7 +151,7 @@ export const VercelSecretSchema = z.object({
   teamId: z.string().nullable().optional(),
   userId: z.string().optional(),
   installationId: z.string().optional(),
-  raw: z.record(z.any()).optional(),
+  raw: z.record(z.string(), z.any()).optional(),
 });
 
 export type VercelSecret = z.infer<typeof VercelSecretSchema>;
diff --git a/apps/webapp/app/models/vercelSdkRecovery.server.ts b/apps/webapp/app/models/vercelSdkRecovery.server.ts
index 2fc2fb32b6a..0264bdf3a30 100644
--- a/apps/webapp/app/models/vercelSdkRecovery.server.ts
+++ b/apps/webapp/app/models/vercelSdkRecovery.server.ts
@@ -147,11 +147,11 @@ export const VercelSchemas = {
     .union([
       z
         .object({
-          envs: z.array(z.record(z.unknown())),
+          envs: z.array(z.record(z.string(), z.unknown())),
           pagination: z.unknown().optional(),
         })
         .passthrough(),
-      z.array(z.record(z.unknown())),
+      z.array(z.record(z.string(), z.unknown())),
     ])
     .transform((val) => (Array.isArray(val) ? { envs: val } : val)),
 
diff --git a/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts b/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts
index dd2c58edb2e..ba6e3008984 100644
--- a/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts
@@ -45,7 +45,7 @@ export const DashboardLayout = z.discriminatedUnion("version", [
   z.object({
     version: z.literal("1"),
     layout: z.array(LayoutItem),
-    widgets: z.record(Widget),
+    widgets: z.record(z.string(), Widget),
   }),
 ]);
 
diff --git a/apps/webapp/app/presenters/v3/SpanPresenter.server.ts b/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
index 49d8f303560..7ae096dca8f 100644
--- a/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
@@ -1004,6 +1004,9 @@ export class SpanPresenter extends BasePresenter {
         filePath: run.lockedBy?.filePath ?? "",
       },
       run: {
+        // zod v4 types the run-context `context` (z.any) field as required; it was
+        // never populated here (optional under v3), so undefined preserves behavior.
+        context: undefined,
         id: run.friendlyId,
         createdAt: run.createdAt,
         tags: run.runTags,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
index 1170225fd4e..71aa78f7b21 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
@@ -91,7 +91,7 @@ const schema = z.object({
     }
 
     return;
-  }, z.array(z.string(), { required_error: "At least one environment is required" })),
+  }, z.array(z.string(), { error: "At least one environment is required" })),
   variables: z.preprocess((i) => {
     if (!Array.isArray(i)) {
       return [];
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
index 848546a518f..3ca61c53f5d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
@@ -160,7 +160,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   if (!parsed.success) {
     return typedjson(
       {
-        error: parsed.error.errors.map((e) => e.message).join(", "),
+        error: parsed.error.issues.map((e) => e.message).join(", "),
         rows: null,
         columns: null,
         stats: null,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
index 8739eaea3ec..48a5e780d55 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
@@ -111,7 +111,7 @@ type BillingAlertsData = UseDataFunctionReturn<typeof loader>;
 
 const schema = z.object({
   amount: z
-    .number({ invalid_type_error: "Not a valid amount" })
+    .number({ error: "Not a valid amount" })
     .min(0, "Amount must be greater than 0"),
   emails: z.preprocess((i) => {
     if (typeof i === "string") return [i];
diff --git a/apps/webapp/app/routes/account._index/route.tsx b/apps/webapp/app/routes/account._index/route.tsx
index 78e8d4e572b..4eb959b5724 100644
--- a/apps/webapp/app/routes/account._index/route.tsx
+++ b/apps/webapp/app/routes/account._index/route.tsx
@@ -44,7 +44,7 @@ function createSchema(
 ) {
   return z.object({
     name: z
-      .string({ required_error: "You must enter a name" })
+      .string({ error: "You must enter a name" })
       .min(2, "Your name must be at least 2 characters long")
       .max(50),
     email: z
diff --git a/apps/webapp/app/routes/account.tokens/route.tsx b/apps/webapp/app/routes/account.tokens/route.tsx
index 931d5487ae4..fd4008b6f90 100644
--- a/apps/webapp/app/routes/account.tokens/route.tsx
+++ b/apps/webapp/app/routes/account.tokens/route.tsx
@@ -170,7 +170,7 @@ const CreateTokenSchema = z.discriminatedUnion("action", [
   z.object({
     action: z.literal("create"),
     tokenName: z
-      .string({ required_error: "You must enter a name" })
+      .string({ error: "You must enter a name" })
       .min(2, "Your name must be at least 2 characters long")
       .max(50),
     // Optional — when no RBAC plugin is installed the UI hides the
diff --git a/apps/webapp/app/routes/admin.feature-flags.tsx b/apps/webapp/app/routes/admin.feature-flags.tsx
index 71a645a88ed..f9b19d49502 100644
--- a/apps/webapp/app/routes/admin.feature-flags.tsx
+++ b/apps/webapp/app/routes/admin.feature-flags.tsx
@@ -90,7 +90,7 @@ export const action = dashboardAction(
     return json({ error: "Invalid JSON body" }, { status: 400 });
   }
 
-  const payloadSchema = z.object({ flags: z.record(z.unknown()) });
+  const payloadSchema = z.object({ flags: z.record(z.string(), z.unknown()) });
   const parsed = payloadSchema.safeParse(body);
   if (!parsed.success) {
     return json({ error: "Invalid payload" }, { status: 400 });
diff --git a/apps/webapp/app/routes/api.v1.plain.customer-cards.ts b/apps/webapp/app/routes/api.v1.plain.customer-cards.ts
index fe7845c5409..598abdb1321 100644
--- a/apps/webapp/app/routes/api.v1.plain.customer-cards.ts
+++ b/apps/webapp/app/routes/api.v1.plain.customer-cards.ts
@@ -106,7 +106,7 @@ export async function action({ request }: ActionFunctionArgs) {
 
   if (!parsed.success) {
     logger.warn("Invalid Plain customer card request", {
-      errors: parsed.error.errors,
+      errors: parsed.error.issues,
     });
     return json({ error: "Invalid request body" }, { status: 400 });
   }
diff --git a/apps/webapp/app/routes/api.v1.prompts.$slug.ts b/apps/webapp/app/routes/api.v1.prompts.$slug.ts
index 3d8de30c25c..50187b57046 100644
--- a/apps/webapp/app/routes/api.v1.prompts.$slug.ts
+++ b/apps/webapp/app/routes/api.v1.prompts.$slug.ts
@@ -92,7 +92,7 @@ export const loader = createLoaderApiRoute(
 // POST /api/v1/prompts/:slug — Resolve prompt with variables
 
 const ResolveBody = z.object({
-  variables: z.record(z.unknown()).default({}),
+  variables: z.record(z.string(), z.unknown()).default({}),
   label: z.string().optional(),
   version: z.number().optional(),
 });
diff --git a/apps/webapp/app/routes/api.v1.query.ts b/apps/webapp/app/routes/api.v1.query.ts
index 3fb6b04ec78..c0654c39a63 100644
--- a/apps/webapp/app/routes/api.v1.query.ts
+++ b/apps/webapp/app/routes/api.v1.query.ts
@@ -94,7 +94,7 @@ const { action, loader } = createActionApiRoute(
     const { result, periodClipped, maxQueryPeriod } = queryResult;
 
     if (format === "csv") {
-      const csv = rowsToCSV(result.rows, result.columns);
+      const csv = rowsToCSV(result.rows as Record<string, unknown>[], result.columns);
 
       return json({
         format: "csv",
diff --git a/apps/webapp/app/routes/api.v1.schedules.ts b/apps/webapp/app/routes/api.v1.schedules.ts
index 56250eaac55..d996af84d5c 100644
--- a/apps/webapp/app/routes/api.v1.schedules.ts
+++ b/apps/webapp/app/routes/api.v1.schedules.ts
@@ -102,6 +102,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
     environmentId: authenticationResult.environment.id,
     page: params.data.page ?? 1,
     pageSize: params.data.perPage,
+    tasks: undefined,
   });
 
   return {
diff --git a/apps/webapp/app/routes/resources.feedback.ts b/apps/webapp/app/routes/resources.feedback.ts
index e6787aa916a..cf9e75839a6 100644
--- a/apps/webapp/app/routes/resources.feedback.ts
+++ b/apps/webapp/app/routes/resources.feedback.ts
@@ -61,8 +61,7 @@ const feedbackTypeLiterals = Object.keys(feedbackTypes).map((key) => z.literal(k
 const feedbackType = z.union(
   [feedbackTypeLiterals[0], feedbackTypeLiterals[1], ...feedbackTypeLiterals.slice(2)],
   {
-    required_error: "Must be either 'bug' or 'feature'",
-    invalid_type_error: "Must be either 'bug' or 'feature'",
+    error: "Must be either 'bug' or 'feature'",
   }
 );
 
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
index 8dbfbda1511..3dddfff9f11 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
@@ -201,7 +201,7 @@ export function UpsertScheduleForm({
     if (!result.success) {
       cronPatternResult = {
         isValid: false,
-        error: result.error.errors[0].message,
+        error: result.error.issues[0].message,
       };
     } else {
       try {
diff --git a/apps/webapp/app/services/apiAuth.server.ts b/apps/webapp/app/services/apiAuth.server.ts
index c19c5d4c516..28224794d30 100644
--- a/apps/webapp/app/services/apiAuth.server.ts
+++ b/apps/webapp/app/services/apiAuth.server.ts
@@ -672,7 +672,7 @@ export async function validateJWTTokenAndRenew<T extends z.ZodTypeAny>(
       return;
     }
 
-    const renewedJwt = await renewJWTToken(payload.data);
+    const renewedJwt = await renewJWTToken(payload.data as Record<string, string>);
 
     return {
       payload: payload.data,
@@ -711,7 +711,7 @@ export async function validateJWTTokenAndRenew<T extends z.ZodTypeAny>(
       }
 
       const renewedJwt = await generateJWTTokenForEnvironment(authenticatedEnv.environment, {
-        ...payload.data,
+        ...(payload.data as Record<string, string>),
       });
 
       logger.debug("Renewed JWT token from Authorization header API Key", {
diff --git a/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts b/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
index 431a0062db8..24134a8395a 100644
--- a/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
+++ b/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
@@ -110,7 +110,7 @@ async function resolveLimitConfig(
     if (!parsedOverride.success) {
       logger.error("Error parsing rate limiter override", {
         override,
-        errors: parsedOverride.error.errors,
+        errors: parsedOverride.error.issues,
       });
 
       return defaultLimiter;
diff --git a/apps/webapp/app/services/queryService.server.ts b/apps/webapp/app/services/queryService.server.ts
index 4a576c2bf34..cb98da13848 100644
--- a/apps/webapp/app/services/queryService.server.ts
+++ b/apps/webapp/app/services/queryService.server.ts
@@ -278,7 +278,7 @@ export async function executeQuery<TOut extends z.ZodSchema>(
     const queryClickhouse = await clickhouseFactory.getClickhouseForOrganization(organizationId, "query");
     const result = await executeTSQL(queryClickhouse.reader, {
       ...baseOptions,
-      schema: z.record(z.any()),
+      schema: z.record(z.string(), z.any()),
       tableSchema: querySchemas,
       transformValues: true,
       enforcedWhereClause,
@@ -365,7 +365,7 @@ export async function executeQuery<TOut extends z.ZodSchema>(
 
     return {
       success: true,
-      result: result[1],
+      result: result[1] as Exclude<TSQLQueryResult<z.output<TOut>>[1], null>,
       queryId,
       periodClipped: periodClipped ? maxQueryPeriod : null,
       maxQueryPeriod,
diff --git a/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts b/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
index 593c916f7c9..bbc7c4cc140 100644
--- a/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
+++ b/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
@@ -86,7 +86,7 @@ async function authenticateRequestForApiBuilder(
   return { ok: true, authentication, ability: result.ability };
 }
 
-type AnyZodSchema = z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>;
+type AnyZodSchema = z.ZodType;
 
 // A multi-resource auth check has two possible directions, and route authors
 // have to pick one explicitly:
diff --git a/apps/webapp/app/services/routeBuilders/dashboardBuilder.server.ts b/apps/webapp/app/services/routeBuilders/dashboardBuilder.server.ts
index 01bdb6d9b53..42d8acd4bf2 100644
--- a/apps/webapp/app/services/routeBuilders/dashboardBuilder.server.ts
+++ b/apps/webapp/app/services/routeBuilders/dashboardBuilder.server.ts
@@ -12,7 +12,7 @@ import type { AuthorizationOption, DashboardLoaderOptions, SessionUser } from ".
 import { fromZodError } from "zod-validation-error";
 import type { z } from "zod";
 
-type AnyZodSchema = z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>;
+type AnyZodSchema = z.ZodType;
 
 function loginRedirectFor(request: Request, override?: string): Response {
   if (override) return redirect(override);
diff --git a/apps/webapp/app/services/routeBuilders/dashboardBuilder.ts b/apps/webapp/app/services/routeBuilders/dashboardBuilder.ts
index b009c218425..fca5297c1cc 100644
--- a/apps/webapp/app/services/routeBuilders/dashboardBuilder.ts
+++ b/apps/webapp/app/services/routeBuilders/dashboardBuilder.ts
@@ -17,7 +17,7 @@ import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-r
 import type { RbacAbility, RbacResource } from "@trigger.dev/rbac";
 import type { z } from "zod";
 
-type AnyZodSchema = z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>;
+type AnyZodSchema = z.ZodType;
 
 type InferZod<T> = T extends z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>
   ? z.infer<T>
diff --git a/apps/webapp/app/utils/json.ts b/apps/webapp/app/utils/json.ts
index 93e92aae0e9..02b837fd796 100644
--- a/apps/webapp/app/utils/json.ts
+++ b/apps/webapp/app/utils/json.ts
@@ -15,7 +15,7 @@ export function safeJsonParse(json?: string): unknown {
 export function safeJsonZodParse<T>(
   schema: z.Schema<T>,
   json: string
-): z.SafeParseReturnType<unknown, T> | undefined {
+): z.ZodSafeParseResult<T> | undefined {
   const parsed = safeJsonParse(json);
 
   if (parsed === null) {
@@ -51,7 +51,7 @@ export async function safeBodyFromResponse<T>(
 export async function safeParseBodyFromResponse<T>(
   response: Response,
   schema: z.Schema<T>
-): Promise<z.SafeParseReturnType<unknown, T> | undefined> {
+): Promise<z.ZodSafeParseResult<T> | undefined> {
   try {
     const unknownJson = await response.json();
 
diff --git a/apps/webapp/app/utils/timeGranularity.ts b/apps/webapp/app/utils/timeGranularity.ts
index 0d8592d27bf..1cfc6f80361 100644
--- a/apps/webapp/app/utils/timeGranularity.ts
+++ b/apps/webapp/app/utils/timeGranularity.ts
@@ -8,7 +8,7 @@ const DurationString = z
       const ms = parseDuration(val);
       return ms !== null && ms > 0;
     },
-    (val) => ({ message: `Invalid or non-positive duration string: "${val}"` })
+    { error: (issue) => `Invalid or non-positive duration string: "${issue.input}"` }
   );
 
 const BracketSchema = z.object({
diff --git a/apps/webapp/app/v3/featureFlags.server.ts b/apps/webapp/app/v3/featureFlags.server.ts
index 03353c914e6..4bf71013004 100644
--- a/apps/webapp/app/v3/featureFlags.server.ts
+++ b/apps/webapp/app/v3/featureFlags.server.ts
@@ -34,7 +34,7 @@ export function makeFlag(_prisma: PrismaClientOrTransaction = prisma) {
       const parsed = flagSchema.safeParse(opts.overrides[opts.key]);
 
       if (parsed.success) {
-        return parsed.data;
+        return parsed.data as z.infer<(typeof FeatureFlagCatalog)[T]>;
       }
     }
 
@@ -42,7 +42,7 @@ export function makeFlag(_prisma: PrismaClientOrTransaction = prisma) {
       const parsed = flagSchema.safeParse(value.value);
 
       if (parsed.success) {
-        return parsed.data;
+        return parsed.data as z.infer<(typeof FeatureFlagCatalog)[T]>;
       }
     }
 
diff --git a/apps/webapp/app/v3/featureFlags.ts b/apps/webapp/app/v3/featureFlags.ts
index bcbdd09b258..668ce06e781 100644
--- a/apps/webapp/app/v3/featureFlags.ts
+++ b/apps/webapp/app/v3/featureFlags.ts
@@ -73,8 +73,10 @@ export type FeatureFlagCatalog = z.infer<typeof FeatureFlagCatalogSchema>;
 export function validateFeatureFlagValue<T extends FeatureFlagKey>(
   key: T,
   value: unknown
-): z.SafeParseReturnType<unknown, z.infer<(typeof FeatureFlagCatalog)[T]>> {
-  return FeatureFlagCatalog[key].safeParse(value);
+): ReturnType<(typeof FeatureFlagCatalog)[T]["safeParse"]> {
+  return FeatureFlagCatalog[key].safeParse(value) as ReturnType<
+    (typeof FeatureFlagCatalog)[T]["safeParse"]
+  >;
 }
 
 // Utility function to validate all feature flags at once
@@ -94,23 +96,28 @@ export type FlagControlType =
   | { type: "number"; min?: number; max?: number }
   | { type: "string" };
 
-export function getFlagControlType(schema: z.ZodTypeAny): FlagControlType {
-  const typeName = schema._def.typeName;
+export function getFlagControlType(schema: z.ZodType): FlagControlType {
+  // zod v4: schema.def.type is a lowercase tag ("boolean"/"enum"/"number"/...).
+  const def = schema.def as {
+    type: string;
+    checks?: Array<{ _zod?: { def?: { check?: string; value?: number } } }>;
+  };
 
-  if (typeName === "ZodBoolean") {
+  if (def.type === "boolean") {
     return { type: "boolean" };
   }
 
-  if (typeName === "ZodEnum") {
-    return { type: "enum", options: schema._def.values as string[] };
+  if (def.type === "enum") {
+    return { type: "enum", options: (schema as z.ZodEnum).options as string[] };
   }
 
-  // z.coerce.number() reports as ZodNumber; pull min/max out of its checks
-  // so the UI can render a constrained number input instead of free text.
-  if (typeName === "ZodNumber") {
-    const checks = (schema._def.checks ?? []) as Array<{ kind: string; value?: number }>;
-    const min = checks.find((c) => c.kind === "min")?.value;
-    const max = checks.find((c) => c.kind === "max")?.value;
+  // z.coerce.number() reports as "number"; pull min/max out of its v4 checks
+  // (each check carries `_zod.def.{check,value}`) so the UI can render a
+  // constrained number input instead of free text.
+  if (def.type === "number") {
+    const checks = def.checks ?? [];
+    const min = checks.find((c) => c._zod?.def?.check === "greater_than")?._zod?.def?.value;
+    const max = checks.find((c) => c._zod?.def?.check === "less_than")?._zod?.def?.value;
     return { type: "number", min, max };
   }
 
diff --git a/apps/webapp/app/v3/marqs/types.ts b/apps/webapp/app/v3/marqs/types.ts
index 69e75ac44a5..34c27103093 100644
--- a/apps/webapp/app/v3/marqs/types.ts
+++ b/apps/webapp/app/v3/marqs/types.ts
@@ -77,7 +77,7 @@ export interface MarQSFairDequeueStrategy {
 
 export const MessagePayload = z.object({
   version: z.literal("1"),
-  data: z.record(z.unknown()),
+  data: z.record(z.string(), z.unknown()),
   queue: z.string(),
   messageId: z.string(),
   timestamp: z.number(),
diff --git a/apps/webapp/app/v3/schedules.ts b/apps/webapp/app/v3/schedules.ts
index e1a27355801..d97214c35a1 100644
--- a/apps/webapp/app/v3/schedules.ts
+++ b/apps/webapp/app/v3/schedules.ts
@@ -20,28 +20,25 @@ export const CronPattern = z.string().refine(
       return false;
     }
   },
-  (val) => {
-    const parts = val.split(" ");
-    if (parts.length > 5) {
-      return {
-        message: "CRON expressions with seconds are not allowed",
-      };
-    }
+  {
+    error: (issue) => {
+      const val = String(issue.input);
+      const parts = val.split(" ");
+      if (parts.length > 5) {
+        return "CRON expressions with seconds are not allowed";
+      }
 
-    if (val === "") {
-      return {
-        message: "CRON expression is required",
-      };
-    }
+      if (val === "") {
+        return "CRON expression is required";
+      }
 
-    try {
-      parseExpression(val);
-      return {
-        message: "Unknown problem",
-      };
-    } catch (e) {
-      return { message: e instanceof Error ? e.message : JSON.stringify(e) };
-    }
+      try {
+        parseExpression(val);
+        return "Unknown problem";
+      } catch (e) {
+        return e instanceof Error ? e.message : JSON.stringify(e);
+      }
+    },
   }
 );
 
diff --git a/apps/webapp/app/v3/services/aiRunFilterService.server.ts b/apps/webapp/app/v3/services/aiRunFilterService.server.ts
index 96b74ab3314..c3bc2b10e8b 100644
--- a/apps/webapp/app/v3/services/aiRunFilterService.server.ts
+++ b/apps/webapp/app/v3/services/aiRunFilterService.server.ts
@@ -258,7 +258,7 @@ export class AIRunFilterService {
       const validationResult = AIFilters.safeParse(output.filters);
       if (!validationResult.success) {
         logger.error("AI filter validation failed", {
-          errors: validationResult.error.errors,
+          errors: validationResult.error.issues,
           filters: output.filters,
         });
 
diff --git a/apps/webapp/app/v3/services/replayTaskRun.server.ts b/apps/webapp/app/v3/services/replayTaskRun.server.ts
index ed2292e32b2..b2680302efd 100644
--- a/apps/webapp/app/v3/services/replayTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/replayTaskRun.server.ts
@@ -20,7 +20,9 @@ type OverrideOptions = {
   metadata?: unknown;
   bulkActionId?: string;
   triggerSource?: string;
-} & RunOptionsData;
+  // zod v4 types `.optional().transform()` fields as required-with-undefined in the
+  // output; Partial keeps them omittable for callers passing a subset of overrides.
+} & Partial<RunOptionsData>;
 
 export class ReplayTaskRunService extends BaseService {
   public async call(existingTaskRun: TaskRun, overrideOptions: OverrideOptions = {}) {
diff --git a/apps/webapp/app/v3/utils/zodPubSub.server.ts b/apps/webapp/app/v3/utils/zodPubSub.server.ts
index 2c081bc368d..fbcc69c07cc 100644
--- a/apps/webapp/app/v3/utils/zodPubSub.server.ts
+++ b/apps/webapp/app/v3/utils/zodPubSub.server.ts
@@ -52,7 +52,7 @@ class RedisZodSubscriber<TMessageCatalog extends ZodMessageCatalogSchema>
     eventName: K,
     listener: (payload: z.infer<TMessageCatalog[K]>) => Promise<void>
   ): void {
-    this._listeners.set(eventName as string, listener);
+    this._listeners.set(eventName as string, listener as Parameters<typeof this._listeners.set>[1]);
   }
 
   public async stopListening(): Promise<void> {
diff --git a/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts b/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
index 95cff1a480e..5246d3af1f7 100644
--- a/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
+++ b/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
@@ -61,7 +61,7 @@ export type TriggerEnvironmentType = z.infer<typeof TriggerEnvironmentType>;
  * Missing env slug = sync all vars. Missing var in env = sync by default.
  * Only explicitly `false` entries disable sync.
  */
-export const SyncEnvVarsMappingSchema = z.record(EnvSlugSchema, z.record(z.string(), z.boolean())).default({});
+export const SyncEnvVarsMappingSchema = z.partialRecord(EnvSlugSchema, z.record(z.string(), z.boolean())).default({});
 
 export type SyncEnvVarsMapping = z.infer<typeof SyncEnvVarsMappingSchema>;
 
diff --git a/apps/webapp/package.json b/apps/webapp/package.json
index aec1291096c..26f632a636b 100644
--- a/apps/webapp/package.json
+++ b/apps/webapp/package.json
@@ -239,7 +239,7 @@
     "ulidx": "^2.2.1",
     "uuid": "^14.0.0",
     "ws": "^8.11.0",
-    "zod": "3.25.76",
+    "zod": "4.4.3",
     "zod-error": "1.5.0",
     "zod-validation-error": "^1.5.0"
   },
diff --git a/internal-packages/clickhouse/package.json b/internal-packages/clickhouse/package.json
index ec5ec25e667..c3f87cf62dc 100644
--- a/internal-packages/clickhouse/package.json
+++ b/internal-packages/clickhouse/package.json
@@ -10,7 +10,7 @@
     "@internal/tracing": "workspace:*",
     "@internal/tsql": "workspace:*",
     "@trigger.dev/core": "workspace:*",
-    "zod": "3.25.76",
+    "zod": "4.4.3",
     "zod-error": "1.5.0"
   },
   "devDependencies": {
diff --git a/internal-packages/clickhouse/src/client/tsql.ts b/internal-packages/clickhouse/src/client/tsql.ts
index 0a8367e7173..fb09b9d4dda 100644
--- a/internal-packages/clickhouse/src/client/tsql.ts
+++ b/internal-packages/clickhouse/src/client/tsql.ts
@@ -202,7 +202,7 @@ export async function executeTSQL<TOut extends z.ZodSchema>(
     const queryFn = reader.queryWithStats({
       name: isExplain ? `${options.name}-explain` : options.name,
       query: queryToExecute,
-      params: z.record(z.any()),
+      params: z.record(z.string(), z.any()),
       // EXPLAIN returns rows with an 'explain' column
       schema: isExplain ? z.object({ explain: z.string() }) : options.schema,
       settings: options.clickhouseSettings,
@@ -236,7 +236,7 @@ export async function executeTSQL<TOut extends z.ZodSchema>(
           const additionalQueryFn = reader.queryWithStats({
             name: `${options.name}-explain-${explainType.name.toLowerCase()}`,
             query: explainType.query,
-            params: z.record(z.any()),
+            params: z.record(z.string(), z.any()),
             schema: z.object({ explain: z.string() }),
             settings: options.clickhouseSettings,
           });
diff --git a/internal-packages/clickhouse/src/tsqlFunctions.test.ts b/internal-packages/clickhouse/src/tsqlFunctions.test.ts
index 6959338256a..a53167e153d 100644
--- a/internal-packages/clickhouse/src/tsqlFunctions.test.ts
+++ b/internal-packages/clickhouse/src/tsqlFunctions.test.ts
@@ -94,7 +94,7 @@ async function assertQueryExecutes(client: ClickhouseClient, tsqlQuery: string):
   const [error] = await executeTSQL(client, {
     name: "func-test",
     query: tsqlQuery,
-    schema: z.record(z.any()),
+    schema: z.record(z.string(), z.any()),
     enforcedWhereClause,
     tableSchema: [taskRunsSchema],
   });
diff --git a/internal-packages/compute/package.json b/internal-packages/compute/package.json
index 4e221879382..c5045878f54 100644
--- a/internal-packages/compute/package.json
+++ b/internal-packages/compute/package.json
@@ -14,7 +14,7 @@
     }
   },
   "dependencies": {
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "rimraf": "6.0.1"
diff --git a/internal-packages/compute/src/types.ts b/internal-packages/compute/src/types.ts
index 5d8d5e26af9..fd878334efa 100644
--- a/internal-packages/compute/src/types.ts
+++ b/internal-packages/compute/src/types.ts
@@ -15,7 +15,7 @@ export const TemplateCreateRequestSchema = z.object({
   callback: z
     .object({
       url: z.string(),
-      metadata: z.record(z.string()).optional(),
+      metadata: z.record(z.string(), z.string()).optional(),
     })
     .optional(),
 });
@@ -38,14 +38,14 @@ export type TemplateCreateResponse = z.infer<typeof TemplateCreateResponseSchema
 export const InstanceCreateRequestSchema = z.object({
   name: z.string(),
   image: z.string(),
-  env: z.record(z.string()),
+  env: z.record(z.string(), z.string()),
   cpu: z.number(),
   memory_gb: z.number(),
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
   // Per-instance identity labels; the provider promotes a configured subset
   // to network-policy selection. Distinct from metadata, which is
   // observability-only and never selected on.
-  labels: z.record(z.string()).optional(),
+  labels: z.record(z.string(), z.string()).optional(),
 });
 export type InstanceCreateRequest = z.infer<typeof InstanceCreateRequestSchema>;
 
@@ -58,7 +58,7 @@ export type InstanceCreateResponse = z.infer<typeof InstanceCreateResponseSchema
 export const InstanceSnapshotRequestSchema = z.object({
   callback: z.object({
     url: z.string(),
-    metadata: z.record(z.string()),
+    metadata: z.record(z.string(), z.string()),
   }),
 });
 export type InstanceSnapshotRequest = z.infer<typeof InstanceSnapshotRequestSchema>;
@@ -67,13 +67,13 @@ export type InstanceSnapshotRequest = z.infer<typeof InstanceSnapshotRequestSche
 
 export const SnapshotRestoreRequestSchema = z.object({
   name: z.string(),
-  metadata: z.record(z.string()),
+  metadata: z.record(z.string(), z.string()),
   cpu: z.number(),
   memory_gb: z.number(),
   // Per-instance identity labels; the caller must resupply the same set as on
   // create. The provider doesn't persist them across a snapshot, so omitting
   // them drops the restored run's policy-based network selection.
-  labels: z.record(z.string()).optional(),
+  labels: z.record(z.string(), z.string()).optional(),
 });
 export type SnapshotRestoreRequest = z.infer<typeof SnapshotRestoreRequestSchema>;
 
@@ -82,14 +82,14 @@ export const SnapshotCallbackPayloadSchema = z.discriminatedUnion("status", [
     status: z.literal("completed"),
     snapshot_id: z.string(),
     instance_id: z.string(),
-    metadata: z.record(z.string()).optional(),
+    metadata: z.record(z.string(), z.string()).optional(),
     duration_ms: z.number().optional(),
   }),
   z.object({
     status: z.literal("failed"),
     instance_id: z.string(),
     error: z.string().optional(),
-    metadata: z.record(z.string()).optional(),
+    metadata: z.record(z.string(), z.string()).optional(),
     duration_ms: z.number().optional(),
   }),
 ]);
diff --git a/internal-packages/emails/package.json b/internal-packages/emails/package.json
index a3091eb97d2..6d088646b80 100644
--- a/internal-packages/emails/package.json
+++ b/internal-packages/emails/package.json
@@ -18,7 +18,7 @@
     "react-dom": "^18.2.0",
     "resend": "^3.2.0",
     "tiny-invariant": "^1.2.0",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@types/nodemailer": "^8.0.0",
diff --git a/internal-packages/run-engine/package.json b/internal-packages/run-engine/package.json
index 414452da3b2..0fdfd0b952f 100644
--- a/internal-packages/run-engine/package.json
+++ b/internal-packages/run-engine/package.json
@@ -31,7 +31,7 @@
     "nanoid": "3.3.8",
     "redlock": "5.0.0-beta.2",
     "seedrandom": "^3.0.5",
-    "zod": "3.25.76",
+    "zod": "4.4.3",
     "p-map": "^6.0.0"
   },
   "devDependencies": {
@@ -48,4 +48,4 @@
     "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "dev": "tsc --watch  -p tsconfig.build.json"
   }
-}
\ No newline at end of file
+}
diff --git a/internal-packages/run-engine/src/batch-queue/types.ts b/internal-packages/run-engine/src/batch-queue/types.ts
index dfb89c3eb2d..2e386bddfb4 100644
--- a/internal-packages/run-engine/src/batch-queue/types.ts
+++ b/internal-packages/run-engine/src/batch-queue/types.ts
@@ -37,7 +37,7 @@ export const BatchItem = z.object({
    */
   payloadType: z.string().optional(),
   /** Options for this specific item - stored as JSON */
-  options: z.record(z.unknown()).optional(),
+  options: z.record(z.string(), z.unknown()).optional(),
 });
 export type BatchItem = z.infer<typeof BatchItem>;
 
@@ -68,7 +68,7 @@ export const BatchMeta = z.object({
   /** Trigger version */
   triggerVersion: z.string().optional(),
   /** Trace context */
-  traceContext: z.record(z.unknown()).optional(),
+  traceContext: z.record(z.string(), z.unknown()).optional(),
   /** Whether span parent should be a link */
   spanParentAsLink: z.boolean().optional(),
   /** Realtime streams version */
@@ -103,7 +103,7 @@ export const BatchItemFailure = z.object({
    */
   payload: z.string().optional(),
   /** The options that were used */
-  options: z.record(z.unknown()).optional(),
+  options: z.record(z.string(), z.unknown()).optional(),
   /** Error message */
   error: z.string(),
   /** Error code if available */
diff --git a/internal-packages/schedule-engine/package.json b/internal-packages/schedule-engine/package.json
index 86929a39341..b8a53a75f6c 100644
--- a/internal-packages/schedule-engine/package.json
+++ b/internal-packages/schedule-engine/package.json
@@ -22,7 +22,7 @@
     "cron-parser": "^4.9.0",
     "cronstrue": "^2.50.0",
     "nanoid": "3.3.8",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@internal/testcontainers": "workspace:*",
@@ -36,4 +36,4 @@
     "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "dev": "tsc --watch  -p tsconfig.build.json"
   }
-}
\ No newline at end of file
+}
diff --git a/internal-packages/tsql/package.json b/internal-packages/tsql/package.json
index 0cac36e7b27..3c86630738f 100644
--- a/internal-packages/tsql/package.json
+++ b/internal-packages/tsql/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@trigger.dev/core": "workspace:*",
     "antlr4ts": "0.5.0-alpha.4",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",
diff --git a/internal-packages/zod-worker/package.json b/internal-packages/zod-worker/package.json
index 352fa945293..5413b365f91 100644
--- a/internal-packages/zod-worker/package.json
+++ b/internal-packages/zod-worker/package.json
@@ -10,7 +10,7 @@
     "@trigger.dev/database": "workspace:*",
     "graphile-worker": "0.16.6",
     "lodash.omit": "^4.5.0",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "devDependencies": {
     "@types/lodash.omit": "^4.5.7",
@@ -19,4 +19,4 @@
   "scripts": {
     "typecheck": "tsc --noEmit"
   }
-}
\ No newline at end of file
+}
diff --git a/internal-packages/zod-worker/src/index.ts b/internal-packages/zod-worker/src/index.ts
index 2428a103fa5..d70eae2f23d 100644
--- a/internal-packages/zod-worker/src/index.ts
+++ b/internal-packages/zod-worker/src/index.ts
@@ -59,7 +59,7 @@ const GraphileJobSchema = z.object({
   revision: z.number(),
   locked_at: z.coerce.date().nullable(),
   locked_by: z.string().nullable(),
-  flags: z.record(z.boolean()).nullable(),
+  flags: z.record(z.string(), z.boolean()).nullable(),
 });
 
 const AddJobResultsSchema = z.array(GraphileJobSchema);
@@ -531,7 +531,7 @@ export class ZodWorker<TMessageCatalog extends MessageCatalogSchema> {
   async #rescheduleTask(payload: unknown, helpers: JobHelpers) {
     this.#logDebug("Rescheduling task", { payload, job: helpers.job });
 
-    await this.enqueue(helpers.job.task_identifier, payload, {
+    await this.enqueue(helpers.job.task_identifier, payload as Parameters<typeof this.enqueue>[1], {
       runAt: helpers.job.run_at,
       priority: helpers.job.priority,
       jobKey: helpers.job.key ?? undefined,
@@ -592,7 +592,7 @@ export class ZodWorker<TMessageCatalog extends MessageCatalogSchema> {
       throw new Error(`Unknown message type: ${String(typeName)}`);
     }
 
-    const payload = messageSchema.parse(rawPayload);
+    const payload = (messageSchema as z.ZodType).parse(rawPayload);
     const job = helpers.job;
 
     this.#logger.debug("Received worker task, calling handler", {
@@ -632,7 +632,7 @@ export class ZodWorker<TMessageCatalog extends MessageCatalogSchema> {
       },
       async (span) => {
         try {
-          await task.handler(payload, job, helpers);
+          await task.handler(payload as Parameters<typeof task.handler>[0], job, helpers);
         } catch (error) {
           if (error instanceof Error) {
             span.recordException(error);
diff --git a/package.json b/package.json
index 9c4b38c0aac..7942eea9298 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,9 @@
       "tmp@<0.2.7": "0.2.7",
       "brace-expansion@<1.1.13": "1.1.13",
       "brace-expansion@>=2 <2.0.3": "2.0.3",
-      "brace-expansion@>=5 <5.0.6": "5.0.6"
+      "brace-expansion@>=5 <5.0.6": "5.0.6",
+      "zod": "4.4.3",
+      "@trigger.dev/platform>zod": "3.23.8"
     },
     "onlyBuiltDependencies": [
       "@depot/cli",
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
index a8dc8908f60..2b98f6d8088 100644
--- a/packages/cli-v3/package.json
+++ b/packages/cli-v3/package.json
@@ -69,7 +69,8 @@
     "rimraf": "^6.0.1",
     "ts-essentials": "10.0.1",
     "tshy": "^3.0.2",
-    "tsx": "4.17.0"
+    "tsx": "4.17.0",
+    "zod": "4.4.3"
   },
   "scripts": {
     "clean": "rimraf dist .tshy .tshy-build .turbo",
@@ -148,7 +149,6 @@
     "tinyglobby": "^0.2.10",
     "ws": "^8.18.0",
     "xdg-app-paths": "^8.3.0",
-    "zod": "3.25.76",
     "zod-validation-error": "^1.5.0"
   },
   "engines": {
@@ -162,5 +162,8 @@
         "default": "./dist/esm/index.js"
       }
     }
+  },
+  "peerDependencies": {
+    "zod": "^3.25.0 || ^4.0.0"
   }
 }
diff --git a/packages/cli-v3/src/cli/common.ts b/packages/cli-v3/src/cli/common.ts
index f251e4e5ef4..29ecb1ee763 100644
--- a/packages/cli-v3/src/cli/common.ts
+++ b/packages/cli-v3/src/cli/common.ts
@@ -42,7 +42,7 @@ export async function handleTelemetry(action: () => Promise<void>) {
   }
 }
 
-export async function wrapCommandAction<T extends z.AnyZodObject, TResult>(
+export async function wrapCommandAction<T extends z.ZodObject<any>, TResult>(
   name: string,
   schema: T,
   options: unknown,
@@ -55,7 +55,7 @@ export async function wrapCommandAction<T extends z.AnyZodObject, TResult>(
       throw new Error(fromZodError(parsedOptions.error).toString());
     }
 
-    logger.loggerLevel = parsedOptions.data.logLevel;
+    logger.loggerLevel = parsedOptions.data.logLevel as typeof logger.loggerLevel;
 
     logger.debug(`Running "${name}" with the following options`, {
       options: options,
diff --git a/packages/cli-v3/src/commands/analyze.ts b/packages/cli-v3/src/commands/analyze.ts
index e8264f9336f..3f584da4db2 100644
--- a/packages/cli-v3/src/commands/analyze.ts
+++ b/packages/cli-v3/src/commands/analyze.ts
@@ -113,14 +113,14 @@ const ImportSchema = z.object({
   kind: ImportKind,
   external: z.boolean().optional(),
   original: z.string().optional(),
-  with: z.record(z.string()).optional(),
+  with: z.record(z.string(), z.string()).optional(),
 });
 
 const InputSchema = z.object({
   bytes: z.number(),
   imports: z.array(ImportSchema),
   format: z.enum(["cjs", "esm"]).optional(),
-  with: z.record(z.string()).optional(),
+  with: z.record(z.string(), z.string()).optional(),
 });
 
 const OutputImportSchema = z.object({
diff --git a/packages/cli-v3/src/mcp/tools/agentChat.ts b/packages/cli-v3/src/mcp/tools/agentChat.ts
index 816d1d5f9d0..f6fa77c34b7 100644
--- a/packages/cli-v3/src/mcp/tools/agentChat.ts
+++ b/packages/cli-v3/src/mcp/tools/agentChat.ts
@@ -72,7 +72,7 @@ const StartAgentChatInput = CommonProjectsInput.extend({
     .describe("A unique conversation ID. Reuse to resume a conversation.")
     .optional(),
   clientData: z
-    .record(z.unknown())
+    .record(z.string(), z.unknown())
     .describe("Client data to include with every message (e.g. userId, model).")
     .optional(),
   preload: z
diff --git a/packages/cli-v3/src/utilities/configFiles.ts b/packages/cli-v3/src/utilities/configFiles.ts
index 2e6455c68d1..56aaa68e1d4 100644
--- a/packages/cli-v3/src/utilities/configFiles.ts
+++ b/packages/cli-v3/src/utilities/configFiles.ts
@@ -22,13 +22,13 @@ const CliConfigProfileSettings = z.object({
 });
 type CliConfigProfileSettings = z.infer<typeof CliConfigProfileSettings>;
 
-const OldCliConfigFile = z.record(CliConfigProfileSettings);
+const OldCliConfigFile = z.record(z.string(), CliConfigProfileSettings);
 type OldCliConfigFile = z.infer<typeof OldCliConfigFile>;
 
 const CliConfigFile = z.object({
   version: z.literal(2),
   currentProfile: z.string().default(DEFFAULT_PROFILE),
-  profiles: z.record(CliConfigProfileSettings),
+  profiles: z.record(z.string(), CliConfigProfileSettings),
   settings: z
     .object({
       hasSeenMCPInstallPrompt: z.boolean().optional(),
diff --git a/packages/core/package.json b/packages/core/package.json
index a3d220c6eac..80b57a92884 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -221,7 +221,6 @@
     "std-env": "^3.8.1",
     "tinyexec": "^0.3.2",
     "uncrypto": "^0.1.3",
-    "zod": "3.25.76",
     "zod-error": "1.5.0",
     "zod-validation-error": "^1.5.0"
   },
@@ -241,7 +240,8 @@
     "superjson": "^2.2.1",
     "ts-essentials": "10.0.1",
     "tshy": "^3.0.2",
-    "tsx": "4.17.0"
+    "tsx": "4.17.0",
+    "zod": "4.4.3"
   },
   "engines": {
     "node": ">=18.20.0"
@@ -648,5 +648,8 @@
   "type": "module",
   "main": "./dist/commonjs/index.js",
   "types": "./dist/commonjs/index.d.ts",
-  "module": "./dist/esm/index.js"
+  "module": "./dist/esm/index.js",
+  "peerDependencies": {
+    "zod": "^3.25.0 || ^4.0.0"
+  }
 }
diff --git a/packages/core/src/schemas/eventFilter.ts b/packages/core/src/schemas/eventFilter.ts
index 81be2e7c12e..ccd9269bf42 100644
--- a/packages/core/src/schemas/eventFilter.ts
+++ b/packages/core/src/schemas/eventFilter.ts
@@ -65,7 +65,7 @@ type EventMatcher = z.infer<typeof EventMatcherSchema>;
 export type EventFilter = { [key: string]: EventMatcher | EventFilter };
 
 export const EventFilterSchema: z.ZodType<EventFilter> = z.lazy(() =>
-  z.record(z.union([EventMatcherSchema, EventFilterSchema]))
+  z.record(z.string(), z.union([EventMatcherSchema, EventFilterSchema]))
 );
 
 export const EventRuleSchema = z.object({
diff --git a/packages/core/src/schemas/json.ts b/packages/core/src/schemas/json.ts
index 79384db156a..32dd506c8ff 100644
--- a/packages/core/src/schemas/json.ts
+++ b/packages/core/src/schemas/json.ts
@@ -6,7 +6,7 @@ type Literal = z.infer<typeof LiteralSchema>;
 export type DeserializedJson = Literal | { [key: string]: DeserializedJson } | DeserializedJson[];
 
 export const DeserializedJsonSchema: z.ZodType<DeserializedJson> = z.lazy(() =>
-  z.union([LiteralSchema, z.array(DeserializedJsonSchema), z.record(DeserializedJsonSchema)])
+  z.union([LiteralSchema, z.array(DeserializedJsonSchema), z.record(z.string(), DeserializedJsonSchema)])
 );
 
 const SerializableSchema = z.union([
@@ -26,5 +26,5 @@ export type SerializableJson =
   | SerializableJson[];
 
 export const SerializableJsonSchema: z.ZodType<SerializableJson> = z.lazy(() =>
-  z.union([SerializableSchema, z.array(SerializableJsonSchema), z.record(SerializableJsonSchema)])
+  z.union([SerializableSchema, z.array(SerializableJsonSchema), z.record(z.string(), SerializableJsonSchema)])
 );
diff --git a/packages/core/src/v3/apiClient/index.ts b/packages/core/src/v3/apiClient/index.ts
index 652b016de92..97d450625f2 100644
--- a/packages/core/src/v3/apiClient/index.ts
+++ b/packages/core/src/v3/apiClient/index.ts
@@ -1800,7 +1800,7 @@ export class ApiClient {
 
   async generateJWTClaims(requestOptions?: ZodFetchOptions): Promise<Record<string, any>> {
     return zodfetch(
-      z.record(z.any()),
+      z.record(z.string(), z.any()),
       `${this.baseUrl}/api/v1/auth/jwt/claims`,
       {
         method: "POST",
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts b/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts
index e5360c6ed6b..778bdb395b7 100644
--- a/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts
+++ b/packages/core/src/v3/runEngineWorker/supervisor/schemas.ts
@@ -51,7 +51,7 @@ export type WorkerApiContinueRunExecutionRequestBody = z.infer<
 >;
 
 export const WorkerApiConnectRequestBody = z.object({
-  metadata: z.record(z.any()),
+  metadata: z.record(z.string(), z.any()),
 });
 export type WorkerApiConnectRequestBody = z.infer<typeof WorkerApiConnectRequestBody>;
 
@@ -104,7 +104,7 @@ export type WorkerApiRunAttemptStartRequestBody = z.infer<
 
 export const WorkerApiRunAttemptStartResponseBody = StartRunAttemptResult.and(
   z.object({
-    envVars: z.record(z.string()),
+    envVars: z.record(z.string(), z.string()),
   })
 );
 export type WorkerApiRunAttemptStartResponseBody = z.infer<
diff --git a/packages/core/src/v3/schemas/api.ts b/packages/core/src/v3/schemas/api.ts
index 155bb77b7a0..81db884c059 100644
--- a/packages/core/src/v3/schemas/api.ts
+++ b/packages/core/src/v3/schemas/api.ts
@@ -183,7 +183,7 @@ const ConcurrencyKeySchema = z.union([z.string(), z.number()]).transform((value)
 export const TriggerTaskRequestBody = z
   .object({
     payload: z.any(),
-    context: z.any(),
+    context: z.any().optional(),
     options: z
       .object({
         /** @deprecated engine v1 only */
@@ -234,7 +234,7 @@ export const TriggerTaskRequestBody = z
         machine: MachinePresetName.optional(),
         maxAttempts: z.number().int().optional(),
         maxDuration: z.number().optional(),
-        metadata: z.any(),
+        metadata: z.any().optional(),
         metadataType: z.string().optional(),
         payloadType: z.string().optional(),
         tags: RunTags.optional(),
@@ -287,7 +287,7 @@ export type BatchTriggerTaskRequestBody = z.infer<typeof BatchTriggerTaskRequest
 export const BatchTriggerTaskItem = z.object({
   task: z.string(),
   payload: z.any(),
-  context: z.any(),
+  context: z.any().optional(),
   options: z
     .object({
       concurrencyKey: ConcurrencyKeySchema.optional(),
@@ -306,7 +306,7 @@ export const BatchTriggerTaskItem = z.object({
       machine: MachinePresetName.optional(),
       maxAttempts: z.number().int().optional(),
       maxDuration: z.number().optional(),
-      metadata: z.any(),
+      metadata: z.any().optional(),
       metadataType: z.string().optional(),
       parentAttempt: z.string().optional(),
       payloadType: z.string().optional(),
@@ -442,7 +442,7 @@ export type CreateBatchResponse = z.infer<typeof CreateBatchResponse>;
  *
  * `options` reuses the strict shape from BatchTriggerTaskItem so that the
  * Phase-2 streaming path validates option fields identically to the V2/V3
- * batch trigger endpoints — historically this used z.record(z.unknown()) and
+ * batch trigger endpoints — historically this used z.record(z.string(), z.unknown()) and
  * let invalid values (e.g. numeric concurrencyKey) reach Prisma.
  */
 export const BatchItemNDJSON = z.object({
@@ -514,7 +514,7 @@ export const RescheduleRunRequestBody = z.object({
 export type RescheduleRunRequestBody = z.infer<typeof RescheduleRunRequestBody>;
 
 export const GetEnvironmentVariablesResponseBody = z.object({
-  variables: z.record(z.string()),
+  variables: z.record(z.string(), z.string()),
 });
 
 export type GetEnvironmentVariablesResponseBody = z.infer<
@@ -628,7 +628,7 @@ export type CreateArtifactRequestBody = z.infer<typeof CreateArtifactRequestBody
 export const CreateArtifactResponseBody = z.object({
   artifactKey: z.string(),
   uploadUrl: z.string(),
-  uploadFields: z.record(z.string()),
+  uploadFields: z.record(z.string(), z.string()),
   expiresAt: z.string().datetime(),
 });
 
@@ -1174,7 +1174,7 @@ const CommonRunFields = {
   costInCents: z.number(),
   baseCostInCents: z.number(),
   durationMs: z.number(),
-  metadata: z.record(z.any()).optional(),
+  metadata: z.record(z.string(), z.any()).optional(),
   taskKind: z.string().optional(),
   region: z.string().optional(),
 };
@@ -1241,8 +1241,8 @@ export type UpdateEnvironmentVariableRequestBody = z.infer<
 >;
 
 export const ImportEnvironmentVariablesRequestBody = z.object({
-  variables: z.record(z.string()),
-  parentVariables: z.record(z.string()).optional(),
+  variables: z.record(z.string(), z.string()),
+  parentVariables: z.record(z.string(), z.string()).optional(),
   override: z.boolean().optional(),
   // When omitted, variables default to non-secret (the DB default is false).
   isSecret: z.boolean().optional(),
@@ -1299,7 +1299,7 @@ export const UpdateMetadataRequestBody = FlushedRunMetadata;
 export type UpdateMetadataRequestBody = z.infer<typeof UpdateMetadataRequestBody>;
 
 export const UpdateMetadataResponseBody = z.object({
-  metadata: z.record(DeserializedJsonSchema),
+  metadata: z.record(z.string(), DeserializedJsonSchema),
 });
 
 export type UpdateMetadataResponseBody = z.infer<typeof UpdateMetadataResponseBody>;
@@ -1571,7 +1571,7 @@ export type CompleteWaitpointTokenRequestBody = z.infer<typeof CompleteWaitpoint
  * server's trigger machinery.
  */
 export const SessionTriggerConfig = z.object({
-  basePayload: z.record(z.unknown()),
+  basePayload: z.record(z.string(), z.unknown()),
   machine: MachinePresetName.optional(),
   queue: z.string().max(128).optional(),
   tags: z.array(z.string().max(128)).max(5).optional(),
@@ -1614,7 +1614,7 @@ export const CreateSessionRequestBody = z.object({
   /** Up to 10 tags for dashboard filtering. */
   tags: z.array(z.string().max(128)).max(10).optional(),
   /** Arbitrary JSON metadata. */
-  metadata: z.record(z.unknown()).optional(),
+  metadata: z.record(z.string(), z.unknown()).optional(),
   /** Absolute expiry timestamp for retention. */
   expiresAt: z.coerce.date().optional(),
 });
@@ -1639,7 +1639,7 @@ export const SessionItem = z.object({
    */
   currentRunId: z.string().nullable().optional(),
   tags: z.array(z.string()),
-  metadata: z.record(z.unknown()).nullable(),
+  metadata: z.record(z.string(), z.unknown()).nullable(),
   closedAt: z.coerce.date().nullable(),
   closedReason: z.string().nullable(),
   expiresAt: z.coerce.date().nullable(),
@@ -1691,7 +1691,7 @@ export type EndAndContinueSessionResponseBody = z.infer<typeof EndAndContinueSes
 
 export const UpdateSessionRequestBody = z.object({
   tags: z.array(z.string().max(128)).max(10).optional(),
-  metadata: z.record(z.unknown()).nullable().optional(),
+  metadata: z.record(z.string(), z.unknown()).nullable().optional(),
   // Null explicitly clears the externalId; non-null values must be non-empty.
   externalId: z
     .union([
@@ -1901,7 +1901,7 @@ export const ApiDeploymentListResponseItem = z.object({
     "TIMED_OUT",
   ]),
   deployedAt: z.coerce.date().optional(),
-  git: z.record(z.any()).optional(),
+  git: z.record(z.string(), z.any()).optional(),
   error: DeploymentErrorData.optional(),
 });
 
@@ -1917,7 +1917,7 @@ export const ApiBranchListResponseBody = z.object({
       name: z.string(),
       createdAt: z.coerce.date(),
       updatedAt: z.coerce.date(),
-      git: z.record(z.any()).optional(),
+      git: z.record(z.string(), z.any()).optional(),
       isPaused: z.boolean(),
     })
   ),
@@ -1943,7 +1943,7 @@ export const RetrieveRunTraceSpanSchema = z.object({
     workerVersion: z.string().optional(),
     queueName: z.string().optional(),
     machinePreset: z.string().optional(),
-    properties: z.record(z.any()).optional(),
+    properties: z.record(z.string(), z.any()).optional(),
     output: z.unknown().optional(),
   }),
 });
@@ -1977,7 +1977,7 @@ export const RetrieveSpanDetailResponseBody = z.object({
   level: z.string(),
   startTime: z.coerce.date(),
   durationMs: z.number(),
-  properties: z.record(z.any()).optional(),
+  properties: z.record(z.string(), z.any()).optional(),
   events: z.array(z.any()).optional(),
   entityType: z.string().optional(),
   ai: z
@@ -2066,7 +2066,7 @@ export type ReadSessionStreamRecordsResponseBody = z.infer<
 >;
 
 export const ResolvePromptRequestBody = z.object({
-  variables: z.record(z.unknown()).default({}),
+  variables: z.record(z.string(), z.unknown()).default({}),
   label: z.string().optional(),
   version: z.number().optional(),
 });
@@ -2081,7 +2081,7 @@ export const ResolvePromptResponseBody = z.object({
     template: z.string().optional(),
     text: z.string().optional(),
     model: z.string().optional().nullable(),
-    config: z.record(z.unknown()).optional().nullable(),
+    config: z.record(z.string(), z.unknown()).optional().nullable(),
   }),
 });
 export type ResolvePromptResponseBody = z.infer<typeof ResolvePromptResponseBody>;
diff --git a/packages/core/src/v3/schemas/build.ts b/packages/core/src/v3/schemas/build.ts
index e1543529a48..b1c7337cc46 100644
--- a/packages/core/src/v3/schemas/build.ts
+++ b/packages/core/src/v3/schemas/build.ts
@@ -33,7 +33,7 @@ export const BuildManifest = z.object({
   branch: z.string().optional(),
   config: ConfigManifest,
   files: z.array(TaskFile),
-  sources: z.record(
+  sources: z.record(z.string(), 
     z.object({
       contents: z.string(),
       contentHash: z.string(),
@@ -49,16 +49,16 @@ export const BuildManifest = z.object({
   configPath: z.string(),
   externals: BuildExternal.array().optional(),
   build: z.object({
-    env: z.record(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
     commands: z.array(z.string()).optional(),
   }),
   customConditions: z.array(z.string()).optional(),
   deploy: z.object({
-    env: z.record(z.string()).optional(),
+    env: z.record(z.string(), z.string()).optional(),
     sync: z
       .object({
-        env: z.record(z.string()).optional(),
-        parentEnv: z.record(z.string()).optional(),
+        env: z.record(z.string(), z.string()).optional(),
+        parentEnv: z.record(z.string(), z.string()).optional(),
       })
       .optional(),
   }),
@@ -75,7 +75,7 @@ export const BuildManifest = z.object({
     })
     .optional(),
   /** Maps output file paths to their content hashes for deduplication during dev */
-  outputHashes: z.record(z.string()).optional(),
+  outputHashes: z.record(z.string(), z.string()).optional(),
   /** Skills discovered and bundled into `.trigger/skills/{id}/` under `outputPath`. */
   skills: SkillManifest.array().optional(),
 });
@@ -104,7 +104,7 @@ export const WorkerManifest = z.object({
   runtime: BuildRuntime,
   runtimeVersion: z.string().optional(),
   customConditions: z.array(z.string()).optional(),
-  timings: z.record(z.number()).optional(),
+  timings: z.record(z.string(), z.number()).optional(),
   processKeepAlive: z
     .object({
       enabled: z.boolean(),
diff --git a/packages/core/src/v3/schemas/common.ts b/packages/core/src/v3/schemas/common.ts
index 4de2ddb5802..afe6faf4a7c 100644
--- a/packages/core/src/v3/schemas/common.ts
+++ b/packages/core/src/v3/schemas/common.ts
@@ -6,7 +6,7 @@ export type Enum<T extends string> = { [K in T]: K };
 
 export const RunMetadataUpdateOperation = z.object({
   type: z.literal("update"),
-  value: z.record(z.unknown()),
+  value: z.record(z.string(), z.unknown()),
 });
 
 export type RunMetadataUpdateOperation = z.infer<typeof RunMetadataUpdateOperation>;
@@ -62,7 +62,7 @@ export const RunMetadataChangeOperation = z.discriminatedUnion("type", [
 export type RunMetadataChangeOperation = z.infer<typeof RunMetadataChangeOperation>;
 
 export const FlushedRunMetadata = z.object({
-  metadata: z.record(DeserializedJsonSchema).optional(),
+  metadata: z.record(z.string(), DeserializedJsonSchema).optional(),
   operations: z.array(RunMetadataChangeOperation).optional(),
   parentOperations: z.array(RunMetadataChangeOperation).optional(),
   rootOperations: z.array(RunMetadataChangeOperation).optional(),
@@ -225,7 +225,7 @@ export const TaskRun = z.object({
   idempotencyKeyScope: z.enum(["run", "attempt", "global"]).optional(),
   maxAttempts: z.number().optional(),
   version: z.string().optional(),
-  metadata: z.record(DeserializedJsonSchema).optional(),
+  metadata: z.record(z.string(), DeserializedJsonSchema).optional(),
   maxDuration: z.number().optional(),
   /** The priority of the run. Wih a value of 10 it will be dequeued before runs that were triggered 9 seconds before it (assuming they had no priority set).  */
   priority: z.number().optional(),
@@ -346,7 +346,7 @@ export const TaskRunExecution = z.object({
   attempt: TaskRunExecutionAttempt.passthrough(),
   run: TaskRun.and(
     z.object({
-      traceContext: z.record(z.unknown()).optional(),
+      traceContext: z.record(z.string(), z.unknown()).optional(),
       realtimeStreamsVersion: z.string().optional(),
     })
   ),
@@ -389,7 +389,7 @@ export const V3TaskRun = z.object({
   idempotencyKeyScope: z.enum(["run", "attempt", "global"]).optional(),
   maxAttempts: z.number().optional(),
   version: z.string().optional(),
-  metadata: z.record(DeserializedJsonSchema).optional(),
+  metadata: z.record(z.string(), DeserializedJsonSchema).optional(),
   maxDuration: z.number().optional(),
   context: z.unknown(),
   durationMs: z.number(),
@@ -404,7 +404,7 @@ export const V3TaskRunExecution = z.object({
   attempt: V3TaskRunExecutionAttempt,
   run: V3TaskRun.and(
     z.object({
-      traceContext: z.record(z.unknown()).optional(),
+      traceContext: z.record(z.string(), z.unknown()).optional(),
     })
   ),
   queue: TaskRunExecutionQueue,
diff --git a/packages/core/src/v3/schemas/eventFilter.ts b/packages/core/src/v3/schemas/eventFilter.ts
index 6ddda362108..698ae49184f 100644
--- a/packages/core/src/v3/schemas/eventFilter.ts
+++ b/packages/core/src/v3/schemas/eventFilter.ts
@@ -65,5 +65,5 @@ type EventMatcher = z.infer<typeof EventMatcher>;
 export type EventFilter = { [key: string]: EventMatcher | EventFilter };
 
 export const EventFilter: z.ZodType<EventFilter> = z.lazy(() =>
-  z.record(z.union([EventMatcher, EventFilter]))
+  z.record(z.string(), z.union([EventMatcher, EventFilter]))
 );
diff --git a/packages/core/src/v3/schemas/messages.ts b/packages/core/src/v3/schemas/messages.ts
index 2c7c357c3b7..d0076da3adc 100644
--- a/packages/core/src/v3/schemas/messages.ts
+++ b/packages/core/src/v3/schemas/messages.ts
@@ -207,10 +207,10 @@ export const WorkerToExecutorMessageCatalog = {
     message: z.object({
       version: z.literal("v1").default("v1"),
       execution: TaskRunExecution,
-      traceContext: z.record(z.unknown()),
+      traceContext: z.record(z.string(), z.unknown()),
       metadata: ServerBackgroundWorker,
       metrics: TaskRunExecutionMetrics.optional(),
-      env: z.record(z.string()).optional(),
+      env: z.record(z.string(), z.string()).optional(),
       isWarmStart: z.boolean().optional(),
     }),
   },
diff --git a/packages/core/src/v3/schemas/openTelemetry.ts b/packages/core/src/v3/schemas/openTelemetry.ts
index 47d9d9a50d9..785805b94e5 100644
--- a/packages/core/src/v3/schemas/openTelemetry.ts
+++ b/packages/core/src/v3/schemas/openTelemetry.ts
@@ -43,7 +43,7 @@ export type AttemptFailedSpanEvent = z.infer<typeof AttemptFailedSpanEvent>;
 export const OtherSpanEvent = z.object({
   name: z.string(),
   time: z.coerce.date(),
-  properties: z.record(z.unknown()),
+  properties: z.record(z.string(), z.unknown()),
 });
 
 export type OtherSpanEvent = z.infer<typeof OtherSpanEvent>;
diff --git a/packages/core/src/v3/schemas/query.ts b/packages/core/src/v3/schemas/query.ts
index 3910ab4f5d7..6820cf7849c 100644
--- a/packages/core/src/v3/schemas/query.ts
+++ b/packages/core/src/v3/schemas/query.ts
@@ -22,7 +22,7 @@ export type QueryExecuteRequestBody = z.infer<typeof QueryExecuteRequestBody>;
  */
 export const QueryExecuteJSONResponseBody = z.object({
   format: z.literal("json"),
-  results: z.array(z.record(z.any())),
+  results: z.array(z.record(z.string(), z.any())),
 });
 
 export type QueryExecuteJSONResponseBody = z.infer<typeof QueryExecuteJSONResponseBody>;
diff --git a/packages/core/src/v3/schemas/resources.ts b/packages/core/src/v3/schemas/resources.ts
index 753324d1257..923c29355be 100644
--- a/packages/core/src/v3/schemas/resources.ts
+++ b/packages/core/src/v3/schemas/resources.ts
@@ -46,7 +46,7 @@ export const PromptResource = z.object({
   /** Default model identifier */
   model: z.string().optional(),
   /** Default model config (temperature, maxTokens, etc.) */
-  config: z.record(z.unknown()).optional(),
+  config: z.record(z.string(), z.unknown()).optional(),
   /** JSONSchema7 for template variables */
   variableSchema: z.unknown().optional(),
 });
diff --git a/packages/core/src/v3/schemas/runEngine.ts b/packages/core/src/v3/schemas/runEngine.ts
index 5ea22960bf2..15a3305a07e 100644
--- a/packages/core/src/v3/schemas/runEngine.ts
+++ b/packages/core/src/v3/schemas/runEngine.ts
@@ -285,7 +285,7 @@ export const DequeuedMessage = z.object({
     machine: MachinePreset,
     attemptNumber: z.number(),
     masterQueue: z.string(),
-    traceContext: z.record(z.unknown()),
+    traceContext: z.record(z.string(), z.unknown()),
     annotations: RunAnnotations.optional(),
   }),
   environment: z.object({
diff --git a/packages/core/src/v3/schemas/schemas.ts b/packages/core/src/v3/schemas/schemas.ts
index 95564cb1efc..b651a312e28 100644
--- a/packages/core/src/v3/schemas/schemas.ts
+++ b/packages/core/src/v3/schemas/schemas.ts
@@ -31,8 +31,8 @@ export type TaskRunExecutionMetrics = z.infer<typeof TaskRunExecutionMetrics>;
 
 export const TaskRunExecutionPayload = z.object({
   execution: TaskRunExecution,
-  traceContext: z.record(z.unknown()),
-  environment: z.record(z.string()).optional(),
+  traceContext: z.record(z.string(), z.unknown()),
+  environment: z.record(z.string(), z.string()).optional(),
   metrics: TaskRunExecutionMetrics.optional(),
 });
 
@@ -56,8 +56,8 @@ export type V3ProdTaskRunExecution = z.infer<typeof V3ProdTaskRunExecution>;
 
 export const V3ProdTaskRunExecutionPayload = z.object({
   execution: V3ProdTaskRunExecution,
-  traceContext: z.record(z.unknown()),
-  environment: z.record(z.string()).optional(),
+  traceContext: z.record(z.string(), z.unknown()),
+  environment: z.record(z.string(), z.string()).optional(),
   metrics: TaskRunExecutionMetrics.optional(),
 });
 
@@ -231,7 +231,7 @@ const promptMetadata = {
   description: z.string().optional(),
   content: z.string().optional(),
   model: z.string().optional(),
-  config: z.record(z.unknown()).optional(),
+  config: z.record(z.string(), z.unknown()).optional(),
   variableSchema: z.unknown().optional(),
 };
 
@@ -320,8 +320,8 @@ export const TaskRunExecutionLazyAttemptPayload = z.object({
   messageId: z.string(),
   isTest: z.boolean(),
   isReplay: z.boolean().default(false),
-  traceContext: z.record(z.unknown()),
-  environment: z.record(z.string()).optional(),
+  traceContext: z.record(z.string(), z.unknown()),
+  environment: z.record(z.string(), z.string()).optional(),
   metrics: TaskRunExecutionMetrics.optional(),
 });
 
diff --git a/packages/core/src/v3/serverOnly/httpServer.ts b/packages/core/src/v3/serverOnly/httpServer.ts
index 1dcddf8f15a..ffd01b67582 100644
--- a/packages/core/src/v3/serverOnly/httpServer.ts
+++ b/packages/core/src/v3/serverOnly/httpServer.ts
@@ -295,13 +295,14 @@ export class HttpServer {
       return { success: true, data };
     }
 
-    const parsed = schema.safeParse(data);
+    // zod v4 narrows the generic schema to $ZodTypes here; cast to the public ZodType (has safeParse in v3 & v4)
+    const parsed = (schema as unknown as z.ZodType).safeParse(data);
 
     if (!parsed.success) {
       return { success: false, error: parsed.error.message };
     }
 
-    return { success: true, data: parsed.data };
+    return { success: true, data: parsed.data as TSchema extends z.ZodFirstPartySchemaTypes ? z.infer<TSchema> : TData };
   }
 
   private parseQueryParams(url: string): Record<string, string> {
diff --git a/packages/core/src/v3/types/tools.ts b/packages/core/src/v3/types/tools.ts
index 8c3aac80bf1..2bad1465ee5 100644
--- a/packages/core/src/v3/types/tools.ts
+++ b/packages/core/src/v3/types/tools.ts
@@ -14,7 +14,7 @@ export type inferToolParameters<PARAMETERS extends ToolTaskParameters> =
 export function convertToolParametersToSchema<TToolParameters extends ToolTaskParameters>(
   toolParameters: TToolParameters
 ): Schema {
-  return toolParameters instanceof z.ZodSchema
+  return toolParameters instanceof z.ZodType
     ? toolParameters
     : convertAISchemaToTaskSchema(toolParameters);
 }
diff --git a/packages/core/src/v3/zodIpc.ts b/packages/core/src/v3/zodIpc.ts
index f42de5a9ddf..7cda582d9b8 100644
--- a/packages/core/src/v3/zodIpc.ts
+++ b/packages/core/src/v3/zodIpc.ts
@@ -85,7 +85,8 @@ class ZodIpcMessageHandler<
       return;
     }
 
-    const ack = await handler(parsedMessage.payload, this.#sender);
+    // parsedMessage.payload is parsed output at runtime; zod v4 distinguishes input/output
+    const ack = await handler(parsedMessage.payload as Parameters<typeof handler>[0], this.#sender);
 
     return ack;
   }
@@ -321,7 +322,7 @@ export class ZodIpcConnection<
         );
       }, timeoutInMs ?? defaultTimeoutInMs);
 
-      this.#acks.set(currentId, { resolve, reject, timeout });
+      this.#acks.set(currentId, { resolve: resolve as (value: unknown) => void, reject, timeout });
 
       const schema = this.opts.emitSchema[type]?.["message"];
 
diff --git a/packages/core/src/v3/zodMessageHandler.ts b/packages/core/src/v3/zodMessageHandler.ts
index 7e1f71fd55c..c6164aa59cf 100644
--- a/packages/core/src/v3/zodMessageHandler.ts
+++ b/packages/core/src/v3/zodMessageHandler.ts
@@ -109,7 +109,8 @@ export class ZodMessageHandler<TMessageCatalog extends ZodMessageCatalogSchema>
       };
     }
 
-    const ack = await handler(parsedMessage.data.payload);
+    // parsedMessage.data.payload is parsed output at runtime; zod v4 distinguishes input/output
+    const ack = await handler(parsedMessage.data.payload as Parameters<typeof handler>[0]);
 
     return {
       success: true,
@@ -277,7 +278,8 @@ export class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {
     }
 
     try {
-      await this.#sender({ type, payload, version: "v1" });
+      // send side: payload is input; zod v4 distinguishes input/output on the sender signature
+      await this.#sender({ type, payload: payload as any, version: "v1" });
     } catch (error) {
       console.error("[ZodMessageSender] Failed to send message", error);
     }
@@ -332,7 +334,8 @@ export async function sendMessageInCatalog<TMessageCatalog extends ZodMessageCat
     throw new ZodSchemaParsedError(parsedPayload.error, payload);
   }
 
-  await sender({ type, payload, version: "v1" });
+  // send side: payload is input; zod v4 distinguishes input/output on the sender signature
+  await sender({ type, payload: payload as any, version: "v1" });
 }
 
 export type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {
diff --git a/packages/core/src/v3/zodNamespace.ts b/packages/core/src/v3/zodNamespace.ts
index 38316d66184..28d2757af70 100644
--- a/packages/core/src/v3/zodNamespace.ts
+++ b/packages/core/src/v3/zodNamespace.ts
@@ -19,7 +19,7 @@ export type ZodNamespaceSocket<
   TClientMessages extends ZodSocketMessageCatalogSchema,
   TServerMessages extends ZodSocketMessageCatalogSchema,
   TServerSideEvents extends EventsMap = DefaultEventsMap,
-  TSocketData extends z.ZodObject<any, any, any> = any,
+  TSocketData extends z.ZodObject<any, any> = any,
 > = Socket<
   ZodMessageCatalogToSocketIoEvents<TClientMessages>,
   ZodMessageCatalogToSocketIoEvents<TServerMessages>,
@@ -31,7 +31,7 @@ interface ZodNamespaceOptions<
   TClientMessages extends ZodSocketMessageCatalogSchema,
   TServerMessages extends ZodSocketMessageCatalogSchema,
   TServerSideEvents extends EventsMap = DefaultEventsMap,
-  TSocketData extends z.ZodObject<any, any, any> = any,
+  TSocketData extends z.ZodObject<any, any> = any,
 > {
   io: Server;
   name: string;
@@ -74,7 +74,7 @@ interface ZodNamespaceOptions<
 export class ZodNamespace<
   TClientMessages extends ZodSocketMessageCatalogSchema,
   TServerMessages extends ZodSocketMessageCatalogSchema,
-  TSocketData extends z.ZodObject<any, any, any> = any,
+  TSocketData extends z.ZodObject<any, any> = any,
   TServerSideEvents extends EventsMap = DefaultEventsMap,
 > {
   #logger: StructuredLogger;
diff --git a/packages/core/src/v3/zodSocket.ts b/packages/core/src/v3/zodSocket.ts
index 5ec1f179a4f..fec1ec8696f 100644
--- a/packages/core/src/v3/zodSocket.ts
+++ b/packages/core/src/v3/zodSocket.ts
@@ -127,7 +127,8 @@ export class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalog
       return;
     }
 
-    const ack = await handler(payload);
+    // payload is the parsed output at runtime; zod v4 distinguishes input/output so cast to the handler's expected arg
+    const ack = await handler(payload as Parameters<typeof handler>[0]);
 
     return ack;
   }
@@ -313,7 +314,7 @@ export class ZodSocketMessageSender<TMessageCatalog extends ZodSocketMessageCata
     // @ts-expect-error
     const callbackResult = await socket.emitWithAck(type, { payload, version: "v1" });
 
-    return callbackResult;
+    return callbackResult as z.infer<GetSocketCallbackSchema<TMessageCatalog, K>>;
   }
 }
 
diff --git a/packages/redis-worker/package.json b/packages/redis-worker/package.json
index 22b8a1b62d8..c9d5a7346fa 100644
--- a/packages/redis-worker/package.json
+++ b/packages/redis-worker/package.json
@@ -28,7 +28,6 @@
     "nanoid": "^5.0.7",
     "p-limit": "^6.2.0",
     "seedrandom": "^3.0.5",
-    "zod": "3.25.76",
     "cron-parser": "^4.9.0"
   },
   "devDependencies": {
@@ -39,7 +38,8 @@
     "@types/seedrandom": "^3.0.8",
     "rimraf": "6.0.1",
     "tsup": "^8.4.0",
-    "tsx": "4.17.0"
+    "tsx": "4.17.0",
+    "zod": "4.4.3"
   },
   "engines": {
     "node": ">=18.20.0"
@@ -53,5 +53,8 @@
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     }
+  },
+  "peerDependencies": {
+    "zod": "^3.25.0 || ^4.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/redis-worker/src/mollifier/schemas.ts b/packages/redis-worker/src/mollifier/schemas.ts
index 5acd0c7c15d..39d9743df1b 100644
--- a/packages/redis-worker/src/mollifier/schemas.ts
+++ b/packages/redis-worker/src/mollifier/schemas.ts
@@ -53,12 +53,12 @@ export const BufferEntrySchema = z.object({
   // so an entry written by an accept Lua predating this field — or one
   // surviving across the deploy that introduced it — still parses instead
   // of being silently dropped on pop.
-  createdAtMicros: stringToInt.default("0"),
+  createdAtMicros: stringToInt.default(0),
   // Drainer-ack flag: `true` once the drainer has materialised this run
   // into PG. The hash persists for a short grace TTL after ack so direct
   // reads (retrieve, trace, etc.) still resolve while PG replica lag
   // settles. Absent on pre-ack entries.
-  materialised: stringToBool.default("false"),
+  materialised: stringToBool.default(false),
   // Denormalised pointer to the Redis idempotency lookup key (set when
   // the run was accepted with an idempotency key, empty otherwise). The
   // ack Lua reads this to DEL the lookup atomically with marking the
@@ -68,7 +68,7 @@ export const BufferEntrySchema = z.object({
   // Incremented atomically by the CAS metadata Lua. Matches the
   // semantic of `TaskRun.metadataVersion` on the PG side (which the
   // UpdateMetadataService uses for the same retry-on-conflict pattern).
-  metadataVersion: stringToInt.default("0"),
+  metadataVersion: stringToInt.default(0),
   lastError: stringToError.optional(),
 });
 
diff --git a/packages/redis-worker/src/queue.ts b/packages/redis-worker/src/queue.ts
index e4c593a148d..daf2d96bdda 100644
--- a/packages/redis-worker/src/queue.ts
+++ b/packages/redis-worker/src/queue.ts
@@ -217,7 +217,8 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
           continue;
         }
 
-        const validatedItem = schema.safeParse(parsedItem.item);
+        // zod v4 narrows the generic schema union here; cast to public ZodType (has safeParse in v3 & v4)
+        const validatedItem = (schema as z.ZodType).safeParse(parsedItem.item);
 
         if (!validatedItem.success) {
           this.logger.error("Invalid item in queue", {
@@ -236,7 +237,7 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
         dequeuedItems.push({
           id,
           job: parsedItem.job,
-          item: validatedItem.data,
+          item: validatedItem.data as QueueItem<TMessageCatalog>["item"],
           visibilityTimeoutMs,
           attempt: parsedItem.attempt ?? 0,
           timestamp,
diff --git a/packages/redis-worker/src/worker.ts b/packages/redis-worker/src/worker.ts
index 51812e575ea..3f9c342eb9c 100644
--- a/packages/redis-worker/src/worker.ts
+++ b/packages/redis-worker/src/worker.ts
@@ -1056,11 +1056,13 @@ class Worker<TCatalog extends WorkerCatalog> {
     const enqueued = await this.enqueueOnce({
       id: identifier,
       job,
+      // job is a runtime string here, so K widens and the payload can't match a
+      // single catalog entry statically; the shape is correct for the cron job.
       payload: {
         timestamp: scheduledAt.getTime(),
         lastTimestamp: lastTimestamp?.getTime(),
         cron,
-      },
+      } as z.infer<TCatalog[string]["schema"]>,
       availableAt,
     });
 
diff --git a/packages/schema-to-json/package.json b/packages/schema-to-json/package.json
index b1be66594a5..a028356ec73 100644
--- a/packages/schema-to-json/package.json
+++ b/packages/schema-to-json/package.json
@@ -44,7 +44,6 @@
     "@trigger.dev/core": "workspace:*",
     "zod-to-json-schema": "^3.24.0",
     "@sodaru/yup-to-json-schema": "^2",
-    "zod": "3.25.76",
     "effect": "^3"
   },
   "devDependencies": {
@@ -56,14 +55,16 @@
     "valibot": "^1.1.0",
     "yup": "^1.7.0",
     "rimraf": "6.0.1",
-    "@arethetypeswrong/cli": "^0.15.4"
+    "@arethetypeswrong/cli": "^0.15.4",
+    "zod": "4.4.3"
   },
   "peerDependencies": {
     "arktype": ">=2.0.0",
     "runtypes": ">=5.0.0",
     "superstruct": ">=0.14.2",
     "@sinclair/typebox": ">=0.34.30",
-    "valibot": ">=0.41.0"
+    "valibot": ">=0.41.0",
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "peerDependenciesMeta": {
     "arktype": {
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
index 87591c52420..7a89737d5a8 100644
--- a/packages/trigger-sdk/package.json
+++ b/packages/trigger-sdk/package.json
@@ -101,13 +101,13 @@
     "tshy": "^3.0.2",
     "tsx": "4.17.0",
     "typed-emitter": "^2.1.0",
-    "zod": "3.25.76"
+    "zod": "4.4.3"
   },
   "peerDependencies": {
     "@ai-sdk/otel": ">=1.0.0-0 <2",
     "ai": "^5.0.0 || ^6.0.0 || >=7.0.0-canary <8",
     "react": "^18.0 || ^19.0",
-    "zod": "^3.0.0 || ^4.0.0"
+    "zod": "^3.25.0 || ^4.0.0"
   },
   "peerDependenciesMeta": {
     "@ai-sdk/otel": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8dd348ad8ba..47aca405f96 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -47,6 +47,8 @@ overrides:
   brace-expansion@<1.1.13: 1.1.13
   brace-expansion@>=2 <2.0.3: 2.0.3
   brace-expansion@>=5 <5.0.6: 5.0.6
+  zod: 4.4.3
+  '@trigger.dev/platform>zod': 3.23.8
 
 patchedDependencies:
   '@changesets/assemble-release-plan@5.2.4':
@@ -251,8 +253,8 @@ importers:
         specifier: ^3.8.0
         version: 3.8.1
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -265,13 +267,13 @@ importers:
     dependencies:
       '@ai-sdk/anthropic':
         specifier: ^3.0.0
-        version: 3.0.84(zod@3.25.76)
+        version: 3.0.84(zod@4.4.3)
       '@ai-sdk/openai':
         specifier: ^3.0.0
-        version: 3.0.41(zod@3.25.76)
+        version: 3.0.41(zod@4.4.3)
       '@ai-sdk/react':
         specifier: ^3.0.0
-        version: 3.0.170(react@18.3.1)(zod@3.25.76)
+        version: 3.0.170(react@18.3.1)(zod@4.4.3)
       '@ariakit/react':
         specifier: ^0.4.6
         version: 0.4.6(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -337,7 +339,7 @@ importers:
         version: 1.19.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@conform-to/zod':
         specifier: ^1.2.2
-        version: 1.19.4(zod@3.25.76)
+        version: 1.19.4(zod@4.4.3)
       '@depot/cli':
         specifier: 0.0.1-cli.2.80.0
         version: 0.0.1-cli.2.80.0
@@ -619,7 +621,7 @@ importers:
         version: 1.1.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       ai:
         specifier: 6.0.116
-        version: 6.0.116(zod@3.25.76)
+        version: 6.0.116(zod@4.4.3)
       assert-never:
         specifier: ^1.2.1
         version: 1.2.1
@@ -832,7 +834,7 @@ importers:
         version: 0.3.1(@remix-run/react@2.17.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@remix-run/server-runtime@2.17.4(typescript@5.5.4))(react@18.3.1)
       remix-utils:
         specifier: ^7.7.0
-        version: 7.7.0(@remix-run/node@2.17.4(typescript@5.5.4))(@remix-run/react@2.17.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@remix-run/router@1.23.2(patch_hash=f14fb2af2690628a0164b66d98e8d7cd6a0e8a4a30a51e53cfb1b6caeca6f7c9))(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.3.1)(zod@3.25.76)
+        version: 7.7.0(@remix-run/node@2.17.4(typescript@5.5.4))(@remix-run/react@2.17.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@remix-run/router@1.23.2(patch_hash=f14fb2af2690628a0164b66d98e8d7cd6a0e8a4a30a51e53cfb1b6caeca6f7c9))(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.3.1)(zod@4.4.3)
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
@@ -900,14 +902,14 @@ importers:
         specifier: ^8.11.0
         version: 8.12.0(bufferutil@4.0.9)
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.25.76)
+        version: 1.5.0(zod@4.4.3)
     devDependencies:
       '@internal/clickhouse':
         specifier: workspace:*
@@ -1058,7 +1060,7 @@ importers:
         version: 2.0.5(eslint@8.31.0)
       evalite:
         specifier: 1.0.0-beta.16
-        version: 1.0.0-beta.16(ai@6.0.116(zod@3.25.76))(better-sqlite3@11.10.0)(bufferutil@4.0.9)
+        version: 1.0.0-beta.16(ai@6.0.116(zod@4.4.3))(better-sqlite3@11.10.0)(bufferutil@4.0.9)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
@@ -1140,8 +1142,8 @@ importers:
         specifier: workspace:*
         version: link:../../packages/core
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
@@ -1156,8 +1158,8 @@ importers:
   internal-packages/compute:
     dependencies:
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       rimraf:
         specifier: 6.0.1
@@ -1167,7 +1169,7 @@ importers:
     dependencies:
       '@ai-sdk/anthropic':
         specifier: ^3.0.0
-        version: 3.0.84(zod@3.25.76)
+        version: 3.0.84(zod@4.4.3)
       '@internal/dashboard-agent-db':
         specifier: workspace:*
         version: link:../dashboard-agent-db
@@ -1176,10 +1178,10 @@ importers:
         version: link:../../packages/trigger-sdk
       ai:
         specifier: 6.0.116
-        version: 6.0.116(zod@3.25.76)
+        version: 6.0.116(zod@4.4.3)
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@ai-sdk/provider':
         specifier: 3.0.8
@@ -1253,8 +1255,8 @@ importers:
         specifier: ^1.2.0
         version: 1.3.1
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@types/nodemailer':
         specifier: ^8.0.0
@@ -1399,8 +1401,8 @@ importers:
         specifier: ^3.0.5
         version: 3.0.5
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -1458,8 +1460,8 @@ importers:
         specifier: 3.3.8
         version: 3.3.8
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -1567,8 +1569,8 @@ importers:
         specifier: 0.5.0-alpha.4
         version: 0.5.0-alpha.4(patch_hash=b5d41129ddbf7c4cbb0288244b2c8d041ee0803c5102c1181c180408d3b579f4)
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       antlr4ts-cli:
         specifier: 0.5.0-alpha.4
@@ -1592,8 +1594,8 @@ importers:
         specifier: ^4.5.0
         version: 4.5.0
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
     devDependencies:
       '@types/lodash.omit':
         specifier: ^4.5.7
@@ -1655,7 +1657,7 @@ importers:
         version: 0.0.1-cli.2.80.0
       '@modelcontextprotocol/sdk':
         specifier: ^1.25.2
-        version: 1.25.2(hono@4.12.15)(supports-color@10.0.0)(zod@3.25.76)
+        version: 1.25.2(hono@4.12.15)(supports-color@10.0.0)(zod@4.4.3)
       '@opentelemetry/api':
         specifier: 1.9.1
         version: 1.9.1
@@ -1836,12 +1838,9 @@ importers:
       xdg-app-paths:
         specifier: ^8.3.0
         version: 8.3.0
-      zod:
-        specifier: 3.25.76
-        version: 3.25.76
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.25.76)
+        version: 1.5.0(zod@4.4.3)
     devDependencies:
       '@epic-web/test-server':
         specifier: ^0.1.0
@@ -1900,6 +1899,9 @@ importers:
       tsx:
         specifier: 4.17.0
         version: 4.17.0
+      zod:
+        specifier: 4.4.3
+        version: 4.4.3
 
   packages/core:
     dependencies:
@@ -1999,19 +2001,16 @@ importers:
       uncrypto:
         specifier: ^0.1.3
         version: 0.1.3
-      zod:
-        specifier: 3.25.76
-        version: 3.25.76
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.25.76)
+        version: 1.5.0(zod@4.4.3)
     devDependencies:
       '@ai-sdk/provider-utils':
         specifier: ^1.0.22
-        version: 1.0.22(zod@3.25.76)
+        version: 1.0.22(zod@4.4.3)
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
         version: 0.15.4
@@ -2032,10 +2031,10 @@ importers:
         version: 4.0.14
       ai:
         specifier: 6.0.116
-        version: 6.0.116(zod@3.25.76)
+        version: 6.0.116(zod@4.4.3)
       ai-v7:
         specifier: npm:ai@7.0.0-canary.159
-        version: ai@7.0.0-canary.159(zod@3.25.76)
+        version: ai@7.0.0-canary.159(zod@4.4.3)
       defu:
         specifier: ^6.1.5
         version: 6.1.7
@@ -2057,6 +2056,9 @@ importers:
       tsx:
         specifier: 4.17.0
         version: 4.17.0
+      zod:
+        specifier: 4.4.3
+        version: 4.4.3
 
   packages/plugins:
     dependencies:
@@ -2171,9 +2173,6 @@ importers:
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
-      zod:
-        specifier: 3.25.76
-        version: 3.25.76
     devDependencies:
       '@internal/redis':
         specifier: workspace:*
@@ -2199,6 +2198,9 @@ importers:
       tsx:
         specifier: 4.17.0
         version: 4.17.0
+      zod:
+        specifier: 4.4.3
+        version: 4.4.3
 
   packages/rsc:
     dependencies:
@@ -2251,12 +2253,9 @@ importers:
       effect:
         specifier: ^3
         version: 3.17.1
-      zod:
-        specifier: 3.25.76
-        version: 3.25.76
       zod-to-json-schema:
         specifier: ^3.24.0
-        version: 3.24.6(zod@3.25.76)
+        version: 3.24.6(zod@4.4.3)
     devDependencies:
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
@@ -2285,12 +2284,15 @@ importers:
       yup:
         specifier: ^1.7.0
         version: 1.7.0
+      zod:
+        specifier: 4.4.3
+        version: 4.4.3
 
   packages/trigger-sdk:
     dependencies:
       '@ai-sdk/otel':
         specifier: '>=1.0.0-0 <2'
-        version: 1.0.0-beta.6(zod@3.25.76)
+        version: 1.0.0-beta.6(zod@4.4.3)
       '@opentelemetry/api':
         specifier: 1.9.1
         version: 1.9.1
@@ -2348,10 +2350,10 @@ importers:
         version: 8.5.4
       ai:
         specifier: 6.0.116
-        version: 6.0.116(zod@3.25.76)
+        version: 6.0.116(zod@4.4.3)
       ai-v7:
         specifier: npm:ai@7.0.0-canary.159
-        version: ai@7.0.0-canary.159(zod@3.25.76)
+        version: ai@7.0.0-canary.159(zod@4.4.3)
       encoding:
         specifier: ^0.1.13
         version: 0.1.13
@@ -2368,8 +2370,8 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       zod:
-        specifier: 3.25.76
-        version: 3.25.76
+        specifier: 4.4.3
+        version: 4.4.3
 
 packages:
 
@@ -2377,31 +2379,31 @@ packages:
     resolution: {integrity: sha512-BIDaHmCHs6Sr5VUsEkTbbVlAN4GWjg97X9x/IfXyviLtzsXvffui9XIcZugkAi1Ri6FnvI5T5qDGh5YLnSuzRg==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/gateway@3.0.66':
     resolution: {integrity: sha512-SIQ0YY0iMuv+07HLsZ+bB990zUJ6S4ujORAh+Jv1V2KGNn73qQKnGO0JBk+w+Res8YqOFSycwDoWcFlQrVxS4A==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/gateway@4.0.0-beta.30':
     resolution: {integrity: sha512-05tWxCb+3SRj5LBY37nRQ8eUdolO5QvKAfsIAUY3zAxg0jc1cBkQNSpZEVwQUR4uFm/Y5fLJ+MIa+6hkol1//A==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/gateway@4.0.0-canary.93':
     resolution: {integrity: sha512-/d0d/DfJRmdMJJww/ihrYezgKedJhrOCsREuAuSHmd/kVzFB5p2bBuCZH3EBxKFQ8NLtPJpOR+QJxOUmDLD8PA==}
     engines: {node: '>=22'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/openai@3.0.41':
     resolution: {integrity: sha512-IZ42A+FO+vuEQCVNqlnAPYQnnUpUfdJIwn1BEDOBywiEHa23fw7PahxVtlX9zm3/zMvTW4JKPzWyvAgDu+SQ2A==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/otel@1.0.0-beta.6':
     resolution: {integrity: sha512-K5VikyO3EKQkNk77ew9oMjM8FInKF+WWar599LmP8rQ0x0iB+P/DVS+h6zQvmecxMNPtQOOyt0uDQFx/AA0DGw==}
@@ -2411,7 +2413,7 @@ packages:
     resolution: {integrity: sha512-YHK2rpj++wnLVc9vPGzGFP3Pjeld2MwhKinetA0zKXOoHAT/Jit5O8kZsxcSlJPu9wvcGT1UGZEjZrtO7PfFOQ==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.0.0
+      zod: 4.4.3
     peerDependenciesMeta:
       zod:
         optional: true
@@ -2420,19 +2422,19 @@ packages:
     resolution: {integrity: sha512-uhukHaCBvqkwBHkT8C2PrnqKTCoLn3pdHXqtcR9I8ErH+flbzgW4o7VHSNIup9LRu+WBvZIZDQLsx6rwl2tiOA==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/provider-utils@5.0.0-beta.9':
     resolution: {integrity: sha512-Ku/S1TV8ibqlweKQHa22eWT9QvKqR4hkl7KMJ0k7kw64Q7XObh12fJUnK4Mh8q+IR5ZeQGm95SLtx++d7FC6XA==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/provider-utils@5.0.0-canary.44':
     resolution: {integrity: sha512-3h7gp8MEwXACWsW8ZPjzio53ynKq0jTNp4Hwr0BWdychMFzmkRRWyvijhg56JWxye16FU92SqQnfBoe2PN4I2A==}
     engines: {node: '>=22'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   '@ai-sdk/provider@0.0.26':
     resolution: {integrity: sha512-dQkfBDs2lTYpKM8389oopPdQgIU007GQyCbuPPrV+K6MtSII3HBfE0stUIMXUb44L+LK1t6GXPP7wjSzjO6uKg==}
@@ -3513,7 +3515,7 @@ packages:
   '@conform-to/zod@1.19.4':
     resolution: {integrity: sha512-g80QtotXLcXWCF86Xou/VpI6i+NBOQxYgLS9YCQYrgV27yilZFJYpgWWBsA8YwodmJVBIYm9RawJba7WnUoddA==}
     peerDependencies:
-      zod: ^3.21.0 || ^4.0.0
+      zod: 4.4.3
 
   '@connectrpc/connect-node@1.4.0':
     resolution: {integrity: sha512-0ANnrr6SvsjevsWEgdzHy7BaHkluZyS6s4xNoVt7RBHFR5V/kT9lPokoIbYUOU9JHzdRgTaS3x5595mwUsu15g==}
@@ -5308,7 +5310,7 @@ packages:
     engines: {node: '>=18'}
     peerDependencies:
       '@cfworker/json-schema': ^4.1.1
-      zod: ^3.25 || ^4.0
+      zod: 4.4.3
     peerDependenciesMeta:
       '@cfworker/json-schema':
         optional: true
@@ -5318,7 +5320,7 @@ packages:
     engines: {node: '>=18'}
     peerDependencies:
       '@cfworker/json-schema': ^4.1.1
-      zod: ^3.25 || ^4.0
+      zod: 4.4.3
     peerDependenciesMeta:
       '@cfworker/json-schema':
         optional: true
@@ -9323,19 +9325,19 @@ packages:
     resolution: {integrity: sha512-7yM+cTmyRLeNIXwt4Vj+mrrJgVQ9RMIW5WO0ydoLoYkewIvsMcvUmqS4j2RJTUXaF1HphwmSKUMQ/HypNRGOmA==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   ai@7.0.0-beta.60:
     resolution: {integrity: sha512-grSKE/9kQtElLCnrhwriTLwXlV+5W8Ljco2KzVc5cY9egK1zwSwVyFQo3L3Al+WVxwvVT6fQjLyEdQpqJHLTrA==}
     engines: {node: '>=18'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   ai@7.0.0-canary.159:
     resolution: {integrity: sha512-9z8OkZdrISDjS3bguQ/mCYsthmr7mNbB1hTa8cRg8aAp31r1HCxVFqmc+ZXTA0FqhGb8aW46UUcjUuJcwxg5Mw==}
     engines: {node: '>=22'}
     peerDependencies:
-      zod: ^3.25.76 || ^4.1.8
+      zod: 4.4.3
 
   ajv-formats@2.1.1:
     resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
@@ -14215,7 +14217,7 @@ packages:
     hasBin: true
     peerDependencies:
       ws: ^8.18.0
-      zod: ^3.23.8
+      zod: 4.4.3
     peerDependenciesMeta:
       ws:
         optional: true
@@ -15529,7 +15531,7 @@ packages:
       intl-parse-accept-language: ^1.0.0
       is-ip: ^5.0.1
       react: 18.3.1
-      zod: ^3.22.4
+      zod: 4.4.3
     peerDependenciesMeta:
       '@remix-run/cloudflare':
         optional: true
@@ -17558,111 +17560,111 @@ packages:
   zod-to-json-schema@3.24.5:
     resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==}
     peerDependencies:
-      zod: ^3.24.1
+      zod: 4.4.3
 
   zod-to-json-schema@3.24.6:
     resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==}
     peerDependencies:
-      zod: ^3.24.1
+      zod: 4.4.3
 
   zod-to-json-schema@3.25.0:
     resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
     peerDependencies:
-      zod: ^3.25 || ^4
+      zod: 4.4.3
 
   zod-to-json-schema@3.25.1:
     resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==}
     peerDependencies:
-      zod: ^3.25 || ^4
+      zod: 4.4.3
 
   zod-validation-error@1.5.0:
     resolution: {integrity: sha512-/7eFkAI4qV0tcxMBB/3+d2c1P6jzzZYdYSlBuAklzMuCrJu5bzJfHS0yVAS87dRHVlhftd6RFJDIvv03JgkSbw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      zod: ^3.18.0
+      zod: 4.4.3
 
   zod@3.23.8:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
-  zod@3.25.76:
-    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
 
   zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
 snapshots:
 
-  '@ai-sdk/anthropic@3.0.84(zod@3.25.76)':
+  '@ai-sdk/anthropic@3.0.84(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 3.0.10
-      '@ai-sdk/provider-utils': 4.0.29(zod@3.25.76)
-      zod: 3.25.76
+      '@ai-sdk/provider-utils': 4.0.29(zod@4.4.3)
+      zod: 4.4.3
 
-  '@ai-sdk/gateway@3.0.66(zod@3.25.76)':
+  '@ai-sdk/gateway@3.0.66(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 3.0.8
-      '@ai-sdk/provider-utils': 4.0.29(zod@3.25.76)
+      '@ai-sdk/provider-utils': 4.0.29(zod@4.4.3)
       '@vercel/oidc': 3.1.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/gateway@4.0.0-beta.30(zod@3.25.76)':
+  '@ai-sdk/gateway@4.0.0-beta.30(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 4.0.0-beta.5
-      '@ai-sdk/provider-utils': 5.0.0-beta.9(zod@3.25.76)
+      '@ai-sdk/provider-utils': 5.0.0-beta.9(zod@4.4.3)
       '@vercel/oidc': 3.2.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/gateway@4.0.0-canary.93(zod@3.25.76)':
+  '@ai-sdk/gateway@4.0.0-canary.93(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 4.0.0-canary.17
-      '@ai-sdk/provider-utils': 5.0.0-canary.44(zod@3.25.76)
+      '@ai-sdk/provider-utils': 5.0.0-canary.44(zod@4.4.3)
       '@vercel/oidc': 3.2.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/openai@3.0.41(zod@3.25.76)':
+  '@ai-sdk/openai@3.0.41(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 3.0.8
-      '@ai-sdk/provider-utils': 4.0.29(zod@3.25.76)
-      zod: 3.25.76
+      '@ai-sdk/provider-utils': 4.0.29(zod@4.4.3)
+      zod: 4.4.3
 
-  '@ai-sdk/otel@1.0.0-beta.6(zod@3.25.76)':
+  '@ai-sdk/otel@1.0.0-beta.6(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 4.0.0-beta.5
       '@opentelemetry/api': 1.9.0
-      ai: 7.0.0-beta.60(zod@3.25.76)
+      ai: 7.0.0-beta.60(zod@4.4.3)
     transitivePeerDependencies:
       - zod
 
-  '@ai-sdk/provider-utils@1.0.22(zod@3.25.76)':
+  '@ai-sdk/provider-utils@1.0.22(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 0.0.26
       eventsource-parser: 1.1.2
       nanoid: 3.3.8
       secure-json-parse: 2.7.0
     optionalDependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/provider-utils@4.0.29(zod@3.25.76)':
+  '@ai-sdk/provider-utils@4.0.29(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 3.0.10
       '@standard-schema/spec': 1.1.0
       eventsource-parser: 3.1.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/provider-utils@5.0.0-beta.9(zod@3.25.76)':
+  '@ai-sdk/provider-utils@5.0.0-beta.9(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 4.0.0-beta.5
       '@standard-schema/spec': 1.1.0
       eventsource-parser: 3.1.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  '@ai-sdk/provider-utils@5.0.0-canary.44(zod@3.25.76)':
+  '@ai-sdk/provider-utils@5.0.0-canary.44(zod@4.4.3)':
     dependencies:
       '@ai-sdk/provider': 4.0.0-canary.17
       '@standard-schema/spec': 1.1.0
       '@workflow/serde': 4.1.0
       eventsource-parser: 3.1.0
-      zod: 3.25.76
+      zod: 4.4.3
 
   '@ai-sdk/provider@0.0.26':
     dependencies:
@@ -17684,10 +17686,10 @@ snapshots:
     dependencies:
       json-schema: 0.4.0
 
-  '@ai-sdk/react@3.0.170(react@18.3.1)(zod@3.25.76)':
+  '@ai-sdk/react@3.0.170(react@18.3.1)(zod@4.4.3)':
     dependencies:
-      '@ai-sdk/provider-utils': 4.0.29(zod@3.25.76)
-      ai: 6.0.116(zod@3.25.76)
+      '@ai-sdk/provider-utils': 4.0.29(zod@4.4.3)
+      ai: 6.0.116(zod@4.4.3)
       react: 18.3.1
       swr: 2.2.5(react@18.3.1)
       throttleit: 2.1.0
@@ -20263,10 +20265,10 @@ snapshots:
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
 
-  '@conform-to/zod@1.19.4(zod@3.25.76)':
+  '@conform-to/zod@1.19.4(zod@4.4.3)':
     dependencies:
       '@conform-to/dom': 1.19.4
-      zod: 3.25.76
+      zod: 4.4.3
 
   '@connectrpc/connect-node@1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))':
     dependencies:
@@ -21564,7 +21566,7 @@ snapshots:
 
   '@microsoft/fetch-event-source@2.0.1': {}
 
-  '@modelcontextprotocol/sdk@1.25.2(hono@4.12.15)(supports-color@10.0.0)(zod@3.25.76)':
+  '@modelcontextprotocol/sdk@1.25.2(hono@4.12.15)(supports-color@10.0.0)(zod@4.4.3)':
     dependencies:
       '@hono/node-server': 1.19.9(hono@4.12.15)
       ajv: 8.18.0
@@ -21580,13 +21582,13 @@ snapshots:
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.0
       raw-body: 3.0.0
-      zod: 3.25.76
-      zod-to-json-schema: 3.25.0(zod@3.25.76)
+      zod: 4.4.3
+      zod-to-json-schema: 3.25.0(zod@4.4.3)
     transitivePeerDependencies:
       - hono
       - supports-color
 
-  '@modelcontextprotocol/sdk@1.26.0(zod@3.25.76)':
+  '@modelcontextprotocol/sdk@1.26.0(zod@4.4.3)':
     dependencies:
       '@hono/node-server': 1.19.9(hono@4.11.8)
       ajv: 8.18.0
@@ -21603,8 +21605,8 @@ snapshots:
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.0
       raw-body: 3.0.0
-      zod: 3.25.76
-      zod-to-json-schema: 3.25.1(zod@3.25.76)
+      zod: 4.4.3
+      zod-to-json-schema: 3.25.1(zod@4.4.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -25877,7 +25879,7 @@ snapshots:
     dependencies:
       '@graphql-typed-document-node/core': 3.2.0(graphql@16.6.0)
       graphql: 16.6.0
-      zod: 3.25.76
+      zod: 4.4.3
 
   '@testcontainers/postgresql@11.14.0':
     dependencies:
@@ -26574,7 +26576,7 @@ snapshots:
 
   '@unkey/error@0.2.0':
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
   '@upsetjs/venn.js@2.0.0':
     optionalDependencies:
@@ -26646,8 +26648,8 @@ snapshots:
 
   '@vercel/sdk@1.19.1':
     dependencies:
-      '@modelcontextprotocol/sdk': 1.26.0(zod@3.25.76)
-      zod: 3.25.76
+      '@modelcontextprotocol/sdk': 1.26.0(zod@4.4.3)
+      zod: 4.4.3
     transitivePeerDependencies:
       - '@cfworker/json-schema'
       - supports-color
@@ -26907,27 +26909,27 @@ snapshots:
 
   ahocorasick@1.0.2: {}
 
-  ai@6.0.116(zod@3.25.76):
+  ai@6.0.116(zod@4.4.3):
     dependencies:
-      '@ai-sdk/gateway': 3.0.66(zod@3.25.76)
+      '@ai-sdk/gateway': 3.0.66(zod@4.4.3)
       '@ai-sdk/provider': 3.0.8
-      '@ai-sdk/provider-utils': 4.0.29(zod@3.25.76)
+      '@ai-sdk/provider-utils': 4.0.29(zod@4.4.3)
       '@opentelemetry/api': 1.9.0
-      zod: 3.25.76
+      zod: 4.4.3
 
-  ai@7.0.0-beta.60(zod@3.25.76):
+  ai@7.0.0-beta.60(zod@4.4.3):
     dependencies:
-      '@ai-sdk/gateway': 4.0.0-beta.30(zod@3.25.76)
+      '@ai-sdk/gateway': 4.0.0-beta.30(zod@4.4.3)
       '@ai-sdk/provider': 4.0.0-beta.5
-      '@ai-sdk/provider-utils': 5.0.0-beta.9(zod@3.25.76)
-      zod: 3.25.76
+      '@ai-sdk/provider-utils': 5.0.0-beta.9(zod@4.4.3)
+      zod: 4.4.3
 
-  ai@7.0.0-canary.159(zod@3.25.76):
+  ai@7.0.0-canary.159(zod@4.4.3):
     dependencies:
-      '@ai-sdk/gateway': 4.0.0-canary.93(zod@3.25.76)
+      '@ai-sdk/gateway': 4.0.0-canary.93(zod@4.4.3)
       '@ai-sdk/provider': 4.0.0-canary.17
-      '@ai-sdk/provider-utils': 5.0.0-canary.44(zod@3.25.76)
-      zod: 3.25.76
+      '@ai-sdk/provider-utils': 5.0.0-canary.44(zod@4.4.3)
+      zod: 4.4.3
 
   ajv-formats@2.1.1(ajv@8.20.0):
     optionalDependencies:
@@ -27163,9 +27165,9 @@ snapshots:
       js-yaml: 4.1.1
       linear-sum-assignment: 1.0.7
       mustache: 4.2.0
-      openai: 4.97.0(encoding@0.1.13)(ws@8.12.0(bufferutil@4.0.9))(zod@3.25.76)
-      zod: 3.25.76
-      zod-to-json-schema: 3.24.5(zod@3.25.76)
+      openai: 4.97.0(encoding@0.1.13)(ws@8.12.0(bufferutil@4.0.9))(zod@4.4.3)
+      zod: 4.4.3
+      zod-to-json-schema: 3.24.5(zod@4.4.3)
     transitivePeerDependencies:
       - encoding
       - ws
@@ -29524,7 +29526,7 @@ snapshots:
     dependencies:
       require-like: 0.1.2
 
-  evalite@1.0.0-beta.16(ai@6.0.116(zod@3.25.76))(better-sqlite3@11.10.0)(bufferutil@4.0.9):
+  evalite@1.0.0-beta.16(ai@6.0.116(zod@4.4.3))(better-sqlite3@11.10.0)(bufferutil@4.0.9):
     dependencies:
       '@fastify/static': 8.2.0
       '@fastify/websocket': 11.2.0(bufferutil@4.0.9)
@@ -29541,7 +29543,7 @@ snapshots:
       table: 6.9.0
       tinyrainbow: 3.1.0
     optionalDependencies:
-      ai: 6.0.116(zod@3.25.76)
+      ai: 6.0.116(zod@4.4.3)
       better-sqlite3: 11.10.0
     transitivePeerDependencies:
       - bufferutil
@@ -32728,7 +32730,7 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  openai@4.97.0(encoding@0.1.13)(ws@8.12.0(bufferutil@4.0.9))(zod@3.25.76):
+  openai@4.97.0(encoding@0.1.13)(ws@8.12.0(bufferutil@4.0.9))(zod@4.4.3):
     dependencies:
       '@types/node': 20.14.14
       '@types/node-fetch': 2.6.12
@@ -32739,7 +32741,7 @@ snapshots:
       node-fetch: 2.6.12(encoding@0.1.13)
     optionalDependencies:
       ws: 8.12.0(bufferutil@4.0.9)
-      zod: 3.25.76
+      zod: 4.4.3
     transitivePeerDependencies:
       - encoding
 
@@ -34186,7 +34188,7 @@ snapshots:
       '@remix-run/server-runtime': 2.17.4(typescript@5.5.4)
       react: 18.3.1
 
-  remix-utils@7.7.0(@remix-run/node@2.17.4(typescript@5.5.4))(@remix-run/react@2.17.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@remix-run/router@1.23.2(patch_hash=f14fb2af2690628a0164b66d98e8d7cd6a0e8a4a30a51e53cfb1b6caeca6f7c9))(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.3.1)(zod@3.25.76):
+  remix-utils@7.7.0(@remix-run/node@2.17.4(typescript@5.5.4))(@remix-run/react@2.17.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4))(@remix-run/router@1.23.2(patch_hash=f14fb2af2690628a0164b66d98e8d7cd6a0e8a4a30a51e53cfb1b6caeca6f7c9))(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.3.1)(zod@4.4.3):
     dependencies:
       type-fest: 4.33.0
     optionalDependencies:
@@ -34196,7 +34198,7 @@ snapshots:
       crypto-js: 4.2.0
       intl-parse-accept-language: 1.0.0
       react: 18.3.1
-      zod: 3.25.76
+      zod: 4.4.3
 
   remove-accents@0.5.0: {}
 
@@ -36557,30 +36559,30 @@ snapshots:
 
   zod-error@1.5.0:
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  zod-to-json-schema@3.24.5(zod@3.25.76):
+  zod-to-json-schema@3.24.5(zod@4.4.3):
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  zod-to-json-schema@3.24.6(zod@3.25.76):
+  zod-to-json-schema@3.24.6(zod@4.4.3):
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  zod-to-json-schema@3.25.0(zod@3.25.76):
+  zod-to-json-schema@3.25.0(zod@4.4.3):
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  zod-to-json-schema@3.25.1(zod@3.25.76):
+  zod-to-json-schema@3.25.1(zod@4.4.3):
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
-  zod-validation-error@1.5.0(zod@3.25.76):
+  zod-validation-error@1.5.0(zod@4.4.3):
     dependencies:
-      zod: 3.25.76
+      zod: 4.4.3
 
   zod@3.23.8: {}
 
-  zod@3.25.76: {}
+  zod@4.4.3: {}
 
   zwitch@2.0.4: {}

From 2b0f9e957d1bd52f31165648eb9442a84caedaa3 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 15:22:34 +0100
Subject: [PATCH 5/8] fix test failures

---
 apps/webapp/package.json             |  2 +-
 packages/cli-v3/package.json         |  2 +-
 packages/core/package.json           |  2 +-
 packages/schema-to-json/package.json |  2 +-
 pnpm-lock.yaml                       | 41 +++++++++++-----------------
 5 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/apps/webapp/package.json b/apps/webapp/package.json
index 26f632a636b..d7f78ef1fd2 100644
--- a/apps/webapp/package.json
+++ b/apps/webapp/package.json
@@ -241,7 +241,7 @@
     "ws": "^8.11.0",
     "zod": "4.4.3",
     "zod-error": "1.5.0",
-    "zod-validation-error": "^1.5.0"
+    "zod-validation-error": "^5.0.0"
   },
   "devDependencies": {
     "@internal/clickhouse": "workspace:*",
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
index 2b98f6d8088..6b779664f34 100644
--- a/packages/cli-v3/package.json
+++ b/packages/cli-v3/package.json
@@ -149,7 +149,7 @@
     "tinyglobby": "^0.2.10",
     "ws": "^8.18.0",
     "xdg-app-paths": "^8.3.0",
-    "zod-validation-error": "^1.5.0"
+    "zod-validation-error": "^5.0.0"
   },
   "engines": {
     "node": ">=18.20.0"
diff --git a/packages/core/package.json b/packages/core/package.json
index 80b57a92884..345d728bff1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -222,7 +222,7 @@
     "tinyexec": "^0.3.2",
     "uncrypto": "^0.1.3",
     "zod-error": "1.5.0",
-    "zod-validation-error": "^1.5.0"
+    "zod-validation-error": "^5.0.0"
   },
   "devDependencies": {
     "@ai-sdk/provider-utils": "^1.0.22",
diff --git a/packages/schema-to-json/package.json b/packages/schema-to-json/package.json
index a028356ec73..7df31dd1581 100644
--- a/packages/schema-to-json/package.json
+++ b/packages/schema-to-json/package.json
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@trigger.dev/core": "workspace:*",
-    "zod-to-json-schema": "^3.24.0",
+    "zod-to-json-schema": "^3.25.2",
     "@sodaru/yup-to-json-schema": "^2",
     "effect": "^3"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 47aca405f96..7cf8645a322 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -908,8 +908,8 @@ importers:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
-        specifier: ^1.5.0
-        version: 1.5.0(zod@4.4.3)
+        specifier: ^5.0.0
+        version: 5.0.0(zod@4.4.3)
     devDependencies:
       '@internal/clickhouse':
         specifier: workspace:*
@@ -1839,8 +1839,8 @@ importers:
         specifier: ^8.3.0
         version: 8.3.0
       zod-validation-error:
-        specifier: ^1.5.0
-        version: 1.5.0(zod@4.4.3)
+        specifier: ^5.0.0
+        version: 5.0.0(zod@4.4.3)
     devDependencies:
       '@epic-web/test-server':
         specifier: ^0.1.0
@@ -2005,8 +2005,8 @@ importers:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
-        specifier: ^1.5.0
-        version: 1.5.0(zod@4.4.3)
+        specifier: ^5.0.0
+        version: 5.0.0(zod@4.4.3)
     devDependencies:
       '@ai-sdk/provider-utils':
         specifier: ^1.0.22
@@ -2254,8 +2254,8 @@ importers:
         specifier: ^3
         version: 3.17.1
       zod-to-json-schema:
-        specifier: ^3.24.0
-        version: 3.24.6(zod@4.4.3)
+        specifier: ^3.25.2
+        version: 3.25.2(zod@4.4.3)
     devDependencies:
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
@@ -17562,24 +17562,19 @@ packages:
     peerDependencies:
       zod: 4.4.3
 
-  zod-to-json-schema@3.24.6:
-    resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==}
-    peerDependencies:
-      zod: 4.4.3
-
   zod-to-json-schema@3.25.0:
     resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
     peerDependencies:
       zod: 4.4.3
 
-  zod-to-json-schema@3.25.1:
-    resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==}
+  zod-to-json-schema@3.25.2:
+    resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==}
     peerDependencies:
       zod: 4.4.3
 
-  zod-validation-error@1.5.0:
-    resolution: {integrity: sha512-/7eFkAI4qV0tcxMBB/3+d2c1P6jzzZYdYSlBuAklzMuCrJu5bzJfHS0yVAS87dRHVlhftd6RFJDIvv03JgkSbw==}
-    engines: {node: '>=16.0.0'}
+  zod-validation-error@5.0.0:
+    resolution: {integrity: sha512-hmk+pkyKq7Q71PiWVSDUc3VfpzpvcRHZ3QPw9yEMVvmtCekaMeOHnbr3WbxfrgEnQTv6haGP4cmv0Ojmihzsxw==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
       zod: 4.4.3
 
@@ -21606,7 +21601,7 @@ snapshots:
       pkce-challenge: 5.0.0
       raw-body: 3.0.0
       zod: 4.4.3
-      zod-to-json-schema: 3.25.1(zod@4.4.3)
+      zod-to-json-schema: 3.25.2(zod@4.4.3)
     transitivePeerDependencies:
       - supports-color
 
@@ -36565,19 +36560,15 @@ snapshots:
     dependencies:
       zod: 4.4.3
 
-  zod-to-json-schema@3.24.6(zod@4.4.3):
-    dependencies:
-      zod: 4.4.3
-
   zod-to-json-schema@3.25.0(zod@4.4.3):
     dependencies:
       zod: 4.4.3
 
-  zod-to-json-schema@3.25.1(zod@4.4.3):
+  zod-to-json-schema@3.25.2(zod@4.4.3):
     dependencies:
       zod: 4.4.3
 
-  zod-validation-error@1.5.0(zod@4.4.3):
+  zod-validation-error@5.0.0(zod@4.4.3):
     dependencies:
       zod: 4.4.3
 

From 4a249c12164501a0b8a2de102b92f20c74da67a3 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 18:32:54 +0100
Subject: [PATCH 6/8] fix: address coderabbit feedback on zod v4 migration

- core: forward the validated/normalized payload (parsedPayload.data)
  from the zod message sender instead of casting the raw input, so zod
  transforms, defaults, and coercions are applied on send
- webapp: reword the feedback type union error to cover all feedback
  types, not just bug/feature
---
 apps/webapp/app/routes/resources.feedback.ts | 2 +-
 packages/core/src/v3/zodMessageHandler.ts    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/webapp/app/routes/resources.feedback.ts b/apps/webapp/app/routes/resources.feedback.ts
index cf9e75839a6..f5ad6b2e44c 100644
--- a/apps/webapp/app/routes/resources.feedback.ts
+++ b/apps/webapp/app/routes/resources.feedback.ts
@@ -61,7 +61,7 @@ const feedbackTypeLiterals = Object.keys(feedbackTypes).map((key) => z.literal(k
 const feedbackType = z.union(
   [feedbackTypeLiterals[0], feedbackTypeLiterals[1], ...feedbackTypeLiterals.slice(2)],
   {
-    error: "Must be either 'bug' or 'feature'",
+    error: "Must be a valid feedback type",
   }
 );
 
diff --git a/packages/core/src/v3/zodMessageHandler.ts b/packages/core/src/v3/zodMessageHandler.ts
index c6164aa59cf..4c2a65021d1 100644
--- a/packages/core/src/v3/zodMessageHandler.ts
+++ b/packages/core/src/v3/zodMessageHandler.ts
@@ -278,8 +278,8 @@ export class ZodMessageSender<TMessageCatalog extends ZodMessageCatalogSchema> {
     }
 
     try {
-      // send side: payload is input; zod v4 distinguishes input/output on the sender signature
-      await this.#sender({ type, payload: payload as any, version: "v1" });
+      // send the validated/normalized output so zod transforms, defaults, and coercions are applied
+      await this.#sender({ type, payload: parsedPayload.data, version: "v1" });
     } catch (error) {
       console.error("[ZodMessageSender] Failed to send message", error);
     }
@@ -334,8 +334,8 @@ export async function sendMessageInCatalog<TMessageCatalog extends ZodMessageCat
     throw new ZodSchemaParsedError(parsedPayload.error, payload);
   }
 
-  // send side: payload is input; zod v4 distinguishes input/output on the sender signature
-  await sender({ type, payload: payload as any, version: "v1" });
+  // send the validated/normalized output so zod transforms, defaults, and coercions are applied
+  await sender({ type, payload: parsedPayload.data, version: "v1" });
 }
 
 export type MessageCatalogToSocketIoEvents<TCatalog extends ZodMessageCatalogSchema> = {

From 822ea2f871331410357ebccd795fabe3447713f6 Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Thu, 25 Jun 2026 19:20:57 +0100
Subject: [PATCH 7/8] fix(webapp): use @conform-to/zod/v4 subpath for zod 4
 compatibility

The root @conform-to/zod entry is the zod 3 implementation (it imports
ZodBranded/ZodEffects from zod), so it throws at module load under
zod 4.4.3, breaking the auth/invite forms and the e2e suites. Switch all
44 imports to the @conform-to/zod/v4 subpath, which targets zod 4.

Also address review feedback:
- concurrency: use formEnvironments.errorId (not .id) for the FormError
  element id to avoid a duplicate DOM id and keep aria-describedby valid
- team / confirm-basic-details: pass value:false to getInputProps on the
  controlled number/hidden inputs so conform omits defaultValue and the
  inputs stay purely controlled
- branches.archive: join the form.errors string[] for readable output
---
 apps/webapp/app/components/Feedback.tsx                       | 2 +-
 apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx    | 2 +-
 apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx        | 2 +-
 .../app/components/schedules/PurchaseSchedulesModal.tsx       | 2 +-
 .../app/routes/_app.orgs.$organizationSlug.invite/route.tsx   | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 4 ++--
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../_app.orgs.$organizationSlug.settings._index/route.tsx     | 2 +-
 .../route.tsx                                                 | 2 +-
 .../route.tsx                                                 | 2 +-
 .../_app.orgs.$organizationSlug.settings.team/route.tsx       | 4 ++--
 .../_app.orgs.$organizationSlug_.projects.new/route.tsx       | 2 +-
 apps/webapp/app/routes/_app.orgs.new/route.tsx                | 2 +-
 apps/webapp/app/routes/account._index/route.tsx               | 2 +-
 apps/webapp/app/routes/account.tokens/route.tsx               | 2 +-
 apps/webapp/app/routes/confirm-basic-details.tsx              | 4 ++--
 apps/webapp/app/routes/invite-resend.tsx                      | 2 +-
 apps/webapp/app/routes/invite-revoke.tsx                      | 2 +-
 apps/webapp/app/routes/invites.tsx                            | 2 +-
 ...rces.$projectId.deployments.$deploymentShortCode.cancel.ts | 2 +-
 ...ces.$projectId.deployments.$deploymentShortCode.promote.ts | 2 +-
 ...es.$projectId.deployments.$deploymentShortCode.rollback.ts | 2 +-
 .../app/routes/resources.batches.$batchId.check-completion.ts | 2 +-
 apps/webapp/app/routes/resources.branches.archive.tsx         | 4 ++--
 apps/webapp/app/routes/resources.feedback.ts                  | 2 +-
 ...zationSlug.projects.$projectParam.env.$envParam.github.tsx | 2 +-
 ...g.projects.$projectParam.env.$envParam.runs.bulkaction.tsx | 2 +-
 .../route.tsx                                                 | 2 +-
 ...zationSlug.projects.$projectParam.env.$envParam.vercel.tsx | 2 +-
 .../route.tsx                                                 | 2 +-
 .../resources.orgs.$organizationSlug.schedules-addon.ts       | 2 +-
 .../app/routes/resources.sessions.$sessionParam.close.ts      | 2 +-
 apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts | 2 +-
 apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts | 2 +-
 44 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/apps/webapp/app/components/Feedback.tsx b/apps/webapp/app/components/Feedback.tsx
index f8b4e8b3985..fc34d398980 100644
--- a/apps/webapp/app/components/Feedback.tsx
+++ b/apps/webapp/app/components/Feedback.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getSelectProps, getInputProps, getTextareaProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { InformationCircleIcon, ArrowUpCircleIcon } from "@heroicons/react/20/solid";
 import { EnvelopeIcon, ShieldCheckIcon } from "@heroicons/react/24/solid";
 import { Form, useActionData, useLocation, useNavigation, useSearchParams } from "@remix-run/react";
diff --git a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
index 49ac595491b..457ba1fb0d8 100644
--- a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
+++ b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   EnvelopeIcon,
   GlobeAltIcon,
diff --git a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
index 827452e4d04..aeeb4d25ecb 100644
--- a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
+++ b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { Form, useActionData, useNavigation, useParams, useSubmit } from "@remix-run/react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
diff --git a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
index 8a6623739c2..0edce7b5bc6 100644
--- a/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
+++ b/apps/webapp/app/components/schedules/PurchaseSchedulesModal.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { EnvelopeIcon } from "@heroicons/react/20/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { useFetcher } from "@remix-run/react";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
index e6173da559f..76eb2645b56 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   ArrowUpCircleIcon,
   EnvelopeIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
index 976a5cb5221..6ec787e7505 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { HashtagIcon, LockClosedIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useNavigate, useNavigation } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/router";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
index 72f9c85ee59..f48da2ee19c 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   BellAlertIcon,
   BellSlashIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index 976557ee9e5..3c112b34281 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { ArrowUpCircleIcon, CheckIcon, EnvelopeIcon, PlusIcon } from "@heroicons/react/20/solid";
 import { BookOpenIcon } from "@heroicons/react/24/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
index db0cb0e4608..b5d97976217 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   ArrowDownIcon,
   EnvelopeIcon,
@@ -476,7 +476,7 @@ function Upgradable({
               </TableRow>
             </TableBody>
           </Table>
-          <FormError id={formEnvironments.id}>{formEnvironments.errors}</FormError>
+          <FormError id={formEnvironments.errorId}>{formEnvironments.errors}</FormError>
         </div>
         <Form className="flex flex-col gap-2" method="post" {...getFormProps(form)} id="allocate">
           <input type="hidden" name="action" value="allocate" />
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
index 71aa78f7b21..97d18c25f34 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
@@ -5,7 +5,7 @@ import {
   getInputProps,
   useForm,
 } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   LockClosedIcon,
   LockOpenIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
index afea881feb1..a0696b20c9f 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   BookOpenIcon,
   InformationCircleIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
index d9cd3b8f006..4da33deae5b 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { BellAlertIcon } from "@heroicons/react/20/solid";
 import { type MetaFunction, useFetcher, useRevalidator } from "@remix-run/react";
 import { type ActionFunctionArgs, json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
index 3ffe35908a5..4eb0751eebd 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors/route.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { Outlet, useNavigate } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { useCallback } from "react";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
index cd433467c77..468635743b6 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { useLocation } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
index ff106157a5a..3798d31e855 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.general/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { conformZodMessage, parseWithZod } from "@conform-to/zod";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod/v4";
 import { ExclamationTriangleIcon, FolderIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { type ActionFunction, json } from "@remix-run/server-runtime";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
index ffe79fab6ba..90124b3e6f4 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings.integrations/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { json } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData, useTypedFetcher } from "remix-typedjson";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
index 64842ca692f..5c120193ba7 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import {
   CheckCircleIcon,
   RectangleStackIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
index 772315db08b..2ef186e4580 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
@@ -1,6 +1,6 @@
 import colorWheelIcon from "../../assets/images/color-wheel.png";
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { conformZodMessage, parseWithZod } from "@conform-to/zod";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod/v4";
 import {
   CheckIcon,
   ExclamationTriangleIcon,
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
index 48a5e780d55..5c43bb1ceed 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { Form, useActionData, type MetaFunction } from "@remix-run/react";
 import { json } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
index fd18aa37684..67daec69f81 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections.new/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { Form, useActionData, useParams, type MetaFunction } from "@remix-run/react";
 import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core/utils";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
index 218f668d363..b2d17fdb930 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { EnvelopeIcon, NoSymbolIcon, UserPlusIcon } from "@heroicons/react/20/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
 import {
@@ -979,7 +979,7 @@ export function PurchaseSeatsModal({
                   Total extra seats
                 </Label>
                 <InputNumberStepper
-                  {...getInputProps(amount, { type: "number" })}
+                  {...getInputProps(amount, { type: "number", value: false })}
                   step={seatPricing.stepSize}
                   min={0}
                   max={undefined}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index a917aeb34db..d06d77cefa0 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { CommandLineIcon, FolderIcon } from "@heroicons/react/20/solid";
 import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
diff --git a/apps/webapp/app/routes/_app.orgs.new/route.tsx b/apps/webapp/app/routes/_app.orgs.new/route.tsx
index 9a3eadc18e1..96ddd9b4401 100644
--- a/apps/webapp/app/routes/_app.orgs.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.new/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { BuildingOffice2Icon, GlobeAltIcon } from "@heroicons/react/20/solid";
 import { RadioGroup } from "@radix-ui/react-radio-group";
 import { json, redirect, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/node";
diff --git a/apps/webapp/app/routes/account._index/route.tsx b/apps/webapp/app/routes/account._index/route.tsx
index 4eb959b5724..2382bc1be45 100644
--- a/apps/webapp/app/routes/account._index/route.tsx
+++ b/apps/webapp/app/routes/account._index/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { conformZodMessage, parseWithZod } from "@conform-to/zod";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod/v4";
 import { Form, type MetaFunction, useActionData } from "@remix-run/react";
 import { type ActionFunction, json } from "@remix-run/server-runtime";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/account.tokens/route.tsx b/apps/webapp/app/routes/account.tokens/route.tsx
index fd4008b6f90..4450ab2c071 100644
--- a/apps/webapp/app/routes/account.tokens/route.tsx
+++ b/apps/webapp/app/routes/account.tokens/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { BookOpenIcon, ShieldCheckIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { ShieldExclamationIcon } from "@heroicons/react/24/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index 7eda5c7ccb3..242f72ae9bd 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { conformZodMessage, parseWithZod } from "@conform-to/zod";
+import { conformZodMessage, parseWithZod } from "@conform-to/zod/v4";
 import { ArrowRightIcon, EnvelopeIcon, UserIcon } from "@heroicons/react/20/solid";
 import { UserGroupIcon } from "~/assets/icons/UserGroupIcon";
 import { HandRaisedIcon } from "@heroicons/react/24/solid";
@@ -312,7 +312,7 @@ export default function Page() {
                 </InputGroup>
               ) : (
                 <>
-                  <input {...getInputProps(confirmEmail, { type: "hidden" })} value={user.email} />
+                  <input {...getInputProps(confirmEmail, { type: "hidden", value: false })} value={user.email} />
                 </>
               )}
 
diff --git a/apps/webapp/app/routes/invite-resend.tsx b/apps/webapp/app/routes/invite-resend.tsx
index f2938b67a61..cdce4a76a74 100644
--- a/apps/webapp/app/routes/invite-resend.tsx
+++ b/apps/webapp/app/routes/invite-resend.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/server-runtime";
 import { env } from "process";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/invite-revoke.tsx b/apps/webapp/app/routes/invite-revoke.tsx
index fc1e4d0b79e..d4ab69f9c83 100644
--- a/apps/webapp/app/routes/invite-revoke.tsx
+++ b/apps/webapp/app/routes/invite-revoke.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { $replica } from "~/db.server";
diff --git a/apps/webapp/app/routes/invites.tsx b/apps/webapp/app/routes/invites.tsx
index c419ba0d5cc..5ee1466c245 100644
--- a/apps/webapp/app/routes/invites.tsx
+++ b/apps/webapp/app/routes/invites.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { type ActionFunction, type LoaderFunctionArgs, json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
index dd1c452c51c..d23b86d4ef6 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/node";
 import { errAsync, fromPromise, okAsync } from "neverthrow";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
index 979264516d1..529f627e5fb 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.promote.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
index d109e97c9d5..3caed9013b3 100644
--- a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.rollback.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
diff --git a/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts b/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
index 40c4565a93a..52a3bf25b84 100644
--- a/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
+++ b/apps/webapp/app/routes/resources.batches.$batchId.check-completion.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { ActionFunction, json } from "@remix-run/node";
 import { assertExhaustive } from "@trigger.dev/core/utils";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/resources.branches.archive.tsx b/apps/webapp/app/routes/resources.branches.archive.tsx
index 336dd9afca8..18950099d17 100644
--- a/apps/webapp/app/routes/resources.branches.archive.tsx
+++ b/apps/webapp/app/routes/resources.branches.archive.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { DialogClose } from "@radix-ui/react-dialog";
 import { Form, useActionData, useFetcher, useLocation } from "@remix-run/react";
 import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";
@@ -111,7 +111,7 @@ export function ArchiveButton({
             <Paragraph spacing>
               Once archived you can create a new branch with the same name.
             </Paragraph>
-            <FormError>{form.errors}</FormError>
+            <FormError>{form.errors?.join(", ")}</FormError>
             <FormButtons
               confirmButton={
                 <Button LeadingIcon={ArchiveIcon} type="submit" variant="danger/medium">
diff --git a/apps/webapp/app/routes/resources.feedback.ts b/apps/webapp/app/routes/resources.feedback.ts
index f5ad6b2e44c..3d8202a5231 100644
--- a/apps/webapp/app/routes/resources.feedback.ts
+++ b/apps/webapp/app/routes/resources.feedback.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { type PlainClient, uiComponent } from "@team-plain/typescript-sdk";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
index 38fed23c753..f3ef3ddadf6 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { CheckCircleIcon, LockClosedIcon, PlusIcon } from "@heroicons/react/20/solid";
 import {
   Form,
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
index 41192916692..42752eb99dd 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { ArrowPathIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
 import { XCircleIcon } from "@heroicons/react/24/outline";
 import { Form } from "@remix-run/react";
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
index 3dddfff9f11..06e0f06e6d2 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.new/route.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, getSelectProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { CheckIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import {
   type FetcherWithComponents,
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
index e55baa8dc9f..28070234566 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
@@ -1,5 +1,5 @@
 import { getFormProps, useForm } from "@conform-to/react";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { CheckCircleIcon, ExclamationTriangleIcon } from "@heroicons/react/20/solid";
 import { Form, useActionData, useFetcher, useNavigation, useLocation } from "@remix-run/react";
 import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
index 7343aa411fb..794eaec4882 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route.tsx
@@ -1,5 +1,5 @@
 import { env } from "~/env.server";
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { Form, useLocation, useNavigation, useSubmit } from "@remix-run/react";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { stringifyIO, timeoutError, WaitpointTokenStatus } from "@trigger.dev/core/v3";
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts b/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
index dbeeccc4722..500645d2871 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.schedules-addon.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core/v3";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts b/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
index 47f8092993d..db9e24a8307 100644
--- a/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
+++ b/apps/webapp/app/routes/resources.sessions.$sessionParam.close.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { type ActionFunction, json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
index 672b9f99ba4..c6021477984 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json } from "@remix-run/node";
 import { z } from "zod";
 import { $replica, prisma } from "~/db.server";
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
index d44e6535780..7ee27469df2 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
@@ -1,4 +1,4 @@
-import { parseWithZod } from "@conform-to/zod";
+import { parseWithZod } from "@conform-to/zod/v4";
 import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { type EnvironmentType, prettyPrintPacket } from "@trigger.dev/core/v3";
 import { typedjson } from "remix-typedjson";

From d85c7f390c011c608d89a601d343bd1a770f429a Mon Sep 17 00:00:00 2001
From: Chris Arderne <chris@trigger.dev>
Date: Fri, 26 Jun 2026 08:48:02 +0100
Subject: [PATCH 8/8] fix(webapp): pass value:false to getInputProps on
 controlled hidden inputs

These hidden inputs supply their own value/defaultValue, so opt out of
conform's auto-derived default (value:false) to keep them as a single
controlled source and avoid a value+defaultValue mix on the same element.
Submissions were already correct (getInputProps emits defaultValue, not
value, for hidden inputs), this just makes the intent explicit and matches
the confirm-basic-details pattern.
---
 apps/webapp/app/components/Feedback.tsx                       | 2 +-
 .../route.tsx                                                 | 4 ++--
 .../_app.orgs.$organizationSlug_.projects.new/route.tsx       | 4 ++--
 apps/webapp/app/routes/resources.branches.archive.tsx         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/webapp/app/components/Feedback.tsx b/apps/webapp/app/components/Feedback.tsx
index fc34d398980..692fc0e293f 100644
--- a/apps/webapp/app/components/Feedback.tsx
+++ b/apps/webapp/app/components/Feedback.tsx
@@ -91,7 +91,7 @@ export function Feedback({ button, defaultValue = "bug", onOpenChange }: Feedbac
           ) && <hr className="border-grid-dimmed" />}
           <Form method="post" action="/resources/feedback" {...getFormProps(form)} className="w-full">
             <Fieldset className="max-w-full gap-y-3">
-              <input value={location.pathname} {...getInputProps(fields.path, { type: "hidden" })} />
+              <input value={location.pathname} {...getInputProps(fields.path, { type: "hidden", value: false })} />
               <InputGroup className="max-w-full">
                 {type === "feature" && (
                   <InfoPanel
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index 3c112b34281..b61f7d596c8 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -965,11 +965,11 @@ export function NewBranchPanel({
             <Fieldset className="max-w-full gap-y-3">
               <input
                 value={parentEnvironment.id}
-                {...getInputProps(parentEnvironmentId, { type: "hidden" })}
+                {...getInputProps(parentEnvironmentId, { type: "hidden", value: false })}
               />
               <input
                 value={location.pathname}
-                {...getInputProps(failurePath, { type: "hidden" })}
+                {...getInputProps(failurePath, { type: "hidden", value: false })}
               />
               <InputGroup className="max-w-full">
                 <Label>Branch name</Label>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index d06d77cefa0..1a4cf40b371 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -388,9 +388,9 @@ export default function Page() {
                   <FormError id={projectName.errorId}>{projectName.errors}</FormError>
                 </InputGroup>
                 {canCreateV3Projects ? (
-                  <input {...getInputProps(projectVersion, { type: "hidden" })} defaultValue={"v3"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden", value: false })} defaultValue={"v3"} />
                 ) : (
-                  <input {...getInputProps(projectVersion, { type: "hidden" })} defaultValue={"v2"} />
+                  <input {...getInputProps(projectVersion, { type: "hidden", value: false })} defaultValue={"v2"} />
                 )}
 
                 <div className="border-t border-charcoal-700" />
diff --git a/apps/webapp/app/routes/resources.branches.archive.tsx b/apps/webapp/app/routes/resources.branches.archive.tsx
index 18950099d17..568ce363491 100644
--- a/apps/webapp/app/routes/resources.branches.archive.tsx
+++ b/apps/webapp/app/routes/resources.branches.archive.tsx
@@ -95,10 +95,10 @@ export function ArchiveButton({
             {...getFormProps(form)}
             className="w-full"
           >
-            <input value={environment.id} {...getInputProps(environmentId, { type: "hidden" })} />
+            <input value={environment.id} {...getInputProps(environmentId, { type: "hidden", value: false })} />
             <input
               value={`${location.pathname}${location.search}`}
-              {...getInputProps(redirectPath, { type: "hidden" })}
+              {...getInputProps(redirectPath, { type: "hidden", value: false })}
             />
             <Paragraph spacing>
               This will <span className="text-text-bright">permanently</span> make this branch{" "}