@effect-app/infra 1.0.11 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @effect-app/infra
 
+## 1.1.1
+
+### Patch Changes
+
+- 93f53d4: update packages
+- Updated dependencies [93f53d4]
+  - @effect-app/infra-adapters@1.0.8
+  - effect-app@1.0.6
+  - @effect-app/schema@1.0.6
+  - @effect-app/core@1.0.4
+
+## 1.1.0
+
+### Minor Changes
+
+- dd1f45f: feat: build RequestFiberSet usage into forkOperation
+
 ## 1.0.11
 
 ### Patch Changes

package/_cjs/services/Operations.cjs

@@ -8,6 +8,7 @@ exports.forkOperationFunction = forkOperationFunction;
 exports.forkOperationWithEffect = forkOperationWithEffect;
 var _Effect = require("@effect-app/core/Effect");
 var _Function = require("@effect-app/core/Function");
+var _RequestFiberSet = require("@effect-app/infra-adapters/RequestFiberSet");
 var _errorReporter = require("@effect-app/infra/errorReporter");
 var _schema = require("@effect-app/schema");
 var _dateFns = require("date-fns");
@@ -85,12 +86,12 @@ class Operations extends _effectApp.Context.TagMakeId("effect-app/Operations", m
   static Live = this.CleanupLive.pipe(_effectApp.Layer.provideMerge(this.toLayer()));
 }
 exports.Operations = Operations;
-const forkOperation = exports.forkOperation = (0, _Function.dual)(2, (self, title) => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(() => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self, scope))))));
+const forkOperation = exports.forkOperation = (0, _Function.dual)(2, (self, title) => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(() => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self.pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add))))));
 function forkOperationFunction(fnc, title) {
   return inp => fnc(inp).pipe(_ => forkOperation(_, title));
 }
-const forkOperation2 = exports.forkOperation2 = (0, _Function.dual)(2, (self, title) => (0, _Effect.flatMap)(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id), scope)))))));
+const forkOperation2 = exports.forkOperation2 = (0, _Function.dual)(2, (self, title) => (0, _Effect.flatMap)(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(id => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(id).pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add)))))));
 function forkOperationWithEffect(self, fnc, title) {
-  return _effectApp.Effect.flatMap(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(opId => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(opId), scope))), _effectApp.Effect.tap(opId => _effectApp.Effect.interruptible(fnc(opId)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))));
+  return _effectApp.Effect.flatMap(Operations, Operations => _effectApp.Effect.flatMap(Scope.make(), scope => Operations.register(title).pipe(Scope.extend(scope), _effectApp.Effect.tap(opId => (0, _reportError.forkDaemonReportRequestUnexpected)(Scope.use(self(opId).pipe(_effectApp.Effect.withSpan(title), _RequestFiberSet.RequestFiberSet.setRootParentSpan), scope)).pipe(_effectApp.Effect.andThen(_RequestFiberSet.RequestFiberSet.add))), _effectApp.Effect.tap(opId => _effectApp.Effect.interruptible(fnc(opId)).pipe(_effectApp.Effect.forkScoped, Scope.extend(scope))))));
 }
 //# sourceMappingURL=Operations.cjs.map

