@effect-agent/storage-sqlite 0.1.0-beta.50 → 0.1.0-beta.52

package/dist/SqliteScheduleStore.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { a as initializeSqliteJournal } from "./sqlite-journal-BxBxOUEI.mjs";
+import { a as initializeSqliteJournal } from "./sqlite-journal-j4E5Cqsj.mjs";
 import { Effect, Layer, Result, Schema } from "effect";
 import * as SqlClientService from "effect/unstable/sql/SqlClient";
 import { ScheduleCapacityError, ScheduleChange, ScheduleConflict, ScheduleDueCursor, ScheduleFailpoint, ScheduleId, ScheduleInstant, ScheduleKey, ScheduleNotFound, ScheduleOwner, SchedulePageRequest, ScheduleRecord, ScheduleStorageError, ScheduleStore, defaultSchedulingLimits } from "@effect-agent/thread/Schedule";

package/dist/{SqliteStorageVersion-DwQbn4bw.d.mts → SqliteStorageVersion-DiIVkDFv.d.mts}

@@ -1,9 +1,9 @@
 import { SqliteMigrator } from "@effect/sql-sqlite-node";
 //#region src/internal/migrations.d.ts
-declare const CurrentSqliteStorageVersion = 7;
+declare const CurrentSqliteStorageVersion = 8;
 declare namespace SqliteStorageVersion_d_exports {
   export { CurrentSqliteStorageVersion };
 }
 //#endregion
 export { CurrentSqliteStorageVersion as n, SqliteStorageVersion_d_exports as t };
-//# sourceMappingURL=SqliteStorageVersion-DwQbn4bw.d.mts.map
+//# sourceMappingURL=SqliteStorageVersion-DiIVkDFv.d.mts.map

package/dist/SqliteStorageVersion.d.mts

@@ -1,2 +1,2 @@
-import { n as CurrentSqliteStorageVersion } from "./SqliteStorageVersion-DwQbn4bw.mjs";
+import { n as CurrentSqliteStorageVersion } from "./SqliteStorageVersion-DiIVkDFv.mjs";
 export { CurrentSqliteStorageVersion };

package/dist/SqliteStorageVersion.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { t as CurrentSqliteStorageVersion } from "./migrations-B82C9A3r.mjs";
+import { t as CurrentSqliteStorageVersion } from "./migrations-BKcJueHB.mjs";
 //#region src/SqliteStorageVersion.ts
-var SqliteStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentSqliteStorageVersion: () => 7 });
+var SqliteStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentSqliteStorageVersion: () => 8 });
 //#endregion
 export { CurrentSqliteStorageVersion, SqliteStorageVersion_exports as t };
 

package/dist/SqliteSubmissionLedger.mjs

@@ -2,14 +2,14 @@ import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { SqliteStorageConfig } from "./SqliteStorageConfig.mjs";
 import { SqliteLedgerError, SqliteStorageCorruptionError, SqliteStorageError, SqliteWriteContention } from "./SqliteStorageError.mjs";
 import { SqliteStorageFailpoint } from "./SqliteStorageFailpoint.mjs";
-import { a as initializeSqliteJournal, i as decodeRows } from "./sqlite-journal-BxBxOUEI.mjs";
+import { a as initializeSqliteJournal, i as decodeRows } from "./sqlite-journal-j4E5Cqsj.mjs";
 import { storageConfigLayer, storageFailpointLayer } from "./SqliteThreadStore.mjs";
 import { ApprovalDecision, CanonicalSequence, DefinitionDigests, Digest, PersistedJson, ProducerEpoch, RecordEnvelope, SettlementOutcome } from "@effect-agent/thread/Records";
 import { Clock, Context, Crypto, DateTime, Effect, Layer, Option, Schema, Stream } from "effect";
 import * as SqlClientService from "effect/unstable/sql/SqlClient";
 import { SqliteClient } from "@effect/sql-sqlite-node";
 import { EMPTY_TAIL_DIGEST } from "@effect-agent/thread/Digest";
