effect 4.0.5 → 4.0.6

package/src/workflow/WorkflowEngine.ts

@@ -745,11 +745,16 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
       readonly parent: string | undefined
       instance: WorkflowInstance["Service"]
       interrupted: boolean
+      interruptedUnsafe: boolean
       // The strongest wake requested while a run was still finishing.
       resumeRequested: WakeMode | undefined
       fiber: Fiber.Fiber<Workflow.Result<unknown, unknown>> | undefined
       // Completed once a run succeeds with `Complete`, after which it cannot resume.
       readonly done: Deferred.Deferred<void>
+      // Parent of every run's scope. Scopes of runs that suspended stay open
+      // under it, so their finalizers and resources last until the execution
+      // finishes.
+      readonly scope: Scope.Closeable
     }
     const executions = new Map<string, ExecutionState>()
 
@@ -784,15 +789,23 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
       }
 
       const entry = workflows.get(state.instance.workflow._tag)!
-      const instance = WorkflowInstance.initial(
-        state.instance.workflow,
-        state.instance.executionId,
-        { scope: state.instance.scope }
-      )
+      // Like the cluster engine, each run gets a fresh scope, so replays rebuild
+      // compensations instead of registering them again.
+      const instance = WorkflowInstance.initial(state.instance.workflow, state.instance.executionId, {
+        scope: Scope.forkUnsafe(state.scope)
+      })
       state.instance = instance
       state.fiber = yield* state.execute(state.payload, state.instance.executionId).pipe(
-        Effect.onExit(() => {
-          if (!state.interrupted) {
+        Effect.onExit((exit) => {
+          // Safe interrupts take effect only when the run would suspend;
+          // unsafe interrupts must also survive a replay that completes normally.
+          if (
+            !state.interrupted ||
+            (!state.interruptedUnsafe &&
+              !instance.suspended &&
+              !instance.abandoned &&
+              !(Context.get(instance.workflow.annotations, Workflow.SuspendOnFailure) && Exit.isFailure(exit)))
+          ) {
             return Effect.void
           }
           instance.interrupted = true
@@ -809,9 +822,15 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
           return Effect.forkIn(resume(state.parent, "automatic"), scope)
         }),
         Effect.onExit((exit) => {
-          return Exit.isSuccess(exit) && exit.value._tag === "Complete"
-            ? Deferred.succeed(state.done, void 0)
-            : Effect.void
+          if (Exit.isSuccess(exit) && exit.value._tag === "Suspended") return Effect.void
+          // The final run's scope closes with the real exit. Closing the parent
+          // then closes earlier scopes in reverse order with `Exit.void`, so their
+          // superseded compensations are skipped, which means their finalizers
+          // also observe success rather than the outcome.
+          return Effect.andThen(
+            Scope.close(state.scope, Exit.void),
+            Exit.isSuccess(exit) && exit.value._tag === "Complete" ? Deferred.succeed(state.done, void 0) : Effect.void
+          )
         }),
         Effect.forkIn(entry.scope)
       )
@@ -842,9 +861,11 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
             execute: entry.execute,
             instance: WorkflowInstance.initial(workflow, options.executionId),
             interrupted: false,
+            interruptedUnsafe: false,
             resumeRequested: undefined,
             fiber: undefined,
             done: Deferred.makeUnsafe(),
+            scope: Scope.makeUnsafe(),
             parent: options.detached ? undefined : options.parent?.executionId
           }
           executions.set(options.executionId, state)
@@ -875,9 +896,12 @@ export const layerMemory: Layer.Layer<WorkflowEngine> = Layer.effect(WorkflowEng
         const state = executions.get(executionId)
         if (!state) return
         state.interrupted = true
+        state.interruptedUnsafe = true
         if (state.fiber) {
           yield* Fiber.interrupt(state.fiber)
         }
+        // Replay after hard interruption to record a terminal workflow result.
+        yield* resume(executionId, "explicit")
       }),
       resume(_workflow, executionId) {
         return resume(executionId, "explicit")

package/dist/http/internal/preResponseHandler.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=preResponseHandler.d.ts.map

package/dist/http/internal/preResponseHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"preResponseHandler.d.ts","sourceRoot":"","sources":["../../../src/http/internal/preResponseHandler.ts"],"names":[],"mappings":""}

package/dist/http/internal/preResponseHandler.js

@@ -1,14 +0,0 @@
-import * as Effect from "../../Effect.js";
-/**
- * @internal
- */
-export const requestPreResponseHandlers = /*#__PURE__*/new WeakMap();
-/**
- * @internal
- */
-export const appendPreResponseHandlerUnsafe = (request, handler) => {
-  const prev = requestPreResponseHandlers.get(request.source);
-  const next = prev ? (request, response) => Effect.flatMap(prev(request, response), response => handler(request, response)) : handler;
-  requestPreResponseHandlers.set(request.source, next);
-};
-//# sourceMappingURL=preResponseHandler.js.map

package/dist/http/internal/preResponseHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"preResponseHandler.js","names":[],"sources":["../../../src/http/internal/preResponseHandler.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,iBAAiB;AAIzC;;;AAGA,OAAO,MAAM,0BAA0B,gBAAG,IAAI,OAAO,EAA8B;AAEnF;;;AAGA,OAAO,MAAM,8BAA8B,GAAG,CAAC,OAA0B,EAAE,OAA2B,KAAU;EAC9G,MAAM,IAAI,GAAG,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;EAC3D,MAAM,IAAI,GAAuB,IAAI,GACnC,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAG,QAAQ,IAAK,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,GACtG,OAAO;EACX,0BAA0B,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC;AACtD,CAAC","ignoreList":[]}

package/src/http/internal/preResponseHandler.ts

@@ -1,19 +0,0 @@
-import * as Effect from "../../Effect.ts"
-import type { PreResponseHandler } from "../HttpEffect.ts"
-import type { HttpServerRequest } from "../HttpServerRequest.ts"
-
-/**
- * @internal
- */
-export const requestPreResponseHandlers = new WeakMap<object, PreResponseHandler>()
-
-/**
- * @internal
- */
-export const appendPreResponseHandlerUnsafe = (request: HttpServerRequest, handler: PreResponseHandler): void => {
-  const prev = requestPreResponseHandlers.get(request.source)
-  const next: PreResponseHandler = prev ?
-    (request, response) => Effect.flatMap(prev(request, response), (response) => handler(request, response))
-    : handler
-  requestPreResponseHandlers.set(request.source, next)
-}