@typed/fx 0.0.4 → 0.0.6

package/esm/Stream/switchMap.js

@@ -0,0 +1,107 @@
+import { flow, pipe } from 'hkt-ts';
+import { isRight } from 'hkt-ts/Either';
+import { isJust } from 'hkt-ts/Maybe';
+import { MapStream } from './map.js';
+import { Disposable, settable } from "../Disposable/Disposable.js";
+import * as FiberRefs from "../FiberRefs/index.js";
+import * as Fx from "../Fx/index.js";
+import { access, lazy, unit } from "../Fx/index.js";
+import { Lock } from "../Semaphore/Semaphore.js";
+import * as Sink from "../Sink/Sink.js";
+import { None, and } from "../Supervisor/Supervisor.js";
+export function switchMap(f, __trace) {
+    return (stream) => SwitchMapStream.make(stream, f, __trace);
+}
+export function switchLatest(stream, __trace) {
+    return switchMap((a) => a, __trace)(stream);
+}
+export class SwitchMapStream {
+    stream;
+    f;
+    __trace;
+    constructor(stream, f, __trace) {
+        this.stream = stream;
+        this.f = f;
+        this.__trace = __trace;
+    }
+    fork(sink, scheduler, context) {
+        const { stream, f } = this;
+        return access((env) => stream.fork(new SwitchMapSink(sink, scheduler, context, f, env, this.__trace), scheduler, context), "access" + " node_modules/@typed/fx/src/Stream/switchMap.ts:46:18");
+    }
+    static make(stream, f, __trace) {
+        if (stream instanceof MapStream) {
+            return SwitchMapStream.make(stream.stream, flow(stream.f, f), __trace);
+        }
+        return new SwitchMapStream(stream, f, __trace);
+    }
+}
+class SwitchMapSink {
+    sink;
+    scheduler;
+    context;
+    f;
+    env;
+    __trace;
+    _ended = false;
+    _fibers = [];
+    _lock = new Lock();
+    _supervisor = None.extend({
+        onEnd: () => (fiber, exit) => {
+            const parentContext = fiber.context.parent;
+            // Merge FiberRefs upon successful completion
+            if (isRight(exit) && isJust(parentContext)) {
+                FiberRefs.join(parentContext.value.fiberRefs, fiber.context.fiberRefs);
+            }
+        },
+    });
+    constructor(sink, scheduler, context, f, env, __trace) {
+        this.sink = sink;
+        this.scheduler = scheduler;
+        this.context = context;
+        this.f = f;
+        this.env = env;
+        this.__trace = __trace;
+    }
+    event = (a) => Fx.lazy(() => {
+        const forked = this.context.fork({
+            supervisor: and(this._supervisor)(this.context.supervisor),
+        });
+        const cleanup = Fx.zipAll(this._fibers.map((f) => f.interruptAs(forked.id)));
+        const disposable = settable();
+        const sink = this.innerSink(disposable);
+        return pipe(cleanup, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        Fx.flatMap(() => this.f(a).fork(Sink.addTrace(sink, this.__trace), this.scheduler, forked)), Fx.tapLazy((fiber) => {
+            this._fibers.push(fiber);
+            disposable.add(Disposable(() => {
+                this._fibers.splice(this._fibers.indexOf(fiber), 1);
+            }));
+        }), Fx.flatMap((fiber) => pipe(fiber, Fx.join, Fx.tapLazy(() => disposable.dispose()))), (x) => x, Fx.provide(this.env));
+    }, "Fx.lazy" + " node_modules/@typed/fx/src/Stream/switchMap.ts:94:12");
+    error = (cause) => {
+        return lazy(() => {
+            this._ended = true;
+            return this.sink.error(cause);
+        }, "lazy" + " node_modules/@typed/fx/src/Stream/switchMap.ts:128:16");
+    };
+    end = lazy(() => {
+        this._ended = true;
+        return this.endIfCompleted();
+    }, "lazy" + " node_modules/@typed/fx/src/Stream/switchMap.ts:135:13");
+    endIfCompleted() {
+        if (this._ended && this._fibers.length === 0) {
+            return this.sink.end;
+        }
+        return unit;
+    }
+    innerSink(disposable) {
+        return {
+            event: this.sink.event,
+            error: this.error,
+            end: lazy(() => {
+                disposable.dispose();
+                return this.endIfCompleted();
+            }, "lazy" + " node_modules/@typed/fx/src/Stream/switchMap.ts:153:16"),
+        };
+    }
+}
+//# sourceMappingURL=switchMap.js.map

