liminal 0.6.0 → 0.7.0

package/dist/user.d.ts

@@ -1,6 +1,6 @@
-import { Effect } from "effect";
-import { Handler, MessagesRef } from "./Context.ts";
+import * as Effect from "effect/Effect";
+import { MessagesRef } from "./Context.ts";
 export declare const user: {
-    (template: TemplateStringsArray, ...substitutions: Array<unknown>): Effect.Effect<void, never, MessagesRef | Handler>;
-    (message: string): Effect.Effect<void, never, MessagesRef | Handler>;
+    (template: TemplateStringsArray, ...substitutions: Array<unknown>): Effect.Effect<void, never, MessagesRef>;
+    (message: string): Effect.Effect<void, never, MessagesRef>;
 };

package/dist/user.js

@@ -1,8 +1,7 @@
-import { AiInput } from "@effect/ai";
-import { Effect, Ref } from "effect";
-import { _emit } from "./_emit.js";
-import { Handler, MessagesRef } from "./Context.js";
-import { MessageAppended } from "./LEvent.js";
+import * as AiInput from "@effect/ai/AiInput";
+import * as Effect from "effect/Effect";
+import * as Ref from "effect/Ref";
+import { MessagesRef } from "./Context.js";
 import { isTemplateStringsArray } from "./util/isTemplateStringsArray.js";
 export const user = Effect.fn(function* (e0, ...eRest) {
     const message = new AiInput.UserMessage({
@@ -12,7 +11,6 @@ export const user = Effect.fn(function* (e0, ...eRest) {
             }),
         ],
     });
-    yield* _emit(new MessageAppended({ message }));
     yield* Ref.update(yield* MessagesRef, (messages) => [...messages, message]);
 });
 //# 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,OAAO,EAAE,MAAM,YAAY,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAA;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAEzE,MAAM,CAAC,MAAM,IAAI,GAMb,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAC,EAAE,EAAE,GAAG,KAAK;IAClC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;QACtC,KAAK,EAAE;YACL,IAAI,OAAO,CAAC,QAAQ,CAAC;gBACnB,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aAC1E,CAAC;SACH;KACF,CAAC,CAAA;IACF,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAC9C,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;AAC7E,CAAC,CAAU,CAAA"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../user.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,oBAAoB,CAAA;AAC7C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAEzE,MAAM,CAAC,MAAM,IAAI,GAMb,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAC,EAAE,EAAE,GAAG,KAAK;IAClC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;QACtC,KAAK,EAAE;YACL,IAAI,OAAO,CAAC,QAAQ,CAAC;gBACnB,IAAI,EAAE,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;aAC1E,CAAC;SACH;KACF,CAAC,CAAA;IACF,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAA;AAC7E,CAAC,CAAU,CAAA"}

package/index.ts

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

package/messages.ts

@@ -1,5 +1,6 @@
-import type { AiInput } from "@effect/ai"
-import { Effect, Ref } from "effect"
+import type { Message } from "@effect/ai/AiInput"
+import * as Effect from "effect/Effect"
+import * as Ref from "effect/Ref"
 import { MessagesRef } from "./Context.ts"
 
-export const messages: Effect.Effect<Array<AiInput.Message>, never, MessagesRef> = Effect.flatMap(MessagesRef, Ref.get)
+export const messages: Effect.Effect<Array<Message>, never, MessagesRef> = Effect.flatMap(MessagesRef, Ref.get)

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.6.0",
+  "version": "0.7.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/set.ts

@@ -1,8 +1,9 @@
-import type { AiInput } from "@effect/ai"
-import { Effect, Ref } from "effect"
+import { Message } from "@effect/ai/AiInput"
+import * as Effect from "effect/Effect"
+import * as Ref from "effect/Ref"
 import { MessagesRef } from "./Context.ts"
 
