@effect-agent/testing 0.1.0-beta.85 → 0.1.0-beta.86

package/dist/{deterministic-layers-Eka0fMZq.mjs → deterministic-layers-D5owIoke.mjs}

@@ -1,11 +1,11 @@
 import { Context, Deferred, Effect, Layer, Option, Ref, Schema } from "effect";
 import { Tool, Toolkit } from "effect/unstable/ai";
-import * as Agent from "@effect-agent/core/Agent";
-import { AgentPolicy } from "@effect-agent/core/AgentPolicy";
-import { RunId, ThreadId, 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 * as Agent from "effect-agent/agent";
+import { AgentPolicy } from "effect-agent/agent-policy";
+import { IdGenerator } from "effect-agent/id-generator";
+import { RunId, ThreadId, TurnId } from "effect-agent/identifiers";
+import { RunContextPreparationPassthrough } from "effect-agent/run-options";
+import { ThreadHistory } from "effect-agent/thread-history";
 //#region src/fixtures/travel-planner/definition.ts
 const AirportCode = Schema.NonEmptyString.pipe(Schema.brand("@effect-agent/testing/travel-planner/AirportCode"));
 const QuoteId = Schema.NonEmptyString.pipe(Schema.brand("@effect-agent/testing/travel-planner/QuoteId"));
@@ -351,8 +351,8 @@ const DeterministicIdGeneratorLayer = Layer.effect(IdGenerator, Effect.gen(funct
 		nextTurnId: Ref.updateAndGet(turn, (n) => n + 1).pipe(Effect.map((n) => Schema.decodeSync(TurnId)(`turn-${n}`)))
 	});
 }));
-const TravelPlannerRuntimeLayer = Layer.mergeAll(RunContextPreparationPassthrough, ThreadHistory.layerTransient, TravelPlannerToolkitLayer, FlightCatalogLayer, LodgingCatalogLayer, ActivityCatalogLayer, TravelGuidanceLayer, DeterministicIdGeneratorLayer).pipe(Layer.provide(CatalogLifecycle.layerNoDeps));
+const TravelPlannerRuntimeLayer = Layer.mergeAll(RunContextPreparationPassthrough, ThreadHistory.layer, TravelPlannerToolkitLayer, FlightCatalogLayer, LodgingCatalogLayer, ActivityCatalogLayer, TravelGuidanceLayer, DeterministicIdGeneratorLayer).pipe(Layer.provide(CatalogLifecycle.layerNoDeps));
 //#endregion
 export { LodgingQuery as A, TravelPlannerToolkitLayer as B, FlightOption as C, Itinerary as D, GuidanceFailure as E, SearchLodging as F, TravelGuidance as I, TravelPlan as L, QuoteId as M, SearchActivities as N, LodgingCatalog as O, SearchFlights as P, TravelPlanner as R, FlightCatalog as S, FlightUnavailable as T, TripRequest as V, ActivityCatalog as _, DeterministicIdGeneratorLayer as a, ActivityUnavailable as b, ReverseCompletionToolkitLayer as c, SupplierOperation as d, SupplierUnavailable as f, supplierBookingRefFor as g, cancelBookingIdempotencyKey as h, CatalogLifecycleCounts as i, LodgingUnavailable as j, LodgingOption as k, SupplierBookingDesk as l, TravelPlannerRuntimeLayer as m, BookingRef as n, FlightCatalogLayer as o, TravelGuidanceLayer as p, CatalogLifecycle as r, LodgingCatalogLayer as s, ActivityCatalogLayer as t, SupplierBookingRecord as u, ActivityQuery as v, FlightQuery as w, AirportCode as x, ActivitySearchResult as y, TravelPlannerToolkit as z };
 
-//# sourceMappingURL=deterministic-layers-Eka0fMZq.mjs.map
+//# sourceMappingURL=deterministic-layers-D5owIoke.mjs.map

