liminal 0.10.0 → 0.11.1

package/dist/user.d.ts

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

package/dist/user.js

@@ -1,8 +1,8 @@
 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 "./Taggable.js";
 /** Append a user message to the conversation. */
 export const user = (a0, ...aRest) => append(UserMessage.make({
     parts: [

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,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,EAAE,SAAS,EAAiB,MAAM,eAAe,CAAA;AAExD,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;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"}

package/dist/userJson.d.ts

@@ -0,0 +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";
+/** 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>;

package/dist/userJson.js

@@ -0,0 +1,8 @@
+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
+/** 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\`\`\``;
+//# sourceMappingURL=userJson.js.map

package/dist/userJson.js.map

@@ -0,0 +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"}

package/events.ts

@@ -3,7 +3,7 @@ import * as Stream from "effect/Stream"
 import type { LEvent } from "./LEvent"
 import { Strand } from "./Strand.ts"
 
-/** Event stream underlying the current strand. */
+/** 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)),
 )

package/index.ts

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

package/internal/JsonValue.ts

@@ -0,0 +1,5 @@
+export type JsonValue = null | boolean | number | string | JsonValueArray | JsonValueObject
+
+export type JsonValueArray = Array<JsonValue> | ReadonlyArray<JsonValue>
+
+export type JsonValueObject = { [key: string]: JsonValue }

package/{Taggable.ts → internal/Taggable.ts}

@@ -4,7 +4,7 @@ export type Taggable<T> = {
   (template: string | TemplateStringsArray, ...substitutions: Array<unknown>): T
 }
 
-export type OptionallyTaggable<T> = {
+export type TaggableNullable<T> = {
   (value?: string | undefined): T
   (template: TemplateStringsArray, ...substitutions: Array<unknown>): T
   (template?: string | TemplateStringsArray | undefined, ...substitutions: Array<unknown>): T

package/messages.ts

@@ -0,0 +1,9 @@
+import type { Message } from "@effect/ai/AiInput"
+import * as Effect from "effect/Effect"
+import { Strand } from "./Strand.ts"
+
+/** Get a copy of the current list of messages. */
+export const messages: Effect.Effect<Array<Message>, never, Strand> = Effect.map(
+  Strand,
+  ({ messages: [...messages] }) => messages,
+)

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "liminal",
   "homepage": "https://liminal.land",
+  "llms": "https://liminal.land/llms.txt",
+  "llmsFull": "https://liminal.land/llmsFull.txt",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
-  "version": "0.10.0",
+  "version": "0.11.1",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -12,12 +15,11 @@
     "directory": "liminal"
   },
   "type": "module",
+  "sideEffects": false,
   "description": "Primitives for composing conversation trees with language models and TypeScript iterators.",
   "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "types": "./index.ts"
-    }
+    ".": "./index.ts",
+    "./package.json": "./package.json"
   },
   "peerDependencies": {
     "@effect/ai": "^0.18.16",

package/pretty.ts

@@ -0,0 +1,41 @@
+import type { Message } from "@effect/ai/AiInput"
+import type { LEvent } from "./LEvent.ts"
+
+const GRAY = "\x1b[90m"
+const RESET = "\x1b[0m"
+const BOLD = "\x1b[1m"
+const GRAY_BG = "\x1b[47m"
+
+export const pretty: (event: typeof LEvent["Type"]) => string = (event) => {
+  let text = `${GRAY}${event._tag}${RESET}`
+  switch (event._tag) {
+    case "MessagesAppended": {
+      text += event.messages.map(formatMessage).join("\n")
+      break
+    }
+    case "MessagesCleared": {
+      text += `\n${event.cleared.length} messages cleared.`
+      break
+    }
+  }
+  return text
+}
+
+const formatMessage = ({ _tag, parts }: Message): string => {
+  let value = ""
+  for (const part of parts) {
+    value += `\n${BOLD}${_tag}\n${GRAY_BG}`
+    switch (part._tag) {
+      case "TextPart": {
+        value += `${part.text}`
+        break
+      }
+      default: {
+        value += `${JSON.stringify(part, null, 2)}`
+        break
+      }
+    }
+    value += RESET
+  }
+  return value
+}

package/reduce.ts

@@ -1,56 +1,32 @@
-import { Message } from "@effect/ai/AiInput"
 import * as Effect from "effect/Effect"
-import * as Option from "effect/Option"
-import * as PubSub from "effect/PubSub"
-import type { YieldWrap } from "effect/Utils"
 import { append } from "./append.ts"
-import { LEvent, MessagesReduced } from "./LEvent.ts"
+import { clear } from "./clear.ts"
 import { Strand } from "./Strand.ts"
-import { unsafeSet } from "./unsafeSet.ts"
+import { strand } from "./strand_.ts"
 
-/** Reduce the current strand's messages. */
-export const reduce: <Y extends YieldWrap<Effect.Effect<any, any, any>>, A, E, R>(
-  reducer: () => Generator<Y, Effect.Effect<Option.Option<A>, E, R>, never>,
+/** Sequentially reduce the current strand's messages in chronological order. */
+export const reduce: <E, R, E1, R1>(
+  reducer: Effect.Effect<Effect.Effect<void, E1, R1>, E, R>,
 ) => Effect.Effect<
   void,
-  ([Y] extends [never] ? never : [Y] extends [YieldWrap<Effect.Effect<infer _A, infer E, infer _R>>] ? E : never) | E,
-  | Strand
-  | ([Y] extends [never] ? never : [Y] extends [YieldWrap<Effect.Effect<infer _A, infer _E, infer R>>] ? R : never)
-  | R
+  E | E1,
+  R | R1 | Strand
 > = Effect.fnUntraced(function*(reducer) {
-  const strand = yield* Strand
-  if (!strand.messages.length || strand.messages.length === 1) return
-  const [m0, m1, ...mRest] = strand.messages
-  let prelude = yield* Effect
-    .gen(function*() {
-      yield* append(m0!, m1!)
-      return yield* Effect.gen(reducer)
-    })
-    .pipe(
-      Effect.provide(Strand.new()),
-    )
+  const parent = yield* Strand
+  if (!parent.messages.length || parent.messages.length === 1) return
+  const [m0, m1, ...mRest] = parent.messages
+  let acc = yield* strand(
+    append(m0!, m1!),
+    reducer,
+  )
   while (mRest.length) {
-    prelude = yield* Effect
-      .gen(function*() {
-        yield* prelude
-        yield* append(mRest.pop()!)
-        return yield* Effect.gen(reducer)
-      })
-      .pipe(
-        Effect.provide(Strand.new()),
-      )
+    acc = yield* strand(
+      acc,
+      append(mRest.pop()!),
+      reducer,
+    )
   }
-  const messages: Array<Message> = []
-  yield* prelude.pipe(Effect.provideService(
-    Strand,
-    Strand.of({
-      messages,
-      events: yield* PubSub.unbounded<LEvent>(),
-    }),
-  ))
-  const previous = yield* unsafeSet(messages)
-  yield* strand.events.publish(
-    MessagesReduced.make({ previous, messages }),
-  )
+  yield* clear
+  yield* acc
   return
 })

package/sequence_.ts

@@ -0,0 +1,9 @@
+import * as Effect from "effect/Effect"
+import type { Sequence } from "./Sequence"
+
+export const sequence: Sequence = (...steps) =>
+  Effect.all(steps, {
+    concurrency: 1,
+  }).pipe(
+    Effect.map((v: Array<never>) => v.pop()!) as never,
+  )

package/strand_.ts

@@ -0,0 +1,25 @@
+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 { Strand } from "./Strand.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: [],
+      })
+    }),
+  ),
+)

