@effect-agent/testing 0.1.0-beta.45 → 0.1.0-beta.47

package/src/{certification.ts → Certification.ts}

@@ -1,55 +1,51 @@
+import * as Subagent from "@effect-agent/capabilities/Subagent";
+import { SubagentPolicy, SubagentRuntime } from "@effect-agent/capabilities/Subagent";
+import { SubagentReservationsMemoryLive } from "@effect-agent/capabilities/SubagentReservations";
+import * as Agent from "@effect-agent/core/Agent";
+import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
 import {
-  Subagent,
-  SubagentPolicy,
-  SubagentReservationsMemoryLive,
-  SubagentRuntime,
-} from "@effect-agent/capabilities";
-import {
-  Agent,
-  AgentPolicy,
   ThreadId,
-  IdGenerator,
   RunId,
   ToolCallId,
   TurnId,
   type AgentId,
   type SubmissionId,
-} from "@effect-agent/core";
-import { DurableStep, DurableStepError, RunToolAuthorization } from "@effect-agent/engine";
+} from "@effect-agent/core/Identifiers";
+import { IdGenerator } from "@effect-agent/core/IdGenerator";
+import { DurableStep, DurableStepError } from "@effect-agent/engine/DurableStep";
+import { RunToolAuthorization } from "@effect-agent/engine/RunOptions";
+import { DurableWorkerBinding, type ResolvedBinding } from "@effect-agent/thread/AgentRegistration";
 import {
-  ApprovalDecisionCommand,
-  ThreadExportRequest,
-  ThreadStore,
-  DefinitionDigests,
-  DeploymentId,
-  Digest,
   DurableAgentRuntime,
   DurableRuntimeConfig,
+  type DurableSubmitFailure,
+  type DurableSubmitOptions,
+  type Receipt,
+} from "@effect-agent/thread/DurableAgentRuntime";
+import {
   DurableRuntimeFailpointError,
   DurableRuntimeFailpointLocation,
-  DurableWorkerBinding,
+} from "@effect-agent/thread/DurableFailpoint";
+import {
+  DefinitionDigests,
+  DeploymentId,
+  Digest,
+  ProducerId,
+  type BatchId,
+} from "@effect-agent/thread/Records";
+import { childThreadIdFor } from "@effect-agent/thread/RunJournal";
+import {
+  ApprovalDecisionCommand,
   IdempotencyKey,
-  LoadCheckpointRequest,
   Principal,
-  ProducerId,
   ResolutionSafeToRetry,
   SubmissionLedger,
   SubmissionLookupById,
-  ToolReconciler,
   UnknownResolutionCommand,
-  WakeScheduler,
   DEFAULT_OWNERSHIP_LEASE_DURATION,
-  childThreadIdFor,
-  verifyThreadInvariants,
-  type BatchId,
-  type DurableSubmitFailure,
-  type DurableSubmitOptions,
-  type Receipt,
-  type ResolvedBinding,
   type SubmissionSnapshot,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/SubmissionLedger";
 import {
-  DurableRuntimeFailpointTestControl,
   type CertificationCaseResult,
   CertificationReport,
   CertificationSweepResult,
@@ -57,7 +53,16 @@ import {
   CertifiedAdapterIdentity,
   certifyPorts,
   type CertificationScenario,
-} from "@effect-agent/thread/testing";
+} from "@effect-agent/thread/testing/Certification";
+import { DurableRuntimeFailpointTestControl } from "@effect-agent/thread/testing/DurableFailpointTestControl";
+import { verifyThreadInvariants } from "@effect-agent/thread/ThreadInvariants";
+import {
+  ThreadExportRequest,
+  ThreadStore,
+  LoadCheckpointRequest,
+} from "@effect-agent/thread/ThreadStore";
+import { ToolReconciler } from "@effect-agent/thread/ToolReconciler";
+import { WakeScheduler } from "@effect-agent/thread/WakeScheduler";
 import type { Crypto } from "effect";
 import {
   Cause,

package/src/{chaos.ts → Chaos.ts}

@@ -1,39 +1,51 @@
+import * as Subagent from "@effect-agent/capabilities/Subagent";
+import { SubagentPolicy, SubagentRuntime } from "@effect-agent/capabilities/Subagent";
+import { SubagentReservationsMemoryLive } from "@effect-agent/capabilities/SubagentReservations";
+import * as Agent from "@effect-agent/core/Agent";
+import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
 import {
-  Subagent,
-  SubagentPolicy,
-  SubagentReservationsMemoryLive,
-  SubagentRuntime,
-} from "@effect-agent/capabilities";
-import {
-  Agent,
-  AgentPolicy,
   ThreadId,
-  IdGenerator,
   RunId,
   ToolCallId,
   TurnId,
   type SubmissionId,
-} from "@effect-agent/core";
+} from "@effect-agent/core/Identifiers";
+import { IdGenerator } from "@effect-agent/core/IdGenerator";
 import {
   DurableStep,
   DurableStepError,
-  RunToolAuthorization,
   ToolExecutionClass,
-} from "@effect-agent/engine";
+} from "@effect-agent/engine/DurableStep";
+import { RunToolAuthorization } from "@effect-agent/engine/RunOptions";
+import { ObligationThresholds } from "@effect-agent/thread/Admin";
+import {
+  DurableWorkerBinding,
+  type DurableBindingFailure,
+  type ResolvedBinding,
+} from "@effect-agent/thread/AgentRegistration";
 import {
-  AbortCommand,
-  ApprovalDecisionCommand,
-  ThreadExportRequest,
-  ThreadStore,
-  DefinitionDigests,
-  Digest,
   DurableAgentRuntime,
   DurableRuntimeConfig,
+  type DurableSubmitFailure,
+  type DurableWorkerFailure,
+  type Receipt,
+} from "@effect-agent/thread/DurableAgentRuntime";
+import {
   DurableRuntimeFailpointError,
   DurableRuntimeFailpointLocation,
-  DurableWorkerBinding,
+} from "@effect-agent/thread/DurableFailpoint";
+import {
+  DefinitionDigests,
+  Digest,
+  type CanonicalRecordEnvelope,
+  type BatchId,
+  type ProducerId,
+} from "@effect-agent/thread/Records";
+import { childThreadIdFor } from "@effect-agent/thread/RunJournal";
+import {
+  AbortCommand,
+  ApprovalDecisionCommand,
   IdempotencyKey,
-  ObligationThresholds,
   Principal,
   ResolutionAbortSubmission,
   ResolutionCompletedWithResult,
@@ -41,21 +53,13 @@ import {
   SubmissionLedger,
   SubmissionLookupById,
   UnknownResolutionCommand,
-  childThreadIdFor,
-  verifyThreadInvariants,
-  type CanonicalRecordEnvelope,
-  type BatchId,
-  type DurableBindingFailure,
-  type DurableSubmitFailure,
-  type DurableWorkerFailure,
-  type ProducerId,
-  type Receipt,
-  type ResolvedBinding,
   type Settlement,
   type SubmissionSnapshot,
   type UnknownResolution,
-} from "@effect-agent/thread";
-import { DurableRuntimeFailpointTestControl } from "@effect-agent/thread/testing";
+} from "@effect-agent/thread/SubmissionLedger";
+import { DurableRuntimeFailpointTestControl } from "@effect-agent/thread/testing/DurableFailpointTestControl";
+import { verifyThreadInvariants } from "@effect-agent/thread/ThreadInvariants";
+import { ThreadExportRequest, ThreadStore } from "@effect-agent/thread/ThreadStore";
 import { Cause, Effect, Exit, Layer, Option, Ref, Schema, Stream } from "effect";
 import { FastCheck } from "effect/testing";
 import {

package/src/{code-executor-conformance.ts → CodeExecutorConformance.ts}

@@ -6,14 +6,16 @@ import {
   CodeExecutor,
   CodeHostCallFailure,
   CodeHostCallSuccess,
-  NetworkAllowlist,
-  NetworkDisabled,
   type CodeExecutionError,
   type CodeExecutionResult,
   type CodeHostCall,
   type CodeHostCallResult,
+} from "@effect-agent/sandbox/CodeExecutor";
+import {
+  NetworkAllowlist,
+  NetworkDisabled,
   type SandboxImplementation,
-} from "@effect-agent/sandbox";
+} from "@effect-agent/sandbox/Sandbox";
 import { Deferred, Duration, Effect, Fiber, Schema } from "effect";
 
 /**

package/src/{code-executor-substitute.ts → CodeExecutorSubstitute.ts}

@@ -13,11 +13,11 @@ import {
   CodeOutputLimitError,
   CodeProgramFailedError,
   CodeSourceError,
-  SandboxImplementation,
   type CodeExecutionLimits,
   type CodeExecutionNamespace,
   type CodeExecutionRequest,
-} from "@effect-agent/sandbox";
+} from "@effect-agent/sandbox/CodeExecutor";
+import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
 import { Clock, Duration, Effect, Fiber, Layer, Option, Queue, Schema } from "effect";
 
 /**

package/src/{fixtures/docs-researcher/index.ts → DocsResearcher.ts}

@@ -1,6 +1,8 @@
+/** Shared Docs Researcher definitions and MCP delegation fixtures. */
+
 // ---------------------------------------------------------------------------
 // Docs Researcher fixture (P7 internal agent #3): S2 durable delegation on DN
