effect-machine 0.11.0 → 0.13.0

package/dist/machine.d.ts

@@ -1,15 +1,16 @@
-import { EffectHandlers, EffectSlots, EffectsDef, EffectsSchema, GuardHandlers, GuardSlots, GuardsDef, GuardsSchema, MachineContext } from "./slot.js";
-import { TransitionResult } from "./internal/utils.js";
-import { BrandedEvent, BrandedState, TaggedOrConstructor } from "./internal/brands.js";
+import { DeferReplyResult, ReplyResult, TransitionResult } from "./internal/utils.js";
+import { BrandedEvent, BrandedState, ExtractReply, TaggedOrConstructor } from "./internal/brands.js";
 import { MachineEventSchema, MachineStateSchema, VariantsUnion } from "./schema.js";
 import { DuplicateActorError } from "./errors.js";
+import { EffectHandlers, EffectSlots, EffectsDef, EffectsSchema, GuardHandlers, GuardSlots, GuardsDef, GuardsSchema, MachineContext } from "./slot.js";
+import { Supervision } from "./supervision.js";
 import { findTransitions } from "./internal/transition.js";
 import { ActorRef, ActorSystem } from "./actor.js";
 import { Cause, Duration, Effect, Schema, Scope, ServiceMap } from "effect";
 
 //#region src/machine.d.ts
 declare namespace machine_d_exports {
-  export { BackgroundEffect, BuiltMachine, HandlerContext, Machine, MachineRef, MakeConfig, ProvideHandlers, SlotContext, SpawnEffect, StateEffectHandler, StateHandlerContext, TaskOptions, TimeoutConfig, Transition, TransitionHandler, findTransitions, make, replay, spawn };
+  export { BackgroundEffect, DeferReplyResult, HandlerContext, Machine, MachineRef, MakeConfig, ProvideHandlers, ReplyResult, SlotContext, SpawnEffect, StateEffectHandler, StateHandlerContext, TaskOptions, TimeoutConfig, Transition, TransitionHandler, deferReply, findTransitions, make, materializeMachine, replay, reply, spawn };
 }
 /**
  * Self reference for sending events back to the machine
@@ -22,7 +23,13 @@ interface MachineRef<Event> {
     readonly _tag: string;
   }, E2 extends {
     readonly _tag: string;
-  }, R2>(id: string, machine: BuiltMachine<S2, E2, R2>) => Effect.Effect<ActorRef<S2, E2>, DuplicateActorError, R2>;
+  }, R2>(id: string, machine: Machine<S2, E2, R2, any, any, any, any>) => Effect.Effect<ActorRef<S2, E2>, DuplicateActorError, R2>;
+  /**
+   * Settle a deferred reply from a spawn handler.
+   * Only usable when the transition handler returned `Machine.deferReply(state)`.
+   * Returns true if a pending reply was settled, false if none was pending.
+   */
+  readonly reply: (value: unknown) => Effect.Effect<boolean>;
 }
 /**
  * Handler context passed to transition handlers
@@ -45,9 +52,11 @@ interface StateHandlerContext<State, Event, ED extends EffectsDef> {
   readonly system: ActorSystem;
 }
 /**
- * Transition handler function
+ * Transition handler function.
+ * When Reply is concrete (event has a reply schema), handler must return Machine.reply().
+ * When Reply is never, handler returns plain state.
  */
-type TransitionHandler<S, E, NewState, GD extends GuardsDef, ED extends EffectsDef, R> = (ctx: HandlerContext<S, E, GD, ED>) => TransitionResult<NewState, R>;
+type TransitionHandler<S, E, NewState, GD extends GuardsDef, ED extends EffectsDef, R, Reply = never> = (ctx: HandlerContext<S, E, GD, ED>) => TransitionResult<NewState, R, Reply>;
 /**
  * State effect handler function
  */
@@ -91,9 +100,6 @@ interface TimeoutConfig<State, Event> {
   /** Event to send when the timer fires. Static or derived from current state. */
   readonly event: Event | ((state: State) => Event);
 }