-import { AbortCommand, AbortIntent, AbortIntentRequest, AdmissionAdmitted, AdmissionConflict, AdmissionNotAdmitted, AdmissionRequest, AdmissionResult, ApprovalConflict, ApprovalDecisionCommand, ApprovalDecisionIntent, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, ChildAttachmentSnapshot, ChildBudgetReservationRequest, ChildBudgetReservationSnapshot, ChildReservationConflict, ChildReservationStatus, ChildSettledNotification, Claim, ClaimJoiningRequest, ClaimRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, OwnershipLost, OwnershipRenewal, OwnershipSnapshot, ParentLinkage, QueueSequence, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, ReservedChildBudget, ReservedSettlement, RevertJoiningRequest, Settlement, SettlementConflict, SettlementFinalization, SettlementReservation, SettlementReservationSnapshot, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, settlementFailureFromRecord, submissionAbortRecordId } from "@effect-agent/thread/SubmissionLedger";
+import { AbortCommand, AbortIntent, AbortIntentRequest, AdmissionAdmitted, AdmissionConflict, AdmissionFence, AdmissionGroup, AdmissionNotAdmitted, AdmissionPolicyError, AdmissionRequest, AdmissionResult, ApprovalConflict, ApprovalDecisionCommand, ApprovalDecisionIntent, AttachChildToReservationRequest, BeginChildBudgetReleaseRequest, ChildAttachmentSnapshot, ChildBudgetReservationRequest, ChildBudgetReservationSnapshot, ChildReservationConflict, ChildReservationStatus, ChildSettledNotification, Claim, ClaimJoiningRequest, ClaimRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, OwnershipLost, OwnershipRenewal, OwnershipSnapshot, ParentLinkage, QueueSequence, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReleaseOwnershipRequest, RenewOwnershipRequest, ReservedChildBudget, ReservedSettlement, RevertJoiningRequest, Settlement, SettlementConflict, SettlementFinalization, SettlementReservation, SettlementReservationSnapshot, SubmissionAdmissionFence, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, settlementFailureFromRecord, submissionAbortRecordId } from "@effect-agent/thread/SubmissionLedger";
 import { NodeCrypto } from "@effect/platform-node";
 //#region src/SqliteSubmissionLedger.ts
 var SqliteSubmissionLedger_exports = /* @__PURE__ */ __exportAll({
@@ -50,7 +50,9 @@ var SubmissionRow = class extends Schema.Class("SubmissionRow")({
 	unknown_reason: Schema.NullOr(BoundedStoredText),
 	unknown_tool_call_ids_json: Schema.NullOr(BoundedStoredText),
 	parent_submission_id: Schema.NullOr(BoundedIdentifier),
-	parent_tool_call_id: Schema.NullOr(BoundedIdentifier)
+	parent_tool_call_id: Schema.NullOr(BoundedIdentifier),
+	admission_group: Schema.NullOr(AdmissionGroup),
+	admission_fence_json: Schema.NullOr(BoundedStoredText)
 }) {};
 var ChildReservationRow = class extends Schema.Class("ChildReservationRow")({
 	reservation_id: BoundedIdentifier,
@@ -140,7 +142,9 @@ const SUBMISSION_COLUMNS = `
   unknown_reason,
   unknown_tool_call_ids_json,
   parent_submission_id,
-  parent_tool_call_id
+  parent_tool_call_id,
+  admission_group,
+  admission_fence_json
 `;
 const CHILD_RESERVATION_COLUMNS = `
   reservation_id,
@@ -218,6 +222,7 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 	const failpoint = yield* SqliteStorageFailpoint;
 	const sql = yield* SqlClientService.SqlClient;
 	const crypto = yield* Crypto.Crypto;
+	const admissionFence = yield* SubmissionAdmissionFence;
 	const journal = yield* initializeSqliteJournal();
 	const hitFailpoint = (location, operation) => failpoint.hit(location).pipe(Effect.mapError((error) => internalFailure(operation)(error)));
 	/**
@@ -307,6 +312,8 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 			receiptId: row.receipt_id,
 			state: row.state,
 			createdAt: row.created_at,
+			...row.admission_group === null ? {} : { admissionGroup: row.admission_group },
+			...row.admission_fence_json === null ? {} : { admissionFence: yield* parseStoredJsonText(row.admission_fence_json).pipe(Effect.mapError(internalFailure(operation))) },
 			...row.settled_outcome === null ? {} : { settledOutcome: row.settled_outcome },
 			...row.ready_at === null ? {} : { readyAt: row.ready_at },
 			...row.parent_submission_id === null || row.parent_tool_call_id === null ? {} : { parentLinkage: {
@@ -498,6 +505,14 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 					existingInputDigest: existing[0].input_digest,
 					attemptedInputDigest: validated.inputDigest
 				});
+				const retainedFence = existing[0].admission_fence_json === null ? void 0 : yield* Schema.decodeEffect(Schema.fromJsonString(AdmissionFence))(existing[0].admission_fence_json).pipe(Effect.mapError(internalFailure(operation)));
+				if ((existing[0].admission_group ?? void 0) !== validated.admissionGroup || !Schema.toEquivalence(Schema.optional(AdmissionFence))(retainedFence, validated.admissionFence)) return yield* AdmissionConflict.make({
+					threadId: validated.threadId,
+					principal: validated.principal,
+					idempotencyKey: validated.idempotencyKey,
+					existingInputDigest: existing[0].input_digest,
+					attemptedInputDigest: validated.inputDigest
+				});
 				return yield* decodeAdmissionResult({
 					submissionId: existing[0].submission_id,
 					receiptId: existing[0].receipt_id,
@@ -506,6 +521,16 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
 					replayed: true
 				}).pipe(Effect.mapError(internalFailure(operation)));
 			}
+			yield* admissionFence.check(validated);
+			if (validated.admissionGroup !== void 0) {
+				if ((yield* sql`
+              SELECT submission_id FROM effect_agent_submissions
+              WHERE thread_id=${validated.threadId} AND admission_group=${validated.admissionGroup} AND state<>'settled' LIMIT 1
+            `.pipe(Effect.mapError(sqlFailure(operation)))).length > 0) return yield* AdmissionPolicyError.make({
+					reason: "occupied",
+					code: "admission-group"
+				});
+			}
 			const maxRows = yield* sql`
             SELECT COALESCE(MAX(queue_sequence), 0) AS max_queue_sequence
             FROM effect_agent_submissions
@@ -530,7 +555,9 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
               state,
               created_at,
               parent_submission_id,
-              parent_tool_call_id
+              parent_tool_call_id,
+              admission_group,
+              admission_fence_json
             ) VALUES (
               ${mintedSubmissionId},
               ${validated.threadId},
@@ -546,7 +573,9 @@ const makeServices = Effect.fn("SqliteSubmissionLedger.makeServices")(function*
               'admitted',
               ${now.iso},
               ${validated.parentLinkage?.parentSubmissionId ?? null},
-              ${validated.parentLinkage?.parentToolCallId ?? null}
+              ${validated.parentLinkage?.parentToolCallId ?? null},
+              ${validated.admissionGroup ?? null},
+              ${validated.admissionFence === void 0 ? null : JSON.stringify(validated.admissionFence)}
             )
           `.pipe(Effect.mapError(sqlFailure(operation)));
 			return yield* decodeAdmissionResult({