@yielded/agent-storage-cloudflare 0.1.0-beta.175 → 0.1.0-beta.177

package/dist/DoMemoryStore.mjs

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
-import { r as ownedState } from "./owned-state-B4QhezMp.mjs";
+import { r as ownedState } from "./owned-state-BgGOA2Ak.mjs";
 import { SqlMemoryLimits, SqlStorageOwner, memoryStoreLayerWithFailpoints } from "@yielded/agent/sql-memory-store";
 import { Effect, Layer, Schema } from "effect";
 import * as SqlClientService from "effect/sql/SqlClient";

package/dist/DoMessageDeliveryStore.mjs

@@ -1,7 +1,7 @@
 import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
-import { i as initializeDoJournal } from "./do-journal-7P3DUBz0.mjs";
+import { i as initializeDoJournal } from "./do-journal-ySC3eXNv.mjs";
 import { BrowserCrypto } from "@effect/platform-browser";
 import { SqlLifecycleSource } from "@yielded/agent-storage-sql/sql-lifecycle-publication";
 import { makeSqlMessageDeliveryStore } from "@yielded/agent-storage-sql/sql-message-delivery-store";

package/dist/DoSubmissionLedger.d.mts

@@ -1,6 +1,6 @@
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
-import { n as DoStorageOptions, t as DoStorageInitializationError } from "./DoThreadStore-Bd4fTns3.mjs";
+import { n as DoStorageOptions, t as DoStorageInitializationError } from "./DoThreadStore-BzYJjm4O.mjs";
 import { Crypto, Layer } from "effect";
 import * as SqlClientService from "effect/sql/SqlClient";
 import { StorageOwner } from "@yielded/agent/run-storage";

package/dist/DoSubmissionLedger.mjs

@@ -2,9 +2,9 @@ import { t as __exportAll } from "./rolldown-runtime-D7D4PA-g.mjs";
 import { DoStorageConfig } from "./DoStorageConfig.mjs";
 import { DoStorageFailpoint } from "./DoStorageFailpoint.mjs";
 import { DoLedgerError, DoStorageCorruptionError, DoStorageError } from "./DoStorageError.mjs";
-import { n as ownedRows } from "./owned-state-B4QhezMp.mjs";
-import { i as initializeDoJournal, r as decodeRows } from "./do-journal-7P3DUBz0.mjs";
-import { l as prepareCanonicalAppend, o as storageConfigLayer, s as storageFailpointLayer } from "./DoThreadStore-CgIZQUNR.mjs";
+import { n as ownedRows } from "./owned-state-BgGOA2Ak.mjs";
+import { i as initializeDoJournal, r as decodeRows } from "./do-journal-ySC3eXNv.mjs";
+import { l as prepareCanonicalAppend, o as storageConfigLayer, s as storageFailpointLayer } from "./DoThreadStore-DG0h5J6u.mjs";
 import { BrowserCrypto } from "@effect/platform-browser";
 import { Cause, Clock, Context, Crypto, DateTime, Effect, Layer, Option, Schema, Stream } from "effect";
 import * as SqlClientService from "effect/sql/SqlClient";
