opencode-anthropic-fix 0.0.25 → 0.0.26

package/lib/accounts.mjs

@@ -334,6 +334,36 @@ export class AccountManager {
     this.#tokenTracker.refund(account.index);
   }
 
+  /**
+   * Apply a utilization-based health penalty (proactive, before actual rate limit).
+   * @param {ManagedAccount} account
+   * @param {number} penalty - Points to deduct (0-10 typical)
+   */
+  applyUtilizationPenalty(account, penalty) {
+    if (penalty > 0) {
+      this.#healthTracker.applyPenalty(account.index, penalty);
+    }
+  }
+
+  /**
+   * Handle surpassed rate limit threshold — aggressive penalty and soft cooldown.
+   * @param {ManagedAccount} account
+   * @param {string | null} resetAt - ISO timestamp or null
+   */
+  applySurpassedThreshold(account, resetAt) {
+    // Apply a significant health penalty
+    this.#healthTracker.applyPenalty(account.index, 15);
+
+    // If reset time provided, set a soft cooldown
+    if (resetAt) {
+      const resetTime = new Date(resetAt).getTime();
+      if (!isNaN(resetTime) && resetTime > Date.now()) {
+        const SOFT_COOLDOWN_KEY = "soft_cooldown";
+        account.rateLimitResetTimes[SOFT_COOLDOWN_KEY] = resetTime;
+      }
+    }
+  }
+
   /**
    * Add a new account to the pool.
    * @param {string} refreshToken

package/lib/backoff.mjs

@@ -7,6 +7,31 @@ const AUTH_FAILED_BACKOFF = 5_000;
 const RATE_LIMIT_EXCEEDED_BACKOFF = 30_000;
 const MIN_BACKOFF_MS = 2_000;
 
+/**
+ * Parse the retry-after-ms header from a response.
+ * Returns milliseconds directly (no conversion needed).
+ * @param {Response} response
+ * @returns {number | null}
+ */
+export function parseRetryAfterMsHeader(response) {
+  const header = response.headers.get("retry-after-ms");
+  if (!header) return null;
+  const ms = parseFloat(header);
+  return !isNaN(ms) && ms > 0 ? ms : null;
+}
+
+/**
+ * Parse the x-should-retry header from a response.
+ * @param {Response} response
+ * @returns {boolean | null} true = force retry, false = force no retry, null = not present
+ */
+export function parseShouldRetryHeader(response) {
+  const header = response.headers.get("x-should-retry");
+  if (header === "true") return true;
+  if (header === "false") return false;
+  return null;
+}
+
 /**
  * Parse the Retry-After header from a response.
  * Supports both seconds (integer) and HTTP-date formats.

package/lib/config.mjs

@@ -44,6 +44,14 @@ import { homedir } from "node:os";
  * @property {number} min_interval_minutes - Minimum minutes between idle refresh attempts per account
  */
 
+/**
+ * @typedef {object} CachePolicyConfig
+ * @property {string} ttl - "1h" (default), "5m", or "off"
+ * @property {boolean} ttl_supported - Auto-set to false if API rejects TTL
+ * @property {boolean} boundary_marker - Inject static/dynamic boundary marker into system prompt (opt-in)
+ * @property {number} hit_rate_warning_threshold - Warn when avg cache hit rate falls below this (0-1). Default: 0.3
+ */
+
 /**
  * @typedef {object} AnthropicAuthConfig
  * @property {AccountSelectionStrategy} account_selection_strategy
@@ -57,6 +65,9 @@ import { homedir } from "node:os";
  * @property {ToastConfig} toasts
  * @property {HeaderConfig} headers
  * @property {IdleRefreshConfig} idle_refresh
+ * @property {CachePolicyConfig} cache_policy
+ * @property {boolean} fast_mode
+ * @property {{emulate_minimal: boolean}} telemetry
  */
 
 /** @type {AnthropicAuthConfig} */
@@ -98,6 +109,16 @@ export const DEFAULT_CONFIG = {
     window_minutes: 60,
     min_interval_minutes: 30,
   },
