@copilotkit/aimock 1.46.0 → 1.47.0

package/dist/ndjson-writer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ndjson-writer.cjs","names":["calculateDelay","delay"],"sources":["../src/ndjson-writer.ts"],"sourcesContent":["/**\n * NDJSON streaming writer for Ollama endpoints.\n *\n * Mirrors writeSSEStream from sse-writer.ts but writes newline-delimited JSON\n * (one JSON object per line) instead of SSE events.\n */\n\nimport type * as http from \"node:http\";\nimport type { StreamingProfile, RecordedTimings } from \"./types.js\";\nimport { delay, calculateDelay } from \"./sse-writer.js\";\n\nexport interface NDJSONStreamOptions {\n  latency?: number;\n  streamingProfile?: StreamingProfile;\n  recordedTimings?: RecordedTimings;\n  replaySpeed?: number;\n  signal?: AbortSignal;\n  onChunkSent?: () => void;\n}\n\nexport async function writeNDJSONStream(\n  res: http.ServerResponse,\n  chunks: object[],\n  options?: NDJSONStreamOptions,\n): Promise<boolean> {\n  const opts = options ?? {};\n  const latency = opts.latency ?? 0;\n  const profile = opts.streamingProfile;\n  const { recordedTimings, replaySpeed } = opts;\n  const signal = opts.signal;\n  const onChunkSent = opts.onChunkSent;\n\n  if (res.writableEnded) return true;\n  res.setHeader(\"Content-Type\", \"application/x-ndjson\");\n  res.setHeader(\"Cache-Control\", \"no-cache\");\n  res.setHeader(\"Connection\", \"keep-alive\");\n\n  let chunkIndex = 0;\n  for (const chunk of chunks) {\n    const chunkDelay = calculateDelay(chunkIndex, profile, latency, recordedTimings, replaySpeed);\n    if (chunkDelay > 0) {\n      await delay(chunkDelay, signal);\n    }\n    if (signal?.aborted) return false;\n    if (res.writableEnded) return true;\n    res.write(JSON.stringify(chunk) + \"\\n\");\n    onChunkSent?.();\n    if (signal?.aborted) return false;\n    chunkIndex++;\n  }\n\n  if (!res.writableEnded) {\n    res.end();\n  }\n  return true;\n}\n"],"mappings":";;;AAoBA,eAAsB,kBACpB,KACA,QACA,SACkB;CAClB,MAAM,OAAO,WAAW,EAAE;CAC1B,MAAM,UAAU,KAAK,WAAW;CAChC,MAAM,UAAU,KAAK;CACrB,MAAM,EAAE,iBAAiB,gBAAgB;CACzC,MAAM,SAAS,KAAK;CACpB,MAAM,cAAc,KAAK;AAEzB,KAAI,IAAI,cAAe,QAAO;AAC9B,KAAI,UAAU,gBAAgB,uBAAuB;AACrD,KAAI,UAAU,iBAAiB,WAAW;AAC1C,KAAI,UAAU,cAAc,aAAa;CAEzC,IAAI,aAAa;AACjB,MAAK,MAAM,SAAS,QAAQ;EAC1B,MAAM,aAAaA,kCAAe,YAAY,SAAS,SAAS,iBAAiB,YAAY;AAC7F,MAAI,aAAa,EACf,OAAMC,yBAAM,YAAY,OAAO;AAEjC,MAAI,QAAQ,QAAS,QAAO;AAC5B,MAAI,IAAI,cAAe,QAAO;AAC9B,MAAI,MAAM,KAAK,UAAU,MAAM,GAAG,KAAK;AACvC,iBAAe;AACf,MAAI,QAAQ,QAAS,QAAO;AAC5B;;AAGF,KAAI,CAAC,IAAI,cACP,KAAI,KAAK;AAEX,QAAO"}
+{"version":3,"file":"ndjson-writer.cjs","names":["runFrameLoop","httpSink"],"sources":["../src/ndjson-writer.ts"],"sourcesContent":["/**\n * NDJSON streaming writer for Ollama endpoints.\n *\n * Mirrors writeSSEStream from sse-writer.ts but writes newline-delimited JSON\n * (one JSON object per line) instead of SSE events.\n */\n\nimport type * as http from \"node:http\";\nimport type { StreamingProfile, RecordedTimings } from \"./types.js\";\nimport { httpSink, runFrameLoop, type FrameCodec } from \"./response/frame-loop.js\";\n\nexport interface NDJSONStreamOptions {\n  latency?: number;\n  streamingProfile?: StreamingProfile;\n  recordedTimings?: RecordedTimings;\n  replaySpeed?: number;\n  signal?: AbortSignal;\n  onChunkSent?: () => void;\n}\n\nexport async function writeNDJSONStream(\n  res: http.ServerResponse,\n  chunks: object[],\n  options?: NDJSONStreamOptions,\n): Promise<boolean> {\n  const opts = options ?? {};\n  // Base contract (public API): with no frames, an aborted signal does not\n  // stop the writer; it still finishes the stream (any trailer, then end())\n  // and returns true. The frame loop returns false there, so pass it no\n  // signal when there are no frames (it reads the signal only per frame and\n  // after the loop).\n  return runFrameLoop(\n    httpSink(res),\n    chunks,\n    ndjsonCodec(),\n    {\n      latency: opts.latency,\n      streamingProfile: opts.streamingProfile,\n      recordedTimings: opts.recordedTimings,\n      replaySpeed: opts.replaySpeed,\n    },\n    { signal: chunks.length > 0 ? opts.signal : undefined, onChunkSent: opts.onChunkSent },\n  );\n}\n\n// Internal (not part of the public API): newline-delimited JSON, one object\n// per line, no trailer (Ollama). Line comments, not JSDoc, so the bundled\n// .d.ts does not attach this comment to a public declaration.\nexport function ndjsonCodec<F = object>(): FrameCodec<F> {\n  return {\n    headers: {\n      \"Content-Type\": \"application/x-ndjson\",\n      \"Cache-Control\": \"no-cache\",\n      Connection: \"keep-alive\",\n    },\n    encode: (frame) => JSON.stringify(frame) + \"\\n\",\n  };\n}\n"],"mappings":";;;AAoBA,eAAsB,kBACpB,KACA,QACA,SACkB;CAClB,MAAM,OAAO,WAAW,EAAE;AAM1B,QAAOA,gCACLC,4BAAS,IAAI,EACb,QACA,aAAa,EACb;EACE,SAAS,KAAK;EACd,kBAAkB,KAAK;EACvB,iBAAiB,KAAK;EACtB,aAAa,KAAK;EACnB,EACD;EAAE,QAAQ,OAAO,SAAS,IAAI,KAAK,SAAS;EAAW,aAAa,KAAK;EAAa,CACvF;;AAMH,SAAgB,cAAyC;AACvD,QAAO;EACL,SAAS;GACP,gBAAgB;GAChB,iBAAiB;GACjB,YAAY;GACb;EACD,SAAS,UAAU,KAAK,UAAU,MAAM,GAAG;EAC5C"}

