@effect-agent/platform-cloudflare 0.1.0-beta.84 → 0.1.0-beta.86

package/src/CloudflareSubscriptions.ts

@@ -2,10 +2,13 @@ import {
   DoSubscriptionAlarmControl,
   DoSubscriptionTransaction,
   doSubscriptionStoreLayer,
-} from "@effect-agent/storage-cloudflare/DoSubscriptionStore";
-import { type EventSources } from "@effect-agent/thread/EventSource";
-import { PersistedJson } from "@effect-agent/thread/Records";
-import { Principal } from "@effect-agent/thread/SubmissionLedger";
+} from "@effect-agent/storage-cloudflare/do-subscription-store";
+import { BrowserCrypto } from "@effect/platform-browser";
+import { SqliteClient } from "@effect/sql-sqlite-do";
+import { Cause, Clock, Context, DateTime, Effect, Layer, Schema, type Scope } from "effect";
+import { type EventSources } from "effect-agent/event-source";
+import { PersistedJson } from "effect-agent/records";
+import { Principal } from "effect-agent/submission-ledger";
 import {
   EventAcknowledgement,
   EventSourceVersion,
@@ -22,16 +25,9 @@ import {
   SubscriptionSnapshot,
   SubscriptionSourceError,
   defaultSubscriptionLimits,
-} from "@effect-agent/thread/Subscription";
-import { type SubscriptionInputBindings } from "@effect-agent/thread/SubscriptionInput";
-import {
-  SubscriptionDriver,
-  SubscriptionIntake,
-  Subscriptions,
-} from "@effect-agent/thread/Subscriptions";
-import { BrowserCrypto } from "@effect/platform-browser";
-import { SqliteClient } from "@effect/sql-sqlite-do";
-import { Cause, Clock, Context, DateTime, Effect, Layer, Schema, type Scope } from "effect";
+} from "effect-agent/subscription";
+import { type SubscriptionInputBindings } from "effect-agent/subscription-input";
+import { SubscriptionDriver, SubscriptionIntake, Subscriptions } from "effect-agent/subscriptions";
 import {
   DurableObject as EffectCfDurableObject,
   DurableObjectAlarm,
@@ -140,7 +136,7 @@ export const makeSubscriptionPartitionAlarmHandler = Effect.fn(
             message: "Ancillary alarm tag mismatch",
           });
 
-        const payload = yield* Schema.decodeUnknownEffect(options.payload)(event.payload).pipe(
+        const payload = yield* Schema.decodeEffect(options.payload)(event.payload).pipe(
           Effect.mapError(() =>
             SubscriptionAlarmProtocolError.make({ message: "Invalid ancillary alarm payload" }),
           ),
@@ -149,10 +145,10 @@ export const makeSubscriptionPartitionAlarmHandler = Effect.fn(
         yield* options.handle({ ...event, payload });
       }).pipe(
         Effect.scoped,
-        Effect.timeout(options.timeoutMillis),
-        Effect.catchTag("TimeoutError", () =>
-          SubscriptionAlarmExtensionError.make({ code: "timeout" }),
-        ),
+        Effect.timeoutOrElse({
+          duration: options.timeoutMillis,
+          orElse: () => SubscriptionAlarmExtensionError.make({ code: "timeout" }),
+        }),
         Effect.provideContext(services),
       ),
   };
@@ -629,7 +625,7 @@ const decodePartitionName = Effect.fn("decodeSubscriptionPartitionName")(functio
     });
   }
 
