@effect-agent/storage-cloudflare 0.1.0-beta.56 → 0.1.0-beta.58

package/dist/DoMemoryStore.d.mts

@@ -1,6 +1,6 @@
-import { MemoryMutationFailpoint } from "@effect-agent/core/MemoryStore";
-import { SqliteClient } from "@effect/sql-sqlite-do";
 import { Layer, Schema } from "effect";
+import { SqliteClient } from "@effect/sql-sqlite-do";
+import { MemoryMutationFailpoint } from "@effect-agent/core/MemoryStore";
 declare namespace DoMemoryStore_d_exports {
   export { DoMemoryStorageLimits, defaultDoMemoryStorageLimits, doMemoryStoreLayer, doMemoryStoreLayerWithFailpoints };
 }

package/dist/DoMemoryStore.mjs

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
+import { Effect, Layer, Schema } from "effect";
+import { SqliteClient } from "@effect/sql-sqlite-do";
 import { MemoryMutationFailpoint, MemoryStorageError } from "@effect-agent/core/MemoryStore";
 import { SqlMemoryLimits, memoryStoreLayerWithFailpoints } from "@effect-agent/thread/SqlMemoryStore";
-import { SqliteClient } from "@effect/sql-sqlite-do";
-import { Effect, Layer, Schema } from "effect";
 //#region src/DoMemoryStore.ts
 var DoMemoryStore_exports = /* @__PURE__ */ __exportAll({
 	DoMemoryStorageLimits: () => DoMemoryStorageLimits,

package/dist/DoMessageDeliveryStore.d.mts

@@ -0,0 +1,17 @@
+import { a as DoStorageCompatibilityError, o as DoStorageCorruptionError, s as DoStorageError } from "./DoStorageError-UrxrvbnF.mjs";
+import { DoStorageConfig } from "./DoStorageConfig.mjs";
+import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
+import { MessageDeliveryError, MessageDeliveryStore, MessageDeliveryStoreLimits } from "@effect-agent/thread/MessageDelivery";
+import { Layer } from "effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+declare namespace DoMessageDeliveryStore_d_exports {
+  export { doMessageDeliveryStoreLayer };
+}
+/**
+ * Message obligations in a Thread Object's own SQL storage. The platform must prearm
+ * maintenance before insertion and retain its alarm while nextDeadline is present.
+ */
+declare const doMessageDeliveryStoreLayer: (limits?: MessageDeliveryStoreLimits) => Layer.Layer<MessageDeliveryStore, DoStorageCompatibilityError | DoStorageCorruptionError | DoStorageError | MessageDeliveryError, DoStorageConfig | DoStorageFailpoint | SqlClient.SqlClient>;
+//#endregion
+export { doMessageDeliveryStoreLayer, DoMessageDeliveryStore_d_exports as t };
+//# sourceMappingURL=DoMessageDeliveryStore.d.mts.map

package/dist/DoMessageDeliveryStore.mjs

@@ -0,0 +1,32 @@
+import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
+import { DoStorageConfig } from "./DoStorageConfig.mjs";
+import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
+import { a as initializeDoJournal } from "./do-journal-Brv7xSH5.mjs";
+import { MessageDeliveryError, MessageDeliveryStore } from "@effect-agent/thread/MessageDelivery";
+import { SqlMessageDeliveryTransaction, makeSqlMessageDeliveryStore } from "@effect-agent/thread/SqlMessageDeliveryStore";
+import { Effect, Layer } from "effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+//#region src/DoMessageDeliveryStore.ts
+var DoMessageDeliveryStore_exports = /* @__PURE__ */ __exportAll({ doMessageDeliveryStoreLayer: () => doMessageDeliveryStoreLayer });
+const transactions = Layer.effect(SqlMessageDeliveryTransaction, Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	return SqlMessageDeliveryTransaction.of({ run: (body) => sql.withTransaction(body).pipe(Effect.catchTag("SqlError", () => MessageDeliveryError.make({
+		reason: "storage",
+		operation: "transaction"
+	}))) });
+}));
+/**
+* Message obligations in a Thread Object's own SQL storage. The platform must prearm
+* maintenance before insertion and retain its alarm while nextDeadline is present.
+*/
+const doMessageDeliveryStoreLayer = (limits) => Layer.effect(MessageDeliveryStore, Effect.gen(function* () {
+	const sql = yield* SqlClient.SqlClient;
+	const config = yield* DoStorageConfig;
+	const failpoint = yield* DoStorageFailpoint;
+	yield* initializeDoJournal(sql, failpoint.hit, config.maxStoredValueBytes);
+	return yield* makeSqlMessageDeliveryStore(limits, { maxStoredValueBytes: config.maxStoredValueBytes });
+})).pipe(Layer.provide(transactions));
+//#endregion
+export { doMessageDeliveryStoreLayer, DoMessageDeliveryStore_exports as t };
+
+//# sourceMappingURL=DoMessageDeliveryStore.mjs.map