-type IsAny<T> = 0 extends 1 & T ? true : false;
-type IsUnknown<T> = unknown extends T ? ([T] extends [unknown] ? true : false) : false;
-type NormalizeR<T> = IsAny<T> extends true ? T : IsUnknown<T> extends true ? never : T;
 interface MakeConfig<SD extends Record<string, Schema.Struct.Fields>, ED extends Record<string, Schema.Struct.Fields>, S extends BrandedState, E extends BrandedEvent, GD extends GuardsDef, EFD extends EffectsDef> {
   readonly state: MachineStateSchema<SD> & {
     Type: S;
@@ -113,22 +119,14 @@ type HasEffectKeys<EFD extends EffectsDef> = [keyof EFD] extends [never] ? false
 type SlotContext<State, Event> = MachineContext<State, Event, MachineRef<Event>>;
 /** Combined handlers for build() - guards and effects only */
 type ProvideHandlers<State, Event, GD extends GuardsDef, EFD extends EffectsDef, R> = (HasGuardKeys<GD> extends true ? GuardHandlers<GD, SlotContext<State, Event>, R> : object) & (HasEffectKeys<EFD> extends true ? EffectHandlers<EFD, SlotContext<State, Event>, R> : object);
-/** Whether the machine has any guard or effect slots */
-type HasSlots<GD extends GuardsDef, EFD extends EffectsDef> = HasGuardKeys<GD> extends true ? true : HasEffectKeys<EFD>;
 /**
- * A finalized machine ready for spawning.
+ * Bind slot handlers to a machine, returning a fresh copy with handlers installed.
+ * If no handlers provided and machine has no slots, returns the machine as-is.
+ * Validates that all required slots are provided and no extra slots are given.
  *
- * Created by calling `.build()` on a `Machine`. This is the only type
- * accepted by `Machine.spawn` and `ActorSystem.spawn` (regular overload).
- * Testing utilities (`simulate`, `createTestHarness`, etc.) still accept `Machine`.
+ * @internal — used by spawn, replay, simulate, test harness, entity-machine
  */
-declare class BuiltMachine<State, Event, R = never> {
-  /** @internal */
-  readonly _inner: Machine<State, Event, R, any, any, any, any>;
-  /** @internal */
-  constructor(machine: Machine<State, Event, R, any, any, any, any>);
-  get initial(): State;
-}
+declare const materializeMachine: <S, E, R, GD extends GuardsDef, EFD extends EffectsDef>(machine: Machine<S, E, R, any, any, GD, EFD>, handlers?: Record<string, any>) => Machine<S, E, never, any, any, GD, EFD>;
 /**
  * Machine definition with fluent builder API.
  *
@@ -171,6 +169,8 @@ declare class Machine<State, Event, R = never, _SD extends Record<string, Schema
   };
   readonly stateSchema?: Schema.Schema<State>;
   readonly eventSchema?: Schema.Schema<Event>;
+  /** @internal */
+  readonly _replySchemas: ReadonlyMap<string, Schema.Decoder<unknown>>;
   /**
    * Context tag for accessing machine state/event/self in slot handlers.
    * Uses shared module-level tag for all machines.
@@ -186,24 +186,25 @@ declare class Machine<State, Event, R = never, _SD extends Record<string, Schema
   }>;
   get guardsSchema(): GuardsSchema<GD> | undefined;
   get effectsSchema(): EffectsSchema<EFD> | undefined;
+  get replySchemas(): ReadonlyMap<string, Schema.Decoder<unknown>>;
   /** @internal */
   constructor(initial: State, stateSchema?: Schema.Schema<State>, eventSchema?: Schema.Schema<Event>, guardsSchema?: GuardsSchema<GD>, effectsSchema?: EffectsSchema<EFD>);
   from<NS extends VariantsUnion<_SD> & BrandedState, R1>(state: TaggedOrConstructor<NS>, build: (scope: TransitionScope<State, Event, R, _SD, _ED, GD, EFD, NS>) => R1): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   from<NS extends ReadonlyArray<TaggedOrConstructor<VariantsUnion<_SD> & BrandedState>>, R1>(states: NS, build: (scope: TransitionScope<State, Event, R, _SD, _ED, GD, EFD, NS[number] extends TaggedOrConstructor<infer S extends VariantsUnion<_SD> & BrandedState> ? S : never>) => R1): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /** @internal */
-  scopeTransition<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: ReadonlyArray<TaggedOrConstructor<NS>>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never>, reenter: boolean): Machine<State, Event, R, _SD, _ED, GD, EFD>;
+  scopeTransition<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: ReadonlyArray<TaggedOrConstructor<NS>>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never, ExtractReply<NE>>, reenter: boolean): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /** Register transition for a single state */
-  on<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
+  on<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never, ExtractReply<NE>>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /** Register transition for multiple states (handler receives union of state types) */
-  on<NS extends ReadonlyArray<TaggedOrConstructor<VariantsUnion<_SD> & BrandedState>>, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: NS, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS[number] extends TaggedOrConstructor<infer S> ? S : never, NE, RS, GD, EFD, never>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
+  on<NS extends ReadonlyArray<TaggedOrConstructor<VariantsUnion<_SD> & BrandedState>>, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: NS, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS[number] extends TaggedOrConstructor<infer S> ? S : never, NE, RS, GD, EFD, never, ExtractReply<NE>>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /**
    * Like `on()`, but forces onEnter/spawn to run even when transitioning to the same state tag.
    * Use this to restart timers, re-run spawned effects, or reset state-scoped effects.
    */
   /** Single state */
