@oxygen-agent/cli 1.142.4 → 1.152.15

package/README.md

@@ -34,4 +34,4 @@ oxygen update
 
 For product documentation and support, visit https://oxygen-agent.com.
 
-Version: 1.142.4
+Version: 1.152.15

package/dist/http-client.js

@@ -1,4 +1,4 @@
-import { OXYGEN_VERSION, OxygenError } from "@oxygen/shared";
+import { OXYGEN_VERSION, OxygenError, isVersionGreater } from "@oxygen/shared";
 import { randomUUID } from "node:crypto";
 import { defaultApiUrl, loadCredentials } from "./credentials.js";
 import { resolveCliUpdateGuidance } from "./runtime.js";
@@ -24,6 +24,9 @@ path, options = {}) {
     const headers = {
         Accept: "application/json",
         "X-Oxygen-Trace-Id": traceId,
+        // Advertise the CLI version so the server can enforce its minimum-CLI floor
+        // even against clients that predate the client-side envelope gate.
+        "X-Oxygen-Client-Version": OXYGEN_VERSION,
     };
     addVercelProtectionBypassHeader(apiUrl, headers);
     if (credentials?.token) {
@@ -83,9 +86,10 @@ path, options = {}) {
     if (!response.ok || !envelope.ok) {
         const failure = envelope;
         const responseTraceId = response.headers.get("x-oxygen-trace-id") ?? traceId;
+        const details = withRetryAfterDetails(failure.error.details, response);
         throw new OxygenError(failure.error.code, failure.error.message, {
-            details: withTraceDetails(failure.error.details, responseTraceId, compatibility, apiUrl),
-            exitCode: response.status >= 500 ? 1 : 1,
+            details: withTraceDetails(details, responseTraceId, compatibility, apiUrl),
+            exitCode: 1,
         });
     }
     return envelope.data;
@@ -197,6 +201,43 @@ function readEnvelopeCompatibility(envelope) {
     }
     return compatibility;
 }
+// Surface the server's 429 backoff as a first-class `retry_after_seconds` detail
+// so loop-driving callers can wait the right amount of time instead of dead-
+// reckoning. Prefers a value the API already put in details; otherwise derives
+// it from the RFC 6585 Retry-After header (or reset_at). Non-429 responses and
+// unparseable values pass through untouched.
+function withRetryAfterDetails(details, response) {
+    if (response.status !== 429)
+        return details;
+    const record = details && typeof details === "object" && !Array.isArray(details)
+        ? details
+        : null;
+    if (record && typeof record.retry_after_seconds === "number")
+        return details;
+    const retryAfterSeconds = retryAfterSecondsFromResponse(response, record);
+    if (retryAfterSeconds === null)
+        return details;
+    if (record)
+        return { ...record, retry_after_seconds: retryAfterSeconds };
+    if (details === undefined)
+        return { retry_after_seconds: retryAfterSeconds };
+    return { details, retry_after_seconds: retryAfterSeconds };
+}
+function retryAfterSecondsFromResponse(response, details) {
+    const header = response.headers.get("retry-after");
+    if (header) {
+        const seconds = Number(header);
+        if (Number.isFinite(seconds) && seconds >= 0)
+            return Math.ceil(seconds);
+    }
+    const resetAt = details?.reset_at;
+    if (typeof resetAt === "string") {
+        const resetMs = Date.parse(resetAt);
+        if (!Number.isNaN(resetMs))
+            return Math.max(0, Math.ceil((resetMs - Date.now()) / 1000));
+    }
+    return null;
+}
 function withTraceDetails(details, traceId, compatibility, apiUrl) {
     const serverVersion = compatibility.version;
     const fields = {
@@ -225,31 +266,6 @@ function withTraceDetails(details, traceId, compatibility, apiUrl) {
         ...fields,
     };
 }
-function isVersionGreater(left, right) {
-    const leftParts = parseSemver(left);
-    const rightParts = parseSemver(right);
-    if (!leftParts || !rightParts)
-        return false;
-    for (let index = 0; index < leftParts.length; index += 1) {
-        const leftPart = leftParts[index] ?? 0;
-        const rightPart = rightParts[index] ?? 0;
-        if (leftPart > rightPart)
-            return true;
-        if (leftPart < rightPart)
-            return false;
-    }
-    return false;
-}
-function parseSemver(value) {
-    const match = /^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/.exec(value);
-    if (!match)
-        return null;
-    return [
-        Number(match[1]),
-        Number(match[2]),
-        Number(match[3]),
-    ];
-}
 function addVercelProtectionBypassHeader(apiUrl, headers) {
     const secret = process.env.VERCEL_AUTOMATION_BYPASS_SECRET?.trim();
     if (!secret)