@effect-app/infra 4.0.0-beta.120 → 4.0.0-beta.122

package/src/Model/Repository/ext.ts

@@ -9,6 +9,24 @@ import type { Query, QueryEnd, QueryWhere } from "../query.js"
 import * as Q from "../query.js"
 import type { Repository } from "./service.js"
 
+interface BatchOptions {
+  readonly batch?: true | number
+}
+
+type NonEmptyReadonlyArray<A> = readonly [A, ...A[]]
+
+const asReadonlyArray = <T>(itemOrItems: T | NonEmptyReadonlyArray<T>): ReadonlyArray<T> =>
+  globalThis.Array.isArray(itemOrItems)
+    ? itemOrItems as ReadonlyArray<T>
+    : [itemOrItems as T]
+
+const getBatchSize = (batch?: true | number) =>
+  batch === true
+    ? 100
+    : typeof batch === "number" && Number.isFinite(batch) && batch > 0
+    ? Math.floor(batch)
+    : undefined
+
 export const extendRepo = <
   T,
   Encoded extends FieldValues,
@@ -16,9 +34,10 @@ export const extendRepo = <
   ItemType extends string,
   IdKey extends keyof T & keyof Encoded,
   RSchema,
-  RPublish
+  RPublish,
+  RProvided = never
 >(
-  repo: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>
+  repo: Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided>
 ) => {
   const get = (id: T[IdKey]) =>
     repo.find(id).pipe(
@@ -244,8 +263,53 @@ export const extendRepo = <
     request: (id: T[IdKey]) => Effect.request(_request({ id }), requestResolver),
     get,
     log: (evt: Evt) => AnyPureDSL.log(evt),
-    save: (...items: NonEmptyArray<T>) => repo.saveAndPublish(items),
+    save: ((itemOrItems: T | NonEmptyReadonlyArray<T>, options?: BatchOptions) => {
+      const items = asReadonlyArray(itemOrItems)
+      const batchSize = getBatchSize(options?.batch)
+      if (batchSize === undefined) {
+        return repo.saveAndPublish(items)
+      }
+      return Effect.forEach(
+        Array.chunksOf(items, batchSize),
+        (batch) => repo.saveAndPublish(batch),
+        { discard: true }
+      )
+    }) as {
+      (item: T, options?: BatchOptions): Effect.Effect<
+        void,
+        InvalidStateError | OptimisticConcurrencyException,
+        RSchema | RPublish
+      >
+      (items: NonEmptyReadonlyArray<T>, options?: BatchOptions): Effect.Effect<
+        void,
+        InvalidStateError | OptimisticConcurrencyException,
+        RSchema | RPublish
+      >
+      /**
+       * Enables chunked writes for large batches.
+       * Note: batching breaks transactional properties because chunks are saved independently.
+       */
+    },
     saveWithEvents: (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) => repo.saveAndPublish(items, events),
+    remove: ((itemOrItems: T | NonEmptyReadonlyArray<T>, options?: BatchOptions) => {
+      const items = asReadonlyArray(itemOrItems)
+      const batchSize = getBatchSize(options?.batch)
+      if (batchSize === undefined) {
+        return repo.removeAndPublish(items)
+      }
+      return Effect.forEach(
+        Array.chunksOf(items, batchSize),
+        (batch) => repo.removeAndPublish(batch),
+        { discard: true }
+      )
+    }) as {
+      (item: T, options?: BatchOptions): Effect.Effect<void, never, RSchema | RPublish>
+      (items: NonEmptyReadonlyArray<T>, options?: BatchOptions): Effect.Effect<void, never, RSchema | RPublish>
+      /**
+       * Enables chunked deletes for large batches.
+       * Note: batching breaks transactional properties because chunks are removed independently.
+       */
+    },
     queryAndSavePure,
     saveManyWithPure,
     byIdAndSaveWithPure,
@@ -268,7 +332,7 @@ export const extendRepo = <
   return {
     ...repo,
     ...exts
-  } as Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish> & typeof exts
+  } as Repository<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided> & typeof exts
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -279,5 +343,6 @@ export interface ExtendedRepository<
   ItemType extends string,
   IdKey extends keyof T & keyof Encoded,
   RSchema,
-  RPublish
-> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish>> {}
+  RPublish,
+  RProvided = never
+> extends ReturnType<typeof extendRepo<T, Encoded, Evt, ItemType, IdKey, RSchema, RPublish, RProvided>> {}

package/src/Model/Repository/internal/internal.ts

@@ -248,28 +248,16 @@ export function makeRepoInternal<
             }
           )
 
