opencode-anthropic-fix 0.1.32 → 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)
@@ -597,6 +598,8 @@ Account credentials are stored with restrictive file permissions (owner read/wri
 
 ## Troubleshooting
 
+Run `opencode-anthropic-auth diagnose` to write a redacted, shareable diagnostic bundle, or add `--stdout` to print it.
+
 ### "Provider not showing up"
 
 Make sure the plugin is installed in `~/.config/opencode/plugin/`. Restart OpenCode after installing.

package/cli.mjs

@@ -29,13 +29,17 @@
  */
 
 import { loadAccounts, saveAccounts, getStoragePath, createDefaultStats } from "./lib/storage.mjs";
-import { loadConfig, saveConfig, getConfigPath, VALID_STRATEGIES, CLIENT_ID } from "./lib/config.mjs";
-import { authorize, exchange, revoke } from "./lib/oauth.mjs";
+import { loadConfig, saveConfig, getConfigPath, VALID_STRATEGIES } from "./lib/config.mjs";
+import { authorize, exchange, refreshToken, revoke } from "./lib/oauth.mjs";
+import { adjustActiveIndexAfterRemoval } from "./lib/account-state.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
+import { writeFile } from "node:fs/promises";
+import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { exec } from "node:child_process";
 import { createInterface } from "node:readline/promises";
 import { stdin, stdout } from "node:process";
+import { buildDiagnosticBundle } from "./lib/diagnose.mjs";
 
 // ---------------------------------------------------------------------------
 // Color helpers — zero dependencies, respects NO_COLOR / TTY
@@ -146,18 +150,7 @@ function rpad(str, width) {
  */
 export async function refreshAccessToken(account) {
   try {
-    const resp = await fetch("https://platform.claude.com/v1/oauth/token", {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        grant_type: "refresh_token",
-        refresh_token: account.refreshToken,
-        client_id: CLIENT_ID,
-      }),
-      signal: AbortSignal.timeout(5000),
-    });
-    if (!resp.ok) return null;
-    const json = await resp.json();
+    const json = await refreshToken(account.refreshToken, { signal: AbortSignal.timeout(5000) });
     account.access = json.access_token;
     account.expires = Date.now() + json.expires_in * 1000;
     if (json.refresh_token) account.refreshToken = json.refresh_token;
@@ -483,13 +476,7 @@ export async function cmdLogout(arg, opts = {}) {
   stored.accounts.splice(idx, 1);
 
   // Adjust active index
-  if (stored.accounts.length === 0) {
-    stored.activeIndex = 0;
-  } else if (stored.activeIndex >= stored.accounts.length) {
-    stored.activeIndex = stored.accounts.length - 1;
-  } else if (stored.activeIndex > idx) {
-    stored.activeIndex--;
-  }
+  adjustActiveIndexAfterRemoval(stored, idx);
 
   await saveAccounts(stored);
   console.log(c.green(`Logged out account #${n} (${label}).`));
@@ -1019,13 +1006,7 @@ export async function cmdRemove(arg, opts = {}) {
   stored.accounts.splice(idx, 1);
 
   // Adjust active index
-  if (stored.accounts.length === 0) {
-    stored.activeIndex = 0;
-  } else if (stored.activeIndex >= stored.accounts.length) {
-    stored.activeIndex = stored.accounts.length - 1;
-  } else if (stored.activeIndex > idx) {
-    stored.activeIndex--;
-  }
+  adjustActiveIndexAfterRemoval(stored, idx);
 
   await saveAccounts(stored);
   console.log(c.green(`Removed account #${n} (${label}).`));
@@ -1172,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) {
@@ -1514,13 +1496,7 @@ export async function cmdManage() {
           if (confirm.trim().toLowerCase() === "y") {
             stored.accounts.splice(idx, 1);
             // Adjust active index
-            if (stored.accounts.length === 0) {
-              stored.activeIndex = 0;
-            } else if (stored.activeIndex >= stored.accounts.length) {
-              stored.activeIndex = stored.accounts.length - 1;
-            } else if (stored.activeIndex > idx) {
-              stored.activeIndex--;
-            }
+            adjustActiveIndexAfterRemoval(stored, idx);
             await saveAccounts(stored);
             console.log(c.green(`Removed account #${num}.`));
           } else {
@@ -1557,6 +1533,34 @@ export async function cmdManage() {
   return 0;
 }
 
+/**
+ * Write or print a redacted diagnostic bundle.
+ *
+ * @param {string | undefined} _arg
+ * @param {{ stdout?: boolean }} [opts]
+ * @returns {Promise<number>} exit code
+ */
+export async function cmdDiagnose(_arg, opts = {}) {
+  try {
+    const bundle = await buildDiagnosticBundle();
+    const json = JSON.stringify(bundle, null, 2);
+    if (opts.stdout) {
+      console.log(json);
+      return 0;
+    }
+
+    const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
+    const outputPath = path.resolve(process.cwd(), `opencode-anthropic-diagnose-${timestamp}.json`);
+    await writeFile(outputPath, `${json}\n`, "utf8");
+    console.log(outputPath);
+    return 0;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(c.red(`Failed to create diagnostic bundle: ${message}`));
+    return 1;
+  }
+}
+
 /**
  * Show help text.
  */
@@ -1588,6 +1592,7 @@ ${c.dim("Account Commands:")}
   ${pad(c.cyan("strategy") + " [name]", 22)}Show or change selection strategy
   ${pad(c.cyan("config"), 22)}Show configuration and file paths
   ${pad(c.cyan("manage"), 22)}Interactive account management menu
+  ${pad(c.cyan("diagnose"), 22)}Write a redacted diagnostic bundle ${c.dim("(dg; --stdout to print)")}
   ${pad(c.cyan("help"), 22)}Show this help message
 
 ${c.dim("Options:")}
@@ -1732,6 +1737,9 @@ async function dispatch(argv) {
     case "manage":
     case "mg":
       return cmdManage();
+    case "diagnose":
+    case "dg":
+      return cmdDiagnose(arg, { stdout: flags.includes("--stdout") });
     case "help":
     case "-h":
     case "--help":