@effect-agent/platform-cloudflare 0.1.0-beta.38 → 0.1.0-beta.39

package/src/prepared-admission.ts

@@ -0,0 +1,90 @@
+import type { AgentId } from "@effect-agent/core";
+import {
+  type DurableSubmitAgent,
+  PersistedJson,
+  type PreparedInput,
+  PreparedInputAdmission,
+  type ScheduledEnvelope,
+  ScheduledInputAdmission,
+  ScheduledInputRetryable,
+  ScheduleStorageError,
+} from "@effect-agent/thread";
+import { Effect, Layer } from "effect";
+
+import { CloudflareThreadClient, type ThreadClientError } from "./client.ts";
+
+const passthroughAgent = (agentId: AgentId): DurableSubmitAgent<typeof PersistedJson> => ({
+  definition: { id: agentId, input: PersistedJson },
+});
+
+/** Ordinary prepared admission through one freshly addressed Thread Object call. */
+export const cloudflarePreparedInputAdmissionLayer: Layer.Layer<
+  PreparedInputAdmission,
+  never,
+  CloudflareThreadClient
+> = Layer.effect(
+  PreparedInputAdmission,
+  Effect.gen(function* () {
+    const client = yield* CloudflareThreadClient;
+    return PreparedInputAdmission.of({
+      submit: (envelope) =>
+        client
+          .submit(passthroughAgent(envelope.agentId), envelope.input, {
+            threadId: envelope.threadId,
+            principal: envelope.deliveryPrincipal,
+            idempotencyKey: envelope.admissionKey,
+            definitions: envelope.definitions,
+          })
+          .pipe(
+            Effect.catchTags({
+              AdmissionConflict: () =>
+                ScheduleStorageError.make({ operation: "prepared admission", reason: "corrupt" }),
+              AdmissionLimitExceeded: () => ScheduledInputRetryable.make({ reason: "capacity" }),
+              ThreadClientError: (error: ThreadClientError) =>
+                ScheduledInputRetryable.make({
+                  reason: error.overloaded === true ? "capacity" : "transport",
+                }),
+              HostProtocolError: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
+              LedgerError: () => ScheduledInputRetryable.make({ reason: "storage" }),
+              ThreadStoreError: () => ScheduledInputRetryable.make({ reason: "storage" }),
+              DurableAlarmError: () => ScheduledInputRetryable.make({ reason: "storage" }),
+              AgentInputError: () =>
+                ScheduleStorageError.make({ operation: "prepared admission", reason: "corrupt" }),
+              DigestError: () =>
+                ScheduleStorageError.make({ operation: "prepared admission", reason: "corrupt" }),
+              ThreadNotMaterialized: () => ScheduledInputRetryable.make({ reason: "storage" }),
+              AppendConflict: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
+              FenceRejected: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
+              DurableRuntimeFailpointError: () =>
+                ScheduledInputRetryable.make({ reason: "ambiguous" }),
+            }),
+          ),
+    });
+  }),
+);
+
+const preparedFromSchedule = (envelope: ScheduledEnvelope): PreparedInput => ({
+  schemaVersion: 1,
+  threadId: envelope.threadId,
+  deliveryPrincipal: envelope.deliveryPrincipal,
+  agentId: envelope.agentId,
+  definitions: envelope.definitions,
+  input: envelope.input,
+  inputDigest: envelope.inputDigest,
+  admissionKey: envelope.admissionKey,
+  authorization: envelope.authorization,
+});
+
+/** Compatibility adapter retaining Scheduling's public admission port. */
+export const cloudflareScheduledInputAdmissionLayer: Layer.Layer<
+  ScheduledInputAdmission,
+  never,
+  PreparedInputAdmission
+> = Layer.effect(
+  ScheduledInputAdmission,
+  Effect.map(PreparedInputAdmission, (admission) =>
+    ScheduledInputAdmission.of({
+      submit: (envelope) => admission.submit(preparedFromSchedule(envelope)),
+    }),
+  ),
+);

package/src/scheduling.ts

@@ -1,4 +1,9 @@
 import { AgentId } from "@effect-agent/core";
+import {
+  DoScheduleAlarmControl,
+  DoScheduleTransaction,
+  scheduleStoreLayer,
+} from "@effect-agent/storage-cloudflare";
 import {
   DefinitionDigests,
   PersistedJson,
@@ -20,21 +25,13 @@ import {
   ScheduleStorageError,
   ScheduleTimingRequest,
   ScheduleValidationError,
-  ScheduledInputAdmission,
-  ScheduledInputRetryable,
-  type ScheduledEnvelope,
   Scheduling,
   ScheduleDriver,
   type ScheduleManagementFailure,
   defaultSchedulingLimits,
   scheduleOwnerKey,
   ScheduleWakeNoop,
-} from "@effect-agent/session";
-import {
-  DoScheduleAlarmControl,
-  DoScheduleTransaction,
-  scheduleStoreLayer,
-} from "@effect-agent/storage-cloudflare";
+} from "@effect-agent/thread";
 import { BrowserCrypto } from "@effect/platform-browser";
 import { SqliteClient } from "@effect/sql-sqlite-do";
 import { Clock, Context, DateTime, Effect, Layer, Schema } from "effect";
