@xandreed/plugin-memory 0.4.0 → 0.8.0-next.0

package/README.md

@@ -1,5 +1,5 @@
 # @xandreed/plugin-memory
 
-Efferent composable agent framework, 0.4.0. Bun on Linux.
+Efferent composable agent framework, 0.8.0-next.0. Bun on Linux.
 
 Documentation: https://github.com/xandreeddev/efferent

package/dist/index.d.ts

@@ -1,2 +1,9 @@
-export declare const memoryPlugin: import("@xandreed/core").Plugin;
+import { HarnessError, Memory, SessionEnvironment } from "@xandreed/core";
+export declare const memoryPlugin: import("@xandreed/core").TypedPlugin<{
+    readonly file: string;
+    readonly limit: number;
+}, {
+    readonly file: string;
+    readonly limit: number;
+}, Memory, HarnessError, SessionEnvironment>;
 export default memoryPlugin;

package/dist/index.js

@@ -1,11 +1,14 @@
 import { appendFile, mkdir, readFile } from "node:fs/promises";
 import { dirname, resolve, relative } from "node:path";
-import { Effect, Layer, Schema } from "effect";
+import { Effect, Layer, Schema, Semaphore } from "effect";
 import { definePlugin, HarnessError, Memory, MemoryEntry, SessionEnvironment } from "@xandreed/core";
-const Config = Schema.Struct({ file: Schema.String, limit: Schema.Int.pipe(Schema.between(1, 100)) }), Row = Schema.Union(Schema.Struct({ kind: Schema.Literal("remember"), entry: MemoryEntry }), Schema.Struct({ kind: Schema.Literal("forget"), id: Schema.String }));
+const Config = Schema.Struct({ file: Schema.String, limit: Schema.Int.pipe(Schema.check(Schema.isBetween({ minimum: 1, maximum: 100 }))) }), Row = Schema.Union([
+  Schema.Struct({ kind: Schema.Literal("remember"), entry: MemoryEntry }),
+  Schema.Struct({ kind: Schema.Literal("forget"), id: Schema.String })
+]);
 export const memoryPlugin = definePlugin({
   id: "@xandreed/plugin-memory",
-  version: "0.4.0",
+  version: "0.8.0-next.0",
   requires: [SessionEnvironment],
   provides: [Memory],
   config: Config,
@@ -14,11 +17,11 @@ export const memoryPlugin = definePlugin({
     const { workspace } = yield* SessionEnvironment, path = resolve(workspace, file);
     if (relative(workspace, path).startsWith(".."))
       return yield* Effect.fail(new HarnessError({ code: "memory.path", message: "Memory file must be inside the workspace" }));
-    const allowed = (requested) => requested === workspace ? Effect.void : Effect.fail(new HarnessError({ code: "memory.workspace", message: "Memory belongs to a different workspace" })), gate = yield* Effect.makeSemaphore(1), read = Effect.tryPromise({
+    const allowed = (requested) => requested === workspace ? Effect.void : Effect.fail(new HarnessError({ code: "memory.workspace", message: "Memory belongs to a different workspace" })), gate = yield* Semaphore.make(1), read = Effect.tryPromise({
       try: () => readFile(path, "utf8"),
       catch: (error) => ({ error, missing: typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT" })
-    }).pipe(Effect.catchAll(({ error, missing }) => missing ? Effect.succeed("") : Effect.fail(new HarnessError({ code: "memory.read", message: String(error) }))), Effect.flatMap((text) => Effect.forEach(text.split(`
-`).filter(Boolean), (line) => Schema.decodeUnknown(Schema.parseJson(Row))(line))), Effect.map((rows) => rows.reduce((entries, row) => row.kind === "remember" ? [...entries.filter((entry) => entry.id !== row.entry.id), row.entry] : entries.filter((entry) => entry.id !== row.id), [])), Effect.mapError((error) => new HarnessError({ code: "memory.read", message: String(error) }))), append = (row) => gate.withPermits(1)(Effect.tryPromise({
+    }).pipe(Effect.catch(({ error, missing }) => missing ? Effect.succeed("") : Effect.fail(new HarnessError({ code: "memory.read", message: String(error) }))), Effect.flatMap((text) => Effect.forEach(text.split(`
+`).filter(Boolean), (line) => Schema.decodeUnknownEffect(Schema.fromJsonString(Row))(line))), Effect.map((rows) => rows.reduce((entries, row) => row.kind === "remember" ? [...entries.filter((entry) => entry.id !== row.entry.id), row.entry] : entries.filter((entry) => entry.id !== row.id), [])), Effect.mapError((error) => new HarnessError({ code: "memory.read", message: String(error) }))), append = (row) => gate.withPermits(1)(Effect.tryPromise({
       try: async () => {
         await mkdir(dirname(path), { recursive: !0 });
         await appendFile(path, `${JSON.stringify(row)}
@@ -27,15 +30,15 @@ export const memoryPlugin = definePlugin({
       catch: (error) => new HarnessError({ code: "memory.write", message: String(error) })
     }));
     return Memory.of({
-      recall: (requested, query) => allowed(requested).pipe(Effect.zipRight(read), Effect.map((entries) => {
+      recall: (requested, query) => allowed(requested).pipe(Effect.andThen(read), Effect.map((entries) => {
         const terms = query.toLowerCase().split(/\W+/).filter((term) => term.length > 2), score = (entry) => terms.filter((term) => entry.text.toLowerCase().includes(term)).length;
         return entries.filter((entry) => entry.workspace === requested).sort((a, b) => score(b) - score(a) || b.createdAt - a.createdAt).slice(0, limit);
       })),
       remember: (requested, text) => {
         const entry = { id: crypto.randomUUID(), workspace: requested, text, createdAt: Date.now() };
-        return text.trim().length === 0 ? Effect.fail(new HarnessError({ code: "memory.empty", message: "Memory cannot be empty" })) : allowed(requested).pipe(Effect.zipRight(append({ kind: "remember", entry })), Effect.as(entry));
+        return text.trim().length === 0 ? Effect.fail(new HarnessError({ code: "memory.empty", message: "Memory cannot be empty" })) : allowed(requested).pipe(Effect.andThen(append({ kind: "remember", entry })), Effect.as(entry));
       },
-      forget: (requested, id) => allowed(requested).pipe(Effect.zipRight(append({ kind: "forget", id })))
+      forget: (requested, id) => allowed(requested).pipe(Effect.andThen(append({ kind: "forget", id })))
     });
   }))
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xandreed/plugin-memory",
-  "version": "0.4.0",
+  "version": "0.8.0-next.0",
   "type": "module",
   "main": "./dist/index.js",
   "exports": {
@@ -10,8 +10,8 @@
     }
   },
   "dependencies": {
-    "@xandreed/core": "0.4.0",
-    "effect": "3.21.4"
+    "@xandreed/core": "0.8.0-next.0",
+    "effect": "4.0.0-rc.118"
   },
   "private": false,
   "types": "./dist/index.d.ts",