package/dist/deterministic-layers-D5owIoke.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"deterministic-layers-D5owIoke.mjs","names":[],"sources":["../src/fixtures/travel-planner/definition.ts","../src/fixtures/travel-planner/deterministic-layers.ts"],"sourcesContent":["import { Context, Effect, Schema } from \"effect\";\nimport * as Agent from \"effect-agent/agent\";\nimport { AgentPolicy } from \"effect-agent/agent-policy\";\nimport { Tool, Toolkit } from \"effect/unstable/ai\";\n\nexport const AirportCode = Schema.NonEmptyString.pipe(\n  Schema.brand(\"@effect-agent/testing/travel-planner/AirportCode\"),\n);\n\nexport type AirportCode = typeof AirportCode.Type;\n\nexport const QuoteId = Schema.NonEmptyString.pipe(\n  Schema.brand(\"@effect-agent/testing/travel-planner/QuoteId\"),\n);\n\nexport type QuoteId = typeof QuoteId.Type;\n\nexport class TripRequest extends Schema.Class<TripRequest>(\"TripRequest\")({\n  request: Schema.NonEmptyString,\n  origin: AirportCode,\n  destination: AirportCode,\n  departOn: Schema.String,\n  nights: Schema.Int.check(Schema.isGreaterThan(0)),\n  travelers: Schema.Int.check(Schema.isGreaterThan(0)),\n  budgetCents: Schema.Int.check(Schema.isGreaterThan(0)),\n  currency: Schema.Literal(\"USD\"),\n}) {}\n\nexport class FlightQuery extends Schema.Class<FlightQuery>(\"FlightQuery\")({\n  origin: AirportCode,\n  destination: AirportCode,\n  departOn: Schema.String,\n  travelers: Schema.Int.check(Schema.isGreaterThan(0)),\n}) {}\n\nexport class LodgingQuery extends Schema.Class<LodgingQuery>(\"LodgingQuery\")({\n  destination: AirportCode,\n  departOn: Schema.String,\n  nights: Schema.Int.check(Schema.isGreaterThan(0)),\n  travelers: Schema.Int.check(Schema.isGreaterThan(0)),\n}) {}\n\nexport class ActivityQuery extends Schema.Class<ActivityQuery>(\"ActivityQuery\")({\n  destination: AirportCode,\n  departOn: Schema.String,\n  nights: Schema.Int.check(Schema.isGreaterThan(0)),\n  travelers: Schema.Int.check(Schema.isGreaterThan(0)),\n}) {}\n\nexport class FlightOption extends Schema.Class<FlightOption>(\"FlightOption\")({\n  quoteId: QuoteId,\n  flight: Schema.String,\n  estimatedCents: Schema.Int.check(Schema.isGreaterThan(0)),\n  currency: Schema.Literal(\"USD\"),\n}) {}\n\nexport class LodgingOption extends Schema.Class<LodgingOption>(\"LodgingOption\")({\n  lodging: Schema.String,\n  estimatedCents: Schema.Int.check(Schema.isGreaterThan(0)),\n  currency: Schema.Literal(\"USD\"),\n}) {}\n\n/** A successful empty activity search is distinct from supplier unavailability. */\nexport class ActivitySearchResult extends Schema.Class<ActivitySearchResult>(\n  \"ActivitySearchResult\",\n)({\n  activities: Schema.Array(Schema.String),\n}) {}\n\nexport class Itinerary extends Schema.Class<Itinerary>(\"Itinerary\")({\n  title: Schema.String,\n  route: Schema.String,\n  dates: Schema.String,\n  flight: Schema.String,\n  lodging: Schema.String,\n  activities: Schema.Array(Schema.String),\n  estimatedTotalCents: Schema.Int.check(Schema.isGreaterThan(0)),\n  currency: Schema.Literal(\"USD\"),\n  quoteId: QuoteId,\n  assumptions: Schema.Array(Schema.String),\n  unresolvedConstraints: Schema.Array(Schema.String),\n  nextAction: Schema.Literal(\"review\"),\n}) {}\n\nexport class TravelPlan extends Schema.Class<TravelPlan>(\"TravelPlan\")({\n  itineraries: Schema.Array(Itinerary),\n}) {}\n\nconst unavailableFields = { query: Schema.String, message: Schema.String };\n\nexport class FlightUnavailable extends Schema.TaggedError<FlightUnavailable>()(\n  \"FlightUnavailable\",\n  unavailableFields,\n) {}\n\nexport class LodgingUnavailable extends Schema.TaggedError<LodgingUnavailable>()(\n  \"LodgingUnavailable\",\n  unavailableFields,\n) {}\n\nexport class ActivityUnavailable extends Schema.TaggedError<ActivityUnavailable>()(\n  \"ActivityUnavailable\",\n  unavailableFields,\n) {}\n\nexport class GuidanceFailure extends Schema.TaggedError<GuidanceFailure>()(\"GuidanceFailure\", {\n  message: Schema.String,\n}) {}\n\nexport class FlightCatalog extends Context.Service<\n  FlightCatalog,\n  { readonly search: (query: FlightQuery) => Effect.Effect<FlightOption, FlightUnavailable> }\n>()(\"@effect-agent/testing/travel-planner/FlightCatalog\") {}\n\nexport class LodgingCatalog extends Context.Service<\n  LodgingCatalog,\n  { readonly search: (query: LodgingQuery) => Effect.Effect<LodgingOption, LodgingUnavailable> }\n>()(\"@effect-agent/testing/travel-planner/LodgingCatalog\") {}\n\nexport class ActivityCatalog extends Context.Service<\n  ActivityCatalog,\n  {\n    readonly search: (\n      query: ActivityQuery,\n    ) => Effect.Effect<ActivitySearchResult, ActivityUnavailable>;\n  }\n>()(\"@effect-agent/testing/travel-planner/ActivityCatalog\") {}\n\nexport class TravelGuidance extends Context.Service<\n  TravelGuidance,\n  { readonly instructions: (input: TripRequest) => Effect.Effect<string, GuidanceFailure> }\n>()(\"@effect-agent/testing/travel-planner/TravelGuidance\") {}\n\nexport const SearchFlights = Tool.make(\"search_flights\", {\n  parameters: FlightQuery,\n  success: FlightOption,\n  failure: FlightUnavailable,\n  failureMode: \"error\",\n  dependencies: [FlightCatalog],\n});\n\nexport const SearchLodging = Tool.make(\"search_lodging\", {\n  parameters: LodgingQuery,\n  success: LodgingOption,\n  failure: LodgingUnavailable,\n  failureMode: \"error\",\n  dependencies: [LodgingCatalog],\n});\n\nexport const SearchActivities = Tool.make(\"search_activities\", {\n  parameters: ActivityQuery,\n  success: ActivitySearchResult,\n  failure: ActivityUnavailable,\n  failureMode: \"error\",\n  dependencies: [ActivityCatalog],\n});\n\nexport const TravelPlannerToolkit = Toolkit.make(SearchFlights, SearchLodging, SearchActivities);\n\nexport const TravelPlannerToolkitLayer = TravelPlannerToolkit.toLayer({\n  search_flights: (query) => Effect.flatMap(FlightCatalog, (catalog) => catalog.search(query)),\n  search_lodging: (query) => Effect.flatMap(LodgingCatalog, (catalog) => catalog.search(query)),\n  search_activities: (query) => Effect.flatMap(ActivityCatalog, (catalog) => catalog.search(query)),\n});\n\nexport const TravelPlanner = Agent.make(\"travel-planner\", {\n  input: TripRequest,\n  output: TravelPlan,\n  instructions: (input) =>\n    Effect.flatMap(TravelGuidance, (guidance) => guidance.instructions(input)),\n  toolkit: TravelPlannerToolkit,\n  policy: AgentPolicy.make({\n    maxTurns: 2,\n    maxToolCalls: 3,\n    maxDuration: \"30 seconds\",\n    toolConcurrency: 3,\n  }),\n  description: \"Build one review-only itinerary from bounded parallel deterministic searches.\",\n  metadata: { deploymentClass: \"E\", phase: \"P1\" },\n});\n","import { Context, Deferred, Effect, Layer, Option, Ref, Schema } from \"effect\";\nimport { IdGenerator } from \"effect-agent/id-generator\";\nimport { ThreadId, RunId, TurnId } from \"effect-agent/identifiers\";\nimport { RunContextPreparationPassthrough } from \"effect-agent/run-options\";\nimport { ThreadHistory } from \"effect-agent/thread-history\";\n\nimport {\n  ActivityCatalog,\n  ActivitySearchResult,\n  ActivityUnavailable,\n  FlightCatalog,\n  FlightOption,\n  FlightUnavailable,\n  LodgingCatalog,\n  LodgingOption,\n  LodgingUnavailable,\n  QuoteId,\n  TravelGuidance,\n  TravelPlannerToolkit,\n  TravelPlannerToolkitLayer,\n} from \"./definition.ts\";\n\nexport class CatalogLifecycleCounts extends Schema.Class<CatalogLifecycleCounts>(\n  \"CatalogLifecycleCounts\",\n)({\n  acquired: Schema.Natural,\n  finalized: Schema.Natural,\n}) {}\n\nexport class CatalogLifecycle extends Context.Service<\n  CatalogLifecycle,\n  {\n    readonly markAcquired: Effect.Effect<void>;\n    readonly markFinalized: Effect.Effect<void>;\n    readonly counts: Effect.Effect<CatalogLifecycleCounts>;\n  }\n>()(\"@effect-agent/testing/travel-planner/CatalogLifecycle\") {\n  static readonly layerNoDeps = Layer.effect(\n    this,\n    Effect.gen(function* () {\n      const acquired = yield* Ref.make(0);\n      const finalized = yield* Ref.make(0);\n\n      return CatalogLifecycle.of({\n        markAcquired: Ref.update(acquired, (n) => n + 1),\n        markFinalized: Ref.update(finalized, (n) => n + 1),\n        counts: Effect.all({ acquired: Ref.get(acquired), finalized: Ref.get(finalized) }).pipe(\n          Effect.map((counts) => CatalogLifecycleCounts.make(counts)),\n        ),\n      });\n    }),\n  );\n}\n\nconst flight = FlightOption.make({\n  quoteId: Schema.decodeSync(QuoteId)(\"quote-sfo-lhr-001\"),\n  flight: \"EA 218 · nonstop · SFO 18:40 → LHR 13:05+1\",\n  estimatedCents: 180_000,\n  currency: \"USD\",\n});\n\nconst lodging = LodgingOption.make({\n  lodging: \"Bloomsbury House · refundable studio · 4 nights\",\n  estimatedCents: 104_000,\n  currency: \"USD\",\n});\n\nconst activities = ActivitySearchResult.make({\n  activities: [\"British Museum timed entry\", \"Thames evening walk\"],\n});\n\n/**\n * Deterministic controls for a Tool batch whose completions are released in a\n * caller-selected order. This is intentionally a test fixture: it uses no\n * clock or sleep and lets engine scheduler tests prove parallel starts and\n * declaration-order prompt materialization.\n */\nexport interface TravelPlannerCompletionControls {\n  readonly flightStarted: Effect.Effect<void>;\n  readonly lodgingStarted: Effect.Effect<void>;\n  readonly activityStarted: Effect.Effect<void>;\n  readonly releaseFlight: Effect.Effect<void>;\n  readonly releaseLodging: Effect.Effect<void>;\n  readonly releaseActivity: Effect.Effect<void>;\n}\n\nexport const ReverseCompletionToolkitLayer = Effect.gen(function* () {\n  const flightStarted = yield* Deferred.make<void>();\n  const lodgingStarted = yield* Deferred.make<void>();\n  const activityStarted = yield* Deferred.make<void>();\n  const releaseFlight = yield* Deferred.make<void>();\n  const releaseLodging = yield* Deferred.make<void>();\n  const releaseActivity = yield* Deferred.make<void>();\n\n  const awaitRelease = <A>(\n    started: Deferred.Deferred<void>,\n    release: Deferred.Deferred<void>,\n    value: A,\n  ) =>\n    Deferred.succeed(started, undefined).pipe(\n      Effect.andThen(Deferred.await(release)),\n      Effect.as(value),\n    );\n\n  return {\n    controls: {\n      flightStarted: Deferred.await(flightStarted),\n      lodgingStarted: Deferred.await(lodgingStarted),\n      activityStarted: Deferred.await(activityStarted),\n      releaseFlight: Deferred.succeed(releaseFlight, undefined).pipe(Effect.asVoid),\n      releaseLodging: Deferred.succeed(releaseLodging, undefined).pipe(Effect.asVoid),\n      releaseActivity: Deferred.succeed(releaseActivity, undefined).pipe(Effect.asVoid),\n    },\n    layer: TravelPlannerToolkit.toLayer({\n      search_flights: () => awaitRelease(flightStarted, releaseFlight, flight),\n      search_lodging: () => awaitRelease(lodgingStarted, releaseLodging, lodging),\n      search_activities: () => awaitRelease(activityStarted, releaseActivity, activities),\n    }),\n  };\n});\n\nexport const FlightCatalogLayer = Layer.effect(\n  FlightCatalog,\n  Effect.gen(function* () {\n    const lifecycle = yield* CatalogLifecycle;\n\n    yield* Effect.acquireRelease(lifecycle.markAcquired, () => lifecycle.markFinalized);\n\n    return FlightCatalog.of({\n      search: (query) =>\n        query.origin === query.destination\n          ? Effect.fail(\n              FlightUnavailable.make({\n                query: `${query.origin}-${query.destination}`,\n                message: \"Origin and destination must differ.\",\n              }),\n            )\n          : Effect.succeed(flight),\n    });\n  }),\n);\n\nexport const LodgingCatalogLayer = Layer.effect(\n  LodgingCatalog,\n  Effect.gen(function* () {\n    const lifecycle = yield* CatalogLifecycle;\n\n    yield* Effect.acquireRelease(lifecycle.markAcquired, () => lifecycle.markFinalized);\n\n    return LodgingCatalog.of({\n      search: (query) =>\n        query.nights < 1\n          ? Effect.fail(\n              LodgingUnavailable.make({\n                query: query.destination,\n                message: \"At least one night is required.\",\n              }),\n            )\n          : Effect.succeed(lodging),\n    });\n  }),\n);\n\nexport const ActivityCatalogLayer = Layer.effect(\n  ActivityCatalog,\n  Effect.gen(function* () {\n    const lifecycle = yield* CatalogLifecycle;\n\n    yield* Effect.acquireRelease(lifecycle.markAcquired, () => lifecycle.markFinalized);\n\n    return ActivityCatalog.of({\n      search: (query) =>\n        query.destination === \"\"\n          ? Effect.fail(\n              ActivityUnavailable.make({\n                query: query.destination,\n                message: \"Destination is required.\",\n              }),\n            )\n          : Effect.succeed(activities),\n    });\n  }),\n);\n\n/** Stable supplier-side booking identity, minted deterministically from the idempotency key. */\nexport const BookingRef = Schema.NonEmptyString.pipe(\n  Schema.brand(\"@effect-agent/testing/travel-planner/BookingRef\"),\n);\n\nexport type BookingRef = typeof BookingRef.Type;\n\n/** The supplier desk operations the P5 booking Tools and Steps invoke. */\nexport const SupplierOperation = Schema.Literals([\n  \"book-flight\",\n  \"cancel-booking\",\n  \"reserve-flight\",\n  \"reserve-lodging\",\n  \"issue-confirmation\",\n]);\n\nexport type SupplierOperation = typeof SupplierOperation.Type;\n\n/**\n * One row of external supplier truth. The desk deduplicates by `idempotencyKey` — replaying a\n * call with the same key returns this exact record without creating a second booking — which is\n * precisely the honesty model of DUR-010: the framework never makes an external call\n * exactly-once; the supplier's idempotency key does.\n */\nexport class SupplierBookingRecord extends Schema.Class<SupplierBookingRecord>(\n  \"@effect-agent/testing/travel-planner/SupplierBookingRecord\",\n)({\n  bookingRef: BookingRef,\n  idempotencyKey: Schema.NonEmptyString,\n  operation: SupplierOperation,\n  detail: Schema.NonEmptyString,\n  status: Schema.Literals([\"confirmed\", \"cancelled\"]),\n}) {}\n\nexport class SupplierUnavailable extends Schema.TaggedError<SupplierUnavailable>()(\n  \"SupplierUnavailable\",\n  { message: Schema.String },\n) {}\n\nexport interface SupplierBookRequest {\n  readonly operation: SupplierOperation;\n  readonly idempotencyKey: string;\n  readonly detail: string;\n}\n\n/** Controls returned by an armed crash window (`holdAfterWrite`). */\nexport interface SupplierHoldControls {\n  /** Resolves once the armed call has performed its supplier write and is blocked. */\n  readonly held: Effect.Effect<void>;\n  /** Releases the blocked call (tests that interrupt the Attempt never call this). */\n  readonly release: Effect.Effect<void>;\n}\n\n/** The desk-internal idempotency key of one cancellation: cancel is idempotent by bookingRef. */\nexport const cancelBookingIdempotencyKey = (bookingRef: string): string =>\n  `cancel-booking:${bookingRef}`;\n\n/** The deterministic bookingRef the desk mints for one idempotency key. */\nexport const supplierBookingRefFor = (idempotencyKey: string): BookingRef =>\n  Schema.decodeSync(BookingRef)(`ref:${idempotencyKey}`);\n\ninterface SupplierHoldWindow {\n  readonly held: Deferred.Deferred<void>;\n  readonly release: Deferred.Deferred<void>;\n}\n\ninterface SupplierDeskState {\n  readonly bookings: ReadonlyMap<string, SupplierBookingRecord>;\n  readonly counts: ReadonlyMap<string, number>;\n  readonly holds: ReadonlyMap<string, SupplierHoldWindow>;\n}\n\n/**\n * The deterministic in-memory supplier: an idempotency-keyed booking store with per-key call\n * counters and injectable crash windows.\n *\n * - `book`/`cancel` always count the call (at-least-once execution stays observable), then\n *   dedupe the external effect by idempotency key — the supplier-side contract the P5 Tools and\n *   Steps rely on.\n * - `holdAfterWrite` arms a one-shot crash window: the next call with that key performs its\n *   supplier write, signals `held`, and never returns. Interrupting the Attempt at that point\n *   models \"the external effect happened but no outcome was recorded\" without any wall clock.\n * - `bookings`/`lookup` expose external truth for the reconciler and for never-fabricate\n *   assertions.\n */\nexport class SupplierBookingDesk extends Context.Service<\n  SupplierBookingDesk,\n  {\n    readonly book: (\n      request: SupplierBookRequest,\n    ) => Effect.Effect<SupplierBookingRecord, SupplierUnavailable>;\n    readonly cancel: (\n      bookingRef: BookingRef,\n    ) => Effect.Effect<SupplierBookingRecord, SupplierUnavailable>;\n    readonly lookup: (\n      idempotencyKey: string,\n    ) => Effect.Effect<Option.Option<SupplierBookingRecord>>;\n    readonly bookings: Effect.Effect<ReadonlyArray<SupplierBookingRecord>>;\n    readonly callCount: (idempotencyKey: string) => Effect.Effect<number>;\n    readonly holdAfterWrite: (idempotencyKey: string) => Effect.Effect<SupplierHoldControls>;\n  }\n>()(\"@effect-agent/testing/travel-planner/SupplierBookingDesk\") {\n  static readonly layer: Layer.Layer<SupplierBookingDesk> = Layer.effect(\n    this,\n    Effect.gen(function* () {\n      const state = yield* Ref.make<SupplierDeskState>({\n        bookings: new Map(),\n        counts: new Map(),\n        holds: new Map(),\n      });\n\n      const enterHold = (hold: Option.Option<SupplierHoldWindow>) =>\n        Option.isSome(hold)\n          ? Deferred.succeed(hold.value.held, undefined).pipe(\n              Effect.andThen(Deferred.await(hold.value.release)),\n            )\n          : Effect.void;\n\n      const book = (request: SupplierBookRequest) =>\n        Ref.modify(state, (current) => {\n          const counts = new Map(current.counts).set(\n            request.idempotencyKey,\n            (current.counts.get(request.idempotencyKey) ?? 0) + 1,\n          );\n\n          const existing = current.bookings.get(request.idempotencyKey);\n\n          const record =\n            existing ??\n            SupplierBookingRecord.make({\n              bookingRef: supplierBookingRefFor(request.idempotencyKey),\n              idempotencyKey: request.idempotencyKey,\n              operation: request.operation,\n              detail: request.detail,\n              status: \"confirmed\",\n            });\n\n          const bookings =\n            existing === undefined\n              ? new Map(current.bookings).set(request.idempotencyKey, record)\n              : current.bookings;\n\n          const hold = Option.fromNullishOr(current.holds.get(request.idempotencyKey));\n\n          const holds = Option.isSome(hold)\n            ? (() => {\n                const next = new Map(current.holds);\n\n                next.delete(request.idempotencyKey);\n\n                return next;\n              })()\n            : current.holds;\n\n          return [\n            { record, hold },\n            { bookings, counts, holds },\n          ] as const;\n        }).pipe(Effect.flatMap(({ hold, record }) => enterHold(hold).pipe(Effect.as(record))));\n\n      const cancel = (bookingRef: BookingRef) =>\n        Ref.modify(state, (current) => {\n          const key = cancelBookingIdempotencyKey(bookingRef);\n          const counts = new Map(current.counts).set(key, (current.counts.get(key) ?? 0) + 1);\n\n          const existingEntry = [...current.bookings.entries()].find(\n            ([, record]) => record.bookingRef === bookingRef,\n          );\n\n          if (existingEntry === undefined) {\n            return [\n              { record: Option.none<SupplierBookingRecord>(), hold: Option.none() },\n              { ...current, counts },\n            ] as const;\n          }\n          const [storeKey, existing] = existingEntry;\n\n          const cancelled =\n            existing.status === \"cancelled\"\n              ? existing\n              : SupplierBookingRecord.make({ ...existing, status: \"cancelled\" });\n\n          const bookings = new Map(current.bookings).set(storeKey, cancelled);\n          const hold = Option.fromNullishOr(current.holds.get(key));\n\n          const holds = Option.isSome(hold)\n            ? (() => {\n                const next = new Map(current.holds);\n\n                next.delete(key);\n\n                return next;\n              })()\n            : current.holds;\n\n          return [\n            { record: Option.some(cancelled), hold },\n            { bookings, counts, holds },\n          ] as const;\n        }).pipe(\n          Effect.flatMap(({ hold, record }) =>\n            Option.isNone(record)\n              ? Effect.fail(\n                  SupplierUnavailable.make({\n                    message: `The supplier desk has no booking under ${bookingRef}.`,\n                  }),\n                )\n              : enterHold(hold).pipe(Effect.as(record.value)),\n          ),\n        );\n\n      return SupplierBookingDesk.of({\n        book,\n        cancel,\n        lookup: (idempotencyKey) =>\n          Ref.get(state).pipe(\n            Effect.map((current) => Option.fromNullishOr(current.bookings.get(idempotencyKey))),\n          ),\n        bookings: Ref.get(state).pipe(Effect.map((current) => [...current.bookings.values()])),\n        callCount: (idempotencyKey) =>\n          Ref.get(state).pipe(Effect.map((current) => current.counts.get(idempotencyKey) ?? 0)),\n        holdAfterWrite: (idempotencyKey) =>\n          Effect.gen(function* () {\n            const held = yield* Deferred.make<void>();\n            const release = yield* Deferred.make<void>();\n\n            yield* Ref.update(state, (current) => ({\n              ...current,\n              holds: new Map(current.holds).set(idempotencyKey, { held, release }),\n            }));\n\n            return {\n              held: Deferred.await(held),\n              release: Deferred.succeed(release, undefined).pipe(Effect.asVoid),\n            };\n          }),\n      });\n    }),\n  );\n}\n\nexport const TravelGuidanceLayer = Layer.succeed(\n  TravelGuidance,\n  TravelGuidance.of({\n    instructions: (input) =>\n      Effect.succeed(\n        [\n          \"You are the Effect Agent Travel Planner P1 interpreter fixture.\",\n          `The user asked: ${input.request}`,\n          \"Call search_flights, search_lodging, and search_activities exactly once in one Tool batch.\",\n          \"Then return only a JSON object of exactly this shape, no prose:\",\n          '{\"itineraries\": [{\"title\": \"<short itinerary name>\", \"route\": \"<origin-destination>\", \"dates\": \"<date range>\", \"flight\": \"<flight description from the Tool result>\", \"lodging\": \"<lodging description from the Tool result>\", \"activities\": [\"<activity>\", \"...\"], \"estimatedTotalCents\": <positive integer total in cents>, \"currency\": \"USD\", \"quoteId\": \"<quoteId from the flight Tool result>\", \"assumptions\": [\"<assumption>\", \"...\"], \"unresolvedConstraints\": [], \"nextAction\": \"review\"}]}',\n          \"Use the Tool results verbatim; activity results may legitimately be an empty array.\",\n          \"This is read-only planning. Require review before any mutation.\",\n        ].join(\"\\n\"),\n      ),\n  }),\n);\n\nexport const DeterministicIdGeneratorLayer = Layer.effect(\n  IdGenerator,\n  Effect.gen(function* () {\n    const thread = yield* Ref.make(0);\n    const run = yield* Ref.make(0);\n    const turn = yield* Ref.make(0);\n\n    return IdGenerator.of({\n      nextThreadId: Ref.updateAndGet(thread, (n) => n + 1).pipe(\n        Effect.map((n) => Schema.decodeSync(ThreadId)(`thread-${n}`)),\n      ),\n      nextRunId: Ref.updateAndGet(run, (n) => n + 1).pipe(\n        Effect.map((n) => Schema.decodeSync(RunId)(`run-${n}`)),\n      ),\n      nextTurnId: Ref.updateAndGet(turn, (n) => n + 1).pipe(\n        Effect.map((n) => Schema.decodeSync(TurnId)(`turn-${n}`)),\n      ),\n    });\n  }),\n);\n\nexport const TravelPlannerRuntimeLayer = Layer.mergeAll(\n  RunContextPreparationPassthrough,\n  ThreadHistory.layer,\n  TravelPlannerToolkitLayer,\n  FlightCatalogLayer,\n  LodgingCatalogLayer,\n  ActivityCatalogLayer,\n  TravelGuidanceLayer,\n  DeterministicIdGeneratorLayer,\n).pipe(Layer.provide(CatalogLifecycle.layerNoDeps));\n"],"mappings":"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"}