-          const parseMany = (items: readonly PM[]) =>
-            Effect
-              .flatMap(cms, (cm) =>
-                decodeMany(items.map((_) => mapReverse(_, cm.set)))
-                  .pipe(
-                    Effect.orDie,
-                    Effect.withSpan("parseMany", { attributes: { itemType: name } }, { captureStackTrace: false })
-                  ))
-          const parseMany2 = <A, R>(
-            items: readonly PM[],
-            schema: S.Codec<A, Encoded, R>
-          ) =>
-            Effect
-              .flatMap(cms, (cm) =>
-                S
-                  .decodeEffect(S.Array(schema))(
-                    items.map((_) => mapReverse(_, cm.set))
-                  )
-                  .pipe(
-                    Effect.orDie,
-                    Effect.withSpan("parseMany2", { attributes: { itemType: name } }, { captureStackTrace: false })
-                  ))
+          const parseMany = Effect.fn("parseMany", { attributes: { itemType: name } })(function*(items: readonly PM[]) {
+            const cm = yield* cms
+            return yield* decodeMany(items.map((_) => mapReverse(_, cm.set))).pipe(Effect.orDie)
+          })
+          const parseMany2 = Effect.fn("parseMany2", { attributes: { itemType: name } })(
+            function*<A, R>(items: readonly PM[], schema: S.Codec<A, Encoded, R>) {
+              const cm = yield* cms
+              return yield* S.decodeEffect(S.Array(schema))(items.map((_) => mapReverse(_, cm.set))).pipe(Effect.orDie)
+            }
+          )
           const filter = <U extends keyof Encoded = keyof Encoded>(args: FilterArgs<Encoded, U>) =>
             store
               .filter(
@@ -291,10 +279,10 @@ export function makeRepoInternal<
           const query: {
             <A, R, From extends FieldValues>(
               q: Q.QueryProjection<Encoded extends From ? From : never, A, R>
-            ): Effect.Effect<readonly A[], S.SchemaError, R>
+            ): Effect.Effect<readonly A[], S.SchemaError, Exclude<R, RCtx>>
             <A, R, EncodedRefined extends Encoded = Encoded>(
               q: Q.QAll<NoInfer<Encoded>, NoInfer<EncodedRefined>, A, R>
-            ): Effect.Effect<readonly A[], never, R>
+            ): Effect.Effect<readonly A[], never, Exclude<R, RCtx>>
           } = (<A, R, EncodedRefined extends Encoded = Encoded>(q: Q.QAll<Encoded, EncodedRefined, A, R>) => {
             const a = Q.toFilter(q)
             const eff = a.mode === "project"
@@ -463,7 +451,7 @@ export function makeRepoInternal<
               }
             }
           }