package/dist/DoMessageDeliveryStore.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"DoMessageDeliveryStore.mjs","names":[],"sources":["../src/DoMessageDeliveryStore.ts"],"sourcesContent":["import {\n  MessageDeliveryError,\n  MessageDeliveryStore,\n  type MessageDeliveryStoreLimits,\n} from \"@effect-agent/thread/MessageDelivery\";\nimport {\n  makeSqlMessageDeliveryStore,\n  SqlMessageDeliveryTransaction,\n} from \"@effect-agent/thread/SqlMessageDeliveryStore\";\nimport { Effect, Layer } from \"effect\";\nimport * as SqlClient from \"effect/unstable/sql/SqlClient\";\n\nimport { DoStorageConfig } from \"./DoStorageConfig.ts\";\nimport { DoStorageFailpoint } from \"./DoStorageFailpoint.ts\";\nimport { initializeDoJournal } from \"./internal/do-journal.ts\";\n\nconst transactions = Layer.effect(\n  SqlMessageDeliveryTransaction,\n  Effect.gen(function* () {\n    const sql = yield* SqlClient.SqlClient;\n\n    return SqlMessageDeliveryTransaction.of({\n      run: (body) =>\n        sql\n          .withTransaction(body)\n          .pipe(\n            Effect.catchTag(\"SqlError\", () =>\n              MessageDeliveryError.make({ reason: \"storage\", operation: \"transaction\" }),\n            ),\n          ),\n    });\n  }),\n);\n\n/**\n * Message obligations in a Thread Object's own SQL storage. The platform must prearm\n * maintenance before insertion and retain its alarm while nextDeadline is present.\n */\nexport const doMessageDeliveryStoreLayer = (limits?: MessageDeliveryStoreLimits) =>\n  Layer.effect(\n    MessageDeliveryStore,\n    Effect.gen(function* () {\n      const sql = yield* SqlClient.SqlClient;\n      const config = yield* DoStorageConfig;\n      const failpoint = yield* DoStorageFailpoint;\n\n      yield* initializeDoJournal(sql, failpoint.hit, config.maxStoredValueBytes);\n\n      return yield* makeSqlMessageDeliveryStore(limits, {\n        maxStoredValueBytes: config.maxStoredValueBytes,\n      });\n    }),\n  ).pipe(Layer.provide(transactions));\n"],"mappings":";;;;;;;;;;AAgBA,MAAM,eAAe,MAAM,OACzB,+BACA,OAAO,IAAI,aAAa;CACtB,MAAM,MAAM,OAAO,UAAU;CAE7B,OAAO,8BAA8B,GAAG,EACtC,MAAM,SACJ,IACG,gBAAgB,IAAI,CAAC,CACrB,KACC,OAAO,SAAS,kBACd,qBAAqB,KAAK;EAAE,QAAQ;EAAW,WAAW;CAAc,CAAC,CAC3E,CACF,EACN,CAAC;AACH,CAAC,CACH;;;;;AAMA,MAAa,+BAA+B,WAC1C,MAAM,OACJ,sBACA,OAAO,IAAI,aAAa;CACtB,MAAM,MAAM,OAAO,UAAU;CAC7B,MAAM,SAAS,OAAO;CACtB,MAAM,YAAY,OAAO;CAEzB,OAAO,oBAAoB,KAAK,UAAU,KAAK,OAAO,mBAAmB;CAEzE,OAAO,OAAO,4BAA4B,QAAQ,EAChD,qBAAqB,OAAO,oBAC9B,CAAC;AACH,CAAC,CACH,CAAC,CAAC,KAAK,MAAM,QAAQ,YAAY,CAAC"}

