@effect-agent/storage-cloudflare 0.1.0-beta.23 → 0.1.0-beta.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-agent/storage-cloudflare",
-  "version": "0.1.0-beta.23",
+  "version": "0.1.0-beta.25",
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",
@@ -8,7 +8,7 @@
     }
   },
   "dependencies": {
-    "@effect-agent/session": "0.1.0-beta.23",
+    "@effect-agent/session": "0.1.0-beta.25",
     "@effect/platform-browser": "4.0.0-rc.110",
     "@effect/sql-sqlite-do": "4.0.0-rc.110",
     "effect": "4.0.0-rc.110"
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "0.21.3",
     "@cloudflare/workers-types": "5.20260813.1",
-    "@effect-agent/testing": "0.1.0-beta.22",
+    "@effect-agent/testing": "0.1.0-beta.23",
     "@effect/vitest": "4.0.0-rc.110",
     "typescript": "7.0.2",
     "vite-plus": "0.2.6",

package/src/do-conversation-store.ts

@@ -56,12 +56,12 @@ import {
   DoStorageConfigValue,
 } from "./do-storage-config.ts";
 import { DoStorageFailpoint, type DoStorageFailpointHandler } from "./do-storage-failpoint.ts";
+import type { DoStorageCompatibilityError } from "./errors.ts";
 import {
   DoAppendConflict,
   DoCheckpointConflict,
   DoFenceRejected,
   type DoStorageFailpointLocation,
-  DoStorageCompatibilityError,
   DoStorageCorruptionError,
   DoStorageError,
 } from "./errors.ts";
@@ -102,6 +102,9 @@ const OffsetText = Schema.String.check(Schema.isMaxLength(4 * 1024));
 const DO_OFFSET_PREFIX = "effect-agent-do@1:";
 const ZERO_CANONICAL_SEQUENCE = Schema.decodeSync(CanonicalSequence)(0);
 const isDigest = Schema.is(Digest);
+const isDoFenceRejected = Schema.is(DoFenceRejected);
+const isDoAppendConflict = Schema.is(DoAppendConflict);
+const isDoCheckpointConflict = Schema.is(DoCheckpointConflict);
 
 const storeError = (operation: string, error: { readonly message: string }) =>
   ConversationStoreError.make({
@@ -550,10 +553,10 @@ const makeServices = Effect.fn("DoConversationStore.makeServices")(function* ()
       yield* hitFailpoint("append:before");
       const result = yield* journal.append(rawRequest).pipe(
         Effect.mapError((error) => {
-          if (error instanceof DoFenceRejected) {
+          if (isDoFenceRejected(error)) {
             return mapFence(validated.conversationId, error);
           }
-          if (error instanceof DoAppendConflict) {
+          if (isDoAppendConflict(error)) {
             return error.actualTailSequence !== undefined && isDigest(error.actualTailDigest)
               ? AppendConflict.make({
                   conversationId: validated.conversationId,
@@ -720,7 +723,7 @@ const makeServices = Effect.fn("DoConversationStore.makeServices")(function* ()
     yield* hitFailpoint("save-checkpoint:before");
     yield* journal.saveCheckpoint(raw).pipe(
       Effect.mapError((error) =>
-        error instanceof DoCheckpointConflict
+        isDoCheckpointConflict(error)
           ? CheckpointRejected.make({
               conversationId: validated.checkpoint.conversationId,
               reason: "digest-mismatch",
@@ -832,19 +835,21 @@ export const storageFailpointLayer = (
  */
 export const layer = (
   options: DoStorageOptions,
-): Layer.Layer<ConversationStore, DoStorageInitializationError> => {
-  const sqlLayer = SqliteClient.layer({ storage: options.storage });
-  return conversationStoreLayer.pipe(
-    Layer.provide(
-      Layer.mergeAll(
-        storageConfigLayer(options),
-        storageFailpointLayer(options),
-        sqlLayer,
-        BrowserCrypto.layer,
+): Layer.Layer<ConversationStore, DoStorageInitializationError> =>
+  Layer.unwrap(
+    Effect.map(DoStorageConfig, (config) =>
+      conversationStoreLayer.pipe(
+        Layer.provide(
+          Layer.mergeAll(
+            Layer.succeed(DoStorageConfig)(config),
+            storageFailpointLayer(options),
+            SqliteClient.layer({ storage: options.storage }),
+            BrowserCrypto.layer,
+          ),
+        ),
       ),
     ),
-  );
-};
+  ).pipe(Layer.provide(storageConfigLayer(options)));
 
 /** Create an adapter-owned resumable observation offset for a known canonical sequence. */
 export const observationOffsetAt = makeOffset;

package/src/do-journal.ts

@@ -4,6 +4,7 @@ import { Effect, Schema } from "effect";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 import { SqlError } from "effect/unstable/sql/SqlError";
 
+import type { DoStorageFailpointError } from "./errors.ts";
 import {
   DoAppendConflict,
   DoCheckpointConflict,
@@ -11,7 +12,6 @@ import {
   DoStorageCompatibilityError,
   DoStorageCorruptionError,
   DoStorageError,
-  DoStorageFailpointError,
   DoValueBoundExceeded,
   type DoStorageFailpointLocation,
 } from "./errors.ts";
@@ -29,6 +29,7 @@ const MAX_RECORDS_PER_CONVERSATION = 65_536;
 const MAX_IDENTIFIER_LENGTH = 1_024;
 /** Durable Object SQL storage allows at most 100 bound parameters per statement. */
 const MAX_BOUND_PARAMETERS = 100;
+const isSqlError = Schema.is(SqlError);
 
 const storedTextBytes = (value: string): number => new TextEncoder().encode(value).byteLength;
 
@@ -378,9 +379,7 @@ const makeJournal = (
     (operation: string) =>
     <A, E>(effect: Effect.Effect<A, E>): Effect.Effect<A, E | DoStorageError> =>
       sql.withTransaction(effect).pipe(
-        Effect.mapError((error) =>
-          error instanceof SqlError ? storageError(operation)(error) : error,
-        ),
+        Effect.mapError((error) => (isSqlError(error) ? storageError(operation)(error) : error)),
         Effect.withSpan("DoJournal.withWriteTransaction", { attributes: { operation } }),
       );
 

package/src/do-ledger.ts

@@ -108,6 +108,11 @@ const BoundedTimestamp = Schema.NonEmptyString.check(Schema.isMaxLength(128));
 
 const SCAN_PAGE_SIZE = 256;
 const EPOCH_ZERO = Schema.decodeSync(ProducerEpoch)(0);
+const RESUME_IMMEDIATELY: SuspensionOutcome = "resume-immediately";
+const SUSPENDED: SuspensionOutcome = "suspended";
+const NOT_WAITING: ChildSettledOutcome = "not-waiting";
+const STILL_WAITING: ChildSettledOutcome = "still-waiting";
+const WOKEN: ChildSettledOutcome = "woken";
 const MAX_IDENTIFIER_LENGTH = 1_024;
 
 class SubmissionRow extends Schema.Class<SubmissionRow>("SubmissionRow")({
@@ -289,6 +294,9 @@ const decodeChildReservationSnapshotUnknown = Schema.decodeUnknownEffect(
   ChildBudgetReservationSnapshot,
 );
 const decodeChildAttachmentSnapshot = Schema.decodeUnknownEffect(ChildAttachmentSnapshot);
+const equivalentPersistedJson = Schema.toEquivalence(PersistedJson);
+const equivalentUnknownResolution = Schema.toEquivalence(UnknownResolution);
+const isDoStorageError = Schema.is(DoStorageError);
 
 /** Wrap an adapter-internal failure into the port's LedgerError without erasing its tag. */
 const internalFailure =
@@ -352,7 +360,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
       .withWriteTransaction(operation)(effect)
       .pipe(
         Effect.mapError((error) =>
-          error instanceof DoStorageError ? internalFailure(operation)(error) : error,
+          isDoStorageError(error) ? internalFailure(operation)(error) : error,
         ),
       );
 
@@ -1819,7 +1827,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             }).pipe(Effect.mapError(internalFailure(operation))),
           );
         }
-        return claimed as ReadonlyArray<JoiningClaim>;
+        return claimed;
       }),
     );
     yield* hitFailpoint("ledger:claim-joining:after", operation);
@@ -1954,7 +1962,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             const decisions = yield* readApprovalDecisions(operation, validated.submissionId);
             const decided = new Set(decisions.map((row) => row.tool_call_id));
             if (validated.reason.toolCallIds.every((toolCallId) => decided.has(toolCallId))) {
-              return "resume-immediately" as SuspensionOutcome;
+              return RESUME_IMMEDIATELY;
             }
           } else {
             const markers = yield* readChildSettlementMarkers(operation, validated.submissionId);
@@ -1972,7 +1980,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
               }
             }
             if (allSettled) {
-              return "resume-immediately" as SuspensionOutcome;
+              return RESUME_IMMEDIATELY;
             }
           }
           const now = yield* currentInstant;
@@ -1990,7 +1998,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             DELETE FROM effect_agent_submission_ownership
             WHERE submission_id = ${validated.submissionId}
           `.pipe(Effect.mapError(sqlFailure(operation)));
-          return "suspended" as SuspensionOutcome;
+          return SUSPENDED;
         }),
       );
       yield* hitFailpoint("ledger:suspend:after", operation);
@@ -2198,17 +2206,24 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
         }
         const resolutions = yield* readUnknownResolutions(operation, validated.submissionId);
         const existing = resolutions.find((row) => row.tool_call_id === validated.toolCallId);
-        if (existing !== undefined && existing.resolution_json !== resolutionJson) {
+        const existingIntent =
+          existing === undefined
+            ? undefined
+            : yield* unknownResolutionIntentFromRow(operation, existing);
+        if (
+          existingIntent !== undefined &&
+          !equivalentUnknownResolution(existingIntent.resolution, validated.resolution)
+        ) {
           return yield* UnknownResolutionConflict.make({
             submissionId: validated.submissionId,
             toolCallId: validated.toolCallId,
           });
         }
         let resolved: UnknownResolutionIntent;
-        if (existing !== undefined) {
+        if (existingIntent !== undefined) {
           // Idempotent replay of the recorded intent (author/reason may differ; the stored
           // audit fields win, exactly like requestAbort).
-          resolved = yield* unknownResolutionIntentFromRow(operation, existing);
+          resolved = existingIntent;
         } else {
           const now = yield* currentInstant;
           yield* sql`
@@ -2322,7 +2337,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
         `.pipe(Effect.mapError(sqlFailure(operation)));
 
         if (parent.state !== "suspended" || parent.suspended_reason_json === null) {
-          return "not-waiting" as ChildSettledOutcome;
+          return NOT_WAITING;
         }
         const reason = yield* Schema.decodeEffect(Schema.fromJsonString(SuspensionReason))(
           parent.suspended_reason_json,
@@ -2337,12 +2352,12 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
           ),
         );
         if (reason._tag !== "WaitingForChild") {
-          return "not-waiting" as ChildSettledOutcome;
+          return NOT_WAITING;
         }
         if (
           !reason.children.some((entry) => entry.childSubmissionId === validated.childSubmissionId)
         ) {
-          return "not-waiting" as ChildSettledOutcome;
+          return NOT_WAITING;
         }
         // The parent wakes exactly when EVERY listed child is provably settled — from its
         // local row or a recorded marker (spec §12 step 10); replays re-run the coverage
@@ -2356,7 +2371,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             entry.childSubmissionId,
           );
           if (!settled) {
-            return "still-waiting" as ChildSettledOutcome;
+            return STILL_WAITING;
           }
         }
         yield* sql`
@@ -2367,7 +2382,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             suspended_at = NULL
           WHERE submission_id = ${validated.parentSubmissionId}
         `.pipe(Effect.mapError(sqlFailure(operation)));
-        return "woken" as ChildSettledOutcome;
+        return WOKEN;
       }),
     );
     yield* hitFailpoint("ledger:child-settled:after", operation);
@@ -2390,13 +2405,17 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
       Effect.gen(function* () {
         const existing = yield* readChildReservation(operation, validated.reservationId);
         if (Option.isSome(existing)) {
+          const existingSnapshot = yield* childReservationSnapshotFromRow(
+            operation,
+            existing.value,
+          );
           // Identical replays short-circuit before the fence, mirroring reserveSettlement: a
           // replay creates nothing, so a recovering caller resumes rather than duplicates.
           const identical =
             existing.value.parent_submission_id === validated.parentSubmissionId &&
             existing.value.parent_tool_call_id === validated.parentToolCallId &&
             existing.value.allocation_digest === validated.allocationDigest &&
-            existing.value.allocation_json === allocationJson;
+            equivalentPersistedJson(existingSnapshot.allocation, validated.allocation);
           if (!identical) {
             return yield* ChildReservationConflict.make({
               reservationId: validated.reservationId,
@@ -2406,7 +2425,7 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
             });
           }
           return ReservedChildBudget.make({
-            reservation: yield* childReservationSnapshotFromRow(operation, existing.value),
+            reservation: existingSnapshot,
             replayed: true,
           });
         }
@@ -2551,10 +2570,17 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
           });
         }
         if (existing.value.status !== "reserved") {
+          const existingSnapshot = yield* childReservationSnapshotFromRow(
+            operation,
+            existing.value,
+          );
           // The accounting decision was already frozen exactly once; an identical replay is a
           // no-op and a divergent decision conflicts (spec §12 join step 6).
-          if (existing.value.accounting_json === accountingJson) {
-            return yield* childReservationSnapshotFromRow(operation, existing.value);
+          if (
+            existingSnapshot.accounting !== undefined &&
+            equivalentPersistedJson(existingSnapshot.accounting, validated.accounting)
+          ) {
+            return existingSnapshot;
           }
           return yield* ChildReservationConflict.make({
             reservationId: validated.reservationId,
@@ -2690,10 +2716,11 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
     return [snapshots, next] as const;
   });
 
-  const scanNonterminal: Stream.Stream<SubmissionSnapshot, LedgerError> = Stream.paginate(
-    undefined as ScanCursor | undefined,
-    scanPage,
-  );
+  const scanNonterminal: Stream.Stream<SubmissionSnapshot, LedgerError> = Stream.paginate<
+    ScanCursor | undefined,
+    SubmissionSnapshot,
+    LedgerError
+  >(undefined, scanPage);
 
   const loadRecoverySnapshot: SubmissionLedger["Service"]["loadRecoverySnapshot"] = Effect.fn(
     "DoSubmissionLedger.loadRecoverySnapshot",
@@ -2964,13 +2991,17 @@ export const submissionLedgerLayer: Layer.Layer<
 export const ledgerLayer = (
   options: DoStorageOptions,
 ): Layer.Layer<SubmissionLedger, DoStorageInitializationError> =>
-  submissionLedgerLayer.pipe(
-    Layer.provide(
-      Layer.mergeAll(
-        storageConfigLayer(options),
-        storageFailpointLayer(options),
-        SqliteClient.layer({ storage: options.storage }),
-        BrowserCrypto.layer,
+  Layer.unwrap(
+    Effect.map(DoStorageConfig, (config) =>
+      submissionLedgerLayer.pipe(
+        Layer.provide(
+          Layer.mergeAll(
+            Layer.succeed(DoStorageConfig)(config),
+            storageFailpointLayer(options),
+            SqliteClient.layer({ storage: options.storage }),
+            BrowserCrypto.layer,
+          ),
+        ),
       ),
     ),
-  );
+  ).pipe(Layer.provide(storageConfigLayer(options)));

package/src/do-storage-failpoint.ts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer, Ref } from "effect";
 
-import { DoStorageFailpointError, type DoStorageFailpointLocation } from "./errors.ts";
+import type { DoStorageFailpointError, DoStorageFailpointLocation } from "./errors.ts";
 
 export type DoStorageFailpointHandler = (
   location: DoStorageFailpointLocation,