-          return r as Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish>
+          return r as Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish, RCtx>
         })
         .pipe(Effect
           // .withSpan("Repository.make [effect-app/infra]", { attributes: { "repository.model_name": name } })

package/src/Model/Repository/makeRepo.ts

@@ -56,8 +56,8 @@ export interface RepositoryOptions<
   schemaContext?: Context.Context<RCtx>
 
   overrides?: (
-    repo: Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish>
-  ) => Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish>
+    repo: Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish, RCtx>
+  ) => Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish, RCtx>
 }
 
 /**
@@ -84,7 +84,7 @@ export const makeRepo: {
     schema: S.Codec<T, Encoded, RSchema>,
     options: RepositoryOptions<IdKey, Encoded, T, ItemType, Evt, RPublish, E, RInitial, RCtx, RSchema>
   ): Effect.Effect<
-    ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish>,
+    ExtendedRepository<T, Encoded, Evt, ItemType, IdKey, Exclude<RSchema, RCtx>, RPublish, RCtx>,
     E,
     RInitial | StoreMaker | RepositoryRegistry
   >
@@ -103,7 +103,7 @@ export const makeRepo: {
     schema: S.Codec<T, Encoded, RSchema>,
     options: Omit<RepositoryOptions<"id", Encoded, T, ItemType, Evt, RPublish, E, RInitial, RCtx, RSchema>, "idKey">
   ): Effect.Effect<
-    ExtendedRepository<T, Encoded, Evt, ItemType, "id", Exclude<RSchema, RCtx>, RPublish>,
+    ExtendedRepository<T, Encoded, Evt, ItemType, "id", Exclude<RSchema, RCtx>, RPublish, RCtx>,
     E,
     RInitial | StoreMaker | RepositoryRegistry
   >

package/src/Model/Repository/service.ts

@@ -14,7 +14,8 @@ export interface Repository<
   ItemType extends string,
   IdKey extends keyof T,
   RSchema,
-  RPublish
+  RPublish,
+  RProvided = never
 > {
   readonly itemType: ItemType
   readonly idKey: IdKey
@@ -59,7 +60,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -79,7 +80,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -101,7 +102,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -125,7 +126,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -151,7 +152,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -177,7 +178,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -205,7 +206,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -235,7 +236,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -267,7 +268,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       A,
@@ -301,7 +302,7 @@ export interface Repository<
       TType extends "many" ? readonly A[] : TType extends "count" ? NonNegativeInt : A,
       | (TType extends "many" ? never : NotFoundError<ItemType>)
       | (TType extends "count" ? never : S.SchemaError),
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
 
     // ending with generic query
@@ -315,7 +316,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -331,7 +332,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -351,7 +352,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -371,7 +372,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -393,7 +394,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -417,7 +418,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -443,7 +444,7 @@ export interface Repository<
     ): Effect.Effect<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined> : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -472,7 +473,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -503,7 +504,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
     <
       R = never,
@@ -536,7 +537,7 @@ export interface Repository<
       TType extends "many" ? DistributeQueryIfExclusiveOnArray<E, T, EncodedRefined>
         : RefineTHelper<T, EncodedRefined>,
       TType extends "many" ? never : NotFoundError<ItemType>,
-      R | RSchema
+      Exclude<R, RProvided> | RSchema
     >
   }
 

package/src/Model/query/new-kid-interpreter.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Array, identity, Match, Option, pipe, S } from "effect-app"
+import { Array, identity, Match, Option, pipe, S, SchemaAST } from "effect-app"
 import { toNonEmptyArray } from "effect-app/Array"
 import { dropUndefinedT } from "effect-app/utils"
 import type { FilterResult } from "../filter/filterApi.js"
@@ -165,7 +165,7 @@ export const toFilter = <
   let select: (keyof TFieldValues | { key: string; subKeys: string[] })[] = []
   // TODO: support more complex (nested) schemas?
   if (schema) {
-    const t = walkTransformation(schema.ast)
+    const t = walkTransformation(SchemaAST.toEncoded(schema.ast))
     if (S.AST.isObjects(t)) {
       select = t.propertySignatures.map((_) => _.name as string)
       for (const prop of t.propertySignatures) {

package/src/Operations.ts

@@ -20,6 +20,33 @@ const make = Effect.gen(function*() {
   const reqFiberSet = yield* RequestFiberSet
   const makeOp = Effect.sync(() => OperationId.make())
 
+  const addOp = Effect.fnUntraced(function*(id: OperationId, title: NonEmptyString2k) {
+    return yield* repo.save(new Operation({ id, title })).pipe(Effect.orDie)
+  })
+
+  const finishOp = Effect.fnUntraced(function*(id: OperationId, exit: Exit.Exit<unknown, unknown>) {
+    const op = yield* repo.get(id).pipe(Effect.orDie)
+    const result = Exit.isSuccess(exit)
+      ? new OperationSuccess()
+      : new OperationFailure({
+        message: Cause.hasInterruptsOnly(exit.cause)
+          ? NonEmptyString2k("Interrupted")
+          : Cause.hasDies(exit.cause)
+          ? NonEmptyString2k("Unknown error")
+          : Cause
+            .findErrorOption(exit.cause)
+            .pipe(
+              Option.flatMap((_) =>
+                typeof _ === "object" && _ !== null && "message" in _ && S.is(NonEmptyString2k)(_.message)
+                  ? Option.some(_.message)
+                  : Option.none()
+              ),
+              Option.getOrNull
+            )
+      })
+    return yield* repo.save(copy(op, { updatedAt: new Date(), result })).pipe(Effect.orDie)
+  })
+
   const register = (title: NonEmptyString2k) =>
     Effect.tap(
       makeOp,
@@ -30,53 +57,20 @@ const make = Effect.gen(function*() {
         )
     )
 
-  const cleanup = Effect.sync(() => subHours(new Date(), 1)).pipe(
-    Effect.andThen((before) => repo.query(where("updatedAt", "lt", before.toISOString()))),
-    Effect.andThen((ops) => pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))),
-    setupRequestContextFromCurrent("Operations.cleanup")
-  )
+  const cleanup = Effect
+    .gen(function*() {
+      const before = subHours(new Date(), 1)
+      const ops = yield* repo.query(where("updatedAt", "lt", before.toISOString()))
+      return yield* pipe(ops, batch(100, Effect.succeed, (items) => repo.removeAndPublish(items)))
+    })
+    .pipe(setupRequestContextFromCurrent("Operations.cleanup"))
 
-  function addOp(id: OperationId, title: NonEmptyString2k) {
-    return repo.save(new Operation({ id, title })).pipe(Effect.orDie)
-  }
-  function findOp(id: OperationId) {
-    return repo.find(id)
-  }
-  function finishOp(id: OperationId, exit: Exit.Exit<unknown, unknown>) {
-    return Effect
-      .flatMap(repo.get(id).pipe(Effect.orDie), (_) =>
-        repo
-          .save(
-            copy(_, {
-              updatedAt: new Date(),
-              result: Exit.isSuccess(exit)
-                ? new OperationSuccess()
-                : new OperationFailure({
-                  message: Cause.hasInterruptsOnly(exit.cause)
-                    ? NonEmptyString2k("Interrupted")
-                    : Cause.hasDies(exit.cause)
-                    ? NonEmptyString2k("Unknown error")
-                    : Cause
-                      .findErrorOption(exit.cause)
-                      .pipe(
-                        Option.flatMap((_) =>
-                          typeof _ === "object" && _ !== null && "message" in _ && S.is(NonEmptyString2k)(_.message)
-                            ? Option.some(_.message)
-                            : Option.none()
-                        ),
-                        Option.getOrNull
-                      )
-                })
-            })
-          )
-          .pipe(Effect.orDie))
-  }
-  function update(id: OperationId, progress: OperationProgress) {
-    return Effect.flatMap(
-      repo.get(id).pipe(Effect.orDie),
-      (_) => repo.save(copy(_, { updatedAt: new Date(), progress })).pipe(Effect.orDie)
-    )
-  }
+  const findOp = (id: OperationId) => repo.find(id)
+
+  const update = Effect.fnUntraced(function*(id: OperationId, progress: OperationProgress) {
+    const op = yield* repo.get(id).pipe(Effect.orDie)
+    return yield* repo.save(copy(op, { updatedAt: new Date(), progress })).pipe(Effect.orDie)
+  })
 
   function fork<R, R2, E, E2, A, A2>(
     self: (id: OperationId) => Effect.Effect<A, E, R>,
@@ -87,29 +81,18 @@ const make = Effect.gen(function*() {
     never,
     Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>
   > {
-    return Effect
-      .flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect.flatMap((id) =>
-                reqFiberSet
-                  .forkDaemonReportUnexpected(Scope.use(
-                    self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                    scope
-                  ))
-                  .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-              ),
-              Effect.tap(({ id }) =>
-                Effect.interruptible(fnc(id)).pipe(
-                  Effect.forkScoped,
-                  Scope.provide(scope)
-                )
-              )
-            )
+    return Effect.gen(function*() {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      yield* Scope.provide(Effect.forkScoped(Effect.interruptible(fnc(id))), scope)
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   }
 
   const fork2: {
@@ -122,24 +105,20 @@ const make = Effect.gen(function*() {
     ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: (opId: OperationId) => Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
-      Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect
-                .flatMap((id) =>
-                  reqFiberSet
-                    .forkDaemonReportUnexpected(Scope.use(
-                      self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                      scope
-                    ))
-                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-                )
-            )
+    Effect.fnUntraced(function*<R, E, A>(
+      self: (opId: OperationId) => Effect.Effect<A, E, R>,
+      title: NonEmptyString2k
+    ) {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self(id).pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   )
 
   const forkOperation: {
@@ -152,28 +131,21 @@ const make = Effect.gen(function*() {
     ): Effect.Effect<RunningOperation<A, E>, never, Exclude<R, Scope.Scope>>
   } = dual(
     2,
-    <R, E, A>(self: Effect.Effect<A, E, R>, title: NonEmptyString2k) =>
-      Effect.flatMap(
-        Scope.make(),
-        (scope) =>
-          register(title)
-            .pipe(
-              Scope.provide(scope),
-              Effect
-                .flatMap((id) =>
-                  reqFiberSet
-                    .forkDaemonReportUnexpected(Scope.use(
-                      self.pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
-                      scope
-                    ))
-                    .pipe(Effect.map((fiber): RunningOperation<A, E> => ({ fiber, id })))
-                )
-            )
+    Effect.fnUntraced(function*<R, E, A>(self: Effect.Effect<A, E, R>, title: NonEmptyString2k) {
+      const scope = yield* Scope.make()
+      const id = yield* Scope.provide(register(title), scope)
+      const fiber = yield* reqFiberSet.forkDaemonReportUnexpected(
+        Scope.use(
+          self.pipe(Effect.withSpan(title, {}, { captureStackTrace: false })),
+          scope
+        )
       )
+      return { fiber, id } satisfies RunningOperation<A, E>
+    })
   )
 
   function forkOperationFunction<R, E, A, Inp>(fnc: (inp: Inp) => Effect.Effect<A, E, R>, title: NonEmptyString2k) {
-    return (inp: Inp) => fnc(inp).pipe((_) => forkOperation(_, title))
+    return (inp: Inp) => forkOperation(fnc(inp), title)
   }
 
   return {
@@ -194,14 +166,7 @@ export class Operations extends Context.Opaque<Operations>()("effect-app/Operati
     .use((_) =>
       _.cleanup.pipe(
         Effect.exit,
-        Effect
-          .flatMap((_) => {
-            if (Exit.isSuccess(_)) {
-              return Effect.void
-            } else {
-              return reportAppError(_.cause)
-            }
-          }),
+        Effect.flatMap((exit) => Exit.isSuccess(exit) ? Effect.void : reportAppError(exit.cause)),
         Effect.schedule(Schedule.fixed(Duration.minutes(20))),
         Effect.map((_) => _ as never),
         MainFiberSet.run