package/dist/ndjson-writer.d.cts

@@ -12,7 +12,6 @@ interface NDJSONStreamOptions {
   onChunkSent?: () => void;
 }
 declare function writeNDJSONStream(res: http$1.ServerResponse, chunks: object[], options?: NDJSONStreamOptions): Promise<boolean>;
-//# sourceMappingURL=ndjson-writer.d.ts.map
 //#endregion
 export { NDJSONStreamOptions, writeNDJSONStream };
 //# sourceMappingURL=ndjson-writer.d.cts.map

package/dist/ndjson-writer.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"ndjson-writer.d.cts","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":[],"mappings":";;;;;AAgBW,UALM,mBAAA,CAKN;EAAW,OAAA,CAAA,EAAA,MAAA;EAIA,gBAAA,CAAA,EAPD,gBAOkB;EAAA,eAAA,CAAA,EANnB,eAMmB;aAC3B,CAAA,EAAA,MAAA;QAEA,CAAA,EAPD,WAOC;aACT,CAAA,EAAA,GAAA,GAAA,IAAA;;iBAJmB,iBAAA,MACf,MAAA,CAAK,4CAEA,sBACT"}
+{"version":3,"file":"ndjson-writer.d.cts","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":[],"mappings":";;;;;AAgBsB,UALL,mBAAA,CAKK;EAIA,OAAA,CAAA,EAAA,MAAA;EAAiB,gBAAA,CAAA,EAPlB,gBAOkB;iBAC3B,CAAA,EAPQ,eAOR;aAEA,CAAA,EAAA,MAAA;QACT,CAAA,EARQ,WAQR;EAAO,WAAA,CAAA,EAAA,GAAA,GAAA,IAAA;;iBAJY,iBAAA,MACf,MAAA,CAAK,4CAEA,sBACT"}

package/dist/ndjson-writer.d.ts

@@ -12,7 +12,6 @@ interface NDJSONStreamOptions {
   onChunkSent?: () => void;
 }
 declare function writeNDJSONStream(res: http$1.ServerResponse, chunks: object[], options?: NDJSONStreamOptions): Promise<boolean>;
-//# sourceMappingURL=ndjson-writer.d.ts.map
 //#endregion
 export { NDJSONStreamOptions, writeNDJSONStream };
 //# sourceMappingURL=ndjson-writer.d.ts.map