package/package.json

@@ -1 +1 @@
-{"name":"@effect-agent/testing","version":"0.1.0-beta.85","dependencies":{"@effect-agent/capabilities":"0.1.0-beta.85","@effect-agent/core":"0.1.0-beta.85","@effect-agent/engine":"0.1.0-beta.85","@effect-agent/sandbox":"0.1.0-beta.85","@effect-agent/thread":"0.1.0-beta.85"},"devDependencies":{"@effect-agent/platform-node":"0.1.0-beta.85","@effect-agent/storage-memory":"0.1.0-beta.85","@effect-agent/storage-sqlite":"0.1.0-beta.85","@effect/platform-node":"4.0.0-rc.112","@effect/sql-sqlite-node":"4.0.0-rc.112","@effect/vitest":"4.0.0-rc.112","effect":"4.0.0-rc.112","typescript":"7.0.2","vite-plus":"0.3.0"},"peerDependencies":{"effect":"^4.0.0-rc.112"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./Certification":{"types":"./dist/Certification.d.mts","default":"./dist/Certification.mjs"},"./Chaos":{"types":"./dist/Chaos.d.mts","default":"./dist/Chaos.mjs"},"./CodeExecutorConformance":{"types":"./dist/CodeExecutorConformance.d.mts","default":"./dist/CodeExecutorConformance.mjs"},"./CodeExecutorSubstitute":{"types":"./dist/CodeExecutorSubstitute.d.mts","default":"./dist/CodeExecutorSubstitute.mjs"},"./DocsResearcher":{"types":"./dist/DocsResearcher.d.mts","default":"./dist/DocsResearcher.mjs"},"./ScriptedModel":{"types":"./dist/ScriptedModel.d.mts","default":"./dist/ScriptedModel.mjs"},"./TravelPlanner":{"types":"./dist/TravelPlanner.d.mts","default":"./dist/TravelPlanner.mjs"}},"description":"Scripted models, deterministic fixtures, and adapter conformance kits for testing Effect Agent applications.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/danieljvdm/effect-agent.git","directory":"packages/testing"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests"}}
+{"name":"@effect-agent/testing","version":"0.1.0-beta.86","dependencies":{"effect-agent":"0.1.0-beta.86"},"devDependencies":{"@effect-agent/platform-node":"0.1.0-beta.86","@effect-agent/storage-memory":"0.1.0-beta.86","@effect-agent/storage-sqlite":"0.1.0-beta.86","@effect/platform-node":"4.0.0-rc.112","@effect/sql-sqlite-node":"4.0.0-rc.112","@effect/vitest":"4.0.0-rc.112","effect":"4.0.0-rc.112","typescript":"7.0.2","vite-plus":"0.3.0"},"peerDependencies":{"effect":"^4.0.0-rc.112"},"exports":{".":{"types":"./dist/index.d.mts","default":"./dist/index.mjs"},"./certification":{"types":"./dist/Certification.d.mts","default":"./dist/Certification.mjs"},"./chaos":{"types":"./dist/Chaos.d.mts","default":"./dist/Chaos.mjs"},"./code-executor-conformance":{"types":"./dist/CodeExecutorConformance.d.mts","default":"./dist/CodeExecutorConformance.mjs"},"./code-executor-substitute":{"types":"./dist/CodeExecutorSubstitute.d.mts","default":"./dist/CodeExecutorSubstitute.mjs"},"./docs-researcher":{"types":"./dist/DocsResearcher.d.mts","default":"./dist/DocsResearcher.mjs"},"./scripted-model":{"types":"./dist/ScriptedModel.d.mts","default":"./dist/ScriptedModel.mjs"},"./travel-planner":{"types":"./dist/TravelPlanner.d.mts","default":"./dist/TravelPlanner.mjs"}},"description":"Scripted models, deterministic fixtures, and adapter conformance kits for testing Effect Agent applications.","license":"MIT","repository":{"type":"git","url":"git+https://github.com/danieljvdm/effect-agent.git","directory":"packages/testing"},"files":["dist","src"],"type":"module","sideEffects":[],"publishConfig":{"access":"public"},"scripts":{"build":"vp pack","check":"tsc --noEmit -p tsconfig.json","test":"vp test --passWithNoTests"}}

