Merge branch 'main' into feature/claude-code-client-support

src/routes/admin.js

@@ -2,6 +2,7 @@ const express = require('express');
 const apiKeyService = require('../services/apiKeyService');
 const claudeAccountService = require('../services/claudeAccountService');
 const claudeConsoleAccountService = require('../services/claudeConsoleAccountService');
+const bedrockAccountService = require('../services/bedrockAccountService');
 const geminiAccountService = require('../services/geminiAccountService');
 const accountGroupService = require('../services/accountGroupService');
 const redis = require('../models/redis');
@@ -1361,6 +1362,227 @@ router.put('/claude-console-accounts/:accountId/toggle-schedulable', authenticat
   }
 });
 
+// ☁️ Bedrock 账户管理
+
+// 获取所有Bedrock账户
+router.get('/bedrock-accounts', authenticateAdmin, async (req, res) => {
+  try {
+    const result = await bedrockAccountService.getAllAccounts();
+    if (!result.success) {
+      return res.status(500).json({ error: 'Failed to get Bedrock accounts', message: result.error });
+    }
+    
+    // 为每个账户添加使用统计信息
+    const accountsWithStats = await Promise.all(result.data.map(async (account) => {
+      try {
+        const usageStats = await redis.getAccountUsageStats(account.id);
+        return {
+          ...account,
+          usage: {
+            daily: usageStats.daily,
+            total: usageStats.total,
+            averages: usageStats.averages
+          }
+        };
+      } catch (statsError) {
+        logger.warn(`⚠️ Failed to get usage stats for Bedrock account ${account.id}:`, statsError.message);
+        return {
+          ...account,
+          usage: {
+            daily: { tokens: 0, requests: 0, allTokens: 0 },
+            total: { tokens: 0, requests: 0, allTokens: 0 },
+            averages: { rpm: 0, tpm: 0 }
+          }
+        };
+      }
+    }));
+    
+    res.json({ success: true, data: accountsWithStats });
+  } catch (error) {
+    logger.error('❌ Failed to get Bedrock accounts:', error);
+    res.status(500).json({ error: 'Failed to get Bedrock accounts', message: error.message });
+  }
+});
+
+// 创建新的Bedrock账户
+router.post('/bedrock-accounts', authenticateAdmin, async (req, res) => {
+  try {
+    const {
+      name,
+      description,
+      region,
+      awsCredentials,
+      defaultModel,
+      priority,
+      accountType,
+      credentialType
+    } = req.body;
+
+    if (!name) {
+      return res.status(400).json({ error: 'Name is required' });
+    }
+
+    // 验证priority的有效性（1-100）
+    if (priority !== undefined && (priority < 1 || priority > 100)) {
+      return res.status(400).json({ error: 'Priority must be between 1 and 100' });
+    }
+
+    // 验证accountType的有效性
+    if (accountType && !['shared', 'dedicated'].includes(accountType)) {
+      return res.status(400).json({ error: 'Invalid account type. Must be "shared" or "dedicated"' });
+    }
+
+    // 验证credentialType的有效性
+    if (credentialType && !['default', 'access_key', 'bearer_token'].includes(credentialType)) {
+      return res.status(400).json({ error: 'Invalid credential type. Must be "default", "access_key", or "bearer_token"' });
+    }
+
+    const result = await bedrockAccountService.createAccount({
+      name,
+      description: description || '',
+      region: region || 'us-east-1',
+      awsCredentials,
+      defaultModel,
+      priority: priority || 50,
+      accountType: accountType || 'shared',
+      credentialType: credentialType || 'default'
+    });
+
+    if (!result.success) {
+      return res.status(500).json({ error: 'Failed to create Bedrock account', message: result.error });
+    }
+
+    logger.success(`☁️ Admin created Bedrock account: ${name}`);
+    res.json({ success: true, data: result.data });
+  } catch (error) {
+    logger.error('❌ Failed to create Bedrock account:', error);
+    res.status(500).json({ error: 'Failed to create Bedrock account', message: error.message });
+  }
+});
+
+// 更新Bedrock账户
+router.put('/bedrock-accounts/:accountId', authenticateAdmin, async (req, res) => {
+  try {
+    const { accountId } = req.params;
+    const updates = req.body;
+
+    // 验证priority的有效性（1-100）
+    if (updates.priority !== undefined && (updates.priority < 1 || updates.priority > 100)) {
+      return res.status(400).json({ error: 'Priority must be between 1 and 100' });
+    }
+
+    // 验证accountType的有效性
+    if (updates.accountType && !['shared', 'dedicated'].includes(updates.accountType)) {
+      return res.status(400).json({ error: 'Invalid account type. Must be "shared" or "dedicated"' });
+    }
+
+    // 验证credentialType的有效性
+    if (updates.credentialType && !['default', 'access_key', 'bearer_token'].includes(updates.credentialType)) {
+      return res.status(400).json({ error: 'Invalid credential type. Must be "default", "access_key", or "bearer_token"' });
+    }
+
+    const result = await bedrockAccountService.updateAccount(accountId, updates);
+
+    if (!result.success) {
+      return res.status(500).json({ error: 'Failed to update Bedrock account', message: result.error });
+    }
+    
+    logger.success(`📝 Admin updated Bedrock account: ${accountId}`);
+    res.json({ success: true, message: 'Bedrock account updated successfully' });
+  } catch (error) {
+    logger.error('❌ Failed to update Bedrock account:', error);
+    res.status(500).json({ error: 'Failed to update Bedrock account', message: error.message });
+  }
+});
+
+// 删除Bedrock账户
+router.delete('/bedrock-accounts/:accountId', authenticateAdmin, async (req, res) => {
+  try {
+    const { accountId } = req.params;
+    
+    const result = await bedrockAccountService.deleteAccount(accountId);
+
+    if (!result.success) {
+      return res.status(500).json({ error: 'Failed to delete Bedrock account', message: result.error });
+    }
+    
+    logger.success(`🗑️ Admin deleted Bedrock account: ${accountId}`);
+    res.json({ success: true, message: 'Bedrock account deleted successfully' });
+  } catch (error) {
+    logger.error('❌ Failed to delete Bedrock account:', error);
+    res.status(500).json({ error: 'Failed to delete Bedrock account', message: error.message });
+  }
+});
+
+// 切换Bedrock账户状态
+router.put('/bedrock-accounts/:accountId/toggle', authenticateAdmin, async (req, res) => {
+  try {
+    const { accountId } = req.params;
+    
+    const accountResult = await bedrockAccountService.getAccount(accountId);
+    if (!accountResult.success) {
+      return res.status(404).json({ error: 'Account not found' });
+    }
+    
+    const newStatus = !accountResult.data.isActive;
+    const updateResult = await bedrockAccountService.updateAccount(accountId, { isActive: newStatus });
+
+    if (!updateResult.success) {
+      return res.status(500).json({ error: 'Failed to toggle account status', message: updateResult.error });
+    }
+    
+    logger.success(`🔄 Admin toggled Bedrock account status: ${accountId} -> ${newStatus ? 'active' : 'inactive'}`);
+    res.json({ success: true, isActive: newStatus });
+  } catch (error) {
+    logger.error('❌ Failed to toggle Bedrock account status:', error);
+    res.status(500).json({ error: 'Failed to toggle account status', message: error.message });
+  }
+});
+
+// 切换Bedrock账户调度状态
+router.put('/bedrock-accounts/:accountId/toggle-schedulable', authenticateAdmin, async (req, res) => {
+  try {
+    const { accountId } = req.params;
+    
+    const accountResult = await bedrockAccountService.getAccount(accountId);
+    if (!accountResult.success) {
+      return res.status(404).json({ error: 'Account not found' });
+    }
+    
+    const newSchedulable = !accountResult.data.schedulable;
+    const updateResult = await bedrockAccountService.updateAccount(accountId, { schedulable: newSchedulable });
+
+    if (!updateResult.success) {
+      return res.status(500).json({ error: 'Failed to toggle schedulable status', message: updateResult.error });
+    }
+    
+    logger.success(`🔄 Admin toggled Bedrock account schedulable status: ${accountId} -> ${newSchedulable ? 'schedulable' : 'not schedulable'}`);
+    res.json({ success: true, schedulable: newSchedulable });
+  } catch (error) {
+    logger.error('❌ Failed to toggle Bedrock account schedulable status:', error);
+    res.status(500).json({ error: 'Failed to toggle schedulable status', message: error.message });
+  }
+});
+
+// 测试Bedrock账户连接
+router.post('/bedrock-accounts/:accountId/test', authenticateAdmin, async (req, res) => {
+  try {
+    const { accountId } = req.params;
+    
+    const result = await bedrockAccountService.testAccount(accountId);
+
+    if (!result.success) {
+      return res.status(500).json({ error: 'Account test failed', message: result.error });
+    }
+    
+    logger.success(`🧪 Admin tested Bedrock account: ${accountId} - ${result.data.status}`);
+    res.json({ success: true, data: result.data });
+  } catch (error) {
+    logger.error('❌ Failed to test Bedrock account:', error);
+    res.status(500).json({ error: 'Failed to test Bedrock account', message: error.message });
+  }
+});
+
 // 🤖 Gemini 账户管理
 
 // 生成 Gemini OAuth 授权 URL