package/dist/ndjson-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ndjson-writer.d.ts","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":[],"mappings":";;;;;AAgBW,UALM,mBAAA,CAKN;EAAW,OAAA,CAAA,EAAA,MAAA;EAIA,gBAAA,CAAA,EAPD,gBAOkB;EAAA,eAAA,CAAA,EANnB,eAMmB;aAC3B,CAAA,EAAA,MAAA;QAEA,CAAA,EAPD,WAOC;aACT,CAAA,EAAA,GAAA,GAAA,IAAA;;iBAJmB,iBAAA,MACf,MAAA,CAAK,4CAEA,sBACT"}
+{"version":3,"file":"ndjson-writer.d.ts","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":[],"mappings":";;;;;AAgBsB,UALL,mBAAA,CAKK;EAIA,OAAA,CAAA,EAAA,MAAA;EAAiB,gBAAA,CAAA,EAPlB,gBAOkB;iBAC3B,CAAA,EAPQ,eAOR;aAEA,CAAA,EAAA,MAAA;QACT,CAAA,EARQ,WAQR;EAAO,WAAA,CAAA,EAAA,GAAA,GAAA,IAAA;;iBAJY,iBAAA,MACf,MAAA,CAAK,4CAEA,sBACT"}

package/dist/ndjson-writer.js

@@ -1,32 +1,29 @@
-import { calculateDelay, delay } from "./sse-writer.js";
+import { httpSink, runFrameLoop } from "./response/frame-loop.js";
 
 //#region src/ndjson-writer.ts
 async function writeNDJSONStream(res, chunks, options) {
 	const opts = options ?? {};
-	const latency = opts.latency ?? 0;
-	const profile = opts.streamingProfile;
-	const { recordedTimings, replaySpeed } = opts;
-	const signal = opts.signal;
-	const onChunkSent = opts.onChunkSent;
-	if (res.writableEnded) return true;
-	res.setHeader("Content-Type", "application/x-ndjson");
-	res.setHeader("Cache-Control", "no-cache");
-	res.setHeader("Connection", "keep-alive");
-	let chunkIndex = 0;
-	for (const chunk of chunks) {
-		const chunkDelay = calculateDelay(chunkIndex, profile, latency, recordedTimings, replaySpeed);
-		if (chunkDelay > 0) await delay(chunkDelay, signal);
-		if (signal?.aborted) return false;
-		if (res.writableEnded) return true;
-		res.write(JSON.stringify(chunk) + "\n");
-		onChunkSent?.();
-		if (signal?.aborted) return false;
-		chunkIndex++;
-	}
-	if (!res.writableEnded) res.end();
-	return true;
+	return runFrameLoop(httpSink(res), chunks, ndjsonCodec(), {
+		latency: opts.latency,
+		streamingProfile: opts.streamingProfile,
+		recordedTimings: opts.recordedTimings,
+		replaySpeed: opts.replaySpeed
+	}, {
+		signal: chunks.length > 0 ? opts.signal : void 0,
+		onChunkSent: opts.onChunkSent
+	});
+}
+function ndjsonCodec() {
+	return {
+		headers: {
+			"Content-Type": "application/x-ndjson",
+			"Cache-Control": "no-cache",
+			Connection: "keep-alive"
+		},
+		encode: (frame) => JSON.stringify(frame) + "\n"
+	};
 }
 
 //#endregion
-export { writeNDJSONStream };
+export { ndjsonCodec, writeNDJSONStream };
 //# sourceMappingURL=ndjson-writer.js.map