+  cache_policy: {
+    ttl: "1h",
+    ttl_supported: true,
+    boundary_marker: false,
+    hit_rate_warning_threshold: 0.3,
+  },
+  fast_mode: false,
+  telemetry: {
+    emulate_minimal: false,
+  },
 };
 
 export const VALID_STRATEGIES = ["sticky", "round-robin", "hybrid"];
@@ -119,6 +140,9 @@ function createDefaultConfig() {
     token_bucket: { ...DEFAULT_CONFIG.token_bucket },
     toasts: { ...DEFAULT_CONFIG.toasts },
     idle_refresh: { ...DEFAULT_CONFIG.idle_refresh },
+    cache_policy: { ...DEFAULT_CONFIG.cache_policy },
+    fast_mode: DEFAULT_CONFIG.fast_mode,
+    telemetry: { ...DEFAULT_CONFIG.telemetry },
   };
 }
 
@@ -293,6 +317,33 @@ function validateConfig(raw) {
     };
   }
 
+  // Cache policy sub-config
+  if (raw.cache_policy && typeof raw.cache_policy === "object") {
+    const cp = /** @type {Record<string, unknown>} */ (raw.cache_policy);
+    const validTtls = ["1h", "5m", "off"];
+    config.cache_policy = {
+      ttl: typeof cp.ttl === "string" && validTtls.includes(cp.ttl) ? cp.ttl : DEFAULT_CONFIG.cache_policy.ttl,
+      ttl_supported:
+        typeof cp.ttl_supported === "boolean" ? cp.ttl_supported : DEFAULT_CONFIG.cache_policy.ttl_supported,
+      boundary_marker:
+        typeof cp.boundary_marker === "boolean" ? cp.boundary_marker : DEFAULT_CONFIG.cache_policy.boundary_marker,
+      hit_rate_warning_threshold:
+        typeof cp.hit_rate_warning_threshold === "number" && Number.isFinite(cp.hit_rate_warning_threshold)
+          ? Math.max(0, Math.min(1, cp.hit_rate_warning_threshold))
+          : DEFAULT_CONFIG.cache_policy.hit_rate_warning_threshold,
+    };
+  }
+
+  // Fast mode
+  config.fast_mode = typeof raw.fast_mode === "boolean" ? raw.fast_mode : false;
+
+  // Telemetry
+  config.telemetry = config.telemetry || {};
+  config.telemetry.emulate_minimal =
+    typeof raw.telemetry?.emulate_minimal === "boolean"
+      ? raw.telemetry.emulate_minimal
+      : DEFAULT_CONFIG.telemetry.emulate_minimal;
+
   return config;
 }
 

package/lib/oauth.mjs

@@ -10,8 +10,17 @@ const OAUTH_MAX_HOST = "claude.ai";
 const OAUTH_REDIRECT_URI = `https://${OAUTH_CONSOLE_HOST}/oauth/code/callback`;
 const OAUTH_TOKEN_URL = `https://${OAUTH_CONSOLE_HOST}/v1/oauth/token`;
 const OAUTH_REVOKE_URL = `https://${OAUTH_CONSOLE_HOST}/v1/oauth/revoke`;
