@effect-agent/platform-cloudflare 0.1.0-beta.44 → 0.1.0-beta.46

package/src/CloudflareBrowser.ts

@@ -0,0 +1,15 @@
+/** Public CloudflareBrowser API. Implementation helpers remain private. */
+export {
+  BrowserQuickActionBrowserBinding,
+  BrowserQuickActionRpcError,
+  BrowserQuickActionWorkersAi,
+  BrowserQuickActionWorkersAiPolicyError,
+  browserQuickActionCaptureLayer,
+  browserQuickActionWorkersAiCaptureLayer,
+  browserQuickActionScreenshotLayer,
+  CloudflareBrowser,
+  type BrowserQuickActionCaptureOptions,
+  type BrowserQuickActionClient,
+  type BrowserQuickActionWorkersAiPolicy,
+  type CloudflareBrowserOptions,
+} from "./internal/browser-quick-action.ts";

package/src/{code-mode-executor.ts → CloudflareCodeMode.ts}

@@ -14,14 +14,14 @@ import {
   CodeOutputLimitError,
   CodeProgramFailedError,
   CodeSourceError,
-  SandboxImplementation,
   type CodeExecutorExecute,
   type CodeExecutionRequest,
-} from "@effect-agent/sandbox";
+} 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";
 
-import { safeCauseDiagnostic, safeCauseMessage } from "./boundary.ts";
+import { safeCauseDiagnostic, safeCauseMessage } from "./internal/boundary.ts";
 
 /**
  * The Cloudflare Dynamic Worker `CodeExecutor` adapter (C4 of ADR-0017;

package/src/{config.ts → CloudflareConfig.ts}

@@ -1,5 +1,6 @@
-import { DEFAULT_MAX_STORED_VALUE_BYTES } from "@effect-agent/storage-cloudflare";
-import { DEFAULT_OWNERSHIP_LEASE_DURATION, DeploymentId } from "@effect-agent/thread";
+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 { Context, Duration, Schema } from "effect";
 
 /**

package/src/{memory.ts → CloudflareMemory.ts}

@@ -1,27 +1,30 @@
+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 MemoryLookup,
   type MemoryReader,
   type MemoryWrite,
-  Memory,
-  MemoryAccess,
   MemoryDocument,
   MemoryMutationFailpoint,
-  MemoryNamespace,
-  MemoryNamespaceAddress,
-  MemoryRecallLimits,
   MemoryStorageError,
   MemoryWriter,
+} from "@effect-agent/core/MemoryStore";
+import {
   type MemoryIndexSearch,
-  type SemanticCandidateLimits,
   type SemanticMemoryProfile,
-} from "@effect-agent/core";
+} from "@effect-agent/core/SemanticMemoryIndex";
+import { type SemanticCandidateLimits } from "@effect-agent/core/SemanticMemoryRevalidation";
 import {
   type DoMemoryStorageLimits,
+  defaultDoMemoryStorageLimits,
+  doMemoryStoreLayerWithFailpoints,
+} from "@effect-agent/storage-cloudflare/DoMemoryStore";
+import {
   type MemoryOwnerAuthorizer,
   decodeMemoryWire,
-  defaultDoMemoryStorageLimits,
   defaultMemoryRpcLimits,
-  doMemoryStoreLayerWithFailpoints,
   encodeMemoryWire,
   handleMemoryOwnerRequest,
   MemoryOwnerIdentity,
@@ -30,8 +33,8 @@ import {
   MemoryRpcError,
   MemoryRpcLimits,
   type MemoryOwnerFailure,
-} from "@effect-agent/storage-cloudflare";
-import { Principal } from "@effect-agent/thread";
+} from "@effect-agent/storage-cloudflare/MemoryProtocol";
+import { Principal } from "@effect-agent/thread/SubmissionLedger";
 import { Clock, Context, Effect, Layer, Schema } from "effect";
 import {
   DurableObject as EffectCfDurableObject,

package/src/{scheduling.ts → CloudflareScheduling.ts}

@@ -1,13 +1,12 @@
-import { AgentId } from "@effect-agent/core";
+import { AgentId } from "@effect-agent/core/Identifiers";
 import {
   DoScheduleAlarmControl,
   DoScheduleTransaction,
   scheduleStoreLayer,
-} from "@effect-agent/storage-cloudflare";
+} from "@effect-agent/storage-cloudflare/DoScheduleStore";
+import { type DurableSubmitAgent } from "@effect-agent/thread/DurableAgentRuntime";
+import { DefinitionDigests, PersistedJson } from "@effect-agent/thread/Records";
 import {
-  DefinitionDigests,
-  PersistedJson,
-  type DurableSubmitAgent,
   ScheduleAuthorizationError,
   type ScheduleAuthorizer,
   ScheduleCapacityError,
@@ -25,13 +24,15 @@ import {
   ScheduleStorageError,
   ScheduleTimingRequest,
   ScheduleValidationError,
+  defaultSchedulingLimits,
+} from "@effect-agent/thread/Schedule";
+import { scheduleOwnerKey } from "@effect-agent/thread/ScheduleTransition";
+import {
   Scheduling,
   ScheduleDriver,
   type ScheduleManagementFailure,
-  defaultSchedulingLimits,
-  scheduleOwnerKey,
   ScheduleWakeNoop,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/Scheduling";
 import { BrowserCrypto } from "@effect/platform-browser";
 import { SqliteClient } from "@effect/sql-sqlite-do";
 import { Clock, Context, DateTime, Effect, Layer, Schema } from "effect";
@@ -42,12 +43,12 @@ import {
   type WorkerEnvironment,
 } from "effect-cf";
 
-import type { ThreadObjectNamespace } from "./bindings.ts";
-import { CloudflareThreadClient } from "./client.ts";
+import type { ThreadObjectNamespace } from "./CloudflareBindings.ts";
+import { CloudflareThreadClient } from "./CloudflareThreadClient.ts";
 import {
   cloudflarePreparedInputAdmissionLayer,
   cloudflareScheduledInputAdmissionLayer,
-} from "./prepared-admission.ts";
+} from "./internal/prepared-admission.ts";
 
 const SCHEDULE_ALARM_TAG = "effect-agent/ScheduleOwnerWake";
 const SCHEDULE_ALARM_ID = "driver";

package/src/{subscriptions.ts → CloudflareSubscriptions.ts}

@@ -2,30 +2,32 @@ import {
   DoSubscriptionAlarmControl,
   DoSubscriptionTransaction,
   doSubscriptionStoreLayer,
-} from "@effect-agent/storage-cloudflare";
+} 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";
 import {
   EventAcknowledgement,
   EventSourceVersion,
-  type EventSources,
-  type SubscriptionInputBindings,
-  PersistedJson,
-  Principal,
   SourcePartition,
   type SubscriptionAuthorizer,
   SubscriptionConfiguration,
-  SubscriptionDriver,
   SubscriptionDeliverySnapshot,
   SubscriptionError,
   SubscriptionFailpointError,
-  SubscriptionIntake,
   SubscriptionKey,
   SubscriptionScope,
   type SubscriptionLimits,
   SubscriptionSnapshot,
   SubscriptionSourceError,
-  Subscriptions,
   defaultSubscriptionLimits,
-} from "@effect-agent/thread";
+} 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 } from "effect";
@@ -36,9 +38,9 @@ import {
   type WorkerEnvironment,
 } from "effect-cf";
 
-import { type ThreadObjectNamespace } from "./bindings.ts";
-import { CloudflareThreadClient } from "./client.ts";
-import { cloudflarePreparedInputAdmissionLayer } from "./prepared-admission.ts";
+import { type ThreadObjectNamespace } from "./CloudflareBindings.ts";
+import { CloudflareThreadClient } from "./CloudflareThreadClient.ts";
+import { cloudflarePreparedInputAdmissionLayer } from "./internal/prepared-admission.ts";
 
 const SUBSCRIPTION_ALARM_TAG = "effect-agent/SubscriptionPartitionWake";
 const SUBSCRIPTION_ALARM_ID = "driver";

package/src/{client.ts → CloudflareThreadClient.ts}

@@ -1,43 +1,50 @@
-import { AgentId, AgentInputError, type ThreadId } from "@effect-agent/core";
+import { AgentInputError } from "@effect-agent/core/AgentError";
+import { AgentId, type ThreadId } from "@effect-agent/core/Identifiers";
+import { DigestError } from "@effect-agent/thread/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";
+import {
+  CanonicalRecordEnvelope,
+  CanonicalSequence,
+  DefinitionDigests,
+  PersistedJson,
+} from "@effect-agent/thread/Records";
 import {
   AbortCommand,
   AbortIntent,
   AdmissionConflict,
-  AppendConflict,
   ApprovalConflict,
   ApprovalDecisionCommand,
   ApprovalDecisionIntent,
-  CanonicalRecordEnvelope,
-  CanonicalSequence,
-  ThreadNotMaterialized,
-  ThreadStoreError,
-  DefinitionDigests,
-  DigestError,
-  DurableRuntimeFailpointError,
-  FenceRejected,
   IdempotencyKey,
   JoinedToHost,
   LedgerError,
-  OperationDenied,
-  PersistedJson,
   Principal,
-  Receipt,
   Settlement,
   SettlementConflict,
   UnknownResolutionCommand,
   UnknownResolutionConflict,
   UnknownResolutionIntent,
-  type DurableSubmitAgent,
-  type DurableSubmitOptions,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/SubmissionLedger";
+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";
 import { RpcTracing } from "effect-cf";
 
-import { DurableAlarmError } from "./alarm.ts";
-import { ThreadObjectNamespace, type ThreadObjectRpc } from "./bindings.ts";
-import { cloudflareFailureSignals, safeCauseMessage } from "./boundary.ts";
-import { AdmissionLimitExceeded } from "./config.ts";
+import { DurableAlarmError } from "./Alarm.ts";
+import { ThreadObjectNamespace, type ThreadObjectRpc } from "./CloudflareBindings.ts";
+import { AdmissionLimitExceeded } from "./CloudflareConfig.ts";
+import { cloudflareFailureSignals, safeCauseMessage } from "./internal/boundary.ts";
 
 /**
  * The Worker↔Thread-Object host protocol (plan §1.4): Schema envelopes for the host

package/src/{interactive-browser.ts → InteractiveBrowser.ts}

@@ -24,12 +24,12 @@ import {
   InteractiveBrowserProtocolError,
   InteractiveBrowserTargetUrl,
   InteractiveBrowserUnsupportedError,
-  PageScreenshotResult,
-  SandboxImplementation,
   type BrowserHandle,
   type InteractiveBrowserError,
   type InteractiveBrowserNetworkPolicy,
-} from "@effect-agent/sandbox";
+} from "@effect-agent/sandbox/InteractiveBrowser";
+import { PageScreenshotResult } from "@effect-agent/sandbox/PageScreenshot";
+import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
 import {
   Context,
   Clock,
@@ -47,8 +47,12 @@ import {
 import {
   BrowserRunSessionLifecycle,
   type BrowserRunLifecycleOptions,
-} from "./browser-session-lifecycle.ts";
-export { BrowserRunCleanupError, BrowserRunSessionLifecycle } from "./browser-session-lifecycle.ts";
+} from "./internal/browser-session-lifecycle.ts";
+
+export {
+  BrowserRunCleanupError,
+  BrowserRunSessionLifecycle,
+} from "./internal/browser-session-lifecycle.ts";
 
 export const browserRunInteractiveImplementation = SandboxImplementation.make({
   isolation: "isolated",

package/src/{thread-object.ts → ThreadObject.ts}

@@ -1,40 +1,48 @@
-import type { AgentId } from "@effect-agent/core";
-import { SubmissionId } from "@effect-agent/core";
+import { type AgentId } from "@effect-agent/core/Identifiers";
+import { SubmissionId } from "@effect-agent/core/Identifiers";
 import {
   decodePortRequest,
   encodePortResponse,
   type PortRequest,
-} from "@effect-agent/storage-cloudflare";
+} from "@effect-agent/storage-cloudflare/PortProtocol";
 import {
-  AppendConflict,
-  ThreadNotMaterialized,
-  ThreadRead,
-  ThreadStore,
-  ThreadStoreError,
-  DigestError,
-  DurableAgentRuntime,
-  DurableRuntimeFailpointError,
-  FenceRejected,
   IntegrityReport,
-  LedgerError,
   ObligationReport,
   ObligationThresholds,
+  RecoveryExplanation,
+  RetryCommand,
+  RetryRefused,
+} from "@effect-agent/thread/Admin";
+import { DigestError } from "@effect-agent/thread/Digest";
+import {
+  DurableAgentRuntime,
+  RecoveryReport,
+  type DurableSubmitAgent,
+} from "@effect-agent/thread/DurableAgentRuntime";
+import { DurableRuntimeFailpointError } from "@effect-agent/thread/DurableFailpoint";
+import {
   OperationAuthorizationRequest,
   OperationAuthorizer,
   OperationDenied,
+} from "@effect-agent/thread/OperationAuthorizer";
+import { PersistedJson } from "@effect-agent/thread/Records";
+import { RunJournalError } from "@effect-agent/thread/RunJournal";
+import {
+  LedgerError,
   OwnershipLost,
-  PersistedJson,
-  RecoveryExplanation,
-  RecoveryReport,
-  RetryCommand,
-  RetryRefused,
-  RunJournalError,
   SettlementConflict,
   SubmissionLedger,
   SubmissionLookupByKey,
-  WakeScheduler,
-  type DurableSubmitAgent,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/SubmissionLedger";
+import {
+  AppendConflict,
+  ThreadNotMaterialized,
+  ThreadRead,
+  ThreadStore,
+  ThreadStoreError,
+  FenceRejected,
+} from "@effect-agent/thread/ThreadStore";
+import { WakeScheduler } from "@effect-agent/thread/WakeScheduler";
 import { Effect, Layer, Option, Schema, Stream } from "effect";
 import {
   DurableObject as EffectCfDurableObject,
@@ -47,14 +55,15 @@ import {
   DurableAlarmError,
   DurableAlarmService,
   type MaintenancePassFailure,
-} from "./alarm.ts";
+} from "./Alarm.ts";
 import {
   ThreadObjectIdentity,
   DurableObjectContext,
   ThreadObjectNamespace,
   threadNamespaceFromEnv,
   type CloudflareBindingError,
-} from "./bindings.ts";
+} from "./CloudflareBindings.ts";
+import { AdmissionLimitExceeded, CloudflareDurableRuntimeConfig } from "./CloudflareConfig.ts";
 import {
   AbortRecorded,
   ApprovalRecorded,
@@ -78,8 +87,7 @@ import {
   encodeHostResponse,
   type HostFailure,
   type HostResponse,
-} from "./client.ts";
-import { AdmissionLimitExceeded, CloudflareDurableRuntimeConfig } from "./config.ts";
+} from "./CloudflareThreadClient.ts";
 import {
   layerConfig,
   ThreadObjectPorts,
@@ -87,8 +95,8 @@ import {
   type CloudflareDurableRuntimeOptions,
   type CloudflareDurableRuntimeServices,
   type CloudflareBootstrapServices,
-} from "./layers.ts";
-import { ProgressWaitRegistry } from "./progress-wait.ts";
+} from "./internal/layers.ts";
+import { ProgressWaitRegistry } from "./internal/progress-wait.ts";
 
 export {
   layer,
@@ -97,7 +105,7 @@ export {
   type CloudflareDurableRuntimeServices as Services,
   type CloudflareDurableRuntimeInitializationError as InitializationError,
   type CloudflareBootstrapServices as BootstrapServices,
-} from "./layers.ts";
+} from "./internal/layers.ts";
 
 /**
  * `ThreadObject.make(application, options)` — the Thread Durable Object

package/src/{wake-scheduler.ts → WakeScheduler.ts}

@@ -1,10 +1,10 @@
-import type { ThreadId } from "@effect-agent/core";
-import { makeWakeSubscriptionHub, WakeScheduler } from "@effect-agent/thread";
+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 { DurableAlarmService } from "./alarm.ts";
-import { ThreadObjectIdentity, ThreadObjectNamespace } from "./bindings.ts";
-import { safeCauseMessage } from "./boundary.ts";
+import { DurableAlarmService } from "./Alarm.ts";
+import { ThreadObjectIdentity, ThreadObjectNamespace } from "./CloudflareBindings.ts";
+import { safeCauseMessage } from "./internal/boundary.ts";
 
 /**
  * Bounded in-memory wake buffer for same-incarnation `awaitSettlement` subscribers. Wake

package/src/index.ts

@@ -1,30 +1,11 @@
-/**
- * `@effect-agent/platform-cloudflare` — the Cloudflare Layer-assembly library for deployment
- * class DC (deployment spec §12: a Layer-assembly library, not an application entrypoint).
- *
- * One SQLite-backed Durable Object per Thread is the serialized owner (durability §6):
- * `ThreadObject.make` builds the class applications export from their Worker,
- * `ThreadObject.layer` assembles the coordinator over the storage-cloudflare
- * adapters and the WP2 cross-Object routing, `DurableAlarmService`/`ThreadMaintenance`
- * multiplex every cadence into the Object's single alarm slot (dirty or autonomously
- * actionable work retains a committed alarm; stable external waits quiesce until their next
- * durably pre-armed mutation), and
- * `CloudflareThreadClient` is the Worker-side ingress. Platform bindings enter ONLY
- * through the `bindings.ts` Layers (DEPLOY-010). This is the only workspace package allowed
- * to import the `cloudflare:workers` runtime module.
- */
-export * from "./bindings.ts";
-export * from "./config.ts";
-export * from "./alarm.ts";
-export * from "./wake-scheduler.ts";
-export * from "./progress-wait.ts";
-export * from "./transport.ts";
-export { layerFromBindings, ThreadObjectPorts } from "./layers.ts";
-export * as ThreadObject from "./thread-object.ts";
-export * from "./client.ts";
-export * from "./prepared-admission.ts";
-export * from "./scheduling.ts";
-export * from "./subscriptions.ts";
-export * from "./code-mode-executor.ts";
-export { CloudflareBrowser, type CloudflareBrowserOptions } from "./browser-quick-action.ts";
-export * from "./memory.ts";
+export * as Alarm from "./Alarm.ts";
+export * as CloudflareBindings from "./CloudflareBindings.ts";
+export * as CloudflareBrowser from "./CloudflareBrowser.ts";
+export * as CloudflareCodeMode from "./CloudflareCodeMode.ts";
+export * as CloudflareConfig from "./CloudflareConfig.ts";
+export * as CloudflareMemory from "./CloudflareMemory.ts";
+export * as CloudflareScheduling from "./CloudflareScheduling.ts";
+export * as CloudflareSubscriptions from "./CloudflareSubscriptions.ts";
+export * as CloudflareThreadClient from "./CloudflareThreadClient.ts";
+export * as ThreadObject from "./ThreadObject.ts";
+export * as WakeScheduler from "./WakeScheduler.ts";