package/dist/ndjson-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ndjson-writer.js","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":["/**\n * NDJSON streaming writer for Ollama endpoints.\n *\n * Mirrors writeSSEStream from sse-writer.ts but writes newline-delimited JSON\n * (one JSON object per line) instead of SSE events.\n */\n\nimport type * as http from \"node:http\";\nimport type { StreamingProfile, RecordedTimings } from \"./types.js\";\nimport { delay, calculateDelay } from \"./sse-writer.js\";\n\nexport interface NDJSONStreamOptions {\n  latency?: number;\n  streamingProfile?: StreamingProfile;\n  recordedTimings?: RecordedTimings;\n  replaySpeed?: number;\n  signal?: AbortSignal;\n  onChunkSent?: () => void;\n}\n\nexport async function writeNDJSONStream(\n  res: http.ServerResponse,\n  chunks: object[],\n  options?: NDJSONStreamOptions,\n): Promise<boolean> {\n  const opts = options ?? {};\n  const latency = opts.latency ?? 0;\n  const profile = opts.streamingProfile;\n  const { recordedTimings, replaySpeed } = opts;\n  const signal = opts.signal;\n  const onChunkSent = opts.onChunkSent;\n\n  if (res.writableEnded) return true;\n  res.setHeader(\"Content-Type\", \"application/x-ndjson\");\n  res.setHeader(\"Cache-Control\", \"no-cache\");\n  res.setHeader(\"Connection\", \"keep-alive\");\n\n  let chunkIndex = 0;\n  for (const chunk of chunks) {\n    const chunkDelay = calculateDelay(chunkIndex, profile, latency, recordedTimings, replaySpeed);\n    if (chunkDelay > 0) {\n      await delay(chunkDelay, signal);\n    }\n    if (signal?.aborted) return false;\n    if (res.writableEnded) return true;\n    res.write(JSON.stringify(chunk) + \"\\n\");\n    onChunkSent?.();\n    if (signal?.aborted) return false;\n    chunkIndex++;\n  }\n\n  if (!res.writableEnded) {\n    res.end();\n  }\n  return true;\n}\n"],"mappings":";;;AAoBA,eAAsB,kBACpB,KACA,QACA,SACkB;CAClB,MAAM,OAAO,WAAW,EAAE;CAC1B,MAAM,UAAU,KAAK,WAAW;CAChC,MAAM,UAAU,KAAK;CACrB,MAAM,EAAE,iBAAiB,gBAAgB;CACzC,MAAM,SAAS,KAAK;CACpB,MAAM,cAAc,KAAK;AAEzB,KAAI,IAAI,cAAe,QAAO;AAC9B,KAAI,UAAU,gBAAgB,uBAAuB;AACrD,KAAI,UAAU,iBAAiB,WAAW;AAC1C,KAAI,UAAU,cAAc,aAAa;CAEzC,IAAI,aAAa;AACjB,MAAK,MAAM,SAAS,QAAQ;EAC1B,MAAM,aAAa,eAAe,YAAY,SAAS,SAAS,iBAAiB,YAAY;AAC7F,MAAI,aAAa,EACf,OAAM,MAAM,YAAY,OAAO;AAEjC,MAAI,QAAQ,QAAS,QAAO;AAC5B,MAAI,IAAI,cAAe,QAAO;AAC9B,MAAI,MAAM,KAAK,UAAU,MAAM,GAAG,KAAK;AACvC,iBAAe;AACf,MAAI,QAAQ,QAAS,QAAO;AAC5B;;AAGF,KAAI,CAAC,IAAI,cACP,KAAI,KAAK;AAEX,QAAO"}
+{"version":3,"file":"ndjson-writer.js","names":[],"sources":["../src/ndjson-writer.ts"],"sourcesContent":["/**\n * NDJSON streaming writer for Ollama endpoints.\n *\n * Mirrors writeSSEStream from sse-writer.ts but writes newline-delimited JSON\n * (one JSON object per line) instead of SSE events.\n */\n\nimport type * as http from \"node:http\";\nimport type { StreamingProfile, RecordedTimings } from \"./types.js\";\nimport { httpSink, runFrameLoop, type FrameCodec } from \"./response/frame-loop.js\";\n\nexport interface NDJSONStreamOptions {\n  latency?: number;\n  streamingProfile?: StreamingProfile;\n  recordedTimings?: RecordedTimings;\n  replaySpeed?: number;\n  signal?: AbortSignal;\n  onChunkSent?: () => void;\n}\n\nexport async function writeNDJSONStream(\n  res: http.ServerResponse,\n  chunks: object[],\n  options?: NDJSONStreamOptions,\n): Promise<boolean> {\n  const opts = options ?? {};\n  // Base contract (public API): with no frames, an aborted signal does not\n  // stop the writer; it still finishes the stream (any trailer, then end())\n  // and returns true. The frame loop returns false there, so pass it no\n  // signal when there are no frames (it reads the signal only per frame and\n  // after the loop).\n  return runFrameLoop(\n    httpSink(res),\n    chunks,\n    ndjsonCodec(),\n    {\n      latency: opts.latency,\n      streamingProfile: opts.streamingProfile,\n      recordedTimings: opts.recordedTimings,\n      replaySpeed: opts.replaySpeed,\n    },\n    { signal: chunks.length > 0 ? opts.signal : undefined, onChunkSent: opts.onChunkSent },\n  );\n}\n\n// Internal (not part of the public API): newline-delimited JSON, one object\n// per line, no trailer (Ollama). Line comments, not JSDoc, so the bundled\n// .d.ts does not attach this comment to a public declaration.\nexport function ndjsonCodec<F = object>(): FrameCodec<F> {\n  return {\n    headers: {\n      \"Content-Type\": \"application/x-ndjson\",\n      \"Cache-Control\": \"no-cache\",\n      Connection: \"keep-alive\",\n    },\n    encode: (frame) => JSON.stringify(frame) + \"\\n\",\n  };\n}\n"],"mappings":";;;AAoBA,eAAsB,kBACpB,KACA,QACA,SACkB;CAClB,MAAM,OAAO,WAAW,EAAE;AAM1B,QAAO,aACL,SAAS,IAAI,EACb,QACA,aAAa,EACb;EACE,SAAS,KAAK;EACd,kBAAkB,KAAK;EACvB,iBAAiB,KAAK;EACtB,aAAa,KAAK;EACnB,EACD;EAAE,QAAQ,OAAO,SAAS,IAAI,KAAK,SAAS;EAAW,aAAa,KAAK;EAAa,CACvF;;AAMH,SAAgB,cAAyC;AACvD,QAAO;EACL,SAAS;GACP,gBAAgB;GAChB,iBAAiB;GACjB,YAAY;GACb;EACD,SAAS,UAAU,KAAK,UAAU,MAAM,GAAG;EAC5C"}