src/routes/api.js

@@ -1,6 +1,8 @@
 const express = require('express');
 const claudeRelayService = require('../services/claudeRelayService');
 const claudeConsoleRelayService = require('../services/claudeConsoleRelayService');
+const bedrockRelayService = require('../services/bedrockRelayService');
+const bedrockAccountService = require('../services/bedrockAccountService');
 const unifiedClaudeScheduler = require('../services/unifiedClaudeScheduler');
 const apiKeyService = require('../services/apiKeyService');
 const { authenticateApiKey } = require('../middleware/auth');
@@ -101,7 +103,7 @@ async function handleMessagesRequest(req, res) {
           logger.warn('⚠️ Usage callback triggered but data is incomplete:', JSON.stringify(usageData));
         }
         });
-      } else {
+      } else if (accountType === 'claude-console') {
         // Claude Console账号使用Console转发服务（需要传递accountId）
         await claudeConsoleRelayService.relayStreamRequestWithUsageCapture(req.body, req.apiKey, res, req.headers, (usageData) => {
           // 回调函数：当检测到完整usage数据时记录真实token使用量
@@ -135,6 +137,44 @@ async function handleMessagesRequest(req, res) {
             logger.warn('⚠️ Usage callback triggered but data is incomplete:', JSON.stringify(usageData));
           }
         }, accountId);
+      } else if (accountType === 'bedrock') {
+        // Bedrock账号使用Bedrock转发服务
+        try {
+          const bedrockAccountResult = await bedrockAccountService.getAccount(accountId);
+          if (!bedrockAccountResult.success) {
+            throw new Error('Failed to get Bedrock account details');
+          }
+
+          const result = await bedrockRelayService.handleStreamRequest(req.body, bedrockAccountResult.data, res);
+          
+          // 记录Bedrock使用统计
+          if (result.usage) {
+            const inputTokens = result.usage.input_tokens || 0;
+            const outputTokens = result.usage.output_tokens || 0;
+            
+            apiKeyService.recordUsage(req.apiKey.id, inputTokens, outputTokens, 0, 0, result.model, accountId).catch(error => {
+              logger.error('❌ Failed to record Bedrock stream usage:', error);
+            });
+            
+            // 更新时间窗口内的token计数
+            if (req.rateLimitInfo) {
+              const totalTokens = inputTokens + outputTokens;
+              redis.getClient().incrby(req.rateLimitInfo.tokenCountKey, totalTokens).catch(error => {
+                logger.error('❌ Failed to update rate limit token count:', error);
+              });
+              logger.api(`📊 Updated rate limit token count: +${totalTokens} tokens`);
+            }
+            
+            usageDataCaptured = true;
+            logger.api(`📊 Bedrock stream usage recorded - Model: ${result.model}, Input: ${inputTokens}, Output: ${outputTokens}, Total: ${inputTokens + outputTokens} tokens`);
+          }
+        } catch (error) {
+          logger.error('❌ Bedrock stream request failed:', error);
+          if (!res.headersSent) {
+            res.status(500).json({ error: 'Bedrock service error', message: error.message });
+          }
+          return;
+        }
       }
       
       // 流式请求完成后 - 如果没有捕获到usage数据，记录警告但不进行估算
