effect-machine 0.12.0 → 0.14.0

package/dist/cluster/entity-machine.d.ts

@@ -65,7 +65,7 @@ declare const EntityMachine: {
     readonly _tag: string;
   }, E extends {
     readonly _tag: string;
-  }, R, EntityType extends string, Rpcs extends Rpc.Any>(entity: Entity.Entity<EntityType, Rpcs>, machine: Machine<S, E, R, any, any, any, any>, options?: EntityMachineOptions<S, E>) => Layer.Layer<never, never, R>;
+  }, R, EntityType extends string, Rpcs extends Rpc.Any>(entity: Entity.Entity<EntityType, Rpcs>, machine: Machine<S, E, R, any, any, any>, options?: EntityMachineOptions<S, E>) => Layer.Layer<never, never, R>;
 };
 //#endregion
 export { EntityMachine, EntityMachineOptions };

package/dist/cluster/entity-machine.js

@@ -1,8 +1,8 @@
-import { BuiltMachine, replay } from "../machine.js";
-import { ActorSystem, makeSystem } from "../actor.js";
+import { replay } from "../machine.js";
 import { createRuntime } from "../internal/runtime.js";
+import { ActorSystem, makeSystem } from "../actor.js";
 import { PersistenceAdapter } from "./persistence.js";
-import { Effect, Option, Queue, Ref, Stream, SubscriptionRef } from "effect";
+import { Clock, Effect, Option, Queue, Ref, Stream, SubscriptionRef } from "effect";
 import { Entity } from "effect/unstable/cluster";
 //#region src/cluster/entity-machine.ts
 /**
@@ -46,9 +46,19 @@ const EntityMachine = { layer: (entity, machine, options) => {
 			enumerable: true
 		} }) : machine;
 		const versionRef = yield* Ref.make(persistCtx.initialVersion);
+		const computedInitial = initialState ?? machine.initial;
+		const stateRef = yield* SubscriptionRef.make(computedInitial);
+		const stoppedRef = yield* Ref.make(false);
+		const eventQueue = yield* Queue.unbounded();
 		const runtime = yield* createRuntime(machineWithState, system, {
 			actorId: entityId,
-			hooks: options?.hooks
+			hooks: options?.hooks,
+			childIdPrefix: `${entityId}/`,
+			cellResources: {
+				stateRef,
+				stoppedRef,
+				eventQueue
+			}
 		});
 		if (persistCtx.adapter !== void 0) {
 			const { adapter: pAdapter, key } = persistCtx;
@@ -56,19 +66,21 @@ const EntityMachine = { layer: (entity, machine, options) => {
 			const schedule = persistence?.snapshotSchedule;
 			if (strategy === "snapshot") yield* SubscriptionRef.changes(runtime.stateRef).pipe(schedule !== void 0 ? Stream.schedule(schedule) : (s) => s, Stream.runForEach((state) => Effect.gen(function* () {
 				const version = yield* Ref.get(versionRef);
+				const now = yield* Clock.currentTimeMillis;
 				yield* pAdapter.saveSnapshot(key, {
 					state,
 					version,
-					timestamp: Date.now()
+					timestamp: now
 				});
 			}).pipe(Effect.catch(() => Effect.void))), Effect.forkScoped);
 			yield* Effect.addFinalizer(() => Effect.gen(function* () {
 				const state = yield* SubscriptionRef.get(runtime.stateRef);
 				const version = yield* Ref.get(versionRef);
+				const now = yield* Clock.currentTimeMillis;
 				yield* pAdapter.saveSnapshot(key, {
 					state,
 					version,
-					timestamp: Date.now()
+					timestamp: now
 				});
 			}).pipe(Effect.catch(() => Effect.void)));
 		}
@@ -138,8 +150,7 @@ const hydratePersistence = (persistence, entityDef, entityId, machine, initializ
 		const snapshotVersion = Option.isSome(maybeSnapshot) ? maybeSnapshot.value.version : 0;
 		const events = yield* adapter.loadEvents(key, snapshotVersion);
 		if (events.length > 0) {
-			const eventValues = events.map((e) => e.event);
-			const hydratedState = yield* replay(new BuiltMachine(machine), eventValues, { from: baseState });
+			const hydratedState = yield* replay(machine, events.map((e) => e.event), { from: baseState });
 			const lastEvent = events[events.length - 1];
 			return {
 				adapter,
@@ -183,7 +194,7 @@ const persistEvent = (adapter, key, versionRef, event) => Effect.gen(function* (
 	const persisted = {
 		event,
 		version: newVersion,
-		timestamp: Date.now()
+		timestamp: yield* Clock.currentTimeMillis
 	};
 	yield* adapter.appendEvents(key, [persisted], expectedVersion);
 	yield* Ref.set(versionRef, newVersion);

package/dist/cluster/to-entity.d.ts

@@ -2,7 +2,7 @@ import { Machine } from "../machine.js";
 import { Schema } from "effect";
 import { Entity } from "effect/unstable/cluster";
 import { Rpc } from "effect/unstable/rpc";
-import * as effect_unstable_rpc_RpcSchema0 from "effect/unstable/rpc/RpcSchema";
+import * as _$effect_unstable_rpc_RpcSchema0 from "effect/unstable/rpc/RpcSchema";
 
 //#region src/cluster/to-entity.d.ts
 /**
@@ -61,10 +61,10 @@ declare const toEntity: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R>(machine: Machine<S, E, R, any, any, any, any>, options: ToEntityOptions) => Entity.Entity<string, Rpc.Rpc<"Send", Schema.Struct<{
+}, R>(machine: Machine<S, E, R, any, any, any>, options: ToEntityOptions) => Entity.Entity<string, Rpc.Rpc<"Send", Schema.Struct<{
   event: Schema.Schema<E>;
 }>, Schema.Schema<S>, Schema.Never, never, never> | Rpc.Rpc<"Ask", Schema.Struct<{
   event: Schema.Schema<E>;
-}>, Schema.Unknown, Schema.Never, never, never> | Rpc.Rpc<"GetState", Schema.Void, Schema.Schema<S>, Schema.Never, never, never> | Rpc.Rpc<"WatchState", Schema.Void, effect_unstable_rpc_RpcSchema0.Stream<Schema.Schema<S>, Schema.Never>, Schema.Never, never, never>>;
+}>, Schema.Unknown, Schema.Never, never, never> | Rpc.Rpc<"GetState", Schema.Void, Schema.Schema<S>, Schema.Never, never, never> | Rpc.Rpc<"WatchState", Schema.Void, _$effect_unstable_rpc_RpcSchema0.Stream<Schema.Schema<S>, Schema.Never>, Schema.Never, never, never>>;
 //#endregion
 export { EntityRpcs, ToEntityOptions, toEntity };

package/dist/errors.d.ts

@@ -1,68 +1,72 @@
 import { Schema } from "effect";
-import * as effect_Cause0 from "effect/Cause";
+import * as _$effect_Cause0 from "effect/Cause";
 
 //#region src/errors.d.ts
 declare const DuplicateActorError_base: Schema.ErrorClass<DuplicateActorError, Schema.TaggedStruct<"DuplicateActorError", {
   readonly actorId: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Attempted to spawn/restore actor with ID already in use */
 declare class DuplicateActorError extends DuplicateActorError_base {}