-export const set = Effect.fn(function*(messages: Iterable<AiInput.Message>) {
+export const set = Effect.fn(function*(messages: Iterable<Message>) {
   const messagesRef = yield* MessagesRef
   const previous = yield* Ref.get(messagesRef)
   yield* Ref.set(messagesRef, [...messages])

package/strand.ts

@@ -1,25 +1,26 @@
-import type { AiInput, AiTool, AiToolkit } from "@effect/ai"
-import { Effect, Option, Ref } from "effect"
-import { Handler, MessagesRef, System, Toolkit } from "./Context.ts"
-import { LEvent } from "./LEvent.ts"
+import * as AiInput from "@effect/ai/AiInput"
+import * as AiTool from "@effect/ai/AiTool"
+import type * as AiToolkit from "@effect/ai/AiToolkit"
+import * as Effect from "effect/Effect"
+import * as Option from "effect/Option"
+import * as Ref from "effect/Ref"
+import { MessagesRef, System, Toolkit } from "./Context.ts"
 
-export interface StrandOptions<E, R, in out T extends AiTool.Any> {
+export interface StrandOptions<in out Tool extends AiTool.Any> {
   /** The system prompt. */
   system?: string | undefined
   /** The initial list of AI input messages. */
   messages?: Iterable<AiInput.Message> | undefined
-  /** The liminal event handler. */
-  handler?: ((event: LEvent) => Effect.Effect<any, E, R>) | undefined
   /** The tools to use for by strand. */
-  tools?: AiToolkit.AiToolkit<T> | undefined
+  toolkit?: AiToolkit.AiToolkit<Tool> | undefined
 }
 
 /** Create an isolated clone of the current conversation to provide for an effect. */
-export const strand: <HE = never, HR = never, T extends AiTool.Any = never>(
-  options?: StrandOptions<HE, HR, T>,
+export const strand: <HE = never, T extends AiTool.Any = never>(
+  options?: StrandOptions<T>,
 ) => <A, E, R>(
   effect: Effect.Effect<A, E, R>,
-) => Effect.Effect<A, E | HE, Exclude<R, MessagesRef | System | Handler> | T> = (options) => (effect) =>
+) => Effect.Effect<A, E | HE, Exclude<R, MessagesRef | System> | T> = (options) => (effect) =>
   Effect.gen(function*() {
     const messagesRef = options?.messages
       ? Ref.unsafeMake([...options.messages])
@@ -32,7 +33,6 @@ export const strand: <HE = never, HR = never, T extends AiTool.Any = never>(
     return yield* (effect.pipe(
       Effect.provideService(MessagesRef, messagesRef),
       Effect.provideService(System, options?.system),
-      Effect.provideService(Handler, options?.handler),
-      Effect.provideService(Toolkit, options?.tools),
+      Effect.provideService(Toolkit, options?.toolkit),
     ))
-  }) as never // TODO
+  }) as never

package/user.ts

@@ -1,16 +1,15 @@
-import { AiInput } from "@effect/ai"
-import { Effect, Ref } from "effect"
-import { _emit } from "./_emit.ts"
-import { Handler, MessagesRef } from "./Context.ts"
-import { MessageAppended } from "./LEvent.ts"
+import * as AiInput from "@effect/ai/AiInput"
+import * as Effect from "effect/Effect"
+import * as Ref from "effect/Ref"
+import { MessagesRef } from "./Context.ts"
 import { isTemplateStringsArray } from "./util/isTemplateStringsArray.ts"
 
 export const user: {
   (
     template: TemplateStringsArray,
     ...substitutions: Array<unknown>
-  ): Effect.Effect<void, never, MessagesRef | Handler>
-  (message: string): Effect.Effect<void, never, MessagesRef | Handler>
+  ): Effect.Effect<void, never, MessagesRef>
+  (message: string): Effect.Effect<void, never, MessagesRef>
 } = Effect.fn(function*(e0, ...eRest) {
   const message = new AiInput.UserMessage({
     parts: [
@@ -19,6 +18,5 @@ export const user: {
       }),
     ],
   })
-  yield* _emit(new MessageAppended({ message }))
   yield* Ref.update(yield* MessagesRef, (messages) => [...messages, message])
 }) as never

package/LEvent.ts

@@ -1,28 +0,0 @@
-import { AiInput, AiResponse } from "@effect/ai"
-import { Schema } from "effect"
-
-export const LEventId = Symbol.for("liminal/LEvent")
-export type LEventId = typeof LEventId
-
-export class MessageAppended extends Schema.Class<MessageAppended>("liminal/MessageAppended")({
-  message: AiInput.Message,
-}) {
-  readonly [LEventId]: LEventId = LEventId
-}
-
-export class InferenceRequested extends Schema.Class<InferenceRequested>("liminal/InferenceRequested")({}) {
-  readonly [LEventId]: LEventId = LEventId
-}
-
-export class Inferred extends Schema.Class<Inferred>("liminal/Inferred")({
-  response: AiResponse.AiResponse,
-}) {
-  readonly [LEventId]: LEventId = LEventId
-}
-
-export type LEvent = typeof LEvent.Type
-export const LEvent: Schema.Union<[
-  typeof MessageAppended,
-  typeof InferenceRequested,
-  typeof Inferred,
-]> = Schema.Union(MessageAppended, InferenceRequested, Inferred)

package/_emit.ts

@@ -1,16 +0,0 @@
-import { Effect, Option } from "effect"
-import { Handler } from "./Context.ts"
-import { LEvent } from "./LEvent.ts"
-
-export const _emit = Effect.fn(function*(event: typeof LEvent.Type) {
-  const handlerOption = yield* Effect.serviceOption(Handler)
-  yield* Option.match(handlerOption, {
-    *onSome(handler) {
-      const effect = handler?.(event)
-      if (effect) {
-        yield* effect as Effect.Effect<void>
-      }
-    },
-    *onNone() {},
-  })
-})

package/dist/LEvent.d.ts

@@ -1,35 +0,0 @@
-import { AiInput, AiResponse } from "@effect/ai";
-import { Schema } from "effect";
-export declare const LEventId: unique symbol;
-export type LEventId = typeof LEventId;
-declare const MessageAppended_base: Schema.Class<MessageAppended, {
-    message: Schema.Union<[typeof AiInput.UserMessage, typeof AiInput.AssistantMessage, typeof AiInput.ToolMessage]>;
-}, Schema.Struct.Encoded<{
-    message: Schema.Union<[typeof AiInput.UserMessage, typeof AiInput.AssistantMessage, typeof AiInput.ToolMessage]>;
-}>, never, {
-    readonly message: AiInput.UserMessage | AiInput.AssistantMessage | AiInput.ToolMessage;
-}, {}, {}>;
-export declare class MessageAppended extends MessageAppended_base {
-    readonly [LEventId]: LEventId;
-}
-declare const InferenceRequested_base: Schema.Class<InferenceRequested, {}, Schema.Struct.Encoded<{}>, never, unknown, {}, {}>;
-export declare class InferenceRequested extends InferenceRequested_base {
-    readonly [LEventId]: LEventId;
-}
-declare const Inferred_base: Schema.Class<Inferred, {
-    response: typeof AiResponse.AiResponse;
-}, Schema.Struct.Encoded<{
-    response: typeof AiResponse.AiResponse;
-}>, never, {
-    readonly response: AiResponse.AiResponse;
-}, {}, {}>;
-export declare class Inferred extends Inferred_base {
-    readonly [LEventId]: LEventId;
-}
-export type LEvent = typeof LEvent.Type;
-export declare const LEvent: Schema.Union<[
-    typeof MessageAppended,
-    typeof InferenceRequested,
-    typeof Inferred
-]>;
-export {};

package/dist/LEvent.js

@@ -1,18 +0,0 @@
-import { AiInput, AiResponse } from "@effect/ai";
-import { Schema } from "effect";
-export const LEventId = Symbol.for("liminal/LEvent");
-export class MessageAppended extends Schema.Class("liminal/MessageAppended")({
-    message: AiInput.Message,
-}) {
-    [LEventId] = LEventId;
-}
-export class InferenceRequested extends Schema.Class("liminal/InferenceRequested")({}) {
-    [LEventId] = LEventId;
-}
-export class Inferred extends Schema.Class("liminal/Inferred")({
-    response: AiResponse.AiResponse,
-}) {
-    [LEventId] = LEventId;
-}
-export const LEvent = Schema.Union(MessageAppended, InferenceRequested, Inferred);
-//# sourceMappingURL=LEvent.js.map

package/dist/LEvent.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LEvent.js","sourceRoot":"","sources":["../LEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAE/B,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;AAGpD,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,KAAK,CAAkB,yBAAyB,CAAC,CAAC;IAC5F,OAAO,EAAE,OAAO,CAAC,OAAO;CACzB,CAAC;IACS,CAAC,QAAQ,CAAC,GAAa,QAAQ,CAAA;CACzC;AAED,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC,KAAK,CAAqB,4BAA4B,CAAC,CAAC,EAAE,CAAC;IAC/F,CAAC,QAAQ,CAAC,GAAa,QAAQ,CAAA;CACzC;AAED,MAAM,OAAO,QAAS,SAAQ,MAAM,CAAC,KAAK,CAAW,kBAAkB,CAAC,CAAC;IACvE,QAAQ,EAAE,UAAU,CAAC,UAAU;CAChC,CAAC;IACS,CAAC,QAAQ,CAAC,GAAa,QAAQ,CAAA;CACzC;AAGD,MAAM,CAAC,MAAM,MAAM,GAId,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAA"}

package/dist/_emit.d.ts

@@ -1,2 +0,0 @@
-import { Effect } from "effect";
-export declare const _emit: (event: import("./LEvent.ts").MessageAppended | import("./LEvent.ts").InferenceRequested | import("./LEvent.ts").Inferred) => Effect.Effect<void, never, never>;

package/dist/_emit.js

@@ -1,16 +0,0 @@
-import { Effect, Option } from "effect";
-import { Handler } from "./Context.js";
-import { LEvent } from "./LEvent.js";
-export const _emit = Effect.fn(function* (event) {
-    const handlerOption = yield* Effect.serviceOption(Handler);
-    yield* Option.match(handlerOption, {
-        *onSome(handler) {
-            const effect = handler?.(event);
-            if (effect) {
-                yield* effect;
-            }
-        },
-        *onNone() { },
-    });
-});
-//# sourceMappingURL=_emit.js.map

package/dist/_emit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"_emit.js","sourceRoot":"","sources":["../_emit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAC,KAAyB;IAChE,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IAC1D,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE;QACjC,CAAC,MAAM,CAAC,OAAO;YACb,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC,KAAK,CAAC,CAAA;YAC/B,IAAI,MAAM,EAAE,CAAC;gBACX,KAAK,CAAC,CAAC,MAA6B,CAAA;YACtC,CAAC;QACH,CAAC;QACD,CAAC,MAAM,KAAI,CAAC;KACb,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}