package/dist/ollama.cjs

@@ -7,8 +7,11 @@ const require_misbehavior = require('./misbehavior.cjs');
 const require_embedding_request = require('./embedding-request.cjs');
 const require_router = require('./router.cjs');
 const require_recorder = require('./recorder.cjs');
-const require_interruption = require('./interruption.cjs');
+const require_timing = require('./response/timing.cjs');
+const require_deliver = require('./response/deliver.cjs');
+const require_proxy = require('./response/proxy.cjs');
 const require_ndjson_writer = require('./ndjson-writer.cjs');
+const require_raw = require('./response/raw.cjs');
 const require_ollama = require('./response/usage/codecs/ollama.cjs');
 
 //#region src/ollama.ts
@@ -330,8 +333,10 @@ function prepareOllamaMisbehavior(plan, request, stream, chunkSize, effectiveStr
 			for (const block of outcome.ordered) if (block.type === "text") priorContent += block.text;
 			else if (index++ === plan.target?.index) break;
 		}
+		const chunks = stream ? [...buildOllamaChatTextChunks(priorContent, model, chunkSize).slice(0, -1), { error }] : [{ error }];
 		return {
-			chunks: stream ? [...buildOllamaChatTextChunks(priorContent, model, chunkSize).slice(0, -1), { error }] : [{ error }],
+			build: () => chunks,
+			reasoning: void 0,
 			status: stream ? 200 : 500,
 			summary: {
 				...plan.summary,
@@ -347,64 +352,64 @@ function prepareOllamaMisbehavior(plan, request, stream, chunkSize, effectiveStr
 			arguments: parsed.text
 		};
 	});
