@xandreed/plugin-session-sqlite 0.13.0 → 0.14.0

package/README.md

@@ -1,5 +1,5 @@
 # @xandreed/plugin-session-sqlite
 
-Efferent composable agent framework, 0.13.0. Bun only.
+Efferent composable agent framework, 0.14.0. Bun only.
 
 Documentation: https://github.com/xandreeddev/efferent

package/dist/index.d.ts

@@ -6,4 +6,4 @@ export declare const sessionSqlitePlugin: import("@xandreed/core").TypedPlugin<{
     readonly path: string;
 }, SessionLog | TurnAdmission, import("@xandreed/core").SessionLogError, never>;
 export default sessionSqlitePlugin;
-export { SessionLogSqliteLive, sessionLogSqlitePlugin } from "./session-log.adapter.js";
+export { makeSessionLogSqlite, SessionLogSqliteLive, sessionLogSqlitePlugin } from "./session-log.adapter.js";

package/dist/index.js

@@ -4,7 +4,7 @@ import { SessionLogSqliteLive } from "./session-log.adapter.js";
 const Config = Schema.Struct({ path: Schema.String });
 export const sessionSqlitePlugin = definePlugin({
   id: "@xandreed/plugin-session-sqlite",
-  version: "0.13.0",
+  version: "0.14.0",
   scope: "runtime",
   config: Config,
   defaults: { path: ".efferent/runtime/sessions.db" },
@@ -12,4 +12,4 @@ export const sessionSqlitePlugin = definePlugin({
   layer: ({ path }) => Layer.merge(SessionLogSqliteLive(path), TurnAdmissionOpen)
 });
 export default sessionSqlitePlugin;
-export { SessionLogSqliteLive, sessionLogSqlitePlugin } from "./session-log.adapter.js";
+export { makeSessionLogSqlite, SessionLogSqliteLive, sessionLogSqlitePlugin } from "./session-log.adapter.js";

package/dist/session-holder.testing.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/session-log.adapter.d.ts

@@ -5,7 +5,10 @@ import { SessionLog, SessionLogError } from "@xandreed/core";
  * The authoritative session journal in one SQLite file: `session_heads`
  * and `session_log_events`. Removal cascades to events and children. A commit is one
  * IMMEDIATE transaction that checks the revision and the clock before it
- * writes; the clock is the process's.
+ * writes. The clock is the caller's Effect `Clock`, read once the transaction
+ * holds the write lock: a commit that waited for another connection past its
+ * `notAfter` is refused, and events carry the time they were committed. A
+ * lock held past the 5 s `busy_timeout` fails with `store.busy`.
  */
 export declare const makeSessionLogSqlite: (path: string) => Effect.Effect<SessionLog["Service"], SessionLogError, Scope.Scope>;
 /** The session log over one SQLite file (see `makeSessionLogSqlite`). */

package/dist/session-log.adapter.js

@@ -2,7 +2,7 @@ import { Database } from "bun:sqlite";
 import { mkdir } from "node:fs/promises";
 import { chmodSync } from "node:fs";
 import { dirname } from "node:path";
-import { Clock, Effect, Layer, Option, Schema } from "effect";
+import { Clock, Effect, Layer, Match, Option, Schema } from "effect";
 import {
   ConversationId,
   definePlugin,
@@ -13,7 +13,7 @@ import {
   SessionLogError,
   SessionMissing
 } from "@xandreed/core";
-const failure = (code) => (error) => new SessionLogError({ code, message: String(error) }), json = (text) => JSON.parse(text), headOf = (row, now) => ({
+const busy = (error) => typeof error === "object" && error !== null && ("code" in error) && typeof error.code === "string" && error.code.startsWith("SQLITE_BUSY"), failure = (code) => (error) => new SessionLogError({ code: busy(error) ? "store.busy" : code, message: String(error) }), json = (text) => JSON.parse(text), headOf = (row, now) => ({
   header: {
     id: ConversationId.make(row.id),
     owner: row.owner,
@@ -44,8 +44,8 @@ export const makeSessionLogSqlite = (path) => Effect.gen(function* () {
   const db = yield* Effect.acquireRelease(Effect.try({ try: () => new Database(path, { create: !0, strict: !0 }), catch: failure("store.open") }), (database) => Effect.sync(() => database.close())), operation = (work) => Effect.try({ try: work, catch: failure("store.io") });
   yield* operation(() => chmodSync(path, 384));
   yield* operation(() => db.exec(`
-    PRAGMA journal_mode = WAL;
     PRAGMA busy_timeout = 5000;
+    PRAGMA journal_mode = WAL;
     PRAGMA foreign_keys = ON;
     CREATE TABLE IF NOT EXISTS session_heads (
       id TEXT PRIMARY KEY, owner TEXT NOT NULL, origin TEXT NOT NULL, created_at INTEGER NOT NULL, meta TEXT NOT NULL,
@@ -61,15 +61,16 @@ export const makeSessionLogSqlite = (path) => Effect.gen(function* () {
   const headRow = (id) => db.query("SELECT * FROM session_heads WHERE id = ?").get(id), removeTree = (id) => db.query("DELETE FROM session_heads WHERE id = ?").run(id);
   return SessionLog.of({
     create: (header) => Effect.gen(function* () {
-      const now = yield* Clock.currentTimeMillis, outcome = yield* operation(() => db.transaction(() => {
+      const { outcome, now } = yield* Clock.clockWith((clock) => operation(() => db.transaction(() => {
+        const now = clock.currentTimeMillisUnsafe();
         if (headRow(header.id) !== null)
-          return "exists";
+          return { outcome: "exists", now };
         if (Option.isSome(header.parent) && headRow(header.parent.value.id) === null)
-          return "orphan";
+          return { outcome: "orphan", now };
         const parent = Option.getOrNull(header.parent);
         db.query("INSERT INTO session_heads (id, owner, origin, created_at, meta, parent_id, parent_through, turn_at_fork, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)").run(header.id, header.owner, header.origin, header.createdAt, JSON.stringify(header.meta), parent?.id ?? null, parent?.through ?? null, parent?.turnAtFork ?? null, now);
-        return "created";
-      }).immediate());
+        return { outcome: "created", now };
+      }).immediate()));
       if (outcome === "exists")
         return yield* Effect.fail(new SessionExists({ session: header.id }));
       if (outcome === "orphan")
@@ -95,14 +96,14 @@ export const makeSessionLogSqlite = (path) => Effect.gen(function* () {
       const kinds = query.kinds.length === 0 ? "" : ` AND kind IN (${query.kinds.map(() => "?").join(", ")})`, limit = Option.match(query.limit, { onNone: () => -1, onSome: (value) => Math.max(0, value) });
       return yield* operation(() => db.query(`SELECT seq, turn, kind, at, data FROM session_log_events WHERE session_id = ? AND seq > ?${kinds} ORDER BY seq LIMIT ?`).all(id, query.after, ...query.kinds, limit).map(eventOf(id)));
     }),
-    commit: (id, commit) => Clock.currentTimeMillis.pipe(Effect.flatMap((at) => operation(() => db.transaction(() => {
-      const head = db.query("SELECT seq, revision FROM session_heads WHERE id = ?").get(id);
+    commit: (id, commit) => Clock.clockWith((clock) => operation(() => db.transaction(() => {
+      const at = clock.currentTimeMillisUnsafe(), head = db.query("SELECT seq, revision FROM session_heads WHERE id = ?").get(id);
       if (head === null)
         return { _tag: "Missing" };
       if (head.revision !== commit.expect)
         return { _tag: "Conflict", actual: head.revision };
       if (Option.isSome(commit.notAfter) && at > commit.notAfter.value)
-        return { _tag: "Expired" };
+        return { _tag: "Expired", at };
       const events = commit.events.map((draft, index) => ({
         session: id,
         seq: head.seq + index + 1,
@@ -114,15 +115,12 @@ export const makeSessionLogSqlite = (path) => Effect.gen(function* () {
       events.forEach((event) => insert.run(id, event.seq, Option.getOrNull(event.turn), event.kind, at, JSON.stringify(event.data)));
       db.query("UPDATE session_heads SET revision = revision + 1, seq = ?, state = COALESCE(?, state), updated_at = ? WHERE id = ?").run(head.seq + events.length, Option.match(commit.state, { onNone: () => null, onSome: (state) => JSON.stringify(state) }), at, id);
       return { _tag: "Done", committed: { revision: head.revision + 1, seq: head.seq + events.length, events, at } };
-    }).immediate()).pipe(Effect.flatMap((outcome) => {
-      if (outcome._tag === "Done")
-        return Effect.succeed(outcome.committed);
-      if (outcome._tag === "Missing")
-        return Effect.fail(new SessionMissing({ session: id }));
-      if (outcome._tag === "Conflict")
-        return Effect.fail(new RevisionConflict({ session: id, expected: commit.expect, actual: outcome.actual }));
-      return Effect.fail(new LeaseExpired({ session: id, notAfter: Option.getOrElse(commit.notAfter, () => at), now: at }));
-    })))),
+    }).immediate())).pipe(Effect.flatMap(Match.valueTags({
+      Done: (outcome) => Effect.succeed(outcome.committed),
+      Missing: () => Effect.fail(new SessionMissing({ session: id })),
+      Conflict: (outcome) => Effect.fail(new RevisionConflict({ session: id, expected: commit.expect, actual: outcome.actual })),
+      Expired: (outcome) => Effect.fail(new LeaseExpired({ session: id, notAfter: Option.getOrElse(commit.notAfter, () => outcome.at), now: outcome.at }))
+    }))),
     remove: (id) => operation(() => db.transaction(() => {
       removeTree(id);
     }).immediate())
@@ -131,7 +129,7 @@ export const makeSessionLogSqlite = (path) => Effect.gen(function* () {
 const LogConfig = Schema.Struct({ path: Schema.String });
 export const sessionLogSqlitePlugin = definePlugin({
   id: "@xandreed/plugin-session-sqlite/log",
-  version: "0.13.0",
+  version: "0.14.0",
   scope: "runtime",
   config: LogConfig,
   defaults: { path: ".efferent/runtime/sessions.db" },

package/dist/session-recovery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/sessions.conformance.test.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xandreed/plugin-session-sqlite",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "engines": {
     "bun": ">=1.3.0"
   },
@@ -13,7 +13,7 @@
     }
   },
   "dependencies": {
-    "@xandreed/core": "0.13.0",
+    "@xandreed/core": "0.14.0",
     "effect": "4.0.7",
     "ws": "^8.21.0"
   },