opencode-anthropic-fix 0.2.0 → 0.2.1

package/README.md

@@ -365,11 +365,12 @@ Pending slash OAuth flows expire after 10 minutes. If completion fails with an e
 
 Control how the plugin picks which account to use for each request.
 
-| Strategy               | Behavior                                                                                  | Best For                                                                            |
-| ---------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------- |
-| **`sticky`** (default) | Stay on one account until it fails or is rate-limited                                     | Single account, predictable behavior, full feature compatibility                    |
-| **`round-robin`**      | Rotate through accounts on every request                                                  | Spreading load evenly across accounts (see [limitations](#round-robin-limitations)) |
-| **`hybrid`**           | Score-based selection with stickiness bias. Considers health, token budget, and freshness | Multiple accounts with varying rate limits                                          |
+| Strategy               | Behavior                                                                                    | Best For                                                                                   |
+| ---------------------- | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------ |
+| **`sticky`** (default) | Stay on one account until it fails or is rate-limited                                       | Single account, predictable behavior, full feature compatibility                           |
+| **`round-robin`**      | Rotate through accounts on every request                                                    | Spreading load evenly across accounts (see [limitations](#round-robin-limitations))        |
+| **`hybrid`**           | Score-based selection with stickiness bias. Considers health, token budget, and freshness   | Multiple accounts with varying rate limits                                                 |
+| **`single`**           | Use one account only; stop and alert when it fails or is rate-limited (never auto-switches) | Simple multi-account setups (e.g. work vs personal) where requests must never mix accounts |
 
 ### Change Strategy
 
@@ -413,7 +414,7 @@ Configuration is stored at `~/.config/opencode/anthropic-auth.json`. All setting
 
 ```jsonc
 {
-  // Account selection strategy: "sticky" | "round-robin" | "hybrid"
+  // Account selection strategy: "sticky" | "round-robin" | "hybrid" | "single"
   "account_selection_strategy": "sticky",
 
   // Seconds before consecutive failure count resets (60-7200)

package/cli.mjs

@@ -1153,6 +1153,7 @@ export async function cmdStrategy(arg) {
       sticky: "Stay on one account until it fails or is rate-limited",
       "round-robin": "Rotate through accounts on every request",
       hybrid: "Prefer healthy accounts, rotate when degraded",
+      single: "Use one account only; stop and alert when it fails or is rate-limited",
     };
 
     for (const s of VALID_STRATEGIES) {

package/index.mjs

@@ -15,15 +15,11 @@ import {
   FALLBACK_CLAUDE_CLI_VERSION,
   CLAUDE_CODE_NPM_LATEST_URL,
   CLAUDE_CODE_BUILD_TIME,
-  EXPERIMENTAL_BETA_FLAGS,
-  BETA_SHORTCUTS,
   resolveBetaShortcut,
-  buildExtendedUserAgent,
 } from "./lib/request-headers.mjs";
-import { loadConfig, loadConfigFresh, saveConfig, CLIENT_ID, getConfigDir } from "./lib/config.mjs";
+import { loadConfig, loadConfigFresh, saveConfig, getConfigDir } from "./lib/config.mjs";
 import { loadContextHintDisabledFlag, saveContextHintDisabledFlag } from "./lib/context-hint-persist.mjs";
 import { loadAccounts, saveAccounts, clearAccounts, createDefaultStats } from "./lib/storage.mjs";
-import { applyOAuthCredentials, resetAccountTracking } from "./lib/account-state.mjs";
 import { acquireRefreshLock, releaseRefreshLock } from "./lib/refresh-lock.mjs";
 import {
   isAccountSpecificError,
@@ -51,7 +47,7 @@ import {
   stripMcpPrefixFromParsedEvent,
 } from "./lib/mimicry/response-stream.mjs";
 import { transformRequestBody, CORE_TOOL_NAMES } from "./lib/mimicry/request-body.mjs";
-import { isFalsyEnv, isTruthyEnv } from "./lib/env.mjs";
+import { isTruthyEnv } from "./lib/env.mjs";
 import { sessionMetrics, createInitialSessionMetrics, getAverageCacheHitRate } from "./lib/session-metrics.mjs";
 import { repairOrphanedToolUseBlocks } from "./lib/mimicry/request-helpers.mjs";
 import { resolveCacheTtl, shouldPlaceToolBreakpoint, updateBoundaryStability } from "./lib/mimicry/cache.mjs";
@@ -83,13 +79,11 @@ import {
   SUBAGENT_CC_ANCHOR,
 } from "./lib/mimicry/system-prompt.mjs";
 import {
-  CLAUDE_3_MODEL_RE,
   hasOneMillionContext,
   isEligibleFor1MContext,
   isOpus46Model,
   isOpus47Model,
   isOpus48Model,
-  isSonnet46Model,
 } from "./lib/mimicry/models.mjs";
 
 export { isFable5Model, isMythos5Model, isAdaptiveThinkingModel } from "./lib/mimicry/models.mjs";
@@ -241,7 +235,7 @@ async function runHaikuSessionSummarize(
   }
 }
 
-export async function AnthropicAuthPlugin({ client, project, directory, worktree, serverUrl, $ }) {
+export async function AnthropicAuthPlugin({ client }) {
   const config = loadConfig();
   _pluginConfig = config; // expose to module-level functions (cache stats, response headers)
   // QA fix H6: read emulation settings live from config instead of stale const capture
@@ -1191,7 +1185,7 @@ export async function AnthropicAuthPlugin({ client, project, directory, worktree
           config.toasts.quiet = enabled;
         },
         strategy: () => {
-          const valid = ["sticky", "round-robin", "hybrid"];
+          const valid = ["sticky", "round-robin", "hybrid", "single"];
           if (valid.includes(value)) {
             saveConfig({ account_selection_strategy: value });
             strategyState.manualOverride = true;
@@ -5576,7 +5570,6 @@ process.once("beforeExit", _beforeExitHandler);
 // The compiled Bun binary computes cch dynamically: xxHash64(body, seed) & 0xFFFFF.
 // Captured real CC v2.1.107 request shows cch=6d00f (5-hex-char, 20-bit masked hash).
 // Seed extracted from binary: 0x6E52736AC806831E (unchanged since v2.1.96).
-const CCH_SEED = 0x6e52736ac806831en; // BigInt — Attestation.zig seed
 
 /** @type {null | ((buf: Uint8Array, seed: bigint) => bigint)} */
 let _xxh64Raw = null;
@@ -5584,22 +5577,6 @@ const _xxhashReady = xxhashInit().then((h) => {
   _xxh64Raw = h.h64Raw;
 });
 
-/**
- * Compute and replace the cch=00000 placeholder in the serialized body with
- * xxHash64(body, seed) & 0xFFFFF, matching the Bun binary's native attestation.
- * @param {string} body - Serialized JSON body
- * @returns {Promise<string>} Body with cch replaced
- */
-async function computeAndReplaceCCH(body) {
-  if (typeof body !== "string" || !body.includes("cch=00000")) return body;
-  await _xxhashReady;
-  if (!_xxh64Raw) return body; // fallback: send as-is if wasm failed to load
-  const bodyBytes = Buffer.from(body, "utf-8");
-  const hash = _xxh64Raw(bodyBytes, CCH_SEED);
-  const cch = (hash & 0xfffffn).toString(16).padStart(5, "0");
-  return body.replace("cch=00000", `cch=${cch}`);
-}
-
 /**
  * Extract the text content of the first user message for billing hash computation.
  * @param {any[] | undefined} messages
@@ -5700,13 +5677,6 @@ function shouldDebugSystemPrompt() {
  * @returns {Record<string, string>}
  */
 
-/**
- * @returns {string}
- */
-function getClaudeEntrypoint() {
-  return process.env.CLAUDE_CODE_ENTRYPOINT || "cli";
-}
-
 /**
  * @param {string | undefined} model
  * @returns {string | undefined}
@@ -5733,15 +5703,6 @@ function logTransformedSystemPrompt(body) {
  * @returns {boolean}
  */
 
-/**
- * @param {string | undefined} body
- * @returns {boolean}
- */
-function supportsThinking(model) {
-  if (!model) return true;
-  return /claude|sonnet|opus|haiku/i.test(model);
-}
-
 /**
  * @param {string | undefined} body
  * @returns {boolean}
@@ -5830,19 +5791,6 @@ function getAccountIdentifier(account) {
  * @returns {{user_id: string}}
  */
 
-/**
- * Return the cache_control object appropriate for the given cache policy.
- * @param {{ttl: string, ttl_supported: boolean, boundary_marker?: boolean} | undefined} cachePolicy
- * @returns {{type: string, ttl?: string}}
- */
-function getCacheControlForPolicy(cachePolicy) {
-  if (!cachePolicy) return { type: "ephemeral" };
-  if (cachePolicy.ttl === "off" || cachePolicy.ttl_supported === false) {
-    return { type: "ephemeral" };
-  }
-  return { type: "ephemeral", ttl: cachePolicy.ttl };
-}
-
 /**
  * @param {string} incomingBeta
  * @param {boolean} signatureEnabled
@@ -5866,18 +5814,6 @@ function getCacheControlForPolicy(cachePolicy) {
 
 /** @typedef {'low' | 'medium' | 'high'} ThinkingEffort */
 
-/**
- * Map budgetTokens to an effort level.
- * Used when an Opus 4.6 request arrives with the legacy budgetTokens shape.
- * @param {number} budgetTokens
- * @returns {ThinkingEffort}
- */
-function budgetTokensToEffort(budgetTokens) {
-  if (budgetTokens <= 1024) return "low";
-  if (budgetTokens <= 8000) return "medium";
-  return "high";
-}
-
 // QA fix L3: budgetTokensToEffort() removed — dead code, never called
 // QA fix L4: isValidEffort() removed — dead code, never called
 
@@ -6068,19 +6004,6 @@ function isEventStreamResponse(response) {
   return contentType.toLowerCase().includes("text/event-stream");
 }
 
-/**
- * Build user-facing switch reason text for account-specific errors.
- * @param {number} status
- * @param {import('./lib/backoff.mjs').RateLimitReason} reason
- * @returns {string}
- */
-function formatSwitchReason(status, reason) {
-  if (reason === "AUTH_FAILED") return "auth failed";
-  if (status === 403 && reason === "QUOTA_EXHAUSTED") return "permission denied";
-  if (reason === "QUOTA_EXHAUSTED") return "quota exhausted";
-  return "rate-limited";
-}
-
 // ---------------------------------------------------------------------------
 // Token refresh (per-account)
 // ---------------------------------------------------------------------------
@@ -6153,7 +6076,7 @@ function applyDiskAuthIfFresher(account, diskAuth, options = {}) {
  * @returns {Promise<string>} The new access token
  * @throws {Error} If refresh fails
  */
-async function refreshAccountToken(account, client, source = "foreground", { onTokensUpdated } = {}) {
+async function refreshAccountToken(account, client, _source = "foreground", { onTokensUpdated } = {}) {
   // CC-sourced accounts must NEVER enter the OAuth HTTP refresh flow.
   // Instead, re-read credentials from the CC source.  If they're still
   // expired, let the caller handle it (the account will be skipped).

package/lib/backoff.mjs

@@ -134,7 +134,7 @@ function extractErrorSignals(body) {
  * @returns {boolean}
  */
 function bodyHasAccountError(body) {
-  const { errorType, message, text } = extractErrorSignals(body);
+  const { errorType, message } = extractErrorSignals(body);
 
   const typeSignals = [
     "rate_limit",

package/lib/cc-credentials.mjs

@@ -84,7 +84,7 @@ function readKeychainService(service) {
     }).trim();
 
     return parseCCCredentialData(raw, "cc-keychain", `keychain:${service}`);
-  } catch (err) {
+  } catch {
     // Exit code 36 = user denied, 44 = not found, 128 = killed
     return null;
   }

package/lib/config.mjs

@@ -4,7 +4,7 @@ import { homedir } from "node:os";
 import { randomBytes } from "node:crypto";
 
 /**
- * @typedef {'sticky' | 'round-robin' | 'hybrid'} AccountSelectionStrategy
+ * @typedef {'sticky' | 'round-robin' | 'hybrid' | 'single'} AccountSelectionStrategy
  */
 
 /**
@@ -449,7 +449,7 @@ export const DEFAULT_CONFIG = {
   },
 };
 
-export const VALID_STRATEGIES = ["sticky", "round-robin", "hybrid"];
+export const VALID_STRATEGIES = ["sticky", "round-robin", "hybrid", "single"];
 
 /** OpenCode's OAuth client ID for Anthropic console auth flows. */
 export const CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";

package/lib/config.test.mjs

@@ -138,6 +138,13 @@ describe("loadConfig", () => {
     expect(config.account_selection_strategy).toBe("sticky");
   });
 
+  it("accepts 'single' strategy from config file", () => {
+    existsSync.mockReturnValue(true);
+    readFileSync.mockReturnValue(JSON.stringify({ account_selection_strategy: "single" }));
+    const config = loadConfig();
+    expect(config.account_selection_strategy).toBe("single");
+  });
+
   it("ignores invalid strategy", () => {
     existsSync.mockReturnValue(true);
     readFileSync.mockReturnValue(JSON.stringify({ account_selection_strategy: "invalid" }));

package/lib/mimicry/headers.mjs

@@ -177,8 +177,6 @@ export function buildAnthropicBetaHeader(
     return mergedBetas.join(",");
   }
 
-  const nonInteractive = isNonInteractiveMode();
-  const haiku = isHaikuModel(model);
   const isRoundRobin = strategy === "round-robin";
   const te = tokenEconomy || {};
 

package/lib/mimicry/request-body.mjs

@@ -66,8 +66,6 @@ export const CORE_TOOL_NAMES = new Set([
 export function transformRequestBody(body, signature, runtime, betaHeader, config) {
   if (!body || typeof body !== "string") return body;
 
-  const TOOL_PREFIX = "mcp_";
-
   try {
     const parsed = JSON.parse(body);
     // Diagnostic: log the incoming model + thinking/speed shape so model-routing

package/lib/rotation.mjs

@@ -259,6 +259,22 @@ export function selectAccount(candidates, strategy, currentIndex, healthTracker,
       return next ? { index: next.index, cursor: cursor + 1 } : null;
     }
 
+    case "single": {
+      // Single-account mode: use exactly one account and never auto-rotate.
+      // Stay on the current account while it is available; if it is
+      // rate-limited or otherwise unavailable, STOP (return null) so the
+      // caller alerts the user instead of silently switching accounts.
+      // Auto-resumes once the account becomes available again (e.g. the
+      // rate-limit window expires). See issue #20.
+      if (currentIndex !== null) {
+        const current = available.find((acc) => acc.index === currentIndex);
+        return current ? { index: current.index, cursor } : null;
+      }
+      // No account selected yet — pick the first available as the single account.
+      const next = available[cursor % available.length];
+      return next ? { index: next.index, cursor: cursor + 1 } : null;
+    }
+
     case "hybrid": {
       const scoredCandidates = available
         .filter((acc) => healthTracker.isUsable(acc.index) && tokenTracker.hasTokens(acc.index))

package/lib/rotation.test.mjs

@@ -337,6 +337,52 @@ describe("selectAccount", () => {
     });
   });
 
+  // Single strategy (issue #20)
+  describe("single strategy", () => {
+    it("selects first available account when no current index", () => {
+      const candidates = [makeCandidate({ index: 0 }), makeCandidate({ index: 1 })];
+      const result = selectAccount(candidates, "single", null, healthTracker, tokenTracker, 0);
+      expect(result?.index).toBe(0);
+    });
+
+    it("stays on the current account when it is available", () => {
+      const candidates = [makeCandidate({ index: 0 }), makeCandidate({ index: 1 })];
+      const result = selectAccount(candidates, "single", 0, healthTracker, tokenTracker, 0);
+      expect(result?.index).toBe(0);
+      expect(result?.cursor).toBe(0);
+    });
+
+    it("returns null when current is rate-limited (does NOT switch)", () => {
+      const candidates = [makeCandidate({ index: 0, isRateLimited: true }), makeCandidate({ index: 1 })];
+      const result = selectAccount(candidates, "single", 0, healthTracker, tokenTracker, 0);
+      // Unlike sticky, single must NOT fall through to account 1.
+      expect(result).toBeNull();
+    });
+
+    it("returns null when the current account is gone (disabled/removed)", () => {
+      const candidates = [makeCandidate({ index: 1 })];
+      const result = selectAccount(candidates, "single", 0, healthTracker, tokenTracker, 0);
+      expect(result).toBeNull();
+    });
+
+    it("ignores health score and stays on current", () => {
+      for (let i = 0; i < 5; i++) {
+        healthTracker.recordFailure(0);
+      }
+      const candidates = [makeCandidate({ index: 0 }), makeCandidate({ index: 1 })];
+      const result = selectAccount(candidates, "single", 0, healthTracker, tokenTracker, 0);
+      expect(result?.index).toBe(0);
+    });
+
+    it("auto-resumes the current account once its rate-limit clears", () => {
+      const limited = [makeCandidate({ index: 0, isRateLimited: true }), makeCandidate({ index: 1 })];
+      expect(selectAccount(limited, "single", 0, healthTracker, tokenTracker, 0)).toBeNull();
+      const cleared = [makeCandidate({ index: 0 }), makeCandidate({ index: 1 })];
+      const result = selectAccount(cleared, "single", 0, healthTracker, tokenTracker, 0);
+      expect(result?.index).toBe(0);
+    });
+  });
+
   // Default/unknown strategy
   it("falls back to first available for unknown strategy", () => {
     const candidates = [makeCandidate({ index: 0 }), makeCandidate({ index: 1 })];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "GPL-3.0-or-later",
   "repository": {
     "type": "git",