@yielded/agent-testing 0.1.0-beta.173 → 0.1.0-beta.174

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

@@ -138,38 +138,37 @@ const summaryParts = (documentId: string): ReadonlyArray<Response.StreamPartEnco
  * Attempt may resume on a fresh Layer build, so responses derive from the
  * committed history in the prompt — never from an in-Layer turn counter.
  */
-const makeCountingModel = (
+const makeCountingModel = Effect.fnUntraced(function* (
   name: string,
   decide: (promptJson: string) => Effect.Effect<ReadonlyArray<Response.StreamPartEncoded>>,
-) =>
-  Effect.gen(function* () {
-    const calls = yield* Ref.make(0);
-    const prompts = yield* Ref.make<ReadonlyArray<string>>([]);
-
-    const model = Model.make(
-      "scripted",
-      name,
-      Layer.effect(
-        LanguageModel.LanguageModel,
-        LanguageModel.make({
-          generateText: () => Effect.succeed([]),
-          streamText: (request) =>
-            Stream.unwrap(
-              Effect.gen(function* () {
-                yield* Ref.update(calls, (value) => value + 1);
-                const promptJson = JSON.stringify(request.prompt);
-
-                yield* Ref.update(prompts, (previous) => [...previous, promptJson]);
-
-                return Stream.fromIterable(yield* decide(promptJson));
-              }),
-            ),
-        }),
-      ),
-    );
+) {
+  const calls = yield* Ref.make(0);
+  const prompts = yield* Ref.make<ReadonlyArray<string>>([]);
+
+  const model = Model.make(
+    "scripted",
+    name,
+    Layer.effect(
+      LanguageModel.LanguageModel,
+      LanguageModel.make({
+        generateText: () => Effect.succeed([]),
+        streamText: (request) =>
+          Stream.unwrap(
+            Effect.gen(function* () {
+              yield* Ref.update(calls, (value) => value + 1);
+              const promptJson = JSON.stringify(request.prompt);
+
+              yield* Ref.update(prompts, (previous) => [...previous, promptJson]);
+
+              return Stream.fromIterable(yield* decide(promptJson));
+            }),
+          ),
+      }),
+    ),
+  );
 
-    return { model, calls: Ref.get(calls), prompts: Ref.get(prompts) };
-  });
+  return { model, calls: Ref.get(calls), prompts: Ref.get(prompts) };
+});
 
 /** Optional overrides for one docs-researcher harness. */
 export interface DocsResearcherHarnessOptions {
@@ -204,98 +203,100 @@ export interface DocsResearcherHarness {
  * at assembly, not assumed. Content-tool execution then flows through the
  * counting `DocumentLibrary` — the scripted MCP server's content store.
  */
-export const makeDocsResearcherHarness = (options?: DocsResearcherHarnessOptions) =>
-  Effect.gen(function* () {
-    const documentIds = options?.documentIds ?? researchCorpusDocumentIds;
-
-    // MCP discovery gate (CAP-009): bounded, digest-verified, fail-closed.
-    const discovery = yield* Effect.scoped(
-      Effect.gen(function* () {
-        const connection = yield* connectMcp(docsMcpRequest);
-
-        yield* assertDiscoveryMatchesAuthoredToolkit(connection);
-
-        return connection.discovery;
-      }),
-    ).pipe(Effect.provide(docsMcpConnectorLayer));
-
-    const fetchCounts = yield* Ref.make<ReadonlyMap<string, number>>(new Map());
-
-    const libraryLayer = Layer.succeed(
-      DocumentLibrary,
-      DocumentLibrary.of({
-        fetch: (query) =>
-          Ref.update(fetchCounts, (current) =>
-            new Map(current).set(query.documentId, (current.get(query.documentId) ?? 0) + 1),
-          ).pipe(Effect.andThen(researchDocumentLookup(query))),
-      }),
-    );
-
-    const childToolkitLayer = docContentToolkitLayer.pipe(Layer.provideMerge(libraryLayer));
-
-    const childModel = yield* makeCountingModel("doc-summarizer-p7", (promptJson) =>
-      Effect.suspend(() => {
-        const documentId = documentIds.find((candidate) => promptJson.includes(candidate));
-
-        if (documentId === undefined) {
-          return Effect.die(new Error("The summarizer prompt names no corpus document"));
-        }
-
-        return Effect.succeed(
-          promptJson.includes(fetchCallId(documentId))
-            ? summaryParts(documentId)
-            : fetchParts(documentId),
-        );
-      }),
-    );
-
-    const childBinding = Agent.withModel(DocSummarizer, childModel.model);
-
-    const firstCallId = summarizeCallId(documentIds[0] ?? "durability-notes");
-
-    const parentModel = yield* makeCountingModel("docs-researcher-p7", (promptJson) =>
-      Effect.succeed(
-        promptJson.includes(firstCallId)
-          ? digestParts(documentIds)
-          : summaryDelegationParts(documentIds),
+export const makeDocsResearcherHarness = Effect.fnUntraced(function* (
+  options?: DocsResearcherHarnessOptions,
+) {
+  const documentIds = options?.documentIds ?? researchCorpusDocumentIds;
+
+  // MCP discovery gate (CAP-009): bounded, digest-verified, fail-closed.
+  const discovery = yield* Effect.scoped(
+    Effect.gen(function* () {
+      const connection = yield* connectMcp(docsMcpRequest);
+
+      yield* assertDiscoveryMatchesAuthoredToolkit(connection);
+
+      return connection.discovery;
+    }),
+  ).pipe(Effect.provide(docsMcpConnectorLayer));
+
+  const fetchCounts = yield* Ref.make<ReadonlyMap<string, number>>(new Map());
+
+  const libraryLayer = Layer.succeed(
+    DocumentLibrary,
+    DocumentLibrary.of({
+      fetch: (query) =>
+        Ref.update(fetchCounts, (current) =>
+          new Map(current).set(query.documentId, (current.get(query.documentId) ?? 0) + 1),
+        ).pipe(Effect.andThen(researchDocumentLookup(query))),
+    }),
+  );
+
+  const childToolkitLayer = docContentToolkitLayer.pipe(Layer.provideMerge(libraryLayer));
+
+  const childModel = yield* makeCountingModel("doc-summarizer-p7", (promptJson) =>
+    Effect.suspend(() => {
+      const documentId = documentIds.find((candidate) => promptJson.includes(candidate));
+
+      if (documentId === undefined) {
+        // oxlint-disable-next-line effect/no-native-error -- Deterministic model fixture assertion remains a native defect.
+        return Effect.die(new Error("The summarizer prompt names no corpus document"));
+      }
+
+      return Effect.succeed(
+        promptJson.includes(fetchCallId(documentId))
+          ? summaryParts(documentId)
+          : fetchParts(documentId),
+      );
+    }),
+  );
+
+  const childBinding = Agent.withModel(DocSummarizer, childModel.model);
+
+  const firstCallId = summarizeCallId(documentIds[0] ?? "durability-notes");
+
+  const parentModel = yield* makeCountingModel("docs-researcher-p7", (promptJson) =>
+    Effect.succeed(
+      promptJson.includes(firstCallId)
+        ? digestParts(documentIds)
+        : summaryDelegationParts(documentIds),
+    ),
+  );
+
+  const parentBinding = Agent.withModel(DocsResearcher, parentModel.model);
+
+  const delegationLayer = docsSummaryHandlersLayer(childBinding).pipe(
+    Layer.provide(
+      Layer.mergeAll(
+        childToolkitLayer,
+        SubagentReservationsMemoryLive,
+        DeterministicIdGeneratorLayer,
       ),
-    );
-
-    const parentBinding = Agent.withModel(DocsResearcher, parentModel.model);
-
-    const delegationLayer = docsSummaryHandlersLayer(childBinding).pipe(
-      Layer.provide(
-        Layer.mergeAll(
-          childToolkitLayer,
-          SubagentReservationsMemoryLive,
-          DeterministicIdGeneratorLayer,
-        ),
-      ),
-    );
-
-    const parentResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
-      parentBinding,
-      docsCoordinatorDigests,
-    ).pipe(Effect.provide(delegationLayer));
-
-    const childResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
-      childBinding,
-      docsSummarizerDigests,
-    ).pipe(Effect.provide(childToolkitLayer));
-
-    const harness: DocsResearcherHarness = {
-      bindings: [parentResolved, childResolved],
-      discovery,
-      parentModelCalls: parentModel.calls,
-      parentPrompts: parentModel.prompts,
-      childModelCalls: childModel.calls,
-      childPrompts: childModel.prompts,
-      fetchInvocations: (documentId) =>
-        Ref.get(fetchCounts).pipe(Effect.map((current) => current.get(documentId) ?? 0)),
-    };
-
-    return harness;
-  });
+    ),
+  );
+
+  const parentResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
+    parentBinding,
+    docsCoordinatorDigests,
+  ).pipe(Effect.provide(delegationLayer));
+
+  const childResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
+    childBinding,
+    docsSummarizerDigests,
+  ).pipe(Effect.provide(childToolkitLayer));
+
+  const harness: DocsResearcherHarness = {
+    bindings: [parentResolved, childResolved],
+    discovery,
+    parentModelCalls: parentModel.calls,
+    parentPrompts: parentModel.prompts,
+    childModelCalls: childModel.calls,
+    childPrompts: childModel.prompts,
+    fetchInvocations: (documentId) =>
+      Ref.get(fetchCounts).pipe(Effect.map((current) => current.get(documentId) ?? 0)),
+  };
+
+  return harness;
+});
 
 const encodeResearchDocument = Schema.encodeEffect(ResearchDocument);
 

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

