liminal 0.5.4 → 0.5.5

package/Agent.ts

@@ -1,28 +1,26 @@
-import type { FiberConfig, FiberInfo } from "./Fiber.ts"
+import { Context } from "./Context.ts"
 import { run } from "./run.ts"
 import type { Rune, RuneKey } from "./Rune.ts"
 import type { Runic } from "./Runic.ts"
+import { Fiber } from "./state/Fiber.ts"
+import { Globals } from "./state/Globals.ts"
 
 export interface Agent<out T, out E> extends PromiseLike<T> {
   T: T
   E: E
 }
 
-export function Agent<Y extends Rune, T>(runic: Runic<Y, T>, config?: AgentConfig<Y, T>): Agent<T, Rune.E<Y>> {
+export function Agent<Y extends Rune, T>(
+  runic: Runic<Y, T>,
+  globals?: Partial<Globals<Y[RuneKey]>>,
+): Agent<T, Rune.E<Y>> {
   return {
     then(onfulfilled, onrejected) {
-      return run(runic, {
-        T: null!,
-        globals: {
-          handler: config?.handler ?? (() => {}),
-        },
-        signal: config?.signal,
-      }).then(onfulfilled, onrejected)
+      const context = new Context([
+        [Globals.make, Globals.make(globals)],
+        [Fiber.make, Fiber.make()],
+      ])
+      return Context.storage.run(context, () => run(runic).then(onfulfilled, onrejected))
     },
   } satisfies Omit<Agent<T, Rune.E<Y>>, "E" | "T"> as never
 }
-
-export interface AgentConfig<Y extends Rune, _T> {
-  handler: (event: Y[RuneKey], info: FiberInfo) => void
-  signal?: AbortSignal
-}

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # liminal
 
+## 0.5.5
+
+### Patch Changes
+
+- 43afd27: Fixing misc. bugs and refactoring context management.
+
 ## 0.5.4
 
 ### Patch Changes

package/Context.ts

@@ -0,0 +1,44 @@
+import { assert } from "liminal-util"
+import { AsyncLocalStorage } from "node:async_hooks"
+
+export class Context extends Map<StateFactory, unknown> {
+  static storage: AsyncLocalStorage<Context> = new AsyncLocalStorage<Context>()
+
+  static make(context?: Context): Context {
+    const instance = new Context()
+    if (context) {
+      for (const [key, value] of context.entries()) {
+        instance.set(key, key(value))
+      }
+    }
+    return instance
+  }
+
+  static unwrap(): Context {
+    const context = this.storage.getStore()
+    assert(context)
+    return context
+  }
+
+  static get<T>(factory: StateFactory<T>): T | undefined {
+    return this.unwrap().get(factory) as never
+  }
+
+  static getAssert<T>(factory: StateFactory<T>): T {
+    const value = this.get(factory)
+    assert(value)
+    return value
+  }
+
+  static getOrInit<T>(factory: StateFactory<T>): T {
+    let context = this.unwrap()
+    let instance = context.get(factory)
+    if (!instance) {
+      instance = factory()
+      context.set(factory, instance)
+    }
+    return instance as never
+  }
+}
+
+export type StateFactory<T = any> = (instance?: T) => T

package/EventBase.ts

@@ -1,13 +1,26 @@
 import { inspect, type InspectOptions } from "node:util"
 
-export abstract class EventBase<B extends symbol, K extends string> {
-  constructor(
-    readonly brand: B,
-    readonly type: K,
-  ) {}
+export interface EventBase<B extends symbol = symbol, K extends string = string> {
+  readonly brand: B
+  readonly type: K
+}
+
+export function EventBase<B extends symbol, K extends string>(brand: B, type: K) {
+  return class implements EventBase<B, K> {
+    readonly brand = brand
+    readonly type = type
 
-  [inspect.custom](depth: number, options: InspectOptions) {
-    const { brand: _0, type: _1, ...rest } = this
-    return `${this.constructor.name} ` + inspect(rest, { ...options, depth })
+    // 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 })
+          },
+        },
+      })
+    }
   }
 }

package/L/L.ts

@@ -5,8 +5,6 @@ export * from "./assistant.ts"
 export * from "./branch.ts"
 export * from "./emit.ts"
 export * from "./fork.ts"