-// with MCP-discovered content tools. See definition.ts / mcp.ts / harness.ts.
+// with MCP-discovered content tools. See fixtures/docs-researcher/{definition,mcp,harness}.ts.
 //
 // Authoring friction note (WP7 input; real observations from writing this
 // agent):
@@ -29,6 +31,67 @@
 //    exactly where a reviewer looks for them.
 // ---------------------------------------------------------------------------
 
-export * from "./definition.ts";
-export * from "./harness.ts";
-export * from "./mcp.ts";
+export {
+  ResearchDocumentId,
+  BoundedSummary,
+  DocumentQuery,
+  ResearchDocument,
+  DocumentUnavailable,
+  DocumentLibrary,
+  FetchDocument,
+  DocContentToolkit,
+  docContentToolkitLayer,
+  docsDocumentBodySecret,
+  researchCorpusDocumentIds,
+  researchDocumentLookup,
+  researchDocumentFor,
+  documentBodyPhrase,
+  SummaryBrief,
+  DocumentSummary,
+  documentSummaryFor,
+  encodedDocumentSummary,
+  DocSummarizer,
+  SummaryRequest,
+  SummaryFinding,
+  DocumentSummaryFailed,
+  documentSummaryPolicy,
+  delegateDocumentSummary,
+  mapSummaryChildFailure,
+  docsSummarizerDigestStrings,
+  docsSummaryHandlersLayer,
+  ResearchRequest,
+  ResearchDigest,
+  docsCoordinatorConfidentialMarker,
+  docsMissionConfidentialMarker,
+  DocsResearcherToolkit,
+  DocsResearcher,
+  researchMissionRequest,
+  expectedResearchDigest,
+} from "./fixtures/docs-researcher/definition.ts";
+
+export {
+  docsResearcherDeploymentId,
+  docsResearcherProducerId,
+  docsResearcherPrincipal,
+  docsCoordinatorDigests,
+  docsSummarizerDigests,
+  docsResearcherSubmitOptions,
+  docsResearcherSubmitAgent,
+  summarizeCallId,
+  fetchCallId,
+  type DocsResearcherHarnessOptions,
+  type DocsResearcherHarness,
+  makeDocsResearcherHarness,
+  redactedDocumentPreview,
+  type DocsResearcherHarnessRequirements,
+} from "./fixtures/docs-researcher/harness.ts";
+
+export {
+  docsMcpRequest,
+  docsMcpIdentity,
+  docsMcpConnectorLayer,
+  docsMcpOversizedConnectorLayer,
+  docsMcpMismatchedConnectorLayer,
+  assertDiscoveryMatchesAuthoredToolkit,
+  DocsMcpDiscoveryEvidence,
+} from "./fixtures/docs-researcher/mcp.ts";