package/_cjs/services/Operations.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","sync","ops","Map","makeOp","OperationId","cleanup","before","subHours","Date","entries","forEach","id","op","lastChanged","Option","fromNullable","updatedAt","pipe","getOrElse","createdAt","delete","withSpan","addOp","title","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","copy","value","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","S","is","some","none","getOrNull","update","progress","register","tap","andThen","annotateLogscoped","acquireRelease","all","values","find","Operations","Context","TagMakeId","CleanupLive","use","void","schedule","Schedule","fixed","Duration","minutes","map","MainFiberSet","run","Layer","effectDiscard","provide","Live","provideMerge","toLayer","forkOperation","exports","dual","self","scope","extend","forkDaemonReportRequestUnexpected","forkOperationFunction","fnc","inp","forkOperation2","forkOperationWithEffect","opId","interruptible","forkScoped"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Operations.cjs","names":["_Effect","require","_Function","_RequestFiberSet","_errorReporter","_schema","_dateFns","_effectApp","_Operations","_MainFiberSet","Scope","_interopRequireWildcard","_reportError","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","reportAppError","reportError","make","Effect","sync","ops","Map","makeOp","OperationId","cleanup","before","subHours","Date","entries","forEach","id","op","lastChanged","Option","fromNullable","updatedAt","pipe","getOrElse","createdAt","delete","withSpan","addOp","title","Operation","findOp","finishOp","exit","flatMap","_","isNone","Error","copy","value","result","Exit","isSuccess","Success","Failure","message","Cause","isInterrupted","cause","NonEmptyString2k","isDie","failureOption","S","is","some","none","getOrNull","update","progress","register","tap","andThen","annotateLogscoped","acquireRelease","all","values","find","Operations","Context","TagMakeId","CleanupLive","use","void","schedule","Schedule","fixed","Duration","minutes","map","MainFiberSet","run","Layer","effectDiscard","provide","Live","provideMerge","toLayer","forkOperation","exports","dual","self","scope","extend","forkDaemonReportRequestUnexpected","RequestFiberSet","setRootParentSpan","add","forkOperationFunction","fnc","inp","forkOperation2","forkOperationWithEffect","opId","interruptible","forkScoped"],"sources":["../../src/services/Operations.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/api/routing/match.d.ts

@@ -8,5 +8,5 @@ import type { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import type { RequestHandler } from "./base.js";
 import type { Middleware } from "./makeRequestHandler.js";
 export declare const RouteDescriptors: Context.Tag<Ref<RouteDescriptorAny[]>, Ref<RouteDescriptorAny[]>>;
-export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/RequestContextContainer.js").RequestContextContainer | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>>, never, never>;
+export declare function match<R, M, PathA extends Struct.Fields, CookieA extends Struct.Fields, QueryA extends Struct.Fields, BodyA extends Struct.Fields, HeaderA extends Struct.Fields, ReqA extends PathA & QueryA & BodyA, ResA extends Struct.Fields, ResE, MiddlewareE, PPath extends `/${string}`, R2, PR, RErr, CTX, Context, Config>(requestHandler: RequestHandler<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, PPath, CTX, Context, Config>, errorHandler: <R>(req: HttpServerRequest.ServerRequest, res: HttpServerResponse.ServerResponse, r2: Effect<HttpServerResponse.ServerResponse, ValidationError | MiddlewareE | ResE, R>) => Effect<HttpServerResponse.ServerResponse, never, Exclude<RErr | R, HttpServerRequest.ServerRequest | HttpRouter.RouteContext | Scope>>, middleware?: Middleware<R, M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, ResE, MiddlewareE, PPath, R2, PR, CTX, Context, Config>): Effect.Effect<HttpRouter.Route<import("@effect/platform/Http/ServerError").RequestError, import("../../services/RequestContextContainer.js").RequestContextContainer | import("@effect-app/infra-adapters/RequestFiberSet").RequestFiberSet | import("../../services/Store/ContextMapContainer.js").ContextMapContainer | Exclude<R2, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<RErr, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext> | Exclude<Exclude<Exclude<R, import("effect-app/utils").EnforceNonEmptyRecord<M>>, PR>, Scope.Scope | HttpServerRequest.ServerRequest | HttpRouter.RouteContext>>, never, never>;
 //# sourceMappingURL=match.d.ts.map

package/dist/services/Operations.d.ts

@@ -1,3 +1,4 @@
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
 import type { StringId } from "@effect-app/schema";
 import { NonEmptyString2k } from "@effect-app/schema";
 import { Context, Effect, Layer, Option } from "effect-app";
@@ -46,7 +47,7 @@ declare const Operations_base: (abstract new (service: {
         all: Effect.Effect<Operation[], never, never>;
         find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
         update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Operations> : Effect<X, never, Operations>;
+    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;
@@ -61,6 +62,6 @@ export declare const forkOperation2: {
     (title: NonEmptyString2k): <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>) => Effect<StringId, never, Operations | Exclude<R, Scope.Scope>>;
     <R, E, A>(self: (opId: OperationId) => Effect<A, E, R>, title: NonEmptyString2k): Effect<StringId, never, Operations | Exclude<R, Scope.Scope>>;
 };
-export declare function forkOperationWithEffect<R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k): Effect<StringId, never, Operations | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
+export declare function forkOperationWithEffect<R, R2, E, E2, A, A2>(self: (id: OperationId) => Effect<A, E, R>, fnc: (id: OperationId) => Effect<A2, E2, R2>, title: NonEmptyString2k): Effect<StringId, never, Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>>;
 export {};
 //# sourceMappingURL=Operations.d.ts.map

package/dist/services/Operations.d.ts.map

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

package/dist/services/Operations.js

@@ -1,5 +1,6 @@
 import { annotateLogscoped, flatMap } from "@effect-app/core/Effect";
 import { dual } from "@effect-app/core/Function";
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet";
 import { reportError } from "@effect-app/infra/errorReporter";
 import { NonEmptyString2k } from "@effect-app/schema";
 import { subHours } from "date-fns";
@@ -89,18 +90,21 @@ export class Operations extends Context.TagMakeId("effect-app/Operations", make)
 export const forkOperation = dual(2, (self, title) => Effect.flatMap(Scope.make(), (scope) => Operations
     .register(title)
     .pipe(Scope.extend(scope), Effect
-    .tap(() => forkDaemonReportRequestUnexpected(Scope.use(self, scope))))));
+    .tap(() => forkDaemonReportRequestUnexpected(Scope.use(self.pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
+    .pipe(Effect.andThen(RequestFiberSet.add))))));
 export function forkOperationFunction(fnc, title) {
     return (inp) => fnc(inp).pipe((_) => forkOperation(_, title));
 }
 export const forkOperation2 = dual(2, (self, title) => flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
     .register(title)
     .pipe(Scope.extend(scope), Effect
-    .tap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id), scope)))))));
+    .tap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id)
+    .pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
+    .pipe(Effect.andThen(RequestFiberSet.add)))))));
 export function forkOperationWithEffect(self, fnc, title) {
-    return Effect.flatMap(Operations, (Operations) => Effect.flatMap(Scope
-        .make(), (scope) => Operations
+    return Effect.flatMap(Operations, (Operations) => Effect.flatMap(Scope.make(), (scope) => Operations
         .register(title)
-        .pipe(Scope.extend(scope), Effect.tap((opId) => forkDaemonReportRequestUnexpected(Scope.use(self(opId), scope))), Effect.tap((opId) => Effect.interruptible(fnc(opId)).pipe(Effect.forkScoped, Scope.extend(scope))))));
+        .pipe(Scope.extend(scope), Effect.tap((opId) => forkDaemonReportRequestUnexpected(Scope.use(self(opId).pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan), scope))
+        .pipe(Effect.andThen(RequestFiberSet.add))), Effect.tap((opId) => Effect.interruptible(fnc(opId)).pipe(Effect.forkScoped, Scope.extend(scope))))));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Operations.js","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Operations.js","sourceRoot":"","sources":["../../src/services/Operations.ts"],"names":[],"mappings":"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"}