-declare const UnprovidedSlotsError_base: Schema.ErrorClass<UnprovidedSlotsError, Schema.TaggedStruct<"UnprovidedSlotsError", {
-  readonly slots: Schema.$Array<Schema.String>;
-}>, effect_Cause0.YieldableError>;
-/** Machine has unprovided effect slots */
-declare class UnprovidedSlotsError extends UnprovidedSlotsError_base {}
 declare const MissingSchemaError_base: Schema.ErrorClass<MissingSchemaError, Schema.TaggedStruct<"MissingSchemaError", {
   readonly operation: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Operation requires schemas attached to machine */
 declare class MissingSchemaError extends MissingSchemaError_base {}
-declare const InvalidSchemaError_base: Schema.ErrorClass<InvalidSchemaError, Schema.TaggedStruct<"InvalidSchemaError", {}>, effect_Cause0.YieldableError>;
+declare const InvalidSchemaError_base: Schema.ErrorClass<InvalidSchemaError, Schema.TaggedStruct<"InvalidSchemaError", {
+  readonly message: Schema.String;
+}>, _$effect_Cause0.YieldableError>;
 /** State/Event schema has no variants */
 declare class InvalidSchemaError extends InvalidSchemaError_base {}
 declare const MissingMatchHandlerError_base: Schema.ErrorClass<MissingMatchHandlerError, Schema.TaggedStruct<"MissingMatchHandlerError", {
   readonly tag: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** $match called with missing handler for tag */
 declare class MissingMatchHandlerError extends MissingMatchHandlerError_base {}
 declare const SlotProvisionError_base: Schema.ErrorClass<SlotProvisionError, Schema.TaggedStruct<"SlotProvisionError", {
   readonly slotName: Schema.String;
-  readonly slotType: Schema.Literals<readonly ["guard", "effect"]>;
-}>, effect_Cause0.YieldableError>;
+  readonly slotType: Schema.Literal<"slot">;
+}>, _$effect_Cause0.YieldableError>;
 /** Slot handler not found at runtime (internal error) */
 declare class SlotProvisionError extends SlotProvisionError_base {}
 declare const ProvisionValidationError_base: Schema.ErrorClass<ProvisionValidationError, Schema.TaggedStruct<"ProvisionValidationError", {
   readonly missing: Schema.$Array<Schema.String>;
   readonly extra: Schema.$Array<Schema.String>;
-}>, effect_Cause0.YieldableError>;
-/** Machine.build() validation failed - missing or extra handlers */
+}>, _$effect_Cause0.YieldableError>;
+/** Slot provision validation failed — missing or extra handlers */
 declare class ProvisionValidationError extends ProvisionValidationError_base {}
 declare const AssertionError_base: Schema.ErrorClass<AssertionError, Schema.TaggedStruct<"AssertionError", {
   readonly message: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Assertion failed in testing utilities */
 declare class AssertionError extends AssertionError_base {}
 declare const ActorStoppedError_base: Schema.ErrorClass<ActorStoppedError, Schema.TaggedStruct<"ActorStoppedError", {
   readonly actorId: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Actor was stopped while a call/ask was pending */
 declare class ActorStoppedError extends ActorStoppedError_base {}
 declare const NoReplyError_base: Schema.ErrorClass<NoReplyError, Schema.TaggedStruct<"NoReplyError", {
   readonly actorId: Schema.String;
   readonly eventTag: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** ask() was used but the transition handler did not call reply */
 declare class NoReplyError extends NoReplyError_base {}
 declare const PersistenceError_base: Schema.ErrorClass<PersistenceError, Schema.TaggedStruct<"PersistenceError", {
   readonly message: Schema.String;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Persistence adapter operation failed */
 declare class PersistenceError extends PersistenceError_base {}
+declare const SlotCodecError_base: Schema.ErrorClass<SlotCodecError, Schema.TaggedStruct<"SlotCodecError", {
+  readonly slotName: Schema.String;
+  readonly phase: Schema.Literals<readonly ["input", "output"]>;
+  readonly message: Schema.String;
+}>, _$effect_Cause0.YieldableError>;
+/** Slot input/output schema validation failed */
+declare class SlotCodecError extends SlotCodecError_base {}
 declare const VersionConflictError_base: Schema.ErrorClass<VersionConflictError, Schema.TaggedStruct<"VersionConflictError", {
   readonly expected: Schema.Number;
   readonly actual: Schema.Number;
-}>, effect_Cause0.YieldableError>;
+}>, _$effect_Cause0.YieldableError>;
 /** Optimistic locking failure — stored version doesn't match expected */
 declare class VersionConflictError extends VersionConflictError_base {}
 //#endregion
-export { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotProvisionError, UnprovidedSlotsError, VersionConflictError };
+export { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotCodecError, SlotProvisionError, VersionConflictError };

package/dist/errors.js

@@ -12,20 +12,18 @@ import { Schema } from "effect";
 */
 /** Attempted to spawn/restore actor with ID already in use */
 var DuplicateActorError = class extends Schema.TaggedErrorClass()("DuplicateActorError", { actorId: Schema.String }) {};
-/** Machine has unprovided effect slots */
-var UnprovidedSlotsError = class extends Schema.TaggedErrorClass()("UnprovidedSlotsError", { slots: Schema.Array(Schema.String) }) {};
 /** Operation requires schemas attached to machine */
 var MissingSchemaError = class extends Schema.TaggedErrorClass()("MissingSchemaError", { operation: Schema.String }) {};
 /** State/Event schema has no variants */
-var InvalidSchemaError = class extends Schema.TaggedErrorClass()("InvalidSchemaError", {}) {};
+var InvalidSchemaError = class extends Schema.TaggedErrorClass()("InvalidSchemaError", { message: Schema.String }) {};
 /** $match called with missing handler for tag */
 var MissingMatchHandlerError = class extends Schema.TaggedErrorClass()("MissingMatchHandlerError", { tag: Schema.String }) {};
 /** Slot handler not found at runtime (internal error) */
 var SlotProvisionError = class extends Schema.TaggedErrorClass()("SlotProvisionError", {
 	slotName: Schema.String,
-	slotType: Schema.Literals(["guard", "effect"])
+	slotType: Schema.Literal("slot")
 }) {};
-/** Machine.build() validation failed - missing or extra handlers */
+/** Slot provision validation failed — missing or extra handlers */
 var ProvisionValidationError = class extends Schema.TaggedErrorClass()("ProvisionValidationError", {
 	missing: Schema.Array(Schema.String),
 	extra: Schema.Array(Schema.String)
@@ -41,10 +39,16 @@ var NoReplyError = class extends Schema.TaggedErrorClass()("NoReplyError", {
 }) {};
 /** Persistence adapter operation failed */
 var PersistenceError = class extends Schema.TaggedErrorClass()("PersistenceError", { message: Schema.String }) {};
+/** Slot input/output schema validation failed */
+var SlotCodecError = class extends Schema.TaggedErrorClass()("SlotCodecError", {
+	slotName: Schema.String,
+	phase: Schema.Literals(["input", "output"]),
+	message: Schema.String
+}) {};
 /** Optimistic locking failure — stored version doesn't match expected */
 var VersionConflictError = class extends Schema.TaggedErrorClass()("VersionConflictError", {
 	expected: Schema.Number,
 	actual: Schema.Number
 }) {};
 //#endregion
-export { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotProvisionError, UnprovidedSlotsError, VersionConflictError };
+export { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotCodecError, SlotProvisionError, VersionConflictError };

package/dist/index.d.ts

@@ -1,10 +1,11 @@
-import { EffectHandlers, EffectSlot, EffectSlots, EffectsDef, EffectsSchema, GuardHandlers, GuardSlot, GuardSlots, GuardsDef, GuardsSchema, MachineContext, Slot } from "./slot.js";
 import { DeferReplyResult, ReplyResult } from "./internal/utils.js";
 import { Event, MachineEventSchema, MachineStateSchema, ReplyFields, State } from "./schema.js";
-import { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, ProvisionValidationError, SlotProvisionError, UnprovidedSlotsError } from "./errors.js";
+import { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotCodecError, SlotProvisionError, VersionConflictError } from "./errors.js";
+import { HasSlotKeys, MachineContext, ProvideSlots, Slot, SlotCall, SlotCalls, SlotFnDef, SlotHandler, SlotInvocation, SlotRequest, SlotResult, SlotsDef, SlotsSchema } from "./slot.js";
+import { ActorExit, CellPhase, DefectPhase, Supervision } from "./supervision.js";
 import { ProcessEventResult } from "./internal/transition.js";
-import { BackgroundEffect, BuiltMachine, HandlerContext, Machine, MachineRef, MakeConfig, ProvideHandlers, SpawnEffect, StateHandlerContext, TaskOptions, Transition, machine_d_exports } from "./machine.js";
+import { BackgroundEffect, HandlerContext, Machine, MachineRef, MakeConfig, SpawnEffect, StateHandlerContext, TaskOptions, TimeoutConfig, Transition, machine_d_exports } from "./machine.js";
 import { ActorRef, ActorRefSync, ActorSystem, Default, SystemEvent, SystemEventListener, TransitionInfo } from "./actor.js";
 import { SimulationResult, TestHarness, TestHarnessOptions, assertNeverReaches, assertPath, assertReaches, createTestHarness, simulate } from "./testing.js";
 import { AnyInspectionEvent, EffectEvent, ErrorEvent, EventReceivedEvent, InspectionEvent, Inspector, InspectorHandler, SpawnEvent, StopEvent, TaskEvent, TracingInspectorOptions, TransitionEvent, collectingInspector, combineInspectors, consoleInspector, makeInspector, makeInspectorEffect, tracingInspector } from "./inspection.js";
-export { type ActorRef, type ActorRefSync, ActorStoppedError, type ActorSystem, Default as ActorSystemDefault, ActorSystem as ActorSystemService, type AnyInspectionEvent, AssertionError, type BackgroundEffect, type BuiltMachine, type DeferReplyResult, DuplicateActorError, type EffectEvent, type EffectSlots, type EffectsDef, type EffectsSchema, type ErrorEvent, Event, type EventReceivedEvent, type GuardHandlers, type GuardSlot, type GuardSlots, type GuardsDef, type GuardsSchema, type HandlerContext, type InspectionEvent, type Inspector, type InspectorHandler, Inspector as InspectorService, InvalidSchemaError, machine_d_exports as Machine, type MachineContext, type MachineEventSchema, type MachineRef, type MachineStateSchema, type Machine as MachineType, type MakeConfig, MissingMatchHandlerError, MissingSchemaError, NoReplyError, type ProcessEventResult, type ProvideHandlers, ProvisionValidationError, type ReplyFields, type ReplyResult, type SimulationResult, Slot, type EffectHandlers as SlotEffectHandlers, type EffectSlot as SlotEffectSlot, SlotProvisionError, type SpawnEffect, type SpawnEvent, State, type StateHandlerContext, type StopEvent, type SystemEvent, type SystemEventListener, type TaskEvent, type TaskOptions, type TestHarness, type TestHarnessOptions, type TracingInspectorOptions, type Transition, type TransitionEvent, type TransitionInfo, UnprovidedSlotsError, assertNeverReaches, assertPath, assertReaches, collectingInspector, combineInspectors, consoleInspector, createTestHarness, makeInspector, makeInspectorEffect, simulate, tracingInspector };
+export { ActorExit, type ActorRef, type ActorRefSync, ActorStoppedError, type ActorSystem, Default as ActorSystemDefault, ActorSystem as ActorSystemService, type AnyInspectionEvent, AssertionError, type BackgroundEffect, type CellPhase, type DefectPhase, type DeferReplyResult, DuplicateActorError, type EffectEvent, type ErrorEvent, Event, type EventReceivedEvent, type HandlerContext, type HasSlotKeys, type InspectionEvent, type Inspector, type InspectorHandler, Inspector as InspectorService, InvalidSchemaError, machine_d_exports as Machine, type MachineContext, type MachineEventSchema, type MachineRef, type MachineStateSchema, type Machine as MachineType, type MakeConfig, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, type ProcessEventResult, type ProvideSlots, ProvisionValidationError, type ReplyFields, type ReplyResult, type SimulationResult, Slot, type SlotCall, type SlotCalls, SlotCodecError, type SlotFnDef, type SlotHandler, type SlotInvocation, SlotProvisionError, type SlotRequest, type SlotResult, type SlotsDef, type SlotsSchema, type SpawnEffect, type SpawnEvent, State, type StateHandlerContext, type StopEvent, Supervision, type SystemEvent, type SystemEventListener, type TaskEvent, type TaskOptions, type TestHarness, type TestHarnessOptions, type TimeoutConfig, type TracingInspectorOptions, type Transition, type TransitionEvent, type TransitionInfo, VersionConflictError, assertNeverReaches, assertPath, assertReaches, collectingInspector, combineInspectors, consoleInspector, createTestHarness, makeInspector, makeInspectorEffect, simulate, tracingInspector };

package/dist/index.js

@@ -1,8 +1,9 @@
+import { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, SlotCodecError, SlotProvisionError, VersionConflictError } from "./errors.js";
 import { Inspector, collectingInspector, combineInspectors, consoleInspector, makeInspector, makeInspectorEffect, tracingInspector } from "./inspection.js";
-import { ActorStoppedError, AssertionError, DuplicateActorError, InvalidSchemaError, MissingMatchHandlerError, MissingSchemaError, NoReplyError, ProvisionValidationError, SlotProvisionError, UnprovidedSlotsError } from "./errors.js";
 import { Slot } from "./slot.js";
 import { machine_exports } from "./machine.js";
+import { ActorExit, Supervision } from "./supervision.js";
 import { ActorSystem, Default } from "./actor.js";
 import { Event, State } from "./schema.js";
 import { assertNeverReaches, assertPath, assertReaches, createTestHarness, simulate } from "./testing.js";
-export { ActorStoppedError, Default as ActorSystemDefault, ActorSystem as ActorSystemService, AssertionError, DuplicateActorError, Event, Inspector as InspectorService, InvalidSchemaError, machine_exports as Machine, MissingMatchHandlerError, MissingSchemaError, NoReplyError, ProvisionValidationError, Slot, SlotProvisionError, State, UnprovidedSlotsError, assertNeverReaches, assertPath, assertReaches, collectingInspector, combineInspectors, consoleInspector, createTestHarness, makeInspector, makeInspectorEffect, simulate, tracingInspector };
+export { ActorExit, ActorStoppedError, Default as ActorSystemDefault, ActorSystem as ActorSystemService, AssertionError, DuplicateActorError, Event, Inspector as InspectorService, InvalidSchemaError, machine_exports as Machine, MissingMatchHandlerError, MissingSchemaError, NoReplyError, PersistenceError, ProvisionValidationError, Slot, SlotCodecError, SlotProvisionError, State, Supervision, VersionConflictError, assertNeverReaches, assertPath, assertReaches, collectingInspector, combineInspectors, consoleInspector, createTestHarness, makeInspector, makeInspectorEffect, simulate, tracingInspector };

package/dist/internal/runtime.d.ts

@@ -1,9 +1,10 @@
-import { EffectsDef, GuardsDef, MachineContext } from "../slot.js";
 import { NoReplyError } from "../errors.js";
-import { ProcessEventHooks } from "./transition.js";
+import { MachineContext, SlotsDef } from "../slot.js";
+import { ActorExit } from "../supervision.js";
+import { ProcessEventHooks, ProcessEventResult } from "./transition.js";
 import { Machine, MachineRef } from "../machine.js";
 import { ActorSystem } from "../actor.js";
-import { Deferred, Effect, Queue, Scope, SubscriptionRef } from "effect";
+import { Deferred, Effect, Queue, Ref, Scope, SubscriptionRef } from "effect";
 
 //#region src/internal/runtime.d.ts
 /** @internal */
@@ -14,11 +15,30 @@ type RuntimeQueuedEvent<E> = {
   readonly _tag: "sendWait";
   readonly event: E;
   readonly done: Deferred.Deferred<void, unknown>;
+} | {
+  readonly _tag: "call";
+  readonly event: E;
+  readonly reply: Deferred.Deferred<ProcessEventResult<{
+    readonly _tag: string;
+  }>, unknown>;
 } | {
   readonly _tag: "ask";
   readonly event: E;
   readonly reply: Deferred.Deferred<unknown, NoReplyError>;
+} | {
+  readonly _tag: "drain";
+  readonly done: Deferred.Deferred<void, never>;
 };
+/**
+ * Resources owned by the actor cell (stable across generations).
+ * When provided, createRuntime uses these instead of allocating its own.
+ * @internal
+ */
+interface RuntimeCellResources<S, E> {
+  readonly stateRef: SubscriptionRef.SubscriptionRef<S>;
+  readonly eventQueue: Queue.Queue<RuntimeQueuedEvent<E>>;
+  readonly stoppedRef: Ref.Ref<boolean>;
+}
 /** @internal */
 interface RuntimeHandle<S, E> {
   /** Enqueue a fire-and-forget event */
@@ -35,26 +55,81 @@ interface RuntimeHandle<S, E> {
   readonly isStopped: Effect.Effect<boolean>;
   /** Stop the runtime (interrupt event loop, clean up) */
   readonly stop: Effect.Effect<void>;
+  /** @internal — raw event queue for direct enqueue (actor.ts uses this for pendingReplies tracking) */
+  readonly _queue: Queue.Queue<RuntimeQueuedEvent<E>>;
+  /** @internal — stopped ref for direct access */
+  readonly _stoppedRef: Ref.Ref<boolean>;
+  /**
+   * Exit deferred — set exactly once with the exit reason when the runtime stops.
+   * Final state → ActorExit.Final, explicit stop → ActorExit.Stopped, defect → ActorExit.Defect.
+   */
+  readonly exitDeferred: Deferred.Deferred<ActorExit<S>, never>;
+  /**
+   * Actor scope — owns background fibers for this generation.
+   * Closing this scope interrupts all background fibers.
+   */
+  readonly actorScope: Scope.Closeable;
+}
+/** @internal */
+interface RuntimeLifecycleHooks<S, E> {
+  /** Before processEventCore — actor emits @machine.event inspection */
+  readonly onEvent?: (state: S, event: E) => Effect.Effect<void>;
+  /** After SubscriptionRef.set on transition — actor notifies listeners, annotates spans */
+  readonly onStateChange?: (result: ProcessEventResult<S>, event: E) => Effect.Effect<void>;
+  /** After reply settlement when transition occurred — actor publishes to transitionsPubSub */
+  readonly onProcessed?: (result: ProcessEventResult<S>, event: E) => Effect.Effect<void>;
+  /** When final state detected in event loop — actor emits @machine.stop */
+  readonly onFinal?: (state: S) => Effect.Effect<void>;
+  /** Before stop resource cleanup — actor emits @machine.stop, settles pending replies */
+  readonly onShutdown?: () => Effect.Effect<void>;
+  /** Before initial spawn effects — actor emits @machine.effect inspection */
+  readonly onInitialSpawnEffects?: (state: S) => Effect.Effect<void>;
 }
 /** @internal */
 interface RuntimeConfig<S, E> {
   readonly actorId: string;
   readonly hooks?: ProcessEventHooks<S, E>;
+  /**
+   * Cell-owned resources. When provided, the runtime uses the cell's stateRef,
+   * eventQueue, and stoppedRef instead of creating its own.
+   * Used by actor.ts for supervision (cell owns stable resources across generations).
+   */
+  readonly cellResources?: RuntimeCellResources<S, E>;
   /**
    * Custom queue factory. Default: `Queue.unbounded()`.
    * Use `Queue.sliding(n)` or `Queue.dropping(n)` for bounded queues.
+   * Ignored when cellResources is provided.
    */
   readonly queueFactory?: Effect.Effect<Queue.Queue<RuntimeQueuedEvent<E>>>;
+  /** Lifecycle callbacks for actor-specific concerns */
+  readonly lifecycle?: RuntimeLifecycleHooks<S, E>;
+  /** Wrap each processQueued invocation — actor uses for span annotations */
+  readonly wrapProcess?: (state: S, event: E, inner: Effect.Effect<ProcessQueuedResult<S>>) => Effect.Effect<ProcessQueuedResult<S>>;
+  /** Called after self.spawn succeeds — actor tracks children */
+  readonly onChildSpawned?: (childId: string, child: unknown) => Effect.Effect<void>;
+  /** Skip registering stop as scope finalizer — actor manages its own lifecycle */
+  readonly skipFinalizer?: boolean;
+  /** Prefix for child actor IDs in self.spawn. Entity-machine uses `${actorId}/`. Default: no prefix. */
+  readonly childIdPrefix?: string;
+}
+/** @internal */
+interface ProcessQueuedResult<S> {
+  readonly shouldStop: boolean;
+  readonly stateChanged: boolean;
+  readonly result: ProcessEventResult<S>;
 }
 /**
  * Create a runtime for a machine. Returns a handle for sending events
  * and querying state. The runtime owns:
- * - Single event queue (all events serialized)
  * - Event loop fiber
  * - Postpone buffer
- * - Background effects
+ * - Background effects (under actorScope)
  * - State scope (spawn effects)
  * - Final state detection
+ * - Exit reason via exitDeferred
+ *
+ * Resources (stateRef, eventQueue, stoppedRef) are either cell-provided
+ * or allocated fresh by the runtime.
  *
  * @internal
  */
@@ -62,6 +137,6 @@ declare const createRuntime: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, any, any, GD, EFD>, system: ActorSystem, config: RuntimeConfig<S, E>) => Effect.Effect<RuntimeHandle<S, E>, never, Scope.Scope | Exclude<R, MachineContext<S, E, MachineRef<E>>> | Exclude<Exclude<R, MachineContext<S, E, MachineRef<E>>>, Scope.Scope>>;
+}, R, SD extends SlotsDef>(machine: Machine<S, E, R, any, any, SD>, system: ActorSystem, config: RuntimeConfig<S, E>) => Effect.Effect<RuntimeHandle<S, E>, never, Scope.Scope | Exclude<R, MachineContext<S, E, MachineRef<E>>> | Exclude<Exclude<R, MachineContext<S, E, MachineRef<E>>>, Scope.Scope>>;
 //#endregion
-export { RuntimeConfig, RuntimeHandle, RuntimeQueuedEvent, createRuntime };
+export { ProcessQueuedResult, RuntimeCellResources, RuntimeConfig, RuntimeHandle, RuntimeLifecycleHooks, RuntimeQueuedEvent, createRuntime };