@effect-agent/storage-sqlite 0.1.0-beta.24 → 0.1.0-beta.25

package/dist/index.mjs

@@ -1062,6 +1062,9 @@ const OffsetText = Schema.String.check(Schema.isMaxLength(4 * 1024));
 const SQLITE_OFFSET_PREFIX = "effect-agent-sqlite@1:";
 const ZERO_CANONICAL_SEQUENCE = Schema.decodeSync(CanonicalSequence)(0);
 const isDigest = Schema.is(Digest);
+const isSqliteFenceRejected = Schema.is(SqliteFenceRejected);
+const isSqliteAppendConflict = Schema.is(SqliteAppendConflict);
+const isSqliteCheckpointConflict = Schema.is(SqliteCheckpointConflict);
 const storeError = (operation, error) => ConversationStoreError.make({
 	cause: error,
 	operation,
@@ -1290,8 +1293,8 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 		}).pipe(Effect.mapError((error) => schemaStoreError("encode canonical append", error)));
 		yield* hitFailpoint("append:before");
 		const result = yield* journal.append(rawRequest).pipe(Effect.mapError((error) => {
-			if (error instanceof SqliteFenceRejected) return mapFence(validated.conversationId, error);
-			if (error instanceof SqliteAppendConflict) return error.actualTailSequence !== void 0 && isDigest(error.actualTailDigest) ? AppendConflict.make({
+			if (isSqliteFenceRejected(error)) return mapFence(validated.conversationId, error);
+			if (isSqliteAppendConflict(error)) return error.actualTailSequence !== void 0 && isDigest(error.actualTailDigest) ? AppendConflict.make({
 				conversationId: validated.conversationId,
 				batchId: validated.batch.batchId,
 				reason: error.reason,
@@ -1392,7 +1395,7 @@ const makeServices$1 = Effect.fn("SqliteConversationStore.makeServices")(functio
 			checkpointJson
 		});
 		yield* hitFailpoint("save-checkpoint:before");
-		yield* journal.saveCheckpoint(raw).pipe(Effect.mapError((error) => error instanceof SqliteCheckpointConflict ? CheckpointRejected.make({
+		yield* journal.saveCheckpoint(raw).pipe(Effect.mapError((error) => isSqliteCheckpointConflict(error) ? CheckpointRejected.make({
 			conversationId: validated.checkpoint.conversationId,
 			reason: "digest-mismatch"
 		}) : storeError("save checkpoint", error)));
@@ -1452,10 +1455,7 @@ const storageFailpointLayer = (options) => options.failpoint === void 0 ? Sqlite
 * A composition-root convenience Layer for canonical Conversations. Durable accepted work is
 * served by the separate SubmissionLedger port.
 */
-const layer = (options) => {
-	const sqlLayer = SqliteClient.layer({ filename: options.filename });
-	return conversationStoreLayer.pipe(Layer.provide(Layer.mergeAll(storageConfigLayer(options), storageFailpointLayer(options), sqlLayer, NodeCrypto.layer)));
-};
+const layer = (options) => Layer.unwrap(Effect.map(SqliteStorageConfig, (config) => conversationStoreLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(SqliteStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 /** Create an adapter-owned resumable observation offset for a known canonical sequence. */
 const observationOffsetAt = makeOffset;
 //#endregion
@@ -1465,6 +1465,11 @@ const BoundedIdentifier = Schema.NonEmptyString.check(Schema.isMaxLength(1024));
 const BoundedTimestamp = Schema.NonEmptyString.check(Schema.isMaxLength(128));
 const SCAN_PAGE_SIZE = 256;
 const EPOCH_ZERO = Schema.decodeSync(ProducerEpoch)(0);
+const RESUME_IMMEDIATELY = "resume-immediately";
+const SUSPENDED = "suspended";
+const NOT_WAITING = "not-waiting";
+const STILL_WAITING = "still-waiting";
+const WOKEN = "woken";
 var SubmissionRow = class extends Schema.Class("SubmissionRow")({
 	submission_id: BoundedIdentifier,
 	conversation_id: BoundedIdentifier,
@@ -1617,6 +1622,9 @@ const decodeUnknownResolutionIntent = Schema.decodeUnknownEffect(UnknownResoluti
 const decodeParentLinkage = Schema.decodeUnknownEffect(ParentLinkage);
 const decodeChildReservationSnapshotUnknown = Schema.decodeUnknownEffect(ChildBudgetReservationSnapshot);
 const decodeChildAttachmentSnapshot = Schema.decodeUnknownEffect(ChildAttachmentSnapshot);
+const equivalentPersistedJson = Schema.toEquivalence(PersistedJson);
+const equivalentUnknownResolution = Schema.toEquivalence(UnknownResolution);
+const isSqliteTransactionFailure = Schema.is(Schema.Union([SqliteStorageError, SqliteWriteContention]));
 /** Wrap an adapter-internal failure into the port's LedgerError without erasing its tag. */
 const internalFailure = (operation) => (error) => LedgerError.make({
 	operation,
@@ -1654,7 +1662,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 	* acquisition failures surface as LedgerError carrying the typed retryable
 	* SqliteWriteContention (or SqliteStorageError) as cause.
 	*/
-	const inWriteTransaction = (operation, effect) => journal.withWriteTransaction(operation)(effect).pipe(Effect.mapError((error) => error instanceof SqliteStorageError || error instanceof SqliteWriteContention ? internalFailure(operation)(error) : error));
+	const inWriteTransaction = (operation, effect) => journal.withWriteTransaction(operation)(effect).pipe(Effect.mapError((error) => isSqliteTransactionFailure(error) ? internalFailure(operation)(error) : error));
 	const mintIdentifier = (prefix, operation) => crypto.randomUUIDv7.pipe(Effect.map((uuid) => `${prefix}-${uuid}`), Effect.mapError((error) => internalFailure(operation)(error)));
 	const currentInstant = Effect.map(Clock.currentTimeMillis, (millis) => ({
 		millis,
@@ -2506,7 +2514,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			if (validated.reason._tag === "ApprovalPending") {
 				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";
+				if (validated.reason.toolCallIds.every((toolCallId) => decided.has(toolCallId))) return RESUME_IMMEDIATELY;
 			} else {
 				let allSettled = true;
 				for (const child of validated.reason.children) {
@@ -2516,7 +2524,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 						break;
 					}
 				}
-				if (allSettled) return "resume-immediately";
+				if (allSettled) return RESUME_IMMEDIATELY;
 			}
 			const now = yield* currentInstant;
 			yield* sql`
@@ -2531,7 +2539,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
           DELETE FROM effect_agent_submission_ownership
           WHERE submission_id = ${validated.submissionId}
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			return "suspended";
+			return SUSPENDED;
 		}));
 		yield* hitFailpoint("ledger:suspend:after", operation);
 		return outcome;
@@ -2659,12 +2667,13 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 				});
 			}
 			const existing = (yield* readUnknownResolutions(operation, validated.submissionId)).find((row) => row.tool_call_id === validated.toolCallId);
-			if (existing !== void 0 && existing.resolution_json !== resolutionJson) return yield* UnknownResolutionConflict.make({
+			const existingIntent = existing === void 0 ? void 0 : yield* unknownResolutionIntentFromRow(operation, existing);
+			if (existingIntent !== void 0 && !equivalentUnknownResolution(existingIntent.resolution, validated.resolution)) return yield* UnknownResolutionConflict.make({
 				submissionId: validated.submissionId,
 				toolCallId: validated.toolCallId
 			});
 			let resolved;
-			if (existing !== void 0) resolved = yield* unknownResolutionIntentFromRow(operation, existing);
+			if (existingIntent !== void 0) resolved = existingIntent;
 			else {
 				const now = yield* currentInstant;
 				yield* sql`
@@ -2724,14 +2733,14 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 				operation,
 				message: `Child submission ${validated.childSubmissionId} has no recorded settlement.`
 			});
-			if (parent.state !== "suspended" || parent.suspended_reason_json === null) return "not-waiting";
+			if (parent.state !== "suspended" || parent.suspended_reason_json === null) return NOT_WAITING;
 			const reason = yield* Schema.decodeEffect(Schema.fromJsonString(SuspensionReason))(parent.suspended_reason_json).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_submissions", parent.submission_id, error.message)));
-			if (reason._tag !== "WaitingForChild") return "not-waiting";
-			if (!reason.children.some((entry) => entry.childSubmissionId === validated.childSubmissionId)) return "not-waiting";
+			if (reason._tag !== "WaitingForChild") return NOT_WAITING;
+			if (!reason.children.some((entry) => entry.childSubmissionId === validated.childSubmissionId)) return NOT_WAITING;
 			for (const entry of reason.children) {
 				const listed = yield* readSubmission(operation, entry.childSubmissionId);
 				const reservation = yield* readReservation(operation, entry.childSubmissionId);
-				if (!(Option.isSome(listed) && (listed.value.state === "settled" || listed.value.state === "terminalizing" && Option.isSome(reservation)))) return "still-waiting";
+				if (!(Option.isSome(listed) && (listed.value.state === "settled" || listed.value.state === "terminalizing" && Option.isSome(reservation)))) return STILL_WAITING;
 			}
 			yield* sql`
           UPDATE effect_agent_submissions
@@ -2741,7 +2750,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
             suspended_at = NULL
           WHERE submission_id = ${validated.parentSubmissionId}
         `.pipe(Effect.mapError(sqlFailure(operation)));
-			return "woken";
+			return WOKEN;
 		}));
 		yield* hitFailpoint("ledger:child-settled:after", operation);
 		return outcome;
@@ -2754,13 +2763,14 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 		const reserved = yield* inWriteTransaction(operation, Effect.gen(function* () {
 			const existing = yield* readChildReservation(operation, validated.reservationId);
 			if (Option.isSome(existing)) {
-				if (!(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)) return yield* ChildReservationConflict.make({
+				const existingSnapshot = yield* childReservationSnapshotFromRow(operation, existing.value);
+				if (!(existing.value.parent_submission_id === validated.parentSubmissionId && existing.value.parent_tool_call_id === validated.parentToolCallId && existing.value.allocation_digest === validated.allocationDigest && equivalentPersistedJson(existingSnapshot.allocation, validated.allocation))) return yield* ChildReservationConflict.make({
 					reservationId: validated.reservationId,
 					status: existing.value.status,
 					message: "A reservation with this identity exists with a different parent Tool Call or allocation."
 				});
 				return ReservedChildBudget.make({
-					reservation: yield* childReservationSnapshotFromRow(operation, existing.value),
+					reservation: existingSnapshot,
 					replayed: true
 				});
 			}
@@ -2856,7 +2866,8 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 				message: `Unknown child reservation ${validated.reservationId}.`
 			});
 			if (existing.value.status !== "reserved") {
-				if (existing.value.accounting_json === accountingJson) return yield* childReservationSnapshotFromRow(operation, existing.value);
+				const existingSnapshot = yield* childReservationSnapshotFromRow(operation, existing.value);
+				if (existingSnapshot.accounting !== void 0 && equivalentPersistedJson(existingSnapshot.accounting, validated.accounting)) return existingSnapshot;
 				return yield* ChildReservationConflict.make({
 					reservationId: validated.reservationId,
 					status: existing.value.status,
@@ -3081,7 +3092,7 @@ const submissionLedgerLayer = Layer.effectContext(makeServices());
 * A composition-root convenience Layer for the durable Submission Ledger. Point it at the
 * same database file as the ConversationStore so claims fence the same producer epochs.
 */
-const ledgerLayer = (options) => submissionLedgerLayer.pipe(Layer.provide(Layer.mergeAll(storageConfigLayer(options), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer)));
+const ledgerLayer = (options) => Layer.unwrap(Effect.map(SqliteStorageConfig, (config) => submissionLedgerLayer.pipe(Layer.provide(Layer.mergeAll(Layer.succeed(SqliteStorageConfig)(config), storageFailpointLayer(options), SqliteClient.layer({ filename: options.filename }), NodeCrypto.layer))))).pipe(Layer.provide(storageConfigLayer(options)));
 //#endregion
 export { CurrentSqliteStorageVersion, SqliteAppendConflict, SqliteCheckpointConflict, SqliteFenceRejected, SqliteLedgerError, SqliteStorageCompatibilityError, SqliteStorageConfig, SqliteStorageConfigValue, SqliteStorageCorruptionError, SqliteStorageError, SqliteStorageFailpoint, SqliteStorageFailpointError, SqliteStorageFailpointLocation, SqliteStorageFailpointTestControl, SqliteWriteContention, conversationStoreLayer, layer, ledgerLayer, observationOffsetAt, sqliteMigrations, storageConfigLayer, storageFailpointLayer, submissionLedgerLayer };