-const OAUTH_CLI_VERSION_PROFILE = "2.1.79";
-const OAUTH_USER_AGENT = `claude-cli/${OAUTH_CLI_VERSION_PROFILE} (external, cli)`;
+const OAUTH_CLI_VERSION_PROFILE = "2.1.80";
+const OAUTH_USER_AGENT = `claude-code/${OAUTH_CLI_VERSION_PROFILE}`;
+
+export const CLAUDE_AI_SCOPES = [
+  "user:profile",
+  "user:inference",
+  "user:sessions:claude_code",
+  "user:mcp_servers",
+  "user:file_upload",
+];
+const CONSOLE_SCOPES = ["org:create_api_key", "user:profile"];
 
 function base64url(input) {
   return Buffer.from(input).toString("base64url");
@@ -20,13 +29,14 @@ function base64url(input) {
 function generatePKCE() {
   const verifier = base64url(randomBytes(32));
   const challenge = base64url(createHash("sha256").update(verifier).digest());
-  return { verifier, challenge };
+  const state = base64url(randomBytes(32));
+  return { verifier, challenge, state };
 }
 
 /**
  * Build an OAuth authorization URL with PKCE challenge.
  * @param {"max" | "console"} mode
- * @returns {Promise<{url: string, verifier: string}>}
+ * @returns {Promise<{url: string, verifier: string, state: string}>}
  */
 export async function authorize(mode) {
   const pkce = generatePKCE();
@@ -36,13 +46,15 @@ export async function authorize(mode) {
   url.searchParams.set("client_id", CLIENT_ID);
   url.searchParams.set("response_type", "code");
   url.searchParams.set("redirect_uri", OAUTH_REDIRECT_URI);
-  url.searchParams.set("scope", "org:create_api_key user:profile user:inference");
+  const scopes = mode === "console" ? CONSOLE_SCOPES : CLAUDE_AI_SCOPES;
+  url.searchParams.set("scope", scopes.join(" "));
   url.searchParams.set("code_challenge", pkce.challenge);
   url.searchParams.set("code_challenge_method", "S256");
-  url.searchParams.set("state", pkce.verifier);
+  url.searchParams.set("state", pkce.state);
   return {
     url: url.toString(),
     verifier: pkce.verifier,
+    state: pkce.state,
   };
 }
 
@@ -182,6 +194,7 @@ export async function refreshToken(refreshTokenValue, options = {}) {
       grant_type: "refresh_token",
       client_id: CLIENT_ID,
       refresh_token: refreshTokenValue,
+      scope: CLAUDE_AI_SCOPES.join(" "),
     }),
     ...(options.signal ? { signal: options.signal } : {}),
   });
@@ -201,3 +214,14 @@ export async function refreshToken(refreshTokenValue, options = {}) {
 
   return resp.json();
 }
+
+/**
+ * Check if an account has all required Claude.ai scopes.
+ * @param {string[] | undefined} scopes
+ * @returns {boolean}
+ */
+export function hasRequiredScopes(scopes) {
+  if (!Array.isArray(scopes) || scopes.length === 0) return false;
+  const stored = new Set(scopes);
+  return CLAUDE_AI_SCOPES.every((s) => stored.has(s));
+}

package/lib/oauth.test.mjs

@@ -23,7 +23,7 @@ describe("oauth headers", () => {
     await exchange("code#state", "verifier");
 
     const [, init] = mockFetch.mock.calls[0];
-    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+    expect(init.headers["User-Agent"]).toBe("claude-code/2.1.80");
   });
 
   it("sends Claude Code user-agent on token refresh", async () => {
@@ -35,7 +35,7 @@ describe("oauth headers", () => {
     await refreshToken("refresh-token");
 
     const [, init] = mockFetch.mock.calls[0];
-    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+    expect(init.headers["User-Agent"]).toBe("claude-code/2.1.80");
   });
 
   it("sends Claude Code user-agent on token revoke", async () => {
@@ -44,6 +44,6 @@ describe("oauth headers", () => {
     await revoke("refresh-token");
 
     const [, init] = mockFetch.mock.calls[0];
-    expect(init.headers["User-Agent"]).toBe("claude-cli/2.1.79 (external, cli)");
+    expect(init.headers["User-Agent"]).toBe("claude-code/2.1.80");
   });
 });

package/lib/rotation.mjs

@@ -72,6 +72,25 @@ export class HealthScoreTracker {
     });
   }
 
+  /**
+   * Apply a direct penalty to an account's health score.
+   * @param {number} accountIndex
+   * @param {number} penalty - Points to deduct
+   */
+  applyPenalty(accountIndex, penalty) {
+    const state = this.#scores.get(accountIndex);
+    if (!state) {
+      this.#scores.set(accountIndex, {
+        score: Math.max(0, this.#config.initial - penalty),
+        lastUpdated: Date.now(),
+        consecutiveFailures: 0,
+      });
+    } else {
+      state.score = Math.max(0, this.getScore(accountIndex) - penalty);
+      state.lastUpdated = Date.now();
+    }
+  }
+
   /**
    * Record a general failure.
    * @param {number} accountIndex

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.0.25",
+  "version": "0.0.26",
+  "license": "GPL-3.0-or-later",
   "main": "./index.mjs",
   "files": [
     "index.mjs",