-	let chunks;
-	let reasoning = "";
-	if (plan.summary.fault === "reasoning-only") {
-		reasoning = plan.reasoning ?? "";
-		const base = {
-			model,
-			created_at: (/* @__PURE__ */ new Date()).toISOString()
-		};
-		if (stream) {
-			chunks = [];
-			for (let i = 0; i < reasoning.length; i += chunkSize) chunks.push({
+	const reasoning = plan.summary.fault === "reasoning-only" ? plan.reasoning ?? "" : require_helpers.resolveReasoningForModel("reasoning" in response ? response.reasoning : void 0, model, effectiveStrict, logger) ?? "";
+	const completion = content + reasoning + servedToolCalls.map((call) => call.name + call.arguments).join("");
+	const build = () => {
+		let chunks;
+		if (plan.summary.fault === "reasoning-only") {
+			const base = {
+				model,
+				created_at: (/* @__PURE__ */ new Date()).toISOString()
+			};
+			if (stream) {
+				chunks = [];
+				for (let i = 0; i < reasoning.length; i += chunkSize) chunks.push({
+					...base,
+					message: {
+						role: "assistant",
+						content: "",
+						thinking: reasoning.slice(i, i + chunkSize)
+					},
+					done: false
+				});
+				chunks.push({
+					...base,
+					message: {
+						role: "assistant",
+						content: ""
+					},
+					done: true,
+					...DURATION_FIELDS,
+					done_reason: "length"
+				});
+			} else chunks = [{
 				...base,
 				message: {
 					role: "assistant",
 					content: "",
-					thinking: reasoning.slice(i, i + chunkSize)
-				},
-				done: false
-			});
-			chunks.push({
-				...base,
-				message: {
-					role: "assistant",
-					content: ""
+					thinking: reasoning
 				},
 				done: true,
 				...DURATION_FIELDS,
 				done_reason: "length"
-			});
-		} else chunks = [{
-			...base,
-			message: {
-				role: "assistant",
-				content: "",
-				thinking: reasoning
-			},
-			done: true,
-			...DURATION_FIELDS,
-			done_reason: "length"
-		}];
-	} else {
-		reasoning = require_helpers.resolveReasoningForModel("reasoning" in response ? response.reasoning : void 0, model, effectiveStrict, logger) ?? "";
-		if (combined) chunks = stream ? buildOllamaChatContentWithToolCallsChunks(content, calls, model, chunkSize, reasoning, response.blocks) : [buildOllamaChatContentWithToolCallsResponse(content, calls, model, reasoning, response.blocks)];
+			}];
+		} else if (combined) chunks = stream ? buildOllamaChatContentWithToolCallsChunks(content, calls, model, chunkSize, reasoning, response.blocks) : [buildOllamaChatContentWithToolCallsResponse(content, calls, model, reasoning, response.blocks)];
 		else if (require_helpers.isToolCallResponse(response)) chunks = stream ? buildOllamaChatToolCallChunks(calls, model, chunkSize, reasoning) : [buildOllamaChatToolCallResponse(calls, model, reasoning)];
 		else chunks = stream ? buildOllamaChatTextChunks(content, model, chunkSize, reasoning) : [buildOllamaChatTextResponse(content, model, reasoning)];
-	}
-	const completion = content + reasoning + servedToolCalls.map((call) => call.name + call.arguments).join("");
-	const terminal = chunks.length - 1;
-	chunks[terminal] = {
-		...chunks[terminal],
-		...require_ollama.render({
-			kind: "applied-chat-estimate",
-			messages: request.messages,
-			completion
-		})
+		const terminal = chunks.length - 1;
+		chunks[terminal] = {
+			...chunks[terminal],
+			...require_ollama.render({
+				kind: "applied-chat-estimate",
+				messages: request.messages,
+				completion
+			})
+		};
+		return chunks;
 	};
 	return {
-		chunks,
+		build,
+		reasoning,
 		status: 200,
 		summary: {
 			...plan.summary,
@@ -523,7 +528,10 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 	completionReq._endpointType = "chat";
 	completionReq._context = require_helpers.getContext(req);
 	const testId = require_helpers.getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, require_router.recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...require_router.recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "ollama"
+	});
 	if (fixture) {
 		journal.incrementFixtureMatchCount(fixture, fixtures, testId);
 		logger.debug(`Fixture matched: ${JSON.stringify(fixture.match).slice(0, 120)}`);
@@ -557,7 +565,7 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await require_recorder.proxyAndRecord(req, res, completionReq, "ollama", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await require_proxy.withHangUpDetection(req, res, () => require_recorder.proxyAndRecord(req, res, completionReq, "ollama", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -568,7 +576,8 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...require_proxy.proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -626,11 +635,44 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 		}).body);
 		return;
 	}
+	if (require_helpers.isRawResponse(response)) {
+		await require_raw.serveRawResponse({
+			wire: "ollama",
+			stream: ollamaReq.stream !== false,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "ollama"
+		});
+		return;
+	}
 	const latency = fixture.latency ?? defaults.latency;
 	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
+	const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
+	const streamTiming = {
+		latency,
+		streamingProfile: fixture.streamingProfile,
+		recordedTimings: fixture.recordedTimings,
+		replaySpeed
+	};
+	const jsonOpts = (payloadLength, duplicateId = false) => ({
+		surface: "other",
+		payloadLength,
+		chunkSize,
+		recordedTimings: fixture.recordedTimings,
+		duplicateId,
+		replaySpeed
+	});
 	const streaming = ollamaReq.stream !== false;
 	if (misbehavior.kind === "applied") {
 		const prepared = prepareOllamaMisbehavior(misbehavior, completionReq, streaming, chunkSize, require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression, logger);
+		const chunks = !streaming && prepared.status === 200 && require_timing.nonStreamingTimingEnabled(fixture, "other") ? void 0 : prepared.build();
 		const journalEntry = journal.add({
 			method: req.method ?? "POST",
 			path: urlPath,
@@ -647,24 +689,16 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 			defaults,
 			testId
 		});
-		if (!streaming) {
+		if (!streaming && prepared.status !== 200) {
 			res.writeHead(prepared.status, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(prepared.chunks[0]));
-		} else {
-			const interruption = require_interruption.createInterruptionSignal(fixture);
-			if (!await require_ndjson_writer.writeNDJSONStream(res, prepared.chunks, {
-				latency,
-				streamingProfile: fixture.streamingProfile,
-				recordedTimings: fixture.recordedTimings,
-				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
-				signal: interruption?.signal,
-				onChunkSent: interruption?.tick
-			})) {
-				if (!res.writableEnded) res.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-			}
-			interruption?.cleanup();
+			res.end(JSON.stringify((chunks ?? prepared.build())[0]));
+		} else if (!streaming) await require_deliver.deliverJson(res, journalEntry, fixture, () => (chunks ?? prepared.build())[0], {
+			...jsonOpts(require_timing.misbehaviorPayloadLength(misbehavior, misbehavior.reasoning === void 0 ? prepared.reasoning : void 0), !!misbehavior.duplicateId),
+			status: prepared.status
+		});
+		else {
+			const frames = chunks ?? prepared.build();
+			await require_deliver.deliverStream(res, journalEntry, fixture, require_ndjson_writer.ndjsonCodec(), frames, streamTiming);
 		}
 		return;
 	}
@@ -709,26 +743,10 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Ollama");
 		const effectiveStrict = require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression;
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, effectiveStrict, logger);
-		if (!streaming) {
-			const body = buildOllamaChatContentWithToolCallsResponse(response.content ?? "", functionToolCalls, completionReq.model, effReasoning, response.blocks);
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(body));
-		} else {
+		if (!streaming) await require_deliver.deliverJson(res, journalEntry, fixture, () => buildOllamaChatContentWithToolCallsResponse(response.content ?? "", functionToolCalls, completionReq.model, effReasoning, response.blocks), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
+		else {
 			const chunks = buildOllamaChatContentWithToolCallsChunks(response.content ?? "", functionToolCalls, completionReq.model, chunkSize, effReasoning, response.blocks);
-			const interruption = require_interruption.createInterruptionSignal(fixture);
-			if (!await require_ndjson_writer.writeNDJSONStream(res, chunks, {
-				latency,
-				streamingProfile: fixture.streamingProfile,
-				recordedTimings: fixture.recordedTimings,
-				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
-				signal: interruption?.signal,
-				onChunkSent: interruption?.tick
-			})) {
-				if (!res.writableEnded) res.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-			}
-			interruption?.cleanup();
+			await require_deliver.deliverStream(res, journalEntry, fixture, require_ndjson_writer.ndjsonCodec(), chunks, streamTiming);
 		}
 		return;
 	}
@@ -752,26 +770,10 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 		});
 		const effectiveStrict = require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression;
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, effectiveStrict, logger);
-		if (!streaming) {
-			const body = buildOllamaChatTextResponse(response.content, completionReq.model, effReasoning);
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(body));
-		} else {
+		if (!streaming) await require_deliver.deliverJson(res, journalEntry, fixture, () => buildOllamaChatTextResponse(response.content, completionReq.model, effReasoning), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
+		else {
 			const chunks = buildOllamaChatTextChunks(response.content, completionReq.model, chunkSize, effReasoning);
-			const interruption = require_interruption.createInterruptionSignal(fixture);
-			if (!await require_ndjson_writer.writeNDJSONStream(res, chunks, {
-				latency,
-				streamingProfile: fixture.streamingProfile,
-				recordedTimings: fixture.recordedTimings,
-				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
-				signal: interruption?.signal,
-				onChunkSent: interruption?.tick
-			})) {
-				if (!res.writableEnded) res.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-			}
-			interruption?.cleanup();
+			await require_deliver.deliverStream(res, journalEntry, fixture, require_ndjson_writer.ndjsonCodec(), chunks, streamTiming);
 		}
 		return;
 	}
@@ -796,26 +798,10 @@ async function handleOllama(req, res, raw, fixtures, journal, defaults, setCorsH
 		const functionToolCalls = require_helpers.requireEmittedFunctionToolCalls(response, "Ollama");
 		const effectiveStrict = require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression;
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, effectiveStrict, logger);
-		if (!streaming) {
-			const body = buildOllamaChatToolCallResponse(functionToolCalls, completionReq.model, effReasoning);
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(body));
-		} else {
+		if (!streaming) await require_deliver.deliverJson(res, journalEntry, fixture, () => buildOllamaChatToolCallResponse(functionToolCalls, completionReq.model, effReasoning), jsonOpts(require_timing.servedPayloadLength(response, effReasoning)));
+		else {
 			const chunks = buildOllamaChatToolCallChunks(functionToolCalls, completionReq.model, chunkSize, effReasoning);
-			const interruption = require_interruption.createInterruptionSignal(fixture);
-			if (!await require_ndjson_writer.writeNDJSONStream(res, chunks, {
-				latency,
-				streamingProfile: fixture.streamingProfile,
-				recordedTimings: fixture.recordedTimings,
-				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
-				signal: interruption?.signal,
-				onChunkSent: interruption?.tick
-			})) {
-				if (!res.writableEnded) res.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-			}
-			interruption?.cleanup();
+			await require_deliver.deliverStream(res, journalEntry, fixture, require_ndjson_writer.ndjsonCodec(), chunks, streamTiming);
 		}
 		return;
 	}
