@rulvar/openai 1.126.0 → 1.128.0

package/dist/index.js

@@ -1137,6 +1137,7 @@ function reconcileStatement(invoice, statement, options) {
 	let statementTotalUsd;
 	let statementComponents;
 	let tokenMismatches = 0;
+	let partialOverlap = false;
 	const tokenMismatchSample = [];
 	const rowsWithResponseId = billable.filter((row) => row.responseId !== void 0).length;
 	if (statement.kind === "requests") {
@@ -1166,50 +1167,51 @@ function reconcileStatement(invoice, statement, options) {
 		if (!carriesAnything) throw new ConfigError("statement reconciliation refused: no export row carries dollars, components, or usage; there is nothing to reconcile against");
 		const matched = [];
 		const matchedStatement = /* @__PURE__ */ new Set();
+		const partialSegmentIds = /* @__PURE__ */ new Set();
 		for (const row of billable) {
-			const hit = row.responseId === void 0 ? void 0 : byId.get(row.responseId);
-			if (hit === void 0) {
+			const rowIds = row.wireResponseIds !== void 0 && row.wireResponseIds.length > 0 ? row.wireResponseIds : row.responseId === void 0 ? [] : [row.responseId];
+			const hits = rowIds.map((id) => byId.get(id)).filter((hit) => hit !== void 0);
+			if (rowIds.length === 0 || hits.length !== rowIds.length) {
 				unmatchedRows += 1;
 				if (row.responseId !== void 0 && unmatchedIdSample.length < SAMPLE_CAP) unmatchedIdSample.push(row.responseId);
+				for (const hit of hits) {
+					partialSegmentIds.add(hit.responseId);
+					partialOverlap = true;
+				}
 				continue;
 			}
-			matchedStatement.add(hit.responseId);
+			for (const hit of hits) matchedStatement.add(hit.responseId);
 			matched.push(row);
-			if (hit.usage !== void 0) {
-				const pairs = [
-					[
-						"inputTokens",
-						hit.usage.inputTokens,
-						row.usage.inputTokens
-					],
-					[
-						"cachedInputTokens",
-						hit.usage.cachedInputTokens,
-						row.usage.cacheReadTokens
-					],
-					[
-						"cacheWriteTokens",
-						hit.usage.cacheWriteTokens,
-						row.usage.cacheWriteTokens
-					],
-					[
-						"outputTokens",
-						hit.usage.outputTokens,
-						row.usage.outputTokens
-					]
+			if (hits.length > 0 && hits.every((hit) => hit.usage !== void 0)) {
+				const fields = [
+					["inputTokens", row.usage.inputTokens],
+					["cachedInputTokens", row.usage.cacheReadTokens],
+					["cacheWriteTokens", row.usage.cacheWriteTokens],
+					["outputTokens", row.usage.outputTokens]
 				];
-				for (const [field, statementValue, ours] of pairs) if (statementValue !== void 0 && statementValue !== ours) {
-					tokenMismatches += 1;
-					if (tokenMismatchSample.length < SAMPLE_CAP) tokenMismatchSample.push({
-						responseId: hit.responseId,
-						field,
-						ours,
-						statement: statementValue
-					});
+				for (const [field, ours] of fields) {
+					let sum = 0;
+					let present = 0;
+					for (const hit of hits) {
+						const value = hit.usage?.[field];
+						if (value !== void 0) {
+							sum += value;
+							present += 1;
+						}
+					}
+					if (present === hits.length && sum !== ours) {
+						tokenMismatches += 1;
+						if (tokenMismatchSample.length < SAMPLE_CAP) tokenMismatchSample.push({
+							responseId: row.responseId ?? rowIds[0] ?? "",
+							field,
+							ours,
+							statement: sum
+						});
+					}
 				}
 			}
 		}
-		for (const row of statement.rows) if (!matchedStatement.has(row.responseId)) {
+		for (const row of statement.rows) if (!matchedStatement.has(row.responseId) && !partialSegmentIds.has(row.responseId)) {
 			statementOnlyRows += 1;
 			if (statementOnlyIdSample.length < SAMPLE_CAP) statementOnlyIdSample.push(row.responseId);
 		}
@@ -1321,7 +1323,7 @@ function reconcileStatement(invoice, statement, options) {
 	const tokensDivergent = tokenComparison === "verdict" && tokenMismatches > 0;
 	let verdict;
 	if (divergent.length > 0 || totalsDivergent || tokensDivergent) verdict = "divergence";
-	else if (matchedRows === 0) verdict = "no-overlap";
+	else if (matchedRows === 0 && !partialOverlap) verdict = "no-overlap";
 	else if (!coverageComplete) verdict = "partial-coverage";
 	else verdict = "match";
 	return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/openai",
-  "version": "1.126.0",
+  "version": "1.128.0",
   "description": "Rulvar first-class provider adapter for the OpenAI Responses API, plus the openaiCompatible factory.",
   "type": "module",
   "license": "Apache-2.0",
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "openai": "^6.49.0",
-    "@rulvar/core": "1.126.0"
+    "@rulvar/core": "1.128.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",
     "tsdown": "^0.22.14",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.126.0"
+    "@rulvar/testing": "1.128.0"
   },
   "repository": {
     "type": "git",