package/dist/DoScheduleStore.d.mts

@@ -1,6 +1,6 @@
 import { Context, Effect, Layer } from "effect";
-import { ScheduleFailpointError, ScheduleStorageError, ScheduleStore } from "@effect-agent/thread/Schedule";
 import * as SqlClientService from "effect/unstable/sql/SqlClient";
+import { ScheduleFailpointError, ScheduleStorageError, ScheduleStore } from "@effect-agent/thread/Schedule";
 declare namespace DoScheduleStore_d_exports {
   export { DoScheduleAlarmControl, DoScheduleAlarmReplacement, DoScheduleReplaceAlarm, DoScheduleTransaction, scheduleStoreLayer };
 }

package/dist/DoScheduleStore.mjs

@@ -1,9 +1,9 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { Context, Effect, Layer, Result, Schema } from "effect";
+import * as SqlClientService from "effect/unstable/sql/SqlClient";
+import { upgradeV2Schedules } from "@effect-agent/thread/SqlStorageV2Upgrade";
 import { ScheduleCapacityError, ScheduleChange, ScheduleConflict, ScheduleDueCursor, ScheduleFailpoint, ScheduleId, ScheduleInstant, ScheduleKey, ScheduleNotFound, ScheduleOwner, SchedulePageRequest, ScheduleRecord, ScheduleStorageError, ScheduleStore, defaultSchedulingLimits } from "@effect-agent/thread/Schedule";
 import { applyScheduleChange, scheduleDeadline, scheduleUsesCapacity } from "@effect-agent/thread/ScheduleTransition";
-import { upgradeV2Schedules } from "@effect-agent/thread/SqlStorageV2Upgrade";
-import * as SqlClientService from "effect/unstable/sql/SqlClient";
 //#region src/DoScheduleStore.ts
 var DoScheduleStore_exports = /* @__PURE__ */ __exportAll({
 	DoScheduleAlarmControl: () => DoScheduleAlarmControl,

package/dist/{DoStorageVersion-DxqcVgDE.d.mts → DoStorageVersion-Pt3jEHdW.d.mts}

@@ -1,10 +1,10 @@
 import { SqliteMigrator } from "@effect/sql-sqlite-do";
 //#region src/internal/migrations.d.ts
 /** The current storage version recorded in `effect_agent_meta`. */
-declare const CurrentDoStorageVersion = 3;
+declare const CurrentDoStorageVersion = 4;
 declare namespace DoStorageVersion_d_exports {
   export { CurrentDoStorageVersion };
 }
 //#endregion
 export { CurrentDoStorageVersion as n, DoStorageVersion_d_exports as t };
-//# sourceMappingURL=DoStorageVersion-DxqcVgDE.d.mts.map
+//# sourceMappingURL=DoStorageVersion-Pt3jEHdW.d.mts.map

package/dist/DoStorageVersion.d.mts

@@ -1,2 +1,2 @@
-import { n as CurrentDoStorageVersion } from "./DoStorageVersion-DxqcVgDE.mjs";
+import { n as CurrentDoStorageVersion } from "./DoStorageVersion-Pt3jEHdW.mjs";
 export { CurrentDoStorageVersion };

package/dist/DoStorageVersion.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { t as CurrentDoStorageVersion } from "./migrations-B-jiT7vx.mjs";
+import { t as CurrentDoStorageVersion } from "./migrations-soC86CQA.mjs";
 //#region src/DoStorageVersion.ts
-var DoStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentDoStorageVersion: () => 3 });
+var DoStorageVersion_exports = /* @__PURE__ */ __exportAll({ CurrentDoStorageVersion: () => 4 });
 //#endregion
 export { CurrentDoStorageVersion, DoStorageVersion_exports as t };
 

package/dist/DoSubmissionLedger.mjs