package/system.ts

@@ -0,0 +1,13 @@
+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"
+
+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
+  },
+)

package/user.ts

@@ -1,8 +1,8 @@
 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 { normalize, type Taggable } from "./Taggable.ts"
 
 /** Append a user message to the conversation. */
 export const user: Taggable<Effect.Effect<void, never, Strand.Strand>> = (a0, ...aRest) =>

package/userJson.ts

@@ -0,0 +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 { user } from "./user.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>(
+  value: A,
+  schema?: Schema.Schema<A, I, never>,
+) => Effect.Effect<void, never, Strand.Strand> = (value) => user`\`\`\`jsonc\n${JSON.stringify(value, null, 2)}\n\`\`\``

package/dist/Taggable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Taggable.js","sourceRoot":"","sources":["../Taggable.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,EAAM,EACN,QAAwB,EAAE,EAC2B,EAAE,CACvD,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAkB,CAAA"}

package/dist/turn.d.ts

@@ -1,7 +0,0 @@
-import { AiError } from "@effect/ai/AiError";
-import { AiLanguageModel } from "@effect/ai/AiLanguageModel";
-import * as Effect from "effect/Effect";
-import { Strand } from "./Strand.ts";
-import { type Taggable } from "./Taggable.ts";
-/** Append a user message to the conversation, then infer and append an assistant message to the conversation. */
-export declare const turn: Taggable<Effect.Effect<string, AiError, Strand | AiLanguageModel>>;

package/dist/turn.js