@@ -403,21 +403,20 @@ export class SupplierBookingDesk extends Context.Service<
         bookings: Ref.get(state).pipe(Effect.map((current) => [...current.bookings.values()])),
         callCount: (idempotencyKey) =>
           Ref.get(state).pipe(Effect.map((current) => current.counts.get(idempotencyKey) ?? 0)),
-        holdAfterWrite: (idempotencyKey) =>
-          Effect.gen(function* () {
-            const held = yield* Deferred.make<void>();
-            const release = yield* Deferred.make<void>();
-
-            yield* Ref.update(state, (current) => ({
-              ...current,
-              holds: new Map(current.holds).set(idempotencyKey, { held, release }),
-            }));
-
-            return {
-              held: Deferred.await(held),
-              release: Deferred.succeed(release, undefined).pipe(Effect.asVoid),
-            };
-          }),
+        holdAfterWrite: Effect.fnUntraced(function* (idempotencyKey) {
+          const held = yield* Deferred.make<void>();
+          const release = yield* Deferred.make<void>();
+
+          yield* Ref.update(state, (current) => ({
+            ...current,
+            holds: new Map(current.holds).set(idempotencyKey, { held, release }),
+          }));
+
+          return {
+            held: Deferred.await(held),
+            release: Deferred.succeed(release, undefined).pipe(Effect.asVoid),
+          };
+        }),
       });
     }),
   );

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