@@ -1,12 +1,14 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
-import { DoLedgerError, DoStorageCorruptionError, DoStorageError } from "./DoStorageError.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
-import { i as storageFailpointLayer, o as decodeRows, r as storageConfigLayer, s as initializeDoJournal } from "./DoThreadStore-CCSgDto6.mjs";
-import { SqliteClient } from "@effect/sql-sqlite-do";
+import { DoLedgerError, DoStorageCorruptionError, DoStorageError } from "./DoStorageError.mjs";
+import { a as initializeDoJournal, i as decodeRows } from "./do-journal-Brv7xSH5.mjs";
+import { storageConfigLayer, storageFailpointLayer } from "./DoThreadStore.mjs";
 import { Clock, Context, Crypto, DateTime, Effect, Layer, Option, Schema, Stream } from "effect";
 import * as SqlClientService from "effect/unstable/sql/SqlClient";
-import { ApprovalDecision, CanonicalSequence, DefinitionDigests, Digest, PersistedJson, ProducerEpoch, RecordEnvelope, SettlementOutcome } from "@effect-agent/thread/Records";
+import { ApprovalDecision, CanonicalSequence, DefinitionDigests, Digest, PersistedJson, ProducerEpoch, RecordEnvelope, SettlementOutcome, WorkerAdmission } from "@effect-agent/thread/Records";
+import { SqliteClient } from "@effect/sql-sqlite-do";
+import { MessageAdmission } from "@effect-agent/core/Messaging";
 import { EMPTY_TAIL_DIGEST } from "@effect-agent/thread/Digest";
 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 { BrowserCrypto } from "@effect/platform-browser";
