@rulvar/openai 1.72.0 → 1.74.0

package/dist/index.js

@@ -557,18 +557,42 @@ function retryAfterMsFrom(header) {
 	if (match === null) return;
 	return Math.min(Number(match[1]) * 1e3, MAX_RETRY_AFTER_MS);
 }
+/** A plain nonnegative integer header value, or undefined. */
+function limitHeaderValue(header) {
+	if (header === void 0) return;
+	const match = /^[\t ]*([0-9]+)[\t ]*$/.exec(header);
+	return match === null ? void 0 : Number(match[1]);
+}
 /** Projects SDK/API errors into the retryable WireError vocabulary. */
 function openAiErrorToWire(error) {
 	const record = error;
 	const status = typeof record.status === "number" ? record.status : void 0;
 	const message = typeof record.message === "string" ? record.message : String(error);
-	if (status === 429) {
-		let retryAfterMs;
+	const headerGet = (name) => {
 		const headers = record.headers;
-		if (headers !== void 0 && headers !== null) {
-			const value = typeof headers.get === "function" ? headers.get("retry-after") ?? void 0 : headers["retry-after"];
-			if (value !== void 0) retryAfterMs = retryAfterMsFrom(value);
+		if (headers === void 0 || headers === null) return;
+		if (typeof headers.get === "function") return headers.get(name) ?? void 0;
+		return headers[name];
+	};
+	if (status === 429) {
+		const retryAfterHeader = headerGet("retry-after");
+		const retryAfterMs = retryAfterHeader === void 0 ? void 0 : retryAfterMsFrom(retryAfterHeader);
+		const buckets = {};
+		for (const name of [
+			"x-ratelimit-limit-requests",
+			"x-ratelimit-remaining-requests",
+			"x-ratelimit-limit-tokens",
+			"x-ratelimit-remaining-tokens"
+		]) {
+			const value = headerGet(name);
+			if (value !== void 0) buckets[name] = value;
 		}
+		const requestsPerMinute = limitHeaderValue(headerGet("x-ratelimit-limit-requests"));
+		const tokensPerMinute = limitHeaderValue(headerGet("x-ratelimit-limit-tokens"));
+		const reportedLimits = {
+			...requestsPerMinute === void 0 ? {} : { requestsPerMinute },
+			...tokensPerMinute === void 0 ? {} : { tokensPerMinute }
+		};
 		return {
 			code: "agent",
 			message,
@@ -576,6 +600,8 @@ function openAiErrorToWire(error) {
 			data: {
 				kind: "rate-limit",
 				...retryAfterMs === void 0 ? {} : { retryAfterMs },
+				...Object.keys(buckets).length > 0 ? { buckets } : {},
+				...Object.keys(reportedLimits).length > 0 ? { reportedLimits } : {},
 				status: 429
 			}
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/openai",
-  "version": "1.72.0",
+  "version": "1.74.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.45.0",
-    "@rulvar/core": "1.72.0"
+    "@rulvar/core": "1.74.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.72.0"
+    "@rulvar/testing": "1.74.0"
   },
   "repository": {
     "type": "git",