@typeonce/effect-machine 0.8.0 → 0.10.0

package/src/Machine.ts

@@ -49,6 +49,11 @@ export const TypeId: TypeId = "~effect/Machine"
 
 declare const MachineOutputStatesTypeId: unique symbol
 declare const MachineTypeId: unique symbol
+declare const EventConstructionTypeId: unique symbol
+declare const EmittedEventConstructionTypeId: unique symbol
+declare const EventProtocolTypeId: unique symbol
+
+const ChildMachineLogicTypeId: typeof internal.ChildMachineLogicTypeId = internal.ChildMachineLogicTypeId
 
 /**
  * Type identifier used for the synthetic event passed to startup lifecycle
@@ -121,7 +126,8 @@ export interface Machine<
   Output = never,
   Emits extends ReadonlyArray<Machine.TaggedSchema> = readonly [],
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 > extends Pipeable {
   readonly [TypeId]: TypeId
   /** @internal Stable type-level carrier for machine protocol extraction. */
@@ -138,7 +144,8 @@ export interface Machine<
     Output,
     Emits,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >
   /** @internal Prevents output implementation evidence from being widened. */
   readonly [MachineOutputStatesTypeId]: Readonly<Record<OutputStates, true>>
@@ -155,21 +162,37 @@ export interface Machine<
    *
    * @since 0.4.0
    */
-  readonly events: InputEvents
+  readonly events: Machine.EventProtocol<"public", InputEvents>
 
   /**
-   * Events reserved for invokes, child emissions, and other machine-local work.
+   * Events reserved for raised events and other machine-local work.
    *
    * @since 0.4.0
    */
-  readonly internalEvents: ReadonlyArray<Machine.TaggedSchema>
+  readonly internalEvents: Machine.EventProtocol<
+    "internal",
+    Machine.InternalEventSchemas<Events, InputEvents>
+  >
 
   /**
-   * Events that the machine may emit to its parent or external adapter.
+   * Ephemeral outward notifications published to this actor's observers.
+   * Emissions are never delivered implicitly to an owning actor.
    *
    * @since 0.4.0
    */
-  readonly emits: Emits
+  readonly emittedEvents: Machine.EventProtocol<"emitted", Emits>
+
+  /**
+   * Public input events accepted by an owning actor when this machine is
+   * running as a child.
+   *
+   * The protocol types the optional `parent` actor reference exposed to
+   * handlers and is checked against a concrete parent's public events at
+   * composition boundaries.
+   *
+   * @since 0.10.0
+   */
+  readonly parentEvents: Machine.EventProtocol<"public", ParentEvents>
 
   /**
    * Optional schema used to decode the machine input before initialization.
@@ -219,7 +242,8 @@ export interface Machine<
     FinalStates,
     Output,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >
 
   /** @internal */
@@ -339,7 +363,8 @@ export type ExecutionServices<Requirements> =
   | Exclude<ActionServices<Requirements>, MachineRuntimeRequirement>
 
 /**
- * Managed runtime capability used to deliver raised and emitted events.
+ * Managed runtime capability used to deliver raised events and publish
+ * emitted notifications.
  *
  * @category models
  * @since 0.4.0
@@ -350,14 +375,45 @@ export interface Runtime<in Events, in Emits> {
    *
    * @since 0.4.0
    */
-  readonly raise: (event: Events) => Effect.Effect<void, MachineSchemaDecodeError | StoppedError>
+  readonly raise: (event: Machine.EventInput<Events>) => Effect.Effect<void, MachineSchemaDecodeError | StoppedError>
 
   /**
-   * Emits an event through the running machine's parent boundary.
+   * Publishes an ephemeral notification to the running actor's observers.
    *
    * @since 0.4.0
    */
