liminal 0.11.1 → 0.13.0

package/dist/user.d.ts

@@ -1,5 +1,4 @@
-import * as Effect from "effect/Effect";
-import { type Taggable } from "./internal/Taggable.ts";
-import * as Strand from "./Strand.ts";
+import type { Strand } from "./Strand.ts";
+import { type Taggable } from "./util/Taggable.ts";
 /** Append a user message to the conversation. */
-export declare const user: Taggable<Effect.Effect<void, never, Strand.Strand>>;
+export declare const user: Taggable<void, never, Strand>;

package/dist/user.js

@@ -1,14 +1,13 @@
 import { TextPart, UserMessage } from "@effect/ai/AiInput";
 import * as Effect from "effect/Effect";
 import { append } from "./append.js";
-import { normalize } from "./internal/Taggable.js";
-import * as Strand from "./Strand.js";
+import { normalize } from "./util/Taggable.js";
 /** Append a user message to the conversation. */
-export const user = (a0, ...aRest) => append(UserMessage.make({
-    parts: [
-        TextPart.make({
-            text: normalize(a0, aRest),
-        }),
-    ],
-}));
+export const user = (a0, ...aRest) => normalize(a0, aRest).pipe(Effect.flatMap((text) => text
+    ? append(UserMessage.make({
+        parts: [
+            TextPart.make({ text }),
+        ],
+    }))
+    : Effect.succeed(undefined)));
 //# sourceMappingURL=user.js.map

package/dist/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,SAAS,EAAiB,MAAM,wBAAwB,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC,iDAAiD;AACjD,MAAM,CAAC,MAAM,IAAI,GAAwD,CAAC,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CACxF,MAAM,CACJ,WAAW,CAAC,IAAI,CAAC;IACf,KAAK,EAAE;QACL,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC;SAC3B,CAAC;KACH;CACF,CAAC,CACH,CAAA"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,SAAS,EAAiB,MAAM,oBAAoB,CAAA;AAE7D,iDAAiD;AACjD,MAAM,CAAC,MAAM,IAAI,GAAkC,CAAC,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CAClE,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,IAAI;IACF,CAAC,CAAC,MAAM,CACN,WAAW,CAAC,IAAI,CAAC;QACf,KAAK,EAAE;YACL,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;SACxB;KACF,CAAC,CACH;IACD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAC9B,CACF,CAAA"}

package/dist/user.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.test.js","sourceRoot":"","sources":["../user.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,KAAK,CAAC,CAAC,IAAI,CAAA,GAAG,CAAA;IACd,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAChB,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;QACpC,WAAW,CAAC,IAAI,CAAC;YACf,KAAK,EAAE;gBACL,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,GAAG;iBACV,CAAC;aACH;SACF,CAAC;QACF,WAAW,CAAC,IAAI,CAAC;YACf,KAAK,EAAE;gBACL,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,GAAG;iBACV,CAAC;aACH;SACF,CAAC;KACH,CAAC,CAAA;AACJ,CAAC,CAAC,CAAC,IAAI,CACL,MAAM,CACP,CAAC,CAAA"}

package/dist/userJson.d.ts

@@ -1,6 +1,6 @@
 import * as Effect from "effect/Effect";
-import * as Schema from "effect/Schema";
-import type { JsonValueObject } from "./internal/JsonValue.ts";
-import * as Strand from "./Strand.ts";
+import type * as Schema from "effect/Schema";
+import type * as Strand from "./Strand.ts";
+import { type JsonValue } from "./util/JsonValue.ts";
 /** Stringify and append some JSON as a user message to the conversation. */
-export declare const userJson: <A, I extends JsonValueObject>(value: A, schema?: Schema.Schema<A, I, never>) => Effect.Effect<void, never, Strand.Strand>;
+export declare const userJson: <A, I extends JsonValue>(value: A, schema?: Schema.Schema<A, I>) => Effect.Effect<void, never, Strand.Strand>;

package/dist/userJson.js

@@ -1,8 +1,9 @@
 import * as Effect from "effect/Effect";
-import * as Schema from "effect/Schema";
-import * as Strand from "./Strand.js";
 import { user } from "./user.js";
