fix: thread recordMatchOptions/logger through record-path handlers

Pass recordMatchOptions and the logger through the server record path into
each provider handler (messages, responses, gemini, bedrock, bedrock-converse,
cohere, ollama) so recorded fixtures carry the content-anchored match metadata.

Author: jpr5

src/bedrock-converse.ts

@@ -34,7 +34,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse } from "./sse-writer.js";
 import { writeEventStream } from "./aws-event-stream.js";
 import { createInterruptionSignal } from "./interruption.js";
@@ -608,6 +608,10 @@ export async function handleConverse(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {
@@ -920,6 +924,10 @@ export async function handleConverseStream(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/bedrock.ts

@@ -45,7 +45,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse } from "./sse-writer.js";
 import { writeEventStream } from "./aws-event-stream.js";
 import { createInterruptionSignal } from "./interruption.js";
@@ -407,6 +407,10 @@ export async function handleBedrock(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {
@@ -1114,6 +1118,10 @@ export async function handleBedrockStream(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/cohere.ts

@@ -42,7 +42,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse, delay, calculateDelay } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
 import type { Journal } from "./journal.js";
@@ -871,6 +871,10 @@ export async function handleCohere(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {
@@ -1300,6 +1304,10 @@ export async function handleCohereEmbed(
     syntheticReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/gemini.ts

@@ -38,7 +38,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse, delay, calculateDelay } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
 import type { Journal } from "./journal.js";
@@ -708,6 +708,10 @@ export async function handleGemini(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
   const path = req.url ?? `/v1beta/models/${model}:generateContent`;
 

src/messages.ts

@@ -37,7 +37,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse, delay, calculateDelay } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
 import type { Journal } from "./journal.js";
@@ -1152,6 +1152,10 @@ export async function handleMessages(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/ollama.ts

@@ -40,7 +40,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse } from "./sse-writer.js";
 import { writeNDJSONStream } from "./ndjson-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
@@ -585,6 +585,10 @@ export async function handleOllama(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {
@@ -969,6 +973,10 @@ export async function handleOllamaGenerate(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {
@@ -1304,6 +1312,10 @@ export async function handleOllamaEmbeddings(
     syntheticReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/responses.ts

@@ -36,7 +36,7 @@ import {
   strictNoMatchMessage,
   strictNoMatchLogLine,
 } from "./helpers.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { writeErrorResponse, delay, calculateDelay } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
 import type { RecordedTimings } from "./types.js";
@@ -967,6 +967,10 @@ export async function handleResponses(
     completionReq,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // Record mode proxies on a miss to capture a fresh turn (see record gate
+    // below), so keep turnIndex strict to prevent an earlier-turn fixture from
+    // shadowing a longer request and skipping the new turn's recording.
+    recordMatchOptions(!!defaults.record, defaults.logger),
   );
 
   if (fixture) {

src/server.ts

@@ -9,7 +9,7 @@ import type {
   RecordProviderKey,
 } from "./types.js";
 import { Journal } from "./journal.js";
-import { matchFixtureDiagnostic } from "./router.js";
+import { matchFixtureDiagnostic, recordMatchOptions } from "./router.js";
 import { validateFixtures, entryToFixture } from "./fixture-loader.js";
 import { writeSSEStream, writeErrorResponse } from "./sse-writer.js";
 import { createInterruptionSignal } from "./interruption.js";
@@ -564,6 +564,11 @@ async function handleCompletions(
     body,
     journal.getFixtureMatchCountsForTest(testId),
     defaults.requestTransform,
+    // In record mode a miss proxies upstream to capture a fresh turn, so an
+    // earlier-turn capture must not shadow a longer request via the relaxed
+    // turnIndex disambiguator — keep turnIndex a strict gate while recording.
+    // This handler's record gate (below) is `defaults.record && providerKey`.
+    recordMatchOptions(!!(defaults.record && providerKey), defaults.logger),
   );
 
   if (fixture) {