-  readonly sendParent: (event: Emits) => Effect.Effect<void, MachineSchemaDecodeError | StoppedError>
+  readonly emit: (
+    event: Machine.EmittedEventInput<Emits>
+  ) => Effect.Effect<void, MachineSchemaDecodeError | StoppedError>
+}
+
+/**
+ * Minimal typed reference accepted by targeted actor commands.
+ *
+ * @category models
+ * @since 0.10.0
+ */
+export interface ActorRef<in Event> {
+  readonly id: string
+  readonly sessionId: string
+  readonly send: (event: Event) => Effect.Effect<void, StoppedError>
+}
+
+/**
+ * Actor references available while evaluating machine behavior.
+ *
+ * @category models
+ * @since 0.10.0
+ */
+export interface ActorContext<
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema>,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema>
+> {
+  /** Reference to the current actor. Sending queues a later mailbox event. */
+  readonly self: ActorRef<Machine.EventInputOf<InputEvents>>
+
+  /** Reference to the owning actor, or `undefined` when running as a root. */
+  readonly parent: ActorRef<Machine.EventInputOf<ParentEvents>> | undefined
 }
 
 /**
@@ -370,13 +426,14 @@ export interface Runtime<in Events, in Emits> {
  */
 export interface Enqueue<in Events, in Emits> {
   /** Raises an event inside the current macrostep. */
-  readonly raise: (event: Events) => void
+  readonly raise: (event: Machine.EventInput<Events>) => void
 
-  /** Emits an event through the machine's parent boundary. */
-  readonly emit: (event: Emits) => void
+  /** Publishes an ephemeral notification to this actor's observers. */
+  readonly emit: (event: Machine.EmittedEventInput<Emits>) => void
 
   /** Sends an event to an invoked child after the transition is selected. */
   readonly sendTo: {
+    <Event>(target: ActorRef<Event>, event: Event): void
     <Child extends ChildMachine.Any>(child: Child, event: ChildMachine.Event<Child>): void
     <Address extends ChildAddress<never>>(child: Address, event: ChildAddress.Event<Address>): void
   }
@@ -397,7 +454,7 @@ export interface Enqueue<in Events, in Emits> {
 export type Command =
   | {
     readonly _tag: "SendTo"
-    readonly child: ChildMachine.Any | ChildAddress<never>
+    readonly target: ActorRef<unknown> | ChildMachine.Any | ChildAddress<never>
     readonly event: unknown
   }
   | {
@@ -672,8 +729,9 @@ type DuplicateEventTag<
   : Events extends readonly [
     infer Head extends Machine.TaggedSchema,
     ...infer Tail extends ReadonlyArray<Machine.TaggedSchema>
-  ] ? Machine.TagOf<Head> extends infer Tag extends PropertyKey ? Tag extends Seen ? Tag | DuplicateEventTag<Tail, Seen>
-      : DuplicateEventTag<Tail, Seen | Tag>
+  ] ? Machine.TagOf<Head> extends infer Tag extends PropertyKey ?
+        | Extract<Tag, Seen>
+        | DuplicateEventTag<Tail, Seen | Tag>
     : never
   : never
 
@@ -683,6 +741,12 @@ type ValidateInputEventProtocol<
 > = [DuplicateInput] extends [never] ? unknown
   : EventProtocolError<"Public event tags must be unique", DuplicateInput>
 
+type ValidateEmittedEventProtocol<
+  EmittedEvents extends ReadonlyArray<Machine.TaggedSchema>,
+  DuplicateEmitted extends PropertyKey = DuplicateEventTag<EmittedEvents>
+> = [DuplicateEmitted] extends [never] ? unknown
+  : EventProtocolError<"Emitted event tags must be unique", DuplicateEmitted>
+
 type ValidateInternalEventProtocol<
   InputEvents extends ReadonlyArray<Machine.TaggedSchema>,
   InternalEvents extends ReadonlyArray<Machine.TaggedSchema>,
@@ -695,6 +759,14 @@ type ValidateInternalEventProtocol<
   : EventProtocolError<"Public and internal event tags must be disjoint", Overlap>
   : EventProtocolError<"Internal event tags must be unique", DuplicateInternal>
 
+type ValidateEventProtocolBuilder<
+  Kind extends Machine.EventProtocolKind,
+  Inputs extends ReadonlyArray<Machine.EventProtocolInput<Kind>>,
+  Schemas extends ReadonlyArray<Machine.TaggedSchema> = Machine.EventProtocolInputSchemasOf<Kind, Inputs>,
+  Duplicate extends PropertyKey = DuplicateEventTag<Schemas>
+> = [Duplicate] extends [never] ? unknown
+  : EventProtocolError<"Event protocol tags must be unique", Duplicate>
+
 const SnapshotBuilderStateTypeId: typeof internal.SnapshotBuilderStateTypeId = internal.SnapshotBuilderStateTypeId
 const SnapshotBuilderConstructionTypeId: unique symbol = Symbol("effect/Machine/SnapshotBuilderConstruction")
 
@@ -1636,7 +1708,9 @@ export type RuntimeOutcome<State, Error = never, Output = never> =
  * @category models
  * @since 0.4.0
  */
-export interface MachineRef<out State, in Event, out Error = never, out Output = never> {
+export interface MachineRef<out State, in Event, out Error = never, out Output = never, out Emitted = never>
+  extends ActorRef<Event>
+{
   /** Stable machine definition id, or a generated fallback when none was declared. */
   readonly id: string
 
@@ -1649,9 +1723,15 @@ export interface MachineRef<out State, in Event, out Error = never, out Output =
   /** Reads the latest lifecycle snapshot. */
   readonly snapshot: Effect.Effect<RuntimeSnapshot<State, Error, Output>>
 
-  /** Streams lifecycle snapshots published after subscription. */
+  /** Streams the current lifecycle snapshot followed by later changes. */
   readonly changes: Stream.Stream<RuntimeSnapshot<State, Error, Output>>
 
+  /**
+   * Streams ephemeral notifications published after subscription. Emissions
+   * are not retained or replayed; the stream completes when the actor stops.
+   */
+  readonly emissions: Stream.Stream<Emitted>
+
   /** Waits for machine output or fails when execution fails or is stopped. */
   readonly join: Effect.Effect<Output, Error | StoppedError>
 
@@ -1763,12 +1843,6 @@ export declare namespace Logic {
   /**
    * Machine-local capabilities available while process logic initializes.
    *
-   * **Gotchas**
-   *
-   * `sendParent` accepts `unknown` because process logic is independent from
-   * the parent that eventually owns it. Prefer typed process output or an
-   * invoke snapshot mapper when either can represent the communication.
-   *
    * @category models
    * @since 0.4.0
    */
@@ -1782,14 +1856,14 @@ export declare namespace Logic {
     /** Starts a child process owned by this scope. */
     readonly spawn: Spawn
 
-    /** Sends an untyped event to the owning process. */
-    readonly sendParent: (event: unknown) => Effect.Effect<void, StoppedError>
-
-    /** Sends an event through a typed parent-local child address. */
-    readonly sendTo: <Address extends ChildAddress<never>>(
-      id: Address,
-      event: ChildAddress.Event<Address>
-    ) => Effect.Effect<void, StoppedError>
+    /** Sends an event to an actor reference or typed parent-local child address. */
+    readonly sendTo: {
+      <TargetEvent>(target: ActorRef<TargetEvent>, event: TargetEvent): Effect.Effect<void, StoppedError>
+      <Address extends ChildAddress<never>>(
+        id: Address,
+        event: ChildAddress.Event<Address>
+      ): Effect.Effect<void, StoppedError>
+    }
 
     /** Stops a child process selected by its parent-local address. */
     readonly stopChild: <Event>(id: ChildAddress<Event>) => Effect.Effect<void>
@@ -1829,8 +1903,9 @@ type InvokeLifecycleId = string & { readonly [ChildAddressTypeId]?: never }
  * **Details**
  *
  * The descriptor carries the child's address and complete machine type. Pass
- * the same value to `invokeMachine`, `sendTo`, and child lookup APIs so state,
- * event, error, and output types are inferred without separate annotations.
+ * a descriptor for the same id and machine to inline `invoke`, `sendTo`, and
+ * child lookup APIs so state, event, error, and output types are inferred
+ * without separate annotations.
  *
  * @category models
  * @since 0.4.0
@@ -1843,6 +1918,9 @@ export interface ChildMachine<Id extends string, M extends Machine.Any> {
 
   /** Complete machine definition carried by this descriptor. */
   readonly machine: M
+
+  /** @internal */
+  readonly [ChildMachineLogicTypeId]: (input?: unknown) => Logic<any, any, any, any, any, any>
 }
 
 /**
@@ -1868,13 +1946,14 @@ export declare namespace ChildMachine {
    */
   export type Ref<Child> = Child extends ChildMachine<string, infer M> ? MachineRef<
       Machine.Snapshot<Machine.States<M>>,
-      Machine.InputEvent<M>,
+      Machine.EventInput<Machine.InputEvent<M>>,
       | Machine.Error<M>
       | ActionError<Machine.Services<M>>
       | InfiniteTransitionError
       | MachineSchemaDecodeError
       | StoppedError,
-      Machine.Output<M>
+      Machine.Output<M>,
+      Machine.EmittedEvent<M>
     >
     : never
 
@@ -1884,7 +1963,8 @@ export declare namespace ChildMachine {
    * @category utility types
    * @since 0.4.0
    */
-  export type Event<Child> = Ref<Child> extends MachineRef<any, infer Event, any, any> ? Event : never
+  export type Event<Child> = Child extends ChildMachine<string, infer M> ? Machine.EventInput<Machine.InputEvent<M>>
+    : never
 }
 
 /**
@@ -1997,7 +2077,8 @@ export declare namespace Machine {
     Output,
     Emits extends ReadonlyArray<TaggedSchema>,
     OutputStates extends StateIdentifier<States>,
-    InputEvents extends ReadonlyArray<TaggedSchema>
+    InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>
   > {
     readonly states: States
     readonly events: Events
@@ -2009,9 +2090,10 @@ export declare namespace Machine {
     readonly initialServices: InitialR
     readonly finalStates: FinalStates
     readonly output: Output
-    readonly emits: Emits
+    readonly emittedEvents: Emits
     readonly outputStates: OutputStates
     readonly inputEvents: InputEvents
+    readonly parentEvents: ParentEvents
   }
 
   /**
@@ -2029,11 +2111,12 @@ export declare namespace Machine {
   export interface Any extends Pipeable {
     readonly [TypeId]: TypeId
     /** @internal */
-    readonly [MachineTypeId]: TypeCarrier<any, any, any, any, any, any, any, any, any, any, any, any, any>
+    readonly [MachineTypeId]: TypeCarrier<any, any, any, any, any, any, any, any, any, any, any, any, any, any>
     readonly states: StateSchemas
-    readonly events: ReadonlyArray<TaggedSchema>
-    readonly internalEvents: ReadonlyArray<TaggedSchema>
-    readonly emits: ReadonlyArray<TaggedSchema>
+    readonly events: EventProtocol.Any<"public">
+    readonly internalEvents: EventProtocol.Any<"internal">
+    readonly emittedEvents: EventProtocol.Any<"emitted">
+    readonly parentEvents: EventProtocol.Any<"public">
     readonly input: Schema.Top | undefined
     readonly id: string | undefined
     /** @internal */
@@ -2134,7 +2217,10 @@ export declare namespace Machine {
    * @category utility types
    * @since 0.4.0
    */
-  export type Emits<M extends Any> = M[typeof MachineTypeId]["emits"]
+  export type EmittedEvents<M extends Any> = M[typeof MachineTypeId]["emittedEvents"]
+
+  /** @deprecated Use {@link EmittedEvents}. */
+  export type Emits<M extends Any> = EmittedEvents<M>
 
   /**
    * Extracts state paths with implemented output handlers.
@@ -2152,6 +2238,22 @@ export declare namespace Machine {
    */
   export type InputEvents<M extends Any> = M[typeof MachineTypeId]["inputEvents"]
 
+  /** Extracts the public input protocol required from an owning actor. */
+  export type ParentEvents<M extends Any> = M[typeof MachineTypeId]["parentEvents"]
+
+  /** Extracts an internal event schema tuple from the complete and public protocols. */
+  export type InternalEventSchemas<
+    Events extends ReadonlyArray<TaggedSchema>,
+    InputEvents extends ReadonlyArray<TaggedSchema>
+  > = Events extends readonly [
+    ...InputEvents,
+    ...infer Internal extends ReadonlyArray<TaggedSchema>
+  ] ? readonly [...Internal]
+    : readonly []
+
+  /** Extracts the internal event schema tuple carried by a machine definition. */
+  export type InternalEvents<M extends Any> = InternalEventSchemas<Events<M>, InputEvents<M>>
+
   /**
    * Extracts the complete event protocol handled inside a machine.
    *
@@ -2168,13 +2270,145 @@ export declare namespace Machine {
    */
   export type InputEvent<M extends Any> = EventOf<InputEvents<M>>
 
+  /**
+   * Opaque event construction returned by {@link events} and
+   * {@link internalEvents}.
+   *
+   * The machine resolves the instruction through its event schema when it is
+   * delivered. Only the discriminator is available before decoding succeeds.
+   */
+  export interface EventConstruction<out Event extends { readonly _tag: PropertyKey }> {
+    readonly [EventConstructionTypeId]: Event
+    readonly _tag: Event["_tag"]
+  }
+
+  /** Opaque construction returned by {@link emittedEvents}. */
+  export interface EmittedEventConstruction<out Event extends { readonly _tag: PropertyKey }> {
+    readonly [EmittedEventConstructionTypeId]: Event
+    readonly _tag: Event["_tag"]
+  }
+
+  /** A decoded event or a deferred machine-bound construction of that event. */
+  export type EventInput<Event> =
+    | Event
+    | (Event extends { readonly _tag: PropertyKey } ? EventConstruction<Event> : never)
+
+  /** A decoded emitted event or a deferred emitted-event construction. */
+  export type EmittedEventInput<Event> =
+    | Event
+    | (Event extends { readonly _tag: PropertyKey } ? EmittedEventConstruction<Event> : never)
+
+  /** Event inputs accepted for a schema tuple at machine delivery boundaries. */
+  export type EventInputOf<Events extends ReadonlyArray<TaggedSchema>> = EventInput<EventOf<Events>>
+
+  /** Identifies whether an event protocol is accepted publicly or only inside a machine. */
+  export type EventProtocolKind = "public" | "internal" | "emitted"
+
+  type EventConstructorInput<EventSchema extends TaggedSchema> = Omit<EventSchema["~type.make.in"], "_tag">
+
+  type EventConstructor<
+    EventSchema extends TaggedSchema,
+    Tag extends EventSchema["Type"]["_tag"],
+    Kind extends EventProtocolKind
+  > = {} extends EventConstructorInput<EventSchema> ? (
+      input?: EventConstructorInput<EventSchema>
+    ) => Kind extends "emitted" ? EmittedEventConstruction<EventByTag<readonly [EventSchema], Tag>>
+      : EventConstruction<EventByTag<readonly [EventSchema], Tag>>
+    : (
+      input: EventConstructorInput<EventSchema>
+    ) => Kind extends "emitted" ? EmittedEventConstruction<EventByTag<readonly [EventSchema], Tag>>
+      : EventConstruction<EventByTag<readonly [EventSchema], Tag>>
+
+  type FiniteEventTag<Tag extends PropertyKey> = string extends Tag ? never
+    : number extends Tag ? never
+    : symbol extends Tag ? never
+    : Tag
+
+  type EventConstructorsForSchema<
+    EventSchema extends TaggedSchema,
+    Kind extends EventProtocolKind
+  > = EventSchema extends {
+    readonly cases: infer Cases extends Readonly<Record<PropertyKey, TaggedSchema>>
+  } ? {
+      readonly [Tag in keyof Cases]: Tag extends Cases[Tag]["Type"]["_tag"] ? EventConstructor<Cases[Tag], Tag, Kind>
+        : never
+    }
+    : EventSchema extends { readonly members: infer Members extends ReadonlyArray<TaggedSchema> } ?
+      Types.UnionToIntersection<EventConstructorsForSchema<Members[number], Kind>>
+    : {
+      readonly [Tag in FiniteEventTag<EventSchema["Type"]["_tag"]>]: EventConstructor<EventSchema, Tag, Kind>
+    }
+
+  /** Protocol-bound constructors keyed by each configured event tag. */
+  export type EventConstructors<
+    Events extends ReadonlyArray<TaggedSchema>,
+    Kind extends EventProtocolKind = "public"
+  > = {
+    readonly [Tag in keyof Types.UnionToIntersection<EventConstructorsForSchema<Events[number], Kind>>]:
+      Types.UnionToIntersection<EventConstructorsForSchema<Events[number], Kind>>[Tag]
+  }
+
+  /**
+   * A schema-backed event protocol exposing only deferred event constructors.
+   *
+   * The schema tuple is retained opaquely for machine runtime validation and
+   * type inference. It is not exposed as a runtime property.
+   *
+   * @since 0.10.0
+   */
+  export type EventProtocol<
+    Kind extends EventProtocolKind,
+    Schemas extends ReadonlyArray<TaggedSchema>
+  > = EventConstructors<Schemas, Kind> & {
+    readonly [EventProtocolTypeId]: {
+      readonly kind: Kind
+      readonly schemas: Schemas
+    }
+  }
+
+  export namespace EventProtocol {
+    /** An erased event protocol descriptor retaining its kind and schema carrier. */
+    export interface Any<Kind extends EventProtocolKind = EventProtocolKind> {
+      readonly [EventProtocolTypeId]: {
+        readonly kind: Kind
+        readonly schemas: ReadonlyArray<TaggedSchema>
+      }
+    }
+  }
+
+  /** A schema or an existing protocol accepted by an event builder. */
+  export type EventProtocolInput<Kind extends EventProtocolKind> = TaggedSchema | EventProtocol.Any<Kind>
+
+  type EventProtocolInputSchemas<
+    Kind extends EventProtocolKind,
+    Input extends EventProtocolInput<Kind>
+  > = Input extends EventProtocol<Kind, infer Schemas> ? Schemas
+    : Input extends TaggedSchema ? readonly [Input]
+    : readonly []
+
+  /** Flattens schema and protocol inputs into one owned schema tuple. */
+  export type EventProtocolInputSchemasOf<
+    Kind extends EventProtocolKind,
+    Inputs extends ReadonlyArray<EventProtocolInput<Kind>>
+  > = Inputs extends readonly [
+    infer Head extends EventProtocolInput<Kind>,
+    ...infer Tail extends ReadonlyArray<EventProtocolInput<Kind>>
+  ] ? readonly [...EventProtocolInputSchemas<Kind, Head>, ...EventProtocolInputSchemasOf<Kind, Tail>]
+    : readonly []
+
+  /** @internal Extracts the schema tuple carried opaquely by an event protocol. */
+  export type EventProtocolSchemas<Protocol extends EventProtocol.Any> = Protocol[typeof EventProtocolTypeId]["schemas"]
+
   /**
    * Extracts the event protocol emitted by a machine.
    *
    * @category utility types
    * @since 0.4.0
    */
-  export type Emit<M extends Any> = EmitOf<Emits<M>>
+  export type EmittedEvent<M extends Any> = EmittedEventOf<Emits<M>>
+
+  /** @deprecated Use {@link EmittedEvent}. */
+  export type Emit<M extends Any> = EmittedEvent<M>
 
   /**
    * A schema whose decoded value contains a `_tag` discriminator.
@@ -2636,6 +2870,11 @@ export declare namespace Machine {
     | {
       readonly type: "choice"
     }
+    | {
+      readonly type: "invoke"
+      readonly id: string
+      readonly outcome: "done" | "failure" | "snapshot"
+    }
 
   /**
    * Statically inspectable destination paths for a transition handler.
@@ -2658,10 +2897,10 @@ export declare namespace Machine {
    *
    * **Details**
    *
-   * Event, eventless, and completion handlers may declare an upper bound of
-   * possible target paths. A handler without that declaration is explicitly
-   * reported as dynamic. The source, trigger, and reentry behavior are
-   * available without executing the handler.
+   * Event, eventless, completion, and invocation lifecycle handlers may
+   * declare an upper bound of possible target paths. A handler without that
+   * declaration is explicitly reported as dynamic. The source, trigger, and
+   * reentry behavior are available without executing the handler.
    *
    * @category models
    * @since 0.4.0
@@ -2680,9 +2919,9 @@ export declare namespace Machine {
   /**
    * Serializable description of state-owned work.
    *
-   * Static invoke descriptors expose their lifecycle id and kind without
-   * retaining Effects, closures, services, or child runtimes. A function-valued
-   * invoke factory is reported as dynamic and is never evaluated by inspection.
+   * Static invoke definitions expose their lifecycle id and kind without
+   * retaining Effects, closures, services, or child runtimes. Function-valued
+   * sources are reported as dynamic and are never evaluated by inspection.
    *
    * @category models
    * @since 0.4.0
@@ -2957,7 +3196,10 @@ export declare namespace Machine {
    * @category utility types
    * @since 0.4.0
    */
-  export type EmitOf<Emits extends ReadonlyArray<TaggedSchema>> = Emits[number]["Type"]
+  export type EmittedEventOf<Emits extends ReadonlyArray<TaggedSchema>> = Emits[number]["Type"]
+
+  /** @deprecated Use {@link EmittedEventOf}. */
+  export type EmitOf<Emits extends ReadonlyArray<TaggedSchema>> = EmittedEventOf<Emits>
 
   /**
    * Event values received by lifecycle callbacks.
@@ -3529,6 +3771,21 @@ export declare namespace Machine {
     >
   }
 
+  /**
+   * Opaque result returned by an explicitly targetless transition.
+   *
+   * The transition remains handled and retains its queued commands, raised
+   * events, and emitted events, but selects no concrete destination. Declared
+   * `targets` constrain only concrete destinations, so this result is always
+   * permitted from ordinary transition handlers.
+   *
+   * @category models
+   * @since 0.10.0
+   */
+  export interface NoTarget {
+    readonly [Topology.NoTargetTypeId]: typeof Topology.NoTargetTypeId
+  }
+
   /**
    * Transition instruction that restores a history pseudo-state's parent.
    *
@@ -3635,9 +3892,9 @@ export declare namespace Machine {
    *
    * **Details**
    *
-   * `local` targets the nearest compound scope for the source state, `branch`
-   * targets descendants of the source root, and `full` builds complete
-   * snapshots for any root.
+   * `none()` handles without selecting a destination, `local` targets the
+   * nearest compound scope for the source state, `branch` targets descendants
+   * of the source root, and `full` builds complete snapshots for any root.
    *
    * These builders control how the next active configuration is assembled; they
    * do not directly control state re-entry. Exit and entry paths are derived
@@ -3653,6 +3910,18 @@ export declare namespace Machine {
     States extends StateSchemas,
     Source extends StateNodeIdentifier<States>
   > {
+    /**
+     * Selects an explicitly targetless transition.
+     *
+     * The event or lifecycle outcome is handled and queued operations are
+     * retained, while the current state configuration remains the transition
+     * result. This remains valid when the handler declares concrete `targets`,
+     * because those paths are an upper bound rather than an exhaustive result.
+     *
+     * @since 0.10.0
+     */
+    readonly none: () => NoTarget
+
     /**
      * Moves to another state in the same local group. The value of the state
      * containing that group, and values in other active branches, are kept.
@@ -3701,11 +3970,13 @@ export declare namespace Machine {
     StateId extends StateIdentifier<States>,
     EventTag extends TagOf<Events[number]>,
     E,
-    R
-  > {
+    R,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     /** Complete logical configuration captured at the start of this microstep. */
     readonly snapshot: Snapshot<States>
     readonly event: EventByTag<Events, EventTag>
@@ -3729,16 +4000,18 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
-  > {
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     readonly event: LifecycleEvent<Events>
   }
 
   /**
-   * Context passed to an invoked child process source.
+   * Context passed to a function-valued invocation source.
    *
    * @category models
    * @since 0.4.0
@@ -3747,36 +4020,84 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
-  > {
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     readonly event: LifecycleEvent<Events>
   }
 
   /**
-   * Context passed to an invoked child process active snapshot mapper.
+   * Context passed to an invocation's active-snapshot transition.
    *
    * @category models
    * @since 0.4.0
    */
-  export interface InvokeSnapshotContext<State, Error, Output> {
+  export interface InvokeSnapshotContext<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    State,
+    Error,
+    Output,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly id: string
+    readonly state: StateByIdentifier<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
+    readonly target: TargetBuilder<States, StateId>
     readonly snapshot: Extract<RuntimeSnapshot<State, Error, Output>, { readonly status: "active" }>
   }
 
   /**
-   * Context passed to an invoked machine terminal output mapper.
+   * Context passed to an invocation's successful completion transition.
    *
    * @category models
    * @since 0.4.0
    */
-  export interface InvokeDoneContext<Output> {
+  export interface InvokeDoneContext<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    Output,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly id: string
+    readonly state: StateByIdentifier<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
+    readonly snapshot: Snapshot<States>
+    readonly target: TargetBuilder<States, StateId>
     readonly output: Output
   }
 
+  /** Context passed to an invocation typed-failure transition. */
+  export interface InvokeFailureContext<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    Error,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
+    readonly id: string
+    readonly state: StateByIdentifier<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
+    readonly snapshot: Snapshot<States>
+    readonly target: TargetBuilder<States, StateId>
+    readonly error: Error
+  }
+
   /**
    * Context passed to an eventless transition handler.
    *
@@ -3787,11 +4108,13 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
-  > {
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     /** Complete logical configuration captured at the start of this microstep. */
     readonly snapshot: Snapshot<States>
     readonly event: LifecycleEvent<Events>
@@ -3816,11 +4139,13 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
-  > {
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     /** Complete logical configuration captured at the start of this microstep. */
     readonly snapshot: Snapshot<States>
     readonly event: LifecycleEvent<Events>
@@ -3841,13 +4166,15 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    ChoiceId extends ChoiceIdentifier<States>
-  > {
-    readonly parent: StateByIdentifier<
+    ChoiceId extends ChoiceIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > extends ActorContext<InputEvents, ParentEvents> {
+    readonly containingState: StateByIdentifier<
       States,
       Extract<ImmediateParentStateIdentifier<ChoiceId>, StateIdentifier<States>>
     >
-    readonly parents: {
+    readonly ancestors: {
       readonly [Parent in Extract<ParentStateIdentifier<ChoiceId>, ValuedStateIdentifier<States>>]: StateByIdentifier<
         States,
         Parent
@@ -3869,8 +4196,8 @@ export declare namespace Machine {
     StateId extends StateIdentifier<States>
   > {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     readonly event: LifecycleEvent<Events>
   }
 
@@ -3904,8 +4231,8 @@ export declare namespace Machine {
     StateId extends StateIdentifier<States>
   > {
     readonly state: StateByIdentifier<States, StateId>
-    readonly parent: ParentStateValue<States, StateId>
-    readonly parents: ParentStateValues<States, StateId>
+    readonly containingState: ParentStateValue<States, StateId>
+    readonly ancestors: ParentStateValues<States, StateId>
     readonly event: LifecycleEvent<Events>
     readonly outputs: ParallelOutputRegions<States, StateId>
   }
@@ -3939,9 +4266,10 @@ export declare namespace Machine {
    *
    * **Details**
    *
-   * Handlers return snapshots for complete state replacement or target builder
-   * results for path-safe partial transitions. Raw decoded state values are not
-   * accepted at transition boundaries.
+   * Handlers return snapshots for complete state replacement, target builder
+   * results for path-safe partial transitions, or `target.none()` for an
+   * explicitly targetless transition. Raw decoded state values and `void` are
+   * not accepted at transition boundaries.
    *
    * @category utility types
    * @since 0.4.0
@@ -3957,7 +4285,7 @@ export declare namespace Machine {
       | HistoryTarget<States, HistoryIdentifier<States>>
       | ChoiceTarget<States, ChoiceIdentifier<States>>
     >
-    | void
+    | NoTarget
 
   /** A choice resolver must always select a typed target synchronously. */
   export type ChoiceResult<States extends StateSchemas, E, R> =
@@ -4066,7 +4394,41 @@ export declare namespace Machine {
    * @category utility types
    * @since 0.4.0
    */
-  export type InvokeLogic<Invoke> = Invoke extends { readonly src: (...args: any) => infer Logic } ? Logic : never
+  export type InvokeResolvedSource<Source> = Source extends (...args: any) => infer Resolved ? Resolved : Source
+
+  type ChildMachineLogic<Child> = Child extends ChildMachine<string, infer M> ? Logic<
+      Snapshot<States<M>>,
+      EventInput<InputEvent<M>>,
+      Error<M> | ActionError<Services<M>> | InfiniteTransitionError | MachineSchemaDecodeError | StoppedError,
+      ExcludeCompatibleRuntime<
+        Exclude<ExecutionServices<InitialServices<M> | Services<M>>, internalRuntime.MachineRuntime>,
+        Event<M>,
+        Emit<M>
+      >,
+      Output<M>,
+      | InitialError<M>
+      | Error<M>
+      | ActionError<InitialServices<M> | Services<M>>
+      | InfiniteTransitionError
+      | MachineSchemaDecodeError
+      | StartupError
+      | StoppedError
+    >
+    : never
+
+  export type InvokeLogic<Invoke> = Invoke extends { readonly effect: infer Source } ?
+    InvokeResolvedSource<Source> extends infer Fx extends Effect.Effect<any, any, any> ? Logic<
+        void,
+        never,
+        Effect.Error<Fx>,
+        Effect.Services<Fx>,
+        Effect.Success<Fx>
+      >
+    : never
+    : Invoke extends { readonly after: unknown } ? Logic<void, never, never, never, void>
+    : Invoke extends { readonly logic: infer Source } ? InvokeResolvedSource<Source>
+    : Invoke extends { readonly child: infer Child } ? ChildMachineLogic<Child>
+    : never
   /**
    * Extracts the startup error from an invoke source child process logic.
    *
@@ -4118,19 +4480,24 @@ export declare namespace Machine {
    * @since 0.4.0
    */
   export type InvokeEmits<Invoke> = Invoke extends {
-    readonly [InvokeTypeId]: { readonly emits: Types.Covariant<infer Emits> }
-  } ? Emits :
-    never
-  /**
-   * Extracts events returned by an invoked child snapshot mapper.
-   *
-   * @category utility types
-   * @since 0.4.0
-   */
-  export type InvokeSnapshotEvent<Invoke> = Invoke extends {
-    readonly [InvokeTypeId]: { readonly snapshotEvent: Types.Covariant<infer Event> }
-  } ? Event :
-    never
+    readonly [InvokeTypeId]: { readonly emits: Types.Covariant<infer Emitted> }
+  } ? Emitted
+    : Invoke extends { readonly child: ChildMachine<string, infer M> } ? Emit<M>
+    : never
+
+  /** Public parent inputs required by an invoked child machine. */
+  export type InvokeParentEvents<Invoke> = Invoke extends {
+    readonly [InvokeTypeId]: { readonly parentEvents: Types.Covariant<infer ParentEvent> }
+  } ? ParentEvent
+    : IsAny<Invoke> extends true ? never
+    : Invoke extends { readonly child: ChildMachine<string, infer M> } ? EventOf<ParentEvents<M>>
+    : never
+  /** Extracts transition results returned by invocation lifecycle handlers. */
+  export type InvokeOutcomeReturn<Invoke> = Invoke extends unknown ?
+      | (Invoke extends { readonly onDone?: infer Handler } ? EventTransitionReturn<NonNullable<Handler>> : never)
+      | (Invoke extends { readonly onFailure?: infer Handler } ? EventTransitionReturn<NonNullable<Handler>> : never)
+      | (Invoke extends { readonly onSnapshot?: infer Handler } ? EventTransitionReturn<NonNullable<Handler>> : never)
+    : never
   /**
    * Extracts the parent transition error contribution from invoked children.
    *
@@ -4138,7 +4505,10 @@ export declare namespace Machine {
    * @since 0.4.0
    */
   export type InvokeError<Config> = [InvokeReturn<Config>] extends [never] ? never
-    : ChildAlreadyExistsError | InvokeInitialError<InvokeReturn<Config>> | InvokeRuntimeError<InvokeReturn<Config>>
+    :
+      | ChildAlreadyExistsError
+      | InvokeInitialError<InvokeReturn<Config>>
+      | Effect.Error<InvokeOutcomeReturn<InvokeReturn<Config>>>
   /**
    * Extracts the parent service requirement contribution from invoked children.
    *
@@ -4146,7 +4516,12 @@ export declare namespace Machine {
    * @since 0.4.0
    */
   export type InvokeRequirements<Config> = [InvokeReturn<Config>] extends [never] ? never
-    : MachineRuntimeRequirement | InvokeServices<InvokeReturn<Config>>
+    :
+      | MachineRuntimeRequirement
+      | InvokeServices<InvokeReturn<Config>>
+      | Effect.Services<
+        InvokeOutcomeReturn<InvokeReturn<Config>>
+      >
   /**
    * Extracts the return value from an eventless transition.
    *
@@ -4192,128 +4567,459 @@ export declare namespace Machine {
     | Effect.Services<ChoiceReturn<Config>>
     | InvokeRequirements<Config>
 
-  /**
-   * Configuration for invoking a child process while a state is active.
-   *
-   * @category models
-   * @since 0.4.0
-   */
-  export interface InvokeConfig<
+  export type InvokeTransition<
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>,
-    Event,
-    ChildState,
-    ChildEvent,
-    ChildError,
-    ChildRequirements,
-    ChildOutput,
-    ChildInitialError,
-    ChildEmits = never,
-    DeliveredOutput = ChildOutput
-  > {
-    readonly [InvokeTypeId]: {
-      readonly output: Types.Covariant<DeliveredOutput>
-      readonly emits: Types.Covariant<ChildEmits>
-      readonly snapshotEvent: Types.Covariant<Event>
-      readonly error: Types.Covariant<ChildError>
-      readonly requirements: Types.Covariant<ChildRequirements>
-      readonly initialError: Types.Covariant<ChildInitialError>
+    Context
+  > =
+    | ((context: Context, enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>) => HandlerResult<States, any, any>)
+    | {
+      readonly reenter?: boolean
+      readonly targets?: ReadonlyArray<StateNodeIdentifier<States>>
+      readonly transition: (
+        context: Context,
+        enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
+      ) => HandlerResult<States, any, any>
     }
-    /** @internal Serializable descriptor metadata used by inspection. */
-    readonly [Activities.ActivityMetadataTypeId]?: Activities.StaticActivityMetadata
-    readonly id: string
-    /**
-     * Optional parent-local address for sending events to this invocation.
-     *
-     * The invocation `id` is only its state-local lifecycle key. Use an
-     * explicit typed address when the parent must communicate with it.
-     */
-    readonly address?: string
-    /** @internal */
-    readonly descriptor?: ChildMachine.Any
-    src(): Logic<
-      ChildState,
-      ChildEvent,
-      ChildError,
-      ChildRequirements,
-      ChildOutput,
-      ChildInitialError
-    >
-    snapshot?(
-      context: InvokeSnapshotContext<ChildState, ChildError, ChildOutput>
-    ): Event | undefined
-    onDone?(context: InvokeDoneContext<ChildOutput>): DeliveredOutput | undefined
+
+  export type InvokeSource<Value, Context> = Value | ((context: Context) => Value)
+
+  interface AnyLogicSource {
+    initial(...args: ReadonlyArray<any>): Effect.Effect<any, any, any>
+    run(...args: ReadonlyArray<any>): Effect.Effect<any, any, any>
   }
 
-  /** @internal */
-  export interface AnyInvokeConfig<
-    Output = unknown,
-    Error = unknown,
-    Requirements = unknown,
-    InitialError = unknown,
-    Emits = never,
-    SnapshotEvent = never
+  /** Inline state-owned work that runs for the lifetime of its active state. */
+  export interface InvokeOwned<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>
   > {
+    readonly "~effect/Machine/InvokeOwner"?: Types.Covariant<readonly [States, Events, Emits, StateId]>
+  }
+
+  /** Type evidence retained by {@link invoke} without affecting runtime data. */
+  export interface InvokeTyped<Output, Error, Requirements, InitialError, Emits = never, ParentEvent = never> {
     readonly [InvokeTypeId]: {
       readonly output: Types.Covariant<Output>
-      readonly emits: Types.Covariant<Emits>
-      readonly snapshotEvent: Types.Covariant<SnapshotEvent>
       readonly error: Types.Covariant<Error>
       readonly requirements: Types.Covariant<Requirements>
       readonly initialError: Types.Covariant<InitialError>
+      readonly emits: Types.Covariant<Emits>
+      readonly parentEvents: Types.Covariant<ParentEvent>
     }
   }
 
-  interface InvokeDefinitionValue {
-    readonly [InvokeTypeId]: unknown
-  }
+  export type InvokeConfig<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>
+  > =
+    & InvokeOwned<States, Events, Emits, StateId>
+    & (
+      | {
+        readonly id: string
+        readonly effect: InvokeSource<Effect.Effect<any, any, any>, InvokeContext<States, Events, Emits, StateId>>
+        readonly after?: never
+        readonly logic?: never
+        readonly child?: never
+        readonly address?: never
+        readonly onDone?: unknown
+        readonly onFailure?: unknown
+        readonly onSnapshot?: never
+      }
+      | {
+        readonly id: string
+        readonly after: InvokeSource<Duration.Input, InvokeContext<States, Events, Emits, StateId>>
+        readonly effect?: never
+        readonly logic?: never
+        readonly child?: never
+        readonly address?: never
+        readonly onDone: unknown
+        readonly onFailure?: never
+        readonly onSnapshot?: never
+      }
+      | {
+        readonly id: string
+        readonly address: string
+        readonly logic: InvokeSource<AnyLogicSource, InvokeContext<States, Events, Emits, StateId>>
+        readonly effect?: never
+        readonly after?: never
+        readonly child?: never
+        readonly onDone?: unknown
+        readonly onFailure?: unknown
+        readonly onSnapshot?: unknown
+      }
+      | {
+        readonly child: ChildMachine.Any
+        readonly input?: {} | null | ((context: InvokeContext<States, Events, Emits, StateId>) => unknown)
+        readonly id?: never
+        readonly address?: never
+        readonly effect?: never
+        readonly after?: never
+        readonly logic?: never
+        readonly onDone?: unknown
+        readonly onFailure?: unknown
+        readonly onSnapshot?: unknown
+      }
+    )
 
-  /**
-   * State-bound configuration for invoked child processes.
-   *
-   * **Details**
-   *
-   * A function form receives the owning state's typed value and lifecycle
-   * event before constructing one or more invoke configurations.
-   *
-   * @category models
-   * @since 0.4.0
-   */
+  /** State-bound inline invocation configuration. */
   export type InvokeDefinition<
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateIdentifier<States>
   > =
-    | InvokeDefinitionValue
-    | ReadonlyArray<InvokeDefinitionValue>
-    | ((context: InvokeContext<States, Events, Emits, StateId>) =>
-      | InvokeDefinitionValue
-      | ReadonlyArray<InvokeDefinitionValue>)
+    | InvokeConfig<States, Events, Emits, StateId>
+    | ReadonlyArray<InvokeConfig<States, Events, Emits, StateId>>
 
-  type OutputHandlerConfig<
+  type InvokeHandlerRequirement<Value, Handler> = IsAny<Value> extends true ? { readonly handler: Handler }
+    : [Value] extends [never] ? { readonly handler?: never }
+    : { readonly handler: Handler }
+
+  export type InvokeDoneRequirement<Value, Handler> = InvokeHandlerRequirement<Value, Handler> extends
+    infer Requirement ? Requirement extends { readonly handler: infer Required } ? { readonly onDone: Required }
+    : { readonly onDone?: never }
+    : never
+
+  export type InvokeFailureRequirement<Value, Handler> = InvokeHandlerRequirement<Value, Handler> extends
+    infer Requirement ? Requirement extends { readonly handler: infer Required } ? { readonly onFailure: Required }
+    : { readonly onFailure?: never }
+    : never
+
+  export type EffectInvokeArgs<
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateIdentifier<States>,
-    Context
-  > = NodeByIdentifier<States, StateId> extends { readonly output: Schema.Top } ? {
-      readonly output: (context: Context) => OutputByIdentifier<States, StateId>
-    }
-    : {
-      readonly output?: never
+    Fx extends Effect.Effect<any, any, any>,
+    Source = Fx
+  > =
+    & {
+      readonly id: InvokeLifecycleId
+      readonly effect: Source
+      readonly after?: never
+      readonly logic?: never
+      readonly child?: never
+      readonly address?: never
+      readonly onSnapshot?: never
     }
+    & InvokeDoneRequirement<
+      Effect.Success<NoInfer<Fx>>,
+      InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeDoneContext<States, Events, Emits, StateId, Effect.Success<NoInfer<Fx>>>
+      >
+    >
+    & InvokeFailureRequirement<
+      Effect.Error<NoInfer<Fx>>,
+      InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeFailureContext<States, Events, Emits, StateId, Effect.Error<NoInfer<Fx>>>
+      >
+    >
 
-  type ActiveOutputHandlerConfig<
+  export type TimerInvokeArgs<
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateIdentifier<States>
-  > = NodeByIdentifier<States, StateId> extends { readonly type: "parallel" } ? OutputHandlerConfig<
+  > = {
+    readonly id: InvokeLifecycleId
+    readonly after: InvokeSource<Duration.Input, InvokeContext<States, Events, Emits, StateId>>
+    readonly effect?: never
+    readonly logic?: never
+    readonly child?: never
+    readonly address?: never
+    readonly onFailure?: never
+    readonly onSnapshot?: never
+    readonly onDone: InvokeTransition<
       States,
       Events,
-      StateId,
-      ParallelOutputContext<States, Events, StateId>
+      Emits,
+      InvokeDoneContext<States, Events, Emits, StateId, void>
+    >
+  }
+
+  export type LogicInvokeArgs<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    ChildState,
+    ChildEvent,
+    ChildError,
+    ChildRequirements,
+    ChildOutput,
+    ChildInitialError,
+    Address extends ChildAddress<never>,
+    Source = Logic<ChildState, ChildEvent, ChildError, ChildRequirements, ChildOutput, ChildInitialError>
+  > =
+    & {
+      readonly id: InvokeLifecycleId
+      readonly address: Address & ChildAddress.Compatibility<Address, ChildEvent>
+      readonly logic: Source
+      readonly effect?: never
+      readonly after?: never
+      readonly child?: never
+      readonly onSnapshot?: InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeSnapshotContext<States, Events, Emits, StateId, ChildState, ChildError, ChildOutput>
+      >
+    }
+    & InvokeDoneRequirement<
+      ChildOutput,
+      InvokeTransition<States, Events, Emits, InvokeDoneContext<States, Events, Emits, StateId, ChildOutput>>
+    >
+    & InvokeFailureRequirement<
+      ChildError,
+      InvokeTransition<States, Events, Emits, InvokeFailureContext<States, Events, Emits, StateId, ChildError>>
+    >
+
+  export type ChildInvokeArgs<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    ChildDefinition extends Machine.Any,
+    Child extends ChildMachine<string, ChildDefinition>
+  > =
+    & {
+      readonly child:
+        & Child
+        & (ChildDefinition extends EnsureExecutable<
+          Machine.States<ChildDefinition>,
+          Machine.UnhandledStates<ChildDefinition>,
+          Machine.OutputStates<ChildDefinition>
+        > ? unknown :
+          never)
+      readonly id?: never
+      readonly address?: never
+      readonly effect?: never
+      readonly after?: never
+      readonly logic?: never
+      readonly onSnapshot?: InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeSnapshotContext<
+          States,
+          Events,
+          Emits,
+          StateId,
+          Snapshot<Machine.States<ChildDefinition>>,
+          Error<ChildDefinition>,
+          Output<ChildDefinition>
+        >
+      >
+    }
+    & (Input<ChildDefinition> extends typeof Schema.Void ? { readonly input?: never } : {
+      readonly input: InvokeSource<Input<ChildDefinition>["Type"], InvokeContext<States, Events, Emits, StateId>>
+    })
+    & InvokeDoneRequirement<
+      Output<ChildDefinition>,
+      InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeDoneContext<States, Events, Emits, StateId, Output<ChildDefinition>>
+      >
+    >
+    & InvokeFailureRequirement<
+      Error<ChildDefinition> | ActionError<Services<ChildDefinition>>,
+      InvokeTransition<
+        States,
+        Events,
+        Emits,
+        InvokeFailureContext<
+          States,
+          Events,
+          Emits,
+          StateId,
+          Error<ChildDefinition> | ActionError<Services<ChildDefinition>>
+        >
+      >
+    >
+
+  export type LogicStateOf<Value> = Value extends Logic<infer State, any, any, any, any, any> ? State : never
+  export type LogicEventOf<Value> = Value extends Logic<any, infer Event, any, any, any, any> ? Event : never
+  export type LogicErrorOf<Value> = Value extends Logic<any, any, infer Error, any, any, any> ? Error : never
+  export type LogicServicesOf<Value> = Value extends Logic<any, any, any, infer Services, any, any> ? Services : never
+  export type LogicOutputOf<Value> = Value extends Logic<any, any, any, any, infer Output, any> ? Output : never
+  export type LogicInitialErrorOf<Value> = Value extends Logic<any, any, any, any, any, infer Error> ? Error : never
+
+  type ContextualInvokeConfig<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    Raw
+  > = Raw extends InvokeTyped<any, any, any, any, any> ? unknown
+    : Raw extends { readonly effect: infer Source } ?
+      InvokeResolvedSource<Source> extends infer Fx extends Effect.Effect<any, any, any> ?
+          & InvokeDoneRequirement<
+            Effect.Success<Fx>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeDoneContext<States, Events, Emits, StateId, Effect.Success<Fx>>
+            >
+          >
+          & InvokeFailureRequirement<
+            Effect.Error<Fx>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeFailureContext<States, Events, Emits, StateId, Effect.Error<Fx>>
+            >
+          >
+          & { readonly onSnapshot?: never }
+      : never
+    : Raw extends { readonly after: unknown } ? {
+        readonly onDone: InvokeTransition<
+          States,
+          Events,
+          Emits,
+          InvokeDoneContext<States, Events, Emits, StateId, void>
+        >
+        readonly onFailure?: never
+        readonly onSnapshot?: never
+      }
+    : Raw extends { readonly logic: infer Source; readonly address: infer Address } ?
+      InvokeResolvedSource<Source> extends infer ChildLogic extends Logic<any, any, any, any, any, any> ?
+          & InvokeDoneRequirement<
+            InvokeOutput<Raw>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeDoneContext<States, Events, Emits, StateId, InvokeOutput<Raw>>
+            >
+          >
+          & InvokeFailureRequirement<
+            InvokeRuntimeError<Raw>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeFailureContext<States, Events, Emits, StateId, InvokeRuntimeError<Raw>>
+            >
+          >
+          & {
+            readonly address:
+              & ChildAddress<never>
+              & ChildAddress.Compatibility<
+                Address,
+                ChildLogic extends Logic<any, infer ChildEvent, any, any, any, any> ? ChildEvent : never
+              >
+            readonly onSnapshot?: InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeSnapshotContext<
+                States,
+                Events,
+                Emits,
+                StateId,
+                ChildLogic extends Logic<infer ChildState, any, any, any, any, any> ? ChildState : never,
+                InvokeRuntimeError<Raw>,
+                InvokeOutput<Raw>
+              >
+            >
+          }
+      : never
+    : Raw extends { readonly child: infer Child extends ChildMachine<string, infer ChildDefinition> } ?
+      ChildMachineLogic<Child> extends infer ChildLogic extends Logic<any, any, any, any, any, any> ?
+          & InvokeDoneRequirement<
+            Output<ChildDefinition>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeDoneContext<States, Events, Emits, StateId, Output<ChildDefinition>>
+            >
+          >
+          & InvokeFailureRequirement<
+            Error<ChildDefinition> | ActionError<Services<ChildDefinition>>,
+            InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeFailureContext<
+                States,
+                Events,
+                Emits,
+                StateId,
+                Error<ChildDefinition> | ActionError<Services<ChildDefinition>>
+              >
+            >
+          >
+          & (Input<ChildDefinition> extends typeof Schema.Void ? { readonly input?: never } : {
+            readonly input: InvokeSource<Input<ChildDefinition>["Type"], InvokeContext<States, Events, Emits, StateId>>
+          })
+          & {
+            readonly onSnapshot?: InvokeTransition<
+              States,
+              Events,
+              Emits,
+              InvokeSnapshotContext<
+                States,
+                Events,
+                Emits,
+                StateId,
+                Snapshot<Machine.States<ChildDefinition>>,
+                Error<ChildDefinition>,
+                Output<ChildDefinition>
+              >
+            >
+          }
+      : never
+    : never
+
+  type ContextualInvokeDefinition<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    Raw
+  > = Raw extends ReadonlyArray<any> ? {
+      readonly [Index in keyof Raw]: ContextualInvokeConfig<States, Events, Emits, StateId, Raw[Index]>
+    }
+    : ContextualInvokeConfig<States, Events, Emits, StateId, Raw>
+
+  type OutputHandlerConfig<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>,
+    Context
+  > = NodeByIdentifier<States, StateId> extends { readonly output: Schema.Top } ? {
+      readonly output: (context: Context) => OutputByIdentifier<States, StateId>
+    }
+    : {
+      readonly output?: never
+    }
+
+  type ActiveOutputHandlerConfig<
+    States extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    StateId extends StateIdentifier<States>
+  > = NodeByIdentifier<States, StateId> extends { readonly type: "parallel" } ? OutputHandlerConfig<
+      States,
+      Events,
+      StateId,
+      ParallelOutputContext<States, Events, StateId>
     >
     : {
       readonly output?: never
@@ -4331,64 +5037,66 @@ export declare namespace Machine {
     Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateIdentifier<States>,
     E,
-    R
+    R,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
   > = {
     readonly entry?: (
-      context: StateActionContext<States, Events, Emits, StateId>,
+      context: StateActionContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
       enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
     ) => StateActionResult<any, any>
     readonly exit?: (
-      context: StateActionContext<States, Events, Emits, StateId>,
+      context: StateActionContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
       enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
     ) => StateActionResult<any, any>
     readonly invoke?: InvokeDefinition<States, Events, Emits, StateId>
     readonly always?:
       | ((
-        context: AlwaysContext<States, Events, Emits, StateId>,
+        context: AlwaysContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
         enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
       ) => HandlerResult<States, any, any>)
       | {
         /** Statically declared upper bound of possible target paths. */
         readonly targets?: ReadonlyArray<StateNodeIdentifier<States>>
         readonly transition: (
-          context: AlwaysContext<States, Events, Emits, StateId>,
+          context: AlwaysContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
           enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
         ) => HandlerResult<States, any, any>
       }
     readonly onDone?:
       | ((
-        context: DoneContext<States, Events, Emits, StateId>,
+        context: DoneContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
         enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
       ) => HandlerResult<States, any, any>)
       | {
         /** Statically declared upper bound of possible target paths. */
         readonly targets?: ReadonlyArray<StateNodeIdentifier<States>>
         readonly transition: (
-          context: DoneContext<States, Events, Emits, StateId>,
+          context: DoneContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
           enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
         ) => HandlerResult<States, any, any>
       }
     readonly on?: {
       readonly [EventTag in TagOf<Events[number]>]?:
         | ((
-          context: HandlerContext<States, Events, Emits, StateId, EventTag, E, R>,
+          context: HandlerContext<States, Events, Emits, StateId, EventTag, E, R, InputEvents, ParentEvents>,
           enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
         ) => HandlerResult<States, any, any>)
         | {
           readonly reenter?: boolean
           /**
            * Upper bound of state or history paths this handler may target.
-           * Returning `void` is always permitted. Declaring a parent state also
+           * Returning `target.none()` is always permitted. Declaring a parent state also
            * permits concrete descendant targets below it.
            */
           readonly targets?: ReadonlyArray<StateNodeIdentifier<States>>
           readonly transition: (
-            context: HandlerContext<States, Events, Emits, StateId, EventTag, E, R>,
+            context: HandlerContext<States, Events, Emits, StateId, EventTag, E, R, InputEvents, ParentEvents>,
             enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
           ) => HandlerResult<States, any, any>
         }
     }
-    readonly initial?: StateInitialHandler<States, Events, Emits, StateId>
+    readonly initial?: StateInitialHandler<States, Events, Emits, StateId, InputEvents, ParentEvents>
   } & ActiveOutputHandlerConfig<States, Events, StateId>
 
   /** Values supplied when a statechart implicitly enters a state's initial children. */
@@ -4413,17 +5121,21 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
-  > = StateActionContext<States, Events, Emits, StateId>
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
+  > = StateActionContext<States, Events, Emits, StateId, InputEvents, ParentEvents>
 
   /** Initial child value implementation for a compound or parallel state. */
   export type StateInitialHandler<
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
   > = (
-    context: StateInitialContext<States, Events, Emits, StateId>,
+    context: StateInitialContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
     enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
   ) => StateInitialValue<States, StateId>
 
@@ -4436,7 +5148,7 @@ export declare namespace Machine {
   > {
     readonly event: LifecycleEvent<Events>
     readonly target: HistoryDefaultTargetBuilder<States, ParentId>
-    readonly parent: ParentId
+    readonly owner: ParentId
   }
 
   /**
@@ -4476,13 +5188,15 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    ChoiceId extends ChoiceIdentifier<States>
+    ChoiceId extends ChoiceIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
   > {
     readonly choice: {
       /** Statically inspectable upper bound of every possible target. */
       readonly targets: readonly [StateNodeIdentifier<States>, ...ReadonlyArray<StateNodeIdentifier<States>>]
       readonly transition: (
-        context: ChoiceContext<States, Events, Emits, ChoiceId>,
+        context: ChoiceContext<States, Events, Emits, ChoiceId, InputEvents, ParentEvents>,
         enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
       ) => ChoiceResult<States, any, any>
     }
@@ -4506,10 +5220,12 @@ export declare namespace Machine {
     States extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
-    StateId extends StateIdentifier<States>
+    StateId extends StateIdentifier<States>,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
   > = {
     readonly entry?: (
-      context: StateActionContext<States, Events, Emits, StateId>,
+      context: StateActionContext<States, Events, Emits, StateId, InputEvents, ParentEvents>,
       enqueue: Enqueue<EventOf<Events>, EmitOf<Emits>>
     ) => StateActionResult<any, any>
     readonly exit?: never
@@ -4530,10 +5246,12 @@ export declare namespace Machine {
     Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateIdentifier<States>,
     E,
-    R
+    R,
+    InputEvents extends ReadonlyArray<TaggedSchema> = Events,
+    ParentEvents extends ReadonlyArray<TaggedSchema> = readonly []
   > = NodeByIdentifier<States, StateId> extends { readonly type: "final" } ?
-    FinalStateConfig<States, Events, Emits, StateId>
-    : ActiveStateConfig<States, Events, Emits, StateId, E, R>
+    FinalStateConfig<States, Events, Emits, StateId, InputEvents, ParentEvents>
+    : ActiveStateConfig<States, Events, Emits, StateId, E, R, InputEvents, ParentEvents>
 
   type HandlerNodeConfig<
     States extends StateSchemas,
@@ -4541,9 +5259,11 @@ export declare namespace Machine {
     Emits extends ReadonlyArray<TaggedSchema>,
     Path extends StateNodeIdentifier<States>,
     E,
-    R
-  > = Path extends ChoiceIdentifier<States> ? ChoiceStateConfig<States, Events, Emits, Path>
-    : Path extends StateIdentifier<States> ? HandlerConfig<States, Events, Emits, Path, E, R>
+    R,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>
+  > = Path extends ChoiceIdentifier<States> ? ChoiceStateConfig<States, Events, Emits, Path, InputEvents, ParentEvents>
+    : Path extends StateIdentifier<States> ? HandlerConfig<States, Events, Emits, Path, E, R, InputEvents, ParentEvents>
     : never
 
   type HandlerChildren<Node> = Node extends { readonly states: infer Children extends StateSchemas } ? Children : never
@@ -4577,6 +5297,39 @@ export declare namespace Machine {
     : Path extends keyof Config ? Config[Path]
     : never
 
+  type HandlerInvokeContextAtPath<
+    AllStates extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    Config,
+    StateId extends StateNodeIdentifier<AllStates>,
+    NodeConfig = HandlerConfigAtPath<Config, StateId>
+  > = StateId extends StateIdentifier<AllStates> ?
+    NodeConfig extends { readonly invoke: infer Invoke } ? HandlerValidationAtPath<
+        StateId,
+        { readonly invoke: ContextualInvokeDefinition<AllStates, Events, Emits, StateId, Invoke> }
+      >
+    : unknown
+    : unknown
+
+  type HandlerInvokeContexts<
+    AllStates extends StateSchemas,
+    Events extends ReadonlyArray<TaggedSchema>,
+    Emits extends ReadonlyArray<TaggedSchema>,
+    Config
+  > = Types.UnionToIntersection<
+    StateNodeIdentifier<AllStates> extends infer StateId extends StateNodeIdentifier<AllStates> ?
+      StateId extends StateNodeIdentifier<AllStates> ? HandlerInvokeContextAtPath<
+          AllStates,
+          Events,
+          Emits,
+          Config,
+          StateId
+        >
+      : never
+      : never
+  >
+
   // Rebuild the public nested handler shape so branded validation errors stay
   // attached to the exact property that introduced them.
   type HandlerValidationAtPath<Path extends string, Validation> = Path extends `${infer Head}.${infer Rest}` ? {
@@ -4593,9 +5346,11 @@ export declare namespace Machine {
     Emits extends ReadonlyArray<TaggedSchema>,
     E,
     R,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>,
     StateId extends StateNodeIdentifier<AllStates>
   > =
-    & HandlerNodeConfig<AllStates, Events, Emits, StateId, E, R>
+    & HandlerNodeConfig<AllStates, Events, Emits, StateId, E, R, InputEvents, ParentEvents>
     & (StateId extends ChoiceIdentifier<AllStates> ? {
         readonly states?: never
         readonly history?: never
@@ -4612,6 +5367,8 @@ export declare namespace Machine {
             Emits,
             E,
             R,
+            InputEvents,
+            ParentEvents,
             Extract<StateId, StateIdentifier<AllStates>>
           >
           readonly history?: HistoryDefaultConfig<
@@ -4634,6 +5391,8 @@ export declare namespace Machine {
     Emits extends ReadonlyArray<TaggedSchema>,
     E,
     R,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>,
     Prefix extends string
   > = {
     readonly [Key in ActiveStateKey<States> | ChoiceStateKey<States>]?: HandlerNode<
@@ -4643,6 +5402,8 @@ export declare namespace Machine {
       Emits,
       E,
       R,
+      InputEvents,
+      ParentEvents,
       HandlerNodeId<AllStates, JoinPath<Prefix, Key>>
     >
   }
@@ -4877,6 +5638,7 @@ export declare namespace Machine {
     AllStates extends StateSchemas,
     Node,
     Events extends ReadonlyArray<TaggedSchema>,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
     StateId extends StateNodeIdentifier<AllStates>,
     Config,
@@ -4891,9 +5653,7 @@ export declare namespace Machine {
         & HandlerOnTargetValidation<StateId, Config>
         & HandlerDirectTargetValidation<StateId, Config, "always">
         & HandlerDirectTargetValidation<StateId, Config, "onDone">
-        & HandlerInvokeOutputValidation<Events, StateId, Config>
-        & HandlerInvokeEmitsValidation<Events, StateId, Config>
-        & HandlerInvokeSnapshotValidation<Events, StateId, Config>
+        & HandlerInvokeParentEventsValidation<InputEvents, StateId, Config>
         & HandlerChildrenValidation<Node, StateId, Config>
         & HandlerOutputRequirementValidation<AllStates, StateId, AvailableOutputStates, Config>
         & HandlerRuntimeValidation<Events, Emits, StateId, Config>
@@ -4922,46 +5682,17 @@ export declare namespace Machine {
     }
     : unknown
 
-  type HandlerInvokeOutputValidation<
-    Events extends ReadonlyArray<TaggedSchema>,
-    StateId extends string,
-    Config
-  > = [InvokeReturn<Config>] extends [never] ? unknown
-    : [Exclude<InvokeOutput<InvokeReturn<Config>>, EventOf<Events> | void>] extends [never] ? unknown
-    : {
-      readonly invoke: HandlerValidationError<
-        "Invoked child output must be a machine event or void",
-        StateId,
-        Exclude<InvokeOutput<InvokeReturn<Config>>, EventOf<Events> | void>
-      >
-    }
-
-  type HandlerInvokeEmitsValidation<
-    Events extends ReadonlyArray<TaggedSchema>,
-    StateId extends string,
-    Config
-  > = [InvokeReturn<Config>] extends [never] ? unknown
-    : [Exclude<InvokeEmits<InvokeReturn<Config>>, EventOf<Events>>] extends [never] ? unknown
-    : {
-      readonly invoke: HandlerValidationError<
-        "Invoked child emits events not accepted by the parent machine",
-        StateId,
-        Exclude<InvokeEmits<InvokeReturn<Config>>, EventOf<Events>>
-      >
-    }
-
-  type HandlerInvokeSnapshotValidation<
+  type HandlerInvokeParentEventsValidation<
     Events extends ReadonlyArray<TaggedSchema>,
     StateId extends string,
     Config
   > = [InvokeReturn<Config>] extends [never] ? unknown
-    : IsAny<InvokeSnapshotEvent<InvokeReturn<Config>>> extends true ? unknown
-    : [Exclude<InvokeSnapshotEvent<InvokeReturn<Config>>, EventOf<Events> | undefined>] extends [never] ? unknown
+    : [Exclude<InvokeParentEvents<InvokeReturn<Config>>, EventOf<Events>>] extends [never] ? unknown
     : {
       readonly invoke: HandlerValidationError<
-        "Invoked child snapshot mapper must return a machine event or undefined",
+        "Invoked child expects parent events not accepted by this machine",
         StateId,
-        Exclude<InvokeSnapshotEvent<InvokeReturn<Config>>, EventOf<Events> | undefined>
+        Exclude<InvokeParentEvents<InvokeReturn<Config>>, EventOf<Events>>
       >
     }
 
@@ -4981,6 +5712,7 @@ export declare namespace Machine {
   type HandlerNodeValidationAtPath<
     AllStates extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
     Config,
     AvailableOutputStates extends StateIdentifier<AllStates>,
@@ -4991,6 +5723,7 @@ export declare namespace Machine {
       AllStates,
       HandlerNodeByPath<AllStates, StateId>,
       Events,
+      InputEvents,
       Emits,
       StateId,
       NodeConfig,
@@ -5002,6 +5735,7 @@ export declare namespace Machine {
   type HandlerTreeNodeValidations<
     AllStates extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
     Config,
     AvailableOutputStates extends StateIdentifier<AllStates>
@@ -5010,6 +5744,7 @@ export declare namespace Machine {
       StateId extends StateNodeIdentifier<AllStates> ? HandlerNodeValidationAtPath<
           AllStates,
           Events,
+          InputEvents,
           Emits,
           Config,
           AvailableOutputStates,
@@ -5022,12 +5757,13 @@ export declare namespace Machine {
   type HandlerTreeValidation<
     AllStates extends StateSchemas,
     Events extends ReadonlyArray<TaggedSchema>,
+    InputEvents extends ReadonlyArray<TaggedSchema>,
     Emits extends ReadonlyArray<TaggedSchema>,
     Config,
     AvailableOutputStates extends StateIdentifier<AllStates>
   > =
     & HandlerUnknownStateKeyValidation<AllStates, "", Config>
-    & HandlerTreeNodeValidations<AllStates, Events, Emits, Config, AvailableOutputStates>
+    & HandlerTreeNodeValidations<AllStates, Events, InputEvents, Emits, Config, AvailableOutputStates>
 
   type HandlerHasRequiredInitial<
     AllStates extends StateSchemas,
@@ -5123,6 +5859,7 @@ export declare namespace Machine {
     Output,
     OutputStates extends StateIdentifier<AllStates>,
     InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>,
     Config
   > = Machine<
     AllStates,
@@ -5141,7 +5878,8 @@ export declare namespace Machine {
     Output,
     Emits,
     OutputStates | Extract<HandlerTreeEvidence<AllStates, Config>["outputState"], StateIdentifier<AllStates>>,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >
 
   /**
@@ -5163,14 +5901,29 @@ export declare namespace Machine {
     FinalStates extends StateIdentifier<States>,
     Output,
     OutputStates extends StateIdentifier<States>,
-    InputEvents extends ReadonlyArray<TaggedSchema>
+    InputEvents extends ReadonlyArray<TaggedSchema>,
+    ParentEvents extends ReadonlyArray<TaggedSchema>
   > {
-    <const Config extends HandlerTree<States, States, Events, Emits, E, R, "">>(
+    <
+      const Config extends HandlerTree<
+        States,
+        States,
+        Events,
+        Emits,
+        E,
+        R,
+        InputEvents,
+        ParentEvents,
+        ""
+      >
+    >(
       config:
         & Config
+        & HandlerInvokeContexts<States, Events, Emits, NoInfer<Config>>
         & HandlerTreeValidation<
           States,
           Events,
+          InputEvents,
           Emits,
           NoInfer<Config>,
           | OutputStates
@@ -5193,6 +5946,7 @@ export declare namespace Machine {
       Output,
       OutputStates,
       InputEvents,
+      ParentEvents,
       Config
     >
   }
@@ -5344,7 +6098,8 @@ export const isFinal: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine: Machine<
     States,
@@ -5359,10 +6114,11 @@ export const isFinal: <
     Output,
     Emits,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >,
   state: Machine.Snapshot<States>
-) => state is Machine.SnapshotContainingFinal<States, FinalStates> = internal.isFinal
+) => state is Machine.SnapshotContainingFinal<States, FinalStates> = internal.isFinal as any
 
 /**
  * Defines a state tree while preserving literal state paths.
@@ -5392,7 +6148,7 @@ export const isFinal: <
  *
  * Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.idle.from()
  * })
  * ```
@@ -5409,18 +6165,22 @@ type MakeConfig<
   Input extends Schema.Top,
   InitialE,
   InitialR,
-  InternalEvents extends ReadonlyArray<Machine.TaggedSchema>
+  InternalEvents extends ReadonlyArray<Machine.TaggedSchema>,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema>
 > = {
   readonly id?: string
   readonly states: States & DefineStateTreeInput<NoInfer<States>>
-  readonly events: InputEvents & ValidateInputEventProtocol<NoInfer<InputEvents>>
+  readonly events:
+    & Machine.EventProtocol<"public", InputEvents>
+    & ValidateInputEventProtocol<NoInfer<InputEvents>>
   readonly internalEvents?:
-    & InternalEvents
+    & Machine.EventProtocol<"internal", InternalEvents>
     & ValidateInternalEventProtocol<
       NoInfer<InputEvents>,
       NoInfer<InternalEvents>
     >
-  readonly emits?: Emits
+  readonly emittedEvents?: Machine.EventProtocol<"emitted", Emits>
+  readonly parentEvents?: Machine.EventProtocol<"public", ParentEvents>
   readonly input?: Input
   readonly initial: (...args: [...Machine.InputArgs<Input>]) => Machine.InitialResult<States, InitialE, InitialR>
 }
@@ -5432,7 +6192,8 @@ type MakeResult<
   Input extends Schema.Top,
   InitialE,
   InitialR,
-  InternalEvents extends ReadonlyArray<Machine.TaggedSchema>
+  InternalEvents extends ReadonlyArray<Machine.TaggedSchema>,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema>
 > = Machine<
   States,
   readonly [...InputEvents, ...InternalEvents],
@@ -5446,7 +6207,8 @@ type MakeResult<
   Machine.TerminalOutput<States>,
   Emits,
   never,
-  InputEvents
+  InputEvents,
+  ParentEvents
 >
 
 interface Make {
@@ -5457,11 +6219,12 @@ interface Make {
     const Input extends Schema.Top = typeof Schema.Void,
     InitialE = never,
     InitialR = never,
-    const InternalEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
+    const InternalEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly [],
+    const ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
   >(
-    config: MakeConfig<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents>,
+    config: MakeConfig<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents, ParentEvents>,
     ..._validation: ValidateDefinedStates<NoInfer<States>>
-  ): MakeResult<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents>
+  ): MakeResult<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents, ParentEvents>
   <
     const States extends Machine.StateSchemas,
     const InputEvents extends ReadonlyArray<Machine.TaggedSchema>,
@@ -5469,10 +6232,11 @@ interface Make {
     const Input extends Schema.Top = typeof Schema.Void,
     InitialE = never,
     InitialR = never,
-    const InternalEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
+    const InternalEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly [],
+    const ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
   >(
     config:
-      & Omit<MakeConfig<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents>, "states">
+      & Omit<MakeConfig<States, InputEvents, Emits, Input, InitialE, InitialR, InternalEvents, ParentEvents>, "states">
       & { readonly states: InvalidDefinedStateTreeInput<States> }
   ): never
 }
@@ -5488,10 +6252,13 @@ interface Make {
  * `defineStates` or is passed inline. Call `handle` on the returned definition
  * to implement state behavior with ordinary TypeScript control flow.
  *
- * Schemas in `events` define the public input protocol. Schemas in
- * `internalEvents` are added to the complete handler protocol for invoke
- * results, child emissions, and other machine-local deliveries. Their tags
- * must be disjoint.
+ * `Machine.events` defines the public input protocol. `Machine.internalEvents`
+ * adds raised events and other machine-local deliveries.
+ * `Machine.emittedEvents` defines outward ephemeral notifications, while
+ * `parentEvents` declares the inputs a child may explicitly send to its owning
+ * actor. All descriptors expose deferred constructors while retaining their
+ * schemas opaquely for runtime validation. Public and internal tags must be
+ * disjoint.
  *
  * **Example** (Typed counter machine)
  *
@@ -5508,10 +6275,11 @@ interface Make {
  * }) {}
  *
  * const States = Machine.defineStates({ Count })
+ * const Events = Machine.events(Increment)
  *
  * const counter = Machine.make({
  *   states: States.states,
- *   events: [Increment],
+ *   events: Events,
  *   initial: () => States.initial.Count(new Count({ value: 0 }))
  * }).handle({
  *   Count: {
@@ -5529,54 +6297,92 @@ interface Make {
  */
 export const make: Make = internal.make
 
-type EventConstructorArgs<EventSchema extends Machine.TaggedSchema> = {} extends EventSchema["~type.make.in"] ?
-  [input?: EventSchema["~type.make.in"]]
-  : [input: EventSchema["~type.make.in"]]
-
 /**
- * Constructs an event from a schema owned by a machine's protocol.
- *
- * **Details**
+ * Extracts the decoded event union carried by an event protocol descriptor.
  *
- * The schema constructor runs exactly once. The resulting decoded event is
- * trusted by this machine and definitions derived from it with `handle`, so
- * repeated delivery does not decode the same already-constructed value again.
- * Events supplied through ordinary `send` and `plan` calls remain untrusted
- * and continue through full runtime schema validation.
- * Treat the returned event as immutable after construction.
+ * @category utility types
+ * @since 0.10.0
+ */
+export type EventOf<Protocol extends Machine.EventProtocol.Any> = Machine.EventOf<
+  Machine.EventProtocolSchemas<Protocol>
+>
+
+/**
+ * Defines a public event protocol and returns deferred constructors for every
+ * statically finite configured event tag.
  *
- * The schema must be one of the machine's configured public or internal event
- * schemas, or a case schema belonging to a configured `Schema.TaggedUnion`.
+ * Constructor inputs retain their schema-derived required fields, defaults,
+ * and transformations. Construction is deferred until delivery so failures
+ * enter the machine's `MachineSchemaDecodeError` channel rather than throwing
+ * at the call site.
  *
  * **Example**
  *
  * ```ts
- * import { Schema } from "effect"
- * import { Machine } from "@typeonce/effect-machine"
+ * const Events = Machine.events(Increment, Reset)
+ * const machine = Machine.make({ events: Events, ... })
+ * yield* ref.send(Events.Increment({ by: 1 }))
+ * ```
  *
- * class Idle extends Schema.TaggedClass<Idle>("Idle")("Idle", {}) {}
- * class Increment extends Schema.TaggedClass<Increment>("Increment")("Increment", {
- *   by: Schema.Number
- * }) {}
+ * @category constructors
+ * @since 0.10.0
+ */
+export const events: {
+  <const Schemas extends ReadonlyArray<Machine.TaggedSchema>>(
+    ...schemas: Schemas & ValidateInputEventProtocol<NoInfer<Schemas>>
+  ): Machine.EventProtocol<"public", readonly [...Schemas]>
+  <const Inputs extends ReadonlyArray<Machine.EventProtocolInput<"public">>>(
+    ...inputs: Inputs & ValidateEventProtocolBuilder<"public", Inputs>
+  ): Machine.EventProtocol<"public", Machine.EventProtocolInputSchemasOf<"public", Inputs>>
+} = internal.events as any
+
+/**
+ * Defines an internal event protocol and returns deferred constructors for
+ * every statically finite configured event tag.
  *
- * const States = Machine.defineStates({ Idle })
- * const counter = Machine.make({
- *   states: States.states,
- *   events: [Increment],
- *   initial: () => States.initial.Idle.from()
- * }).handle({ Idle: { on: { Increment: () => States.initial.Idle.from() } } })
+ * Use these constructors for raised events and other machine-local deliveries.
+ * Construction failures are reported through the
+ * owning machine's `MachineSchemaDecodeError` channel.
+ *
+ * **Example**
+ *
+ * ```ts
+ * const InternalEvents = Machine.internalEvents(Loaded, Failed)
+ * const machine = Machine.make({ internalEvents: InternalEvents, ... })
  *
- * const increment = Machine.event(counter, Increment, { by: 1 })
+ * // Inside a transition callback:
+ * enqueue.raise(InternalEvents.Loaded({ value }))
  * ```
  *
  * @category constructors
- * @since 0.4.0
+ * @since 0.10.0
  */
-export const event: <const M extends Machine.Any, const EventSchema extends Machine.TaggedSchema>(
-  machine: M,
-  schema: EventSchema & ([EventSchema["Type"]] extends [Machine.Event<M>] ? unknown : never),
-  ...args: EventConstructorArgs<EventSchema>
-) => EventSchema["Type"] = internal.event
+export const internalEvents: {
+  <const Schemas extends ReadonlyArray<Machine.TaggedSchema>>(
+    ...schemas: Schemas & ValidateInternalEventProtocol<readonly [], NoInfer<Schemas>>
+  ): Machine.EventProtocol<"internal", readonly [...Schemas]>
+  <const Inputs extends ReadonlyArray<Machine.EventProtocolInput<"internal">>>(
+    ...inputs: Inputs & ValidateEventProtocolBuilder<"internal", Inputs>
+  ): Machine.EventProtocol<"internal", Machine.EventProtocolInputSchemasOf<"internal", Inputs>>
+} = internal.internalEvents as any
+
+/**
+ * Defines the ephemeral notifications a machine may publish to external
+ * observers. Emitted events are separate from actor input and are never sent
+ * implicitly to a parent actor. Observe them through `MachineRef.emissions` or
+ * the AtomMachine emission stream adapters.
+ *
+ * @category constructors
+ * @since 0.10.0
+ */
+export const emittedEvents: {
+  <const Schemas extends ReadonlyArray<Machine.TaggedSchema>>(
+    ...schemas: Schemas & ValidateEmittedEventProtocol<NoInfer<Schemas>>
+  ): Machine.EventProtocol<"emitted", readonly [...Schemas]>
+  <const Inputs extends ReadonlyArray<Machine.EventProtocolInput<"emitted">>>(
+    ...inputs: Inputs & ValidateEventProtocolBuilder<"emitted", Inputs>
+  ): Machine.EventProtocol<"emitted", Machine.EventProtocolInputSchemasOf<"emitted", Inputs>>
+} = internal.emittedEvents as any
 
 /**
  * Encodes a decoded machine snapshot into a normalized data representation.
@@ -5611,7 +6417,7 @@ export const event: <const M extends Machine.Any, const EventSchema extends Mach
  * const States = Machine.defineStates({ Idle })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.Idle.from()
  * }).handle({ Idle: {} })
  *
@@ -5638,7 +6444,8 @@ export const encodeSnapshot: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine: Machine<
     States,
@@ -5653,14 +6460,15 @@ export const encodeSnapshot: <
     Output,
     Emits,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >,
   snapshot: Machine.Snapshot<States>
 ) => Effect.Effect<
   Machine.EncodedSnapshot,
   MachineSchemaEncodeError,
   Machine.SnapshotEncodingServices<States>
-> = internal.encodeSnapshot
+> = internal.encodeSnapshot as any
 
 /**
  * Decodes a normalized data representation into a validated machine snapshot.
@@ -5691,7 +6499,7 @@ export const encodeSnapshot: <
  * const States = Machine.defineStates({ Idle })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.Idle.from()
  * }).handle({ Idle: {} })
  *
@@ -5719,7 +6527,8 @@ export const decodeSnapshot: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine: Machine<
     States,
@@ -5734,449 +6543,316 @@ export const decodeSnapshot: <
     Output,
     Emits,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >,
   encoded: unknown
 ) => Effect.Effect<
   Machine.Snapshot<States>,
   MachineSchemaDecodeError,
   Machine.SnapshotDecodingServices<States>
-> = internal.decodeSnapshot
+> = internal.decodeSnapshot as any
 
-/**
- * Creates an invoked child process configuration for an active state.
- *
- * **When to use**
- *
- * Use to run a child process while a machine remains in a state. Successful
- * outputs are sent directly to the parent machine as events; `void` sends
- * nothing. Unrecovered child failures fail the owning machine. Active
- * snapshots can optionally be mapped to progress events.
- *
- * **Gotchas**
- *
- * Invoked child processes run while their owning state is active and are
- * stopped before the state exits. An unrecovered child failure fails the owning
- * machine; recover inside the child Effect when failure should become an event.
- * The `id` is a state-local lifecycle key, not a communication address. To
- * send events to the invocation, pass a typed `childAddress` as `address`.
- * The `src` callback is intentionally independent from its parent state. When
- * construction depends on the typed state, lifecycle event, or runtime, use
- * the state config factory form `invoke: (context) => Machine.invoke(...)` and
- * close over that context from `src`.
- *
- * **Example** (Effect output as a parent event)
- *
- * ```ts
- * import { Effect, Schema } from "effect"
- * import { Machine } from "@typeonce/effect-machine"
- *
- * class Loaded extends Schema.TaggedClass<Loaded>("Loaded")("Loaded", {
- *   value: Schema.String
- * }) {}
- *
- * const load = Machine.invoke({
- *   id: "load",
- *   src: () => Machine.effect(Effect.succeed(new Loaded({ value: "ready" })))
- * })
- * ```
- *
- * @see {@link effect} for one-shot child effects.
- * @see {@link spawn} for children whose lifetime is controlled by actions.
- * @category constructors
- * @since 0.4.0
- */
-export const invoke: <
-  ChildState,
-  ChildEvent,
-  ChildError = never,
-  ChildRequirements = never,
-  ChildOutput = never,
-  ChildInitialError = never,
-  Event = never,
-  Address extends ChildAddress<never> | undefined = undefined
->(
-  config:
-    & {
-      readonly id: InvokeLifecycleId
-      readonly src: () => Logic<
-        ChildState,
-        ChildEvent,
-        ChildError,
-        ChildRequirements,
-        ChildOutput,
-        ChildInitialError
-      >
-      readonly snapshot?: (
-        context: Machine.InvokeSnapshotContext<ChildState, ChildError, ChildOutput>
-      ) => Event | undefined
-    }
-    & ([Address] extends [undefined] ? {
-        readonly address?: never
-      }
-      : {
-        readonly address: Exclude<Address, undefined>
-      } & ChildAddress.Compatibility<Exclude<Address, undefined>, NoInfer<ChildEvent>>)
-) => Machine.InvokeConfig<
-  any,
-  any,
-  any,
-  any,
-  Event,
-  ChildState,
-  ChildEvent,
-  ChildError,
-  ChildRequirements,
-  ChildOutput,
-  ChildInitialError
-> = internal.invoke
-
-type InvokeEffectResult<Requirements, Event> = Machine.InvokeConfig<
-  any,
-  any,
-  any,
-  any,
-  never,
-  void,
-  never,
-  never,
-  Requirements,
-  Event | void,
-  never
+type DynamicEffectInvokeSource<
+  States extends Machine.StateSchemas,
+  Events extends ReadonlyArray<Machine.TaggedSchema>,
+  Emits extends ReadonlyArray<Machine.TaggedSchema>,
+  StateId extends Machine.StateIdentifier<States>,
+  Source extends (
+    context: Machine.InvokeContext<States, Events, Emits, StateId>
+  ) => Effect.Effect<unknown, unknown, unknown>
+> = {
+  readonly id: InvokeLifecycleId
+  readonly effect: Source
+  readonly after?: never
+  readonly logic?: never
+  readonly child?: never
+  readonly address?: never
+  readonly onSnapshot?: never
+}
+
+type DynamicEffectDoneHandler<
+  States extends Machine.StateSchemas,
+  Events extends ReadonlyArray<Machine.TaggedSchema>,
+  Emits extends ReadonlyArray<Machine.TaggedSchema>,
+  StateId extends Machine.StateIdentifier<States>,
+  Source extends (...args: ReadonlyArray<never>) => Effect.Effect<unknown, unknown, unknown>
+> = Machine.InvokeTransition<
+  States,
+  Events,
+  Emits,
+  Machine.InvokeDoneContext<States, Events, Emits, StateId, Effect.Success<ReturnType<NoInfer<Source>>>>
 >
 
-type InvokeEffectIsInfallible<Fx extends Effect.Effect<any, any, any>> = IsAny<Effect.Error<Fx>> extends true ? false
-  : [Effect.Error<Fx>] extends [never] ? true
-  : false
+type DynamicEffectFailureHandler<
+  States extends Machine.StateSchemas,
+  Events extends ReadonlyArray<Machine.TaggedSchema>,
+  Emits extends ReadonlyArray<Machine.TaggedSchema>,
+  StateId extends Machine.StateIdentifier<States>,
+  Source extends (...args: ReadonlyArray<never>) => Effect.Effect<unknown, unknown, unknown>
+> = Machine.InvokeTransition<
+  States,
+  Events,
+  Emits,
+  Machine.InvokeFailureContext<States, Events, Emits, StateId, Effect.Error<ReturnType<NoInfer<Source>>>>
+>
 
-type InvokeEffectConfig<
-  Fx extends Effect.Effect<any, any, any>,
-  SuccessEvent,
-  FailureEvent
+type DynamicEffectInvokeResult<
+  States extends Machine.StateSchemas,
+  Events extends ReadonlyArray<Machine.TaggedSchema>,
+  Emits extends ReadonlyArray<Machine.TaggedSchema>,
+  StateId extends Machine.StateIdentifier<States>,
+  Source extends (...args: ReadonlyArray<never>) => Effect.Effect<unknown, unknown, unknown>
 > =
-  & {
-    readonly id: InvokeLifecycleId
-    readonly effect: Fx
-    readonly onSuccess: (value: NoInfer<Effect.Success<Fx>>) => SuccessEvent | void
-  }
-  & (
-    InvokeEffectIsInfallible<Fx> extends true ? {
-        readonly onFailure?: never
-      }
-      : {
-        readonly onFailure: (error: NoInfer<Effect.Error<Fx>>) => FailureEvent | void
-      }
-  )
+  & Machine.InvokeConfig<States, Events, Emits, StateId>
+  & Machine.InvokeTyped<
+    Effect.Success<ReturnType<Source>>,
+    Effect.Error<ReturnType<Source>>,
+    Effect.Services<ReturnType<Source>>,
+    never
+  >
+
+type InvokeChannelIsNever<Value> = IsAny<Value> extends true ? false : [Value] extends [never] ? true : false
 
 /**
- * Invokes one Effect and maps its typed outcome into machine-local events.
+ * Preserves inference for a state-owned invocation configuration.
  *
- * **Details**
- *
- * This is the high-level one-shot counterpart to `invoke`. Success and typed
- * failure values are mapped independently, so callers do not need to recover
- * an Effect into a common event union by hand. Defects and interruption remain
- * failures of the owning machine.
+ * Use `effect` for one-shot work, `after` for a cancellable timer, `logic` for
+ * reusable process logic, or `child` for a complete child machine. `onDone` is
+ * required whenever the source can complete with an output, while `onFailure`
+ * is required only when the source has a typed failure channel.
  *
- * Declare mapped outcomes in `internalEvents` unless they are also legitimate
- * public commands.
- *
- * **Example**
+ * This constructor is an identity at runtime, but preserves lifecycle callback
+ * inference through published declarations. Effects and durations may be
+ * supplied directly or derived from the owning state's entry context. Dynamic
+ * Effect sources infer the owner context, output, error, and service channels
+ * together without a return annotation. Logic invocations require both a
+ * lifecycle `id` and a typed communication `address`. Child descriptors already
+ * own their identity, so `id` and `address` must not be repeated.
  *
  * ```ts
- * import { Effect, Schema } from "effect"
- * import { Machine } from "@typeonce/effect-machine"
- *
- * class Loaded extends Schema.TaggedClass<Loaded>("Loaded")("Loaded", {
- *   value: Schema.String
- * }) {}
- *
- * const load = Machine.invokeEffect({
+ * invoke: Machine.invoke({
  *   id: "load",
- *   effect: Effect.succeed("ready"),
- *   onSuccess: (value) => new Loaded({ value })
+ *   effect: Effect.tryPromise({
+ *     try: () => fetch("/api/data").then((response) => response.json()),
+ *     catch: (cause) => new LoadError({ cause })
+ *   }),
+ *   onDone: ({ output, target }) => target.full.Ready({ data: output }),
+ *   onFailure: ({ error, target }) => target.full.Failed({ error })
  * })
  * ```
  *
- * @see {@link invoke} for arbitrary child process logic.
- * @see {@link after} for a state-scoped delayed event.
- * @category constructors
- * @since 0.4.0
- */
-export const invokeEffect: <const Fx extends Effect.Effect<any, any, any>, SuccessEvent, FailureEvent = never>(
-  config: InvokeEffectConfig<Fx, SuccessEvent, FailureEvent>
-) => InvokeEffectResult<
-  Effect.Services<Fx>,
-  SuccessEvent | (InvokeEffectIsInfallible<Fx> extends true ? never : FailureEvent)
-> = internal.invokeEffect
-
-/**
- * Creates a cancellable state-scoped delayed event.
- *
- * The timer starts when its owning state is entered and is interrupted when
- * that state exits. The delayed value should normally be declared in
- * `internalEvents`.
- *
- * **Example**
- *
- * ```ts
- * import { Schema } from "effect"
- * import { Machine } from "@typeonce/effect-machine"
- *
- * class TimedOut extends Schema.TaggedClass<TimedOut>("TimedOut")("TimedOut", {}) {}
- *
- * const timeout = Machine.after("5 seconds", new TimedOut({}))
- * ```
- *
- * @category constructors
- * @since 0.4.0
- */
-export const after: <Event extends { readonly _tag: PropertyKey }>(
-  duration: Duration.Input,
-  event: Event,
-  options?: { readonly id?: InvokeLifecycleId }
-) => InvokeEffectResult<never, Event> = internal.after
-
-type RetagFields<Target extends Machine.TaggedSchema> = Omit<Target["~type.make.in"], "_tag">
-
-type RetagTargetCompatibility<Target extends Machine.TaggedSchema> = Target extends {
-  readonly fields: Schema.Struct.Fields
-} ? "_tag" extends keyof Target["~type.make.in"] ? {} extends Pick<Target["~type.make.in"], "_tag"> ? unknown : {
-      readonly "~effect/Machine/RetagTargetError": "Target schema must supply its discriminator when make is called"
-    }
-  : unknown
-  : {
-    readonly "~effect/Machine/RetagTargetError": "Target schema must be one tagged struct or tagged class"
-  }
-
-type RequiredKeys<A> = {
-  readonly [Key in keyof A]-?: {} extends Pick<A, Key> ? never : Key
-}[keyof A]
-
-type CompatibleSourceKeys<Fields, Source> = {
-  readonly [Key in Extract<keyof Fields, keyof Source>]: Source[Key] extends Fields[Key] ? Key : never
-}[Extract<keyof Fields, keyof Source>]
-
-type RetagPatch<Target extends Machine.TaggedSchema, Source> =
-  & Partial<RetagFields<Target>>
-  & Pick<
-    RetagFields<Target>,
-    Exclude<RequiredKeys<RetagFields<Target>>, CompatibleSourceKeys<RetagFields<Target>, Source>>
-  >
-
-type RetagArgs<Target extends Machine.TaggedSchema, Source> = [
-  Exclude<RequiredKeys<RetagFields<Target>>, CompatibleSourceKeys<RetagFields<Target>, Source>>
-] extends [never] ? [patch?: RetagPatch<Target, Source>]
-  : [patch: RetagPatch<Target, Source>]
-
-/**
- * Constructs another tagged case from compatible source fields.
- *
- * The target must be one tagged struct or tagged class whose discriminator is
- * supplied by its constructor. Union wrappers are rejected because their
- * `make` operation cannot select a member after the source discriminator has
- * been discarded. Missing or incompatible required target fields must be
- * supplied by the patch, and the target schema's normal `make` validation
- * remains authoritative at runtime.
- *
- * @category constructors
- * @since 0.4.0
- */
-export const retag: <const Target extends Machine.TaggedSchema, const Source extends { readonly _tag: PropertyKey }>(
-  target: Target & RetagTargetCompatibility<Target>,
-  source: Source,
-  ...args: RetagArgs<Target, Source>
-) => Target["Type"] = internal.retag
-
-type InvokeMachineInput<Input extends Schema.Top> = Input extends typeof Schema.Void ? {
-    readonly input?: never
-  }
-  : {
-    readonly input: Input["Type"]
-  }
-
-/**
- * Creates an invoked child process from a complete statechart machine.
- *
- * **When to use**
- *
- * Use when a state should own another statechart machine and communicate with
- * it through typed child events, emissions, snapshots, or terminal output.
- *
- * **Details**
- *
- * Child emissions are delivered directly to the parent as events. Active
- * snapshots and terminal output can be mapped to parent events. The owning
- * state controls the child lifetime.
- *
- * **Gotchas**
- *
- * Active invoked machines must have unique child addresses. A machine starts
- * after its owning state's entry actions, so those actions cannot send events
- * to a newly entered child. Unrecovered child failures fail the parent.
- *
- * @see {@link invoke} for invoking lower-level process logic.
- * @see {@link sendTo} for sending events to the invoked machine.
  * @category constructors
- * @since 0.4.0
+ * @since 0.9.0
  */
-export const invokeMachine: {
+export const invoke: {
   <
     const States extends Machine.StateSchemas,
     const Events extends ReadonlyArray<Machine.TaggedSchema>,
-    const Emits extends ReadonlyArray<Machine.TaggedSchema> = readonly [],
-    const Input extends Schema.Top = typeof Schema.Void,
-    UnhandledStates extends Machine.StateIdentifier<States> = Machine.StateIdentifier<States>,
-    E = never,
-    R = never,
-    InitialE = never,
-    InitialR = never,
-    FinalStates extends Machine.StateIdentifier<States> = never,
-    Output = never,
-    SnapshotEvent = never,
-    DoneEvent = never,
-    Id extends string = string,
-    OutputStates extends Machine.StateIdentifier<States> = never,
-    InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Source extends (
+      context: Machine.InvokeContext<States, Events, Emits, StateId>
+    ) => Effect.Effect<unknown, unknown, unknown>
   >(
     config:
+      & DynamicEffectInvokeSource<States, Events, Emits, StateId, Source>
       & {
-        readonly child: ChildMachine<
-          Id,
-          & Machine<
-            States,
-            Events,
-            Input,
-            UnhandledStates,
-            E,
-            R,
-            InitialE,
-            InitialR,
-            FinalStates,
-            Output,
-            Emits,
-            OutputStates,
-            InputEvents
-          >
-          & EnsureExecutable<States, UnhandledStates, OutputStates>
-        >
-        readonly snapshot?: (
-          context: Machine.InvokeSnapshotContext<
-            Machine.Snapshot<States>,
-            | E
-            | ActionError<R>
-            | InfiniteTransitionError
-            | MachineSchemaDecodeError
-            | StoppedError,
-            Output
-          >
-        ) => SnapshotEvent | undefined
-        readonly onDone: (context: Machine.InvokeDoneContext<Output>) => DoneEvent | undefined
-      }
-      & InvokeMachineInput<Input>
-  ): Machine.InvokeConfig<
-    any,
-    any,
-    any,
-    any,
-    SnapshotEvent,
-    Machine.Snapshot<States>,
-    Machine.EventOf<InputEvents>,
-    E | ActionError<R> | InfiniteTransitionError | MachineSchemaDecodeError | StoppedError,
-    ExcludeCompatibleRuntime<
-      Exclude<ExecutionServices<InitialR | R>, internalRuntime.MachineRuntime>,
-      Machine.EventOf<Events>,
-      Machine.EmitOf<Emits>
-    >,
-    Output,
-    | InitialE
-    | E
-    | ActionError<InitialR | R>
-    | InfiniteTransitionError
-    | MachineSchemaDecodeError
-    | StartupError
-    | StoppedError,
-    Machine.EmitOf<Emits>,
-    DoneEvent
-  >
+        readonly onDone: DynamicEffectDoneHandler<States, Events, Emits, StateId, Source>
+        readonly onFailure: DynamicEffectFailureHandler<States, Events, Emits, StateId, Source>
+      },
+    ..._validation: InvokeChannelIsNever<Effect.Success<ReturnType<Source>>> extends true ? [
+        "onDone must be omitted when the Effect output is never"
+      ]
+      : InvokeChannelIsNever<Effect.Error<ReturnType<Source>>> extends true ? [
+          "onFailure must be omitted when the Effect error is never"
+        ]
+      : []
+  ): DynamicEffectInvokeResult<States, Events, Emits, StateId, Source>
   <
     const States extends Machine.StateSchemas,
     const Events extends ReadonlyArray<Machine.TaggedSchema>,
-    const Emits extends ReadonlyArray<Machine.TaggedSchema> = readonly [],
-    const Input extends Schema.Top = typeof Schema.Void,
-    UnhandledStates extends Machine.StateIdentifier<States> = Machine.StateIdentifier<States>,
-    E = never,
-    R = never,
-    InitialE = never,
-    InitialR = never,
-    FinalStates extends Machine.StateIdentifier<States> = never,
-    Output = never,
-    SnapshotEvent = never,
-    Id extends string = string,
-    OutputStates extends Machine.StateIdentifier<States> = never,
-    InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Source extends (
+      context: Machine.InvokeContext<States, Events, Emits, StateId>
+    ) => Effect.Effect<unknown, never, unknown>
   >(
     config:
+      & DynamicEffectInvokeSource<States, Events, Emits, StateId, Source>
+      & {
+        readonly onDone: DynamicEffectDoneHandler<States, Events, Emits, StateId, Source>
+        readonly onFailure?: never
+      },
+    ..._validation: InvokeChannelIsNever<Effect.Success<ReturnType<Source>>> extends true ? [
+        "onDone must be omitted when the Effect output is never"
+      ]
+      : []
+  ): DynamicEffectInvokeResult<States, Events, Emits, StateId, Source>
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Source extends (
+      context: Machine.InvokeContext<States, Events, Emits, StateId>
+    ) => Effect.Effect<never, unknown, unknown>
+  >(
+    config:
+      & DynamicEffectInvokeSource<States, Events, Emits, StateId, Source>
+      & {
+        readonly onDone?: never
+        readonly onFailure: DynamicEffectFailureHandler<States, Events, Emits, StateId, Source>
+      },
+    ..._validation: InvokeChannelIsNever<Effect.Error<ReturnType<Source>>> extends true ? [
+        "onFailure must be omitted when the Effect error is never"
+      ]
+      : []
+  ): DynamicEffectInvokeResult<States, Events, Emits, StateId, Source>
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Source extends (
+      context: Machine.InvokeContext<States, Events, Emits, StateId>
+    ) => Effect.Effect<never, never, unknown>
+  >(
+    config:
+      & DynamicEffectInvokeSource<States, Events, Emits, StateId, Source>
       & {
-        readonly child: ChildMachine<
-          Id,
-          & Machine<
-            States,
-            Events,
-            Input,
-            UnhandledStates,
-            E,
-            R,
-            InitialE,
-            InitialR,
-            FinalStates,
-            Output,
-            Emits,
-            OutputStates,
-            InputEvents
-          >
-          & EnsureExecutable<States, UnhandledStates, OutputStates>
-        >
-        readonly snapshot?: (
-          context: Machine.InvokeSnapshotContext<
-            Machine.Snapshot<States>,
-            | E
-            | ActionError<R>
-            | InfiniteTransitionError
-            | MachineSchemaDecodeError
-            | StoppedError,
-            Output
-          >
-        ) => SnapshotEvent | undefined
         readonly onDone?: never
+        readonly onFailure?: never
       }
-      & InvokeMachineInput<Input>
-  ): Machine.InvokeConfig<
-    any,
-    any,
-    any,
-    any,
-    SnapshotEvent,
-    Machine.Snapshot<States>,
-    Machine.EventOf<InputEvents>,
-    E | ActionError<R> | InfiniteTransitionError | MachineSchemaDecodeError | StoppedError,
-    ExcludeCompatibleRuntime<
-      Exclude<ExecutionServices<InitialR | R>, internalRuntime.MachineRuntime>,
-      Machine.EventOf<Events>,
-      Machine.EmitOf<Emits>
-    >,
-    Output,
-    | InitialE
-    | E
-    | ActionError<InitialR | R>
-    | InfiniteTransitionError
-    | MachineSchemaDecodeError
-    | StartupError
-    | StoppedError,
-    Machine.EmitOf<Emits>
-  >
-} = internal.invokeMachine
-
+  ): DynamicEffectInvokeResult<States, Events, Emits, StateId, Source>
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Fx extends Effect.Effect<any, any, any>,
+    const Config extends object
+  >(
+    config: Config & Machine.EffectInvokeArgs<States, Events, Emits, StateId, Fx>
+  ):
+    & Config
+    & Machine.InvokeOwned<States, Events, Emits, StateId>
+    & Machine.InvokeTyped<
+      Effect.Success<Fx>,
+      Effect.Error<Fx>,
+      Effect.Services<Fx>,
+      never
+    >
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Config extends object
+  >(
+    config: Config & Machine.TimerInvokeArgs<States, Events, Emits, StateId>
+  ): Config & Machine.InvokeOwned<States, Events, Emits, StateId> & Machine.InvokeTyped<void, never, never, never>
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    ChildState,
+    ChildEvent,
+    ChildError,
+    ChildRequirements,
+    ChildOutput,
+    ChildInitialError,
+    Address extends ChildAddress<never>
+  >(
+    config: Machine.LogicInvokeArgs<
+      States,
+      Events,
+      Emits,
+      StateId,
+      ChildState,
+      ChildEvent,
+      ChildError,
+      ChildRequirements,
+      ChildOutput,
+      ChildInitialError,
+      Address,
+      (context: Machine.InvokeContext<States, Events, Emits, StateId>) => Logic<
+        ChildState,
+        ChildEvent,
+        ChildError,
+        ChildRequirements,
+        ChildOutput,
+        ChildInitialError
+      >
+    >
+  ):
+    & Machine.InvokeConfig<States, Events, Emits, StateId>
+    & Machine.InvokeTyped<
+      ChildOutput,
+      ChildError,
+      ChildRequirements,
+      ChildInitialError
+    >
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    ChildState,
+    ChildEvent,
+    ChildError,
+    ChildRequirements,
+    ChildOutput,
+    ChildInitialError,
+    Address extends ChildAddress<never>,
+    const Config extends object
+  >(
+    config:
+      & Config
+      & Machine.LogicInvokeArgs<
+        States,
+        Events,
+        Emits,
+        StateId,
+        ChildState,
+        ChildEvent,
+        ChildError,
+        ChildRequirements,
+        ChildOutput,
+        ChildInitialError,
+        Address
+      >
+  ):
+    & Config
+    & Machine.InvokeOwned<States, Events, Emits, StateId>
+    & Machine.InvokeTyped<
+      ChildOutput,
+      ChildError,
+      ChildRequirements,
+      ChildInitialError
+    >
+  <
+    const States extends Machine.StateSchemas,
+    const Events extends ReadonlyArray<Machine.TaggedSchema>,
+    const Emits extends ReadonlyArray<Machine.TaggedSchema>,
+    StateId extends Machine.StateIdentifier<States>,
+    const Child extends ChildMachine.Any,
+    const Config extends object
+  >(
+    config: Config & Machine.ChildInvokeArgs<States, Events, Emits, StateId, Child["machine"], Child>
+  ):
+    & Config
+    & Machine.InvokeOwned<States, Events, Emits, StateId>
+    & Machine.InvokeTyped<
+      Machine.Output<Child["machine"]>,
+      Machine.Error<Child["machine"]> | ActionError<Machine.Services<Child["machine"]>>,
+      Machine.Services<Child["machine"]>,
+      Machine.InitialError<Child["machine"]>,
+      Machine.Emit<Child["machine"]>,
+      Machine.EventOf<Machine.ParentEvents<Child["machine"]>>
+    >
+} = ((config: unknown) => config) as any
 /**
  * Plans the initial state for a machine without executing actor commands.
  *
@@ -6205,7 +6881,7 @@ export const invokeMachine: {
  * const States = Machine.defineStates({ Idle })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.Idle.from()
  * }).handle({ Idle: {} })
  *
@@ -6230,7 +6906,8 @@ export const planInitial: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine:
     & Machine<
@@ -6246,7 +6923,8 @@ export const planInitial: <
       Output,
       Emits,
       OutputStates,
-      InputEvents
+      InputEvents,
+      ParentEvents
     >
     & EnsureExecutable<States, UnhandledStates, OutputStates>,
   ...args: [...Machine.InputArgs<Input>]
@@ -6287,7 +6965,7 @@ export const planInitial: <
   ),
   InitialE | E | InfiniteTransitionError | MachineSchemaDecodeError | StartupError,
   never
-> = internal.planInitial
+> = internal.planInitial as any
 
 /**
  * Returns every compiled state node in definition order.
@@ -6338,10 +7016,9 @@ export const transitionDefinitions: <M extends Machine.Any>(machine: M) => Reado
  *
  * **Details**
  *
- * Static `invoke`, `invokeEffect`, `after`, and `invokeMachine` descriptors
- * expose stable ownership and lifecycle metadata without serializing runtime
- * values. Function-valued invoke factories are represented as dynamic and are
- * never evaluated during inspection.
+ * Static inline invocation definitions expose stable ownership and lifecycle
+ * metadata without serializing runtime values. Function-valued sources are
+ * represented as dynamic and are never evaluated during inspection.
  *
  * @category getters
  * @since 0.4.0
@@ -6392,7 +7069,8 @@ export const enabled: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine: Machine<
     States,
@@ -6407,10 +7085,11 @@ export const enabled: <
     Output,
     Emits,
     OutputStates,
-    InputEvents
+    InputEvents,
+    ParentEvents
   >,
   state: Machine.Snapshot<States>
-) => ReadonlyArray<Machine.TagOf<Events[number]>> = internal.enabled
+) => ReadonlyArray<Machine.TagOf<Events[number]>> = internal.enabled as any
 
 /**
  * Plans the next state snapshot synchronously.
@@ -6441,7 +7120,7 @@ export const enabled: <
  * const States = Machine.defineStates({ Off, On })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [Toggle],
+ *   events: Machine.events(Toggle),
  *   initial: () => States.initial.Off.from()
  * }).handle({ Off: { on: { Toggle: () => States.initial.On.from() } }, On: {} })
  *
@@ -6469,7 +7148,8 @@ export const plan: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine:
     & Machine<
@@ -6485,11 +7165,12 @@ export const plan: <
       Output,
       Emits,
       OutputStates,
-      InputEvents
+      InputEvents,
+      ParentEvents
     >
     & EnsureExecutable<States, UnhandledStates, OutputStates>,
   state: Machine.Snapshot<States>,
-  event: Machine.EventOf<InputEvents>
+  event: Machine.EventInputOf<InputEvents>
 ) => Effect.Effect<
   & {
     readonly next: Machine.Snapshot<States>
@@ -6525,53 +7206,7 @@ export const plan: <
   ),
   E | InfiniteTransitionError | MachineSchemaDecodeError,
   never
-> = internal.plan
-
-/**
- * Creates a one-shot child process from an Effect.
- *
- * **When to use**
- *
- * Use when you need side effects that produce one typed output or error.
- *
- * **Details**
- *
- * The Effect may run arbitrary side effects. Its success value is the process
- * output, its typed error is preserved, and its services are inferred. When
- * invoked, the output is sent to the owning machine as an event unless it is
- * `void`.
- *
- * **Gotchas**
- *
- * This process has no incoming event protocol. Its Effect runs once. Use
- * `transition` for a process that receives events over time and `logic` for
- * direct machine-local communication or intermediate snapshots.
- *
- * **Example** (Recover a child failure as output)
- *
- * ```ts
- * import { Effect, Schema } from "effect"
- * import { Machine } from "@typeonce/effect-machine"
- *
- * class LoadFailed extends Schema.TaggedClass<LoadFailed>("LoadFailed")("LoadFailed", {
- *   reason: Schema.String
- * }) {}
- *
- * const load = Machine.effect(
- *   Effect.fail("unavailable").pipe(
- *     Effect.catch((reason) => Effect.succeed(new LoadFailed({ reason })))
- *   )
- * )
- * ```
- *
- * @see {@link transition} for event-driven state.
- * @see {@link logic} for direct control over intermediate snapshots.
- * @category constructors
- * @since 0.4.0
- */
-export const effect: <Output, Error = never, Requirements = never>(
-  effect: Effect.Effect<Output, Error, Requirements>
-) => Logic<void, never, Error, Requirements, Output> = internal.effect
+> = internal.plan as any
 
 /**
  * Creates advanced stateful process logic from explicit initialization and
@@ -6594,9 +7229,9 @@ export const effect: <Output, Error = never, Requirements = never>(
  * This is the low-level process constructor. Parent messages sent directly
  * through its scope are intentionally `unknown` because the logic does not know
  * which machine will eventually own it. Prefer typed output, typed child
- * addresses, or invoke snapshot mapping when possible.
+ * addresses, or invocation lifecycle transitions when possible.
  *
- * @see {@link effect} for one-shot work.
+ * Use an inline `invoke` with an `effect` source for one-shot work.
  * @see {@link transition} for event-driven state.
  * @category constructors
  * @since 0.4.0
@@ -6645,7 +7280,7 @@ export const logic: <
  * )
  * ```
  *
- * @see {@link effect} for one-shot work.
+ * Use an inline `invoke` with an `effect` source for one-shot work.
  * @see {@link logic} for direct process lifecycle control.
  * @category constructors
  * @since 0.4.0
@@ -6807,7 +7442,7 @@ export const watch: <State, Event, Error = never, Output = never>(
  * const States = Machine.defineStates({ Idle })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.Idle.from()
  * }).handle({ Idle: {} })
  *
@@ -6835,7 +7470,8 @@ export const start: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine:
     & Machine<
@@ -6851,20 +7487,22 @@ export const start: <
       Output,
       Emits,
       OutputStates,
-      InputEvents
+      InputEvents,
+      ParentEvents
     >
     & EnsureExecutable<States, UnhandledStates, OutputStates>,
   ...args: [...Machine.InputArgs<Input>]
 ) => Effect.Effect<
   MachineRef<
     Machine.Snapshot<States>,
-    Machine.EventOf<InputEvents>,
+    Machine.EventInputOf<InputEvents>,
     | E
     | ActionError<R>
     | InfiniteTransitionError
     | MachineSchemaDecodeError
     | StoppedError,
-    Output
+    Output,
+    Machine.EmittedEventOf<Emits>
   >,
   | InitialE
   | E
@@ -6878,7 +7516,7 @@ export const start: <
     Machine.EventOf<Events>,
     Machine.EmitOf<Emits>
   >
-> = internal.start
+> = internal.start as any
 
 /**
  * Starts a fresh managed runtime from a decoded logical snapshot.
@@ -6890,8 +7528,8 @@ export const start: <
  * entry or transition actions, re-deliver raised or emitted events, or
  * re-evaluate historical completion and eventless transitions. Active-state
  * invokes start once in ancestor and document order with {@link InitialEvent};
- * delayed invokes restart their complete duration and invoked machines start
- * from their own initial state.
+ * timer invocations restart their complete duration and child-machine
+ * invocations start from their own initial state.
  *
  * Only logical state, completion, and history metadata are resumed. Queues,
  * scopes, subscriptions, fibers, spawned children, invoke progress, and prior
@@ -6914,7 +7552,7 @@ export const start: <
  * const States = Machine.defineStates({ Idle })
  * const machine = Machine.make({
  *   states: States.states,
- *   events: [],
+ *   events: Machine.events(),
  *   initial: () => States.initial.Idle.from()
  * }).handle({ Idle: {} })
  *
@@ -6944,7 +7582,8 @@ export const resume: <
   FinalStates extends Machine.StateIdentifier<States> = never,
   Output = never,
   OutputStates extends Machine.StateIdentifier<States> = never,
-  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events
+  InputEvents extends ReadonlyArray<Machine.TaggedSchema> = Events,
+  ParentEvents extends ReadonlyArray<Machine.TaggedSchema> = readonly []
 >(
   machine:
     & Machine<
@@ -6960,20 +7599,22 @@ export const resume: <
       Output,
       Emits,
       OutputStates,
-      InputEvents
+      InputEvents,
+      ParentEvents
     >
     & EnsureExecutable<States, UnhandledStates, OutputStates>,
   snapshot: Machine.Snapshot<States>
 ) => Effect.Effect<
   MachineRef<
     Machine.Snapshot<States>,
-    Machine.EventOf<InputEvents>,
+    Machine.EventInputOf<InputEvents>,
     | E
     | ActionError<R>
     | InfiniteTransitionError
     | MachineSchemaDecodeError
     | StoppedError,
-    Output
+    Output,
+    Machine.EmittedEventOf<Emits>
   >,
   MachineSchemaDecodeError,
   ExcludeCompatibleRuntime<
@@ -6981,4 +7622,4 @@ export const resume: <
     Machine.EventOf<Events>,
     Machine.EmitOf<Emits>
   >
-> = internal.resume
+> = internal.resume as any