package/dist/services/QueueMaker/service.d.ts

@@ -16,13 +16,13 @@ export declare const QueueMaker: QueueMakerOps;
 export declare const QueueMeta: import("@effect/schema/Schema").Struct<{
     requestContext: typeof RequestContext;
     span: S.PropertySignature<"?:", {
-        readonly sampled: boolean;
         readonly spanId: string;
         readonly traceId: string;
-    } | undefined, never, "?:", {
         readonly sampled: boolean;
+    } | undefined, never, "?:", {
         readonly spanId: string;
         readonly traceId: string;
+        readonly sampled: boolean;
     } | undefined, false, never>;
 }>;
 //# sourceMappingURL=service.d.ts.map

package/dist/services/RepositoryBase.d.ts

@@ -145,7 +145,7 @@ export declare function makeRepo<Evt = never>(): <ItemType extends string, R, En
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string;
         };
-    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, StoreMaker | ContextMapContainer | R | RInitial | R2>;
+    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, ContextMapContainer | StoreMaker | R | RInitial | R2>;
     Q: Query<Encoded>;
 };
 export declare function makeStore<Encoded extends {

package/dist/services/RequestContextContainer.d.ts

@@ -25,7 +25,7 @@ declare const RequestContextContainer_base: (abstract new (service: {
         requestContext: Effect<RequestContext>;
         update: (f: (rc: RequestContext) => RequestContext) => Effect<RequestContext>;
         start: (f: RequestContext) => Effect<void>;
-    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | RequestContextContainer> : Effect<X, never, RequestContextContainer>;
+    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, RequestContextContainer | R_4> : Effect<X, never, RequestContextContainer>;
 };
 /**
  * @tsplus type RequestContextContainer

package/dist/services/Store/service.d.ts

@@ -88,7 +88,7 @@ declare const StoreMaker_base: (abstract new (service: {
         make: <Encoded extends {
             id: Id;
         }, Id extends string, R = never, E = never>(name: string, seed?: Effect<Iterable<Encoded>, E, R> | undefined, config?: StoreConfig<Encoded> | undefined) => Effect<Store<Encoded, Id, PersistenceModelType<Encoded>>, E, R>;
-    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, StoreMaker | R_4> : Effect<X, never, StoreMaker>;
+    }) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | StoreMaker> : Effect<X, never, StoreMaker>;
 };
 /**
  * @tsplus type StoreMaker
@@ -127,7 +127,7 @@ declare const ContextMap_base: (abstract new (service: {
     use: <X>(body: (_: {
         get: (id: string) => string | undefined;
         set: (id: string, eTag: string | undefined) => void;
-    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, ContextMap | R_5> : Effect<X, never, ContextMap>;
+    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | ContextMap> : Effect<X, never, ContextMap>;
 };
 /**
  * @tsplus type ContextMap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.0.11",
+  "version": "1.1.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -12,20 +12,20 @@
     "@sendgrid/mail": "^8.1.3",
     "change-case": "^5.4.4",
     "cross-fetch": "^4.0.0",
-    "fast-check": "~3.17.1",
+    "fast-check": "~3.17.2",
     "object-hash": "^3.0.0",
     "path-parser": "^6.1.0",
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/infra-adapters": "1.0.7",
-    "@effect-app/core": "1.0.3",
-    "@effect-app/schema": "1.0.5",
-    "effect-app": "1.0.5"
+    "@effect-app/core": "1.0.4",
+    "@effect-app/infra-adapters": "1.0.8",
+    "effect-app": "1.0.6",
+    "@effect-app/schema": "1.0.6"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",
-    "@sentry/node": "^7.110.1",
+    "@sentry/node": "^7.111.0",
     "@types/express": "^4.17.21",
     "@types/node": "~20.12.7",
     "@types/proper-lockfile": "^4.1.4",
@@ -42,9 +42,9 @@
   },
   "peerDependencies": {
     "express": "^4.19.2",
-    "@effect/platform": "^0.49.3",
-    "@effect/schema": "^0.66.1",
-    "effect": "^3.0.1"
+    "@effect/platform": "^0.50.3",
+    "@effect/schema": "^0.66.6",
+    "effect": "^3.0.3"
   },
   "typesVersions": {
     "*": {

package/src/services/Operations.ts

@@ -1,5 +1,6 @@
 import { annotateLogscoped, flatMap } from "@effect-app/core/Effect"
 import { dual } from "@effect-app/core/Function"
+import { RequestFiberSet } from "@effect-app/infra-adapters/RequestFiberSet"
 import { reportError } from "@effect-app/infra/errorReporter"
 import type { StringId } from "@effect-app/schema"
 import { NonEmptyString2k } from "@effect-app/schema"
@@ -140,7 +141,16 @@ export const forkOperation: {
           .pipe(
             Scope.extend(scope),
             Effect
-              .tap(() => forkDaemonReportRequestUnexpected(Scope.use(self, scope)))
+              .tap(() =>
+                forkDaemonReportRequestUnexpected(Scope.use(
+                  self.pipe(
+                    Effect.withSpan(title),
+                    RequestFiberSet.setRootParentSpan
+                  ),
+                  scope
+                ))
+                  .pipe(Effect.andThen(RequestFiberSet.add))
+              )
           )
     )
 )
@@ -169,7 +179,17 @@ export const forkOperation2: {
             .pipe(
               Scope.extend(scope),
               Effect
-                .tap((id) => forkDaemonReportRequestUnexpected(Scope.use(self(id), scope)))
+                .tap((id) =>
+                  forkDaemonReportRequestUnexpected(Scope.use(
+                    self(id)
+                      .pipe(
+                        Effect.withSpan(title),
+                        RequestFiberSet.setRootParentSpan
+                      ),
+                    scope
+                  ))
+                    .pipe(Effect.andThen(RequestFiberSet.add))
+                )
             )
       ))
 )
@@ -178,18 +198,28 @@ export function forkOperationWithEffect<R, R2, E, E2, A, A2>(
   self: (id: OperationId) => Effect<A, E, R>,
   fnc: (id: OperationId) => Effect<A2, E2, R2>,
   title: NonEmptyString2k
-): Effect<StringId, never, Operations | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> {
+): Effect<StringId, never, Operations | RequestFiberSet | Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> {
   return Effect.flatMap(Operations, (Operations) =>
     Effect.flatMap(
-      Scope
-        .make(),
+      Scope.make(),
       (scope) =>
         Operations
           .register(title)
           .pipe(
             Scope.extend(scope),
-            Effect.tap((opId) => forkDaemonReportRequestUnexpected(Scope.use(self(opId), scope))),
-            Effect.tap((opId) => Effect.interruptible(fnc(opId)).pipe(Effect.forkScoped, Scope.extend(scope)))
+            Effect.tap((opId) =>
+              forkDaemonReportRequestUnexpected(Scope.use(
+                self(opId).pipe(Effect.withSpan(title), RequestFiberSet.setRootParentSpan),
+                scope
+              ))
+                .pipe(Effect.andThen(RequestFiberSet.add))
+            ),
+            Effect.tap((opId) =>
+              Effect.interruptible(fnc(opId)).pipe(
+                Effect.forkScoped,
+                Scope.extend(scope)
+              )
+            )
           )
     ))
 }

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -1,37 +0,0 @@
-// packages/infra/vitest.config.ts
-import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
-
-// vite.config.base.ts
-import path from "path";
-import fs from "fs";
-var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
-function makeConfig(dirName) {
-  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
-  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
-  const cfg = {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    //plugins: [autoImport],
-    test: {
-      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
-      reporters: "verbose",
-      globals: true
-    },
-    resolve: {
-      alias: packages.reduce((acc, cur) => {
-        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
-        return acc;
-      }, {})
-      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
-    }
-  };
-  console.log(cfg);
-  return cfg;
-}
-
-// packages/infra/vitest.config.ts
-var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
-var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
-export {
-  vitest_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=