package/src/TravelPlanner.ts

@@ -0,0 +1,244 @@
+/** Shared Travel Planner definitions, deterministic services, and durability fixtures. */
+export {
+  AirportCode,
+  QuoteId,
+  TripRequest,
+  FlightQuery,
+  LodgingQuery,
+  ActivityQuery,
+  FlightOption,
+  LodgingOption,
+  ActivitySearchResult,
+  Itinerary,
+  TravelPlan,
+  FlightUnavailable,
+  LodgingUnavailable,
+  ActivityUnavailable,
+  GuidanceFailure,
+  FlightCatalog,
+  LodgingCatalog,
+  ActivityCatalog,
+  TravelGuidance,
+  SearchFlights,
+  SearchLodging,
+  SearchActivities,
+  TravelPlannerToolkit,
+  TravelPlannerToolkitLayer,
+  TravelPlanner,
+} from "./fixtures/travel-planner/definition.ts";
+
+export {
+  CatalogLifecycleCounts,
+  CatalogLifecycle,
+  type TravelPlannerCompletionControls,
+  ReverseCompletionToolkitLayer,
+  FlightCatalogLayer,
+  LodgingCatalogLayer,
+  ActivityCatalogLayer,
+  BookingRef,
+  SupplierOperation,
+  SupplierBookingRecord,
+  SupplierUnavailable,
+  type SupplierBookRequest,
+  type SupplierHoldControls,
+  cancelBookingIdempotencyKey,
+  supplierBookingRefFor,
+  SupplierBookingDesk,
+  TravelGuidanceLayer,
+  DeterministicIdGeneratorLayer,
+  TravelPlannerRuntimeLayer,
+} from "./fixtures/travel-planner/deterministic-layers.ts";
+
+export {
+  ItineraryHoldRequest,
+  ItineraryHold,
+  ItineraryHoldUnavailable,
+  ItineraryHoldGateway,
+  HoldItinerary,
+  TravelPlannerPhase2Toolkit,
+  TravelPlannerPhase2ToolkitLayer,
+  TravelPlannerPhase2,
+} from "./fixtures/travel-planner/phase2.ts";
+
+export {
+  TravelPlannerPersistenceProfile,
+  phase3TravelPlannerProfile,
+  phase3TravelPlannerThreadId,
+  phase3TravelPlannerProducerId,
+  phase3TravelPlannerRunId,
+  phase3TravelPlannerDefinitionDigests,
+  phase3TravelPlannerInitialBatch,
+  phase3TravelPlannerCompletionBatch,
+  phase3TravelPlannerBatches,
+  phase3TravelPlannerEncodedFixture,
+  TravelPlannerProjectionError,
+  travelPlanFromProjection,
+  makePhase3TravelPlannerCheckpoint,
+} from "./fixtures/travel-planner/phase3.ts";
+
+export {
+  TravelPlannerDurabilityProfile,
+  phase4TravelPlannerProfile,
+  phase4TravelPlannerDeploymentId,
+  phase4TravelPlannerProducerId,
+  phase4TravelPlannerPrincipal,
+  phase4TravelPlannerDefinitionDigests,
+  phase4TravelPlannerSubmitOptions,
+  DurableSearchFlights,
+  DurableSearchLodging,
+  DurableSearchActivities,
+  TravelPlannerPhase4Toolkit,
+  TravelPlannerPhase4ToolkitLayer,
+  TravelPlannerPhase4,
+  makePhase4TravelPlannerAgent,
+  phase4TravelPlannerWorkerLayer,
+  TravelPlannerDurableEvidenceError,
+  travelPlanFromDurableSettlement,
+  normalizeDurableTravelPlannerEvidence,
+} from "./fixtures/travel-planner/phase4.ts";
+
+export {
+  TravelPlannerBookingProfile,
+  phase5TravelPlannerProfile,
+  phase5TravelPlannerDeploymentId,
+  phase5TravelPlannerProducerId,
+  phase5TravelPlannerPrincipal,
+  phase5TravelPlannerDefinitionDigests,
+  phase5TravelPlannerSubmitOptions,
+  TravelerRef,
+  FlightBookingRequest,
+  SupplierBookingConfirmation,
+  CancelBookingRequest,
+  CancellationConfirmation,
+  ItineraryBookingRequest,
+  ItineraryConfirmation,
+  TravelBookingReport,
+  bookFlightIdempotencyKey,
+  itineraryStepIdempotencyKey,
+  BookFlight,
+  CancelBooking,
+  BookItinerary,
+  TravelPlannerPhase5Toolkit,
+  TravelPlannerPhase5ToolkitLayer,
+  TravelSupplierReconcilerLayer,
+  TravelPlannerPhase5,
+  TravelPlannerBookingEvidenceError,
+  assertSettledBookingsExistAtSupplier,
+  phase5TravelPlannerWorkerLayer,
+} from "./fixtures/travel-planner/phase5.ts";
+
+export {
+  TravelPlannerCloudflareProfile,
+  phase6TravelPlannerProfile,
+  phase6TravelPlannerDeploymentId,
+  phase6TravelPlannerProducerPrefix,
+  phase6TravelPlannerProducerId,
+  phase6GatedPlannerDefinitionDigests,
+  type CrossPlatformEvidenceIdentity,
+  normalizeCrossPlatformTravelPlannerEvidence,
+  phase6FlightCallId,
+  phase6LodgingCallId,
+  phase6ActivityCallId,
+  phase6PlannerModel,
+  releasePhase6PlannerGate,
+  resetPhase6PlannerGate,
+  phase6GatedTrip,
+  phase6GatedPlannerModel,
+  phase6SupplierDesk,
+  phase6SupplierDeskLayer,
+  phase6SupplierReconcilerLayer,
+  phase6BookingToolCallId,
+  phase6BookingRef,
+  phase6BookingTrip,
+  phase6BookingModel,
+  phase6GuideInvocationCount,
+  phase6ResearchMission,
+  phase6ResearchDestination,
+  phase6ChildLookupCallId,
+  phase6CoordinatorModel,
+  releasePhase6ResearcherGate,
+  resetPhase6ResearcherGate,
+  phase6ResearcherModel,
+  makePhase6TravelPlannerBindings,
+  phase6TravelPlannerGoldenEvidence,
+} from "./fixtures/travel-planner/phase6.ts";
+
+export {
+  TravelPlannerPhase7Profile,
+  phase7TravelPlannerProfile,
+  PHASE7_LIVE_GATE_ENV,
+  PHASE7_LIVE_CREDENTIAL_ENV,
+  type Phase7LiveGateEnvironment,
+  phase7LiveProfileEnabled,
+} from "./fixtures/travel-planner/phase7.ts";
+
+export {
+  phase1Trip,
+  expectedTravelPlan,
+  phase1HappyPathTurns,
+} from "./fixtures/travel-planner/scenarios.ts";
+
+export {
+  DestinationQuery,
+  DestinationFacts,
+  DestinationGuideUnavailable,
+  DestinationGuide,
+  LookupDestination,
+  DestinationResearcherToolkit,
+  DestinationResearcherToolkitLayer,
+  DestinationBrief,
+  DestinationReport,
+  DestinationResearcher,
+  destinationLookup,
+  destinationReportFor,
+  encodedDestinationReport,
+  DestinationGuideLayer,
+  DestinationResearchSupportLayer,
+  DestinationResearchRequest,
+  DestinationResearchFindings,
+  DestinationResearchFailed,
+  ResearchDispatchGate,
+  destinationResearchPolicy,
+  destinationResearchDelegation,
+  mapResearchChildFailure,
+  destinationResearchHandlersLayer,
+  ResearchMission,
+  DestinationRecommendation,
+  DestinationShortlist,
+  coordinatorConfidentialMarker,
+  missionConfidentialMarker,
+  TravelCoordinatorToolkit,
+  TravelCoordinator,
+  researchMission,
+  expectedDestinationShortlist,
+  type DestinationResearchCall,
+  coordinatorResearchTurn,
+  coordinatorShortlistTurn,
+  researcherHappyPathTurns,
+  type DestinationResearcherControls,
+  makeDestinationResearcherModel,
+} from "./fixtures/travel-planner/subagents.ts";
+
+export {
+  TravelPlannerSubagentDurabilityProfile,
+  s2TravelPlannerProfile,
+  s2TravelPlannerDeploymentId,
+  s2TravelPlannerProducerId,
+  s2TravelPlannerPrincipal,
+  s2CoordinatorDigests,
+  s2ResearcherDigestStrings,
+  s2ResearcherDigests,
+  s2TravelPlannerSubmitOptions,
+  s2CoordinatorSubmitAgent,
+  durableResearchAllocation,
+  durableResearchCallId,
+  durableChildLookupCallId,
+  durableResearchFinding,
+  durableResearchShortlist,
+  encodedDestinationFacts,
+  makeInvocationCountingModel,
+  durableDestinationResearchHandlersLayer,
+  type DurableResearchHarnessOptions,
+  type DurableResearchHarness,
+  makeDurableResearchHarness,
+} from "./fixtures/travel-planner/subagents-durable.ts";