package/src/Certification.ts

@@ -1,39 +1,53 @@
-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 type { Crypto } from "effect";
 import {
-  ThreadId,
-  RunId,
-  ToolCallId,
-  TurnId,
-  type AgentId,
-  type SubmissionId,
-} 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";
+  Cause,
+  Clock,
+  DateTime,
+  Duration,
+  Effect,
+  Exit,
+  Layer,
+  Option,
+  Ref,
+  Schema,
+  Stream,
+} from "effect";
+import * as Agent from "effect-agent/agent";
+import { AgentPolicy } from "effect-agent/agent-policy";
+import { DurableWorkerBinding, type ResolvedBinding } from "effect-agent/agent-registration";
 import {
   DurableAgentRuntime,
   DurableRuntimeConfig,
   type DurableSubmitFailure,
   type DurableSubmitOptions,
   type Receipt,
-} from "@effect-agent/thread/DurableAgentRuntime";
+} from "effect-agent/durable-agent-runtime";
 import {
   DurableRuntimeFailpointError,
   DurableRuntimeFailpointLocation,
-} from "@effect-agent/thread/DurableFailpoint";
+} from "effect-agent/durable-failpoint";
+import { DurableStep, DurableStepError } from "effect-agent/durable-step";
+import { IdGenerator } from "effect-agent/id-generator";
+import {
+  ThreadId,
+  RunId,
+  ToolCallId,
+  TurnId,
+  type AgentId,
+  type SubmissionId,
+} from "effect-agent/identifiers";
 import {
   DefinitionDigests,
   DeploymentId,
   Digest,
   ProducerId,
   type BatchId,
-} from "@effect-agent/thread/Records";
-import { childThreadIdFor } from "@effect-agent/thread/RunJournal";
+} from "effect-agent/records";
+import { childThreadIdFor } from "effect-agent/run-journal";
+import { RunToolAuthorization } from "effect-agent/run-options";
+import * as Subagent from "effect-agent/subagent";
+import { SubagentPolicy } from "effect-agent/subagent";
+import { SubagentReservationsMemoryLive } from "effect-agent/subagent-reservations";
 import {
   ApprovalDecisionCommand,
   IdempotencyKey,
@@ -44,42 +58,26 @@ import {
   UnknownResolutionCommand,
   DEFAULT_OWNERSHIP_LEASE_DURATION,
   type SubmissionSnapshot,
-} from "@effect-agent/thread/SubmissionLedger";
+} from "effect-agent/submission-ledger";
 import {
   type CertificationCaseResult,
-  CertificationReport,
+  type CertificationReport,
   CertificationSweepResult,
   CertificationTierThreeReport,
   CertifiedAdapterIdentity,
   certifyPorts,
   type CertificationScenario,
-} 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,
-  Clock,
-  DateTime,
-  Duration,
-  Effect,
-  Exit,
-  Layer,
-  Option,
-  Ref,
-  Schema,
-  Stream,
-} from "effect";
+} from "effect-agent/testing/certification";
+import { DurableRuntimeFailpointTestControl } from "effect-agent/testing/durable-failpoint-test-control";
+import { verifyThreadInvariants } from "effect-agent/thread-invariants";
+import { ThreadExportRequest, ThreadStore, LoadCheckpointRequest } from "effect-agent/thread-store";
+import { ToolReconciler } from "effect-agent/tool-reconciler";
+import { WakeScheduler } from "effect-agent/wake-scheduler";
 import { TestClock } from "effect/testing";
 import { LanguageModel, Model, Tool, Toolkit, type Response } from "effect/unstable/ai";
 
