@azumag/opencode-rate-limit-fallback 1.31.0 → 1.36.0

package/dist/src/types/index.js

@@ -23,6 +23,16 @@ export const DEFAULT_RETRY_POLICY = {
     jitterEnabled: false,
     jitterFactor: 0.1,
 };
+/**
+ * Default circuit breaker configuration
+ */
+export const DEFAULT_CIRCUIT_BREAKER_CONFIG = {
+    enabled: false,
+    failureThreshold: 5,
+    recoveryTimeoutMs: 60000,
+    halfOpenMaxCalls: 1,
+    successThreshold: 2,
+};
 /**
  * Valid fallback modes
  */

package/dist/src/utils/config.d.ts

@@ -6,6 +6,13 @@ import type { PluginConfig } from '../types/index.js';
  * Default plugin configuration
  */
 export declare const DEFAULT_CONFIG: PluginConfig;
+/**
+ * Result of config loading, includes which file was loaded
+ */
+export interface ConfigLoadResult {
+    config: PluginConfig;
+    source: string | null;
+}
 /**
  * Validate configuration values
  */
@@ -13,4 +20,4 @@ export declare function validateConfig(config: Partial<PluginConfig>): PluginCon
 /**
  * Load and validate config from file paths
  */
-export declare function loadConfig(directory: string): PluginConfig;
+export declare function loadConfig(directory: string, worktree?: string): ConfigLoadResult;

package/dist/src/utils/config.js

@@ -3,7 +3,7 @@
  */
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
-import { DEFAULT_FALLBACK_MODELS, VALID_FALLBACK_MODES, VALID_RESET_INTERVALS, DEFAULT_RETRY_POLICY, VALID_RETRY_STRATEGIES, } from '../types/index.js';
+import { DEFAULT_FALLBACK_MODELS, VALID_FALLBACK_MODES, VALID_RESET_INTERVALS, DEFAULT_RETRY_POLICY, VALID_RETRY_STRATEGIES, DEFAULT_CIRCUIT_BREAKER_CONFIG, } from '../types/index.js';
 /**
  * Default plugin configuration
  */
@@ -13,6 +13,7 @@ export const DEFAULT_CONFIG = {
     enabled: true,
     fallbackMode: "cycle",
     retryPolicy: DEFAULT_RETRY_POLICY,
+    circuitBreaker: DEFAULT_CIRCUIT_BREAKER_CONFIG,
     log: {
         level: "warn",
         format: "simple",
@@ -37,13 +38,17 @@ export function validateConfig(config) {
     return {
         ...DEFAULT_CONFIG,
         ...config,
-        fallbackModels: config.fallbackModels || DEFAULT_CONFIG.fallbackModels,
+        fallbackModels: Array.isArray(config.fallbackModels) ? config.fallbackModels : DEFAULT_CONFIG.fallbackModels,
         fallbackMode: mode && VALID_FALLBACK_MODES.includes(mode) ? mode : DEFAULT_CONFIG.fallbackMode,
         retryPolicy: config.retryPolicy ? {
             ...DEFAULT_CONFIG.retryPolicy,
             ...config.retryPolicy,
             strategy: strategy && VALID_RETRY_STRATEGIES.includes(strategy) ? strategy : DEFAULT_CONFIG.retryPolicy.strategy,
         } : DEFAULT_CONFIG.retryPolicy,
+        circuitBreaker: config.circuitBreaker ? {
+            ...DEFAULT_CONFIG.circuitBreaker,
+            ...config.circuitBreaker,
+        } : DEFAULT_CONFIG.circuitBreaker,
         log: config.log ? { ...DEFAULT_CONFIG.log, ...config.log } : DEFAULT_CONFIG.log,
         metrics: config.metrics ? {
             ...DEFAULT_CONFIG.metrics,
@@ -59,20 +64,30 @@ export function validateConfig(config) {
 /**
  * Load and validate config from file paths
  */
-export function loadConfig(directory) {
+export function loadConfig(directory, worktree) {
     const homedir = process.env.HOME || "";
-    const configPaths = [
-        join(directory, ".opencode", "rate-limit-fallback.json"),
-        join(directory, "rate-limit-fallback.json"),
-        join(homedir, ".opencode", "rate-limit-fallback.json"),
-        join(homedir, ".config", "opencode", "rate-limit-fallback.json"),
-    ];
+    const xdgConfigHome = process.env.XDG_CONFIG_HOME || join(homedir, ".config");
+    // Build search paths: worktree first, then directory, then home locations
+    const searchDirs = [];
+    if (worktree) {
+        searchDirs.push(worktree);
+    }
+    if (!worktree || worktree !== directory) {
+        searchDirs.push(directory);
+    }
+    const configPaths = [];
+    for (const dir of searchDirs) {
+        configPaths.push(join(dir, ".opencode", "rate-limit-fallback.json"));
+        configPaths.push(join(dir, "rate-limit-fallback.json"));
+    }
+    configPaths.push(join(homedir, ".opencode", "rate-limit-fallback.json"));
+    configPaths.push(join(xdgConfigHome, "opencode", "rate-limit-fallback.json"));
     for (const configPath of configPaths) {
         if (existsSync(configPath)) {
             try {
                 const content = readFileSync(configPath, "utf-8");
                 const userConfig = JSON.parse(content);
-                return validateConfig(userConfig);
+                return { config: validateConfig(userConfig), source: configPath };
             }
             catch (error) {
                 // Log config errors to console immediately before logger is initialized
@@ -81,5 +96,5 @@ export function loadConfig(directory) {
             }
         }
     }
-    return DEFAULT_CONFIG;
+    return { config: DEFAULT_CONFIG, source: null };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azumag/opencode-rate-limit-fallback",
-  "version": "1.31.0",
+  "version": "1.36.0",
   "description": "OpenCode plugin that automatically switches to fallback models when rate limited",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/src/utils/errorDetection.d.ts

@@ -1,7 +0,0 @@
-/**
- * Rate limit error detection
- */
-/**
- * Check if error is rate limit related
- */
-export declare function isRateLimitError(error: unknown): boolean;

package/dist/src/utils/errorDetection.js

@@ -1,34 +0,0 @@
-/**
- * Rate limit error detection
- */
-/**
- * Check if error is rate limit related
- */
-export function isRateLimitError(error) {
-    if (!error || typeof error !== "object")
-        return false;
-    // More type-safe error object structure
-    const err = error;
-    // Check for 429 status code in APIError (strict check)
-    if (err.name === "APIError" && err.data?.statusCode === 429) {
-        return true;
-    }
-    // Type-safe access to error fields
-    const responseBody = String(err.data?.responseBody || "").toLowerCase();
-    const message = String(err.data?.message || err.message || "").toLowerCase();
-    // Strict rate limit indicators only - avoid false positives
-    const strictRateLimitIndicators = [
-        "rate limit",
-        "rate_limit",
-        "ratelimit",
-        "too many requests",
-        "quota exceeded",
-    ];
-    // Check for 429 in text (explicit HTTP status code)
-    if (responseBody.includes("429") || message.includes("429")) {
-        return true;
-    }
-    // Check for strict rate limit keywords
-    return strictRateLimitIndicators.some((indicator) => responseBody.includes(indicator) ||
-        message.includes(indicator));
-}