@@ -225,74 +225,71 @@ export const TravelPlannerPhase5ToolkitLayer = TravelPlannerPhase5Toolkit.toLaye
     Effect.flatMap(LodgingCatalog, (catalog) => catalog.search(LodgingQuery.make(query))),
   search_activities: (query) =>
     Effect.flatMap(ActivityCatalog, (catalog) => catalog.search(ActivityQuery.make(query))),
-  book_flight: (request, context) =>
-    Effect.gen(function* () {
-      const desk = yield* SupplierBookingDesk;
-      const toolCallId = yield* requireToolCallId("book_flight", context.toolCallId);
-
-      const record = yield* desk.book({
-        operation: "book-flight",
-        idempotencyKey: bookFlightIdempotencyKey(toolCallId),
-        detail: `flight ${request.quoteId} for ${request.travelerRef} on ${request.departOn}`,
-      });
-
-      return SupplierBookingConfirmation.make({
-        bookingRef: record.bookingRef,
-        status: "confirmed",
-        detail: record.detail,
-      });
-    }),
-  cancel_booking: (request) =>
-    Effect.gen(function* () {
-      const desk = yield* SupplierBookingDesk;
-      const record = yield* desk.cancel(request.bookingRef);
-
-      return CancellationConfirmation.make({
-        bookingRef: record.bookingRef,
-        status: "cancelled",
-      });
-    }),
-  book_itinerary: (request, context) =>
-    Effect.gen(function* () {
-      const desk = yield* SupplierBookingDesk;
-      const step = yield* DurableStep;
-      const toolCallId = yield* requireToolCallId("book_itinerary", context.toolCallId);
-
-      const bookStep = (
-        stepName: "reserve-flight" | "reserve-lodging" | "issue-confirmation",
-        detail: string,
-      ) =>
-        step.do(
-          stepName,
-          SupplierBookingRecord,
-          desk.book({
-            operation: stepName,
-            idempotencyKey: itineraryStepIdempotencyKey(toolCallId, stepName),
-            detail,
-          }),
-        );
-
-      const flight = yield* bookStep(
-        "reserve-flight",
-        `flight ${request.quoteId} for ${request.travelerRef}`,
-      );
+  book_flight: Effect.fnUntraced(function* (request, context) {
+    const desk = yield* SupplierBookingDesk;
+    const toolCallId = yield* requireToolCallId("book_flight", context.toolCallId);
 
-      const lodging = yield* bookStep(
-        "reserve-lodging",
-        `lodging ${request.destination} for ${request.nights} nights (${request.travelerRef})`,
-      );
+    const record = yield* desk.book({
+      operation: "book-flight",
+      idempotencyKey: bookFlightIdempotencyKey(toolCallId),
+      detail: `flight ${request.quoteId} for ${request.travelerRef} on ${request.departOn}`,
+    });
+
+    return SupplierBookingConfirmation.make({
+      bookingRef: record.bookingRef,
+      status: "confirmed",
+      detail: record.detail,
+    });
+  }),
+  cancel_booking: Effect.fnUntraced(function* (request) {
+    const desk = yield* SupplierBookingDesk;
+    const record = yield* desk.cancel(request.bookingRef);
 
-      const confirmation = yield* bookStep(
-        "issue-confirmation",
-        `itinerary confirmation for ${request.travelerRef}`,
+    return CancellationConfirmation.make({
+      bookingRef: record.bookingRef,
+      status: "cancelled",
+    });
+  }),
+  book_itinerary: Effect.fnUntraced(function* (request, context) {
+    const desk = yield* SupplierBookingDesk;
+    const step = yield* DurableStep;
+    const toolCallId = yield* requireToolCallId("book_itinerary", context.toolCallId);
+
+    const bookStep = (
+      stepName: "reserve-flight" | "reserve-lodging" | "issue-confirmation",
+      detail: string,
+    ) =>
+      step.do(
+        stepName,
+        SupplierBookingRecord,
+        desk.book({
+          operation: stepName,
+          idempotencyKey: itineraryStepIdempotencyKey(toolCallId, stepName),
+          detail,
+        }),
       );
 
-      return ItineraryConfirmation.make({
-        flightBookingRef: flight.bookingRef,
-        lodgingBookingRef: lodging.bookingRef,
-        confirmationCode: confirmation.bookingRef,
-      });
-    }),
+    const flight = yield* bookStep(
+      "reserve-flight",
+      `flight ${request.quoteId} for ${request.travelerRef}`,
+    );
+
+    const lodging = yield* bookStep(
+      "reserve-lodging",
+      `lodging ${request.destination} for ${request.nights} nights (${request.travelerRef})`,
+    );
+
+    const confirmation = yield* bookStep(
+      "issue-confirmation",
+      `itinerary confirmation for ${request.travelerRef}`,
+    );
+
+    return ItineraryConfirmation.make({
+      flightBookingRef: flight.bookingRef,
+      lodgingBookingRef: lodging.bookingRef,
+      confirmationCode: confirmation.bookingRef,
+    });
+  }),
 });
 
 const decodePersistedJson = Schema.decodeUnknownEffect(PersistedJson);