-export * from "./join.ts"
 export * from "./model.ts"
-export * from "./self.ts"
 export * from "./system.ts"
 export * from "./user.ts"

package/L/_infer.ts

@@ -1,20 +1,19 @@
 import type { SchemaObject } from "liminal-schema"
 import { assert } from "liminal-util"
+import { Context } from "../Context.ts"
 import { InferenceRequested, Inferred, type LEvent } from "../LEvent.ts"
 import type { Rune } from "../Rune.ts"
-import { context } from "../state/Context.ts"
 import { MessageRegistry } from "../state/MessageRegistry.ts"
 import { ModelRegistry } from "../state/ModelRegistry.ts"
 import { emit } from "./emit.ts"
 import { rune } from "./rune.ts"
 
 export function* _infer(schema?: SchemaObject): Generator<Rune<LEvent>, string> {
-  const state = context.get()
-  const modelRegistry = state.getOrInit(ModelRegistry.make)
+  const modelRegistry = Context.getOrInit(ModelRegistry.make)
   const model = modelRegistry.peek()
-  const messageRegistry = state.getOrInit(MessageRegistry.make)
-  const counter = state.getOrInit(InferenceRequestCounter)
   assert(model)
+  const messageRegistry = Context.getOrInit(MessageRegistry.make)
+  const counter = Context.getOrInit(InferenceRequestCounter)
   const requestId = counter.next()
   yield* emit(new InferenceRequested(requestId, schema))
   const inference = yield* rune(() => model.resolve(messageRegistry.messages, schema))

package/L/_message.ts

@@ -1,15 +1,14 @@
+import { Context } from "../Context.ts"
 import { type LEvent, MessageAppended } from "../LEvent.ts"
 import type { ContentPart, Message, MessageRole } from "../Message.ts"
 import type { Rune } from "../Rune.ts"
-import { context } from "../state/Context.ts"
 import { MessageRegistry } from "../state/MessageRegistry.ts"
 import { emit } from "./emit.ts"
 
 export interface _message extends Generator<Rune<LEvent>, void> {}
 
 export function* _message(role: MessageRole, content: Array<ContentPart>): _message {
-  const state = context.get()
-  const messageRegistry = state.getOrInit(MessageRegistry.make)
+  const messageRegistry = Context.getOrInit(MessageRegistry.make)
   const message: Message = { role, content }
   yield* emit(new MessageAppended(message))
   messageRegistry.append(message)

package/L/branch.ts

@@ -1,10 +1,9 @@
-import type { FiberConfig } from "../Fiber.ts"
+import { Context } from "../Context.ts"
 import { run } from "../run.ts"
 import { type Rune } from "../Rune.ts"
 import type { Runic } from "../Runic.ts"
-import { context } from "../state/Context.ts"
+import { Fiber } from "../state/Fiber.ts"
 import { rune } from "./rune.ts"
-import { self } from "./self.ts"
 
 export interface branch<Y extends Rune, T> extends Generator<Y, T> {}
 
@@ -16,36 +15,23 @@ export function branch<XR extends Record<keyof any, Runic>>(
   runics: XR,
 ): branch<Runic.Y<XR[keyof XR]> | Rune<never>, { [K in keyof XR]: Runic.T<XR[K]> }>
 export function* branch(value: Runic | Array<Runic> | Record<keyof any, Runic>): branch<Rune, any> {
-  const parent = yield* self
-  const { globals } = parent
+  const parent = Context.get(Fiber.make)
   if (Array.isArray(value)) {
     const runners = value.map((runic) => {
-      const state = context.get()
-      const fiberConfig: FiberConfig = {
-        T: null!,
-        globals,
-        state,
-      }
-      return () => run(runic, fiberConfig)
+      const context = Context.make(Context.unwrap())
+      context.set(Fiber.make, new Fiber(parent))
+      return () => run(runic, context)
     })
     return yield* rune(() => Promise.all(runners.map((runner) => runner())))
   } else if (typeof value === "object") {
     const runners = Object.entries(value).map(([key, runic]) => {
-      const state = context.get()
-      const fiberConfig: FiberConfig = {
-        T: null!,
-        globals,
-        state,
-      }
-      return async () => [key, await run(runic, fiberConfig)]
+      const context = Context.make(Context.unwrap())
+      context.set(Fiber.make, new Fiber(parent))
+      return async () => [key, await run(runic, context)]
     })
     return yield* rune(() => Promise.all(runners.map((runner) => runner())).then(Object.fromEntries))
   }
-  const state = context.get()
-  const fiberConfig: FiberConfig = {
-    T: null!,
-    globals,
-    state,
-  }
-  return yield* rune(() => run(typeof value === "function" ? value() : value, fiberConfig))
+  const context = Context.make(Context.unwrap())
+  context.set(Fiber.make, new Fiber(parent))
+  return yield* rune(() => run(typeof value === "function" ? value() : value, context))
 }

package/L/emit.ts

@@ -1,10 +1,16 @@
 import type { EnsureNarrow } from "liminal-util"
-import { handler } from "../Fiber.ts"
+import { Context } from "../Context.ts"
 import type { Rune } from "../Rune.ts"
-import { rune } from "./rune.ts"
+import { Fiber } from "../state/Fiber.ts"
+import { Globals } from "../state/Globals.ts"
 
 export interface emit<E> extends Generator<Rune<E>, void> {}
 
 export function* emit<const E>(event: EnsureNarrow<E>): emit<E> {
-  yield* rune((fiberConfig) => handler(fiberConfig, event))<E>()
+  const globals = Context.getAssert(Globals.make)
+  const fiber = Context.getAssert(Fiber.make)
+  globals.handler?.(event, {
+    fiber: fiber.index,
+    timestamp: Date.now(),
+  })
 }

package/L/model.ts

@@ -1,12 +1,11 @@
+import { Context } from "../Context.ts"
 import type { Model } from "../Model.ts"
 import type { Rune } from "../Rune.ts"
-import { context } from "../state/Context.ts"
 import { ModelRegistry } from "../state/ModelRegistry.ts"
 
 export interface model extends Generator<Rune<never>, void> {}
 
 export function* model(model: Model): model {
-  const state = context.get()
-  const modelRegistry = state.getOrInit(ModelRegistry.make)
+  const modelRegistry = Context.getOrInit(ModelRegistry.make)
   modelRegistry.register(model)
 }

package/L/rune.ts

@@ -1,11 +1,10 @@
-import type { FiberConfig } from "../Fiber.ts"
 import { type Rune, RuneKey } from "../Rune.ts"
 
 export interface rune<T> extends Iterable<Rune<never>, T> {
   <E>(): Generator<Rune<E>, T>
 }
 
-export function rune<R>(source: (fiberConfig: FiberConfig) => R): rune<Awaited<R>> {
+export function rune<R>(source: () => R): rune<Awaited<R>> {
   return Object.assign(
     function*<E>(): Generator<Rune<E>, Awaited<R>> {
       return yield Object.assign(source, { [RuneKey]: {} as never })

package/LEvent.ts

@@ -7,49 +7,39 @@ export type LEvent = InferenceRequested | Inferred | MessageAppended | FiberCrea
 export const LEventTag: unique symbol = Symbol.for("liminal/LEvent")
 export type LEventTag = typeof LEventTag
 
-export class InferenceRequested extends EventBase<LEventTag, "inference_requested"> {
+export class InferenceRequested extends EventBase(LEventTag, "inference_requested") {
   declare schema?: SchemaObject
   constructor(
     readonly requestId: number,
     schema?: SchemaObject | undefined,
   ) {
-    super(LEventTag, "inference_requested")
+    super()
     if (schema) {
       this.schema = schema
     }
   }
 }
 
-export class Inferred extends EventBase<LEventTag, "inferred"> {
+export class Inferred extends EventBase(LEventTag, "inferred") {
   constructor(
     readonly requestId: number,
     readonly inference: string,
   ) {
-    super(LEventTag, "inferred")
+    super()
   }
 }
 
-export class MessageAppended extends EventBase<LEventTag, "message_appended"> {
+export class MessageAppended extends EventBase(LEventTag, "message_appended") {
   constructor(readonly message: Message) {
-    super(LEventTag, "message_appended")
+    super()
   }
 }
 
-export class FiberCreated extends EventBase<LEventTag, "fiber_created"> {
-  constructor() {
-    super(LEventTag, "fiber_created")
-  }
-}
-
-export class FiberStarted extends EventBase<LEventTag, "fiber_started"> {
-  constructor() {
-    super(LEventTag, "fiber_started")
-  }
-}
-
-export class FiberResolved extends EventBase<LEventTag, "fiber_resolved"> {
+export class FiberCreated extends EventBase(LEventTag, "fiber_created") {}
+export class FiberStarted extends EventBase(LEventTag, "fiber_started") {}
+export class FiberResolved extends EventBase(LEventTag, "fiber_resolved") {
   constructor(readonly value: any) {
-    super(LEventTag, "fiber_resolved")
+    super()
   }
 }
 

package/Rune.ts

@@ -1,7 +1,5 @@
-import type { FiberConfig } from "./Fiber.ts"
-
 export interface Rune<out E = any> {
-  (fiber: FiberConfig): any
+  (): any
   [RuneKey]: E
 }
 

package/dist/Agent.d.ts

@@ -1,12 +1,8 @@
-import type { FiberInfo } from "./Fiber.ts";
 import type { Rune, RuneKey } from "./Rune.ts";
 import type { Runic } from "./Runic.ts";
+import { Globals } from "./state/Globals.ts";
 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<Y, T>): Agent<T, Rune.E<Y>>;
-export interface AgentConfig<Y extends Rune, _T> {
-    handler: (event: Y[RuneKey], info: FiberInfo) => void;
-    signal?: AbortSignal;
-}
+export declare function Agent<Y extends Rune, T>(runic: Runic<Y, T>, globals?: Partial<Globals<Y[RuneKey]>>): Agent<T, Rune.E<Y>>;

package/dist/Agent.js

@@ -1,14 +1,15 @@
+import { Context } from "./Context.js";
 import { run } from "./run.js";
-export function Agent(runic, config) {
+import { Fiber } from "./state/Fiber.js";
+import { Globals } from "./state/Globals.js";
+export function Agent(runic, globals) {
     return {
         then(onfulfilled, onrejected) {
-            return run(runic, {
-                T: null,
-                globals: {
-                    handler: config?.handler ?? (() => { }),
-                },
-                signal: config?.signal,
-            }).then(onfulfilled, onrejected);
+            const context = new Context([
+                [Globals.make, Globals.make(globals)],
+                [Fiber.make, Fiber.make()],
+            ]);
+            return Context.storage.run(context, () => run(runic).then(onfulfilled, onrejected));
         },
     };
 }

package/dist/Agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"Agent.js","sourceRoot":"","sources":["../Agent.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAS9B,MAAM,UAAU,KAAK,CAAoB,KAAkB,EAAE,MAA0B;IACrF,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,UAAU;YAC1B,OAAO,GAAG,CAAC,KAAK,EAAE;gBAChB,CAAC,EAAE,IAAK;gBACR,OAAO,EAAE;oBACP,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;iBACvC;gBACD,MAAM,EAAE,MAAM,EAAE,MAAM;aACvB,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAClC,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,GAAG,EAAE,MAAM,UAAU,CAAA;AAG9B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAO5C,MAAM,UAAU,KAAK,CACnB,KAAkB,EAClB,OAAsC;IAEtC,OAAO;QACL,IAAI,CAAC,WAAW,EAAE,UAAU;YAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;gBAC1B,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;aAC3B,CAAC,CAAA;YACF,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAA;QACrF,CAAC;KACsD,CAAA;AAC3D,CAAC"}

package/dist/Context.d.ts

@@ -0,0 +1,10 @@
+import { AsyncLocalStorage } from "node:async_hooks";
+export declare class Context extends Map<StateFactory, unknown> {
+    static storage: AsyncLocalStorage<Context>;
+    static make(context?: Context): Context;
+    static unwrap(): Context;
+    static get<T>(factory: StateFactory<T>): T | undefined;
+    static getAssert<T>(factory: StateFactory<T>): T;
+    static getOrInit<T>(factory: StateFactory<T>): T;
+}
+export type StateFactory<T = any> = (instance?: T) => T;

package/dist/Context.js

@@ -0,0 +1,37 @@
+import { assert } from "liminal-util";
+import { AsyncLocalStorage } from "node:async_hooks";
+export class Context extends Map {
+    static storage = new AsyncLocalStorage();
+    static make(context) {
+        const instance = new Context();
+        if (context) {
+            for (const [key, value] of context.entries()) {
+                instance.set(key, key(value));
+            }
+        }
+        return instance;
+    }
+    static unwrap() {
+        const context = this.storage.getStore();
+        assert(context);
+        return context;
+    }
+    static get(factory) {
+        return this.unwrap().get(factory);
+    }
+    static getAssert(factory) {
+        const value = this.get(factory);
+        assert(value);
+        return value;
+    }
+    static getOrInit(factory) {
+        let context = this.unwrap();
+        let instance = context.get(factory);
+        if (!instance) {
+            instance = factory();
+            context.set(factory, instance);
+        }
+        return instance;
+    }
+}
+//# sourceMappingURL=Context.js.map

package/dist/Context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Context.js","sourceRoot":"","sources":["../Context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAEpD,MAAM,OAAO,OAAQ,SAAQ,GAA0B;IACrD,MAAM,CAAC,OAAO,GAA+B,IAAI,iBAAiB,EAAW,CAAA;IAE7E,MAAM,CAAC,IAAI,CAAC,OAAiB;QAC3B,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAA;QAC9B,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC7C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,MAAM,CAAC,MAAM;QACX,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;QACvC,MAAM,CAAC,OAAO,CAAC,CAAA;QACf,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,MAAM,CAAC,GAAG,CAAI,OAAwB;QACpC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,OAAO,CAAU,CAAA;IAC5C,CAAC;IAED,MAAM,CAAC,SAAS,CAAI,OAAwB;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC/B,MAAM,CAAC,KAAK,CAAC,CAAA;QACb,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,CAAC,SAAS,CAAI,OAAwB;QAC1C,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QAC3B,IAAI,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACnC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,OAAO,EAAE,CAAA;YACpB,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAChC,CAAC;QACD,OAAO,QAAiB,CAAA;IAC1B,CAAC"}

package/dist/EventBase.d.ts

@@ -1,7 +1,10 @@
-import { inspect, type InspectOptions } from "node:util";
-export declare abstract class EventBase<B extends symbol, K extends string> {
+export interface EventBase<B extends symbol = symbol, K extends string = string> {
     readonly brand: B;
     readonly type: K;
-    constructor(brand: B, type: K);
-    [inspect.custom](depth: number, options: InspectOptions): string;
 }
+export declare function EventBase<B extends symbol, K extends string>(brand: B, type: K): {
+    new (): {
+        readonly brand: B;
+        readonly type: K;
+    };
+};

package/dist/EventBase.js

@@ -1,14 +1,20 @@
 import { inspect } from "node:util";
-export class EventBase {
-    brand;
-    type;
-    constructor(brand, type) {
-        this.brand = brand;
-        this.type = type;
-    }
-    [inspect.custom](depth, options) {
-        const { brand: _0, type: _1, ...rest } = this;
-        return `${this.constructor.name} ` + inspect(rest, { ...options, depth });
-    }
+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 });
+                    },
+                },
+            });
+        }
+    };
 }
 //# sourceMappingURL=EventBase.js.map

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;AAExD,MAAM,OAAgB,SAAS;IAElB;IACA;IAFX,YACW,KAAQ,EACR,IAAO;QADP,UAAK,GAAL,KAAK,CAAG;QACR,SAAI,GAAJ,IAAI,CAAG;IACf,CAAC;IAEJ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAa,EAAE,OAAuB;QACrD,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;QAC7C,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3E,CAAC;CACF"}
+{"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"}

package/dist/L/L.d.ts

@@ -5,8 +5,6 @@ export * from "./assistant.ts";
 export * from "./branch.ts";
 export * from "./emit.ts";
 export * from "./fork.ts";
-export * from "./join.ts";
 export * from "./model.ts";
-export * from "./self.ts";
 export * from "./system.ts";
 export * from "./user.ts";

package/dist/L/L.js

@@ -5,9 +5,7 @@ export * from "./assistant.js";
 export * from "./branch.js";
 export * from "./emit.js";
 export * from "./fork.js";
-export * from "./join.js";
 export * from "./model.js";
-export * from "./self.js";
 export * from "./system.js";
 export * from "./user.js";
 //# sourceMappingURL=L.js.map

package/dist/L/L.js.map

@@ -1 +1 @@
-{"version":3,"file":"L.js","sourceRoot":"","sources":["../../L/L.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,WAAW,CAAA;AACzB,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"L.js","sourceRoot":"","sources":["../../L/L.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAA;AACxC,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}

package/dist/L/_infer.js

@@ -1,17 +1,16 @@
 import { assert } from "liminal-util";
+import { Context } from "../Context.js";
 import { InferenceRequested, Inferred } from "../LEvent.js";
-import { context } from "../state/Context.js";
 import { MessageRegistry } from "../state/MessageRegistry.js";
 import { ModelRegistry } from "../state/ModelRegistry.js";
 import { emit } from "./emit.js";
 import { rune } from "./rune.js";
 export function* _infer(schema) {
-    const state = context.get();
-    const modelRegistry = state.getOrInit(ModelRegistry.make);
+    const modelRegistry = Context.getOrInit(ModelRegistry.make);
     const model = modelRegistry.peek();
-    const messageRegistry = state.getOrInit(MessageRegistry.make);
-    const counter = state.getOrInit(InferenceRequestCounter);
     assert(model);
+    const messageRegistry = Context.getOrInit(MessageRegistry.make);
+    const counter = Context.getOrInit(InferenceRequestCounter);
     const requestId = counter.next();
     yield* emit(new InferenceRequested(requestId, schema));
     const inference = yield* rune(() => model.resolve(messageRegistry.messages, schema));

package/dist/L/_infer.js.map

@@ -1 +1 @@
-{"version":3,"file":"_infer.js","sourceRoot":"","sources":["../../L/_infer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAA;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAqB;IAC3C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC3B,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IACzD,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,EAAE,CAAA;IAClC,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAA;IACxD,MAAM,CAAC,KAAK,CAAC,CAAA;IACb,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;IAChC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IACtD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IACpF,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IAC/C,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB;IACjD,OAAO;QACL,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;QAC3B,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,EAAE,CAAA;QACrB,CAAC;QACD,KAAK;YACH,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;KACF,CAAA;AACH,CAAC"}
+{"version":3,"file":"_infer.js","sourceRoot":"","sources":["../../L/_infer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAe,MAAM,cAAc,CAAA;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAqB;IAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IAC3D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,EAAE,CAAA;IAClC,MAAM,CAAC,KAAK,CAAC,CAAA;IACb,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAA;IAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;IAChC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;IACtD,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IACpF,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;IAC/C,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB;IACjD,OAAO;QACL,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,CAAC;QAC3B,IAAI;YACF,OAAO,IAAI,CAAC,KAAK,EAAE,CAAA;QACrB,CAAC;QACD,KAAK;YACH,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAA;QACtC,CAAC;KACF,CAAA;AACH,CAAC"}

package/dist/L/_message.js

@@ -1,10 +1,9 @@
+import { Context } from "../Context.js";
 import { MessageAppended } from "../LEvent.js";
-import { context } from "../state/Context.js";
 import { MessageRegistry } from "../state/MessageRegistry.js";
 import { emit } from "./emit.js";
 export function* _message(role, content) {
-    const state = context.get();
-    const messageRegistry = state.getOrInit(MessageRegistry.make);
+    const messageRegistry = Context.getOrInit(MessageRegistry.make);
     const message = { role, content };
     yield* emit(new MessageAppended(message));
     messageRegistry.append(message);

package/dist/L/_message.js.map

@@ -1 +1 @@
-{"version":3,"file":"_message.js","sourceRoot":"","sources":["../../L/_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,eAAe,EAAE,MAAM,cAAc,CAAA;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAIhC,MAAM,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAiB,EAAE,OAA2B;IACtE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC3B,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC7D,MAAM,OAAO,GAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC1C,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACjC,CAAC"}
+{"version":3,"file":"_message.js","sourceRoot":"","sources":["../../L/_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAe,eAAe,EAAE,MAAM,cAAc,CAAA;AAG3D,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAIhC,MAAM,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAiB,EAAE,OAA2B;IACtE,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;IAC/D,MAAM,OAAO,GAAY,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;IAC1C,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CAAA;IACzC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AACjC,CAAC"}