packages/example/src/main.tsx

@@ -26,11 +26,11 @@ declare module "@tanstack/react-router" {
 
 
 createRoot(document.getElementById("root")!).render(
-    <StrictMode>
+    // <StrictMode>
         <ReffuseRuntime.Provider>
             <GlobalContext.Provider layer={layer}>
                 <RouterProvider router={router} />
             </GlobalContext.Provider>
         </ReffuseRuntime.Provider>
-    </StrictMode>
+    // </StrictMode>
 )

packages/extension-query/src/QueryRunner.ts

@@ -1,5 +1,5 @@
 import * as AsyncData from "@typed/async-data"
-import { Effect, Fiber, flow, identity, Option, Ref, SubscriptionRef } from "effect"
+import { Effect, Fiber, identity, Option, Ref, SubscriptionRef } from "effect"
 
 
 export interface QueryRunner<A, E, R> {
@@ -24,9 +24,17 @@ export const make = <A, E, R>(
 
     const interrupt = fiberRef.pipe(
         Effect.flatMap(Option.match({
-            onSome: flow(
-                Fiber.interrupt,
-                Effect.andThen(Ref.set(fiberRef, Option.none())),
+            onSome: fiber => Ref.set(fiberRef, Option.none()).pipe(
+                Effect.andThen(Fiber.interrupt(fiber))
+            ),
+            onNone: () => Effect.void,
+        }))
+    )
+
+    const forkInterrupt = fiberRef.pipe(
+        Effect.flatMap(Option.match({
+            onSome: fiber => Ref.set(fiberRef, Option.none()).pipe(
+                Effect.andThen(Fiber.interruptFork(fiber))
             ),
             onNone: () => Effect.void,
         }))

packages/extension-query/src/index.ts

@@ -25,7 +25,7 @@ export const QueryExtension = ReffuseExtension.make(() => ({
 
         this.useFork(() => Stream.runForEach(runner.fiberRef.changes, Console.log), [])
 
-        this.useFork(() => Effect.addFinalizer(() => runner.interrupt).pipe(
+        this.useEffect(() => Effect.addFinalizer(() => Effect.void).pipe(
             Effect.andThen(Ref.set(runner.queryRef, props.effect())),
             Effect.andThen(runner.forkFetch),
         ), [runner, ...props.deps])