From c79e6e8bad25adc93696f6ea79ff90f86ae774af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Mon, 17 Nov 2025 04:13:12 +0100
Subject: [PATCH] Refactor Form

---
 packages/effect-fc/src/Form.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/effect-fc/src/Form.ts b/packages/effect-fc/src/Form.ts
index c31f12a..4b02a7b 100644
--- a/packages/effect-fc/src/Form.ts
+++ b/packages/effect-fc/src/Form.ts
@@ -164,9 +164,10 @@ export const submit = <A, I, R, SA, SE, SR, SP>(
             self.onSubmit(value) as Effect.Effect<SA, SE, Result.forkEffect.InputContext<SR, SP>>,
             { initialProgress: self.initialSubmitProgress },
         )),
-        Effect.andThen(([result]) => Stream.runFoldEffect(
-            result.changes,
-            Result.initial() as Result.Result<SA, SE, SP>,
+        Effect.andThen(([sub]) => Effect.all([Effect.succeed(sub), sub.get])),
+        Effect.andThen(([sub, initial]) => Stream.runFoldEffect(
+            sub.changes,
+            initial,
             (_, result) => Effect.as(Ref.set(self.submitResultRef, result), result),
         )),
         Effect.tap(result => Result.isFailure(result)