@anthonyhaussman/opencode-agy-auth 1.1.14-alpha.0 → 1.1.14-alpha.2

package/dist/index.js

@@ -516,6 +516,69 @@ function normalizeErrorEnvelope(parsed) {
   }
   return isObject(parsed) ? parsed : null;
 }
+var MAX_QUOTA_RESET_WAIT_MS = 72e5;
+function findResetTimeForModel(summary, model) {
+  if (!summary) return null;
+  const normalize2 = (str) => str.toLowerCase().replace(/[^a-z0-9]/g, "");
+  const modelNorm = model ? normalize2(model) : "";
+  let targetGroups = summary.groups ?? [];
+  if (modelNorm && targetGroups.length > 0) {
+    const matched = targetGroups.filter((g) => {
+      const gName = normalize2(g.displayName ?? "");
+      return gName.includes(modelNorm) || modelNorm.includes(gName);
+    });
+    if (matched.length > 0) {
+      targetGroups = matched;
+    }
+  }
+  const allBuckets = [];
+  for (const group of targetGroups) {
+    if (group.buckets) {
+      allBuckets.push(...group.buckets);
+    }
+  }
+  if (allBuckets.length === 0 && summary.buckets) {
+    allBuckets.push(...summary.buckets);
+  }
+  const now = Date.now();
+  const validResetBuckets = allBuckets.filter((b) => {
+    if (!b.resetTime) return false;
+    const t = new Date(b.resetTime).getTime();
+    return !Number.isNaN(t) && t > now;
+  });
+  if (validResetBuckets.length === 0) {
+    return null;
+  }
+  const exhaustedFiveHour = validResetBuckets.find(
+    (b) => (b.remainingFraction === 0 || b.disabled) && b.window?.toUpperCase() === "FIVE_HOUR"
+  );
+  if (exhaustedFiveHour?.resetTime) return exhaustedFiveHour.resetTime;
+  const exhaustedAny = validResetBuckets.find((b) => b.remainingFraction === 0 || b.disabled);
+  if (exhaustedAny?.resetTime) return exhaustedAny.resetTime;
+  const fiveHour = validResetBuckets.find((b) => b.window?.toUpperCase() === "FIVE_HOUR");
+  if (fiveHour?.resetTime) return fiveHour.resetTime;
+  validResetBuckets.sort(
+    (a, b) => new Date(a.resetTime).getTime() - new Date(b.resetTime).getTime()
+  );
+  return validResetBuckets[0]?.resetTime ?? null;
+}
+async function resolveQuotaResetDelay(accessToken, projectId, model, userAgentModel) {
+  try {
+    const summary = await retrieveUserQuotaSummary(accessToken, projectId, userAgentModel);
+    if (!summary) return null;
+    const resetTime = findResetTimeForModel(summary, model);
+    if (!resetTime) return null;
+    const resetTimestamp = new Date(resetTime).getTime();
+    if (Number.isNaN(resetTimestamp)) return null;
+    const waitMs = resetTimestamp - Date.now() + 1e3;
+    if (waitMs <= 0 || waitMs > MAX_QUOTA_RESET_WAIT_MS) {
+      return null;
+    }
+    return { waitMs, resetTime };
+  } catch {
+    return null;
+  }
+}
 
 // src/sdk/retry/helpers.ts
 var DEFAULT_MAX_ATTEMPTS = 3;
