liminal 0.11.1 → 0.12.2

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,6 @@
 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 = (value, schema) => user `\`\`\`json${schema ? "c" : ""}\n${schema ? encodeJsonc(schema)(value) : JSON.stringify(value, null, 2)}\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,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CACjE,IAAI,CAAA,aAAa,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,CAAA"}

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

@@ -1,5 +1,7 @@
+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) => string;

package/dist/util/JsonValue.js

@@ -0,0 +1,82 @@
+import * as Schema from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
+export const encodeJsonc = (schema) => {
+    const encoder = encodeAstJsonc(SchemaAST.encodedAST(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) => {
+        const description = extractAnnotation(type)?.trim();
+        if (description) {
+            return `// ${description}\n${this.childIndentation}`;
+        }
+        return "";
+    };
+}
+const encodeAstJsonc = (ast) => {
+    switch (ast._tag) {
+        case "TypeLiteral": {
+            return (value, ctx) => {
+                const props = ast.propertySignatures
+                    .map(({ name, type }) => {
+                    if (typeof name === "symbol")
+                        throw 0;
+                    const child = encodeAstJsonc(type)(value[name], ctx.next());
+                    return `${ctx.comment(type)}${name}: ${child}`;
+                })
+                    .join(`,\n${ctx.childIndentation}`);
+                return `{\n${ctx.childIndentation}${props}\n${ctx.indentation}}`;
+            };
+        }
+        case "StringKeyword": {
+            return (value) => `"${value}"`;
+        }
+        case "NumberKeyword": {
+            return (value) => `${value}`;
+        }
+        case "Literal": {
+            const { literal } = ast;
+            if (typeof literal === "string") {
+                return () => `"${literal}"`;
+            }
+            if (typeof literal === "number" || typeof literal === "boolean") {
+                return () => String(literal);
+            }
+            if (literal === null) {
+                return () => "null";
+            }
+            throw 0;
+        }
+        case "TupleType": {
+            const { elements, rest } = ast;
+            return (value, ctx) => {
+                const e = (elements.length ? elements : rest).map((element, i) => {
+                    const child = encodeAstJsonc(element.type)(value[i], ctx.next());
+                    return `${ctx.comment(element.type)}${child}`;
+                }).join(`,\n${ctx.childIndentation}`);
+                return `[\n${ctx.childIndentation}${e}\n${ctx.indentation}]`;
+            };
+        }
+    }
+    console.log(ast._tag);
+    throw 0;
+};
+const extractAnnotation = ({ annotations }) => {
+    if (SchemaAST.JSONSchemaAnnotationId in annotations) {
+        const jsonSchemaAnnotations = annotations[SchemaAST.JSONSchemaAnnotationId];
+        if (jsonSchemaAnnotations) {
+            return jsonSchemaAnnotations.description;
+        }
+    }
+    return;
+};
+//# 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":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAQ7C,MAAM,CAAC,MAAM,WAAW,GAAkF,CACxG,MAAM,EACN,EAAE;IACF,MAAM,OAAO,GAAG,cAAc,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;IAChE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7D,CAAC,CAAA;AAED,MAAM,kBAAkB;IACb,KAAK,CAAQ;IACb,WAAW,CAAQ;IACnB,gBAAgB,CAAQ;IACjC,YAAY,KAAa;QACvB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;QACxC,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IACrD,CAAC;IAED,IAAI,GAAG,GAAG,EAAE,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;IAEnD,OAAO,GAAG,CAAC,IAAmB,EAAU,EAAE;QACxC,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAA;QACnD,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,MAAM,WAAW,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACtD,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC,CAAA;CACF;AAED,MAAM,cAAc,GAAgF,CAAC,GAAG,EAAE,EAAE;IAC1G,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,KAAK,GAAG,GAAG,CAAC,kBAAkB;qBACjC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;oBACtB,IAAI,OAAO,IAAI,KAAK,QAAQ;wBAAE,MAAM,CAAC,CAAA;oBAErC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAE,KAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;oBACtE,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,EAAE,CAAA;gBAChD,CAAC,CAAC;qBACD,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAA;gBACrC,OAAO,MAAM,GAAG,CAAC,gBAAgB,GAAG,KAAK,KAAK,GAAG,CAAC,WAAW,GAAG,CAAA;YAClE,CAAC,CAAA;QACH,CAAC;QACD,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAA;QAChC,CAAC;QACD,KAAK,eAAe,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAA;QAC9B,CAAC;QACD,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAA;YACvB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAChC,OAAO,GAAG,EAAE,CAAC,IAAI,OAAO,GAAG,CAAA;YAC7B,CAAC;YACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,SAAS,EAAE,CAAC;gBAChE,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC9B,CAAC;YACD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrB,OAAO,GAAG,EAAE,CAAC,MAAM,CAAA;YACrB,CAAC;YACD,MAAM,CAAC,CAAA;QACT,CAAC;QACD,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAA;YAC9B,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE;oBAC/D,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAE,KAAe,CAAC,CAAC,CAAE,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;oBAC5E,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,EAAE,CAAA;gBAC/C,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAC,CAAA;gBACrC,OAAO,MAAM,GAAG,CAAC,gBAAgB,GAAG,CAAC,KAAK,GAAG,CAAC,WAAW,GAAG,CAAA;YAC9D,CAAC,CAAA;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACrB,MAAM,CAAC,CAAA;AACT,CAAC,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC,EAAE,WAAW,EAAiB,EAAsB,EAAE;IAC/E,IAAI,SAAS,CAAC,sBAAsB,IAAI,WAAW,EAAE,CAAC;QACpD,MAAM,qBAAqB,GAAG,WAAW,CAAC,SAAS,CAAC,sBAAsB,CAE7D,CAAA;QACb,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,qBAAqB,CAAC,WAAqB,CAAA;QACpD,CAAC;IACH,CAAC;IACD,OAAM;AACR,CAAC,CAAA"}

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,21 @@
+import * as Effect from "effect/Effect";
+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 String.raw(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;AAkBvC,MAAM,CAAC,MAAM,SAAS,GAUoD,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,EAAE,EAAE,GAAG,KAAK;IAChH,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,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CACnB,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,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAA;AAClC,CAAC,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 handle: <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.12.2",
   "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,12 @@
 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> = (value, schema) =>
+  user`\`\`\`json${schema ? "c" : ""}\n${schema ? encodeJsonc(schema)(value) : JSON.stringify(value, null, 2)}\n\`\`\``

package/util/JsonValue.ts

@@ -0,0 +1,97 @@
+import * as Schema from "effect/Schema"
+import * as SchemaAST from "effect/SchemaAST"
+
+export type JsonValue = null | boolean | number | string | JsonValueArray | JsonValueObject
+
+export type JsonValueArray = Array<JsonValue> | ReadonlyArray<JsonValue>
+
+export type JsonValueObject = { [key: string]: JsonValue }
+
+export const encodeJsonc: <A, I extends JsonValue>(schema: Schema.Schema<A, I>) => (value: A) => string = (
+  schema,
+) => {
+  const encoder = encodeAstJsonc(SchemaAST.encodedAST(schema.ast))
+  return (value) => encoder(value, new EncodeJsoncContext(0))
+}
+
+class EncodeJsoncContext {
+  readonly depth: number
+  readonly indentation: string
+  readonly childIndentation: string
+  constructor(depth: number) {
+    this.depth = depth
+    this.indentation = " ".repeat(depth * 2)
+    this.childIndentation = " ".repeat((depth + 1) * 2)
+  }
+
+  next = () => new EncodeJsoncContext(this.depth + 1)
+
+  comment = (type: SchemaAST.AST): string => {
+    const description = extractAnnotation(type)?.trim()
+    if (description) {
+      return `// ${description}\n${this.childIndentation}`
+    }
+    return ""
+  }
+}
+
+const encodeAstJsonc: (ast: SchemaAST.AST) => (value: unknown, ctx: EncodeJsoncContext) => string = (ast) => {
+  switch (ast._tag) {
+    case "TypeLiteral": {
+      return (value, ctx) => {
+        const props = ast.propertySignatures
+          .map(({ name, type }) => {
+            if (typeof name === "symbol") throw 0
+
+            const child = encodeAstJsonc(type)((value as never)[name], ctx.next())
+            return `${ctx.comment(type)}${name}: ${child}`
+          })
+          .join(`,\n${ctx.childIndentation}`)
+        return `{\n${ctx.childIndentation}${props}\n${ctx.indentation}}`
+      }
+    }
+    case "StringKeyword": {
+      return (value) => `"${value}"`
+    }
+    case "NumberKeyword": {
+      return (value) => `${value}`
+    }
+    case "Literal": {
+      const { literal } = ast
+      if (typeof literal === "string") {
+        return () => `"${literal}"`
+      }
+      if (typeof literal === "number" || typeof literal === "boolean") {
+        return () => String(literal)
+      }
+      if (literal === null) {
+        return () => "null"
+      }
+      throw 0
+    }
+    case "TupleType": {
+      const { elements, rest } = ast
+      return (value, ctx) => {
+        const e = (elements.length ? elements : rest).map((element, i) => {
+          const child = encodeAstJsonc(element.type)((value as never)[i]!, ctx.next())
+          return `${ctx.comment(element.type)}${child}`
+        }).join(`,\n${ctx.childIndentation}`)
+        return `[\n${ctx.childIndentation}${e}\n${ctx.indentation}]`
+      }
+    }
+  }
+  console.log(ast._tag)
+  throw 0
+}
+
+const extractAnnotation = ({ annotations }: SchemaAST.AST): string | undefined => {
+  if (SchemaAST.JSONSchemaAnnotationId in annotations) {
+    const jsonSchemaAnnotations = annotations[SchemaAST.JSONSchemaAnnotationId] as
+      | SchemaAST.Annotations
+      | undefined
+    if (jsonSchemaAnnotations) {
+      return jsonSchemaAnnotations.description as string
+    }
+  }
+  return
+}

package/util/Sequence.ts

@@ -0,0 +1,9 @@
+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/util/Taggable.ts

@@ -0,0 +1,47 @@
+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 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)> = Effect.fnUntraced(function*(a0, ...aRest) {
+  let a0_: TemplateStringsArray | string | undefined
+  if (Effect.isEffect(a0)) {
+    a0_ = yield* a0 as Effect.Effect<TemplateStringsArray | string | undefined>
+  } else {
+    a0_ = a0
+  }
+  if (!a0_) return undefined as never
+  const aRest_ = yield* Effect.all(
+    aRest.map((v) => Effect.isEffect(v) ? v : Effect.succeed(v)),
+  ) as never as Effect.Effect<Array<unknown>>
+  if (typeof a0_ === "string") {
+    if (aRest_.length === 0) {
+      return a0_
+    }
+    return [a0_, ...aRest_].join("")
+  }
+  return String.raw(a0_, ...aRest)
+})