@@ -166,10 +206,43 @@ async function handleMessagesRequest(req, res) {
       if (accountType === 'claude-official') {
         // 官方Claude账号使用原有的转发服务
         response = await claudeRelayService.relayRequest(req.body, req.apiKey, req, res, req.headers);
-      } else {
+      } else if (accountType === 'claude-console') {
         // Claude Console账号使用Console转发服务
         logger.debug(`[DEBUG] Calling claudeConsoleRelayService.relayRequest with accountId: ${accountId}`);
         response = await claudeConsoleRelayService.relayRequest(req.body, req.apiKey, req, res, req.headers, accountId);
+      } else if (accountType === 'bedrock') {
+        // Bedrock账号使用Bedrock转发服务
+        try {
+          const bedrockAccountResult = await bedrockAccountService.getAccount(accountId);
+          if (!bedrockAccountResult.success) {
+            throw new Error('Failed to get Bedrock account details');
+          }
+
+          const result = await bedrockRelayService.handleNonStreamRequest(req.body, bedrockAccountResult.data, req.headers);
+          
+          // 构建标准响应格式
+          response = {
+            statusCode: result.success ? 200 : 500,
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(result.success ? result.data : { error: result.error }),
+            accountId: accountId
+          };
+          
+          // 如果成功，添加使用统计到响应数据中
+          if (result.success && result.usage) {
+            const responseData = JSON.parse(response.body);
+            responseData.usage = result.usage;
+            response.body = JSON.stringify(responseData);
+          }
+        } catch (error) {
+          logger.error('❌ Bedrock non-stream request failed:', error);
+          response = {
+            statusCode: 500,
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ error: 'Bedrock service error', message: error.message }),
+            accountId: accountId
+          };
+        }
       }
       
       logger.info('📡 Claude API response received', {

src/services/bedrockAccountService.js

@@ -0,0 +1,398 @@
+const { v4: uuidv4 } = require('uuid');
+const crypto = require('crypto');
+const redis = require('../models/redis');
+const logger = require('../utils/logger');
+const config = require('../../config/config');
+const bedrockRelayService = require('./bedrockRelayService');
+
+class BedrockAccountService {
+  constructor() {
+    // 加密相关常量
+    this.ENCRYPTION_ALGORITHM = 'aes-256-cbc';
+    this.ENCRYPTION_SALT = 'salt';
+  }
+
+  // 🏢 创建Bedrock账户
+  async createAccount(options = {}) {
+    const {
+      name = 'Unnamed Bedrock Account',
+      description = '',
+      region = process.env.AWS_REGION || 'us-east-1',
+      awsCredentials = null, // { accessKeyId, secretAccessKey, sessionToken }
+      defaultModel = 'us.anthropic.claude-sonnet-4-20250514-v1:0',
+      isActive = true,
+      accountType = 'shared', // 'dedicated' or 'shared'
+      priority = 50, // 调度优先级 (1-100，数字越小优先级越高)
+      schedulable = true, // 是否可被调度
+      credentialType = 'default' // 'default', 'access_key', 'bearer_token'
+    } = options;
+
+    const accountId = uuidv4();
+
+    let accountData = {
+      id: accountId,
+      name,
+      description,
+      region,
+      defaultModel,
+      isActive,
+      accountType,
+      priority,
+      schedulable,
+      credentialType,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      type: 'bedrock' // 标识这是Bedrock账户
+    };
+
+    // 加密存储AWS凭证
+    if (awsCredentials) {
+      accountData.awsCredentials = this._encryptAwsCredentials(awsCredentials);
+    }
+
+    const client = redis.getClientSafe();
+    await client.set(`bedrock_account:${accountId}`, JSON.stringify(accountData));
+
+    logger.info(`✅ 创建Bedrock账户成功 - ID: ${accountId}, 名称: ${name}, 区域: ${region}`);
+
+    return {
+      success: true,
+      data: {
+        id: accountId,
+        name,
+        description,
+        region,
+        defaultModel,
+        isActive,
+        accountType,
+        priority,
+        schedulable,
+        credentialType,
+        createdAt: accountData.createdAt,
+        type: 'bedrock'
+      }
+    };
+  }
+
+  // 🔍 获取账户信息
+  async getAccount(accountId) {
+    try {
+      const client = redis.getClientSafe();
+      const accountData = await client.get(`bedrock_account:${accountId}`);
+      if (!accountData) {
+        return { success: false, error: 'Account not found' };
+      }
+
+      const account = JSON.parse(accountData);
+
+      // 解密AWS凭证用于内部使用
+      if (account.awsCredentials) {
+        account.awsCredentials = this._decryptAwsCredentials(account.awsCredentials);
+      }
+
+      logger.debug(`🔍 获取Bedrock账户 - ID: ${accountId}, 名称: ${account.name}`);
+
+      return {
+        success: true,
+        data: account
+      };
+    } catch (error) {
+      logger.error(`❌ 获取Bedrock账户失败 - ID: ${accountId}`, error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  // 📋 获取所有账户列表
+  async getAllAccounts() {
+    try {
+      const client = redis.getClientSafe();
+      const keys = await client.keys('bedrock_account:*');
+      const accounts = [];
+
+      for (const key of keys) {
+        const accountData = await client.get(key);
+        if (accountData) {
+          const account = JSON.parse(accountData);
+
+          // 返回给前端时，不包含敏感信息，只显示掩码
+          accounts.push({
+            id: account.id,
+            name: account.name,
+            description: account.description,
+            region: account.region,
+            defaultModel: account.defaultModel,
+            isActive: account.isActive,
+            accountType: account.accountType,
+            priority: account.priority,
+            schedulable: account.schedulable,
+            credentialType: account.credentialType,
+            createdAt: account.createdAt,
+            updatedAt: account.updatedAt,
+            type: 'bedrock',
+            hasCredentials: !!account.awsCredentials
+          });
+        }
+      }
+
+      // 按优先级和名称排序
+      accounts.sort((a, b) => {
+        if (a.priority !== b.priority) return a.priority - b.priority;
+        return a.name.localeCompare(b.name);
+      });
+
+      logger.debug(`📋 获取所有Bedrock账户 - 共 ${accounts.length} 个`);
+
+      return {
+        success: true,
+        data: accounts
+      };
+    } catch (error) {
+      logger.error('❌ 获取Bedrock账户列表失败', error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  // ✏️ 更新账户信息
+  async updateAccount(accountId, updates = {}) {
+    try {
+      const accountResult = await this.getAccount(accountId);
+      if (!accountResult.success) {
+        return accountResult;
+      }
+
+      const account = accountResult.data;
+
+      // 更新字段
+      if (updates.name !== undefined) account.name = updates.name;
+      if (updates.description !== undefined) account.description = updates.description;
+      if (updates.region !== undefined) account.region = updates.region;
+      if (updates.defaultModel !== undefined) account.defaultModel = updates.defaultModel;
+      if (updates.isActive !== undefined) account.isActive = updates.isActive;
+      if (updates.accountType !== undefined) account.accountType = updates.accountType;
+      if (updates.priority !== undefined) account.priority = updates.priority;
+      if (updates.schedulable !== undefined) account.schedulable = updates.schedulable;
+      if (updates.credentialType !== undefined) account.credentialType = updates.credentialType;
+
+      // 更新AWS凭证
+      if (updates.awsCredentials !== undefined) {
+        if (updates.awsCredentials) {
+          account.awsCredentials = this._encryptAwsCredentials(updates.awsCredentials);
+        } else {
+          delete account.awsCredentials;
+        }
+      }
+
+      account.updatedAt = new Date().toISOString();
+
+      const client = redis.getClientSafe();
+      await client.set(`bedrock_account:${accountId}`, JSON.stringify(account));
+
+      logger.info(`✅ 更新Bedrock账户成功 - ID: ${accountId}, 名称: ${account.name}`);
+
+      return {
+        success: true,
+        data: {
+          id: account.id,
+          name: account.name,
+          description: account.description,
+          region: account.region,
+          defaultModel: account.defaultModel,
+          isActive: account.isActive,
+          accountType: account.accountType,
+          priority: account.priority,
+          schedulable: account.schedulable,
+          credentialType: account.credentialType,
+          updatedAt: account.updatedAt,
+          type: 'bedrock'
+        }
+      };
+    } catch (error) {
+      logger.error(`❌ 更新Bedrock账户失败 - ID: ${accountId}`, error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  // 🗑️ 删除账户
+  async deleteAccount(accountId) {
+    try {
+      const accountResult = await this.getAccount(accountId);
+      if (!accountResult.success) {
+        return accountResult;
+      }
+
+      const client = redis.getClientSafe();
+      await client.del(`bedrock_account:${accountId}`);
+
+      logger.info(`✅ 删除Bedrock账户成功 - ID: ${accountId}`);
+
+      return { success: true };
+    } catch (error) {
+      logger.error(`❌ 删除Bedrock账户失败 - ID: ${accountId}`, error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  // 🎯 选择可用的Bedrock账户 (用于请求转发)
+  async selectAvailableAccount() {
+    try {
+      const accountsResult = await this.getAllAccounts();
+      if (!accountsResult.success) {
+        return { success: false, error: 'Failed to get accounts' };
+      }
+
+      const availableAccounts = accountsResult.data.filter(account =>
+        account.isActive && account.schedulable
+      );
+
+      if (availableAccounts.length === 0) {
+        return { success: false, error: 'No available Bedrock accounts' };
+      }
+
+      // 简单的轮询选择策略 - 选择优先级最高的账户
+      const selectedAccount = availableAccounts[0];
+
+      // 获取完整账户信息（包含解密的凭证）
+      const fullAccountResult = await this.getAccount(selectedAccount.id);
+      if (!fullAccountResult.success) {
+        return { success: false, error: 'Failed to get selected account details' };
+      }
+
+      logger.debug(`🎯 选择Bedrock账户 - ID: ${selectedAccount.id}, 名称: ${selectedAccount.name}`);
+
+      return {
+        success: true,
+        data: fullAccountResult.data
+      };
+    } catch (error) {
+      logger.error('❌ 选择Bedrock账户失败', error);
+      return { success: false, error: error.message };
+    }
+  }
+
+  // 🧪 测试账户连接
+  async testAccount(accountId) {
+    try {
+      const accountResult = await this.getAccount(accountId);
+      if (!accountResult.success) {
+        return accountResult;
+      }
+
+      const account = accountResult.data;
+
+      logger.info(`🧪 测试Bedrock账户连接 - ID: ${accountId}, 名称: ${account.name}`);
+
+      // 尝试获取模型列表来测试连接
+      const models = await bedrockRelayService.getAvailableModels(account);
+
+      if (models && models.length > 0) {
+        logger.info(`✅ Bedrock账户测试成功 - ID: ${accountId}, 发现 ${models.length} 个模型`);
+        return {
+          success: true,
+          data: {
+            status: 'connected',
+            modelsCount: models.length,
+            region: account.region,
+            credentialType: account.credentialType
+          }
+        };
+      } else {
+        return {
+          success: false,
+          error: 'Unable to retrieve models from Bedrock'
+        };
+      }
+    } catch (error) {
+      logger.error(`❌ 测试Bedrock账户失败 - ID: ${accountId}`, error);
+      return {
+        success: false,
+        error: error.message
+      };
+    }
+  }
+
+  // 🔐 加密AWS凭证
+  _encryptAwsCredentials(credentials) {
+    try {
+      const key = crypto.createHash('sha256').update(config.security.encryptionKey).digest();
+      const iv = crypto.randomBytes(16);
+      const cipher = crypto.createCipheriv(this.ENCRYPTION_ALGORITHM, key, iv);
+
+      const credentialsString = JSON.stringify(credentials);
+      let encrypted = cipher.update(credentialsString, 'utf8', 'hex');
+      encrypted += cipher.final('hex');
+
+      return {
+        encrypted: encrypted,
+        iv: iv.toString('hex')
+      };
+    } catch (error) {
+      logger.error('❌ AWS凭证加密失败', error);
+      throw new Error('Credentials encryption failed');
+    }
+  }
+
+  // 🔓 解密AWS凭证
+  _decryptAwsCredentials(encryptedData) {
+    try {
+      // 检查数据格式
+      if (!encryptedData || typeof encryptedData !== 'object') {
+        logger.error('❌ 无效的加密数据格式:', encryptedData);
+        throw new Error('Invalid encrypted data format');
+      }
+
+      // 检查必要字段
+      if (!encryptedData.encrypted || !encryptedData.iv) {
+        logger.error('❌ 缺少加密数据字段:', {
+          hasEncrypted: !!encryptedData.encrypted,
+          hasIv: !!encryptedData.iv
+        });
+        throw new Error('Missing encrypted data fields');
+      }
+
+      const key = crypto.createHash('sha256').update(config.security.encryptionKey).digest();
+      const iv = Buffer.from(encryptedData.iv, 'hex');
+      const decipher = crypto.createDecipheriv(this.ENCRYPTION_ALGORITHM, key, iv);
+
+      let decrypted = decipher.update(encryptedData.encrypted, 'hex', 'utf8');
+      decrypted += decipher.final('utf8');
+
+      return JSON.parse(decrypted);
+    } catch (error) {
+      logger.error('❌ AWS凭证解密失败', error);
+      throw new Error('Credentials decryption failed');
+    }
+  }
+
+  // 🔍 获取账户统计信息
+  async getAccountStats() {
+    try {
+      const accountsResult = await this.getAllAccounts();
+      if (!accountsResult.success) {
+        return { success: false, error: accountsResult.error };
+      }
+
+      const accounts = accountsResult.data;
+      const stats = {
+        total: accounts.length,
+        active: accounts.filter(acc => acc.isActive).length,
+        inactive: accounts.filter(acc => !acc.isActive).length,
+        schedulable: accounts.filter(acc => acc.schedulable).length,
+        byRegion: {},
+        byCredentialType: {}
+      };
+
+      // 按区域统计
+      accounts.forEach(acc => {
+        stats.byRegion[acc.region] = (stats.byRegion[acc.region] || 0) + 1;
+        stats.byCredentialType[acc.credentialType] = (stats.byCredentialType[acc.credentialType] || 0) + 1;
+      });
+
+      return { success: true, data: stats };
+    } catch (error) {
+      logger.error('❌ 获取Bedrock账户统计失败', error);
+      return { success: false, error: error.message };
+    }
+  }
+}
+
+module.exports = new BedrockAccountService();

src/services/bedrockRelayService.js

@@ -0,0 +1,465 @@
+const { BedrockRuntimeClient, InvokeModelCommand, InvokeModelWithResponseStreamCommand } = require('@aws-sdk/client-bedrock-runtime');
+const { fromEnv } = require('@aws-sdk/credential-providers');
+const logger = require('../utils/logger');
+const config = require('../../config/config');
+
+class BedrockRelayService {
+  constructor() {
+    this.defaultRegion = process.env.AWS_REGION || config.bedrock?.defaultRegion || 'us-east-1';
+    this.smallFastModelRegion = process.env.ANTHROPIC_SMALL_FAST_MODEL_AWS_REGION || this.defaultRegion;
+
+    // 默认模型配置
+    this.defaultModel = process.env.ANTHROPIC_MODEL || 'us.anthropic.claude-sonnet-4-20250514-v1:0';
+    this.defaultSmallModel = process.env.ANTHROPIC_SMALL_FAST_MODEL || 'us.anthropic.claude-3-5-haiku-20241022-v1:0';
+
+    // Token配置
+    this.maxOutputTokens = parseInt(process.env.CLAUDE_CODE_MAX_OUTPUT_TOKENS) || 4096;
+    this.maxThinkingTokens = parseInt(process.env.MAX_THINKING_TOKENS) || 1024;
+    this.enablePromptCaching = process.env.DISABLE_PROMPT_CACHING !== '1';
+
+    // 创建Bedrock客户端
+    this.clients = new Map(); // 缓存不同区域的客户端
+  }
+
+  // 获取或创建Bedrock客户端
+  _getBedrockClient(region = null, bedrockAccount = null) {
+    const targetRegion = region || this.defaultRegion;
+    const clientKey = `${targetRegion}-${bedrockAccount?.id || 'default'}`;
+
+    if (this.clients.has(clientKey)) {
+      return this.clients.get(clientKey);
+    }
+
+    const clientConfig = {
+      region: targetRegion
+    };
+
+    // 如果账户配置了特定的AWS凭证，使用它们
+    if (bedrockAccount?.awsCredentials) {
+      clientConfig.credentials = {
+        accessKeyId: bedrockAccount.awsCredentials.accessKeyId,
+        secretAccessKey: bedrockAccount.awsCredentials.secretAccessKey,
+        sessionToken: bedrockAccount.awsCredentials.sessionToken
+      };
+    } else {
+      // 检查是否有环境变量凭证
+      if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
+        clientConfig.credentials = fromEnv();
+      } else {
+        throw new Error('AWS凭证未配置。请在Bedrock账户中配置AWS访问密钥，或设置环境变量AWS_ACCESS_KEY_ID和AWS_SECRET_ACCESS_KEY');
+      }
+    }
+
+    const client = new BedrockRuntimeClient(clientConfig);
+    this.clients.set(clientKey, client);
+
+    logger.debug(`🔧 Created Bedrock client for region: ${targetRegion}, account: ${bedrockAccount?.name || 'default'}`);
+    return client;
+  }
+
+  // 处理非流式请求
+  async handleNonStreamRequest(requestBody, bedrockAccount = null) {
+    try {
+      const modelId = this._selectModel(requestBody, bedrockAccount);
+      const region = this._selectRegion(modelId, bedrockAccount);
+      const client = this._getBedrockClient(region, bedrockAccount);
+
+      // 转换请求格式为Bedrock格式
+      const bedrockPayload = this._convertToBedrockFormat(requestBody);
+
+      const command = new InvokeModelCommand({
+        modelId: modelId,
+        body: JSON.stringify(bedrockPayload),
+        contentType: 'application/json',
+        accept: 'application/json'
+      });
+
+      logger.debug(`🚀 Bedrock非流式请求 - 模型: ${modelId}, 区域: ${region}`);
+
+      const startTime = Date.now();
+      const response = await client.send(command);
+      const duration = Date.now() - startTime;
+
+      // 解析响应
+      const responseBody = JSON.parse(new TextDecoder().decode(response.body));
+      const claudeResponse = this._convertFromBedrockFormat(responseBody);
+
+      logger.info(`✅ Bedrock请求完成 - 模型: ${modelId}, 耗时: ${duration}ms`);
+
+      return {
+        success: true,
+        data: claudeResponse,
+        usage: claudeResponse.usage,
+        model: modelId,
+        duration
+      };
+
+    } catch (error) {
+      logger.error('❌ Bedrock非流式请求失败:', error);
+      throw this._handleBedrockError(error);
+    }
+  }
+
+  // 处理流式请求
+  async handleStreamRequest(requestBody, bedrockAccount = null, res) {
+    try {
+      const modelId = this._selectModel(requestBody, bedrockAccount);
+      const region = this._selectRegion(modelId, bedrockAccount);
+      const client = this._getBedrockClient(region, bedrockAccount);
+
+      // 转换请求格式为Bedrock格式
+      const bedrockPayload = this._convertToBedrockFormat(requestBody);
+
+      const command = new InvokeModelWithResponseStreamCommand({
+        modelId: modelId,
+        body: JSON.stringify(bedrockPayload),
+        contentType: 'application/json',
+        accept: 'application/json'
+      });
+
+      logger.debug(`🌊 Bedrock流式请求 - 模型: ${modelId}, 区域: ${region}`);
+
+      const startTime = Date.now();
+      const response = await client.send(command);
+
+      // 设置SSE响应头
+      res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        'Connection': 'keep-alive',
+        'Access-Control-Allow-Origin': '*',
+        'Access-Control-Allow-Headers': 'Content-Type, Authorization'
+      });
+
+      let totalUsage = null;
+      let isFirstChunk = true;
+
+      // 处理流式响应
+      for await (const chunk of response.body) {
+        if (chunk.chunk) {
+          const chunkData = JSON.parse(new TextDecoder().decode(chunk.chunk.bytes));
+          const claudeEvent = this._convertBedrockStreamToClaudeFormat(chunkData, isFirstChunk);
+
+          if (claudeEvent) {
+            // 发送SSE事件
+            res.write(`event: ${claudeEvent.type}\n`);
+            res.write(`data: ${JSON.stringify(claudeEvent.data)}\n\n`);
+
+            // 提取使用统计
+            if (claudeEvent.type === 'message_stop' && claudeEvent.data.usage) {
+              totalUsage = claudeEvent.data.usage;
+            }
+
+            isFirstChunk = false;
+          }
+        }
+      }
+
+      const duration = Date.now() - startTime;
+      logger.info(`✅ Bedrock流式请求完成 - 模型: ${modelId}, 耗时: ${duration}ms`);
+
+      // 发送结束事件
+      res.write('event: done\n');
+      res.write('data: [DONE]\n\n');
+      res.end();
+
+      return {
+        success: true,
+        usage: totalUsage,
+        model: modelId,
+        duration
+      };
+
+    } catch (error) {
+      logger.error('❌ Bedrock流式请求失败:', error);
+
+      // 发送错误事件
+      if (!res.headersSent) {
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+      }
+
+      res.write('event: error\n');
+      res.write(`data: ${JSON.stringify({ error: this._handleBedrockError(error).message })}\n\n`);
+      res.end();
+
+      throw this._handleBedrockError(error);
+    }
+  }
+
+  // 选择使用的模型
+  _selectModel(requestBody, bedrockAccount) {
+    let selectedModel;
+    
+    // 优先使用账户配置的模型
+    if (bedrockAccount?.defaultModel) {
+      selectedModel = bedrockAccount.defaultModel;
+      logger.info(`🎯 使用账户配置的模型: ${selectedModel}`, { metadata: { source: 'account', accountId: bedrockAccount.id } });
+    }
+    // 检查请求中指定的模型
+    else if (requestBody.model) {
+      selectedModel = requestBody.model;
+      logger.info(`🎯 使用请求指定的模型: ${selectedModel}`, { metadata: { source: 'request' } });
+    }
+    // 使用默认模型
+    else {
+      selectedModel = this.defaultModel;
+      logger.info(`🎯 使用系统默认模型: ${selectedModel}`, { metadata: { source: 'default' } });
+    }
+
+    // 如果是标准Claude模型名，需要映射为Bedrock格式
+    const bedrockModel = this._mapToBedrockModel(selectedModel);
+    if (bedrockModel !== selectedModel) {
+      logger.info(`🔄 模型映射: ${selectedModel} → ${bedrockModel}`, { metadata: { originalModel: selectedModel, bedrockModel } });
+    }
+
+    return bedrockModel;
+  }
+
+  // 将标准Claude模型名映射为Bedrock格式
+  _mapToBedrockModel(modelName) {
+    // 标准Claude模型名到Bedrock模型名的映射表
+    const modelMapping = {
+      // Claude Sonnet 4
+      'claude-sonnet-4': 'us.anthropic.claude-sonnet-4-20250514-v1:0',
+      'claude-sonnet-4-20250514': 'us.anthropic.claude-sonnet-4-20250514-v1:0',
+      
+      // Claude Opus 4.1
+      'claude-opus-4': 'us.anthropic.claude-opus-4-1-20250805-v1:0',
+      'claude-opus-4-1': 'us.anthropic.claude-opus-4-1-20250805-v1:0',
+      'claude-opus-4-1-20250805': 'us.anthropic.claude-opus-4-1-20250805-v1:0',
+      
+      // Claude 3.7 Sonnet
+      'claude-3-7-sonnet': 'us.anthropic.claude-3-7-sonnet-20250219-v1:0',
+      'claude-3-7-sonnet-20250219': 'us.anthropic.claude-3-7-sonnet-20250219-v1:0',
+      
+      // Claude 3.5 Sonnet v2
+      'claude-3-5-sonnet': 'us.anthropic.claude-3-5-sonnet-20241022-v2:0',
+      'claude-3-5-sonnet-20241022': 'us.anthropic.claude-3-5-sonnet-20241022-v2:0',
+      
+      // Claude 3.5 Haiku
+      'claude-3-5-haiku': 'us.anthropic.claude-3-5-haiku-20241022-v1:0',
+      'claude-3-5-haiku-20241022': 'us.anthropic.claude-3-5-haiku-20241022-v1:0',
+      
+      // Claude 3 Sonnet
+      'claude-3-sonnet': 'us.anthropic.claude-3-sonnet-20240229-v1:0',
+      'claude-3-sonnet-20240229': 'us.anthropic.claude-3-sonnet-20240229-v1:0',
+      
+      // Claude 3 Haiku
+      'claude-3-haiku': 'us.anthropic.claude-3-haiku-20240307-v1:0',
+      'claude-3-haiku-20240307': 'us.anthropic.claude-3-haiku-20240307-v1:0'
+    };
+
+    // 如果已经是Bedrock格式，直接返回
+    // Bedrock模型格式：{region}.anthropic.{model-name} 或 anthropic.{model-name}
+    if (modelName.includes('.anthropic.') || modelName.startsWith('anthropic.')) {
+      return modelName;
+    }
+
+    // 查找映射
+    const mappedModel = modelMapping[modelName];
+    if (mappedModel) {
+      return mappedModel;
+    }
+
+    // 如果没有找到映射，返回原始模型名（可能会导致错误，但保持向后兼容）
+    logger.warn(`⚠️ 未找到模型映射: ${modelName}，使用原始模型名`, { metadata: { originalModel: modelName } });
+    return modelName;
+  }
+
+  // 选择使用的区域
+  _selectRegion(modelId, bedrockAccount) {
+    // 优先使用账户配置的区域
+    if (bedrockAccount?.region) {
+      return bedrockAccount.region;
+    }
+
+    // 对于小模型，使用专门的区域配置
+    if (modelId.includes('haiku')) {
+      return this.smallFastModelRegion;
+    }
+
+    return this.defaultRegion;
+  }
+
+  // 转换Claude格式请求到Bedrock格式
+  _convertToBedrockFormat(requestBody) {
+    const bedrockPayload = {
+      anthropic_version: 'bedrock-2023-05-31',
+      max_tokens: Math.min(requestBody.max_tokens || this.maxOutputTokens, this.maxOutputTokens),
+      messages: requestBody.messages || []
+    };
+
+    // 添加系统提示词
+    if (requestBody.system) {
+      bedrockPayload.system = requestBody.system;
+    }
+
+    // 添加其他参数
+    if (requestBody.temperature !== undefined) {
+      bedrockPayload.temperature = requestBody.temperature;
+    }
+
+    if (requestBody.top_p !== undefined) {
+      bedrockPayload.top_p = requestBody.top_p;
+    }
+
+    if (requestBody.top_k !== undefined) {
+      bedrockPayload.top_k = requestBody.top_k;
+    }
+
+    if (requestBody.stop_sequences) {
+      bedrockPayload.stop_sequences = requestBody.stop_sequences;
+    }
+
+    // 工具调用支持
+    if (requestBody.tools) {
+      bedrockPayload.tools = requestBody.tools;
+    }
+
+    if (requestBody.tool_choice) {
+      bedrockPayload.tool_choice = requestBody.tool_choice;
+    }
+
+    return bedrockPayload;
+  }
+
+  // 转换Bedrock响应到Claude格式
+  _convertFromBedrockFormat(bedrockResponse) {
+    return {
+      id: `msg_${Date.now()}_bedrock`,
+      type: 'message',
+      role: 'assistant',
+      content: bedrockResponse.content || [],
+      model: bedrockResponse.model || this.defaultModel,
+      stop_reason: bedrockResponse.stop_reason || 'end_turn',
+      stop_sequence: bedrockResponse.stop_sequence || null,
+      usage: bedrockResponse.usage || {
+        input_tokens: 0,
+        output_tokens: 0
+      }
+    };
+  }
+
+  // 转换Bedrock流事件到Claude SSE格式
+  _convertBedrockStreamToClaudeFormat(bedrockChunk) {
+    if (bedrockChunk.type === 'message_start') {
+      return {
+        type: 'message_start',
+        data: {
+          type: 'message',
+          id: `msg_${Date.now()}_bedrock`,
+          role: 'assistant',
+          content: [],
+          model: this.defaultModel,
+          stop_reason: null,
+          stop_sequence: null,
+          usage: bedrockChunk.message?.usage || { input_tokens: 0, output_tokens: 0 }
+        }
+      };
+    }
+
+    if (bedrockChunk.type === 'content_block_delta') {
+      return {
+        type: 'content_block_delta',
+        data: {
+          index: bedrockChunk.index || 0,
+          delta: bedrockChunk.delta || {}
+        }
+      };
+    }
+
+    if (bedrockChunk.type === 'message_delta') {
+      return {
+        type: 'message_delta',
+        data: {
+          delta: bedrockChunk.delta || {},
+          usage: bedrockChunk.usage || {}
+        }
+      };
+    }
+
+    if (bedrockChunk.type === 'message_stop') {
+      return {
+        type: 'message_stop',
+        data: {
+          usage: bedrockChunk.usage || {}
+        }
+      };
+    }
+
+    return null;
+  }
+
+  // 处理Bedrock错误
+  _handleBedrockError(error) {
+    const errorMessage = error.message || 'Unknown Bedrock error';
+
+    if (error.name === 'ValidationException') {
+      return new Error(`Bedrock参数验证失败: ${errorMessage}`);
+    }
+
+    if (error.name === 'ThrottlingException') {
+      return new Error('Bedrock请求限流，请稍后重试');
+    }
+
+    if (error.name === 'AccessDeniedException') {
+      return new Error('Bedrock访问被拒绝，请检查IAM权限');
+    }
+
+    if (error.name === 'ModelNotReadyException') {
+      return new Error('Bedrock模型未就绪，请稍后重试');
+    }
+
+    return new Error(`Bedrock服务错误: ${errorMessage}`);
+  }
+
+  // 获取可用模型列表
+  async getAvailableModels(bedrockAccount = null) {
+    try {
+      const region = bedrockAccount?.region || this.defaultRegion;
+
+      // Bedrock暂不支持列出推理配置文件的API，返回预定义的模型列表
+      const models = [
+        {
+          id: 'us.anthropic.claude-sonnet-4-20250514-v1:0',
+          name: 'Claude Sonnet 4',
+          provider: 'anthropic',
+          type: 'bedrock'
+        },
+        {
+          id: 'us.anthropic.claude-opus-4-1-20250805-v1:0',
+          name: 'Claude Opus 4.1',
+          provider: 'anthropic',
+          type: 'bedrock'
+        },
+        {
+          id: 'us.anthropic.claude-3-7-sonnet-20250219-v1:0',
+          name: 'Claude 3.7 Sonnet',
+          provider: 'anthropic',
+          type: 'bedrock'
+        },
+        {
+          id: 'us.anthropic.claude-3-5-sonnet-20241022-v2:0',
+          name: 'Claude 3.5 Sonnet v2',
+          provider: 'anthropic',
+          type: 'bedrock'
+        },
+        {
+          id: 'us.anthropic.claude-3-5-haiku-20241022-v1:0',
+          name: 'Claude 3.5 Haiku',
+          provider: 'anthropic',
+          type: 'bedrock'
+        }
+      ];
+
+      logger.debug(`📋 返回Bedrock可用模型 ${models.length} 个, 区域: ${region}`);
+      return models;
+
+    } catch (error) {
+      logger.error('❌ 获取Bedrock模型列表失败:', error);
+      return [];
+    }
+  }
+}
+
+module.exports = new BedrockRelayService();

src/services/claudeRelayService.js

@@ -559,7 +559,7 @@ class ClaudeRelayService {
       }
 
       req.on('error', (error) => {
-        console.error(": ❌ ", error);
+        console.error(': ❌ ', error);
         logger.error('❌ Claude API request error:', error.message, {
           code: error.code,
           errno: error.errno,
@@ -724,7 +724,7 @@ class ClaudeRelayService {
           });
           
           res.on('end', () => {
-            console.error(": ❌ ", errorData);
+            console.error(': ❌ ', errorData);
             logger.error('❌ Claude API error response:', errorData);
             if (!responseStream.destroyed) {
               // 发送错误事件

src/services/unifiedClaudeScheduler.js

@@ -1,5 +1,6 @@
 const claudeAccountService = require('./claudeAccountService');
 const claudeConsoleAccountService = require('./claudeConsoleAccountService');
+const bedrockAccountService = require('./bedrockAccountService');
 const accountGroupService = require('./accountGroupService');
 const redis = require('../models/redis');
 const logger = require('../utils/logger');
@@ -58,6 +59,20 @@ class UnifiedClaudeScheduler {
         }
       }
 
+      // 3. 检查Bedrock账户绑定
+      if (apiKeyData.bedrockAccountId) {
+        const boundBedrockAccountResult = await bedrockAccountService.getAccount(apiKeyData.bedrockAccountId);
+        if (boundBedrockAccountResult.success && boundBedrockAccountResult.data.isActive === true) {
+          logger.info(`🎯 Using bound dedicated Bedrock account: ${boundBedrockAccountResult.data.name} (${apiKeyData.bedrockAccountId}) for API key ${apiKeyData.name}`);
+          return {
+            accountId: apiKeyData.bedrockAccountId,
+            accountType: 'bedrock'
+          };
+        } else {
+          logger.warn(`⚠️ Bound Bedrock account ${apiKeyData.bedrockAccountId} is not available, falling back to pool`);
+        }
+      }
+
       // 如果有会话哈希，检查是否有已映射的账户
       if (sessionHash) {
         const mappedAccount = await this._getSessionMapping(sessionHash);
@@ -155,6 +170,23 @@ class UnifiedClaudeScheduler {
       }
     }
 
+    // 3. 检查Bedrock账户绑定
+    if (apiKeyData.bedrockAccountId) {
+      const boundBedrockAccountResult = await bedrockAccountService.getAccount(apiKeyData.bedrockAccountId);
+      if (boundBedrockAccountResult.success && boundBedrockAccountResult.data.isActive === true) {
+        logger.info(`🎯 Using bound dedicated Bedrock account: ${boundBedrockAccountResult.data.name} (${apiKeyData.bedrockAccountId})`);
+        return [{
+          ...boundBedrockAccountResult.data,
+          accountId: boundBedrockAccountResult.data.id,
+          accountType: 'bedrock',
+          priority: parseInt(boundBedrockAccountResult.data.priority) || 50,
+          lastUsedAt: boundBedrockAccountResult.data.lastUsedAt || '0'
+        }];
+      } else {
+        logger.warn(`⚠️ Bound Bedrock account ${apiKeyData.bedrockAccountId} is not available`);
+      }
+    }
+
     // 获取官方Claude账户（共享池）
     const claudeAccounts = await redis.getAllClaudeAccounts();
     for (const account of claudeAccounts) {
@@ -227,8 +259,35 @@ class UnifiedClaudeScheduler {
         logger.info(`❌ Claude Console account ${account.name} not eligible - isActive: ${account.isActive}, status: ${account.status}, accountType: ${account.accountType}, schedulable: ${account.schedulable}`);
       }
     }
+
+    // 获取Bedrock账户（共享池）
+    const bedrockAccountsResult = await bedrockAccountService.getAllAccounts();
+    if (bedrockAccountsResult.success) {
+      const bedrockAccounts = bedrockAccountsResult.data;
+      logger.info(`📋 Found ${bedrockAccounts.length} total Bedrock accounts`);
+      
+      for (const account of bedrockAccounts) {
+        logger.info(`🔍 Checking Bedrock account: ${account.name} - isActive: ${account.isActive}, accountType: ${account.accountType}, schedulable: ${account.schedulable}`);
+        
+        if (account.isActive === true && 
+            account.accountType === 'shared' &&
+            this._isSchedulable(account.schedulable)) { // 检查是否可调度
+          
+          availableAccounts.push({
+            ...account,
+            accountId: account.id,
+            accountType: 'bedrock',
+            priority: parseInt(account.priority) || 50,
+            lastUsedAt: account.lastUsedAt || '0'
+          });
+          logger.info(`✅ Added Bedrock account to available pool: ${account.name} (priority: ${account.priority})`);
+        } else {
+          logger.info(`❌ Bedrock account ${account.name} not eligible - isActive: ${account.isActive}, accountType: ${account.accountType}, schedulable: ${account.schedulable}`);
+        }
+      }
+    }
     
-    logger.info(`📊 Total available accounts: ${availableAccounts.length} (Claude: ${availableAccounts.filter(a => a.accountType === 'claude-official').length}, Console: ${availableAccounts.filter(a => a.accountType === 'claude-console').length})`);
+    logger.info(`📊 Total available accounts: ${availableAccounts.length} (Claude: ${availableAccounts.filter(a => a.accountType === 'claude-official').length}, Console: ${availableAccounts.filter(a => a.accountType === 'claude-console').length}, Bedrock: ${availableAccounts.filter(a => a.accountType === 'bedrock').length})`);
     return availableAccounts;
   }
 
@@ -272,6 +331,18 @@ class UnifiedClaudeScheduler {
           return false;
         }
         return !(await claudeConsoleAccountService.isAccountRateLimited(accountId));
+      } else if (accountType === 'bedrock') {
+        const accountResult = await bedrockAccountService.getAccount(accountId);
+        if (!accountResult.success || !accountResult.data.isActive) {
+          return false;
+        }
+        // 检查是否可调度
+        if (!this._isSchedulable(accountResult.data.schedulable)) {
+          logger.info(`🚫 Bedrock account ${accountId} is not schedulable`);
+          return false;
+        }
+        // Bedrock账户暂不需要限流检查，因为AWS管理限流
+        return true;
       }
       return false;
     } catch (error) {