@@ -1,21 +0,0 @@
-import { AiError } from "@effect/ai/AiError";
-import { TextPart, UserMessage } from "@effect/ai/AiInput";
-import { AiLanguageModel } from "@effect/ai/AiLanguageModel";
-import * as Effect from "effect/Effect";
-import { append } from "./append.js";
-import { assistant } from "./assistant.js";
-import { Strand } from "./Strand.js";
-import { normalize } from "./Taggable.js";
-/** Append a user message to the conversation, then infer and append an assistant message to the conversation. */
-export const turn = Effect
-    .fnUntraced(function* (a0, ...aRest) {
-    yield* append(UserMessage.make({
-        parts: [
-            TextPart.make({
-                text: normalize(a0, aRest),
-            }),
-        ],
-    }));
-    return yield* assistant;
-});
-//# sourceMappingURL=turn.js.map

package/dist/turn.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"turn.js","sourceRoot":"","sources":["../turn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,SAAS,EAAiB,MAAM,eAAe,CAAA;AAExD,iHAAiH;AACjH,MAAM,CAAC,MAAM,IAAI,GAAuE,MAAM;KAC3F,UAAU,CACT,QAAQ,CAAC,EAAC,EAAE,EAAE,GAAG,KAAK;IACpB,KAAK,CAAC,CAAC,MAAM,CACX,WAAW,CAAC,IAAI,CAAC;QACf,KAAK,EAAE;YACL,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC;aAC3B,CAAC;SACH;KACF,CAAC,CACH,CAAA;IACD,OAAO,KAAK,CAAC,CAAC,SAAS,CAAA;AACzB,CAAC,CACF,CAAA"}

package/dist/unsafeSet.d.ts

@@ -1,5 +0,0 @@
-import { Message } from "@effect/ai/AiInput";
-import * as Effect from "effect/Effect";
-import { Strand } from "./Strand.ts";
-/** Set the list of messages. */
-export declare const unsafeSet: (messages: Iterable<Message>) => Effect.Effect<Array<Message>, never, Strand>;

package/dist/unsafeSet.js

@@ -1,13 +0,0 @@
-import { Message } from "@effect/ai/AiInput";
-import * as Effect from "effect/Effect";
-import { Strand } from "./Strand.js";
-/** Set the list of messages. */
-export const unsafeSet = Effect.fnUntraced(function* (messages) {
-    const strand = yield* Strand;
-    const previous = strand.messages;
-    Object.assign(strand, {
-        messages: [...messages],
-    });
-    return previous;
-});
-//# sourceMappingURL=unsafeSet.js.map

package/dist/unsafeSet.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"unsafeSet.js","sourceRoot":"","sources":["../unsafeSet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,gCAAgC;AAChC,MAAM,CAAC,MAAM,SAAS,GAE8B,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,QAAQ;IACtF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAA;IAC5B,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;IAChC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QACpB,QAAQ,EAAE,CAAC,GAAG,QAAQ,CAAC;KACxB,CAAC,CAAA;IACF,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAC,CAAA"}

package/turn.ts

@@ -1,25 +0,0 @@
-import { AiError } from "@effect/ai/AiError"
-import { TextPart, UserMessage } from "@effect/ai/AiInput"
-import { AiLanguageModel } from "@effect/ai/AiLanguageModel"
-import * as Effect from "effect/Effect"
-import { append } from "./append.ts"
-import { assistant } from "./assistant.ts"
-import { Strand } from "./Strand.ts"
-import { normalize, type Taggable } from "./Taggable.ts"
-
-/** Append a user message to the conversation, then infer and append an assistant message to the conversation. */
-export const turn: Taggable<Effect.Effect<string, AiError, Strand | AiLanguageModel>> = Effect
-  .fnUntraced(
-    function*(a0, ...aRest) {
-      yield* append(
-        UserMessage.make({
-          parts: [
-            TextPart.make({
-              text: normalize(a0, aRest),
-            }),
-          ],
-        }),
-      )
-      return yield* assistant
-    },
-  )

package/unsafeSet.ts

@@ -1,15 +0,0 @@
-import { Message } from "@effect/ai/AiInput"
-import * as Effect from "effect/Effect"
-import { Strand } from "./Strand.ts"
-
-/** Set the list of messages. */
-export const unsafeSet: (
-  messages: Iterable<Message>,
-) => Effect.Effect<Array<Message>, never, Strand> = Effect.fnUntraced(function*(messages) {
-  const strand = yield* Strand
-  const previous = strand.messages
-  Object.assign(strand, {
-    messages: [...messages],
-  })
-  return previous
-})