package/esm/Stream/switchMap.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"switchMap.js","sourceRoot":"","sources":["../../src/Stream/switchMap.ts"],"names":[],"mappings":"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"}

package/esm/Stream/tap.d.ts

@@ -1,4 +1,5 @@
 import { Stream } from './Stream.js';
 import { Fx } from "../Fx/Fx.js";
-export declare const tap: <A, R2, E2, B>(f: (a: A) => Fx<R2, E2, B>) => <R, E>(stream: Stream<R, E, A>) => Stream<R2 | R, E2 | E, A>;
+export declare const tap: <A, R2, E2, B>(f: (a: A) => Fx<R2, E2, B>, __trace?: string) => <R, E>(stream: Stream<R, E, A>) => Stream<R2 | R, E2 | E, A>;
+export declare const tapLazy: <A, B>(f: (a: A) => B, __trace?: string) => <R, E>(stream: Stream<R, E, A>) => Stream<R, E, A>;
 //# sourceMappingURL=tap.d.ts.map

package/esm/Stream/tap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tap.d.ts","sourceRoot":"","sources":["../../src/Stream/tap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGpC,OAAO,EAAE,EAAE,EAAO,oBAAkB;AAEpC,eAAO,MAAM,GAAG,4GAaX,CAAA"}
+{"version":3,"file":"tap.d.ts","sourceRoot":"","sources":["../../src/Stream/tap.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGpC,OAAO,EAAE,EAAE,EAAiB,oBAAkB;AAE9C,eAAO,MAAM,GAAG,uDACuC,MAAM,iEAYxD,CAAA;AAEL,eAAO,MAAM,OAAO,mCAAoC,MAAM,uDAChB,CAAA"}

package/esm/Stream/tap.js

@@ -1,5 +1,6 @@
 import { pipe } from 'hkt-ts/function';
 import { flatMapFx } from './flatMapFx.js';
-import { map } from "../Fx/Fx.js";
-export const tap = (f) => (stream) => pipe(stream, flatMapFx((a) => pipe(f(a), map(() => a)), 'Stream.tap'));
+import { fromLazy, map } from "../Fx/Fx.js";
+export const tap = (f, __trace) => (stream) => pipe(stream, flatMapFx((a) => pipe(f(a), map(() => a)), __trace));
+export const tapLazy = (f, __trace) => tap((a) => fromLazy(() => f(a)), __trace);
 //# sourceMappingURL=tap.js.map

package/esm/Stream/tap.js.map

@@ -1 +1 @@
-{"version":3,"file":"tap.js","sourceRoot":"","sources":["../../src/Stream/tap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAM,GAAG,EAAE,oBAAkB;AAEpC,MAAM,CAAC,MAAM,GAAG,GACd,CAAe,CAA0B,EAAE,EAAE,CAC7C,CAAO,MAAuB,EAA6B,EAAE,CAC3D,IAAI,CACF,MAAM,EACN,SAAS,CACP,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,CACF,CAAC,CAAC,CAAC,CAAC,EACJ,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACb,EACH,YAAY,CACb,CACF,CAAA"}
+{"version":3,"file":"tap.js","sourceRoot":"","sources":["../../src/Stream/tap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAGtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,OAAO,EAAM,QAAQ,EAAE,GAAG,EAAE,oBAAkB;AAE9C,MAAM,CAAC,MAAM,GAAG,GACd,CAAe,CAA0B,EAAE,OAAgB,EAAE,EAAE,CAC/D,CAAO,MAAuB,EAA6B,EAAE,CAC3D,IAAI,CACF,MAAM,EACN,SAAS,CACP,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,CACF,CAAC,CAAC,CAAC,CAAC,EACJ,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CACb,EACH,OAAO,CACR,CACF,CAAA;AAEL,MAAM,CAAC,MAAM,OAAO,GAAG,CAAO,CAAc,EAAE,OAAgB,EAAE,EAAE,CAChE,GAAG,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA"}

package/esm/Timeline/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Timeline/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Timeline/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/fx",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "High-performance Asynchronous Effects",
   "type": "module",
   "main": "esm/index.js",
@@ -256,26 +256,6 @@
         "types": "./esm/Duration/Duration.d.ts"
       }
     },
-    "./Effect": {
-      "require": {
-        "default": "./cjs/Effect/index.js",
-        "types": "./cjs/Effect/index.js"
-      },
-      "import": {
-        "default": "./esm/Effect/index.js",
-        "types": "./esm/Effect/index.js"
-      }
-    },
-    "./Effect/Effect": {
-      "require": {
-        "default": "./cjs/Effect/Effect.js",
-        "types": "./cjs/Effect/Effect.d.ts"
-      },
-      "import": {
-        "default": "./esm/Effect/Effect.js",
-        "types": "./esm/Effect/Effect.d.ts"
-      }
-    },
     "./Env": {
       "require": {
         "default": "./cjs/Env/index.js",
@@ -356,6 +336,16 @@
         "types": "./esm/Fiber/fromExit.d.ts"
       }
     },
+    "./Fiber/fromScope": {
+      "require": {
+        "default": "./cjs/Fiber/fromScope.js",
+        "types": "./cjs/Fiber/fromScope.d.ts"
+      },
+      "import": {
+        "default": "./esm/Fiber/fromScope.js",
+        "types": "./esm/Fiber/fromScope.d.ts"
+      }
+    },
     "./Fiber/hkt": {
       "require": {
         "default": "./cjs/Fiber/hkt.js",
@@ -1176,6 +1166,16 @@
         "types": "./esm/Stream/Stream.d.ts"
       }
     },
+    "./Stream/acquirePermit": {
+      "require": {
+        "default": "./cjs/Stream/acquirePermit.js",
+        "types": "./cjs/Stream/acquirePermit.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/acquirePermit.js",
+        "types": "./esm/Stream/acquirePermit.d.ts"
+      }
+    },
     "./Stream/bimap": {
       "require": {
         "default": "./cjs/Stream/bimap.js",
@@ -1226,6 +1226,16 @@
         "types": "./esm/Stream/flatMap.d.ts"
       }
     },
+    "./Stream/flatMapConcurrently": {
+      "require": {
+        "default": "./cjs/Stream/flatMapConcurrently.js",
+        "types": "./cjs/Stream/flatMapConcurrently.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/flatMapConcurrently.js",
+        "types": "./esm/Stream/flatMapConcurrently.d.ts"
+      }
+    },
     "./Stream/flatMapFx": {
       "require": {
         "default": "./cjs/Stream/flatMapFx.js",
@@ -1266,6 +1276,26 @@
         "types": "./esm/Stream/hkt.d.ts"
       }
     },
+    "./Stream/hold": {
+      "require": {
+        "default": "./cjs/Stream/hold.js",
+        "types": "./cjs/Stream/hold.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/hold.js",
+        "types": "./esm/Stream/hold.d.ts"
+      }
+    },
+    "./Stream/lazy": {
+      "require": {
+        "default": "./cjs/Stream/lazy.js",
+        "types": "./cjs/Stream/lazy.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/lazy.js",
+        "types": "./esm/Stream/lazy.d.ts"
+      }
+    },
     "./Stream/map": {
       "require": {
         "default": "./cjs/Stream/map.js",
@@ -1276,6 +1306,36 @@
         "types": "./esm/Stream/map.d.ts"
       }
     },
+    "./Stream/merge": {
+      "require": {
+        "default": "./cjs/Stream/merge.js",
+        "types": "./cjs/Stream/merge.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/merge.js",
+        "types": "./esm/Stream/merge.d.ts"
+      }
+    },
+    "./Stream/multicast": {
+      "require": {
+        "default": "./cjs/Stream/multicast.js",
+        "types": "./cjs/Stream/multicast.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/multicast.js",
+        "types": "./esm/Stream/multicast.d.ts"
+      }
+    },
+    "./Stream/orElse": {
+      "require": {
+        "default": "./cjs/Stream/orElse.js",
+        "types": "./cjs/Stream/orElse.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/orElse.js",
+        "types": "./esm/Stream/orElse.d.ts"
+      }
+    },
     "./Stream/periodic": {
       "require": {
         "default": "./cjs/Stream/periodic.js",
@@ -1296,6 +1356,16 @@
         "types": "./esm/Stream/run.d.ts"
       }
     },
+    "./Stream/scan": {
+      "require": {
+        "default": "./cjs/Stream/scan.js",
+        "types": "./cjs/Stream/scan.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/scan.js",
+        "types": "./esm/Stream/scan.d.ts"
+      }
+    },
     "./Stream/scheduled": {
       "require": {
         "default": "./cjs/Stream/scheduled.js",
@@ -1306,6 +1376,26 @@
         "types": "./esm/Stream/scheduled.d.ts"
       }
     },
+    "./Stream/setFiberRefLocally": {
+      "require": {
+        "default": "./cjs/Stream/setFiberRefLocally.js",
+        "types": "./cjs/Stream/setFiberRefLocally.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/setFiberRefLocally.js",
+        "types": "./esm/Stream/setFiberRefLocally.d.ts"
+      }
+    },
+    "./Stream/switchMap": {
+      "require": {
+        "default": "./cjs/Stream/switchMap.js",
+        "types": "./cjs/Stream/switchMap.d.ts"
+      },
+      "import": {
+        "default": "./esm/Stream/switchMap.js",
+        "types": "./esm/Stream/switchMap.d.ts"
+      }
+    },
     "./Stream/tap": {
       "require": {
         "default": "./cjs/Stream/tap.js",

package/readme.md

@@ -23,7 +23,7 @@ bundle size, parse time, memory constraints, etc. are of great concern. There wi
 these metrics, ergonomics, and feature-set. We'll attempt to tread these lines as best we can, but Fx is highly feature-rich
 as it is, and can be used to build many many more abstractions that are not yet available as 3rd party plugins.
 
-The full library, and its dependencies, are about 20kb minified + gzipped. 
+The full library, and its dependencies, are about 30kb minified + gzipped. 
 However, it is provided as ES modules and is highly tree-shakeable. Take only what you need.
 
 ## Come Back Soon

package/src/Cause/Cause.ts

@@ -85,6 +85,16 @@ export const traced =
   <E>(cause: Cause<E>): Cause<E> =>
     new Traced(cause, trace)
 
+export const isEmpty = <E>(cause: Cause<E>): cause is Empty => cause.tag === Empty.tag
+export const isInterrupted = <E>(cause: Cause<E>): cause is Interrupted =>
+  cause.tag === 'Interrupted'
+export const isUnexpected = <E>(cause: Cause<E>): cause is Unexpected => cause.tag === 'Unexpected'
+export const isExpected = <E>(cause: Cause<E>): cause is Expected<E> => cause.tag === 'Expected'
+export const isSequential = <E>(cause: Cause<E>): cause is Sequential<E, E> =>
+  cause.tag === 'Sequential'
+export const isParallel = <E>(cause: Cause<E>): cause is Parallel<E, E> => cause.tag === 'Parallel'
+export const isTraced = <E>(cause: Cause<E>): cause is Traced<E> => cause.tag === 'Traced'
+
 export const makeParallelAssociative = <E>(): Associative.Associative<Cause<E>> => ({
   concat: (left, right) =>
     left.tag === Empty.tag ? right : right.tag === Empty.tag ? left : new Parallel(left, right),
@@ -423,3 +433,56 @@ export const makeDebug = <E>(renderer: Renderer<E> = defaultRenderer): D.Debug<C
   D.Debug((cause) => prettyPrint(cause, renderer))
 
 export const Debug = makeDebug()
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export const findExpected = find(<E>(_e: E): _e is E => true)
+
+export function findType<T extends Cause<any>['tag']>(tag: T) {
+  return <E>(cause: Cause<E>): Maybe.Maybe<Cause<E>> => {
+    if (cause.tag === tag) {
+      return Maybe.Just(cause)
+    }
+
+    if (cause.tag === 'Sequential') {
+      return pipe(
+        findType(tag)(cause.left),
+        Maybe.match(
+          () => findType(tag)(cause.right),
+          (a) =>
+            pipe(
+              findType(tag)(cause.right),
+              Maybe.match(
+                () => Maybe.Just(a),
+                (b) => Maybe.Just(sequential(a, b)),
+              ),
+            ),
+        ),
+      )
+    }
+
+    if (cause.tag === 'Parallel') {
+      return pipe(
+        findType(tag)(cause.left),
+        Maybe.match(
+          () => findType(tag)(cause.right),
+          (a) =>
+            pipe(
+              findType(tag)(cause.right),
+              Maybe.match(
+                () => Maybe.Just(a),
+                (b) => Maybe.Just(parallel(a, b)),
+              ),
+            ),
+        ),
+      )
+    }
+
+    if (cause.tag === 'Traced') {
+      return findType(tag)(cause.cause)
+    }
+
+    return Maybe.Nothing
+  }
+}
+
+export const findInterrupted = findType('Interrupted')

package/src/Cause/Renderer.ts

@@ -67,7 +67,7 @@ export function renderInterrupted<E>(
 ): Sequential {
   return Sequential([
     Failure([
-      `Interrupted by Fiber ${FiberIdDebug.debug(cause.fiberId)}.`,
+      `Interrupted by ${FiberIdDebug.debug(cause.fiberId)}.`,
       '',
       ...renderTrace(trace, renderer),
     ]),

package/src/Env/Env.ts

@@ -9,6 +9,6 @@ export interface Env<R> {
 
 export function Env<R>(fiberRefs: FiberRefs.FiberRefs): Env<R> {
   return {
-    get: getServiceFromFiberRefs(fiberRefs),
+    get: getServiceFromFiberRefs(fiberRefs.fork()),
   }
 }

package/src/Fiber/fromScope.ts

@@ -0,0 +1,19 @@
+import { pipe } from 'hkt-ts'
+
+import { Synthetic } from './Fiber.js'
+
+import { FiberId } from '@/FiberId/FiberId.js'
+import { Closeable, closeOrWait, wait } from '@/Scope/Closeable.js'
+import { Exit, FiberRefs, Fx } from '@/index.js'
+
+export function fromScope(id: FiberId, fiberRefs: FiberRefs.FiberRefs, scope: Closeable) {
+  return Synthetic({
+    id,
+    exit: wait(scope),
+    inheritFiberRefs: pipe(
+      Fx.getFiberRefs,
+      Fx.flatMap((refs) => Fx.fromLazy(() => FiberRefs.join(refs, fiberRefs))),
+    ),
+    interruptAs: (id) => closeOrWait(scope)(Exit.interrupt(id)),
+  })
+}

package/src/FiberContext/FiberContext.ts

@@ -61,7 +61,7 @@ export function fork<Id extends FiberId.FiberId = FiberId.Live, Id2 extends Fibe
     platform: overrides?.platform ?? context.platform.fork(),
     fiberRefs: overrides?.fiberRefs ?? context.fiberRefs.fork(),
     scope: overrides?.scope ?? context.scope.fork(),
-    supervisor: overrides?.supervisor ?? None,
+    supervisor: overrides?.supervisor ?? context.supervisor,
     logger: overrides?.logger ?? context.logger,
     parent: overrides?.parent ?? Just(context),
   })

package/src/FiberRef/builtins.ts

@@ -20,7 +20,7 @@ export const CurrentEnv = make(
   pipe(
     Fx.getFiberContext,
     // Always use a snapshot of the FiberRefs to avoid mutability problems.
-    Fx.map((c): Env<any> => ({ get: getServiceFromFiberRefs(c.fiberRefs) })),
+    Fx.map((c): Env<any> => ({ get: getServiceFromFiberRefs(c.fiberRefs.fork()) })),
   ),
   {
     fork: constant(Nothing), // Always create a new Env for each Fiber.
@@ -55,17 +55,26 @@ export const Layers = FiberRef.make(
   },
 )
 
-export const Services = FiberRef.make(Fx.now(ImmutableMap<Service<any>, any>()), {
-  join: identity, // Always keep the parent Fiber's services
-})
+export const Services = FiberRef.make(
+  Fx.fromLazy(() => ImmutableMap<Service<any>, any>()),
+  {
+    join: identity, // Always keep the parent Fiber's services
+  },
+)
 
-export const CurrentLogSpans = FiberRef.make(Fx.now(ImmutableMap<string, LogSpan>()), {
-  join: identity,
-})
+export const CurrentLogSpans = FiberRef.make(
+  Fx.fromLazy(() => ImmutableMap<string, LogSpan>()),
+  {
+    join: identity,
+  },
+)
 
-export const CurrentLogAnnotations = FiberRef.make(Fx.now(ImmutableMap<string, LogAnnotation>()), {
-  join: identity,
-})
+export const CurrentLogAnnotations = FiberRef.make(
+  Fx.fromLazy(() => ImmutableMap<string, LogAnnotation>()),
+  {
+    join: identity,
+  },
+)
 
 export function getServiceFromFiberRefs(fiberRefs: FiberRefs.FiberRefs) {
   return <S>(id: Service<S>): Fx.Of<S> => {

package/src/FiberRuntime/FiberRuntime.ts

@@ -119,6 +119,11 @@ export class FiberRuntime<F extends Fx.AnyFx>
   readonly addObserver = (
     observer: (exit: Exit.Exit<Fx.ErrorsOf<F>, Fx.OutputOf<F>>) => void,
   ): Disposable => {
+    if (this._status.tag === 'Done') {
+      const exit = this._status.exit
+      return this.setTimer(() => observer(exit))
+    }
+
     this._observers.push(observer)
 
     return Disposable(() => {
@@ -137,10 +142,7 @@ export class FiberRuntime<F extends Fx.AnyFx>
         this._disposable.dispose()
         this._disposable = settable()
         this._current = Maybe.Just(Fx.interrupted(id).instr)
-
-        if (this._status.tag === 'Suspended') {
-          this.setTimer(() => this.loop())
-        }
+        this.loop()
       } else {
         // Record the interrupting FiberId for if/when the interrupt status becomes true again.
         this._interruptedBy.add(id)
@@ -207,6 +209,7 @@ export class FiberRuntime<F extends Fx.AnyFx>
 
   protected addCustomTrace(trace?: string) {
     if (trace) {
+      this.pushPopFiberRef(Builtin.CurrentTrace, this.getRuntimeTrace())
       this.pushPopFiberRef(Builtin.CurrentTrace, Trace.Trace.custom(trace))
     }
   }
@@ -225,14 +228,8 @@ export class FiberRuntime<F extends Fx.AnyFx>
     this.withFiberRef(Builtin.CurrentConcurrencyLevel, (semaphore) => {
       const withConcurrency = acquireFiber(semaphore.value)
 
-      const f = new FiberRuntime(
-        withConcurrency(instr.first),
-        this.context.fork({ fiberRefs: this.context.fiberRefs }),
-      )
-      const s = new FiberRuntime(
-        withConcurrency(instr.second),
-        this.context.fork({ fiberRefs: this.context.fiberRefs }),
-      )
+      const f = new FiberRuntime(withConcurrency(instr.first), this.context.fork())
+      const s = new FiberRuntime(withConcurrency(instr.second), this.context.fork())
 
       const [future, onExit] = bothFuture(f, s)
 
@@ -247,7 +244,14 @@ export class FiberRuntime<F extends Fx.AnyFx>
 
       return pipe(
         wait(future),
-        Fx.ensuring(() => Fx.fromLazy(() => inner.dispose())),
+        Fx.ensuring(() =>
+          Fx.fromLazy(() => {
+            FiberRefs.join(this.context.fiberRefs, f.context.fiberRefs)
+            FiberRefs.join(this.context.fiberRefs, s.context.fiberRefs)
+
+            inner.dispose()
+          }),
+        ),
       )
     })
   }
@@ -267,14 +271,8 @@ export class FiberRuntime<F extends Fx.AnyFx>
   protected processEither(instr: Extract<AnyInstruction, { readonly tag: 'Either' }>) {
     this.withFiberRef(Builtin.CurrentConcurrencyLevel, (semaphore) => {
       const withConcurrency = acquireFiber(semaphore.value)
-      const f = new FiberRuntime(
-        withConcurrency(instr.first),
-        this.context.fork({ fiberRefs: this.context.fiberRefs }),
-      )
-      const s = new FiberRuntime(
-        withConcurrency(instr.second),
-        this.context.fork({ fiberRefs: this.context.fiberRefs }),
-      )
+      const f = new FiberRuntime(withConcurrency(instr.first), this.context.fork())
+      const s = new FiberRuntime(withConcurrency(instr.second), this.context.fork())
 
       const inner = settable()
       const future = Pending<never, any, any>()
@@ -283,10 +281,19 @@ export class FiberRuntime<F extends Fx.AnyFx>
           pipe(
             Fx.fromExit(exit),
             Fx.ensuring(() =>
-              index === 0 ? s.interruptAs(f.context.id) : f.interruptAs(s.context.id),
+              index === 0
+                ? pipe(
+                    s.interruptAs(f.context.id),
+                    Fx.tapLazy(() => FiberRefs.join(this.context.fiberRefs, f.context.fiberRefs)),
+                  )
+                : pipe(
+                    f.interruptAs(s.context.id),
+                    Fx.tapLazy(() => FiberRefs.join(this.context.fiberRefs, s.context.fiberRefs)),
+                  ),
             ),
           ),
         )
+
         inner.dispose()
       }
 
@@ -335,9 +342,9 @@ export class FiberRuntime<F extends Fx.AnyFx>
   }
 
   protected processFromCause(instr: Extract<AnyInstruction, { readonly tag: 'FromCause' }>) {
-    if (instr.cause.tag === 'Interrupted' && this._children.length > 0) {
-      const fiberId = instr.cause.fiberId
-      const interrupts = this._children.map((c) => c.interruptAs(fiberId))
+    const interruptedCause = Cause.findInterrupted(instr.cause)
+    if (Maybe.isJust(interruptedCause) && this._children.length > 0) {
+      const interrupts = this._children.map((c) => c.interruptAs(this.id))
       this._children = []
 
       // Cancel all Child Fibers and then continue with the Cause