@@ -45,8 +42,12 @@ import {
   type WorkerEnvironment,
 } from "effect-cf";
 
-import type { ConversationObjectNamespace } from "./bindings.ts";
-import { CloudflareConversationClient, type ConversationClientError } from "./client.ts";
+import type { ThreadObjectNamespace } from "./bindings.ts";
+import { CloudflareThreadClient } from "./client.ts";
+import {
+  cloudflarePreparedInputAdmissionLayer,
+  cloudflareScheduledInputAdmissionLayer,
+} from "./prepared-admission.ts";
 
 const SCHEDULE_ALARM_TAG = "effect-agent/ScheduleOwnerWake";
 const SCHEDULE_ALARM_ID = "driver";
@@ -421,48 +422,6 @@ const transactionLayer: Layer.Layer<
   }),
 );
 
-const admissionLayer: Layer.Layer<ScheduledInputAdmission, never, CloudflareConversationClient> =
-  Layer.effect(
-    ScheduledInputAdmission,
-    Effect.gen(function* () {
-      const client = yield* CloudflareConversationClient;
-      const submit = (envelope: ScheduledEnvelope) =>
-        client
-          .submit(passthroughAgent(envelope.agentId), envelope.input, {
-            conversationId: envelope.conversationId,
-            principal: envelope.deliveryPrincipal,
-            idempotencyKey: envelope.admissionKey,
-            definitions: envelope.definitions,
-          })
-          .pipe(
-            Effect.catchTags({
-              AdmissionConflict: () =>
-                ScheduleStorageError.make({ operation: "scheduled admission", reason: "corrupt" }),
-              AdmissionLimitExceeded: () => ScheduledInputRetryable.make({ reason: "capacity" }),
-              ConversationClientError: (error: ConversationClientError) =>
-                ScheduledInputRetryable.make({
-                  reason: error.overloaded === true ? "capacity" : "transport",
-                }),
-              HostProtocolError: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
-              LedgerError: () => ScheduledInputRetryable.make({ reason: "storage" }),
-              ConversationStoreError: () => ScheduledInputRetryable.make({ reason: "storage" }),
-              DurableAlarmError: () => ScheduledInputRetryable.make({ reason: "storage" }),
-              AgentInputError: () =>
-                ScheduleStorageError.make({ operation: "scheduled admission", reason: "corrupt" }),
-              DigestError: () =>
-                ScheduleStorageError.make({ operation: "scheduled admission", reason: "corrupt" }),
-              ConversationNotMaterialized: () =>
-                ScheduledInputRetryable.make({ reason: "storage" }),
-              AppendConflict: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
-              FenceRejected: () => ScheduledInputRetryable.make({ reason: "ambiguous" }),
-              DurableRuntimeFailpointError: () =>
-                ScheduledInputRetryable.make({ reason: "ambiguous" }),
-            }),
-          );
-      return ScheduledInputAdmission.of({ submit });
-    }),
-  );
-
 type ScheduleRuntimeServices =
   | Scheduling
   | ScheduleDriver
@@ -616,7 +575,7 @@ export interface ScheduleOwnerObjectClass {
  */
 export const makeScheduleOwnerObjectClass = <E>(
   host: Layer.Layer<
-    ScheduleAuthorizer | ConversationObjectNamespace,
+    ScheduleAuthorizer | ThreadObjectNamespace,
     E,
     EffectCfDurableObjectState.DurableObjectState | WorkerEnvironment | ScheduleOwnerIdentity
   >,
@@ -638,7 +597,12 @@ export const makeScheduleOwnerObjectClass = <E>(
     Layer.provideMerge(
       scheduleStoreLayer.pipe(Layer.provide(transactionLayer), Layer.provide(sqlLayer)),
     ),
-    Layer.provide(admissionLayer.pipe(Layer.provide(CloudflareConversationClient.layer))),
+    Layer.provide(
+      cloudflareScheduledInputAdmissionLayer.pipe(
+        Layer.provide(cloudflarePreparedInputAdmissionLayer),
+        Layer.provide(CloudflareThreadClient.layer),
+      ),
+    ),
     Layer.provide(ScheduleWakeNoop),
     Layer.provide(BrowserCrypto.layer),
     Layer.provideMerge(DurableObjectAlarm.DurableObjectAlarm.layer),