@effect-agent/platform-cloudflare 0.1.0-beta.85 → 0.1.0-beta.87

package/src/CloudflareCodeMode.ts

@@ -1,3 +1,5 @@
+import { RpcTarget } from "cloudflare:workers";
+import { Clock, Duration, Effect, Exit, Fiber, Layer, Option, Queue, Schema } from "effect";
 import {
   CodeExecutionHost,
   CodeExecutionResourceUse,
@@ -16,10 +18,8 @@ import {
   CodeSourceError,
   type CodeExecutorExecute,
   type CodeExecutionRequest,
-} from "@effect-agent/sandbox/CodeExecutor";
-import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
-import { RpcTarget } from "cloudflare:workers";
-import { Clock, Duration, Effect, Exit, Fiber, Layer, Option, Queue, Schema } from "effect";
+} from "effect-agent/code-executor";
+import { SandboxImplementation } from "effect-agent/sandbox";
 
 import { safeCauseDiagnostic, safeCauseMessage } from "./internal/boundary.ts";
 

package/src/CloudflareConfig.ts

@@ -1,7 +1,7 @@
-import { DEFAULT_MAX_STORED_VALUE_BYTES } from "@effect-agent/storage-cloudflare/DoStorageConfig";
-import { DeploymentId } from "@effect-agent/thread/Records";
-import { DEFAULT_OWNERSHIP_LEASE_DURATION } from "@effect-agent/thread/SubmissionLedger";
+import { DEFAULT_MAX_STORED_VALUE_BYTES } from "@effect-agent/storage-cloudflare/do-storage-config";
 import { Context, Duration, Schema } from "effect";