+import { makeCertificationReport } from "./internal/certification-report.ts";
+
 /**
  * P7 WP2 — `certifyDurableAdapters` (plan §1): the one certification entry point a durable
  * adapter pair runs to earn a Schema-encoded certificate.
@@ -88,12 +86,13 @@ import { LanguageModel, Model, Tool, Toolkit, type Response } from "effect/unsta
  *   `certifyPorts` (TEST-004/STORE-010).
  * - **Tier 2 — coordinator protocol + failpoint convergence**: the durable coordinator is
  *   assembled over the CANDIDATE Layer pair with a scripted deterministic model; every
- *   `DurableRuntimeFailpointLocation` is armed one-shot across the six scenario shapes
- *   (plain / uncertain-tool / durable-steps / approval / join / delegation). After the injected
- *   fault the runner asserts the state stays CLASSIFIABLE (recovery + the public unblocking
- *   operations `resolveUnknown`/`resolveApproval` are the only levers used) and that the
- *   re-drive CONVERGES to `verifyThreadInvariants` with `requireAllSettled` — including a
- *   fully discharged digest-chain check, because the runner captures per-batch producer
+ *   reached `DurableRuntimeFailpointLocation` is armed one-shot across the six scenario shapes
+ *   (plain / uncertain-tool / durable-steps / approval / join / delegation). Unreached locations
+ *   share a verified clean run per shape; new unaccounted-for locations get a full sweep.
+ *   After the injected fault the runner asserts the state stays CLASSIFIABLE (recovery +
+ *   the public unblocking operations `resolveUnknown`/`resolveApproval` are the only levers
+ *   used) and that the re-drive CONVERGES to `verifyThreadInvariants` with `requireAllSettled`,
+ *   including a fully discharged digest-chain check, because the runner captures per-batch producer
  *   identity at append time.
  * - **Tier 3 — real loss lever**: recorded honestly. A durable adapter either supplies a
  *   `CertificationCrashLever` executed in this run, cites its committed real-loss evidence
@@ -188,7 +187,7 @@ export const TIER2_UNREACHED_LOCATIONS: ReadonlyArray<DurableRuntimeFailpointLoc
   "subagent:after-child-abort-intent",
   // Background workers use retained delivery, source capacity, and child-origin paths absent
   // from these six attached/ordinary scenarios. The before/after creation and completion
-  // boundaries are exercised by packages/thread/test/worker-host.test.ts.
+  // boundaries are exercised by packages/effect-agent/test/durable/worker-host.test.ts.
   "worker:before-source-append",
   "worker:after-source-append",
   "worker:before-origin-append",
@@ -205,7 +204,7 @@ export const TIER2_UNREACHED_LOCATIONS: ReadonlyArray<DurableRuntimeFailpointLoc
   "worker:before-report-delivery",
   "worker:after-report-delivery",
   // None of the six shapes emits Agent updates. All four boundaries are exercised separately
-  // by packages/thread/test/worker-host.test.ts ("repairs an accepted parent update after ...").
+  // by packages/effect-agent/test/durable/worker-host.test.ts ("repairs an accepted parent update after ...").
   // Node restart/lost-ack coverage is in packages/platform-node/test/worker-updates.test.ts;
   // Cloudflare eviction/alarm recovery is in packages/platform-cloudflare/test/background-workers.test.ts.
   // These suites are not executed by this certification runner; its update rows remain not-triggered.
@@ -660,7 +659,7 @@ const makeCell = Effect.fn("Certification.makeCell")(function* (
         ),
       );
 
-      const delegationLayer = SubagentRuntime.layer(researchDelegation, childBinding, {
+      const delegationLayer = Subagent.layer(researchDelegation, childBinding, {
         mapChildFailure,
         durable: { targetDigests: CHILD_DIGEST_STRINGS },
       }).pipe(Layer.provide(delegationSupport));
@@ -778,26 +777,29 @@ const failureTagOf = <E>(cause: Cause.Cause<E>): string => {
   return "defect";
 };
 
-/** One Tier-2 sweep cell: arm `location` one-shot, drive `scenario`, converge, verify. */
+type SweepOutcome = Pick<
+  CertificationSweepResult,
+  "failpointFired" | "status" | "digestChainVerified" | "detail"
+>;
+
+/** Discover a clean path, or arm one location; both drives converge and verify real storage. */
 const runSweepCell = Effect.fn("Certification.runSweepCell")(function* (
   scenario: CertificationScenario,
-  location: DurableRuntimeFailpointLocation,
+  location: DurableRuntimeFailpointLocation | undefined,
   batchProducers: ReadonlyMap<BatchId, ProducerId>,
   leaseAdvance: Duration.Duration,
+  reached: Set<DurableRuntimeFailpointLocation>,
 ) {
   const ledger = yield* SubmissionLedger;
   const control = yield* DurableRuntimeFailpointTestControl;
-  const slug = `${scenario}-${location.replaceAll(":", "-")}`;
-
-  const failed = (detail: string, fired: boolean): CertificationSweepResult =>
-    CertificationSweepResult.make({
-      scenario,
-      location,
-      failpointFired: fired,
-      status: "failed",
-      digestChainVerified: false,
-      detail: detail.slice(0, 4_096),
-    });
+  const slug = `${scenario}-${location?.replaceAll(":", "-") ?? "discovery"}`;
+
+  const failed = (detail: string, fired: boolean): SweepOutcome => ({
+    failpointFired: fired,
+    status: "failed",
+    digestChainVerified: false,
+    detail: detail.slice(0, 4_096),
+  });
 
   const cell = yield* makeCell(scenario, slug);
 
@@ -816,15 +818,19 @@ const runSweepCell = Effect.fn("Certification.runSweepCell")(function* (
   const fired = yield* Ref.make(false);
 
   yield* control.setHandler((hit) =>
-    hit !== location
-      ? Effect.void
-      : Ref.getAndSet(fired, true).pipe(
-          Effect.flatMap((already) =>
-            already
-              ? Effect.void
-              : Effect.fail(DurableRuntimeFailpointError.make({ location: hit })),
-          ),
-        ),
+    Effect.suspend(() => {
+      reached.add(hit);
+
+      return hit !== location
+        ? Effect.void
+        : Ref.getAndSet(fired, true).pipe(
+            Effect.flatMap((already) =>
+              already
+                ? Effect.void
+                : Effect.fail(DurableRuntimeFailpointError.make({ location: hit })),
+            ),
+          );
+    }),
   );
 
   // Submissions are idempotent (DUR-001): one replay recovers a submit-boundary fault.
@@ -954,13 +960,11 @@ const runSweepCell = Effect.fn("Certification.runSweepCell")(function* (
     );
   }
 
-  return CertificationSweepResult.make({
-    scenario,
-    location,
+  return {
     failpointFired: wasFired,
     status: wasFired ? "converged" : "not-triggered",
     digestChainVerified,
-  });
+  } satisfies SweepOutcome;
 });
 
 // ---------------------------------------------------------------------------
@@ -1079,12 +1083,73 @@ export const certifyDurableAdapters = <LedgerE = never, StoreE = never>(
   const program = Effect.gen(function* () {
     const ledger = yield* SubmissionLedger;
 
-    // Tier 2 — coordinator failpoint convergence sweep.
+    // Tier 2 — discover each deterministic shape without a fault. Unreached locations
+    // would all repeat this same clean drive, including its full digest verification.
     const tier2: Array<CertificationSweepResult> = [];
 
+    const discoveries: Array<{
+      readonly scenario: CertificationScenario;
+      readonly outcome: SweepOutcome;
+      readonly reached: Set<DurableRuntimeFailpointLocation>;
+    }> = [];
+
     for (const scenario of CERTIFICATION_SCENARIOS) {
+      const reached = new Set<DurableRuntimeFailpointLocation>();
+
+      const outcome = yield* runSweepCell(
+        scenario,
+        undefined,
+        batchProducers,
+        leaseAdvance,
+        reached,
+      );
+
+      discoveries.push({ scenario, outcome, reached });
+    }
+    const observed = new Set(discoveries.flatMap(({ reached }) => [...reached]));
+
+    // Never silently omit a new location: if neither discovery nor the documented
+    // never-fired set accounts for it, arm it in EVERY shape. Tests pin the fired paths
+    // per shape and the never-fired set, so new or lost routes require explicit review.
+    const unaccounted = new Set(
+      DurableRuntimeFailpointLocation.literals.filter(
+        (location) => !observed.has(location) && !TIER2_UNREACHED_LOCATIONS.includes(location),
+      ),
+    );
+
+    for (const discovery of discoveries) {
+      const { scenario, reached } = discovery;
+      const outcomes = new Map<DurableRuntimeFailpointLocation, SweepOutcome>();
+
+      if (discovery.outcome.status !== "failed") {
+        while (true) {
+          // Recovery may expose another route. Discover those too, without re-running a
+          // cell already checked. Schema order bounds this to one drive per location.
+          const location = DurableRuntimeFailpointLocation.literals.find(
+            (candidate) =>
+              !outcomes.has(candidate) && (reached.has(candidate) || unaccounted.has(candidate)),
+          );
+
+          if (location === undefined) break;
+          outcomes.set(
+            location,
+            yield* runSweepCell(scenario, location, batchProducers, leaseAdvance, reached),
+          );
+        }
+      }
       for (const location of DurableRuntimeFailpointLocation.literals) {
-        tier2.push(yield* runSweepCell(scenario, location, batchProducers, leaseAdvance));
+        const outcome = outcomes.get(location) ?? discovery.outcome;
+
+        tier2.push(
+          CertificationSweepResult.make({
+            scenario,
+            location,
+            ...outcome,
+            ...(outcomes.has(location) || outcome.status === "failed"
+              ? {}
+              : { detail: "verified clean scenario did not reach this location" }),
+          }),
+        );
       }
     }
 
@@ -1097,13 +1162,7 @@ export const certifyDurableAdapters = <LedgerE = never, StoreE = never>(
 
     const generatedAt = yield* nowUtc;
 
-    const ok =
-      tier1.every((result) => result.status === "passed") &&
-      tier2.every((result) => result.status !== "failed") &&
-      tier3.cases.every((result) => result.status === "passed");
-
-    return CertificationReport.make({
-      format: "effect-agent/certification@2",
+    return makeCertificationReport({
       adapter: CertifiedAdapterIdentity.make({
         name: options.adapter.name,
         ...(options.adapter.version === undefined ? {} : { version: options.adapter.version }),
@@ -1113,13 +1172,6 @@ export const certifyDurableAdapters = <LedgerE = never, StoreE = never>(
       tier1,
       tier2,
       tier3,
-      ok,
-      fullyCertified:
-        ok &&
-        capabilities.durability !== "non-durable" &&
-        tier3.status === "exercised" &&
-        tier3.cases.length > 0 &&
-        tier3.cases.every((result) => result.suite === "real-loss"),
     });
   });
 

package/src/Chaos.ts

@@ -1,47 +1,38 @@
-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 {
-  ThreadId,
-  RunId,
-  ToolCallId,
-  TurnId,
-  type SubmissionId,
-} from "@effect-agent/core/Identifiers";
-import { IdGenerator } from "@effect-agent/core/IdGenerator";
-import {
-  DurableStep,
-  DurableStepError,
-  ToolExecutionClass,
-} from "@effect-agent/engine/DurableStep";
-import { RunToolAuthorization } from "@effect-agent/engine/RunOptions";
-import { ObligationThresholds } from "@effect-agent/thread/Admin";
+import { Cause, Effect, Exit, Layer, Option, Ref, Schema, Stream } from "effect";
+import { ObligationThresholds } from "effect-agent/admin";
+import * as Agent from "effect-agent/agent";
+import { AgentPolicy } from "effect-agent/agent-policy";
 import {
   DurableWorkerBinding,
   type DurableBindingFailure,
   type ResolvedBinding,
-} from "@effect-agent/thread/AgentRegistration";
+} from "effect-agent/agent-registration";
 import {
   DurableAgentRuntime,
   DurableRuntimeConfig,
   type DurableSubmitFailure,
   type DurableWorkerFailure,
   type Receipt,
-} from "@effect-agent/thread/DurableAgentRuntime";
+} from "effect-agent/durable-agent-runtime";
 import {
   DurableRuntimeFailpointError,
   DurableRuntimeFailpointLocation,
-} from "@effect-agent/thread/DurableFailpoint";
+} from "effect-agent/durable-failpoint";
+import { DurableStep, DurableStepError, ToolExecutionClass } from "effect-agent/durable-step";
+import { IdGenerator } from "effect-agent/id-generator";
+import { ThreadId, RunId, ToolCallId, TurnId, type SubmissionId } from "effect-agent/identifiers";
 import {
   DefinitionDigests,
   Digest,
   type CanonicalRecordEnvelope,
   type BatchId,
   type ProducerId,
-} from "@effect-agent/thread/Records";
-import { childThreadIdFor } from "@effect-agent/thread/RunJournal";
+} from "effect-agent/records";
+import { childThreadIdFor } from "effect-agent/run-journal";
+import { RunToolAuthorization } from "effect-agent/run-options";
+import * as Subagent from "effect-agent/subagent";
+import { SubagentPolicy } from "effect-agent/subagent";
+import { SubagentReservationsMemoryLive } from "effect-agent/subagent-reservations";
 import {
   AbortCommand,
   ApprovalDecisionCommand,
@@ -56,11 +47,10 @@ import {
   type Settlement,
   type SubmissionSnapshot,
   type UnknownResolution,
-} 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";
+} from "effect-agent/submission-ledger";
+import { DurableRuntimeFailpointTestControl } from "effect-agent/testing/durable-failpoint-test-control";
+import { verifyThreadInvariants } from "effect-agent/thread-invariants";
+import { ThreadExportRequest, ThreadStore } from "effect-agent/thread-store";
 import { FastCheck } from "effect/testing";
 import {
   LanguageModel,
@@ -769,7 +759,7 @@ const makeLaneFixture = Effect.fn("Chaos.makeLaneFixture")(function* (
 
       const childBinding = Agent.withModel(childDefinition, childModel);
 
-      const delegationLayer = SubagentRuntime.layer(chaosDelegation, childBinding, {
+      const delegationLayer = Subagent.layer(chaosDelegation, childBinding, {
         mapChildFailure: (failure) => ChaosDelegationFailed.make({ childErrorTag: failure._tag }),
         durable: { targetDigests: childDigestStrings(laneIndex) },
       }).pipe(Layer.provide(delegationSupport));

package/src/CodeExecutorConformance.ts

@@ -1,3 +1,4 @@
+import { Deferred, Duration, Effect, Fiber, Schema } from "effect";
 import {
   CodeExecutionHost,
   CodeExecutionLimits,
@@ -10,13 +11,12 @@ import {
   type CodeExecutionResult,
   type CodeHostCall,
   type CodeHostCallResult,
-} from "@effect-agent/sandbox/CodeExecutor";
+} from "effect-agent/code-executor";
 import {
   NetworkAllowlist,
   NetworkDisabled,
   type SandboxImplementation,
-} from "@effect-agent/sandbox/Sandbox";
-import { Deferred, Duration, Effect, Fiber, Schema } from "effect";
+} from "effect-agent/sandbox";
 
 /**
  * Shared `CodeExecutor` conformance (TEST-015). Every adapter — the

package/src/CodeExecutorSubstitute.ts

@@ -1,3 +1,4 @@
+import { Clock, Duration, Effect, Fiber, Layer, Option, Queue, Schema } from "effect";
 import {
   CodeExecutionHost,
   CodeExecutionProtocolError,
@@ -16,9 +17,8 @@ import {
   type CodeExecutionLimits,
   type CodeExecutionNamespace,
   type CodeExecutionRequest,
-} from "@effect-agent/sandbox/CodeExecutor";
-import { SandboxImplementation } from "@effect-agent/sandbox/Sandbox";
-import { Clock, Duration, Effect, Fiber, Layer, Option, Queue, Schema } from "effect";
+} from "effect-agent/code-executor";
+import { SandboxImplementation } from "effect-agent/sandbox";
 
 /**
  * The deterministic in-process executor substitute (C1 of ADR-0017). It runs