@@ -812,6 +875,7 @@ async function fetchWithRetry(input, init) {
   const throttleKey = buildRetryThrottleKey(input, retryInit);
   await waitForRetryCooldown(throttleKey, retryInit.signal);
   let attempt = 1;
+  let hasRetriedQuotaReset = false;
   const url2 = readRequestUrl(input);
   while (attempt <= DEFAULT_MAX_ATTEMPTS) {
     let response;
@@ -837,6 +901,25 @@ async function fetchWithRetry(input, init) {
       if (quotaContext.reason === "MODEL_CAPACITY_EXHAUSTED") {
         const cooldownMs = quotaContext.retryDelayMs ?? MODEL_CAPACITY_COOLDOWN_MS;
         setRetryCooldown(throttleKey, cooldownMs);
+        return response;
+      }
+      if (quotaContext.reason === "QUOTA_EXHAUSTED" && !hasRetriedQuotaReset && !retryInit.signal?.aborted) {
+        const body = typeof retryInit.body === "string" ? safeParseBody(retryInit.body) : null;
+        const project = readString(body?.project);
+        const model = readString(body?.model);
+        const token = extractAuthToken(retryInit.headers);
+        if (token && project) {
+          const resetInfo = await resolveQuotaResetDelay(token, project, model);
+          if (resetInfo && resetInfo.waitMs > 0 && resetInfo.waitMs <= MAX_QUOTA_RESET_WAIT_MS) {
+            hasRetriedQuotaReset = true;
+            setRetryCooldown(throttleKey, resetInfo.waitMs);
+            await wait(resetInfo.waitMs);
+            if (retryInit.signal?.aborted) {
+              return response;
+            }
+            continue;
+          }
+        }
       }
       return response;
     }
@@ -922,6 +1005,14 @@ function safeParseBody(body) {
 function readString(value) {
   return typeof value === "string" && value.trim() ? value : void 0;
 }
+function extractAuthToken(headers) {
+  if (!headers) return void 0;
+  const h = new Headers(headers);
+  const auth = h.get("authorization") || h.get("Authorization");
+  if (!auth) return void 0;
+  const match = auth.match(/^Bearer\s+(.+)$/i);
+  return match?.[1]?.trim() || auth.trim();
+}
 
 // src/sdk/terminal-hyperlink.ts
 var OSC8_OPEN = "\x1B]8;;";
@@ -18448,20 +18539,26 @@ function injectMissingToolCallIds(contents) {
   }
 }
 function applyLatestSignature(contents, latestSig) {
-  const allFunctionCalls = [];
+  const allFunctionParts = [];
   for (const content of contents) {
     if (content && typeof content === "object" && Array.isArray(content.parts)) {
       for (const part of content.parts) {
         if (part && typeof part === "object" && part.functionCall) {
-          allFunctionCalls.push(part);
+          if (part.functionCall.thoughtSignature) {
+            if (!part.thoughtSignature || part.thoughtSignature === "skip_thought_signature_validator") {
+              part.thoughtSignature = part.functionCall.thoughtSignature;
+            }
+            delete part.functionCall.thoughtSignature;
+          }
+          allFunctionParts.push(part);
         }
       }
     }
   }
-  if (allFunctionCalls.length > 0 && latestSig) {
-    const lastFunctionCall = allFunctionCalls[allFunctionCalls.length - 1];
-    if (!lastFunctionCall.thoughtSignature || lastFunctionCall.thoughtSignature === "skip_thought_signature_validator") {
-      lastFunctionCall.thoughtSignature = latestSig;
+  if (allFunctionParts.length > 0 && latestSig) {
+    const lastPart = allFunctionParts[allFunctionParts.length - 1];
+    if (!lastPart.thoughtSignature || lastPart.thoughtSignature === "skip_thought_signature_validator") {
+      lastPart.thoughtSignature = latestSig;
     }
   }
 }
@@ -19315,7 +19412,7 @@ function resolveThinkingConfigDefaults(provider) {
   const providerOptions = provider && typeof provider === "object" ? provider.options ?? void 0 : void 0;
   const providerThinkingConfig = providerOptions?.thinkingConfig;
   const modelThinkingConfigByModel = {};
-  for (const [modelId, model] of Object.entries(provider.models ?? {})) {
+  for (const [modelId, model] of Object.entries(provider?.models ?? {})) {
     if (!model || typeof model !== "object") {
       continue;
     }