-// TODO: serialize with comments from schema
+import { encodeJsonc } from "./util/JsonValue.js";
 /** Stringify and append some JSON as a user message to the conversation. */
-export const userJson = (value) => user `\`\`\`jsonc\n${JSON.stringify(value, null, 2)}\n\`\`\``;
+export const userJson = Effect.fnUntraced(function* (value, schema) {
+    const encoded = schema ? encodeJsonc(schema)(value) : JSON.stringify(value, null, 2);
+    return yield* user `\`\`\`json${schema ? "c" : ""}${"\n"}${encoded}${"\n"}\`\`\``;
+});
 //# sourceMappingURL=userJson.js.map

package/dist/userJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"userJson.js","sourceRoot":"","sources":["../userJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,4CAA4C;AAC5C,4EAA4E;AAC5E,MAAM,CAAC,MAAM,QAAQ,GAG4B,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAA,gBAAgB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAA"}
+{"version":3,"file":"userJson.js","sourceRoot":"","sources":["../userJson.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,WAAW,EAAkB,MAAM,qBAAqB,CAAA;AAEjE,4EAA4E;AAC5E,MAAM,CAAC,MAAM,QAAQ,GAG4B,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,KAAK,EAAE,MAAM;IACxF,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACpF,OAAO,KAAK,CAAC,CAAC,IAAI,CAAA,aAAa,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,GAAG,OAAO,GAAG,IAAI,QAAQ,CAAA;AAClF,CAAC,CAAC,CAAA"}

package/dist/{internal → util}/JsonValue.d.ts

@@ -1,5 +1,8 @@
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
 export type JsonValue = null | boolean | number | string | JsonValueArray | JsonValueObject;
 export type JsonValueArray = Array<JsonValue> | ReadonlyArray<JsonValue>;
 export type JsonValueObject = {
     [key: string]: JsonValue;
 };
+export declare const encodeJsonc: <A, I extends JsonValue>(schema: Schema.Schema<A, I>) => (value: A) => Effect.Effect<string>;

package/dist/util/JsonValue.js

@@ -0,0 +1,109 @@
+import * as Effect from "effect/Effect";
+import { pipe } from "effect/Function";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
+export const encodeJsonc = (schema) => {
+    const encoder = encodeAst(SchemaAST.encodedBoundAST(schema.ast));
+    return (value) => encoder(value, new EncodeJsoncContext(0));
+};
+class EncodeJsoncContext {
+    depth;
+    indentation;
+    childIndentation;
+    constructor(depth) {
+        this.depth = depth;
+        this.indentation = " ".repeat(depth * 2);
+        this.childIndentation = " ".repeat((depth + 1) * 2);
+    }
+    next = () => new EncodeJsoncContext(this.depth + 1);
+    comment = (type) => Option.match(SchemaAST.getDescriptionAnnotation(type), {
+        onSome: (v) => {
+            v = v.trim();
+            if (v) {
+                return `// ${v}\n${this.childIndentation}`;
+            }
+            return "";
+        },
+        onNone: () => "",
+    });
+}
+const encodeAst = (ast, refinement) => {
+    switch (ast._tag) {
+        case "TypeLiteral": {
+            return Effect.fnUntraced(function* (value, ctx) {
+                const props = yield* Effect.all(ast.propertySignatures.map(Effect.fnUntraced(function* ({ name, type }) {
+                    if (typeof name === "symbol")
+                        throw 0;
+                    const child = yield* encodeAst(type)(value[name], ctx.next());
+                    return `${ctx.comment(refinement ?? type)}${name}: ${child}`;
+                }))).pipe(Effect.map((v) => v.join(`,\n${ctx.childIndentation}`)));
+                return `{\n${ctx.childIndentation}${props}\n${ctx.indentation}}`;
+            });
+        }
+        case "StringKeyword": {
+            return (value) => Effect.succeed(`"${value}"`);
+        }
+        case "BooleanKeyword":
+        case "NumberKeyword": {
+            return (value) => Effect.succeed(String(value));
+        }
+        case "Refinement": {
+            return encodeAst(ast.from, refinement ?? ast);
+        }
+        case "UnknownKeyword":
+        case "AnyKeyword": {
+            return (value, ctx) => Effect.succeed(JSON
+                .stringify(value, null, 2)
+                .split("\n")
+                .map((line, i) => i ? ctx.indentation.concat(line) : line)
+                .join("\n"));
+        }
+        case "Union": {
+            const { types } = ast;
+            const guards = types.map((ast) => pipe(ast, Schema.make, Schema.is));
+            return (value, ctx) => {
+                for (let i = 0; i < types.length; i++) {
+                    const guard = guards[i];
+                    if (guard(value)) {
+                        return encodeAst(types[i])(value, ctx);
+                    }
+                }
+                throw 0;
+            };
+        }
+        case "Literal": {
+            const { literal } = ast;
+            const v = (() => {
+                switch (typeof literal) {
+                    case "boolean":
+                    case "number": {
+                        return String(literal);
+                    }
+                    case "string": {
+                        return `"${literal}"`;
+                    }
+                }
+                if (literal === null) {
+                    return "null";
+                }
+                console.log({ literal });
+                throw 0;
+            })();
+            return () => Effect.succeed(v);
+        }
+        case "TupleType": {
+            const { elements, rest } = ast;
+            return (value, ctx) => Effect.all((elements.length ? elements : rest).map(Effect.fnUntraced(function* (element, i) {
+                const child = yield* encodeAst(element.type)(value[i], ctx.next());
+                return `${ctx.comment(refinement ?? element.type)}${child}`;
+            }))).pipe(Effect.map((v) => `[\n${ctx.childIndentation}${v.join(`,\n${ctx.childIndentation}`)}\n${ctx.indentation}]`));
+        }
+        case "Suspend": {
+            return encodeAst(ast.f());
+        }
+    }
+    console.log({ ast });
+    throw 0;
+};
+//# sourceMappingURL=JsonValue.js.map

package/dist/util/JsonValue.js.map

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

package/dist/util/Sequence.d.ts

@@ -0,0 +1,2 @@
+import type { Effect } from "effect/Effect";
+export type Sequence<I = never, O = never> = <Arg extends Array<Effect<any, any, any>>>(...steps: Arg) => Effect<Arg extends [] ? void : Arg extends [...infer _0, infer L extends Effect<any, any, any>] ? Effect.Success<L> : never, Effect.Error<Arg[number]>, Exclude<Effect.Context<Arg[number]>, I> | O>;

package/dist/util/Sequence.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Sequence.js.map

package/dist/util/Sequence.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../util/Sequence.ts"],"names":[],"mappings":""}

package/dist/util/Taggable.d.ts

@@ -0,0 +1,6 @@
+import * as Effect from "effect/Effect";
+/** Append a user message to the conversation. */
+export type Taggable<A, E, R> = <L extends Array<unknown>, E1 = never, R1 = never>(template?: TemplateStringsArray | string | Effect.Effect<string | undefined, E1, R1> | undefined, ...substitutions: L) => Effect.Effect<A, ([ExtractEffect<L>] extends [never] ? never : Effect.Effect.Error<ExtractEffect<L>>) | E | E1, ([ExtractEffect<L>] extends [never] ? never : Effect.Effect.Context<ExtractEffect<L>>) | R | R1>;
+type ExtractEffect<T extends Array<unknown>> = Extract<T[number], Effect.All.EffectAny>;
+export declare const normalize: <A0 extends TemplateStringsArray | string | Effect.Effect<string | undefined, any, any> | undefined, L extends Array<unknown>>(a0: A0, aRest: L) => Effect.Effect<string | (undefined extends A0 ? undefined : never)>;
+export {};

package/dist/util/Taggable.js

@@ -0,0 +1,24 @@
+import * as Effect from "effect/Effect";
+import { fixRaw } from "./fixRaw.js";
+export const normalize = Effect.fnUntraced(function* (a0, aRest) {
+    let a0_;
+    if (Effect.isEffect(a0)) {
+        a0_ = yield* a0;
+    }
+    else {
+        a0_ = a0;
+    }
+    if (!a0_)
+        return undefined;
+    const aRest_ = yield* Effect.all(aRest.map((v) => Effect.isEffect(v)
+        ? v
+        : Effect.succeed(v)));
+    if (typeof a0_ === "string") {
+        if (aRest_.length === 0) {
+            return a0_;
+        }
+        return [a0_, ...aRest_].join("");
+    }
+    return fixRaw(a0_, aRest_);
+});
+//# sourceMappingURL=Taggable.js.map

package/dist/util/Taggable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Taggable.js","sourceRoot":"","sources":["../../util/Taggable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAkBpC,MAAM,CAAC,MAAM,SAAS,GAUoD,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,EAAE,EAAE,KAAK;IAC7G,IAAI,GAA8C,CAAA;IAClD,IAAI,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;QACxB,GAAG,GAAG,KAAK,CAAC,CAAC,EAA8D,CAAA;IAC7E,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,EAAE,CAAA;IACV,CAAC;IACD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAkB,CAAA;IACnC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAC9B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACd,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CACtB,CACwC,CAAA;IAC3C,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,GAAG,CAAA;QACZ,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAClC,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAC,CAAA"}

package/dist/util/fixRaw.d.ts

@@ -0,0 +1,4 @@
+export declare const fixRaw: (strings: TemplateStringsArray, values: Array<unknown>) => string;
+export declare const fixTemplateStrings: (template: TemplateStringsArray) => {
+    readonly raw: readonly string[];
+};

package/dist/util/fixRaw.js

@@ -0,0 +1,75 @@
+const LEADING_SPACE_RE = /^([ \t]*)/;
+const INDENTATION_RE = /^\n([ \t]+)/;
+const ESCAPE_SEQ_RE = /\\([`${\\]|\n)/g;
+const LAST_INDENTATION_RE = /\n[ \t]+$/;
+export const fixRaw = (strings, values) => {
+    const fixedStrings = fixTemplateStrings(strings);
+    const rawArr = fixedStrings.raw;
+    const valuesLength = values.length;
+    const resultParts = new Array(Math.max(1, rawArr.length * 2 - 1));
+    let resultIndex = 0;
+    for (let i = 0; i < rawArr.length; i++) {
+        const str = rawArr[i] || "";
+        resultParts[resultIndex++] = str;
+        // Only process values for non-final segments.
+        if (i < valuesLength) {
+            const value = String(values[i]);
+            // If value has line breaks, we should indent it.
+            if (value.includes("\n")) {
+                const lastNewlineIndex = str.lastIndexOf("\n");
+                if (lastNewlineIndex !== -1) {
+                    // Extract the indentation after the last newline.
+                    const textAfterLastNewline = str.substring(lastNewlineIndex + 1);
+                    const leadingSpaceMatch = LEADING_SPACE_RE.exec(textAfterLastNewline);
+                    const indentationToApply = leadingSpaceMatch && leadingSpaceMatch[1] ? leadingSpaceMatch[1] : "";
+                    if (indentationToApply) {
+                        // Split the value into lines once.
+                        const lines = value.split("\n");
+                        const linesLength = lines.length;
+                        // First line doesn't need indentation.
+                        resultParts[resultIndex++] = lines[0];
+                        // Apply indentation to subsequent lines.
+                        for (let j = 1; j < linesLength; j++) {
+                            resultParts[resultIndex++] = "\n" + indentationToApply + lines[j];
+                        }
+                        continue;
+                    }
+                }
+            }
+            // For simple values or when no indentation is needed.
+            resultParts[resultIndex++] = value;
+        }
+    }
+    // Combine all parts at once
+    return resultParts.slice(0, resultIndex).join("");
+};
+export const fixTemplateStrings = (template) => {
+    const leadingIndentMatch = INDENTATION_RE.exec(template.raw[0]);
+    const indentation = leadingIndentMatch?.[1];
+    const rawLength = template.raw.length;
+    const raw = new Array(rawLength);
+    for (let i = 0; i < rawLength; i++) {
+        let str = template.raw[i];
+        // Only perform common indentation replacements if needed.
+        if (indentation) {
+            // Remove leading newline and indentation in the first segment.
+            if (i === 0) {
+                str = str.slice(indentation.length + 1);
+            }
+            // Use a simple string replacement with a regular expression for better performance.
+            str = str.replaceAll(`\n${indentation}`, "\n");
+        }
+        // Replace common escape sequences in a single pass.
+        str = str.replace(ESCAPE_SEQ_RE, (_match, char) => {
+            // Keep the escaped newline replacement separate for clarity.
+            return char === "\n" ? "" : char;
+        });
+        // Handle trailing spaces only for the last segment.
+        if (indentation && i === rawLength - 1) {
+            str = str.replace(LAST_INDENTATION_RE, "");
+        }
+        raw[i] = str;
+    }
+    return { raw };
+};
+//# sourceMappingURL=fixRaw.js.map

package/dist/util/fixRaw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fixRaw.js","sourceRoot":"","sources":["../../util/fixRaw.ts"],"names":[],"mappings":"AAAA,MAAM,gBAAgB,GAAG,WAAW,CAAA;AACpC,MAAM,cAAc,GAAG,aAAa,CAAA;AACpC,MAAM,aAAa,GAAG,iBAAiB,CAAA;AACvC,MAAM,mBAAmB,GAAG,WAAW,CAAA;AAEvC,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,OAA6B,EAAE,MAAsB,EAAU,EAAE;IACtF,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAA;IAC/B,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAA;IAElC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACjE,IAAI,WAAW,GAAG,CAAC,CAAA;IAEnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3B,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG,GAAG,CAAA;QAEhC,8CAA8C;QAC9C,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;YAE/B,iDAAiD;YACjD,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzB,MAAM,gBAAgB,GAAG,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAE9C,IAAI,gBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC;oBAC5B,kDAAkD;oBAClD,MAAM,oBAAoB,GAAG,GAAG,CAAC,SAAS,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAA;oBAChE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;oBACrE,MAAM,kBAAkB,GAAG,iBAAiB,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;oBAEhG,IAAI,kBAAkB,EAAE,CAAC;wBACvB,mCAAmC;wBACnC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;wBAC/B,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAA;wBAEhC,uCAAuC;wBACvC,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;wBAErC,yCAAyC;wBACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;4BACrC,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG,IAAI,GAAG,kBAAkB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;wBACnE,CAAC;wBACD,SAAQ;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YACD,sDAAsD;YACtD,WAAW,CAAC,WAAW,EAAE,CAAC,GAAG,KAAK,CAAA;QACpC,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACnD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAA8B,EAE/D,EAAE;IACF,MAAM,kBAAkB,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,CAAA;IAChE,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAA;IAE3C,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAA;IACrC,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QACnC,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAE,CAAA;QAC1B,0DAA0D;QAC1D,IAAI,WAAW,EAAE,CAAC;YAChB,+DAA+D;YAC/D,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YACzC,CAAC;YACD,oFAAoF;YACpF,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,KAAK,WAAW,EAAE,EAAE,IAAI,CAAC,CAAA;QAChD,CAAC;QAED,oDAAoD;QACpD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAChD,6DAA6D;YAC7D,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,oDAAoD;QACpD,IAAI,WAAW,IAAI,CAAC,KAAK,SAAS,GAAG,CAAC,EAAE,CAAC;YACvC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAA;QAC5C,CAAC;QAED,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;IACd,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,CAAA;AAChB,CAAC,CAAA"}

package/enable.ts

@@ -0,0 +1,8 @@
+import * as AiTool from "@effect/ai/AiTool"
+import type { AiToolkit } from "@effect/ai/AiToolkit"
+import * as Effect from "effect/Effect"
+import type { Strand } from "./Strand.ts"
+
+export declare const enable: <Tools extends AiTool.Any>(
+  toolkit: AiToolkit<Tools>,
+) => Effect.Effect<never, never, AiTool.Handler<Tools["name"]> | Strand>

package/events.ts

@@ -1,9 +1,10 @@
 import * as Effect from "effect/Effect"
 import * as Stream from "effect/Stream"
-import type { LEvent } from "./LEvent"
+import type { LEvent } from "./LEvent.ts"
 import { Strand } from "./Strand.ts"
 
-/** Get a new event stream of the events of the current strand. */
-export const events: Stream.Stream<LEvent, never, Strand> = Stream.unwrap(
-  Effect.map(Strand, ({ events }) => Stream.fromPubSub(events)),
+/** A stream of events from the current strand. */
+export const events: Stream.Stream<LEvent, never, Strand> = Strand.pipe(
+  Effect.map(({ events }) => Stream.fromPubSub(events)),
+  Stream.unwrap,
 )

package/handle.ts

@@ -0,0 +1,25 @@
+import * as Effect from "effect/Effect"
+import type { RuntimeFiber } from "effect/Fiber"
+import * as Scope from "effect/Scope"
+import * as Stream from "effect/Stream"
+import type { LEvent } from "./LEvent.ts"
+import { Strand } from "./Strand.ts"
+
+/** Attach an event handler to process the events of the current strand. */
+export const listen: <A, E, R>(
+  f: (event: LEvent) => Effect.Effect<A, E, R>,
+) => Effect.Effect<RuntimeFiber<void, E>, never, Strand | R | Scope.Scope> = Effect.fnUntraced(function*(f) {
+  const latch = yield* Effect.makeLatch(false)
+  const { events } = yield* Strand
+  const dequeue = yield* events.subscribe
+  const fiber = yield* latch.open.pipe(
+    Effect.zipRight(
+      Stream.fromQueue(dequeue).pipe(
+        Stream.runForEach(f),
+        Effect.fork,
+      ),
+    ),
+  )
+  yield* latch.await
+  return fiber
+})

package/index.ts

@@ -1,4 +1,4 @@
 export * as L from "./L.ts"
 export * from "./LEvent.ts"
-export * from "./pretty.ts"
+export * as LPretty from "./LPretty.ts"
 export * from "./Strand.ts"

package/package.json

@@ -7,7 +7,7 @@
     "access": "public",
     "provenance": true
   },
-  "version": "0.11.1",
+  "version": "0.13.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -16,13 +16,13 @@
   },
   "type": "module",
   "sideEffects": false,
-  "description": "Primitives for composing conversation trees with language models and TypeScript iterators.",
+  "description": "An Effect AI toolkit for LLM integration and conversation state management.",
   "exports": {
     ".": "./index.ts",
     "./package.json": "./package.json"
   },
   "peerDependencies": {
-    "@effect/ai": "^0.18.16",
-    "effect": "^3.17.4"
+    "@effect/ai": "^0.25.0",
+    "effect": "^3.17.6"
   }
 }

package/{sequence_.ts → sequence.ts}

@@ -1,5 +1,5 @@
 import * as Effect from "effect/Effect"
-import type { Sequence } from "./Sequence"
+import type { Sequence } from "./util/Sequence"
 
 export const sequence: Sequence = (...steps) =>
   Effect.all(steps, {

package/strand_.ts

@@ -1,25 +1,11 @@
 import * as Effect from "effect/Effect"
 import { flow } from "effect/Function"
-import * as Option from "effect/Option"
-import * as PubSub from "effect/PubSub"
-import type { LEvent } from "./LEvent.ts"
-import { type Sequence } from "./Sequence.ts"
-import { sequence } from "./sequence_.ts"
+import { sequence } from "./sequence.ts"
 import { Strand } from "./Strand.ts"
+import { type Sequence } from "./util/Sequence.ts"
 
 /** Isolate the effect with a new strand in context. */
 export const strand: Sequence<Strand> = flow(
   sequence,
-  Effect.provideServiceEffect(
-    Strand,
-    Effect.gen(function*() {
-      return Strand.of({
-        parent: yield* Effect.serviceOption(Strand),
-        events: yield* PubSub.unbounded<LEvent>(),
-        system: Option.none(),
-        messages: [],
-        tools: [],
-      })
-    }),
-  ),
+  Effect.provide(Strand.layer()),
 )

package/system.ts

@@ -1,13 +1,12 @@
 import * as Effect from "effect/Effect"
 import * as Option from "effect/Option"
-import { normalize, type TaggableNullable } from "./internal/Taggable.ts"
 import { Strand } from "./Strand.ts"
+import { normalize, type Taggable } from "./util/Taggable.ts"
 
-export const system: TaggableNullable<Effect.Effect<Option.Option<string>, never, Strand>> = Effect.fnUntraced(
-  function*(a0, ...aRest) {
-    const conversation = yield* Strand
-    const { system } = conversation
-    conversation.system = a0 ? Option.some(normalize(a0, aRest)) : Option.none()
-    return system
-  },
-)
+/** Set the system instruction for the current strand. */
+export const system: Taggable<Option.Option<string>, never, Strand> = Effect.fnUntraced(function*(a0, ...aRest) {
+  const conversation = yield* Strand
+  const { system } = conversation
+  conversation.system = a0 ? Option.some(yield* normalize(a0, aRest)) : Option.none()
+  return system
+})

package/user.test.ts

@@ -0,0 +1,30 @@
+import { TextPart, UserMessage } from "@effect/ai/AiInput"
+import { expect, it } from "@effect/vitest"
+import * as Effect from "effect/Effect"
+import { messages } from "./messages.ts"
+import { strand } from "./strand_.ts"
+import { user } from "./user.ts"
+
+it.effect("test success", () =>
+  Effect.gen(function*() {
+    yield* user`A`
+    yield* user("B")
+    expect(yield* messages).toStrictEqual([
+      UserMessage.make({
+        parts: [
+          TextPart.make({
+            text: "A",
+          }),
+        ],
+      }),
+      UserMessage.make({
+        parts: [
+          TextPart.make({
+            text: "B",
+          }),
+        ],
+      }),
+    ])
+  }).pipe(
+    strand,
+  ))

package/user.ts

@@ -1,17 +1,21 @@
 import { TextPart, UserMessage } from "@effect/ai/AiInput"
 import * as Effect from "effect/Effect"
 import { append } from "./append.ts"
-import { normalize, type Taggable } from "./internal/Taggable.ts"
-import * as Strand from "./Strand.ts"
+import type { Strand } from "./Strand.ts"
+import { normalize, type Taggable } from "./util/Taggable.ts"
 
 /** Append a user message to the conversation. */
-export const user: Taggable<Effect.Effect<void, never, Strand.Strand>> = (a0, ...aRest) =>
-  append(
-    UserMessage.make({
-      parts: [
-        TextPart.make({
-          text: normalize(a0, aRest),
-        }),
-      ],
-    }),
+export const user: Taggable<void, never, Strand> = (a0, ...aRest) =>
+  normalize(a0, aRest).pipe(
+    Effect.flatMap((text) =>
+      text
+        ? append(
+          UserMessage.make({
+            parts: [
+              TextPart.make({ text }),
+            ],
+          }),
+        )
+        : Effect.succeed(undefined)
+    ),
   )

package/userJson.ts

@@ -1,12 +1,14 @@
 import * as Effect from "effect/Effect"
-import * as Schema from "effect/Schema"
-import type { JsonValueObject } from "./internal/JsonValue.ts"
-import * as Strand from "./Strand.ts"
+import type * as Schema from "effect/Schema"
+import type * as Strand from "./Strand.ts"
 import { user } from "./user.ts"
+import { encodeJsonc, type JsonValue } from "./util/JsonValue.ts"
 
-// TODO: serialize with comments from schema
 /** Stringify and append some JSON as a user message to the conversation. */
-export const userJson: <A, I extends JsonValueObject>(
+export const userJson: <A, I extends JsonValue>(
   value: A,
-  schema?: Schema.Schema<A, I, never>,
-) => Effect.Effect<void, never, Strand.Strand> = (value) => user`\`\`\`jsonc\n${JSON.stringify(value, null, 2)}\n\`\`\``
+  schema?: Schema.Schema<A, I>,
+) => Effect.Effect<void, never, Strand.Strand> = Effect.fnUntraced(function*(value, schema) {
+  const encoded = schema ? encodeJsonc(schema)(value) : JSON.stringify(value, null, 2)
+  return yield* user`\`\`\`json${schema ? "c" : ""}${"\n"}${encoded}${"\n"}\`\`\``
+})