@@ -901,7 +887,10 @@ async function handleOllamaGenerate(req, res, raw, fixtures, journal, defaults,
 	completionReq._endpointType = "chat";
 	completionReq._context = require_helpers.getContext(req);
 	const testId = require_helpers.getTestId(req);
-	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, require_router.recordMatchOptions(!!defaults.record, defaults.logger));
+	const { fixture, skippedBySequenceOrTurn } = require_router.matchFixtureDiagnostic(fixtures, completionReq, journal.getFixtureMatchCountsForTest(testId), defaults.requestTransform, {
+		...require_router.recordMatchOptions(!!defaults.record, defaults.logger),
+		wire: "ollama-generate"
+	});
 	if (fixture) {
 		journal.incrementFixtureMatchCount(fixture, fixtures, testId);
 		defaults.logger.debug(`Fixture matched: ${JSON.stringify(fixture.match).slice(0, 120)}`);
@@ -935,7 +924,7 @@ async function handleOllamaGenerate(req, res, raw, fixtures, journal, defaults,
 			return;
 		}
 		if (defaults.record) {
-			const outcome = await require_recorder.proxyAndRecord(req, res, completionReq, "ollama", urlPath, fixtures, defaults, raw);
+			const { outcome, clientHungUp } = await require_proxy.withHangUpDetection(req, res, () => require_recorder.proxyAndRecord(req, res, completionReq, "ollama", urlPath, fixtures, defaults, raw));
 			if (outcome === "handled_by_hook") return;
 			if (outcome !== "not_configured") {
 				journal.add({
@@ -946,7 +935,8 @@ async function handleOllamaGenerate(req, res, raw, fixtures, journal, defaults,
 					response: {
 						status: res.statusCode ?? 200,
 						fixture: null,
-						source: "proxy"
+						source: "proxy",
+						...require_proxy.proxyInterruption(res, clientHungUp)
 					}
 				});
 				return;
@@ -1005,8 +995,40 @@ async function handleOllamaGenerate(req, res, raw, fixtures, journal, defaults,
 		}).body);
 		return;
 	}
+	if (require_helpers.isRawResponse(response)) {
+		await require_raw.serveRawResponse({
+			wire: "ollama-generate",
+			stream: generateReq.stream !== false,
+			req,
+			res,
+			fixture,
+			response,
+			body: completionReq,
+			journal,
+			defaults,
+			testId,
+			misbehaviorSummary: misbehavior.summary,
+			errorWire: "ollama"
+		});
+		return;
+	}
 	const latency = fixture.latency ?? defaults.latency;
 	const chunkSize = Math.max(1, fixture.chunkSize ?? defaults.chunkSize);
+	const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
+	const streamTiming = {
+		latency,
+		streamingProfile: fixture.streamingProfile,
+		recordedTimings: fixture.recordedTimings,
+		replaySpeed
+	};
+	const jsonOpts = (payloadLength, duplicateId = false) => ({
+		surface: "other",
+		payloadLength,
+		chunkSize,
+		recordedTimings: fixture.recordedTimings,
+		duplicateId,
+		replaySpeed
+	});
 	const streaming = generateReq.stream !== false;
 	if (require_helpers.isErrorResponse(response)) {
 		const status = response.status ?? 500;
@@ -1047,26 +1069,10 @@ async function handleOllamaGenerate(req, res, raw, fixtures, journal, defaults,
 		});
 		const effectiveStrict = require_policy.resolveRequestDecisions(defaults.strict, req.headers).reasoningSuppression;
 		const effReasoning = require_helpers.resolveReasoningForModel(response.reasoning, completionReq.model, effectiveStrict, defaults.logger);
-		if (!streaming) {
-			const body = buildOllamaGenerateTextResponse(response.content, completionReq.model, effReasoning);
-			res.writeHead(200, { "Content-Type": "application/json" });
-			res.end(JSON.stringify(body));
-		} else {
+		if (!streaming) await require_deliver.deliverJson(res, journalEntry, fixture, () => buildOllamaGenerateTextResponse(response.content, completionReq.model, effReasoning), jsonOpts(require_timing.servedPayloadLength({ content: response.content }, effReasoning)));
+		else {
 			const chunks = buildOllamaGenerateTextChunks(response.content, completionReq.model, chunkSize, effReasoning);
-			const interruption = require_interruption.createInterruptionSignal(fixture);
-			if (!await require_ndjson_writer.writeNDJSONStream(res, chunks, {
-				latency,
-				streamingProfile: fixture.streamingProfile,
-				recordedTimings: fixture.recordedTimings,
-				replaySpeed: fixture.replaySpeed ?? defaults.replaySpeed,
-				signal: interruption?.signal,
-				onChunkSent: interruption?.tick
-			})) {
-				if (!res.writableEnded) res.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-			}
-			interruption?.cleanup();
+			await require_deliver.deliverStream(res, journalEntry, fixture, require_ndjson_writer.ndjsonCodec(), chunks, streamTiming);
 		}
 		return;
 	}