liminal 0.5.1 → 0.5.2

package/dist/Scope.js

@@ -1,4 +1,4 @@
-export function RootScope(defaultLanguageModel, args, handler = () => { }, signal) {
+export function RootScope({ signal, args, handler, default: defaultLanguageModel, }) {
     const controller = new AbortController();
     signal?.addEventListener("abort", () => {
         controller.abort();
@@ -14,6 +14,7 @@ export function RootScope(defaultLanguageModel, args, handler = () => { }, signa
         languageModels: new Set([defaultLanguageModel]),
         embeddingModels: new Set(),
         childForkCounts: {},
+        sections: new Set(),
         index: 0,
         reduce,
         fork,
@@ -21,14 +22,14 @@ export function RootScope(defaultLanguageModel, args, handler = () => { }, signa
         event,
     };
 }
-async function reduce(actor) {
+async function reduce(agent) {
     const { signal } = this.controller;
     let scope = { ...this };
     if (signal.aborted)
         return scope;
     let value;
     try {
-        let current = await actor.next();
+        let current = await agent.next();
         while (!current.done) {
             const { value } = current;
             if (signal.aborted)
@@ -36,7 +37,7 @@ async function reduce(actor) {
             scope = await value.reducer(scope);
             if (signal.aborted)
                 return scope;
-            current = await actor.next(scope.nextArg);
+            current = await agent.next(scope.nextArg);
         }
         value = current.value;
     }
@@ -49,7 +50,7 @@ async function reduce(actor) {
         nextArg: undefined,
     };
 }
-function fork(type, subpath) {
+function fork(type, subpath, overrides) {
     const subpathStr = subpath.join(" ");
     let index = this.childForkCounts[subpathStr];
     if (typeof index === "number") {
@@ -73,9 +74,11 @@ function fork(type, subpath) {
         parent: this,
         value: undefined,
         index,
+        sections: new Set(this.sections),
         reduce,
         fork,
         event,
+        ...overrides ?? {},
     };
     f.event({ type: "forked" });
     return f;

package/dist/Scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../Scope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../Scope.ts"],"names":[],"mappings":"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"}

package/dist/Tool.d.ts

@@ -1,6 +1,6 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import type { Action } from "./Action.ts";
-import type { Actor } from "./Actor.ts";
+import type { Agent } from "./Agent.ts";
 import type { Scope } from "./Scope.ts";
 import type { JSONKey } from "./util/JSONKey.ts";
 import type { JSONObject } from "./util/JSONObject.ts";
@@ -16,6 +16,6 @@ export interface Tool<K extends JSONKey = JSONKey> extends ToolConfig<K> {
     executor: (scope: Scope) => ToolExecutor;
 }
 export declare function Tool<K extends JSONKey>(config: ToolConfig<K>): Tool<K>;
-export type ToolImplementation = (params: any) => Actor<Action, ToolResult> | PromiseOr<ToolResult>;
+export type ToolImplementation = (params: any) => Agent<Action, ToolResult> | PromiseOr<ToolResult>;
 export type ToolExecutor = (args: any) => Promise<JSONValue>;
 export type ToolResult = JSONValue | void;

package/dist/actions/actions_derived/clear.js

@@ -1,5 +1,5 @@
-import { setMessages } from "../../actions/setMessages.js";
+import { messages } from "../messages.js";
 export function clear() {
-    return setMessages(() => []);
+    return messages(() => []);
 }
 //# sourceMappingURL=clear.js.map

package/dist/actions/actions_derived/clear.js.map

@@ -1 +1 @@
-{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../../actions/actions_derived/clear.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAG1D,MAAM,UAAU,KAAK;IACnB,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;AAC9B,CAAC"}
+{"version":3,"file":"clear.js","sourceRoot":"","sources":["../../../actions/actions_derived/clear.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,MAAM,UAAU,KAAK;IACnB,OAAO,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;AAC3B,CAAC"}

package/dist/actions/actions_derived/declareModel.d.ts

@@ -1,5 +1,5 @@
-import type { Model } from "../../Model.ts";
+import type { Models, ModelType } from "../../Model.ts";
 import type { JSONKey } from "../../util/JSONKey.ts";
 import { declareArg } from "../declareArg.ts";
 import { pushModel } from "../pushModel.ts";
-export declare function declareModel<K extends JSONKey>(key: K): Generator<declareArg<K, Model> | pushModel<K, "language" | "embedding">, Generator<import("../removeModel.ts").removeModel<K, "language" | "embedding">, void, any>, any>;
+export declare function declareModel<K extends JSONKey, M extends ModelType>(key: K, _modelType: M): Generator<declareArg<K, Models[M]> | pushModel<K, Models[M]["type"]>, Generator<import("../pushModel.ts").removeModel<K, Models[M]["type"]>, void, any>, any>;

package/dist/actions/actions_derived/declareModel.js

@@ -1,6 +1,6 @@
 import { declareArg } from "../declareArg.js";
 import { pushModel } from "../pushModel.js";
-export function* declareModel(key) {
+export function* declareModel(key, _modelType) {
     const model = yield* declareArg(key)();
     return yield* pushModel(key, model);
 }

package/dist/actions/actions_derived/declareModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"declareModel.js","sourceRoot":"","sources":["../../../actions/actions_derived/declareModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,SAAS,CAAC,CAAC,YAAY,CAAoB,GAAM;IACrD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAS,CAAA;IAC7C,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACrC,CAAC"}
+{"version":3,"file":"declareModel.js","sourceRoot":"","sources":["../../../actions/actions_derived/declareModel.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAE3C,MAAM,SAAS,CAAC,CAAC,YAAY,CAAyC,GAAM,EAAE,UAAa;IACzF,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAa,CAAA;IACjD,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;AACrC,CAAC"}

package/dist/actions/actions_derived/declareModel.test.js

@@ -1,20 +1,20 @@
 import { describe, expect, it } from "bun:test";
-import { Exec } from "../../Exec.js";
+import { exec } from "../../Exec.js";
 import * as L from "../../L.js";
 import { TestEmbeddingModel } from "../../testing/TestEmbeddingModel.js";
 import { TestLanguageModel } from "../../testing/TestLanguageModel.js";
 describe("Model", () => {
     it("generates the expected event sequence", async () => {
         const events = [];
-        await Exec(function* () {
-            const a = yield* L.declareModel("secondary");
+        await exec(function* () {
+            const a = yield* L.declareModel("secondary", "language");
             yield* L.branch("fork-key", function* () {
-                const b = yield* L.declareModel("child_a");
-                const c = yield* L.declareModel("child_b");
+                const b = yield* L.declareModel("child_a", "language");
+                const c = yield* L.declareModel("child_b", "embedding");
                 yield* b;
                 yield* c;
             });
-            const c = yield* L.declareModel("tertiary");
+            const c = yield* L.declareModel("tertiary", "embedding");
             yield* a;
             yield* c;
         }, {
@@ -25,7 +25,10 @@ describe("Model", () => {
                 child_b: TestEmbeddingModel(),
                 tertiary: TestEmbeddingModel(),
             },
-        })((event) => events.push(event));
+            handler(event) {
+                events.push(event);
+            },
+        });
         expect(JSON.stringify(events, null, 2)).toMatchSnapshot();
     });
 });

package/dist/actions/actions_derived/declareModel.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"declareModel.test.js","sourceRoot":"","sources":["../../../actions/actions_derived/declareModel.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAEtE,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,MAAM,GAAkB,EAAE,CAAA;QAChC,MAAM,IAAI,CAAC,QAAQ,CAAC;YAClB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;YAC5C,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC;gBACnC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;gBAC1C,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,CAAA;gBAC1C,KAAK,CAAC,CAAC,CAAC,CAAA;gBACR,KAAK,CAAC,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAA;YAC3C,KAAK,CAAC,CAAC,CAAC,CAAA;YACR,KAAK,CAAC,CAAC,CAAC,CAAA;QACV,CAAC,EAAE;YACD,OAAO,EAAE,iBAAiB,EAAE;YAC5B,IAAI,EAAE;gBACJ,SAAS,EAAE,iBAAiB,EAAE;gBAC9B,OAAO,EAAE,iBAAiB,EAAE;gBAC5B,OAAO,EAAE,kBAAkB,EAAE;gBAC7B,QAAQ,EAAE,kBAAkB,EAAE;aAC/B;SACF,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;QACjC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;IAC3D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
+{"version":3,"file":"declareModel.test.js","sourceRoot":"","sources":["../../../actions/actions_derived/declareModel.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAAU,CAAA;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,KAAK,CAAC,MAAM,YAAY,CAAA;AAC/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAEtE,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,MAAM,GAAkB,EAAE,CAAA;QAChC,MAAM,IAAI,CAAC,QAAQ,CAAC;YAClB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;YACxD,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC;gBACnC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;gBACtD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;gBACvD,KAAK,CAAC,CAAC,CAAC,CAAA;gBACR,KAAK,CAAC,CAAC,CAAC,CAAA;YACV,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;YACxD,KAAK,CAAC,CAAC,CAAC,CAAA;YACR,KAAK,CAAC,CAAC,CAAC,CAAA;QACV,CAAC,EAAE;YACD,OAAO,EAAE,iBAAiB,EAAE;YAC5B,IAAI,EAAE;gBACJ,SAAS,EAAE,iBAAiB,EAAE;gBAC9B,OAAO,EAAE,iBAAiB,EAAE;gBAC5B,OAAO,EAAE,kBAAkB,EAAE;gBAC7B,QAAQ,EAAE,kBAAkB,EAAE;aAC/B;YACD,OAAO,CAAC,KAAK;gBACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACpB,CAAC;SACF,CAAC,CAAA;QACF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAA;IAC3D,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/actions/actions_derived/messages.d.ts

@@ -1,6 +1,6 @@
 import type { AssistantContent, UserContent } from "../../Message.ts";
 import { type TaggableArgs } from "../../util/Taggable.ts";
 import { appendMessage } from "../appendMessage.ts";
-export declare function user(...args: TaggableArgs<[content: UserContent]>): Generator<appendMessage<import("../../Message.ts").UserMessage>, Generator<import("../removeMessage.ts").removeMessage, void, any>, any>;
-export declare function system(...args: TaggableArgs<[content: string]>): Generator<appendMessage<import("../../Message.ts").SystemMessage>, Generator<import("../removeMessage.ts").removeMessage, void, any>, any>;
-export declare function assistant(...args: TaggableArgs<[content: AssistantContent]>): Generator<appendMessage<import("../../Message.ts").AssistantMessage>, Generator<import("../removeMessage.ts").removeMessage, void, any>, any>;
+export declare function user(...args: TaggableArgs<[content: UserContent]>): Generator<appendMessage<import("../../Message.ts").UserMessage>, Generator<import("../appendMessage.ts").removeMessage, void, any>, any>;
+export declare function system(...args: TaggableArgs<[content: string]>): Generator<appendMessage<import("../../Message.ts").SystemMessage>, Generator<import("../appendMessage.ts").removeMessage, void, any>, any>;
+export declare function assistant(...args: TaggableArgs<[content: AssistantContent]>): Generator<appendMessage<import("../../Message.ts").AssistantMessage>, Generator<import("../appendMessage.ts").removeMessage, void, any>, any>;

package/dist/actions/actions_derived/messages.js.map

@@ -1 +1 @@
-{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../actions/actions_derived/messages.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAqB,MAAM,wBAAwB,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,UAAU,IAAI,CAAC,GAAG,IAA0C;IAChE,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG,IAAqC;IAC7D,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAG,IAA+C;IAC1E,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC5C,CAAC"}
+{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../actions/actions_derived/messages.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAqB,MAAM,wBAAwB,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,UAAU,IAAI,CAAC,GAAG,IAA0C;IAChE,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,GAAG,IAAqC;IAC7D,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAG,IAA+C;IAC1E,MAAM,CAAC,OAAO,CAAC,GAAG,qBAAqB,CAAC,GAAG,IAAI,CAAC,CAAA;IAChD,OAAO,aAAa,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC5C,CAAC"}

package/dist/actions/actions_derived/readers_derived.d.ts

@@ -0,0 +1,6 @@
+export declare const tools: {
+    [Symbol.iterator](): Generator<import("../scope.ts").getScope, Set<import("../../Tool.ts").Tool<import("../../index.ts").JSONKey>>, any>;
+};
+export declare const signal: {
+    [Symbol.iterator](): Generator<import("../scope.ts").getScope, AbortSignal, any>;
+};

package/dist/actions/actions_derived/readers_derived.js

@@ -0,0 +1,14 @@
+import { scope } from "../scope.js";
+export const tools = {
+    *[Symbol.iterator]() {
+        const scope_ = yield* scope;
+        return scope_.tools;
+    },
+};
+export const signal = {
+    *[Symbol.iterator]() {
+        const scope_ = yield* scope;
+        return scope_.controller.signal;
+    },
+};
+//# sourceMappingURL=readers_derived.js.map

package/dist/actions/actions_derived/readers_derived.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readers_derived.js","sourceRoot":"","sources":["../../../actions/actions_derived/readers_derived.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEnC,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QAC3B,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;CACF,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAA;QAC3B,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAA;IACjC,CAAC;CACF,CAAA"}

package/dist/actions/appendMessage.d.ts

@@ -1,10 +1,14 @@
 import { Action } from "../Action.ts";
 import type { MessageAppended } from "../events/MessageAppended.ts";
+import type { MessageRemoved } from "../events/MessageRemoved.ts";
 import type { Message, MessageContents, MessageRole, Messages } from "../Message.ts";
 import type { Spec } from "../Spec.ts";
-import { removeMessage } from "./removeMessage.ts";
-export interface appendMessage<M extends Message> extends Action<"append_message", Spec.Make<{
+export interface appendMessage<M extends Message = Message> extends Action<"append_message", Spec.Make<{
     Event: MessageAppended<M>;
 }>> {
 }
+export interface removeMessage extends Action<"remove_message", Spec.Make<{
+    Event: MessageRemoved;
+}>> {
+}
 export declare function appendMessage<R extends MessageRole>(role: R, content: MessageContents[R]): Generator<appendMessage<Messages[R]>, Generator<removeMessage, void>>;

package/dist/actions/appendMessage.js

@@ -1,18 +1,39 @@
 import { Action } from "../Action.js";
-import { removeMessage } from "./removeMessage.js";
+import { peekLast } from "../util/peekLast.js";
 export function* appendMessage(role, content) {
     return yield Action("append_message", (scope) => {
         const message = {
             role,
             content,
         }; // <-- why isn't this inferred?
+        const section = peekLast(scope.sections);
+        if (section) {
+            section.messages.add(message);
+        }
         scope.event({
             type: "message_appended",
             message,
         });
         return {
             ...scope,
-            nextArg: removeMessage(message),
+            nextArg: (function* () {
+                return yield Action("remove_message", (scope) => {
+                    scope.event({
+                        type: "message_removed",
+                        message,
+                    });
+                    const messages = new Set(scope.messages);
+                    messages.delete(message);
+                    if (section) {
+                        section.messages.delete(message);
+                    }
+                    return {
+                        ...scope,
+                        nextArg: message,
+                        messages,
+                    };
+                });
+            })(),
             messages: new Set([...scope.messages, message]),
         };
     });

package/dist/actions/appendMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"appendMessage.js","sourceRoot":"","sources":["../../actions/appendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAMlD,MAAM,SAAS,CAAC,CAAC,aAAa,CAC5B,IAAO,EACP,OAA2B;IAE3B,OAAO,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG;YACd,IAAI;YACJ,OAAO;SACO,CAAA,CAAC,+BAA+B;QAChD,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,kBAAkB;YACxB,OAAO;SACR,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC;YAC/B,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"appendMessage.js","sourceRoot":"","sources":["../../actions/appendMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAKrC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAQ9C,MAAM,SAAS,CAAC,CAAC,aAAa,CAC5B,IAAO,EACP,OAA2B;IAE3B,OAAO,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG;YACd,IAAI;YACJ,OAAO;SACO,CAAA,CAAC,+BAA+B;QAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACxC,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;QACD,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,kBAAkB;YACxB,OAAO;SACR,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,CAAC,QAAQ,CAAC;gBACjB,OAAO,MAAM,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC9C,KAAK,CAAC,KAAK,CAAC;wBACV,IAAI,EAAE,iBAAiB;wBACvB,OAAO;qBACR,CAAC,CAAA;oBACF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;oBACxC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;oBACxB,IAAI,OAAO,EAAE,CAAC;wBACZ,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;oBAClC,CAAC;oBACD,OAAO;wBACL,GAAG,KAAK;wBACR,OAAO,EAAE,OAAO;wBAChB,QAAQ;qBACT,CAAA;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,EAAE;YACJ,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/actions/branch.d.ts

@@ -1,35 +1,39 @@
 import { Action } from "../Action.ts";
-import type { ActorLike, ActorLikeArray, ActorLikeRecord, ActorLikesT, ActorLikeT, ActorLikeY } from "../Actor.ts";
+import type { AgentLike, AgentLikeT, AgentLikeY } from "../Agent.ts";
 import type { Spec } from "../Spec.ts";
 import type { JSONKey } from "../util/JSONKey.ts";
-export declare function branch<K extends JSONKey, Y extends Action, T>(key: K, actorLike: ActorLike<Y, T>): Generator<Action<"branch", Spec.Make<{
+export declare function branch<K extends JSONKey, Y extends Action, T>(key: K, agentLike: AgentLike<Y, T>): Generator<Action<"branch", Spec.Make<{
     Child: [Y[""]] extends [never] ? never : [K, Y[""]];
     Entry: Y[""]["Entry"];
     Value: T;
 }>>, T>;
-export declare function branch<K extends JSONKey, const A extends ActorLikeArray>(name: K, actorLikeArray: A): Generator<Action<"branch", Spec.Make<{
+export declare function branch<K extends JSONKey, const A extends Array<AgentLike>>(name: K, agentLikes: A): Generator<Action<"branch", Spec.Make<{
     Child: [
         K,
         {
             [L in keyof A]: Spec.Make<{
-                Child: [L, ActorLikeY<A[L]>[""]];
-                Entry: ActorLikeY<A[L]>[""]["Entry"];
-                Value: ActorLikeT<A[L]>;
+                Child: [L, AgentLikeY<A[L]>[""]];
+                Entry: AgentLikeY<A[L]>[""]["Entry"];
+                Value: AgentLikeT<A[L]>;
             }>;
         }[keyof A]
     ];
-    Entry: ActorLikeY<A[number]>[""]["Entry"];
-}>>, ActorLikesT<A>>;
-export declare function branch<K extends JSONKey, A extends ActorLikeRecord>(name: K, actorLikeRecord: A): Generator<Action<"branch", Spec.Make<{
+    Entry: AgentLikeY<A[number]>[""]["Entry"];
+}>>, AgentLikesT<A>>;
+export declare function branch<K extends JSONKey, A extends Record<JSONKey, AgentLike>>(name: K, agentLikes: A): Generator<Action<"branch", Spec.Make<{
     Child: [
         K,
         {
             [L in Exclude<keyof A, symbol>]: Spec.Make<{
-                Child: [L, ActorLikeY<A[L]>[""]];
-                Entry: ActorLikeY<A[L]>[""]["Entry"];
-                Value: ActorLikeT<A[L]>;
+                Child: [L, AgentLikeY<A[L]>[""]];
+                Entry: AgentLikeY<A[L]>[""]["Entry"];
+                Value: AgentLikeT<A[L]>;
             }>;
         }[Exclude<keyof A, symbol>]
     ];
-    Entry: ActorLikeY<A[keyof A]>[""]["Entry"];
-}>>, ActorLikesT<A>>;
+    Entry: AgentLikeY<A[keyof A]>[""]["Entry"];
+}>>, AgentLikesT<A>>;
+export type AgentLikes = Array<AgentLike> | Record<JSONKey, AgentLike>;
+export type AgentLikesT<A extends AgentLikes> = {
+    -readonly [K in keyof A]: A[K] extends AgentLike<Action, infer T> ? T : never;
+} & {};

package/dist/actions/branch.js

@@ -1,11 +1,11 @@
 import { Action } from "../Action.js";
 import { unwrapDeferred } from "../util/unwrapDeferred.js";
-export function* branch(key, implementation) {
+export function* branch(key, a1) {
     return yield Action("branch", async (scope) => {
-        if (typeof implementation === "function") {
+        if (typeof a1 === "function") {
             const branchScope = scope.fork("branch", [key]);
-            const actor = unwrapDeferred(implementation);
-            const { value } = await branchScope.reduce(actor);
+            const agent = unwrapDeferred(a1);
+            const { value } = await branchScope.reduce(agent);
             branchScope.event({
                 type: "returned",
                 value,
@@ -15,20 +15,20 @@ export function* branch(key, implementation) {
                 nextArg: value,
             };
         }
-        const armKeys = Array.isArray(implementation)
-            ? Array.from({ length: implementation.length }, (_0, i) => i)
-            : Reflect.ownKeys(implementation);
+        const armKeys = Array.isArray(a1)
+            ? Array.from({ length: a1.length }, (_0, i) => i)
+            : Reflect.ownKeys(a1);
         const values = await Promise.all(armKeys.map(async (armKey) => {
             const branchArmScope = scope.fork("branch_arm", [key, armKey]);
-            const actor = unwrapDeferred(implementation[armKey]);
-            const { value } = await branchArmScope.reduce(actor);
+            const agent = unwrapDeferred(a1[armKey]);
+            const { value } = await branchArmScope.reduce(agent);
             branchArmScope.event({
                 type: "returned",
                 value,
             });
             return value;
         }));
-        const value = Array.isArray(implementation)
+        const value = Array.isArray(a1)
             ? values
             : Object.fromEntries(armKeys.map((key, i) => [key, values[i]]));
         return {

package/dist/actions/branch.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../actions/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAarC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AA0D1D,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,GAAY,EAAE,cAAsC;IAC1E,OAAO,MAAM,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;YACzC,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,cAA2B,CAAC,CAAA;YACzD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjD,WAAW,CAAC,KAAK,CAAC;gBAChB,IAAI,EAAE,UAAU;gBAChB,KAAK;aACN,CAAC,CAAA;YACF,OAAO;gBACL,GAAG,KAAK;gBACR,OAAO,EAAE,KAAK;aACf,CAAA;QACH,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;YAC3C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAkB,CAAA;QACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9D,MAAM,KAAK,GAAG,cAAc,CAAC,cAAc,CAAC,MAAe,CAAC,CAAU,CAAA;YACtE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpD,cAAc,CAAC,KAAK,CAAC;gBACnB,IAAI,EAAE,UAAU;gBAChB,KAAK;aACN,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAC,CAAA;QACH,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;YACzC,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACjE,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../actions/branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AA0D1D,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,GAAY,EAAE,EAA0B;IAC9D,OAAO,MAAM,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE,CAAC;YAC7B,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;YAC/C,MAAM,KAAK,GAAG,cAAc,CAAC,EAAe,CAAC,CAAA;YAC7C,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjD,WAAW,CAAC,KAAK,CAAC;gBAChB,IAAI,EAAE,UAAU;gBAChB,KAAK;aACN,CAAC,CAAA;YACF,OAAO;gBACL,GAAG,KAAK;gBACR,OAAO,EAAE,KAAK;aACf,CAAA;QACH,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACjD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAkB,CAAA;QACxC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAA;YAC9D,MAAM,KAAK,GAAG,cAAc,CAAC,EAAE,CAAC,MAAe,CAAC,CAAU,CAAA;YAC1D,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpD,cAAc,CAAC,KAAK,CAAC;gBACnB,IAAI,EAAE,UAAU;gBAChB,KAAK;aACN,CAAC,CAAA;YACF,OAAO,KAAK,CAAA;QACd,CAAC,CAAC,CAAC,CAAA;QACH,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACjE,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK;SACf,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/actions/catch.d.ts

@@ -1,10 +1,10 @@
 import { Action } from "../Action.ts";
-import type { ActorLike } from "../Actor.ts";
+import type { AgentLike } from "../Agent.ts";
 import type { Spec } from "../Spec.ts";
 import type { JSONKey } from "../util/JSONKey.ts";
 import type { Result } from "../util/Result.ts";
 export { catch_ as catch };
-declare function catch_<K extends JSONKey, Y extends Action, T>(key: K, actorLike: ActorLike<Y, T>): Generator<Action<"catch", Spec.Make<{
+declare function catch_<K extends JSONKey, Y extends Action, T>(key: K, agentLike: AgentLike<Y, T>): Generator<Action<"catch", Spec.Make<{
     Child: [K, Y[""]];
     Value: T;
 }>>, Result<T, Y[""]["Throw"]>>;

package/dist/actions/catch.js

@@ -1,11 +1,11 @@
 import { Action } from "../Action.js";
 import { unwrapDeferred } from "../util/unwrapDeferred.js";
 export { catch_ as catch };
-function* catch_(key, actorLike) {
+function* catch_(key, agentLike) {
     return yield Action("catch", async (scope) => {
         const catchScope = scope.fork("catch", [key]);
         try {
-            const { value } = await catchScope.reduce(unwrapDeferred(actorLike));
+            const { value } = await catchScope.reduce(unwrapDeferred(agentLike));
             catchScope.event({
                 type: "returned",
                 value,

package/dist/actions/embed.js

@@ -1,8 +1,9 @@
 import { Action } from "../Action.js";
 import { assert } from "../util/assert.js";
+import { peekLast } from "../util/peekLast.js";
 export function* embed(value) {
     return yield Action("embed", async (scope) => {
-        const model = scope.embeddingModels.values().next().value;
+        const model = peekLast(scope.embeddingModels);
         assert(model);
         scope.event({
             type: "embedding_requested",

package/dist/actions/embed.js.map

@@ -1 +1 @@
-{"version":3,"file":"embed.js","sourceRoot":"","sources":["../../actions/embed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAI1C,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,KAAa;IAClC,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;QACzD,MAAM,CAAC,KAAK,CAAC,CAAA;QACb,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,qBAAqB;YAC3B,KAAK;SACN,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC1C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,KAAK;SACrB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"embed.js","sourceRoot":"","sources":["../../actions/embed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAIrC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAI9C,MAAM,SAAS,CAAC,CAAC,KAAK,CAAC,KAAa;IAClC,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC7C,MAAM,CAAC,KAAK,CAAC,CAAA;QACb,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,qBAAqB;YAC3B,KAAK;SACN,CAAC,CAAA;QACF,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC1C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,KAAK;YACL,SAAS;SACV,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,KAAK;SACrB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/actions/enableTool.d.ts

@@ -1,6 +1,6 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import { Action } from "../Action.ts";
-import type { Actor } from "../Actor.ts";
+import type { Agent } from "../Agent.ts";
 import type { ToolCalled } from "../events/ToolCalled.ts";
 import type { ToolEnabled } from "../events/ToolEnabled.ts";
 import type { Spec } from "../Spec.ts";
@@ -12,7 +12,7 @@ import { disableTool } from "./disableTool.ts";
 export declare function enableTool<K extends JSONKey, A>(key: K, description: string, params: StandardSchemaV1<JSONObject, A>, implementation: (params: A) => PromiseOr<ToolResult>): Generator<Action<"enable_tool", Spec.Make<{
     Event: ToolEnabled<K> | ToolCalled<K, A>;
 }>>, Generator<disableTool<K>, void>>;
-export declare function enableTool<K extends JSONKey, A, Y extends Action, T extends ToolResult>(key: K, description: string, params: StandardSchemaV1<JSONObject, A>, implementation: (params: A) => Actor<Y, T>): Generator<Action<"enable_tool", Spec.Make<{
+export declare function enableTool<K extends JSONKey, A, Y extends Action, T extends ToolResult>(key: K, description: string, params: StandardSchemaV1<JSONObject, A>, implementation: (params: A) => Agent<Y, T>): Generator<Action<"enable_tool", Spec.Make<{
     Event: ToolEnabled<K> | ToolCalled<K, A>;
     Child: [K, Y[""]];
     Entry: Y[""]["Entry"];

package/dist/actions/enableTool.type-test.js

@@ -1,5 +1,5 @@
 import * as L from "../L.js";
-import { ActorAssertions } from "../testing/ActorAssertions.js";
+import { AgentAssertions } from "../testing/AgentAssertions.js";
 import { emit } from "./emit.js";
 import { enableTool } from "./enableTool.js";
 const P = L.object({
@@ -8,16 +8,16 @@ const P = L.object({
 });
 const arrowTool = L.enableTool("Tool", "", P, (params) => {
 });
-ActorAssertions(arrowTool).assertSpec();
+AgentAssertions(arrowTool).assertSpec();
 function* _0() {
     const detach = yield* arrowTool;
-    ActorAssertions(detach).assertSpec();
+    AgentAssertions(detach).assertSpec();
 }
 const genTool = enableTool("tool-key", "", P, function* (params) {
     yield* emit("Test");
     return "";
 });
-ActorAssertions(genTool).assertSpec();
+AgentAssertions(genTool).assertSpec();
 function* parent() {
     yield* L.enableTool("parent-tool", "", P, () => { });
     yield* L.branch("fork-key", {
@@ -26,5 +26,5 @@ function* parent() {
         },
     });
 }
-ActorAssertions(parent).assertSpec();
+AgentAssertions(parent).assertSpec();
 //# sourceMappingURL=enableTool.type-test.js.map

package/dist/actions/infer.d.ts

@@ -10,4 +10,6 @@ interface infer_<_T> extends Action<"infer", Spec.Make<{
     Event: InferenceRequested | Inferred;
 }>> {
 }
-declare function infer_<T extends JSONValue = string>(type?: StandardSchemaV1<JSONObject, T>): Generator<infer_<T>, T>;
+declare const infer_: (<T extends JSONValue>(type: StandardSchemaV1<JSONObject, T>) => Generator<infer_<T>, T>) & {
+    [Symbol.iterator](): Iterator<infer_<string>, string>;
+};

package/dist/actions/infer.js

@@ -1,11 +1,20 @@
 import { Action } from "../Action.js";
+import { peekLast } from "../util/peekLast.js";
 export { infer_ as infer };
-function* infer_(type) {
+const infer_ = Object.assign(function* infer_(type) {
+    return yield* impl(type);
+}, {
+    *[Symbol.iterator]() {
+        return yield* impl();
+    },
+});
+Object.defineProperty(infer_, "name", { value: "infer" });
+function* impl(type) {
     return yield Action("infer", async (scope) => {
         scope.event({
             type: "inference_requested",
         });
-        const model = scope.languageModels.values().next().value;
+        const model = peekLast(scope.languageModels);
         scope = await scope.reduce(model.infer(type));
         scope.event({
             type: "inferred",
@@ -17,5 +26,4 @@ function* infer_(type) {
         };
     });
 }
-Object.defineProperty(infer_, "name", { value: "infer" });
 //# sourceMappingURL=infer.js.map

package/dist/actions/infer.js.map

@@ -1 +1 @@
-{"version":3,"file":"infer.js","sourceRoot":"","sources":["../../actions/infer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAOrC,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CAAA;AAW1B,QAAQ,CAAC,CAAC,MAAM,CAA+B,IAAsC;IACnF,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,qBAAqB;SAC5B,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAA;QACzD,KAAK,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,KAAK;SACrB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA"}
+{"version":3,"file":"infer.js","sourceRoot":"","sources":["../../actions/infer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAMrC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAE9C,OAAO,EAAE,MAAM,IAAI,KAAK,EAAE,CAAA;AAW1B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,QAAQ,CAAC,CAAC,MAAM,CAAsB,IAAqC;IACzE,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC,EACD;IACE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAChB,OAAO,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC;CACF,CACF,CAAA;AACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;AAEzD,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAwC;IACrD,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAC3C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,qBAAqB;SAC5B,CAAC,CAAA;QACF,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAE,CAAA;QAC7C,KAAK,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAC7C,KAAK,CAAC,KAAK,CAAC;YACV,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC,CAAA;QACF,OAAO;YACL,GAAG,KAAK;YACR,OAAO,EAAE,KAAK,CAAC,KAAK;SACrB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/dist/actions/messages.d.ts

@@ -0,0 +1,24 @@
+import { Action } from "../Action.ts";
+import type { Agent } from "../Agent.ts";
+import type { MessagesSet } from "../events/MessagesSet.ts";
+import type { Message } from "../Message.ts";
+import type { Spec } from "../Spec.ts";
+import type { JSONKey } from "../util/JSONKey.ts";
+import type { PromiseOr } from "../util/PromiseOr.ts";
+import { type getScope } from "./scope.ts";
+interface messages extends Iterable<getScope, Set<Message>> {
+    (messages: Array<Message>): Generator<Action<"set_messages", Spec.Make<{
+        Event: MessagesSet;
+    }>>, Array<Message>>;
+    (setter: (messages: Array<Message>) => PromiseOr<Array<Message>>): Generator<Action<"set_messages", Spec.Make<{
+        Event: MessagesSet;
+    }>>, Array<Message>>;
+    <K extends JSONKey, Y extends Action>(key: K, setter: (messages: Array<Message>) => Agent<Y, void>): Generator<Action<"set_messages", Spec.Make<{
+        Event: MessagesSet;
+        Child: [K, Y[""]];
+        Entry: Y[""]["Entry"];
+        Value: Array<Message>;
+    }>>, Array<Message>>;
+}
+export declare const messages: messages;
+export {};