-  reenter<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
+  reenter<NS extends VariantsUnion<_SD> & BrandedState, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS, NE, RS, GD, EFD, never, ExtractReply<NE>>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /** Multiple states */
-  reenter<NS extends ReadonlyArray<TaggedOrConstructor<VariantsUnion<_SD> & BrandedState>>, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: NS, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS[number] extends TaggedOrConstructor<infer S> ? S : never, NE, RS, GD, EFD, never>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
+  reenter<NS extends ReadonlyArray<TaggedOrConstructor<VariantsUnion<_SD> & BrandedState>>, NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(states: NS, event: TaggedOrConstructor<NE>, handler: TransitionHandler<NS[number] extends TaggedOrConstructor<infer S> ? S : never, NE, RS, GD, EFD, never, ExtractReply<NE>>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   /**
    * Register a wildcard transition that fires from any state when no specific transition matches.
    * Specific `.on()` transitions always take priority over `.onAny()`.
@@ -301,50 +302,83 @@ declare class Machine<State, Event, R = never, _SD extends Record<string, Schema
    */
   postpone<NS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>, events: TaggedOrConstructor<VariantsUnion<_ED> & BrandedEvent> | ReadonlyArray<TaggedOrConstructor<VariantsUnion<_ED> & BrandedEvent>>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
   final<NS extends VariantsUnion<_SD> & BrandedState>(state: TaggedOrConstructor<NS>): Machine<State, Event, R, _SD, _ED, GD, EFD>;
-  /**
-   * Finalize the machine. Returns a `BuiltMachine` — the only type accepted by `Machine.spawn`.
-   *
-   * - Machines with slots: pass implementations as the first argument.
-   * - Machines without slots: call with no arguments.
-   */
-  build<R2 = never>(...args: HasSlots<GD, EFD> extends true ? [handlers: ProvideHandlers<State, Event, GD, EFD, R2>] : [handlers?: ProvideHandlers<State, Event, GD, EFD, R2>]): BuiltMachine<State, Event, R | NormalizeR<R2>>;
   static make<SD extends Record<string, Schema.Struct.Fields>, ED extends Record<string, Schema.Struct.Fields>, S extends BrandedState, E extends BrandedEvent, GD extends GuardsDef = Record<string, never>, EFD extends EffectsDef = Record<string, never>>(config: MakeConfig<SD, ED, S, E, GD, EFD>): Machine<S, E, never, SD, ED, GD, EFD>;
 }
 declare class TransitionScope<State, Event, R, _SD extends Record<string, Schema.Struct.Fields>, _ED extends Record<string, Schema.Struct.Fields>, GD extends GuardsDef, EFD extends EffectsDef, SelectedState extends VariantsUnion<_SD> & BrandedState> {
   private readonly machine;
   private readonly states;
   constructor(machine: Machine<State, Event, R, _SD, _ED, GD, EFD>, states: ReadonlyArray<TaggedOrConstructor<SelectedState>>);
-  on<NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(event: TaggedOrConstructor<NE>, handler: TransitionHandler<SelectedState, NE, RS, GD, EFD, never>): TransitionScope<State, Event, R, _SD, _ED, GD, EFD, SelectedState>;
-  reenter<NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(event: TaggedOrConstructor<NE>, handler: TransitionHandler<SelectedState, NE, RS, GD, EFD, never>): TransitionScope<State, Event, R, _SD, _ED, GD, EFD, SelectedState>;
+  on<NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(event: TaggedOrConstructor<NE>, handler: TransitionHandler<SelectedState, NE, RS, GD, EFD, never, ExtractReply<NE>>): TransitionScope<State, Event, R, _SD, _ED, GD, EFD, SelectedState>;
+  reenter<NE extends VariantsUnion<_ED> & BrandedEvent, RS extends VariantsUnion<_SD> & BrandedState>(event: TaggedOrConstructor<NE>, handler: TransitionHandler<SelectedState, NE, RS, GD, EFD, never, ExtractReply<NE>>): TransitionScope<State, Event, R, _SD, _ED, GD, EFD, SelectedState>;
 }
 declare const make: typeof Machine.make;
 /**
- * Spawn an actor from a built machine.
+ * Spawn an actor directly without ActorSystem ceremony.
+ * Accepts a `Machine` directly. For slotful machines, pass `{ slots }` in options.
+ *
+ * **Single actor, no registry.** Caller manages lifetime via `actor.stop`.
+ * If a `Scope` exists in context, cleanup attaches automatically on scope close.
+ *
+ * For registry, lookup by ID, persistence, or multi-actor coordination,
+ * use `ActorSystemService` / `system.spawn` instead.
+ *
+ * @example
+ * ```ts
+ * // Fire-and-forget — caller manages lifetime
+ * const actor = yield* Machine.spawn(machine.build());
+ * yield* actor.send(Event.Start);
+ * yield* actor.awaitFinal;
+ * yield* actor.stop;
+ *
+ * // Scope-aware — auto-cleans up on scope close
+ * yield* Effect.scoped(Effect.gen(function* () {
+ *   const actor = yield* Machine.spawn(machine.build());
+ *   yield* actor.send(Event.Start);
+ *   // actor.stop called automatically when scope closes
+ * }));
+ * ```
+ */
+type AnyMachine<S, E, R> = Machine<S, E, R, any, any, any, any>;
+/**
+ * Spawn an actor from a machine.
+ *
+ * For machines with slots, pass implementations via `{ slots: { ... } }`.
  *
- * Options:
- * - `id` — custom actor ID (default: random)
- * - `hydrate` — restore from a previously-saved state snapshot.
- *   The actor starts in the hydrated state and re-runs spawn effects
- *   for that state (timers, scoped resources, etc.). Transition history
- *   is not replayed — only the current state's entry effects run.
+ * @example
+ * ```ts
+ * // No slots
+ * const actor = yield* Machine.spawn(machine);
  *
- * Persistence is composed in userland by observing `actor.changes`
- * and saving snapshots to your own storage.
+ * // With slots
+ * const actor = yield* Machine.spawn(machine, {
+ *   slots: { canRetry: ({ max }, { state }) => state.attempts < max },
+ * });
+ *
+ * // With hydration
+ * const actor = yield* Machine.spawn(machine, { hydrate: savedState });
+ * ```
  */
 declare const spawn: <S extends {
   readonly _tag: string;
 }, E extends {
   readonly _tag: string;
-}, R>(machine: BuiltMachine<S, E, R>, idOrOptions?: string | {
+}, R>(machine: AnyMachine<S, E, R>, options?: string | {
   id?: string;
   hydrate?: S;
+  slots?: Record<string, any>;
+  supervision?: Supervision.Policy;
 }) => Effect.Effect<ActorRef<S, E>, never, R>;
-declare const replay: <S extends {
-  readonly _tag: string;
-}, E extends {
-  readonly _tag: string;
-}, R>(machine: BuiltMachine<S, E, R>, events: ReadonlyArray<E>, options?: {
-  from?: S;
-}) => Effect.Effect<S, never, R>;
+declare const replay: {
+  <S extends {
+    readonly _tag: string;
+  }, E extends {
+    readonly _tag: string;
+  }, R>(machine: AnyMachine<S, E, R>, events: ReadonlyArray<E>, options?: {
+    from?: S;
+    slots?: Record<string, any>;
+  }): Effect.Effect<S, never, R>;
+};
+declare const reply: <State, Reply>(state: State, reply: Reply) => ReplyResult<State, Reply>;
+declare const deferReply: <State>(state: State) => DeferReplyResult<State>;
 //#endregion
-export { BackgroundEffect, BuiltMachine, HandlerContext, Machine, MachineRef, MakeConfig, ProvideHandlers, SlotContext, SpawnEffect, StateEffectHandler, StateHandlerContext, TaskOptions, TimeoutConfig, Transition, TransitionHandler, findTransitions, machine_d_exports, make, replay, spawn };
+export { BackgroundEffect, type DeferReplyResult, HandlerContext, Machine, MachineRef, MakeConfig, ProvideHandlers, type ReplyResult, SlotContext, SpawnEffect, StateEffectHandler, StateHandlerContext, TaskOptions, TimeoutConfig, Transition, TransitionHandler, deferReply, findTransitions, machine_d_exports, make, materializeMachine, replay, reply, spawn };

package/dist/machine.js

@@ -1,19 +1,21 @@
 import { __exportAll } from "./_virtual/_rolldown/runtime.js";
 import { Inspector } from "./inspection.js";
-import { getTag, stubSystem } from "./internal/utils.js";
-import { ProvisionValidationError, SlotProvisionError } from "./errors.js";
-import { emitWithTimestamp } from "./internal/inspection.js";
-import { MachineContextTag } from "./slot.js";
+import { getTag, makeDeferReply, makeReply, stubSystem } from "./internal/utils.js";
 import { findTransitions, invalidateIndex, resolveTransition, runTransitionHandler, shouldPostpone } from "./internal/transition.js";
+import { emitWithTimestamp } from "./internal/inspection.js";
+import { ProvisionValidationError, SlotProvisionError } from "./errors.js";
 import { createActor } from "./actor.js";
-import { Cause, Effect, Exit, Option, Scope } from "effect";
+import { MachineContextTag } from "./slot.js";
+import { Cause, Effect, Exit, Option, Random, Scope } from "effect";
 //#region src/machine.ts
 var machine_exports = /* @__PURE__ */ __exportAll({
-	BuiltMachine: () => BuiltMachine,
 	Machine: () => Machine,
+	deferReply: () => deferReply,
 	findTransitions: () => findTransitions,
 	make: () => make,
+	materializeMachine: () => materializeMachine,
 	replay: () => replay,
+	reply: () => reply,
 	spawn: () => spawn
 });
 const emitTaskInspection = (input) => Effect.flatMap(Effect.serviceOption(Inspector), (inspector) => Option.isNone(inspector) ? Effect.void : emitWithTimestamp(inspector.value, (timestamp) => ({
@@ -26,22 +28,49 @@ const emitTaskInspection = (input) => Effect.flatMap(Effect.serviceOption(Inspec
 	timestamp
 })));
 /**
-* A finalized machine ready for spawning.
+* Bind slot handlers to a machine, returning a fresh copy with handlers installed.
+* If no handlers provided and machine has no slots, returns the machine as-is.
+* Validates that all required slots are provided and no extra slots are given.
 *
-* Created by calling `.build()` on a `Machine`. This is the only type
-* accepted by `Machine.spawn` and `ActorSystem.spawn` (regular overload).
-* Testing utilities (`simulate`, `createTestHarness`, etc.) still accept `Machine`.
+* @internal — used by spawn, replay, simulate, test harness, entity-machine
 */
-var BuiltMachine = class {
-	/** @internal */
-	_inner;
-	/** @internal */
-	constructor(machine) {
-		this._inner = machine;
-	}
-	get initial() {
-		return this._inner.initial;
+const materializeMachine = (machine, handlers) => {
+	if (handlers === void 0) {
+		const hasGuards = machine._guardsSchema !== void 0 && Object.keys(machine._guardsSchema.definitions).length > 0;
+		const hasEffects = machine._effectsSchema !== void 0 && Object.keys(machine._effectsSchema.definitions).length > 0;
+		if (hasGuards || hasEffects) {
+			const missing = [];
+			if (machine._guardsSchema !== void 0) missing.push(...Object.keys(machine._guardsSchema.definitions));
+			if (machine._effectsSchema !== void 0) missing.push(...Object.keys(machine._effectsSchema.definitions));
+			throw new ProvisionValidationError({
+				missing,
+				extra: []
+			});
+		}
+		return machine;
 	}
+	const requiredSlots = /* @__PURE__ */ new Set();
+	if (machine._guardsSchema !== void 0) for (const name of Object.keys(machine._guardsSchema.definitions)) requiredSlots.add(name);
+	if (machine._effectsSchema !== void 0) for (const name of Object.keys(machine._effectsSchema.definitions)) requiredSlots.add(name);
+	const providedSlots = new Set(Object.keys(handlers));
+	const missing = [];
+	const extra = [];
+	for (const name of requiredSlots) if (!providedSlots.has(name)) missing.push(name);
+	for (const name of providedSlots) if (!requiredSlots.has(name)) extra.push(name);
+	if (missing.length > 0 || extra.length > 0) throw new ProvisionValidationError({
+		missing,
+		extra
+	});
+	const result = new Machine(machine.initial, machine.stateSchema, machine.eventSchema, machine._guardsSchema, machine._effectsSchema);
+	result._transitions = [...machine._transitions];
+	result._finalStates = new Set(machine._finalStates);
+	result._spawnEffects = [...machine._spawnEffects];
+	result._backgroundEffects = [...machine._backgroundEffects];
+	result._postponeRules = [...machine._postponeRules];
+	result._replySchemas = machine._replySchemas;
+	if (machine._guardsSchema !== void 0) for (const name of Object.keys(machine._guardsSchema.definitions)) result._guardHandlers.set(name, handlers[name]);
+	if (machine._effectsSchema !== void 0) for (const name of Object.keys(machine._effectsSchema.definitions)) result._effectHandlers.set(name, handlers[name]);
+	return result;
 };
 /**
 * Machine definition with fluent builder API.
@@ -69,6 +98,7 @@ var Machine = class Machine {
 	/** @internal */ _slots;
 	stateSchema;
 	eventSchema;
+	/** @internal */ _replySchemas;
 	/**
 	* Context tag for accessing machine state/event/self in slot handlers.
 	* Uses shared module-level tag for all machines.
@@ -95,6 +125,9 @@ var Machine = class Machine {
 	get effectsSchema() {
 		return this._effectsSchema;
 	}
+	get replySchemas() {
+		return this._replySchemas;
+	}
 	/** @internal */
 	constructor(initial, stateSchema, eventSchema, guardsSchema, effectsSchema) {
 		this.initial = initial;
@@ -105,6 +138,7 @@ var Machine = class Machine {
 		this._postponeRules = [];
 		this._guardsSchema = guardsSchema;
 		this._effectsSchema = effectsSchema;
+		this._replySchemas = eventSchema?._replySchemas ?? /* @__PURE__ */ new Map();
 		this._guardHandlers = /* @__PURE__ */ new Map();
 		this._effectHandlers = /* @__PURE__ */ new Map();
 		this.stateSchema = stateSchema;
@@ -348,40 +382,6 @@ var Machine = class Machine {
 		this._finalStates.add(stateTag);
 		return this;
 	}
-	/**
-	* Finalize the machine. Returns a `BuiltMachine` — the only type accepted by `Machine.spawn`.
-	*
-	* - Machines with slots: pass implementations as the first argument.
-	* - Machines without slots: call with no arguments.
-	*/
-	build(...args) {
-		const handlers = args[0];
-		if (handlers !== void 0) {
-			const requiredSlots = /* @__PURE__ */ new Set();
-			if (this._guardsSchema !== void 0) for (const name of Object.keys(this._guardsSchema.definitions)) requiredSlots.add(name);
-			if (this._effectsSchema !== void 0) for (const name of Object.keys(this._effectsSchema.definitions)) requiredSlots.add(name);
-			const providedSlots = new Set(Object.keys(handlers));
-			const missing = [];
-			const extra = [];
-			for (const name of requiredSlots) if (!providedSlots.has(name)) missing.push(name);
-			for (const name of providedSlots) if (!requiredSlots.has(name)) extra.push(name);
-			if (missing.length > 0 || extra.length > 0) throw new ProvisionValidationError({
-				missing,
-				extra
-			});
-			const result = new Machine(this.initial, this.stateSchema, this.eventSchema, this._guardsSchema, this._effectsSchema);
-			result._transitions = [...this._transitions];
-			result._finalStates = new Set(this._finalStates);
-			result._spawnEffects = [...this._spawnEffects];
-			result._backgroundEffects = [...this._backgroundEffects];
-			result._postponeRules = [...this._postponeRules];
-			const anyHandlers = handlers;
-			if (this._guardsSchema !== void 0) for (const name of Object.keys(this._guardsSchema.definitions)) result._guardHandlers.set(name, anyHandlers[name]);
-			if (this._effectsSchema !== void 0) for (const name of Object.keys(this._effectsSchema.definitions)) result._effectHandlers.set(name, anyHandlers[name]);
-			return new BuiltMachine(result);
-		}
-		return new BuiltMachine(this);
-	}
 	static make(config) {
 		return new Machine(config.initial, config.state, config.event, config.guards, config.effects);
 	}
@@ -402,27 +402,36 @@ var TransitionScope = class {
 };
 const make = Machine.make;
 /**
-* Spawn an actor from a built machine.
+* Spawn an actor from a machine.
+*
+* For machines with slots, pass implementations via `{ slots: { ... } }`.
+*
+* @example
+* ```ts
+* // No slots
+* const actor = yield* Machine.spawn(machine);
 *
-* Options:
-* - `id` — custom actor ID (default: random)
-* - `hydrate` — restore from a previously-saved state snapshot.
-*   The actor starts in the hydrated state and re-runs spawn effects
-*   for that state (timers, scoped resources, etc.). Transition history
-*   is not replayed — only the current state's entry effects run.
+* // With slots
+* const actor = yield* Machine.spawn(machine, {
+*   slots: { canRetry: ({ max }, { state }) => state.attempts < max },
+* });
 *
-* Persistence is composed in userland by observing `actor.changes`
-* and saving snapshots to your own storage.
+* // With hydration
+* const actor = yield* Machine.spawn(machine, { hydrate: savedState });
+* ```
 */
-const spawn = Effect.fn("effect-machine.spawn")(function* (built, idOrOptions) {
+const spawn = Effect.fn("effect-machine.spawn")(function* (machine, idOrOptions) {
 	const opts = typeof idOrOptions === "string" ? { id: idOrOptions } : idOrOptions;
-	const actor = yield* createActor(opts?.id ?? `actor-${Math.random().toString(36).slice(2)}`, built._inner, { initialState: opts?.hydrate });
+	const actor = yield* createActor(opts?.id ?? `actor-${(yield* Random.next).toString(36).slice(2)}`, materializeMachine(machine, opts?.slots), {
+		initialState: opts?.hydrate,
+		supervision: opts?.supervision
+	});
 	const maybeScope = yield* Effect.serviceOption(Scope.Scope);
 	if (Option.isSome(maybeScope)) yield* Scope.addFinalizer(maybeScope.value, actor.stop);
 	return actor;
 });
-const replay = Effect.fn("effect-machine.replay")(function* (built, events, options) {
-	const machine = built._inner;
+const replay = Effect.fn("effect-machine.replay")(function* (input, events, options) {
+	const machine = materializeMachine(input, options?.slots);
 	let state = options?.from ?? machine.initial;
 	const hasPostponeRules = machine.postponeRules.length > 0;
 	const postponed = [];
@@ -430,7 +439,8 @@ const replay = Effect.fn("effect-machine.replay")(function* (built, events, opti
 	const self = {
 		send: dummySend,
 		cast: dummySend,
-		spawn: () => Effect.die("spawn not supported in replay")
+		spawn: () => Effect.die("spawn not supported in replay"),
+		reply: () => Effect.succeed(false)
 	};
 	for (const event of events) {
 		if (machine.finalStates.has(state._tag)) break;
@@ -464,5 +474,7 @@ const replay = Effect.fn("effect-machine.replay")(function* (built, events, opti
 	}
 	return state;
 });
+const reply = makeReply;
+const deferReply = makeDeferReply;
 //#endregion
-export { BuiltMachine, Machine, findTransitions, machine_exports, make, replay, spawn };
+export { Machine, deferReply, findTransitions, machine_exports, make, materializeMachine, replay, reply, spawn };

package/dist/schema.d.ts

@@ -1,7 +1,17 @@
-import { FullEventBrand, FullStateBrand } from "./internal/brands.js";
+import { FullEventBrand, FullStateBrand, ReplyTypeBrand } from "./internal/brands.js";
 import { Schema } from "effect";
 
 //#region src/schema.d.ts
+declare const ReplySchemaSymbol: unique symbol;
+type ReplySchemaSymbol = typeof ReplySchemaSymbol;
+/**
+ * Fields annotated with a reply schema.
+ * Structurally identical to Schema.Struct.Fields at runtime,
+ * but carries the reply schema type at compile time.
+ */
+type ReplyFields<F extends Schema.Struct.Fields, RS extends Schema.Schema<unknown>> = F & {
+  readonly [ReplySchemaSymbol]: RS;
+};
 /**
  * Extract the TypeScript type from a TaggedStruct schema
  */
@@ -12,20 +22,23 @@ type TaggedStructType<Tag extends string, Fields extends Schema.Struct.Fields> =
 type VariantSchemas<D extends Record<string, Schema.Struct.Fields>> = { readonly [K in keyof D & string]: Schema.TaggedStruct<K, D[K]> };
 /**
  * Build union type from variant schemas.
- * Used for constraining fluent method type params.
+ * Reply-bearing variants carry ReplyTypeBrand<R> for ask() inference.
  */
-type VariantsUnion<D extends Record<string, Schema.Struct.Fields>> = { [K in keyof D & string]: TaggedStructType<K, D[K]> }[keyof D & string];
+type VariantsUnion<D extends Record<string, Schema.Struct.Fields>> = { [K in keyof D & string]: TaggedStructType<K, D[K]> & (D[K] extends {
+  readonly [ReplySchemaSymbol]: Schema.Schema<infer R>;
+} ? ReplyTypeBrand<R> : unknown) }[keyof D & string];
 /**
- * Check if fields are empty (no required properties)
+ * Check if fields are empty (no required string properties).
+ * Symbol keys (like ReplySchemaSymbol) are metadata, not payload fields.
  */
-type IsEmptyFields<Fields extends Schema.Struct.Fields> = keyof Fields extends never ? true : false;
+type IsEmptyFields<Fields extends Schema.Struct.Fields> = string & keyof Fields extends never ? true : false;
 /**
- * Constructor functions for each variant.
- * Empty structs: plain values with `_tag`: `State.Idle`
- * Non-empty structs require args: `State.Loading({ url })`
- *
- * Each variant also has a `derive` method for constructing from a source object.
+ * Resolve the reply brand for a variant's fields.
+ * If fields carry ReplySchemaSymbol, adds ReplyTypeBrand<R>.
  */
+type VariantReplyBrand<Fields extends Schema.Struct.Fields> = Fields extends {
+  readonly [ReplySchemaSymbol]: Schema.Schema<infer R>;
+} ? ReplyTypeBrand<R> : unknown;
 /**
  * Constructor functions for each variant.
  * Empty structs: plain values with `_tag`: `State.Idle`
@@ -33,10 +46,11 @@ type IsEmptyFields<Fields extends Schema.Struct.Fields> = keyof Fields extends n
  *
  * Each variant also has a `derive` method for constructing from a source object.
  * The source type uses `object` to accept branded state types without index signature issues.
+ * Reply-bearing variants carry ReplyTypeBrand<R> for ask() type inference.
  */
-type VariantConstructors<D extends Record<string, Schema.Struct.Fields>, Brand> = { readonly [K in keyof D & string]: IsEmptyFields<D[K]> extends true ? TaggedStructType<K, D[K]> & Brand & {
+type VariantConstructors<D extends Record<string, Schema.Struct.Fields>, Brand> = { readonly [K in keyof D & string]: IsEmptyFields<D[K]> extends true ? TaggedStructType<K, D[K]> & Brand & VariantReplyBrand<D[K]> & {
   readonly derive: (source: object) => TaggedStructType<K, D[K]> & Brand;
-} : ((args: Schema.Struct.Type<D[K]>) => TaggedStructType<K, D[K]> & Brand) & {
+} : ((args: Schema.Struct.Type<D[K]>) => TaggedStructType<K, D[K]> & Brand & VariantReplyBrand<D[K]>) & {
   readonly derive: (source: object, partial?: Partial<Schema.Struct.Type<D[K]>>) => TaggedStructType<K, D[K]> & Brand;
   readonly _tag: K;
 } };
@@ -67,6 +81,11 @@ interface MachineSchemaBase<D extends Record<string, Schema.Struct.Fields>, Bran
     <R>(cases: MatchCases<D, R>): (value: VariantsUnion<D> & Brand) => R;
     <R>(value: VariantsUnion<D> & Brand, cases: MatchCases<D, R>): R;
   };
+  /**
+   * Reply schemas per variant tag. Only populated for event schemas
+   * with variants defined via `Event.reply()`.
+   */
+  readonly _replySchemas: ReadonlyMap<string, Schema.Decoder<unknown>>;
 }
 /**
  * Schema-first state definition that provides:
@@ -116,26 +135,8 @@ type MachineEventSchema<D extends Record<string, Schema.Struct.Fields>> = Schema
  * ```
  */
 declare const State: <const D extends Record<string, Schema.Struct.Fields>>(definition: D) => MachineStateSchema<D>;
-/**
- * Create a schema-first Event definition.
- *
- * The schema's definition type D creates a unique brand, preventing
- * accidental use of constructors from different event schemas
- * (unless they have identical definitions).
- *
- * @example
- * ```ts
- * const OrderEvent = MachineSchema.Event({
- *   Ship: { trackingId: Schema.String },
- *   Cancel: {},
- * })
- *
- * type OrderEvent = typeof OrderEvent.Type
- *
- * // Construct
- * const e = OrderEvent.Ship({ trackingId: "abc" })
- * ```
- */
-declare const Event: <const D extends Record<string, Schema.Struct.Fields>>(definition: D) => MachineEventSchema<D>;
+declare const Event: (<const D extends Record<string, Schema.Struct.Fields>>(definition: D) => MachineEventSchema<D>) & {
+  reply: <F extends Schema.Struct.Fields, RS extends Schema.Schema<unknown>>(fields: F, replySchema: RS) => ReplyFields<F, RS>;
+};
 //#endregion
-export { Event, MachineEventSchema, MachineStateSchema, State, VariantsUnion };
+export { Event, MachineEventSchema, MachineStateSchema, ReplyFields, ReplySchemaSymbol, State, VariantsUnion };