opencode-anthropic-fix 0.0.18 → 0.0.20

package/README.md

@@ -43,8 +43,9 @@ The [original plugin](https://github.com/anomalyco/opencode-anthropic-auth) prov
 - **Standalone CLI** — manage accounts without opening OpenCode
 - **Configurable strategies** — sticky, round-robin, or hybrid account selection
 - **Claude Code signature emulation** — full HTTP header, system prompt, beta flag, and metadata mimicry derived from Claude Code's open source code
-- **Adaptive thinking for Opus 4.6** — automatically uses `adaptive-thinking-2026-01-28` and maps `budgetTokens` to effort levels (`low`/`medium`/`high`/`max`)
+- **Adaptive thinking for Opus 4.6** — automatically uses `adaptive-thinking-2026-01-28` and maps `budgetTokens` to effort levels (`low`/`medium`/`high`)
 - **1M context limit override** — patches `model.limit.context` so OpenCode compacts at the right threshold while `models.dev` catches up
+- **Runtime config + custom betas** — `/anthropic set`, `/anthropic config`, and `/anthropic betas` slash commands for live feature toggling without restarting OpenCode
 
 ## Installation
 
@@ -231,20 +232,65 @@ Most commands have short aliases: `ln`, `lo`, `ra`, `rf`, `ls`, `st`, `sw`, `en`
 
 ## Slash Commands in OpenCode
 
-The plugin also registers a built-in `/anthropic` slash command so you can manage accounts without leaving OpenCode.
+The plugin registers a built-in `/anthropic` slash command for account management, feature toggles, and custom beta headers — all without leaving OpenCode.
 
-### Common examples
+### Account management
 
 ```text
-/anthropic                # list (default)
+/anthropic                # list accounts (default)
 /anthropic usage          # full account list + quota windows
 /anthropic switch 2
 /anthropic refresh 1
 /anthropic logout 2       # revoke tokens and remove account 2
 /anthropic logout --all   # revoke all tokens and clear all accounts
-/anthropic strategy hybrid
 /anthropic stats
-/anthropic config
+```
+
+### Runtime configuration
+
+Toggle features live without restarting OpenCode. Changes are persisted to `anthropic-auth.json`.
+
+```text
+/anthropic config                  # show all current settings
+/anthropic set emulation on        # enable/disable Claude signature emulation
+/anthropic set compaction minimal  # set prompt compaction mode (minimal/off)
+/anthropic set 1m-context on       # enable/disable 1M context limit override
+/anthropic set idle-refresh on     # enable/disable idle account refresh
+/anthropic set strategy round-robin # change account selection strategy
+/anthropic set debug on            # enable/disable debug logging
+/anthropic set quiet on            # suppress non-error toasts
+```
+
+### Custom beta headers
+
+Add or remove beta flags that get included in every `anthropic-beta` header. Persisted across sessions.
+
+```text
+/anthropic betas                   # show active betas (auto + custom) with presets
+/anthropic betas add <beta-name>   # add a custom beta
+/anthropic betas remove <beta-name> # remove a custom beta
+```
+
+**Available preset betas** (shown by `/anthropic betas`):
+
+| Beta                              | Description                                       |
+| --------------------------------- | ------------------------------------------------- |
+| `prompt-caching-scope-2026-01-05` | Cache control with `scope: "org"` — free perf win |
+| `context-management-2025-06-27`   | Server-side auto-summarization when context fills |
+| `structured-outputs-2025-12-15`   | Strict JSON schema output enforcement             |
+| `tool-examples-2025-10-29`        | Input/output examples in tool definitions         |
+| `code-execution-2025-08-25`       | Python sandbox execution by the model             |
+| `files-api-2025-04-14`            | Upload once, reuse file ID across requests        |
+| `compact-2026-01-12`              | Conversation compaction endpoint                  |
+| `mcp-servers-2025-12-04`          | MCP servers in API request payload                |
+| `web-search-2025-03-05`           | Web search (Vertex/Foundry only)                  |
+
+Example workflow:
+
+```text
+/anthropic betas add prompt-caching-scope-2026-01-05
+/anthropic betas add context-management-2025-06-27
+/anthropic betas   # verify
 ```
 
 ### OAuth flows from slash command
@@ -272,11 +318,11 @@ 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, or when you want predictable behavior |
-| **`round-robin`**      | Rotate through accounts on every request                                                  | Spreading load evenly across accounts                 |
-| **`hybrid`**           | Score-based selection with stickiness bias. Considers health, token budget, and freshness | Multiple accounts with varying rate limits            |
+| Strategy                    | Behavior                                                                                  | Best For                                              |
+| --------------------------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------- |
+| **`round-robin`** (default) | Rotate through accounts on every request                                                  | Spreading load evenly across accounts                 |
+| **`sticky`**                | Stay on one account until it fails or is rate-limited                                     | Single account, or when you want predictable behavior |
+| **`hybrid`**                | Score-based selection with stickiness bias. Considers health, token budget, and freshness | Multiple accounts with varying rate limits            |
 
 ### Change Strategy
 
@@ -297,8 +343,8 @@ Configuration is stored at `~/.config/opencode/anthropic-auth.json`. All setting
 
 ```jsonc
 {
-  // Account selection strategy: "sticky" | "round-robin" | "hybrid"
-  "account_selection_strategy": "sticky",
+  // Account selection strategy: "round-robin" | "sticky" | "hybrid"
+  "account_selection_strategy": "round-robin",
 
   // Seconds before consecutive failure count resets (60-7200)
   "failure_ttl_seconds": 3600,
@@ -325,8 +371,8 @@ Configuration is stored at `~/.config/opencode/anthropic-auth.json`. All setting
   // Only applied for OAuth (Max Plan) sessions — API key users use the
   // context-1m-2025-08-07 beta header instead.
   "override_model_limits": {
-    // Enable/disable the override
-    "enabled": true,
+    // Enable/disable the override (default: off — enable if you need 1M context)
+    "enabled": false,
     // Context window to inject (tokens). Default: 1_000_000.
     "context": 1000000,
     // Max output tokens to inject. 0 = leave the model's default unchanged.
@@ -351,6 +397,9 @@ Configuration is stored at `~/.config/opencode/anthropic-auth.json`. All setting
     "initial_tokens": 50,
   },
 
+  // Custom beta headers (added to every request via /anthropic betas add)
+  "custom_betas": [],
+
   // Toast notification settings
   "toasts": {
     // Suppress non-error toasts (account status, switching)

package/index.mjs

@@ -5,7 +5,7 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { AccountManager } from "./lib/accounts.mjs";
 import { authorize, exchange, refreshToken } from "./lib/oauth.mjs";
-import { loadConfig, CLIENT_ID, getConfigDir } from "./lib/config.mjs";
+import { loadConfig, loadConfigFresh, saveConfig, CLIENT_ID, getConfigDir } from "./lib/config.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";
@@ -103,7 +103,7 @@ async function promptManageAccounts(accountManager) {
 // Request building helpers (extracted from original fetch interceptor)
 // ---------------------------------------------------------------------------
 
-const FALLBACK_CLAUDE_CLI_VERSION = "2.1.68";
+const FALLBACK_CLAUDE_CLI_VERSION = "2.1.76";
 const CLAUDE_CODE_NPM_LATEST_URL = "https://registry.npmjs.org/@anthropic-ai/claude-code/latest";
 const CLAUDE_CODE_BETA_FLAG = "claude-code-20250219";
 const BILLING_HASH_SALT = "59cf53e54c78";
@@ -292,7 +292,10 @@ function supportsThinking(model) {
  */
 function isOpus46Model(model) {
   if (!model) return false;
-  return /claude-opus-4[._-]6/i.test(model);
+  // Match standard IDs (claude-opus-4-6, claude-opus-4.6) and Bedrock ARNs
+  // (arn:aws:bedrock:...anthropic.claude-opus-4-6-...).
+  // Also match bare "opus-4-6" / "opus-4.6" fragments for non-standard strings.
+  return /claude-opus-4[._-]6|opus[._-]4[._-]6/i.test(model);
 }
 
 /**
@@ -300,7 +303,8 @@ function isOpus46Model(model) {
  * @returns {boolean}
  */
 function hasOneMillionContext(model) {
-  return /(^|[-_ ])1m($|[-_ ])|context[-_]?1m/i.test(model);
+  // Models with explicit 1m suffix, or Opus 4.6 (1M by default since v2.1.75).
+  return /(^|[-_ ])1m($|[-_ ])|context[-_]?1m/i.test(model) || isOpus46Model(model);
 }
 
 /**
@@ -655,9 +659,10 @@ function buildSystemPromptBlocks(system, signature, messages) {
  * @param {boolean} signatureEnabled
  * @param {string} model
  * @param {"anthropic" | "bedrock" | "vertex" | "foundry"} provider
+ * @param {string[]} [customBetas]
  * @returns {string}
  */
-function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provider) {
+function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provider, customBetas) {
   const incomingBetasList = incomingBeta
     .split(",")
     .map((b) => b.trim())
@@ -725,6 +730,10 @@ function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provide
 
   betas.push("fine-grained-tool-streaming-2025-05-14");
 
+  if (Array.isArray(customBetas)) {
+    betas.push(...customBetas.filter(Boolean));
+  }
+
   const mergedBetas = [...new Set([...betas, ...incomingBetasList])];
   if (provider === "bedrock") {
     return mergedBetas.filter((beta) => !BEDROCK_UNSUPPORTED_BETAS.has(beta)).join(",");
@@ -732,7 +741,7 @@ function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provide
   return mergedBetas.join(",");
 }
 
-/** @typedef {'low' | 'medium' | 'high' | 'max'} ThinkingEffort */
+/** @typedef {'low' | 'medium' | 'high'} ThinkingEffort */
 
 /**
  * Map budgetTokens to an adaptive thinking effort level.
@@ -743,8 +752,7 @@ function buildAnthropicBetaHeader(incomingBeta, signatureEnabled, model, provide
 function budgetTokensToEffort(budgetTokens) {
   if (budgetTokens <= 1024) return "low";
   if (budgetTokens <= 8000) return "medium";
-  if (budgetTokens <= 16000) return "high";
-  return "max";
+  return "high";
 }
 
 /**
@@ -753,7 +761,7 @@ function budgetTokensToEffort(budgetTokens) {
  * @returns {value is ThinkingEffort}
  */
 function isValidEffort(value) {
-  return value === "low" || value === "medium" || value === "high" || value === "max";
+  return value === "low" || value === "medium" || value === "high";
 }
 
 /**
@@ -884,7 +892,7 @@ function buildRequestHeaders(input, requestInit, accessToken, requestBody, reque
   const incomingBeta = requestHeaders.get("anthropic-beta") || "";
   const { model, tools, messages } = parseRequestBodyMetadata(requestBody);
   const provider = detectProvider(requestUrl);
-  const mergedBetas = buildAnthropicBetaHeader(incomingBeta, signature.enabled, model, provider);
+  const mergedBetas = buildAnthropicBetaHeader(incomingBeta, signature.enabled, model, provider, signature.customBetas);
 
   const authTokenOverride = process.env.ANTHROPIC_AUTH_TOKEN?.trim();
   const bearerToken = authTokenOverride || accessToken;
@@ -1427,10 +1435,14 @@ function applyDiskAuthIfFresher(account, diskAuth, options = {}) {
  * @param {import('./lib/accounts.mjs').ManagedAccount} account
  * @param {ReturnType<typeof import('@opencode-ai/sdk').createOpencodeClient>} client
  * @param {"foreground" | "idle"} [source]
+ * @param {{ onTokensUpdated?: () => Promise<void> }} [options] - If provided,
+ *   called under the cross-process lock after token update to persist rotated
+ *   tokens before the lock is released.  Omitting means tokens won't be saved
+ *   to disk until the caller arranges it (risking the rotation race).
  * @returns {Promise<string>} The new access token
  * @throws {Error} If refresh fails
  */
-async function refreshAccountToken(account, client, source = "foreground") {
+async function refreshAccountToken(account, client, source = "foreground", { onTokensUpdated } = {}) {
   const lockResult = await acquireRefreshLock(account.id, {
     timeoutMs: 2_000,
     backoffMs: 60,
@@ -1471,6 +1483,22 @@ async function refreshAccountToken(account, client, source = "foreground") {
     }
     markTokenStateUpdated(account);
 
+    // Persist new tokens to disk BEFORE releasing the cross-process lock.
+    // This is critical: if we release the lock first, another process can
+    // acquire it and read the old (now-rotated) refresh token from disk,
+    // leading to an invalid_grant failure.  The debounced requestSaveToDisk()
+    // that callers used previously left a ~1 s window where this race could
+    // (and did) happen.
+    if (onTokensUpdated) {
+      try {
+        await onTokensUpdated();
+      } catch {
+        // Best-effort: in-memory tokens remain valid for this process.
+        // The callback is responsible for scheduling its own fallback
+        // (e.g. a debounced retry) if the synchronous save fails.
+      }
+    }
+
     // Also persist to OpenCode's auth.json for compatibility.
     // This should be best-effort: a persistence hiccup should not invalidate an
     // otherwise successful refresh token exchange.
@@ -1877,6 +1905,140 @@ export async function AnthropicAuthPlugin({ client }) {
       return;
     }
 
+    // /anthropic config — show effective config
+    if (primary === "config") {
+      const fresh = loadConfigFresh();
+      const lines = [
+        "▣ Anthropic Config",
+        "",
+        `strategy: ${fresh.account_selection_strategy}`,
+        `emulation: ${fresh.signature_emulation.enabled ? "on" : "off"}`,
+        `compaction: ${fresh.signature_emulation.prompt_compaction}`,
+        `1m-context: ${fresh.override_model_limits.enabled ? "on" : "off"}`,
+        `idle-refresh: ${fresh.idle_refresh.enabled ? "on" : "off"}`,
+        `debug: ${fresh.debug ? "on" : "off"}`,
+        `quiet: ${fresh.toasts.quiet ? "on" : "off"}`,
+        `custom_betas: ${fresh.custom_betas.length ? fresh.custom_betas.join(", ") : "(none)"}`,
+      ];
+      await sendCommandMessage(input.sessionID, lines.join("\n"));
+      return;
+    }
+
+    // /anthropic set <key> <value> — toggle features at runtime
+    if (primary === "set") {
+      const key = (args[1] || "").toLowerCase();
+      const value = (args[2] || "").toLowerCase();
+      /** @type {Record<string, () => void>} */
+      const setters = {
+        emulation: () =>
+          saveConfig({ signature_emulation: { enabled: value === "on" || value === "1" || value === "true" } }),
+        compaction: () =>
+          saveConfig({ signature_emulation: { prompt_compaction: value === "off" ? "off" : "minimal" } }),
+        "1m-context": () =>
+          saveConfig({ override_model_limits: { enabled: value === "on" || value === "1" || value === "true" } }),
+        "idle-refresh": () =>
+          saveConfig({ idle_refresh: { enabled: value === "on" || value === "1" || value === "true" } }),
+        debug: () => saveConfig({ debug: value === "on" || value === "1" || value === "true" }),
+        quiet: () => saveConfig({ toasts: { quiet: value === "on" || value === "1" || value === "true" } }),
+        strategy: () => {
+          const valid = ["sticky", "round-robin", "hybrid"];
+          if (valid.includes(value)) saveConfig({ account_selection_strategy: value });
+          else throw new Error(`Invalid strategy. Valid: ${valid.join(", ")}`);
+        },
+      };
+
+      if (!key || !setters[key]) {
+        const keys = Object.keys(setters).join(", ");
+        await sendCommandMessage(
+          input.sessionID,
+          `▣ Anthropic Set\n\nUsage: /anthropic set <key> <value>\nKeys: ${keys}\nValues: on/off (or specific values for strategy/compaction)`,
+        );
+        return;
+      }
+      if (!value) {
+        await sendCommandMessage(input.sessionID, `▣ Anthropic Set\n\nMissing value for "${key}".`);
+        return;
+      }
+      setters[key]();
+      // Reload config into runtime
+      Object.assign(config, loadConfigFresh());
+      await sendCommandMessage(input.sessionID, `▣ Anthropic Set\n\n${key} = ${value}`);
+      return;
+    }
+
+    // /anthropic betas [add|remove <beta>] — show/manage custom betas
+    if (primary === "betas") {
+      const action = (args[1] || "").toLowerCase();
+
+      if (!action || action === "list") {
+        const fresh = loadConfigFresh();
+        const lines = [
+          "▣ Anthropic Betas",
+          "",
+          "Preset betas (auto-computed per model/provider):",
+          "  oauth-2025-04-20, claude-code-20250219,",
+          "  interleaved-thinking-2025-05-14 OR adaptive-thinking-2026-01-28,",
+          "  fine-grained-tool-streaming-2025-05-14",
+          "",
+          `Custom betas: ${fresh.custom_betas.length ? fresh.custom_betas.join(", ") : "(none)"}`,
+          "",
+          "Toggleable presets:",
+          "  /anthropic betas add structured-outputs-2025-12-15",
+          "  /anthropic betas add context-management-2025-06-27",
+          "  /anthropic betas add prompt-caching-scope-2026-01-05",
+          "  /anthropic betas add tool-examples-2025-10-29",
+          "  /anthropic betas add web-search-2025-03-05",
+          "  /anthropic betas add code-execution-2025-08-25",
+          "  /anthropic betas add compact-2026-01-12",
+          "  /anthropic betas add mcp-servers-2025-12-04",
+          "  /anthropic betas add files-api-2025-04-14",
+          "",
+          "Remove: /anthropic betas remove <beta>",
+        ];
+        await sendCommandMessage(input.sessionID, lines.join("\n"));
+        return;
+      }
+
+      if (action === "add") {
+        const beta = args[2]?.trim();
+        if (!beta) {
+          await sendCommandMessage(input.sessionID, "▣ Anthropic Betas\n\nUsage: /anthropic betas add <beta-name>");
+          return;
+        }
+        const fresh = loadConfigFresh();
+        const current = fresh.custom_betas || [];
+        if (current.includes(beta)) {
+          await sendCommandMessage(input.sessionID, `▣ Anthropic Betas\n\n"${beta}" already added.`);
+          return;
+        }
+        saveConfig({ custom_betas: [...current, beta] });
+        Object.assign(config, loadConfigFresh());
+        await sendCommandMessage(input.sessionID, `▣ Anthropic Betas\n\nAdded: ${beta}`);
+        return;
+      }
+
+      if (action === "remove" || action === "rm") {
+        const beta = args[2]?.trim();
+        if (!beta) {
+          await sendCommandMessage(input.sessionID, "▣ Anthropic Betas\n\nUsage: /anthropic betas remove <beta-name>");
+          return;
+        }
+        const fresh = loadConfigFresh();
+        const current = fresh.custom_betas || [];
+        if (!current.includes(beta)) {
+          await sendCommandMessage(input.sessionID, `▣ Anthropic Betas\n\n"${beta}" not in custom betas.`);
+          return;
+        }
+        saveConfig({ custom_betas: current.filter((b) => b !== beta) });
+        Object.assign(config, loadConfigFresh());
+        await sendCommandMessage(input.sessionID, `▣ Anthropic Betas\n\nRemoved: ${beta}`);
+        return;
+      }
+
+      await sendCommandMessage(input.sessionID, "▣ Anthropic Betas\n\nUsage: /anthropic betas [add|remove <beta>]");
+      return;
+    }
+
     // Interactive CLI command is not compatible with slash flow.
     if (primary === "manage" || primary === "mg") {
       await sendCommandMessage(
@@ -2011,7 +2173,21 @@ export async function AnthropicAuthPlugin({ client }) {
     const entry = { source, promise: Promise.resolve("") };
     const p = (async () => {
       try {
-        return await refreshAccountToken(account, client, source);
+        return await refreshAccountToken(account, client, source, {
+          onTokensUpdated: async () => {
+            try {
+              await accountManager.saveToDisk();
+            } catch {
+              // Synchronous save failed (disk full, permissions, etc.).
+              // Schedule a debounced retry so the rotated token eventually
+              // reaches disk.  Another process may hit invalid_grant in the
+              // interim, but its retry-from-disk logic can recover once this
+              // save lands.
+              accountManager.requestSaveToDisk();
+              throw new Error("save failed, debounced retry scheduled");
+            }
+          },
+        });
       } finally {
         if (refreshInFlight.get(key) === entry) {
           refreshInFlight.delete(key);
@@ -2040,7 +2216,6 @@ export async function AnthropicAuthPlugin({ client }) {
     try {
       try {
         await refreshAccountTokenSingleFlight(account, "idle");
-        accountManager.requestSaveToDisk();
         return;
       } catch (err) {
         let details = parseRefreshFailure(err);
@@ -2068,7 +2243,6 @@ export async function AnthropicAuthPlugin({ client }) {
 
         try {
           await refreshAccountTokenSingleFlight(account, "idle");
-          accountManager.requestSaveToDisk();
           return;
         } catch (retryErr) {
           details = parseRefreshFailure(retryErr);
@@ -2125,7 +2299,7 @@ export async function AnthropicAuthPlugin({ client }) {
       input.command ??= {};
       input.command["anthropic"] = {
         template: "/anthropic",
-        description: "Manage Anthropic multi-account auth (status, usage, switch, login, reauth, logout)",
+        description: "Manage Anthropic auth, config, and betas (usage, login, config, set, betas, switch)",
       };
     },
     "command.execute.before": async (input) => {
@@ -2252,8 +2426,8 @@ export async function AnthropicAuthPlugin({ client }) {
                   const attemptedRefreshToken = account.refreshToken;
                   try {
                     accessToken = await refreshAccountTokenSingleFlight(account);
-                    // Persist updated tokens (especially if refresh token rotated)
-                    accountManager.requestSaveToDisk();
+                    // Tokens are now saved under the refresh lock (inside
+                    // refreshAccountToken) so no debounced save needed here.
                   } catch (err) {
                     // Token refresh failed — check if another instance rotated the
                     // refresh token and persisted it between attempts.
@@ -2287,7 +2461,6 @@ export async function AnthropicAuthPlugin({ client }) {
 
                       try {
                         accessToken = await refreshAccountTokenSingleFlight(account);
-                        accountManager.requestSaveToDisk();
                       } catch (retryErr) {
                         finalError = retryErr;
                         details = parseRefreshFailure(retryErr);
@@ -2354,6 +2527,7 @@ export async function AnthropicAuthPlugin({ client }) {
                 const requestHeaders = buildRequestHeaders(input, requestInit, accessToken, body, requestUrl, {
                   enabled: signatureEmulationEnabled,
                   claudeCliVersion,
+                  customBetas: config.custom_betas,
                 });
                 // Execute the request
                 let response;

package/lib/config.mjs

@@ -51,6 +51,7 @@ import { homedir } from "node:os";
  * @property {boolean} debug
  * @property {{ enabled: boolean, fetch_claude_code_version_on_startup: boolean, prompt_compaction: 'minimal' | 'off' }} signature_emulation
  * @property {OverrideModelLimitsConfig} override_model_limits
+ * @property {string[]} custom_betas
  * @property {HealthScoreConfig} health_score
  * @property {TokenBucketConfig} token_bucket
  * @property {ToastConfig} toasts
@@ -60,7 +61,7 @@ import { homedir } from "node:os";
 
 /** @type {AnthropicAuthConfig} */
 export const DEFAULT_CONFIG = {
-  account_selection_strategy: "sticky",
+  account_selection_strategy: "round-robin",
   failure_ttl_seconds: 3600,
   debug: false,
   signature_emulation: {
@@ -69,10 +70,11 @@ export const DEFAULT_CONFIG = {
     prompt_compaction: "minimal",
   },
   override_model_limits: {
-    enabled: true,
+    enabled: false,
     context: 1_000_000,
     output: 0,
   },
+  custom_betas: [],
   health_score: {
     initial: 70,
     success_reward: 1,
@@ -112,6 +114,7 @@ function createDefaultConfig() {
     ...DEFAULT_CONFIG,
     signature_emulation: { ...DEFAULT_CONFIG.signature_emulation },
     override_model_limits: { ...DEFAULT_CONFIG.override_model_limits },
+    custom_betas: [...DEFAULT_CONFIG.custom_betas],
     health_score: { ...DEFAULT_CONFIG.health_score },
     token_bucket: { ...DEFAULT_CONFIG.token_bucket },
     toasts: { ...DEFAULT_CONFIG.toasts },
@@ -197,6 +200,11 @@ function validateConfig(raw) {
     };
   }
 
+  // Custom betas
+  if (Array.isArray(raw.custom_betas)) {
+    config.custom_betas = raw.custom_betas.filter((b) => typeof b === "string" && b.trim()).map((b) => b.trim());
+  }
+
   // Health score sub-config
   if (raw.health_score && typeof raw.health_score === "object") {
     const hs = /** @type {Record<string, unknown>} */ (raw.health_score);
@@ -408,19 +416,56 @@ export function loadRawConfig() {
  * Uses atomic write (temp + rename) for safety.
  * @param {Record<string, unknown>} updates - Keys to merge into the config file
  */
+/**
+ * Deep merge source into target (one level deep for objects, replace for arrays/primitives).
+ * @param {Record<string, unknown>} target
+ * @param {Record<string, unknown>} source
+ * @returns {Record<string, unknown>}
+ */
+function deepMergeConfig(target, source) {
+  const result = { ...target };
+  for (const [key, value] of Object.entries(source)) {
+    if (
+      value &&
+      typeof value === "object" &&
+      !Array.isArray(value) &&
+      typeof result[key] === "object" &&
+      result[key] &&
+      !Array.isArray(result[key])
+    ) {
+      result[key] = {
+        .../** @type {Record<string, unknown>} */ (result[key]),
+        .../** @type {Record<string, unknown>} */ (value),
+      };
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
 export function saveConfig(updates) {
   const configPath = getConfigPath();
   const dir = dirname(configPath);
   mkdirSync(dir, { recursive: true });
 
-  // Read existing raw config
+  // Re-read from disk to avoid clobbering concurrent writes
   const existing = loadRawConfig();
 
-  // Merge updates
-  const merged = { ...existing, ...updates };
+  // Deep merge (one level) so sub-config objects are merged, not replaced
+  const merged = deepMergeConfig(existing, updates);
 
   // Atomic write: temp file + rename
   const tmpPath = configPath + `.tmp.${process.pid}`;
   writeFileSync(tmpPath, JSON.stringify(merged, null, 2) + "\n", { encoding: "utf-8", mode: 0o600 });
   renameSync(tmpPath, configPath);
 }
+
+/**
+ * Load config fresh from disk (bypassing any startup cache).
+ * Useful for slash commands that need current on-disk state.
+ * @returns {AnthropicAuthConfig}
+ */
+export function loadConfigFresh() {
+  return loadConfig();
+}

package/lib/config.test.mjs

@@ -10,7 +10,7 @@ vi.mock("node:fs", () => ({
 
 describe("DEFAULT_CONFIG", () => {
   it("has expected default strategy", () => {
-    expect(DEFAULT_CONFIG.account_selection_strategy).toBe("sticky");
+    expect(DEFAULT_CONFIG.account_selection_strategy).toBe("round-robin");
   });
 
   it("has expected health score defaults", () => {
@@ -114,7 +114,7 @@ describe("loadConfig", () => {
     existsSync.mockReturnValue(true);
     readFileSync.mockReturnValue(JSON.stringify({ account_selection_strategy: "invalid" }));
     const config = loadConfig();
-    expect(config.account_selection_strategy).toBe("sticky");
+    expect(config.account_selection_strategy).toBe("round-robin");
   });
 
   it("accepts boolean debug", () => {
@@ -199,7 +199,7 @@ describe("loadConfig", () => {
     existsSync.mockReturnValue(false);
     process.env.OPENCODE_ANTHROPIC_STRATEGY = "invalid";
     const config = loadConfig();
-    expect(config.account_selection_strategy).toBe("sticky");
+    expect(config.account_selection_strategy).toBe("round-robin");
   });
 
   it("enables debug from OPENCODE_ANTHROPIC_DEBUG=1", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-anthropic-fix",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "main": "./index.mjs",
   "files": [
     "index.mjs",