@oxygen-agent/cli 1.1010.721 → 1.1010.905

package/dist/http-client.js

@@ -1,5 +1,6 @@
 import { OXYGEN_VERSION, OxygenError, isCliResult, isVersionGreater, parseSemver, readEnvelopeCompatibility, vercelProtectionBypassHeaders, withRetryAfterDetails, } from "@oxygen/shared";
 import { randomUUID } from "node:crypto";
+import { recordMutatingRequestAnswered, recoverFromCliFloorRejection } from "./auto-update.js";
 import { defaultApiUrl, loadCredentialsWithEndpoint } from "./credentials.js";
 import { assertResolvedApiUrl, cliEndpointDetails, describeCliEndpoint, isProdApiUrl, resolveCliUpdateGuidance, } from "./runtime.js";
 const DEFAULT_REQUEST_TIMEOUT_MS = 120_000;
@@ -31,7 +32,14 @@ path, options = {}) {
         ...init, signal: init?.signal ? AbortSignal.any([options.signal, init.signal]) : options.signal,
     }) : baseFetch;
     if (path !== "/api/health" && shouldCheckCliCompatibility(options)) {
-        await ensureFreshCliForApiUrl(apiUrl, { fetch: fetchImpl, endpoint });
+        try {
+            await ensureFreshCliForApiUrl(apiUrl, { fetch: fetchImpl, endpoint });
+        }
+        catch (error) {
+            // The preflight dialed only /api/health: nothing has run yet, so an
+            // automatic update may re-run this command in the new binary.
+            throw error instanceof OxygenError ? await recoverFromCliFloorRejection(error, endpoint) : error;
+        }
     }
     options.signal?.throwIfAborted();
     const traceId = options.traceId ?? randomUUID();
@@ -117,17 +125,33 @@ path, options = {}) {
     }
     const envelope = await readEnvelope(response);
     const compatibility = readEnvelopeCompatibility(envelope);
-    assertCliMeetsMinimumApiVersion(compatibility, options, endpoint);
+    const failed = !response.ok || !envelope.ok;
+    try {
+        assertCliMeetsMinimumApiVersion(compatibility, options, endpoint);
+    }
+    catch (error) {
+        // Only a refused request is safe to re-run: a successful one already did its work.
+        throw failed && error instanceof OxygenError ? await recoverFromCliFloorRejection(error, endpoint) : error;
+    }
     warnIfCliIsOlderThanApi(compatibility.version, endpoint);
-    if (!response.ok || !envelope.ok) {
+    if (failed) {
         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, describeFailureAgainstEndpoint(failure.error.code, failure.error.message, endpoint), {
+        const error = new OxygenError(failure.error.code, describeFailureAgainstEndpoint(failure.error.code, failure.error.message, endpoint), {
             details: withTraceDetails(details, responseTraceId, compatibility, endpoint),
             exitCode: 1,
         });
+        // The floor gate refuses before the route does any work (assertCliClientVersionFloor).
+        if (error.code === "cli_update_required")
+            throw await recoverFromCliFloorRejection(error, endpoint);
+        // Any other answer to a write may have written something; never re-run the command after it.
+        if (method !== "GET")
+            recordMutatingRequestAnswered();
+        throw error;
     }
+    if (method !== "GET")
+        recordMutatingRequestAnswered();
     return envelope.data;
 }
 async function readBoundedBinaryResponse(response, maxBytes) {