package/src/{browser-quick-action.ts → internal/browser-quick-action.ts}

@@ -11,24 +11,26 @@ import {
   PageCaptureResourceUse,
   PageCaptureResult,
   PageCaptureUnsupportedError,
-  PageScreenshot,
-  PageScreenshotOutputLimitError,
-  PageScreenshotResult,
-  type PageScreenshotCapture,
-  type PageScreenshotError,
-  type PageScreenshotRequest,
   PageContentCaptured,
   PageLinksCaptured,
   PageMarkdownCaptured,
   PageScrapeCaptured,
   PageStructuredCaptured,
-  SandboxImplementation,
   type PageCaptureAction,
   type PageCaptureCapture,
   type PageCaptureError,
   type PageCaptureOutput,
   type PageCaptureRequest,
-} from "@effect-agent/sandbox";
+} from "@effect-agent/sandbox/PageCapture";
+import {
+  PageScreenshot,
+  PageScreenshotOutputLimitError,
+  PageScreenshotResult,
+  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";
 
 /**

package/src/{layers.ts → internal/layers.ts}

@@ -1,47 +1,56 @@
-import { ThreadId } from "@effect-agent/core";
-import type {
-  RunContextPreparation,
-  RunCostEstimator,
-  RunToolFailureObserver,
-} from "@effect-agent/engine";
+import { ThreadId } 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";
+} from "@effect-agent/engine/RunOptions";
+import {
+  type DoStorageFailpointHandler,
+  type DoStorageFailpoint,
+} from "@effect-agent/storage-cloudflare/DoStorageFailpoint";
+import { submissionLedgerLayer } from "@effect-agent/storage-cloudflare/DoSubmissionLedger";
 import {
   threadStoreLayer,
-  executePortRequest,
-  routedThreadStoreLayer,
-  routedSubmissionLedgerLayer,
   storageConfigLayer,
   storageFailpointLayer,
-  submissionLedgerLayer,
-  type DoStorageFailpointHandler,
   type DoStorageInitializationError,
   type DoStorageOptions,
-  type DoStorageFailpoint,
-  type PortRequest,
-  type PortResponse,
-} from "@effect-agent/storage-cloudflare";
+} from "@effect-agent/storage-cloudflare/DoThreadStore";
+import { type PortRequest, type PortResponse } from "@effect-agent/storage-cloudflare/PortProtocol";
+import {
+  executePortRequest,
+  routedThreadStoreLayer,
+  routedSubmissionLedgerLayer,
+} from "@effect-agent/storage-cloudflare/PortRouting";
 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";
+import {
   DurableRuntimeFailpoint,
-  ProducerId,
-  operationAuthorizerLayer,
-  ToolReconciler,
-  type AgentRegistration,
-  type ThreadStore,
-  type DigestError,
   type DurableRuntimeFailpointHandler,
+} from "@effect-agent/thread/DurableFailpoint";
+import {
+  operationAuthorizerLayer,
   type OperationAuthorizerService,
-  type ResolvedBinding,
-  type SubmissionLedger,
-  type WakeScheduler,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/OperationAuthorizer";
+import { ProducerId } from "@effect-agent/thread/Records";
+import { type SubmissionLedger } from "@effect-agent/thread/SubmissionLedger";
+import { type 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 } from "effect";
@@ -52,25 +61,25 @@ import {
   ThreadMaintenanceFailpoint,
   DurableAlarmService,
   type ThreadMaintenanceFailpointHandler,
-} from "./alarm.ts";
+} from "../Alarm.ts";
 import {
   ThreadObjectIdentity,
   DurableObjectContext,
   type ThreadObjectNamespace,
-} from "./bindings.ts";
+} from "../CloudflareBindings.ts";
 import {
   CLOUDFLARE_RUNTIME_DEFAULTS,
   CloudflareDurableRuntimeConfig,
   CloudflareDurableRuntimeConfigValue,
   CloudflarePlatformConfigError,
-} from "./config.ts";
+} from "../CloudflareConfig.ts";
+import { cloudflareWakeSchedulerLayer } from "../WakeScheduler.ts";
 import { ProgressWaitRegistry } from "./progress-wait.ts";
 import { threadPortTransportLayer } from "./transport.ts";
-import { cloudflareWakeSchedulerLayer } from "./wake-scheduler.ts";
 
 /**
  * Raw (unvalidated) construction options for `ThreadObject.make`, mirroring
- * `NodeDurableRuntimeOptions`. Optional fields default to the documented production values
+ * `NodeDurableAgentRuntimeOptions`. Optional fields default to the documented production values
  * (`CLOUDFLARE_RUNTIME_DEFAULTS`); everything is schema-decoded into
  * `CloudflareDurableRuntimeConfigValue` before any resource opens (deployment §5 gate 1).
  */
@@ -367,7 +376,7 @@ export const layerFromBindings = (
 
       const base = Layer.mergeAll(DurableAlarmService.layer, ProgressWaitRegistry.layer);
 
-      const runtimeStack = DurableAgentRuntime.layerWithServices.pipe(
+      const runtimeStack = DurableAgentRuntime.layerWithBindings(bindings).pipe(
         Layer.provideMerge(routedPorts),
         Layer.provideMerge(cloudflareWakeSchedulerLayer),
         Layer.provideMerge(base),
@@ -375,7 +384,7 @@ export const layerFromBindings = (
 
       return Layer.mergeAll(
         runtimeStack,
-        ThreadMaintenance.layer(bindings).pipe(Layer.provide(runtimeStack)),
+        ThreadMaintenance.layer.pipe(Layer.provide(runtimeStack)),
         portsEndpointLayer,
       );
     }),