package/Sequence.ts

@@ -1,14 +0,0 @@
-import * as Effect from "effect/Effect"
-
-export type Sequence<P = never, R1 = never> = <Arg extends Array<Effect.Effect<any, any, any>>>(
-  ...steps: Arg
-) => Effect.Effect<
-  Arg extends [] ? void
-    : [Arg extends [...infer _0, infer L] ? L : never] extends [Effect.Effect<infer A, infer _E, infer _R>] ? A
-    : never,
-  Arg[number] extends never ? never : [Arg[number]] extends [Effect.Effect<infer _A, infer E, infer _R>] ? E : never,
-  Exclude<
-    Arg[number] extends never ? never : [Arg[number]] extends [Effect.Effect<infer _A, infer _E, infer R>] ? R : never,
-    P
-  > | R1
->

package/dist/Sequence.d.ts

@@ -1,2 +0,0 @@
-import * as Effect from "effect/Effect";
-export type Sequence<P = never, R1 = never> = <Arg extends Array<Effect.Effect<any, any, any>>>(...steps: Arg) => Effect.Effect<Arg extends [] ? void : [Arg extends [...infer _0, infer L] ? L : never] extends [Effect.Effect<infer A, infer _E, infer _R>] ? A : never, Arg[number] extends never ? never : [Arg[number]] extends [Effect.Effect<infer _A, infer E, infer _R>] ? E : never, Exclude<Arg[number] extends never ? never : [Arg[number]] extends [Effect.Effect<infer _A, infer _E, infer R>] ? R : never, P> | R1>;

package/dist/Sequence.js

@@ -1,2 +0,0 @@
-import * as Effect from "effect/Effect";
-//# sourceMappingURL=Sequence.js.map

package/dist/Sequence.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../Sequence.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA"}