@rulvar/bridge-ai-sdk 1.83.0 → 1.84.0

package/dist/index.js

@@ -150,27 +150,35 @@ function bridgeAiSdk(model, options = {}) {
 				};
 				return;
 			}
-			if (!mapper.terminal) yield {
-				type: "error",
-				error: {
-					code: "agent",
-					message: `bridged model '${model.modelId}' ended its stream without a finish part`,
-					retryable: true,
-					data: { kind: "transport" }
-				}
-			};
+			if (!mapper.terminal) {
+				if (signal?.aborted === true) return;
+				yield {
+					type: "error",
+					error: {
+						code: "agent",
+						message: `bridged model '${model.modelId}' ended its stream without a finish part`,
+						retryable: true,
+						data: { kind: "transport" }
+					}
+				};
+			}
 		}
 	};
 }
 async function* iterateStream(stream) {
 	const reader = stream.getReader();
+	let drained = false;
 	try {
 		while (true) {
 			const { done, value } = await reader.read();
-			if (done) return;
+			if (done) {
+				drained = true;
+				return;
+			}
 			yield value;
 		}
 	} finally {
+		if (!drained) reader.cancel().catch(() => void 0);
 		reader.releaseLock();
 	}
 }
@@ -255,7 +263,7 @@ function mapMessages(messages, context) {
 				type: "tool-call",
 				toolCallId: context.ids.wireFor(part.id),
 				toolName: part.name,
-				input: part.args
+				input: unwrapUnparsedArgs(part.args)
 			});
 			else if (part.type === "provider-raw" && part.provider === context.family) {
 				const reinserted = reinsertRetained(part.block);
@@ -333,7 +341,10 @@ function reinsertRetained(block) {
 			type: "tool-result",
 			toolCallId: record.toolCallId,
 			toolName: record.toolName,
-			output: {
+			output: record.isError === true ? {
+				type: "error-json",
+				value: record.result
+			} : {
 				type: "json",
 				value: record.result
 			},
@@ -356,6 +367,22 @@ function stringifyResult(result) {
 	return typeof result === "string" ? result : JSON.stringify(result) ?? "null";
 }
 /**
+* Projects tool-call arguments back into the V4 prompt. The adapter
+* parse-failure wrapper ({__unparsed: raw} and nothing else) projects as
+* the ORIGINAL raw text the model wrote, mirroring the openai wire's
+* guard from the v1.74 experiment review: re-encoding the internal
+* wrapper showed the live model {"__unparsed":"..."} as its own past
+* call and taught it to imitate that shape.
+*/
+function unwrapUnparsedArgs(args) {
+	if (typeof args === "object" && args !== null && !Array.isArray(args)) {
+		const keys = Object.keys(args);
+		const raw = args.__unparsed;
+		if (keys.length === 1 && keys[0] === "__unparsed" && typeof raw === "string") return raw;
+	}
+	return args;
+}
+/**
 * Maps the V4 stream-part vocabulary onto ChatEvents, assembling tool
 * arguments, normalizing usage under the Usage invariant, and collecting
 * the turn's retention payload (reasoning parts with their signatures,
@@ -367,7 +394,6 @@ var StreamMapper = class {
 	adapterId;
 	ids;
 	effortDownmapped;
-	toolNames = /* @__PURE__ */ new Map();
 	startedToolWireIds = /* @__PURE__ */ new Set();
 	providerExecutedWireIds = /* @__PURE__ */ new Set();
 	reasoning = /* @__PURE__ */ new Map();
@@ -432,7 +458,6 @@ var StreamMapper = class {
 					this.providerExecutedWireIds.add(part.id);
 					return [];
 				}
-				this.toolNames.set(part.id, part.toolName);
 				this.startedToolWireIds.add(part.id);
 				return [{
 					type: "tool-call-start",
@@ -469,26 +494,15 @@ var StreamMapper = class {
 					name: part.toolName
 				});
 				const parsed = parseToolArgs(part.input);
-				if (parsed.ok) events.push({
+				events.push({
 					type: "tool-call-end",
 					id: canonical,
-					args: parsed.value
+					args: parsed.ok ? parsed.value : { __unparsed: part.input }
 				});
-				else {
-					this.terminal = true;
-					events.push({
-						type: "error",
-						error: {
-							code: "agent",
-							message: `bridged tool call '${part.toolName}' carried arguments that are not valid JSON`,
-							retryable: true,
-							data: { kind: "transport" }
-						}
-					});
-				}
 				return events;
 			}
 			case "tool-result":
+				if (part.preliminary === true) return [];
 				this.retained.push({
 					type: "tool-result",
 					toolCallId: part.toolCallId,
@@ -537,6 +551,9 @@ var StreamMapper = class {
 	}
 	mapFinish(part) {
 		if (part.finishReason.unified === "error") return [{
+			type: "usage",
+			usage: mapUsage(part.usage)
+		}, {
 			type: "error",
 			error: {
 				code: "agent",
@@ -545,6 +562,12 @@ var StreamMapper = class {
 				data: { kind: "transport" }
 			}
 		}];
+		for (const acc of this.reasoning.values()) this.retained.push({
+			type: "reasoning",
+			text: acc.text,
+			...acc.providerMetadata === void 0 ? {} : { providerMetadata: acc.providerMetadata }
+		});
+		this.reasoning.clear();
 		const finish = mapFinishReason(part.finishReason, this.adapterId);
 		const usage = mapUsage(part.usage);
 		const bag = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/bridge-ai-sdk",
-  "version": "1.83.0",
+  "version": "1.84.0",
   "description": "Rulvar bridge adapter wrapping any Vercel AI SDK LanguageModelV4 as a ProviderAdapter.",
   "type": "module",
   "license": "Apache-2.0",
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "@ai-sdk/provider": "^4.0.0",
-    "@rulvar/core": "1.83.0"
+    "@rulvar/core": "1.84.0"
   },
   "devDependencies": {
     "@ai-sdk/google": "^4.0.0",
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.83.0"
+    "@rulvar/testing": "1.84.0"
   },
   "repository": {
     "type": "git",