+import { DeploymentId } from "effect-agent/records";
+import { DEFAULT_OWNERSHIP_LEASE_DURATION } from "effect-agent/submission-ledger";
 
 /**
  * Schema-validated configuration for the Cloudflare durable runtime (deployment spec §4:

package/src/CloudflareMemory.ts

@@ -1,27 +1,8 @@
-import * as Memory from "@effect-agent/core/Memory";
-import * as MemoryNamespace from "@effect-agent/core/MemoryNamespace";
-import { MemoryNamespaceAddress } from "@effect-agent/core/MemoryNamespace";
-import { type MemoryLookup, MemoryRecallLimits } from "@effect-agent/core/MemoryReference";
-import { MemoryAccess } from "@effect-agent/core/MemoryRevalidation";
-import {
-  type MemoryReader,
-  type MemoryWrite,
-  MemoryKey,
-  MemoryDocument,
-  MemoryMutationFailpoint,
-  MemoryStorageError,
-  MemoryWriter,
-} from "@effect-agent/core/MemoryStore";
-import {
-  type MemoryIndexSearch,
-  type SemanticMemoryProfile,
-} from "@effect-agent/core/SemanticMemoryIndex";
-import { type SemanticCandidateLimits } from "@effect-agent/core/SemanticMemoryRevalidation";
 import {
   type DoMemoryStorageLimits,
   defaultDoMemoryStorageLimits,
   doMemoryStoreLayerWithFailpoints,
-} from "@effect-agent/storage-cloudflare/DoMemoryStore";
+} from "@effect-agent/storage-cloudflare/do-memory-store";
 import {
   type MemoryOwnerAuthorizer,
   decodeMemoryWire,
@@ -34,9 +15,28 @@ import {
   MemoryRpcError,
   MemoryRpcLimits,
   type MemoryOwnerFailure,
-} from "@effect-agent/storage-cloudflare/MemoryProtocol";
-import { Principal } from "@effect-agent/thread/SubmissionLedger";
+} from "@effect-agent/storage-cloudflare/memory-protocol";
 import { Clock, Context, Effect, Layer, Schema } from "effect";
+import * as Memory from "effect-agent/memory";
+import * as MemoryNamespace from "effect-agent/memory-namespace";
+import { MemoryNamespaceAddress } from "effect-agent/memory-namespace";
+import { type MemoryLookup, MemoryRecallLimits } from "effect-agent/memory-reference";
+import { MemoryAccess } from "effect-agent/memory-revalidation";
+import {
+  type MemoryReader,
+  type MemoryWrite,
+  MemoryKey,
+  MemoryDocument,
+  MemoryMutationFailpoint,
+  MemoryStorageError,
+  MemoryWriter,
+} from "effect-agent/memory-store";
+import {
+  type MemoryIndexSearch,
+  type SemanticMemoryProfile,
+} from "effect-agent/semantic-memory-index";
+import { type SemanticCandidateLimits } from "effect-agent/semantic-memory-revalidation";
+import { Principal } from "effect-agent/submission-ledger";
 import {
   DurableObject as EffectCfDurableObject,
   DurableObjectState,

package/src/CloudflareScheduling.ts

@@ -1,11 +1,14 @@
-import { AgentId } from "@effect-agent/core/Identifiers";
 import {
   DoScheduleAlarmControl,
   DoScheduleTransaction,
   scheduleStoreLayer,
-} from "@effect-agent/storage-cloudflare/DoScheduleStore";
-import { type DurableSubmitAgent } from "@effect-agent/thread/DurableAgentRuntime";
-import { DefinitionDigests, PersistedJson } from "@effect-agent/thread/Records";
+} from "@effect-agent/storage-cloudflare/do-schedule-store";
+import { BrowserCrypto } from "@effect/platform-browser";
+import { SqliteClient } from "@effect/sql-sqlite-do";
+import { Clock, Context, DateTime, Effect, Layer, Schema } from "effect";
+import { type DurableSubmitAgent } from "effect-agent/durable-agent-runtime";
+import { AgentId } from "effect-agent/identifiers";
+import { DefinitionDigests, PersistedJson } from "effect-agent/records";
 import {
   ScheduleAuthorizationError,
   type ScheduleAuthorizer,
@@ -25,18 +28,15 @@ import {
   ScheduleTimingRequest,
   ScheduleValidationError,
   defaultSchedulingLimits,
-} from "@effect-agent/thread/Schedule";
-import { scheduleOwnerKey } from "@effect-agent/thread/ScheduleTransition";
+} from "effect-agent/schedule";
+import { scheduleOwnerKey } from "effect-agent/schedule-transition";
 import {
   Scheduling,
   ScheduleDriver,
   type ScheduleManagementFailure,
   ScheduleWakeNoop,
-} from "@effect-agent/thread/Scheduling";
-import { AdmissionFence } from "@effect-agent/thread/SubmissionLedger";
-import { BrowserCrypto } from "@effect/platform-browser";
-import { SqliteClient } from "@effect/sql-sqlite-do";
-import { Clock, Context, DateTime, Effect, Layer, Schema } from "effect";
+} from "effect-agent/scheduling";
+import { AdmissionFence } from "effect-agent/submission-ledger";
 import {
   DurableObject as EffectCfDurableObject,
   DurableObjectAlarm,

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,

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 { InputMessage } 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";

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,21 +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,
-  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,

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/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,17 +1,17 @@
-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";
 import { CloudflareDurableRuntimeConfig } from "../CloudflareConfig.ts";
 
-/** Every externally requested write prearms the owning Object's maintenance generation. */
+/** Every write prearms its owner; the delivery due index owns its recovery deadline. */
 export const guardedMessageDeliveryStoreLayer = Layer.effect(
   MessageDeliveryStore,
   Effect.gen(function* () {
@@ -36,7 +36,12 @@ export const guardedMessageDeliveryStoreLayer = Layer.effect(
 
     const mutate = <A, E>(body: Effect.Effect<A, E>) =>
       mutations
-        .withMutation(cacheGate.withPermit(Ref.set(deadline, undefined).pipe(Effect.andThen(body))))
+        .withMutation(
+          cacheGate.withPermit(Ref.set(deadline, undefined).pipe(Effect.andThen(body))),
+          // A foreign receipt changing does not make the source ledger actionable. Keep the
+          // prearm and producer gate so eviction and a racing pass cannot lose delivery work.
+          { invalidatesRecovery: false },
+        )
         .pipe(
           Effect.catchTag("DurableAlarmError", () =>
             MessageDeliveryError.make({ reason: "storage", operation: "prearm message delivery" }),

package/src/internal/prepared-admission.ts

@@ -1,16 +1,16 @@
-import { type AgentId } from "@effect-agent/core/Identifiers";
-import { type DurableSubmitAgent } from "@effect-agent/thread/DurableAgentRuntime";
-import { PreparedInputAdmission } from "@effect-agent/thread/PreparedInputAdmission";
-import { PersistedJson } from "@effect-agent/thread/Records";
+import { Effect, Layer } from "effect";
+import { type DurableSubmitAgent } from "effect-agent/durable-agent-runtime";
+import { type AgentId } from "effect-agent/identifiers";
+import { PreparedInputAdmission } from "effect-agent/prepared-input-admission";
+import { PersistedJson } from "effect-agent/records";
 import {
   type ScheduledEnvelope,
   ScheduledInputAdmission,
   ScheduledInputRetryable,
   ScheduledInputRefused,
   ScheduleStorageError,
-} from "@effect-agent/thread/Schedule";
-import { type PreparedInput } from "@effect-agent/thread/Subscription";
-import { Effect, Layer } from "effect";
+} from "effect-agent/schedule";
+import { type PreparedInput } from "effect-agent/subscription";
 
 import { CloudflareThreadClient, type ThreadClientError } from "../CloudflareThreadClient.ts";
 

package/src/internal/transport.ts

@@ -1,7 +1,7 @@
 import {
   ThreadPortTransport,
   portTransportFailure,
-} from "@effect-agent/storage-cloudflare/PortRouting";
+} from "@effect-agent/storage-cloudflare/port-routing";
 import { Effect, Layer } from "effect";
 
 import { callThreadObject, ThreadObjectNamespace } from "../CloudflareBindings.ts";

package/src/protected-browser/binding.ts

@@ -1,8 +1,8 @@
 /// <reference types="@cloudflare/workers-types" />
 import puppeteer, { type Browser } from "@cloudflare/puppeteer";
-import { type InteractiveBrowserPolicy } from "@effect-agent/sandbox/InteractiveBrowser";
-import { ProtectedBrowserError } from "@effect-agent/sandbox/ProtectedBrowser";
 import { Clock, Context, Crypto, Effect, Layer, Redacted, Schema, type Scope } from "effect";
+import { type InteractiveBrowserPolicy } from "effect-agent/interactive-browser";
+import { ProtectedBrowserError } from "effect-agent/protected-browser";
 
 import { BrowserRunSessionLifecycle } from "../internal/browser-session-lifecycle.ts";
 import { makeProtectedNativeTransport, ProtectedNativeSession } from "./native.ts";

package/src/protected-browser/native.ts

@@ -1,12 +1,12 @@
 /// <reference types="@cloudflare/workers-types" />
 import type { Browser, Frame, JSHandle, Page } from "@cloudflare/puppeteer";
-import { type InteractiveBrowserPolicy } from "@effect-agent/sandbox/InteractiveBrowser";
+import { Clock, Context, Crypto, Effect, Redacted, Schema, type Scope } from "effect";
+import { type InteractiveBrowserPolicy } from "effect-agent/interactive-browser";
 import {
   CredentialOrigin,
   CredentialTarget,
   ProtectedBrowserControl,
-} from "@effect-agent/sandbox/ProtectedBrowser";
-import { Clock, Context, Crypto, Effect, Redacted, Schema, type Scope } from "effect";
+} from "effect-agent/protected-browser";
 
 import { inspectFrame, maxAttributeLength } from "./inspect-frame.ts";
 import {

package/src/protected-browser/policy.ts

@@ -1,4 +1,15 @@
-import { InteractiveBrowserPolicy } from "@effect-agent/sandbox/InteractiveBrowser";
+import {
+  Clock,
+  Context,
+  Crypto,
+  Effect,
+  Layer,
+  Redacted,
+  Schema,
+  Semaphore,
+  type Scope,
+} from "effect";
+import { InteractiveBrowserPolicy } from "effect-agent/interactive-browser";
 /// <reference types="@cloudflare/workers-types" />
 import {
   BrowserCredentialAccess,
@@ -27,18 +38,7 @@ import {
   type ProtectedBrowserAction,
   type ProtectedCleanup,
   type ProtectedObservationState,
-} from "@effect-agent/sandbox/ProtectedBrowser";
-import {
-  Clock,
-  Context,
-  Crypto,
-  Effect,
-  Layer,
-  Redacted,
-  Schema,
-  Semaphore,
-  type Scope,
-} from "effect";
+} from "effect-agent/protected-browser";
 
 export class ProtectedTransportError extends Schema.TaggedError<ProtectedTransportError>()(
   "ProtectedTransportError",