@@ -56,7 +58,9 @@ var SubmissionRow = class extends Schema.Class("SubmissionRow")({
 	parent_submission_id: Schema.NullOr(BoundedIdentifier),
 	parent_tool_call_id: Schema.NullOr(BoundedIdentifier),
 	admission_group: Schema.NullOr(AdmissionGroup),
-	admission_fence_json: Schema.NullOr(BoundedStoredText)
+	admission_fence_json: Schema.NullOr(BoundedStoredText),
+	worker_admission_json: Schema.NullOr(BoundedStoredText),
+	message_admission_json: Schema.NullOr(BoundedStoredText)
 }) {};
 var ChildReservationRow = class extends Schema.Class("ChildReservationRow")({
 	reservation_id: BoundedIdentifier,
@@ -154,7 +158,9 @@ const SUBMISSION_COLUMNS = `
   parent_submission_id,
   parent_tool_call_id,
   admission_group,
-  admission_fence_json
+  admission_fence_json,
+  worker_admission_json,
+  message_admission_json
 `;
 const CHILD_RESERVATION_COLUMNS = `
   reservation_id,
@@ -319,6 +325,8 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 			state: row.state,
 			createdAt: row.created_at,
 			...row.admission_group === null ? {} : { admissionGroup: row.admission_group },
+			...row.worker_admission_json === null ? {} : { workerAdmission: yield* parseStoredJsonText(row.worker_admission_json).pipe(Effect.mapError(internalFailure(operation))) },
+			...row.message_admission_json === null ? {} : { messageAdmission: yield* parseStoredJsonText(row.message_admission_json).pipe(Effect.mapError(internalFailure(operation))) },
 			...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 },
@@ -517,6 +525,16 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 		const validated = yield* Schema.decodeUnknownEffect(Schema.toType(AdmissionRequest))(request).pipe(Effect.mapError(internalFailure(operation)));
 		const inputJson = yield* encodePersistedJsonText(validated.inputPayload).pipe(Effect.mapError(internalFailure(operation)));
 		yield* journal.checkValueBound(operation, inputJson).pipe(Effect.mapError(internalFailure(operation)));
+		const workerAdmissionJson = validated.workerAdmission === void 0 ? null : yield* Schema.encodeEffect(Schema.fromJsonString(WorkerAdmission))(validated.workerAdmission).pipe(Effect.mapError(internalFailure(operation)));
+		if (workerAdmissionJson !== null && new TextEncoder().encode(workerAdmissionJson).byteLength > config.maxStoredValueBytes) return yield* LedgerError.make({
+			operation,
+			message: "Worker admission metadata exceeds the stored value bound"
+		});
+		const messageAdmissionJson = validated.messageAdmission === void 0 ? null : yield* Schema.encodeEffect(Schema.fromJsonString(MessageAdmission))(validated.messageAdmission).pipe(Effect.mapError(internalFailure(operation)));
+		if (messageAdmissionJson !== null && new TextEncoder().encode(messageAdmissionJson).byteLength > config.maxStoredValueBytes) return yield* LedgerError.make({
+			operation,
+			message: "Message admission metadata exceeds the stored value bound"
+		});
 		const agentDigestsJson = yield* encodeDefinitionDigestsText(validated.agentDigests).pipe(Effect.mapError(internalFailure(operation)));
 		const mintedSubmissionId = `${yield* mintUuid(operation)}:${validated.threadId}`;
 		if (mintedSubmissionId.length > MAX_IDENTIFIER_LENGTH) return yield* LedgerError.make({
@@ -545,8 +563,10 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 					existingInputDigest: existing[0].input_digest,
 					attemptedInputDigest: validated.inputDigest
 				});
+				const retainedWorkerAdmission = existing[0].worker_admission_json === null ? void 0 : yield* Schema.decodeEffect(Schema.fromJsonString(WorkerAdmission))(existing[0].worker_admission_json).pipe(Effect.mapError(internalFailure(operation)));
+				const retainedMessageAdmission = existing[0].message_admission_json === null ? void 0 : yield* Schema.decodeEffect(Schema.fromJsonString(MessageAdmission))(existing[0].message_admission_json).pipe(Effect.mapError(internalFailure(operation)));
 				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({
+				if ((existing[0].admission_group ?? void 0) !== validated.admissionGroup || !Schema.toEquivalence(Schema.optional(WorkerAdmission))(retainedWorkerAdmission, validated.workerAdmission) || !Schema.toEquivalence(Schema.optional(MessageAdmission))(retainedMessageAdmission, validated.messageAdmission) || !Schema.toEquivalence(Schema.optional(AdmissionFence))(retainedFence, validated.admissionFence)) return yield* AdmissionConflict.make({
 					threadId: validated.threadId,
 					principal: validated.principal,
 					idempotencyKey: validated.idempotencyKey,
@@ -561,6 +581,18 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
 					replayed: true
 				}).pipe(Effect.mapError(internalFailure(operation)));
 			}
+			const firstRows = yield* sql`
+            SELECT worker_admission_json FROM effect_agent_submissions
+            WHERE thread_id=${validated.threadId} ORDER BY queue_sequence LIMIT 1
+          `.pipe(Effect.mapError(sqlFailure(operation)));
+			const first = yield* Schema.decodeUnknownEffect(Schema.Array(Schema.Struct({ worker_admission_json: Schema.NullOr(BoundedStoredText) })))(firstRows).pipe(Effect.mapError(internalFailure(operation)));
+			if (first[0] !== void 0) {
+				const previous = first[0].worker_admission_json === null ? void 0 : yield* Schema.decodeEffect(Schema.fromJsonString(WorkerAdmission))(first[0].worker_admission_json).pipe(Effect.mapError(internalFailure(operation)));
+				if (!Schema.toEquivalence(Schema.optional(WorkerAdmission.fields.origin))(previous?.origin, validated.workerAdmission?.origin)) return yield* AdmissionPolicyError.make({
+					reason: "refused",
+					code: "worker-origin-conflict"
+				});
+			}
 			yield* admissionFence.check(validated);
 			if (validated.admissionGroup !== void 0) {
 				if ((yield* sql`
@@ -597,7 +629,9 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
               parent_submission_id,
               parent_tool_call_id,
               admission_group,
-              admission_fence_json
+              admission_fence_json,
+  worker_admission_json,
+  message_admission_json
             ) VALUES (
               ${mintedSubmissionId},
               ${validated.threadId},
@@ -615,7 +649,9 @@ const makeServices = Effect.fn("DoSubmissionLedger.makeServices")(function* () {
               ${validated.parentLinkage?.parentSubmissionId ?? null},
               ${validated.parentLinkage?.parentToolCallId ?? null},
               ${validated.admissionGroup ?? null},
-              ${validated.admissionFence === void 0 ? null : JSON.stringify(validated.admissionFence)}
+              ${validated.admissionFence === void 0 ? null : JSON.stringify(validated.admissionFence)},
+              ${workerAdmissionJson},
+              ${messageAdmissionJson}
             )
           `.pipe(Effect.mapError(sqlFailure(operation)));
 			return yield* decodeAdmissionResult({