package/src/fixtures/docs-researcher/definition.ts

@@ -1,6 +1,8 @@
-import { Subagent, SubagentPolicy, SubagentRuntime } from "@effect-agent/capabilities";
-import { Agent, AgentPolicy } from "@effect-agent/core";
-import type { RuntimeBinding } from "@effect-agent/engine";
+import * as Subagent from "@effect-agent/capabilities/Subagent";
+import { SubagentPolicy, SubagentRuntime } from "@effect-agent/capabilities/Subagent";
+import * as Agent from "@effect-agent/core/Agent";
+import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
+import { type RuntimeBinding } from "@effect-agent/engine/AgentRuntime";
 import { Context, Effect, Schema } from "effect";
 import { Tool, Toolkit } from "effect/unstable/ai";
 

package/src/fixtures/docs-researcher/harness.ts

@@ -1,23 +1,16 @@
+import { connectMcp, type McpDiscovery } from "@effect-agent/capabilities/Mcp";
 import {
-  connectMcp,
   Redactor,
-  SubagentReservationsMemoryLive,
-  type McpDiscovery,
   type RedactedPreview,
   type RedactionError,
-} from "@effect-agent/capabilities";
-import { Agent, type ThreadId } from "@effect-agent/core";
-import {
-  DefinitionDigests,
-  DeploymentId,
-  Digest,
-  DurableWorkerBinding,
-  Principal,
-  ProducerId,
-  type DurableSubmitOptions,
-  type IdempotencyKey,
-  type ResolvedBinding,
-} from "@effect-agent/thread";
+} from "@effect-agent/capabilities/Redaction";
+import { SubagentReservationsMemoryLive } from "@effect-agent/capabilities/SubagentReservations";
+import * as Agent from "@effect-agent/core/Agent";
+import { type ThreadId } from "@effect-agent/core/Identifiers";
+import { DurableWorkerBinding, type ResolvedBinding } from "@effect-agent/thread/AgentRegistration";
+import { type DurableSubmitOptions } from "@effect-agent/thread/DurableAgentRuntime";
+import { DefinitionDigests, DeploymentId, Digest, ProducerId } from "@effect-agent/thread/Records";
+import { Principal, type IdempotencyKey } from "@effect-agent/thread/SubmissionLedger";
 import type { Crypto } from "effect";
 import { Effect, Layer, Ref, Schema, Stream } from "effect";
 import { LanguageModel, Model, type Response } from "effect/unstable/ai";

