liminal 0.5.6 → 0.5.8

package/Agent.ts

@@ -5,10 +5,9 @@ import { MessageRegistry, MessageRegistryContext } from "./MessageRegistry.ts"
 import { ModelRegistry, ModelRegistryContext } from "./ModelRegistry.ts"
 import type { Rune } from "./Rune.ts"
 import type { Runic } from "./Runic.ts"
-import type { RuntimeEvent } from "./RuntimeEvent.ts"
 
-export interface AgentConfig<E> {
-  handler?: ((event: RuntimeEvent<E>) => void) | undefined
+export interface AgentConfig<T, E> {
+  handler?: ((this: Fiber<T>, event: E) => void) | undefined
   models?: ModelRegistry
   messages?: MessageRegistry
   signal?: AbortSignal | undefined
@@ -21,16 +20,16 @@ export interface Agent<out T, out E> extends PromiseLike<T> {
 
 export function Agent<Y extends Rune, T>(
   runic: Runic<Y, T>,
-  config?: AgentConfig<Rune.E<Y>>,
+  config?: AgentConfig<T, Rune.E<Y>>,
 ): Agent<T, Rune.E<Y>> {
   return {
     then(onfulfilled, onrejected) {
-      const rootCtx = new Context([
+      return new Context([
         [HandlerContext, config?.handler],
         [ModelRegistryContext, config?.models ?? new ModelRegistry()],
         [MessageRegistryContext, config?.messages ?? new MessageRegistry()],
       ])
-      return rootCtx.run(() => Fiber(runic).resolve().then(onfulfilled, onrejected))
+        .run(() => new Fiber(runic).resolution().then(onfulfilled, onrejected))
     },
   } satisfies Omit<Agent<T, Rune.E<Y>>, "E" | "T"> as never
 }

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # liminal
 
+## 0.5.8
+
+### Patch Changes
+
+- 23a24ae: Reintroduce L.catch and clean up parts of the generator runtime.
+- f2f360c: Continue to clean up the generator runtime internals.
+- Updated dependencies [23a24ae]
+- Updated dependencies [f2f360c]
+  - liminal-schema@0.0.3
+  - liminal-util@0.0.4
+
+## 0.5.7
+
+### Patch Changes
+
+- a56f121: Re-flatten events. Make fiber info available in event handler via this.
+- Updated dependencies [a56f121]
+  - liminal-util@0.0.3
+
 ## 0.5.6
 
 ### Patch Changes

package/EventBase.ts

@@ -1,4 +1,4 @@
-import { inspect, type InspectOptions } from "node:util"
+import { attachCustomInspect } from "liminal-util"
 
 export interface EventBase<B extends symbol = symbol, K extends string = string> {
   readonly brand: B
@@ -10,17 +10,8 @@ export function EventBase<B extends symbol, K extends string>(brand: B, type: K)
     readonly brand = brand
     readonly type = type
 
-    // Allows us to circumvent a false positive ts error related to private symbols.
-    // https://github.com/microsoft/TypeScript/issues/58496
     static {
-      Object.defineProperties(this.prototype, {
-        [inspect.custom]: {
-          value(depth: number, options: InspectOptions) {
-            const { brand: _0, type: _1, ...rest } = this
-            return `${this.constructor.name} ` + inspect(rest, { ...options, depth })
-          },
-        },
-      })
+      attachCustomInspect(this, ({ brand: _0, type: _1, ...rest }) => rest)
     }
   }
 }

package/Fiber.ts

@@ -1,54 +1,105 @@
+import { attachCustomInspect } from "liminal-util"
 import { Context } from "./Context.ts"
 import type { Rune } from "./Rune.ts"
 import { Runic } from "./Runic.ts"
 
-export interface FiberInfo {
-  readonly index: number
-  readonly parent?: FiberInfo
+export type FiberStatus<T> = {
+  type: "untouched"
+} | {
+  type: "pending"
+  self: AbortSignal
+  promise: Promise<T>
+} | {
+  type: "aborted"
+  reason: unknown
+} | {
+  type: "resolved"
+  value: T
+} | {
+  type: "rejected"
+  exception: unknown
 }
 
-let nextIndex = 0
+export class Fiber<T = any> {
+  static nextIndex: number = 0
 
-export interface Fiber<T = any> {
-  parent?: Fiber | undefined
-  info: FiberInfo
-  resolve(): Promise<T>
-}
+  declare T: T
+  readonly index: number = Fiber.nextIndex++
+
+  #runic: Runic<Rune, T>
+  declare readonly parent?: Fiber
+  #context: Context = Context.ensure()
+
+  signal: AbortSignal
+  either: AbortSignal
+  abort: (reason?: any) => void
 
-export function Fiber<T = any>(runic: Runic<Rune, T>, parent?: Fiber): Fiber<T> {
-  let index = nextIndex++
-  let pending: Promise<T> | undefined
-  const context = Context.ensure()
-  return {
-    parent,
-    info: {
-      index,
-      ...parent && { parent: parent.info },
-    },
-    resolve,
+  status: FiberStatus<T> = { type: "untouched" }
+
+  constructor(runic: Runic<Rune, T>, parent?: Fiber) {
+    this.#runic = runic
+    if (parent) {
+      this.parent = parent
+    }
+    const controller = new AbortController()
+    this.signal = controller.signal
+    this.either = AbortSignal.any([
+      ...this.parent?.signal ? [this.parent.signal] : [],
+      this.signal,
+    ])
+    this.abort = controller.abort.bind(controller)
   }
 
-  function resolve(this: Fiber<T>): Promise<T> {
-    if (!pending) {
-      const { promise, resolve, reject } = Promise.withResolvers<T>()
-      pending = promise
-      const iterator = Runic.unwrap(runic)
-      let nextArg: unknown
-      context.run(async () => {
-        try {
-          let current = await iterator.next()
-          while (!current.done) {
-            const rune = current.value
-            nextArg = await rune(this)
-            current = await iterator.next(nextArg)
-          }
-          const { value } = current
-          resolve(value)
-        } catch (error) {
-          reject(error)
+  static async join<F extends Array<Fiber>>(fibers: F): Promise<{ [I in keyof F]: F[I]["T"] }> {
+    return await Promise.all(fibers.map((fiber) => fiber.resolution())) as never
+  }
+
+  resolution(this: Fiber<T>): Promise<T> {
+    const { status, abort } = this
+    switch (status.type) {
+      case "untouched": {
+        const { promise, resolve, reject } = Promise.withResolvers<T>()
+        this.status = {
+          type: "pending",
+          self: this.signal,
+          promise,
         }
-      })
+        const iterator = Runic.unwrap(this.#runic)
+        let nextArg: unknown
+        this.#context.run(async () => {
+          try {
+            let current = await iterator.next()
+            while (!current.done) {
+              const rune = current.value
+              nextArg = await rune(this)
+              current = await iterator.next(nextArg)
+            }
+            const { value } = current
+            abort()
+            resolve(value)
+          } catch (exception) {
+            abort(exception)
+            reject(exception)
+          }
+        })
+        return promise
+      }
+      case "pending": {
+        return status.promise
+      }
+      case "resolved": {
+        return Promise.resolve(status.value)
+      }
+      case "rejected": {
+        return Promise.reject(status.exception)
+      }
+      case "aborted": {
+        return Promise.reject(status.reason)
+      }
     }
-    return pending
+  }
+
+  static {
+    attachCustomInspect(this, ({ index, parent }) => ({ index, ...parent && { parent } }))
   }
 }

package/Handler.ts

@@ -1,6 +1,6 @@
 import { ContextHandle } from "./Context.ts"
-import type { RuntimeEvent } from "./RuntimeEvent.ts"
+import type { Fiber } from "./Fiber.ts"
 
-export type Handler<E = any> = [(event: RuntimeEvent<E>) => void][0]
+export type Handler<E = any> = [(this: Fiber, event: E) => void][0]
 
 export const HandlerContext: ContextHandle<Handler | undefined> = ContextHandle()

package/L/L.ts

@@ -3,6 +3,7 @@ export * from "./_infer.ts"
 export * from "./_message.ts"
 export * from "./assistant.ts"
 export * from "./branch.ts"
+export * from "./catch.ts"
 export * from "./emit.ts"
 export * from "./model.ts"
 export * from "./system.ts"

package/L/assistant.ts

@@ -6,7 +6,7 @@ import { _message } from "./_message.ts"
 import { rune } from "./rune.ts"
 
 export interface assistant extends Iterable<Rune<LEvent>, string> {
-  <T>(schema: LType<T>): Generator<Rune<LEvent>, T>
+  <T>(type: LType<T>): Generator<Rune<LEvent>, T>
 }
 
 export const assistant: assistant = Object.assign(

package/L/branch.ts

@@ -17,17 +17,20 @@ export function* branch(value: Runic | Array<Runic> | Record<keyof any, Runic>):
   const context = Context.ensure()
   const parent = yield* rune((fiber) => fiber)
   if (Array.isArray(value)) {
-    const fibers = value.map((runic) => context.clone().run(() => Fiber(runic, parent)))
-    return yield* rune(() => Promise.all(fibers.map(({ resolve }) => resolve())))
+    const fibers = value.map((runic) => context.clone().run(() => new Fiber(runic, parent)))
+    return yield* rune(() => Fiber.join(fibers))
   } else if (typeof value === "object") {
-    const entries = Object.entries(value)
-    const fibers = entries.map(([_key, runic]) => context.clone().run(() => Fiber(runic, parent)))
-    return yield* rune(() =>
-      Promise
-        .all(fibers.map(({ resolve }, i) => resolve().then((value) => [entries[i]![0], value])))
-        .then(Object.fromEntries)
+    const fibers = Object.values(value).map(
+      (runic) => context.clone().run(() => new Fiber(runic, parent)),
     )
+    return yield* rune(async () => {
+      const keys = Object.keys(value)
+      return await Fiber
+        .join(fibers)
+        .then((resolved) => resolved.map((value, i) => [keys[i], value]))
+        .then(Object.fromEntries)
+    })
   }
-  const fiber = context.clone().run(() => Fiber(typeof value === "function" ? value() : value, parent))
-  return yield* rune(() => fiber.resolve())
+  const fiber = context.clone().run(() => new Fiber(typeof value === "function" ? value() : value, parent))
+  return yield* rune(() => fiber.resolution())
 }

package/L/catch.ts

@@ -0,0 +1,24 @@
+import { Fiber } from "../Fiber.ts"
+import type { Rune } from "../Rune.ts"
+import type { Runic } from "../Runic.ts"
+import { rune } from "./rune.ts"
+
+export { catch_ as catch }
+function* catch_<Y extends Rune, T>(runic: Runic<Y, T>): Generator<Rune<Y>, CatchResult<T>> {
+  return yield* rune(async () => {
+    try {
+      return { resolved: await new Fiber(runic).resolution() }
+    } catch (exception: unknown) {
+      return { rejected: exception }
+    }
+  })
+}
+Object.defineProperty(catch_, "name", { value: "catch" })
+
+export type CatchResult<T> = {
+  resolved: T
+  rejected?: never
+} | {
+  resolved?: never
+  rejected: unknown
+}

package/L/emit.ts

@@ -10,9 +10,5 @@ export function* emit<const E>(event: EnsureNarrow<E>): emit<E> {
   const context = Context.ensure()
   const handler = context.get(HandlerContext)
   const fiber = yield* rune((fiber) => fiber)
-  handler?.({
-    ...fiber.info,
-    ...fiber.parent && { parent: fiber.parent.info },
-    event,
-  })
+  handler?.call(fiber, event)
 }

package/L/rune.ts

@@ -8,11 +8,11 @@ export interface rune<T> extends Iterable<Rune<never>, T> {
 export function rune<R>(source: (fiber: Fiber) => R): rune<Awaited<R>> {
   return Object.assign(
     function*<E>(): Generator<Rune<E>, Awaited<R>> {
-      return yield Object.assign(source, { [RuneKey]: {} as never })
+      return yield Object.assign(source, { [RuneKey]: true } as never)
     },
     {
       *[Symbol.iterator](): Generator<Rune<never>, Awaited<R>> {
-        return yield Object.assign(source, { [RuneKey]: {} as never })
+        return yield Object.assign(source, { [RuneKey]: true } as never)
       },
     },
   )

package/Model.ts

@@ -1,13 +1,14 @@
 import type { Schema } from "liminal-schema"
+import { attachCustomInspect } from "liminal-util"
 import type { Message } from "./Message.ts"
 
-export interface Model {
-  resolve(messages: Array<Message>, schema?: Schema): Promise<string>
-}
+export class Model {
+  constructor(
+    readonly vendor: string,
+    readonly resolve: (messages: Array<Message>, schema?: Schema) => Promise<string>,
+  ) {}
 
-// export interface ModelCapabilities {
-//   readonly url: boolean
-//   readonly mimes: Set<string>
-//   readonly reasoning: boolean
-//   readonly structures: boolean
-// }
+  static {
+    attachCustomInspect(this, ({ vendor }) => ({ vendor }))
+  }
+}

package/Rune.ts

@@ -1,12 +1,13 @@
 import type { Fiber } from "./Fiber.ts"
 
 export interface Rune<out E = any> {
+  E: E
   (fiber: Fiber): any
-  [RuneKey]: E
+  [RuneKey]: true
 }
 
 export declare namespace Rune {
-  export type E<X extends Rune> = X[RuneKey]
+  export type E<X extends Rune> = X["E"]
 }
 
 export const RuneKey: unique symbol = Symbol.for("liminal/Rune")

package/dist/Agent.d.ts

@@ -1,10 +1,10 @@
+import { Fiber } from "./Fiber.ts";
 import { MessageRegistry } from "./MessageRegistry.ts";
 import { ModelRegistry } from "./ModelRegistry.ts";
 import type { Rune } from "./Rune.ts";
 import type { Runic } from "./Runic.ts";
-import type { RuntimeEvent } from "./RuntimeEvent.ts";
-export interface AgentConfig<E> {
-    handler?: ((event: RuntimeEvent<E>) => void) | undefined;
+export interface AgentConfig<T, E> {
+    handler?: ((this: Fiber<T>, event: E) => void) | undefined;
     models?: ModelRegistry;
     messages?: MessageRegistry;
     signal?: AbortSignal | undefined;
@@ -13,4 +13,4 @@ export interface Agent<out T, out E> extends PromiseLike<T> {
     T: T;
     E: E;
 }
-export declare function Agent<Y extends Rune, T>(runic: Runic<Y, T>, config?: AgentConfig<Rune.E<Y>>): Agent<T, Rune.E<Y>>;
+export declare function Agent<Y extends Rune, T>(runic: Runic<Y, T>, config?: AgentConfig<T, Rune.E<Y>>): Agent<T, Rune.E<Y>>;

package/dist/Agent.js

@@ -6,12 +6,12 @@ import { ModelRegistry, ModelRegistryContext } from "./ModelRegistry.js";
 export function Agent(runic, config) {
     return {
         then(onfulfilled, onrejected) {
-            const rootCtx = new Context([
+            return new Context([
                 [HandlerContext, config?.handler],
                 [ModelRegistryContext, config?.models ?? new ModelRegistry()],
                 [MessageRegistryContext, config?.messages ?? new MessageRegistry()],
-            ]);
-            return rootCtx.run(() => Fiber(runic).resolve().then(onfulfilled, onrejected));
+            ])
+                .run(() => new Fiber(runic).resolution().then(onfulfilled, onrejected));
         },
     };
 }

package/dist/Agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../Agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAiBxE,MAAM,UAAU,KAAK,CACnB,KAAkB,EAClB,MAA+B;IAE/B,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,UAAU;YAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;gBAC1B,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC;gBACjC,CAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBAC7D,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,IAAI,IAAI,eAAe,EAAE,CAAC;aACpE,CAAC,CAAA;YACF,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAA;QAChF,CAAC;KACsD,CAAA;AAC3D,CAAC"}
+{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../Agent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AAgBxE,MAAM,UAAU,KAAK,CACnB,KAAkB,EAClB,MAAkC;IAElC,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,UAAU;YAC1B,OAAO,IAAI,OAAO,CAAC;gBACjB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC;gBACjC,CAAC,oBAAoB,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;gBAC7D,CAAC,sBAAsB,EAAE,MAAM,EAAE,QAAQ,IAAI,IAAI,eAAe,EAAE,CAAC;aACpE,CAAC;iBACC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAA;QAC3E,CAAC;KACsD,CAAA;AAC3D,CAAC"}

package/dist/EventBase.js

@@ -1,19 +1,10 @@
-import { inspect } from "node:util";
+import { attachCustomInspect } from "liminal-util";
 export function EventBase(brand, type) {
     return class {
         brand = brand;
         type = type;
-        // Allows us to circumvent a false positive ts error related to private symbols.
-        // https://github.com/microsoft/TypeScript/issues/58496
         static {
-            Object.defineProperties(this.prototype, {
-                [inspect.custom]: {
-                    value(depth, options) {
-                        const { brand: _0, type: _1, ...rest } = this;
-                        return `${this.constructor.name} ` + inspect(rest, { ...options, depth });
-                    },
-                },
-            });
+            attachCustomInspect(this, ({ brand: _0, type: _1, ...rest }) => rest);
         }
     };
 }

package/dist/EventBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventBase.js","sourceRoot":"","sources":["../EventBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAuB,MAAM,WAAW,CAAA;AAOxD,MAAM,UAAU,SAAS,CAAqC,KAAQ,EAAE,IAAO;IAC7E,OAAO;QACI,KAAK,GAAG,KAAK,CAAA;QACb,IAAI,GAAG,IAAI,CAAA;QAEpB,gFAAgF;QAChF,uDAAuD;QACvD;YACE,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE;gBACtC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBAChB,KAAK,CAAC,KAAa,EAAE,OAAuB;wBAC1C,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;wBAC7C,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;oBAC3E,CAAC;iBACF;aACF,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"EventBase.js","sourceRoot":"","sources":["../EventBase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAOlD,MAAM,UAAU,SAAS,CAAqC,KAAQ,EAAE,IAAO;IAC7E,OAAO;QACI,KAAK,GAAG,KAAK,CAAA;QACb,IAAI,GAAG,IAAI,CAAA;QAEpB;YACE,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;QACvE,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/Fiber.d.ts

@@ -1,12 +1,34 @@
 import type { Rune } from "./Rune.ts";
 import { Runic } from "./Runic.ts";
-export interface FiberInfo {
+export type FiberStatus<T> = {
+    type: "untouched";
+} | {
+    type: "pending";
+    self: AbortSignal;
+    promise: Promise<T>;
+} | {
+    type: "aborted";
+    reason: unknown;
+} | {
+    type: "resolved";
+    value: T;
+} | {
+    type: "rejected";
+    exception: unknown;
+};
+export declare class Fiber<T = any> {
+    #private;
+    static nextIndex: number;
+    T: T;
     readonly index: number;
-    readonly parent?: FiberInfo;
+    readonly parent?: Fiber;
+    signal: AbortSignal;
+    either: AbortSignal;
+    abort: (reason?: any) => void;
+    status: FiberStatus<T>;
+    constructor(runic: Runic<Rune, T>, parent?: Fiber);
+    static join<F extends Array<Fiber>>(fibers: F): Promise<{
+        [I in keyof F]: F[I]["T"];
+    }>;
+    resolution(this: Fiber<T>): Promise<T>;
 }
-export interface Fiber<T = any> {
-    parent?: Fiber | undefined;
-    info: FiberInfo;
-    resolve(): Promise<T>;
-}
-export declare function Fiber<T = any>(runic: Runic<Rune, T>, parent?: Fiber): Fiber<T>;

package/dist/Fiber.js

@@ -1,41 +1,78 @@
+import { attachCustomInspect } from "liminal-util";
 import { Context } from "./Context.js";
 import { Runic } from "./Runic.js";
-let nextIndex = 0;
-export function Fiber(runic, parent) {
-    let index = nextIndex++;
-    let pending;
-    const context = Context.ensure();
-    return {
-        parent,
-        info: {
-            index,
-            ...parent && { parent: parent.info },
-        },
-        resolve,
-    };
-    function resolve() {
-        if (!pending) {
-            const { promise, resolve, reject } = Promise.withResolvers();
-            pending = promise;
-            const iterator = Runic.unwrap(runic);
-            let nextArg;
-            context.run(async () => {
-                try {
-                    let current = await iterator.next();
-                    while (!current.done) {
-                        const rune = current.value;
-                        nextArg = await rune(this);
-                        current = await iterator.next(nextArg);
+export class Fiber {
+    static nextIndex = 0;
+    index = Fiber.nextIndex++;
+    #runic;
+    #context = Context.ensure();
+    signal;
+    either;
+    abort;
+    status = { type: "untouched" };
+    constructor(runic, parent) {
+        this.#runic = runic;
+        if (parent) {
+            this.parent = parent;
+        }
+        const controller = new AbortController();
+        this.signal = controller.signal;
+        this.either = AbortSignal.any([
+            ...this.parent?.signal ? [this.parent.signal] : [],
+            this.signal,
+        ]);
+        this.abort = controller.abort.bind(controller);
+    }
+    static async join(fibers) {
+        return await Promise.all(fibers.map((fiber) => fiber.resolution()));
+    }
+    resolution() {
+        const { status, abort } = this;
+        switch (status.type) {
+            case "untouched": {
+                const { promise, resolve, reject } = Promise.withResolvers();
+                this.status = {
+                    type: "pending",
+                    self: this.signal,
+                    promise,
+                };
+                const iterator = Runic.unwrap(this.#runic);
+                let nextArg;
+                this.#context.run(async () => {
+                    try {
+                        let current = await iterator.next();
+                        while (!current.done) {
+                            const rune = current.value;
+                            nextArg = await rune(this);
+                            current = await iterator.next(nextArg);
+                        }
+                        const { value } = current;
+                        abort();
+                        resolve(value);
                     }
-                    const { value } = current;
-                    resolve(value);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+                    catch (exception) {
+                        abort(exception);
+                        reject(exception);
+                    }
+                });
+                return promise;
+            }
+            case "pending": {
+                return status.promise;
+            }
+            case "resolved": {
+                return Promise.resolve(status.value);
+            }
+            case "rejected": {
+                return Promise.reject(status.exception);
+            }
+            case "aborted": {
+                return Promise.reject(status.reason);
+            }
         }
-        return pending;
+    }
+    static {
+        attachCustomInspect(this, ({ index, parent }) => ({ index, ...parent && { parent } }));
     }
 }
 //# sourceMappingURL=Fiber.js.map

package/dist/Fiber.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fiber.js","sourceRoot":"","sources":["../Fiber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAOlC,IAAI,SAAS,GAAG,CAAC,CAAA;AAQjB,MAAM,UAAU,KAAK,CAAU,KAAqB,EAAE,MAAc;IAClE,IAAI,KAAK,GAAG,SAAS,EAAE,CAAA;IACvB,IAAI,OAA+B,CAAA;IACnC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;IAChC,OAAO;QACL,MAAM;QACN,IAAI,EAAE;YACJ,KAAK;YACL,GAAG,MAAM,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE;SACrC;QACD,OAAO;KACR,CAAA;IAED,SAAS,OAAO;QACd,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAK,CAAA;YAC/D,OAAO,GAAG,OAAO,CAAA;YACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpC,IAAI,OAAgB,CAAA;YACpB,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrB,IAAI,CAAC;oBACH,IAAI,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;oBACnC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;wBACrB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAA;wBAC1B,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAA;wBAC1B,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBACxC,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;oBACzB,OAAO,CAAC,KAAK,CAAC,CAAA;gBAChB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CAAC,CAAA;gBACf,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC"}
+{"version":3,"file":"Fiber.js","sourceRoot":"","sources":["../Fiber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAmBlC,MAAM,OAAO,KAAK;IAChB,MAAM,CAAC,SAAS,GAAW,CAAC,CAAA;IAGnB,KAAK,GAAW,KAAK,CAAC,SAAS,EAAE,CAAA;IAE1C,MAAM,CAAgB;IAEtB,QAAQ,GAAY,OAAO,CAAC,MAAM,EAAE,CAAA;IAEpC,MAAM,CAAa;IACnB,MAAM,CAAa;IACnB,KAAK,CAAwB;IAE7B,MAAM,GAAmB,EAAE,IAAI,EAAE,WAAW,EAAE,CAAA;IAE9C,YAAY,KAAqB,EAAE,MAAc;QAC/C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACtB,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QACxC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QAC/B,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC;YAC5B,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;YAClD,IAAI,CAAC,MAAM;SACZ,CAAC,CAAA;QACF,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;IAChD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAyB,MAAS;QACjD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAU,CAAA;IAC9E,CAAC;IAED,UAAU;QACR,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAA;QAC9B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,WAAW,CAAC,CAAC,CAAC;gBACjB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAK,CAAA;gBAC/D,IAAI,CAAC,MAAM,GAAG;oBACZ,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,IAAI,CAAC,MAAM;oBACjB,OAAO;iBACR,CAAA;gBACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC1C,IAAI,OAAgB,CAAA;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;oBAC3B,IAAI,CAAC;wBACH,IAAI,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;wBACnC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;4BACrB,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAA;4BAC1B,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAA;4BAC1B,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;wBACxC,CAAC;wBACD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAA;wBACzB,KAAK,EAAE,CAAA;wBACP,OAAO,CAAC,KAAK,CAAC,CAAA;oBAChB,CAAC;oBAAC,OAAO,SAAS,EAAE,CAAC;wBACnB,KAAK,CAAC,SAAS,CAAC,CAAA;wBAChB,MAAM,CAAC,SAAS,CAAC,CAAA;oBACnB,CAAC;gBACH,CAAC,CAAC,CAAA;gBACF,OAAO,OAAO,CAAA;YAChB,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,OAAO,MAAM,CAAC,OAAO,CAAA;YACvB,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACtC,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACzC,CAAC;YACD,KAAK,SAAS,CAAC,CAAC,CAAC;gBACf,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED;QACE,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;IACxF,CAAC"}

package/dist/Handler.d.ts

@@ -1,4 +1,4 @@
 import { ContextHandle } from "./Context.ts";
-import type { RuntimeEvent } from "./RuntimeEvent.ts";
-export type Handler<E = any> = [(event: RuntimeEvent<E>) => void][0];
+import type { Fiber } from "./Fiber.ts";
+export type Handler<E = any> = [(this: Fiber, event: E) => void][0];
 export declare const HandlerContext: ContextHandle<Handler | undefined>;

package/dist/L/L.d.ts

@@ -3,6 +3,7 @@ export * from "./_infer.ts";
 export * from "./_message.ts";
 export * from "./assistant.ts";
 export * from "./branch.ts";
+export * from "./catch.ts";
 export * from "./emit.ts";
 export * from "./model.ts";
 export * from "./system.ts";