From 7d9f505a15ea40545b2f2fd0d821e1756e85e0c7 Mon Sep 17 00:00:00 2001
From: Sanyela <my@aiai.li>
Date: Wed, 3 Dec 2025 15:47:53 +0800
Subject: [PATCH] fix: only throw NoAvailableProviderError for Kiro providers

---
 src/service-manager.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/service-manager.js b/src/service-manager.js
index e9d4dec..ab704d3 100644
--- a/src/service-manager.js
+++ b/src/service-manager.js
@@ -72,12 +72,15 @@ export class NoAvailableProviderError extends Error {
     }
 }
 
+// Provider types that should throw error when no available provider (instead of falling back to main config)
+const STRICT_POOL_PROVIDERS = ['claude-kiro-oauth'];
+
 /**
  * Get API service adapter, considering provider pools
  * @param {Object} config - The current request configuration
  * @param {string} [requestedModel] - Optional. The model name to filter providers by.
  * @returns {Promise<Object>} The API service adapter
- * @throws {NoAvailableProviderError} If no healthy provider is available in the pool
+ * @throws {NoAvailableProviderError} If no healthy provider is available in the pool (only for strict pool providers)
  */
 export async function getApiService(config, requestedModel = null) {
     let serviceConfig = config;
@@ -91,9 +94,14 @@ export async function getApiService(config, requestedModel = null) {
             config.uuid = serviceConfig.uuid;
             console.log(`[API Service] Using pooled configuration for ${config.MODEL_PROVIDER}: ${serviceConfig.uuid}${requestedModel ? ` (model: ${requestedModel})` : ''}`);
         } else {
-            // 号池没有可用账号，抛出错误
-            console.error(`[API Service] 号池无可用账号: ${config.MODEL_PROVIDER}${requestedModel ? ` (model: ${requestedModel})` : ''}`);
-            throw new NoAvailableProviderError(config.MODEL_PROVIDER, requestedModel);
+            // 号池没有可用账号
+            // 只有 Kiro 类型的 provider 抛出错误，其他 provider 回退到主配置
+            if (STRICT_POOL_PROVIDERS.includes(config.MODEL_PROVIDER)) {
+                console.error(`[API Service] 号池无可用账号: ${config.MODEL_PROVIDER}${requestedModel ? ` (model: ${requestedModel})` : ''}`);
+                throw new NoAvailableProviderError(config.MODEL_PROVIDER, requestedModel);
+            } else {
+                console.warn(`[API Service] No healthy provider found in pool for ${config.MODEL_PROVIDER}${requestedModel ? ` supporting model: ${requestedModel}` : ''}. Falling back to main config.`);
+            }
         }
     }
     return getServiceAdapter(serviceConfig);