package/src/fixtures/docs-researcher/mcp.ts

@@ -4,7 +4,7 @@ import {
   McpServerIdentity,
   McpToolkitMismatch,
   type McpConnection,
-} from "@effect-agent/capabilities";
+} from "@effect-agent/capabilities/Mcp";
 import type { JsonSchema } from "effect";
 import { Effect, JsonPointer, Layer, Schema } from "effect";
 import { Tool } from "effect/unstable/ai";

package/src/fixtures/travel-planner/definition.ts

@@ -1,4 +1,5 @@
-import { Agent, AgentPolicy } from "@effect-agent/core";
+import * as Agent from "@effect-agent/core/Agent";
+import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
 import { Context, Effect, Schema } from "effect";
 import { Tool, Toolkit } from "effect/unstable/ai";
 

package/src/fixtures/travel-planner/deterministic-layers.ts

@@ -1,5 +1,7 @@
-import { ThreadId, IdGenerator, RunId, TurnId } from "@effect-agent/core";
-import { ThreadHistory, RunContextPreparationPassthrough } from "@effect-agent/engine";
+import { ThreadId, RunId, TurnId } from "@effect-agent/core/Identifiers";
+import { IdGenerator } from "@effect-agent/core/IdGenerator";
+import { RunContextPreparationPassthrough } from "@effect-agent/engine/RunOptions";
+import { ThreadHistory } from "@effect-agent/engine/ThreadHistory";
 import { Context, Deferred, Effect, Layer, Option, Ref, Schema } from "effect";
 
 import {

package/src/fixtures/travel-planner/phase2.ts

@@ -1,4 +1,5 @@
-import { Agent, AgentPolicy } from "@effect-agent/core";
+import * as Agent from "@effect-agent/core/Agent";
+import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
 import { Context, Effect, Schema } from "effect";
 import { Tool, Toolkit } from "effect/unstable/ai";
 

package/src/fixtures/travel-planner/phase3.ts

@@ -1,16 +1,16 @@
-import { AgentId, ThreadId, RunId, SubmissionId } from "@effect-agent/core";
+import { AgentId, ThreadId, RunId, SubmissionId } from "@effect-agent/core/Identifiers";
 import {
   BatchId,
   CanonicalBatch,
-  ThreadCheckpoint,
-  ThreadProjection,
   DefinitionDigests,
   DeploymentId,
   Digest,
   ProducerId,
   RecordEnvelope,
   RecordId,
-} from "@effect-agent/thread";
+} from "@effect-agent/thread/Records";
+import { ThreadProjection } from "@effect-agent/thread/ThreadProjection";
+import { ThreadCheckpoint } from "@effect-agent/thread/ThreadStore";
 import { Effect, Schema } from "effect";
 
 import { TravelPlan, TripRequest } from "./definition.ts";