package/src/fixtures/travel-planner/subagents-durable.ts

@@ -150,40 +150,39 @@ export const encodedDestinationFacts = (destination: string): unknown => {
 const scriptedUsage = { inputTokens: { total: 96 }, outputTokens: { total: 64 } };
 
 /** One scripted model whose behavior is keyed by the global invocation index. */
-export const makeInvocationCountingModel = (
+export const makeInvocationCountingModel = Effect.fnUntraced(function* (
   name: string,
   script: (call: number) => ReadonlyArray<Response.StreamPartEncoded>,
-) =>
-  Effect.gen(function* () {
-    const calls = yield* Ref.make(0);
-    const prompts = yield* Ref.make<ReadonlyArray<string>>([]);
-
-    const model = Model.make(
-      "scripted",
-      name,
-      Layer.effect(
-        LanguageModel.LanguageModel,
-        LanguageModel.make({
-          generateText: () => Effect.succeed([]),
-          streamText: (request) =>
-            Stream.unwrap(
-              Effect.gen(function* () {
-                const call = yield* Ref.getAndUpdate(calls, (value) => value + 1);
-
-                yield* Ref.update(prompts, (previous) => [
-                  ...previous,
-                  JSON.stringify(request.prompt.content),
-                ]);
-
-                return Stream.fromIterable(script(call));
-              }),
-            ),
-        }),
-      ),
-    );
+) {
+  const calls = yield* Ref.make(0);
+  const prompts = yield* Ref.make<ReadonlyArray<string>>([]);
+
+  const model = Model.make(
+    "scripted",
+    name,
+    Layer.effect(
+      LanguageModel.LanguageModel,
+      LanguageModel.make({
+        generateText: () => Effect.succeed([]),
+        streamText: (request) =>
+          Stream.unwrap(
+            Effect.gen(function* () {
+              const call = yield* Ref.getAndUpdate(calls, (value) => value + 1);
+
+              yield* Ref.update(prompts, (previous) => [
+                ...previous,
+                JSON.stringify(request.prompt.content),
+              ]);
+
+              return Stream.fromIterable(script(call));
+            }),
+          ),
+      }),
+    ),
+  );
 
-    return { model, calls: Ref.get(calls), prompts: Ref.get(prompts) };
-  });
+  return { model, calls: Ref.get(calls), prompts: Ref.get(prompts) };
+});
 
 const delegationTurnParts = (
   toolCallId: string,
@@ -296,70 +295,69 @@ export interface DurableResearchHarness {
  * registered with several `NodeDurableAgentRuntime` stacks over the same SQLite
  * file while the counters keep counting across all of them.
  */
-export const makeDurableResearchHarness = (options?: DurableResearchHarnessOptions) =>
-  Effect.gen(function* () {
-    const destination = options?.destination ?? "LHR";
-    const focus = options?.focus ?? "museums";
-
-    const guideInvocations = yield* Ref.make(0);
-
-    const guideLayer = Layer.succeed(
-      DestinationGuide,
-      DestinationGuide.of({
-        lookup: (query) =>
-          Ref.update(guideInvocations, (count) => count + 1).pipe(
-            Effect.andThen(destinationLookup(query)),
-          ),
-      }),
-    );
+export const makeDurableResearchHarness = Effect.fnUntraced(function* (
+  options?: DurableResearchHarnessOptions,
+) {
+  const destination = options?.destination ?? "LHR";
+  const focus = options?.focus ?? "museums";
+
+  const guideInvocations = yield* Ref.make(0);
+
+  const guideLayer = Layer.succeed(
+    DestinationGuide,
+    DestinationGuide.of({
+      lookup: (query) =>
+        Ref.update(guideInvocations, (count) => count + 1).pipe(
+          Effect.andThen(destinationLookup(query)),
+        ),
+    }),
+  );
 
-    const childToolkitLayer = DestinationResearcherToolkitLayer.pipe(
-      Layer.provideMerge(guideLayer),
-    );
+  const childToolkitLayer = DestinationResearcherToolkitLayer.pipe(Layer.provideMerge(guideLayer));
 
-    const childModel = yield* makeInvocationCountingModel("destination-researcher-s2", (call) =>
-      call === 0 ? researcherLookupParts(destination) : researcherReportParts(destination),
-    );
+  const childModel = yield* makeInvocationCountingModel("destination-researcher-s2", (call) =>
+    call === 0 ? researcherLookupParts(destination) : researcherReportParts(destination),
+  );
 
-    const childBinding = Agent.withModel(DestinationResearcher, childModel.model);
+  const childBinding = Agent.withModel(DestinationResearcher, childModel.model);
 
-    const parentModel = yield* makeInvocationCountingModel("travel-coordinator-s2", (call) =>
-      call === 0
-        ? delegationTurnParts(durableResearchCallId, destination, focus)
-        : shortlistParts(durableResearchShortlist(destination)),
-    );
+  const parentModel = yield* makeInvocationCountingModel("travel-coordinator-s2", (call) =>
+    call === 0
+      ? delegationTurnParts(durableResearchCallId, destination, focus)
+      : shortlistParts(durableResearchShortlist(destination)),
+  );
 
-    const parentBinding = Agent.withModel(TravelCoordinator, parentModel.model);
+  const parentBinding = Agent.withModel(TravelCoordinator, parentModel.model);
 
-    const delegationLayer = durableDestinationResearchHandlersLayer(childBinding).pipe(
-      Layer.provide(
-        Layer.mergeAll(
-          childToolkitLayer,
-          SubagentReservationsMemoryLive,
-          DeterministicIdGeneratorLayer,
-          ResearchDispatchGate.layerOpen,
-        ),
+  const delegationLayer = durableDestinationResearchHandlersLayer(childBinding).pipe(
+    Layer.provide(
+      Layer.mergeAll(
+        childToolkitLayer,
+        SubagentReservationsMemoryLive,
+        DeterministicIdGeneratorLayer,
+        ResearchDispatchGate.layerOpen,
       ),
-    );
-
-    const parentResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
-      parentBinding,
-      s2CoordinatorDigests,
-    ).pipe(Effect.provide(delegationLayer));
-
-    const childResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
-      childBinding,
-      options?.childRegistrationDigests ?? s2ResearcherDigests,
-    ).pipe(Effect.provide(childToolkitLayer));
-
-    const harness: DurableResearchHarness = {
-      bindings: [parentResolved, childResolved],
-      parentModelCalls: parentModel.calls,
-      parentPrompts: parentModel.prompts,
-      childModelCalls: childModel.calls,
-      childPrompts: childModel.prompts,
-      guideInvocations: Ref.get(guideInvocations),
-    };
-
-    return harness;
-  });
+    ),
+  );
+
+  const parentResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
+    parentBinding,
+    s2CoordinatorDigests,
+  ).pipe(Effect.provide(delegationLayer));
+
+  const childResolved: ResolvedBinding = yield* DurableWorkerBinding.make(
+    childBinding,
+    options?.childRegistrationDigests ?? s2ResearcherDigests,
+  ).pipe(Effect.provide(childToolkitLayer));
+
+  const harness: DurableResearchHarness = {
+    bindings: [parentResolved, childResolved],
+    parentModelCalls: parentModel.calls,
+    parentPrompts: parentModel.prompts,
+    childModelCalls: childModel.calls,
+    childPrompts: childModel.prompts,
+    guideInvocations: Ref.get(guideInvocations),
+  };
+
+  return harness;
+});