@@ -19,7 +19,7 @@ import { decodeAbortFact, decodeAdmissionFact, decodeApprovalFact, decodeResolut
 import { InputMessage } from "@yielded/agent/messaging";
 import { runIdForSubmission } from "@yielded/agent/run-journal";
 import { SettlementPublicationResult, SettlementPublisher, validateCanonicalSettlement, validateJoinedSettlement, validatePublication } from "@yielded/agent/settlement-publisher";
-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, FundingOwner, FundingOwnerRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, OwnershipLost, ParentLinkage, QueueSequence, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReservedChildBudget, RevertJoiningRequest, Settlement, SettlementConflict, SettlementFinalization, SubmissionAdmissionFence, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SubmissionWorkItem, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, UnknownResolutionKind, WorkerLedgerState, WorkerStopCommand, approvalDecisionsCover, settlementFailureFromRecord, submissionAbortRecordId, submissionSettlementBatchId, submissionSettlementRecordId, unknownResolutionKind, unknownResolutionMatchesResult, workerTerminalFromRecord } from "@yielded/agent/submission-ledger";
+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, FundingOwner, FundingOwnerRequest, InputAppliedMarker, JoinSnapshot, JoinedToHost, JoiningClaim, LedgerCapabilities, LedgerError, MarkInputAppliedRequest, MarkJoinedRequest, MarkReadyRequest, MarkUnknownRequest, OwnershipLost, ParentLinkage, QueueSequence, RecoverySnapshot, RecoverySnapshotRequest, ReleaseChildBudgetRequest, ReservedChildBudget, RevertJoiningRequest, Settlement, SettlementConflict, SettlementFinalization, SubmissionAdmissionFence, SubmissionLedger, SubmissionLookup, SubmissionLookupByKey, SubmissionSnapshot, SubmissionState, SubmissionWorkItem, SuspendRequest, SuspensionReason, SuspensionSnapshot, UnknownResolution, UnknownResolutionCommand, UnknownResolutionConflict, UnknownResolutionIntent, UnknownResolutionKind, WorkerLedgerState, WorkerStopCommand, approvalDecisionsCover, settlementFailureFromRecord, submissionAbortRecordId, submissionInputBatchId, submissionInputRecordId, submissionSettlementBatchId, submissionSettlementRecordId, unknownResolutionKind, unknownResolutionMatchesResult, workerTerminalFromRecord } from "@yielded/agent/submission-ledger";
 import { AssignmentTerminal } from "@yielded/agent/worker";
 //#region src/DoSubmissionLedger.ts
 var DoSubmissionLedger_exports = /* @__PURE__ */ __exportAll({
@@ -524,8 +524,7 @@ const makeServices = Effect.fnUntraced(function* () {
 		yield* hitFailpoint("ledger:admit:before", operation);
 		const result = yield* inWriteTransaction(operation, Effect.gen(function* () {
 			const keyRowKey = `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`;
-			const existingRows = yield* byKey(validated, operation);
-			const existing = yield* decodeSubmissionRows(operation, keyRowKey, existingRows);
+			const existing = yield* byKey(validated, operation);
 			if (existing.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", keyRowKey, "An admission idempotency key returned more than one row.");
 			if (existing.length === 1) {
 				const sameLinkage = validated.parentLinkage === void 0 ? existing[0].parent_submission_id === null && existing[0].parent_tool_call_id === null : existing[0].parent_submission_id === validated.parentLinkage.parentSubmissionId && existing[0].parent_tool_call_id === validated.parentLinkage.parentToolCallId;
@@ -720,8 +719,7 @@ const makeServices = Effect.fnUntraced(function* () {
 			if (Option.isNone(row)) return Option.none();
 			return Option.some(yield* decodeSubmissionSnapshot(operation, row.value));
 		}
-		const foundRows = yield* byKey(validated, operation);
-		const decoded = yield* decodeSubmissionRows(operation, `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, foundRows);
+		const decoded = yield* byKey(validated, operation);
 		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
 		if (decoded.length === 0) return Option.none();
 		return Option.some(yield* decodeSubmissionSnapshot(operation, decoded[0]));
@@ -729,8 +727,7 @@ const makeServices = Effect.fnUntraced(function* () {
 	const resolveAdmission = Effect.fnUntraced(function* (request) {
 		const operation = "ledger resolve admission";
 		const validated = yield* Schema.decodeEffect(Schema.toType(SubmissionLookupByKey))(request).pipe(Effect.mapError(internalFailure(operation)));
-		const foundRows = yield* byKey(validated, operation);
-		const decoded = yield* decodeSubmissionRows(operation, `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, foundRows);
+		const decoded = yield* byKey(validated, operation);
 		if (decoded.length > 1) return yield* corruptionFailure(operation, "effect_agent_submissions", `${validated.threadId}/${validated.principal}/${validated.idempotencyKey}`, "An admission idempotency key returned more than one row.");
 		if (decoded.length === 0) return AdmissionNotAdmitted.make();
 		return AdmissionAdmitted.make({ submission: yield* decodeSubmissionSnapshot(operation, decoded[0]) });
@@ -793,31 +790,76 @@ const makeServices = Effect.fnUntraced(function* () {
 		yield* hitFailpoint("ledger:claim:after", operation);
 		return claimed;
 	});
+	const markInputAppliedInTransaction = Effect.fnUntraced(function* (validated) {
+		const operation = "ledger mark input applied";
+		const submission = yield* requireSubmission(operation, validated.submissionId);
+		yield* requireOwner(operation, submission);
+		if (submission.input_applied_record_id !== null) {
+			if (submission.input_applied_record_id === validated.recordId && submission.input_applied_sequence === validated.sequence) return;
+			return yield* corruptionFailure(operation, "effect_agent_submissions", validated.submissionId, "A different canonical input marker is already recorded for this Submission.");
+		}
+		yield* sql`
+    UPDATE effect_agent_submissions
+    SET
+      input_applied_record_id = ${validated.recordId},
+      input_applied_sequence = ${validated.sequence},
+      state = CASE
+        WHEN state IN ('admitted', 'ready') THEN 'input-applied'
+        ELSE state
+      END
+    WHERE submission_id = ${validated.submissionId}
+   RETURNING *, ${definitionJson(sql)} AS agent_digests_json`.pipe(rows.submissions.write, Effect.mapError(internalFailure(operation)));
+	});
 	const markInputApplied = Effect.fnUntraced(function* (request) {
 		const operation = "ledger mark input applied";
 		const validated = yield* decodeMarkInputAppliedRequestType(request).pipe(Effect.mapError(internalFailure(operation)));
 		yield* hitFailpoint("ledger:mark-input-applied:before", operation);
-		yield* inWriteTransaction(operation, Effect.gen(function* () {
-			const submission = yield* requireSubmission(operation, validated.submissionId);
-			yield* requireOwner(operation, submission);
-			if (submission.input_applied_record_id !== null) {
-				if (submission.input_applied_record_id === validated.recordId && submission.input_applied_sequence === validated.sequence) return;
-				return yield* corruptionFailure(operation, "effect_agent_submissions", validated.submissionId, "A different canonical input marker is already recorded for this Submission.");
-			}
-			yield* sql`
-          UPDATE effect_agent_submissions
-          SET
-            input_applied_record_id = ${validated.recordId},
-            input_applied_sequence = ${validated.sequence},
-            state = CASE
-              WHEN state IN ('admitted', 'ready') THEN 'input-applied'
-              ELSE state
-            END
-          WHERE submission_id = ${validated.submissionId}
-         RETURNING *, ${definitionJson(sql)} AS agent_digests_json`.pipe(rows.submissions.write, Effect.mapError(internalFailure(operation)));
-		}));
+		yield* inWriteTransaction(operation, markInputAppliedInTransaction(validated));
 		yield* hitFailpoint("ledger:mark-input-applied:after", operation);
 	});
+	const appendInput = Effect.fnUntraced(function* (submissionId, request) {
+		const operation = "append original input and context";
+		const prepared = yield* prepareCanonicalAppend(request).pipe(Effect.provideService(Crypto.Crypto, crypto));
+		const record = prepared.request.batch.records[0];
+		const context = prepared.request.executions?.flatMap((update) => update.facts ?? []).find(({ payload }) => payload._tag === "RunContextRecorded");
+		if (prepared.request.executions?.length !== 1 || prepared.request.executions[0]?.previousRevision !== 0 || prepared.request.batch.records.length !== 1 || record?.payload._tag !== "UserInputRecorded" || record.payload.kind !== "user" || record.payload.submissionId !== submissionId || record.payload.runId !== runIdForSubmission(submissionId) || record.recordId !== submissionInputRecordId(submissionId) || prepared.request.batch.batchId !== submissionInputBatchId(submissionId) || context?.payload._tag === "RunContextRecorded" && context.payload.historyThrough !== prepared.request.expectedTailSequence) return yield* ThreadStoreError.make({
+			operation,
+			message: "Original input publication has a different context boundary"
+		});
+		const mapError = (cause) => ThreadStoreError.make({
+			operation,
+			message: cause.message,
+			cause
+		});
+		yield* journal.prepareAppend(prepared.raw).pipe(Effect.mapError(mapError));
+		return yield* owner.withProgress(prepared.request.threadId, owner.withMutation(Effect.gen(function* () {
+			yield* hitFailpoint("append:before", operation);
+			yield* hitFailpoint("ledger:mark-input-applied:before", operation);
+			const result = yield* journal.withWriteTransaction(operation)(Effect.gen(function* () {
+				const submission = yield* requireSubmission(operation, submissionId);
+				yield* requireOwner(operation, submission);
+				if (submission.thread_id !== prepared.request.threadId) return yield* LedgerError.make({
+					operation,
+					message: "Original input belongs to another Thread"
+				});
+				const result = yield* journal.appendPrepared(prepared.raw);
+				yield* markInputAppliedInTransaction(MarkInputAppliedRequest.make({
+					submissionId,
+					recordId: record.recordId,
+					sequence: result.firstSequence
+				}));
+				return result;
+			})).pipe(Effect.mapError((error) => error._tag === "DoAppendConflict" ? AppendConflict.make({
+				threadId: prepared.request.threadId,
+				batchId: prepared.request.batch.batchId,
+				reason: error.reason,
+				...error.actualTailSequence === void 0 ? {} : { actualTailSequence: error.actualTailSequence }
+			}) : error._tag === "OwnershipLost" ? error : mapError(error)));
+			yield* hitFailpoint("ledger:mark-input-applied:after", operation);
+			yield* hitFailpoint("append:after", operation);
+			return result;
+		}).pipe(Effect.mapError((error) => error._tag === "OwnershipLost" || error._tag === "ThreadStoreError" || error._tag === "AppendConflict" ? error : mapError(error)))));
+	});
 	const publish = Effect.fn("DoSubmissionLedger.publishSettlement")(function* (input) {
 		const operation = "publish settlement";
 		const { request, record, settlement } = yield* validatePublication(input);
@@ -1767,8 +1809,8 @@ const makeServices = Effect.fnUntraced(function* () {
 			const abortRow = yield* readAbortIntent(operation, validated.submissionId);
 			if (Option.isSome(abortRow)) abortIntent = yield* abortIntentFromRow(operation, submissionRow, validated.submissionId, abortRow.value);
 			const joinRows = (yield* cached(rows.submissions.by("joined_host_submission_id", validated.submissionId), operation)).filter((row) => row.joined_host_submission_id === validated.submissionId).sort((a, b) => a.queue_sequence - b.queue_sequence);
-			const joinSubmissions = yield* decodeSubmissionRows(operation, validated.submissionId, joinRows);
-			const joins = yield* Effect.forEach(joinSubmissions, (row) => decodeJoinSnapshot({
+			const joins = [];
+			for (const row of joinRows) joins.push(yield* decodeJoinSnapshot({
 				submissionId: row.submission_id,
 				state: row.state,
 				hostSubmissionId: validated.submissionId
@@ -1784,16 +1826,18 @@ const makeServices = Effect.fnUntraced(function* () {
 				}).pipe(Effect.mapError((error) => corruptionFailure(operation, "effect_agent_submissions", validated.submissionId, error.message)));
 			}
 			const decisionRows = yield* readApprovalDecisions(operation, validated.submissionId);
-			const approvalDecisions = yield* Effect.forEach(decisionRows, (row) => approvalIntentFromRow(operation, row));
+			const approvalDecisions = [];
+			for (const row of decisionRows) approvalDecisions.push(yield* approvalIntentFromRow(operation, row));
 			const resolutionRows = yield* readUnknownResolutions(operation, validated.submissionId);
-			const unknownResolutions = yield* Effect.forEach(resolutionRows, (row) => unknownResolutionIntentFromRow(operation, row));
+			const unknownResolutions = [];
+			for (const row of resolutionRows) unknownResolutions.push(yield* unknownResolutionIntentFromRow(operation, row));
 			const childReservationRows = (yield* cached(rows.childReservations.by("parent_submission_id", validated.submissionId), operation)).filter((row) => row.parent_submission_id === validated.submissionId).sort((a, b) => a.parent_tool_call_id.localeCompare(b.parent_tool_call_id));
-			const decodedChildReservations = yield* decodeChildReservationRows(operation, validated.submissionId, childReservationRows);
-			const childReservations = yield* Effect.forEach(decodedChildReservations, (row) => childReservationSnapshotFromRow(operation, row));
+			const childReservations = [];
+			for (const row of childReservationRows) childReservations.push(yield* childReservationSnapshotFromRow(operation, row));
 			const markers = yield* readChildSettlementMarkers(operation, validated.submissionId);
 			const markersByChild = new Map(markers.map((row) => [row.child_submission_id, row]));
 			const childAttachments = [];
-			for (const row of decodedChildReservations) {
+			for (const row of childReservationRows) {
 				if (row.child_submission_id === null) continue;
 				const child = yield* readSubmission(operation, row.child_submission_id);
 				if (Option.isSome(child)) {
@@ -1844,6 +1888,7 @@ const makeServices = Effect.fnUntraced(function* () {
 		resolveAdmission,
 		selectHead,
 		markInputApplied,
+		appendInput,
 		finalizeSettlement: (request) => owner.withMutation(finalizeSettlement(request)),
 		requestAbort,
 		stopWorker,