-  const tuple = yield* Schema.decodeUnknownEffect(
+  const tuple = yield* Schema.decodeEffect(
     Schema.fromJsonString(Schema.Tuple([Schema.String, Schema.String])),
   )(name).pipe(
     Effect.mapError(() =>
@@ -639,7 +635,7 @@ const decodePartitionName = Effect.fn("decodeSubscriptionPartitionName")(functio
     ),
   );
 
-  return yield* Schema.decodeUnknownEffect(SourcePartition)({
+  return yield* Schema.decodeEffect(SourcePartition)({
     tenantId: tuple[0],
     address: tuple[1],
   }).pipe(
@@ -860,10 +856,10 @@ const alarmHandler = (limits: SubscriptionLimits) =>
 
           return yield* handler.handle(event).pipe(
             Effect.scoped,
-            Effect.timeout(MAX_ANCILLARY_ALARM_MILLIS),
-            Effect.catchTag("TimeoutError", () =>
-              SubscriptionAlarmExtensionError.make({ code: "timeout" }),
-            ),
+            Effect.timeoutOrElse({
+              duration: MAX_ANCILLARY_ALARM_MILLIS,
+              orElse: () => SubscriptionAlarmExtensionError.make({ code: "timeout" }),
+            }),
           );
         }
         if (event.id !== SUBSCRIPTION_ALARM_ID) {
@@ -884,13 +880,13 @@ const alarmHandler = (limits: SubscriptionLimits) =>
         yield* alarmControl.prearm((yield* Clock.currentTimeMillis) + limits.retryMillis);
 
         const pass = yield* driver.runDue.pipe(
-          Effect.catchCause((cause) =>
-            Cause.hasInterrupts(cause)
-              ? Effect.failCause(cause)
-              : Clock.currentTimeMillis.pipe(
-                  Effect.flatMap((time) => alarmControl.prearm(time + limits.retryMillis)),
-                  Effect.andThen(Effect.failCause(cause)),
-                ),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterrupts(cause),
+            (cause) =>
+              Clock.currentTimeMillis.pipe(
+                Effect.flatMap((time) => alarmControl.prearm(time + limits.retryMillis)),
+                Effect.andThen(Effect.failCause(cause)),
+              ),
           ),
         );
 

package/src/CloudflareThreadClient.ts

@@ -1,21 +1,23 @@
-import { AgentInputError } from "@effect-agent/core/AgentError";
-import { AgentId, type ThreadId } from "@effect-agent/core/Identifiers";
-import { MessageAdmission } from "@effect-agent/core/Messaging";
-import { DigestError } from "@effect-agent/thread/Digest";
+import { BrowserCrypto } from "@effect/platform-browser";
+import { Context, Crypto, Duration, Effect, Layer, Schema } from "effect";
+import { AgentInputError } from "effect-agent/agent-error";
+import { DigestError } from "effect-agent/digest";
 import {
   Receipt,
   type DurableSubmitAgent,
   type DurableSubmitOptions,
-} from "@effect-agent/thread/DurableAgentRuntime";
-import { DurableRuntimeFailpointError } from "@effect-agent/thread/DurableFailpoint";
-import { OperationDenied } from "@effect-agent/thread/OperationAuthorizer";
+} from "effect-agent/durable-agent-runtime";
+import { DurableRuntimeFailpointError } from "effect-agent/durable-failpoint";
+import { AgentId, type ThreadId } from "effect-agent/identifiers";
+import { InputMessage } from "effect-agent/messaging";
+import { OperationDenied } from "effect-agent/operation-authorizer";
 import {
   CanonicalRecordEnvelope,
   CanonicalSequence,
   DefinitionDigests,
   PersistedJson,
   WorkerAdmission,
-} from "@effect-agent/thread/Records";
+} from "effect-agent/records";
 import {
   AdmissionFence,
   AdmissionGroup,
@@ -35,16 +37,14 @@ import {
   UnknownResolutionCommand,
   UnknownResolutionConflict,
   UnknownResolutionIntent,
-} from "@effect-agent/thread/SubmissionLedger";
-import { SubmissionStatus } from "@effect-agent/thread/SubmissionStatus";
+} from "effect-agent/submission-ledger";
+import { SubmissionStatus } from "effect-agent/submission-status";
 import {
   AppendConflict,
   ThreadNotMaterialized,
   ThreadStoreError,
   FenceRejected,
-} from "@effect-agent/thread/ThreadStore";
-import { BrowserCrypto } from "@effect/platform-browser";
-import { Context, Crypto, Duration, Effect, Layer, Schema } from "effect";
+} from "effect-agent/thread-store";
 import { RpcTracing } from "effect-cf";
 
 import { DurableAlarmError } from "./Alarm.ts";
@@ -121,7 +121,7 @@ export class SubmitRequest extends Schema.Class<SubmitRequest>(
   admissionGroup: Schema.optionalKey(AdmissionGroup),
   admissionFence: Schema.optionalKey(AdmissionFence),
   workerAdmission: Schema.optionalKey(WorkerAdmission),
-  messageAdmission: Schema.optionalKey(MessageAdmission),
+  messageAdmission: Schema.optionalKey(InputMessage),
   definitions: DefinitionDigests,
   inputPayload: PersistedJson,
 }) {}

package/src/InteractiveBrowser.ts

@@ -7,6 +7,18 @@ import puppeteer, {
   type HTTPRequest,
   type Page,
 } from "@cloudflare/puppeteer";
+import {
+  Context,
+  Clock,
+  Duration,
+  Effect,
+  Layer,
+  Redacted,
+  Ref,
+  Schema,
+  Semaphore,
+  type Scope,
+} from "effect";
 import {
   BrowserActionResult,
   BrowserScreenshotRequest,
@@ -27,22 +39,9 @@ import {
   type BrowserHandle,
   type InteractiveBrowserError,
   type InteractiveBrowserNetworkPolicy,
-} from "@effect-agent/sandbox/InteractiveBrowser";
-import { PageScreenshotResult } from "@effect-agent/sandbox/PageScreenshot";
-import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
-import {
-  Context,
-  Clock,
-  Duration,
-  Effect,
-  Layer,
-  Option,
-  Redacted,
-  Ref,
-  Schema,
-  Semaphore,
-  type Scope,
-} from "effect";
+} from "effect-agent/interactive-browser";
+import { PageScreenshotResult } from "effect-agent/page-screenshot";
+import { SandboxImplementation } from "effect-agent/sandbox";
 
 import {
   BrowserRunSessionLifecycle,
@@ -231,7 +230,7 @@ export class BrowserRunViewport extends Schema.Class<BrowserRunViewport>("Browse
 ) {}
 
 const decodeViewport = (input: BrowserRunViewport) =>
-  Schema.decodeUnknownEffect(BrowserRunViewport)(input, { onExcessProperty: "error" }).pipe(
+  Schema.decodeEffect(BrowserRunViewport)(input, { onExcessProperty: "error" }).pipe(
     Effect.mapError(() => policyError("The browser viewport is malformed")),
     // Copy only presentation fields, including for Schema class instances.
     Effect.map((viewport) => ({
@@ -1043,7 +1042,7 @@ const makeProductionPage = (page: Page): BrowserRunInteractivePage => {
         ),
       );
 
-      if (observation._tag === "Text") Schema.decodeUnknownSync(PageObservation)(observation.text);
+      if (observation._tag === "Text") Schema.decodeSync(PageObservation)(observation.text);
 
       return observation;
     },
@@ -1177,7 +1176,7 @@ const snapshotPolicy = Effect.fn("BrowserRunInteractive.snapshotPolicy")(functio
   InteractiveBrowserPolicySnapshot,
   InteractiveBrowserPolicyDeniedError | InteractiveBrowserUnsupportedError
 > {
-  const decoded = yield* Schema.decodeUnknownEffect(InteractiveBrowserPolicy)(input).pipe(
+  const decoded = yield* Schema.decodeEffect(InteractiveBrowserPolicy)(input).pipe(
     Effect.mapError(() => policyError("The interactive browser policy is malformed")),
   );
 
@@ -1651,15 +1650,13 @@ const makeHandle = Effect.fn("BrowserRunInteractive.makeHandle")(function* (
         }),
       )
       .pipe(
-        Effect.flatMap((result) =>
-          Option.isSome(result)
-            ? Effect.succeed(result.value)
-            : Effect.fail(
-                InteractiveBrowserBusyError.make({
-                  implementation: browserRunInteractiveImplementation,
-                  message: "The browser handle already has an operation in flight",
-                }),
-              ),
+        Effect.flatMap(
+          Effect.fromOption(() =>
+            InteractiveBrowserBusyError.make({
+              implementation: browserRunInteractiveImplementation,
+              message: "The browser handle already has an operation in flight",
+            }),
+          ),
         ),
       );
 
@@ -1714,7 +1711,7 @@ const makeHandle = Effect.fn("BrowserRunInteractive.makeHandle")(function* (
             });
           }
 
-          return yield* Schema.decodeUnknownEffect(BrowserTextResult)({
+          return yield* Schema.decodeEffect(BrowserTextResult)({
             text: observation.text,
           }).pipe(
             Effect.mapError((cause) =>
@@ -1748,7 +1745,7 @@ const makeHandle = Effect.fn("BrowserRunInteractive.makeHandle")(function* (
         }),
       ),
     screenshot: (request) =>
-      Schema.decodeUnknownEffect(BrowserScreenshotRequest)(request).pipe(
+      Schema.decodeEffect(BrowserScreenshotRequest)(request).pipe(
         Effect.mapError(() => policyError("The browser screenshot request is malformed")),
         Effect.flatMap((decoded) =>
           run(
@@ -1771,7 +1768,7 @@ const makeHandle = Effect.fn("BrowserRunInteractive.makeHandle")(function* (
                 });
               }
 
-              return yield* Schema.decodeUnknownEffect(PageScreenshotResult)({
+              return yield* Schema.decodeEffect(PageScreenshotResult)({
                 implementation: browserRunInteractiveImplementation,
                 mediaType: "image/png",
                 bytes: new Uint8Array(bytes),
@@ -1786,7 +1783,7 @@ const makeHandle = Effect.fn("BrowserRunInteractive.makeHandle")(function* (
         ),
       ),
     scroll: (request) =>
-      Schema.decodeUnknownEffect(BrowserScrollRequest)(request).pipe(
+      Schema.decodeEffect(BrowserScrollRequest)(request).pipe(
         Effect.mapError(() => policyError("The browser scroll request is malformed")),
         Effect.flatMap((decoded) =>
           run(
@@ -2209,7 +2206,7 @@ const makeHostService = (
           ),
         ),
       getLiveView: (request) =>
-        Schema.decodeUnknownEffect(BrowserRunLiveViewRequest)(request).pipe(
+        Schema.decodeEffect(BrowserRunLiveViewRequest)(request).pipe(
           Effect.mapError(() => policyError("The Live View request is malformed")),
           Effect.flatMap((decoded) =>
             runtime.run(
@@ -2222,7 +2219,7 @@ const makeHostService = (
                 "Cloudflare returned a malformed Live View response",
               ).pipe(
                 Effect.flatMap((observation) =>
-                  Schema.decodeUnknownEffect(BrowserRunLiveViewResult)({
+                  Schema.decodeEffect(BrowserRunLiveViewResult)({
                     devtoolsFrontendUrl: Redacted.make(observation.devtoolsFrontendUrl),
                   }).pipe(
                     Effect.mapError(() =>
@@ -2236,7 +2233,7 @@ const makeHostService = (
           ),
         ),
       handoff: (request) =>
-        Schema.decodeUnknownEffect(BrowserRunHandoffRequest)(request).pipe(
+        Schema.decodeEffect(BrowserRunHandoffRequest)(request).pipe(
           Effect.mapError(() => policyError("The browser handoff request is malformed")),
           Effect.flatMap((decoded) =>
             runtime.run(
@@ -2249,7 +2246,7 @@ const makeHostService = (
                 "Cloudflare returned a malformed browser handoff response",
               ).pipe(
                 Effect.flatMap((observation) =>
-                  Schema.decodeUnknownEffect(BrowserRunHandoffResult)({
+                  Schema.decodeEffect(BrowserRunHandoffResult)({
                     handoffId: Redacted.make(observation.handoffId),
                   }).pipe(
                     Effect.mapError(() =>
@@ -2272,7 +2269,7 @@ const makeHostService = (
           "Cloudflare returned a malformed browser handoff state",
         ).pipe(
           Effect.flatMap((observation) =>
-            Schema.decodeUnknownEffect(BrowserRunHandoffState)({
+            Schema.decodeEffect(BrowserRunHandoffState)({
               active: observation.active,
               ...(observation.handoffId === undefined
                 ? {}

package/src/ThreadObject.ts

@@ -1,5 +1,3 @@
-import { type AgentId, type ThreadId } from "@effect-agent/core/Identifiers";
-import { SubmissionId } from "@effect-agent/core/Identifiers";
 import {
   decodePortRequest,
   encodePortResponse,
@@ -9,7 +7,8 @@ import {
   PortSucceeded,
   type PortRequest,
   type PortResponse,
-} from "@effect-agent/storage-cloudflare/PortProtocol";
+} from "@effect-agent/storage-cloudflare/port-protocol";
+import { Effect, Layer, Option, Schema, Stream } from "effect";
 import {
   IntegrityReport,
   ObligationReport,
@@ -17,22 +16,24 @@ import {
   RecoveryExplanation,
   RetryCommand,
   RetryRefused,
-} from "@effect-agent/thread/Admin";
-import { DigestError } from "@effect-agent/thread/Digest";
+} from "effect-agent/admin";
+import { DigestError } from "effect-agent/digest";
 import {
   DurableAgentRuntime,
   DurableRuntimeConfig,
   RecoveryReport,
   type DurableSubmitAgent,
-} from "@effect-agent/thread/DurableAgentRuntime";
-import { DurableRuntimeFailpointError } from "@effect-agent/thread/DurableFailpoint";
+} from "effect-agent/durable-agent-runtime";
+import { DurableRuntimeFailpointError } from "effect-agent/durable-failpoint";
+import { type AgentId, type ThreadId } from "effect-agent/identifiers";
+import { SubmissionId } from "effect-agent/identifiers";
 import {
   OperationAuthorizationRequest,
   OperationAuthorizer,
   OperationDenied,
-} from "@effect-agent/thread/OperationAuthorizer";
-import { PersistedJson } from "@effect-agent/thread/Records";
-import { RunJournalError } from "@effect-agent/thread/RunJournal";
+} from "effect-agent/operation-authorizer";
+import { PersistedJson } from "effect-agent/records";
+import { RunJournalError } from "effect-agent/run-journal";
 import {
   AdmissionPolicyError,
   LedgerError,
@@ -40,7 +41,7 @@ import {
   SettlementConflict,
   SubmissionLedger,
   SubmissionLookupByKey,
-} from "@effect-agent/thread/SubmissionLedger";
+} from "effect-agent/submission-ledger";
 import {
   AppendConflict,
   ThreadNotMaterialized,
@@ -48,9 +49,8 @@ import {
   ThreadStore,
   ThreadStoreError,
   FenceRejected,
-} from "@effect-agent/thread/ThreadStore";
-import { WakeScheduler } from "@effect-agent/thread/WakeScheduler";
-import { Effect, Layer, Option, Schema, Stream } from "effect";
+} from "effect-agent/thread-store";
+import { WakeScheduler } from "effect-agent/wake-scheduler";
 import {
   DurableObject as EffectCfDurableObject,
   DurableObjectState as EffectCfDurableObjectState,

package/src/WakeScheduler.ts

@@ -1,6 +1,6 @@
-import { type ThreadId } from "@effect-agent/core/Identifiers";
-import { makeWakeSubscriptionHub, WakeScheduler } from "@effect-agent/thread/WakeScheduler";
 import { Effect, Layer, PubSub, Schema, Stream } from "effect";
+import { type ThreadId } from "effect-agent/identifiers";
+import { makeWakeSubscriptionHub, WakeScheduler } from "effect-agent/wake-scheduler";
 
 import { DurableAlarmService } from "./Alarm.ts";
 import {

package/src/internal/browser-quick-action.ts

@@ -1,5 +1,6 @@
 /// <reference types="@cloudflare/workers-types" />
 
+import { Context, Effect, Layer, Option, Schema } from "effect";
 import {
   PageCapture,
   PageCaptureInferenceUse,
@@ -21,7 +22,7 @@ import {
   type PageCaptureError,
   type PageCaptureOutput,
   type PageCaptureRequest,
-} from "@effect-agent/sandbox/PageCapture";
+} from "effect-agent/page-capture";
 import {
   PageScreenshot,
   PageScreenshotOutputLimitError,
@@ -29,9 +30,8 @@ import {
   type PageScreenshotCapture,
   type PageScreenshotError,
   type PageScreenshotRequest,
-} from "@effect-agent/sandbox/PageScreenshot";
-import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
-import { Context, Effect, Layer, Option, Schema } from "effect";
+} from "effect-agent/page-screenshot";
+import { SandboxImplementation } from "effect-agent/sandbox";
 
 /**
  * The Cloudflare Browser Run Quick Action `PageCapture` adapter (capability

package/src/internal/browser-session-lifecycle.ts

@@ -107,7 +107,7 @@ export class BrowserRunSessionLifecycle extends Context.Service<
           });
 
           if (response.status === 404) {
-            const absent = Schema.decodeUnknownOption(Schema.fromJsonString(Absent))(body, {
+            const absent = Schema.decodeOption(Schema.fromJsonString(Absent))(body, {
               onExcessProperty: "error",
             });
 
@@ -116,16 +116,16 @@ export class BrowserRunSessionLifecycle extends Context.Service<
             return yield* new BrowserRunCleanupError({ reason: "malformed" });
           }
           if (method === "DELETE") {
-            const result = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Closed))(
-              body,
-            ).pipe(Effect.mapError(() => new BrowserRunCleanupError({ reason: "malformed" })));
+            const result = yield* Schema.decodeEffect(Schema.fromJsonString(Closed))(body).pipe(
+              Effect.mapError(() => new BrowserRunCleanupError({ reason: "malformed" })),
+            );
 
             return result.status === "closed";
           }
 
-          const result = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Metadata))(
-            body,
-          ).pipe(Effect.mapError(() => new BrowserRunCleanupError({ reason: "malformed" })));
+          const result = yield* Schema.decodeEffect(Schema.fromJsonString(Metadata))(body).pipe(
+            Effect.mapError(() => new BrowserRunCleanupError({ reason: "malformed" })),
+          );
 
           if (result.sessionId !== sessionId)
             return yield* new BrowserRunCleanupError({ reason: "malformed" });
@@ -135,7 +135,7 @@ export class BrowserRunSessionLifecycle extends Context.Service<
 
         const close = Effect.fn("BrowserRunSessionLifecycle.close")(
           function* (sessionId: Redacted.Redacted<string>) {
-            const id = yield* Schema.decodeUnknownEffect(Identity)(Redacted.value(sessionId)).pipe(
+            const id = yield* Schema.decodeEffect(Identity)(Redacted.value(sessionId)).pipe(
               Effect.mapError(() => new BrowserRunCleanupError({ reason: "configuration" })),
             );
 

package/src/internal/layers.ts

@@ -1,82 +1,82 @@
-import { ThreadId, type SubmissionId } from "@effect-agent/core/Identifiers";
-import {
-  type RunContextPreparation,
-  type RunCostEstimator,
-  type RunToolFailureObserver,
-} from "@effect-agent/engine/RunOptions";
-import {
-  CurrentToolFailureObserver,
-  RunContextPreparationPassthrough,
-  RunToolAuthorization,
-  toolFailureObserverLayer,
-} from "@effect-agent/engine/RunOptions";
-import { doMessageDeliveryStoreLayer } from "@effect-agent/storage-cloudflare/DoMessageDeliveryStore";
+import { doMessageDeliveryStoreLayer } from "@effect-agent/storage-cloudflare/do-message-delivery-store";
 import {
   type DoStorageFailpointHandler,
   type DoStorageFailpoint,
-} from "@effect-agent/storage-cloudflare/DoStorageFailpoint";
-import { submissionLedgerLayer } from "@effect-agent/storage-cloudflare/DoSubmissionLedger";
+} from "@effect-agent/storage-cloudflare/do-storage-failpoint";
+import { submissionLedgerLayer } from "@effect-agent/storage-cloudflare/do-submission-ledger";
 import {
   threadStoreLayer,
   storageConfigLayer,
   storageFailpointLayer,
   type DoStorageInitializationError,
   type DoStorageOptions,
-} from "@effect-agent/storage-cloudflare/DoThreadStore";
-import { type PortRequest, type PortResponse } from "@effect-agent/storage-cloudflare/PortProtocol";
+} from "@effect-agent/storage-cloudflare/do-thread-store";
+import {
+  type PortRequest,
+  type PortResponse,
+} from "@effect-agent/storage-cloudflare/port-protocol";
 import {
   executePortRequest,
   routedThreadStoreLayer,
   routedSubmissionLedgerLayer,
-} from "@effect-agent/storage-cloudflare/PortRouting";
+} from "@effect-agent/storage-cloudflare/port-routing";
+import { BrowserCrypto } from "@effect/platform-browser";
+import { SqliteClient } from "@effect/sql-sqlite-do";
+import {
+  type Crypto,
+  Cause,
+  Context,
+  Duration,
+  Effect,
+  Layer,
+  Schema,
+  Semaphore,
+  type Option,
+} from "effect";
 import {
   compileRegistrations,
   type AgentRegistration,
   type ResolvedBinding,
-} from "@effect-agent/thread/AgentRegistration";
-import { type DigestError } from "@effect-agent/thread/Digest";
-import {
-  DurableAgentRuntime,
-  DurableRuntimeConfig,
-} from "@effect-agent/thread/DurableAgentRuntime";
+} from "effect-agent/agent-registration";
+import { type DigestError } from "effect-agent/digest";
+import { DurableAgentRuntime, DurableRuntimeConfig } from "effect-agent/durable-agent-runtime";
 import {
   DurableRuntimeFailpoint,
   type DurableRuntimeFailpointHandler,
-} from "@effect-agent/thread/DurableFailpoint";
+} from "effect-agent/durable-failpoint";
+import { ThreadId, type SubmissionId } from "effect-agent/identifiers";
 import {
   type MessageDeliveryStore,
   MessageDeliveryDriver,
   type MessageDeliveryError,
-} from "@effect-agent/thread/MessageDelivery";
+} from "effect-agent/message-delivery";
 import {
   operationAuthorizerLayer,
   type OperationAuthorizerService,
-} from "@effect-agent/thread/OperationAuthorizer";
-import { type PreparedInputAdmission } from "@effect-agent/thread/PreparedInputAdmission";
-import { ProducerId } from "@effect-agent/thread/Records";
+} from "effect-agent/operation-authorizer";
+import { type PreparedInputAdmission } from "effect-agent/prepared-input-admission";
+import { ProducerId } from "effect-agent/records";
+import {
+  type RunContextPreparation,
+  type RunCostEstimator,
+  type RunToolFailureObserver,
+} from "effect-agent/run-options";
+import {
+  CurrentToolFailureObserver,
+  RunContextPreparationPassthrough,
+  RunToolAuthorization,
+  toolFailureObserverLayer,
+} from "effect-agent/run-options";
 import {
   LedgerError,
   SubmissionLedger,
   SubmissionLookupById,
   type SubmissionSnapshot,
-} from "@effect-agent/thread/SubmissionLedger";
-import { ThreadProjectionMaintenance } from "@effect-agent/thread/ThreadProjectionMaintenance";
-import { ThreadStoreError, ThreadStore } from "@effect-agent/thread/ThreadStore";
-import { ToolReconciler } from "@effect-agent/thread/ToolReconciler";
-import { type WakeScheduler } from "@effect-agent/thread/WakeScheduler";
-import { BrowserCrypto } from "@effect/platform-browser";
-import { SqliteClient } from "@effect/sql-sqlite-do";
-import {
-  type Crypto,
-  Cause,
-  Context,
-  Duration,
-  Effect,
-  Layer,
-  Schema,
-  Semaphore,
-  type Option,
-} from "effect";
+} from "effect-agent/submission-ledger";
+import { ThreadProjectionMaintenance } from "effect-agent/thread-projection-maintenance";
+import { ThreadStoreError, ThreadStore } from "effect-agent/thread-store";
+import { ToolReconciler } from "effect-agent/tool-reconciler";
+import { type WakeScheduler } from "effect-agent/wake-scheduler";
 import { SqlClient } from "effect/unstable/sql/SqlClient";
 
 import {

package/src/internal/message-delivery.ts

@@ -1,11 +1,11 @@
-import { type ThreadId } from "@effect-agent/core/Identifiers";
+import { Clock, Context, Deferred, Effect, Layer, Option, Ref, Semaphore, Stream } from "effect";
+import { type ThreadId } from "effect-agent/identifiers";
 import {
   MessageDeliveryDriver,
   MessageDeliveryError,
   MessageDeliveryStore,
-} from "@effect-agent/thread/MessageDelivery";
-import { WakeScheduler } from "@effect-agent/thread/WakeScheduler";
-import { Clock, Context, Deferred, Effect, Layer, Option, Ref, Semaphore, Stream } from "effect";
+} from "effect-agent/message-delivery";
+import { WakeScheduler } from "effect-agent/wake-scheduler";
 
 import { DurableAlarmError, ThreadMessageDelivery, ThreadMutationGate } from "../Alarm.ts";
 import { ThreadObjectPlacement } from "../CloudflareBindings.ts";
@@ -57,6 +57,8 @@ export const guardedMessageDeliveryStoreLayer = Layer.effect(
     );
 
     return MessageDeliveryStore.of({
+      limits: store.limits,
+      maxStoredValueBytes: store.maxStoredValueBytes,
       insert: (record) =>
         local(
           record.key.ownerThreadId,
@@ -71,12 +73,9 @@ export const guardedMessageDeliveryStoreLayer = Layer.effect(
       // pass placement validation before the driver may dispatch any of the wave.
       due: (nowMillis, limit, owner) =>
         local(owner, store.due(nowMillis, limit, owner)).pipe(
-          Effect.flatMap((keys) =>
-            keys.every((key) => ownsThread(key.ownerThreadId))
-              ? Effect.succeed(keys)
-              : Effect.fail(
-                  MessageDeliveryError.make({ reason: "validation", operation: "message owner" }),
-                ),
+          Effect.filterOrFail(
+            (keys) => keys.every((key) => ownsThread(key.ownerThreadId)),
+            () => MessageDeliveryError.make({ reason: "validation", operation: "message owner" }),
           ),
         ),
       nextDeadline: (owner) =>