aicodeswitch 1.7.1 → 1.9.0

package/README.md

@@ -97,7 +97,7 @@ Codex的配置覆盖逻辑一模一样。
 
 **有什么用？**
 
-aicodeswitch内部，会根据“源类型”来转换数据。例如，你的供应商API服务接口是OpenAI Chat的数据格式，而你在路由中配置的“路由对象“是Claude Code，那么就意味着，这个供应商API的数据，需要经过转换之后才能被Claude Code正确使用。
+aicodeswitch内部，会根据“源类型”来转换数据。例如，你的供应商API服务接口是OpenAI Chat的数据格式，而你在路由中配置的“客户端工具“是Claude Code，那么就意味着，这个供应商API的数据，需要经过转换之后才能被Claude Code正确使用。
 
 ## 路由管理
 
@@ -105,7 +105,7 @@ aicodeswitch内部，会根据“源类型”来转换数据。例如，你的
 
 路由是aicodeswitch的核心功能，它负责将不同的对象（目前指Claude Code和Codex）的请求，路由到不同的供应商API服务上。
 
-### 什么是“路由对象”？
+### 什么是“客户端工具”？
 
 目前指Claude Code或Codex。
 

package/dist/server/database.js

@@ -58,6 +58,16 @@ class DatabaseManager {
             value: void 0
         });
         this.db = new better_sqlite3_1.default(path_1.default.join(dataPath, 'app.db'));
+        // 启用外键约束（SQLite 默认禁用，必须手动启用才能使 ON DELETE CASCADE 生效）
+        this.db.pragma('foreign_keys = ON');
+        // 配置数据库以确保实时读取最新数据
+        // WAL 模式 + normal 同步模式: 提供最佳的并发性和实时性
+        this.db.pragma('journal_mode = WAL');
+        this.db.pragma('synchronous = NORMAL');
+        // 确保读取操作不会看到旧的数据快照
+        // 在 WAL 模式下,默认情况下读取操作不会阻塞写入操作
+        // 设置 read_uncommitted = 0 确保读取最新提交的数据
+        this.db.pragma('read_uncommitted = 0');
         this.logDb = new level_1.Level(path_1.default.join(dataPath, 'logs'), { valueEncoding: 'json' });
         this.accessLogDb = new level_1.Level(path_1.default.join(dataPath, 'access-logs'), { valueEncoding: 'json' });
         this.errorLogDb = new level_1.Level(path_1.default.join(dataPath, 'error-logs'), { valueEncoding: 'json' });
@@ -66,9 +76,137 @@ class DatabaseManager {
     initialize() {
         return __awaiter(this, void 0, void 0, function* () {
             this.createTables();
+            yield this.runMigrations();
             yield this.ensureDefaultConfig();
         });
     }
+    runMigrations() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const columns = this.db.pragma('table_info(api_services)');
+            // 检查是否有旧的 max_output_tokens 字段（单值版本）
+            const hasOldMaxOutputTokens = columns.some((col) => col.name === 'max_output_tokens');
+            // 检查是否已经有新的 model_limits 字段（JSON 版本）
+            const hasModelLimits = columns.some((col) => col.name === 'model_limits');
+            if (!hasModelLimits) {
+                if (hasOldMaxOutputTokens) {
+                    // 如果有旧字段，先删除旧字段（SQLite 不支持 ALTER TABLE DROP COLUMN，需要重建表）
+                    console.log('[DB] Running migration: Replacing max_output_tokens with model_limits');
+                    yield this.migrateMaxOutputTokensToModelLimits();
+                }
+                else {
+                    // 直接添加新字段
+                    console.log('[DB] Running migration: Adding model_limits column to api_services table');
+                    this.db.exec('ALTER TABLE api_services ADD COLUMN model_limits TEXT;');
+                    console.log('[DB] Migration completed: model_limits column added');
+                }
+            }
+            // 检查rules表是否有token相关字段
+            const rulesColumns = this.db.pragma('table_info(rules)');
+            const hasTokenLimit = rulesColumns.some((col) => col.name === 'token_limit');
+            const hasTotalTokensUsed = rulesColumns.some((col) => col.name === 'total_tokens_used');
+            const hasResetInterval = rulesColumns.some((col) => col.name === 'reset_interval');
+            const hasLastResetAt = rulesColumns.some((col) => col.name === 'last_reset_at');
+            if (!hasTokenLimit) {
+                console.log('[DB] Running migration: Adding token_limit column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN token_limit INTEGER;');
+                console.log('[DB] Migration completed: token_limit column added');
+            }
+            if (!hasTotalTokensUsed) {
+                console.log('[DB] Running migration: Adding total_tokens_used column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN total_tokens_used INTEGER DEFAULT 0;');
+                console.log('[DB] Migration completed: total_tokens_used column added');
+            }
+            if (!hasResetInterval) {
+                console.log('[DB] Running migration: Adding reset_interval column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN reset_interval INTEGER;');
+                console.log('[DB] Migration completed: reset_interval column added');
+            }
+            if (!hasLastResetAt) {
+                console.log('[DB] Running migration: Adding last_reset_at column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN last_reset_at INTEGER;');
+                console.log('[DB] Migration completed: last_reset_at column added');
+            }
+            // 检查rules表是否有timeout字段
+            const hasRuleTimeout = rulesColumns.some((col) => col.name === 'timeout');
+            if (!hasRuleTimeout) {
+                console.log('[DB] Running migration: Adding timeout column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN timeout INTEGER;');
+                console.log('[DB] Migration completed: timeout column added to rules');
+            }
+            // 检查api_services表是否有timeout字段，如果有则移除
+            const hasServiceTimeout = columns.some((col) => col.name === 'timeout');
+            if (hasServiceTimeout) {
+                console.log('[DB] Running migration: Removing timeout column from api_services table');
+                yield this.migrateRemoveServiceTimeout();
+                console.log('[DB] Migration completed: timeout column removed from api_services');
+            }
+        });
+    }
+    migrateMaxOutputTokensToModelLimits() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // SQLite 不支持直接删除列，需要重建表
+            // 先临时禁用外键约束
+            this.db.pragma('foreign_keys = OFF');
+            this.db.exec(`
+      CREATE TABLE api_services_new (
+        id TEXT PRIMARY KEY,
+        vendor_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        api_url TEXT NOT NULL,
+        api_key TEXT NOT NULL,
+        timeout INTEGER,
+        source_type TEXT,
+        supported_models TEXT,
+        model_limits TEXT,
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        FOREIGN KEY (vendor_id) REFERENCES vendors(id) ON DELETE CASCADE
+      );
+
+      INSERT INTO api_services_new
+      SELECT
+        id, vendor_id, name, api_url, api_key, timeout, source_type, supported_models,
+        NULL, -- model_limits 设为 NULL，旧数据需要手动配置
+        created_at, updated_at
+      FROM api_services;
+
+      DROP TABLE api_services;
+      ALTER TABLE api_services_new RENAME TO api_services;
+    `);
+            // 重新启用外键约束
+            this.db.pragma('foreign_keys = ON');
+            console.log('[DB] Migration completed: Replaced max_output_tokens with model_limits');
+        });
+    }
+    migrateRemoveServiceTimeout() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // SQLite 不支持直接删除列，需要重建表
+            this.db.pragma('foreign_keys = OFF');
+            this.db.exec(`
+      CREATE TABLE api_services_new (
+        id TEXT PRIMARY KEY,
+        vendor_id TEXT NOT NULL,
+        name TEXT NOT NULL,
+        api_url TEXT NOT NULL,
+        api_key TEXT NOT NULL,
+        source_type TEXT,
+        supported_models TEXT,
+        model_limits TEXT,
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL,
+        FOREIGN KEY (vendor_id) REFERENCES vendors(id) ON DELETE CASCADE
+      );
+
+      INSERT INTO api_services_new (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at)
+      SELECT id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at
+      FROM api_services;
+
+      DROP TABLE api_services;
+      ALTER TABLE api_services_new RENAME TO api_services;
+    `);
+            this.db.pragma('foreign_keys = ON');
+        });
+    }
     createTables() {
         this.db.exec(`
       CREATE TABLE IF NOT EXISTS vendors (
@@ -85,7 +223,6 @@ class DatabaseManager {
          name TEXT NOT NULL,
          api_url TEXT NOT NULL,
          api_key TEXT NOT NULL,
-         timeout INTEGER,
          source_type TEXT,
          supported_models TEXT,
          created_at INTEGER NOT NULL,
@@ -111,6 +248,11 @@ class DatabaseManager {
         target_model TEXT,
         replaced_model TEXT,
         sort_order INTEGER DEFAULT 0,
+        timeout INTEGER,
+        token_limit INTEGER,
+        total_tokens_used INTEGER DEFAULT 0,
+        reset_interval INTEGER,
+        last_reset_at INTEGER,
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL,
         FOREIGN KEY (route_id) REFERENCES routes(id) ON DELETE CASCADE,
@@ -129,7 +271,7 @@ class DatabaseManager {
             if (!config) {
                 const defaultConfig = {
                     enableLogging: true,
-                    logRetentionDays: 7,
+                    logRetentionDays: 30,
                     maxLogSize: 1000,
                     apiKey: '',
                     enableFailover: true, // 默认启用智能故障切换
@@ -170,37 +312,48 @@ class DatabaseManager {
     }
     // API Service operations
     getAPIServices(vendorId) {
+        // 每次都重新准备语句以确保获取最新数据
         const query = vendorId
             ? 'SELECT * FROM api_services WHERE vendor_id = ? ORDER BY created_at DESC'
             : 'SELECT * FROM api_services ORDER BY created_at DESC';
-        const stmt = vendorId ? this.db.prepare(query).bind(vendorId) : this.db.prepare(query);
-        const rows = stmt.all();
-        return rows.map((row) => ({
+        // 不缓存 prepared statement,每次重新创建以确保读取最新数据
+        const stmt = this.db.prepare(query);
+        const rows = vendorId ? stmt.all(vendorId) : stmt.all();
+        const services = rows.map((row) => ({
             id: row.id,
             vendorId: row.vendor_id,
             name: row.name,
             apiUrl: row.api_url,
             apiKey: row.api_key,
-            timeout: row.timeout,
             sourceType: row.source_type,
             supportedModels: row.supported_models ? row.supported_models.split(',').map((model) => model.trim()).filter((model) => model.length > 0) : undefined,
+            modelLimits: row.model_limits ? JSON.parse(row.model_limits) : undefined,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));
+        // 调试日志: 记录读取的服务信息
+        if (process.env.NODE_ENV === 'development' && services.length > 0) {
+            console.log(`[DB] Read ${services.length} services from database, first service: ${services[0].name} -> ${services[0].apiUrl}`);
+        }
+        return services;
     }
     createAPIService(service) {
         const id = crypto_1.default.randomUUID();
         const now = Date.now();
         this.db
-            .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, timeout, source_type, supported_models, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-            .run(id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, now, now);
+            .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+            .run(id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, now);
         return Object.assign(Object.assign({}, service), { id, createdAt: now, updatedAt: now });
     }
     updateAPIService(id, service) {
         const now = Date.now();
         const result = this.db
-            .prepare('UPDATE api_services SET name = ?, api_url = ?, api_key = ?, timeout = ?, source_type = ?, supported_models = ?, updated_at = ? WHERE id = ?')
-            .run(service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, now, id);
+            .prepare('UPDATE api_services SET name = ?, api_url = ?, api_key = ?, source_type = ?, supported_models = ?, model_limits = ?, updated_at = ? WHERE id = ?')
+            .run(service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, now, id);
+        // 调试日志: 记录更新操作
+        if (result.changes > 0 && process.env.NODE_ENV === 'development') {
+            console.log(`[DB] Updated service ${id}: ${service.name} -> ${service.apiUrl}`);
+        }
         return result.changes > 0;
     }
     deleteAPIService(id) {
@@ -267,6 +420,11 @@ class DatabaseManager {
             targetModel: row.target_model,
             replacedModel: row.replaced_model,
             sortOrder: row.sort_order,
+            timeout: row.timeout,
+            tokenLimit: row.token_limit,
+            totalTokensUsed: row.total_tokens_used,
+            resetInterval: row.reset_interval,
+            lastResetAt: row.last_reset_at,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));
@@ -275,21 +433,68 @@ class DatabaseManager {
         const id = crypto_1.default.randomUUID();
         const now = Date.now();
         this.db
-            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)')
-            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, now, now);
+            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout || null, route.tokenLimit || null, route.totalTokensUsed || 0, route.resetInterval || null, route.lastResetAt || null, now, now);
         return Object.assign(Object.assign({}, route), { id, createdAt: now, updatedAt: now });
     }
     updateRule(id, route) {
         const now = Date.now();
         const result = this.db
-            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, updated_at = ? WHERE id = ?')
-            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, now, id);
+            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, timeout = ?, token_limit = ?, reset_interval = ?, updated_at = ? WHERE id = ?')
+            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout !== undefined ? route.timeout : null, route.tokenLimit !== undefined ? route.tokenLimit : null, route.resetInterval !== undefined ? route.resetInterval : null, now, id);
         return result.changes > 0;
     }
     deleteRule(id) {
         const result = this.db.prepare('DELETE FROM rules WHERE id = ?').run(id);
         return result.changes > 0;
     }
+    /**
+     * 增加规则的token使用量
+     * @param ruleId 规则ID
+     * @param tokensUsed 使用的token数量
+     * @returns 是否成功
+     */
+    incrementRuleTokenUsage(ruleId, tokensUsed) {
+        const result = this.db
+            .prepare('UPDATE rules SET total_tokens_used = total_tokens_used + ? WHERE id = ?')
+            .run(tokensUsed, ruleId);
+        return result.changes > 0;
+    }
+    /**
+     * 重置规则的token使用量
+     * @param ruleId 规则ID
+     * @returns 是否成功
+     */
+    resetRuleTokenUsage(ruleId) {
+        const now = Date.now();
+        const result = this.db
+            .prepare('UPDATE rules SET total_tokens_used = 0, last_reset_at = ? WHERE id = ?')
+            .run(now, ruleId);
+        return result.changes > 0;
+    }
+    /**
+     * 检查并重置到期的规则
+     * 如果规则设置了reset_interval且已经到了重置时间，则自动重置token使用量
+     * @param ruleId 规则ID
+     * @returns 是否进行了重置
+     */
+    checkAndResetRuleIfNeeded(ruleId) {
+        const rule = this.db
+            .prepare('SELECT reset_interval, last_reset_at FROM rules WHERE id = ?')
+            .get(ruleId);
+        if (!rule || !rule.reset_interval) {
+            return false; // 没有设置重置间隔
+        }
+        const now = Date.now();
+        const resetIntervalMs = rule.reset_interval * 60 * 60 * 1000; // 小时转毫秒
+        const lastResetAt = rule.last_reset_at || 0;
+        // 检查是否已经到了重置时间
+        if (now - lastResetAt >= resetIntervalMs) {
+            this.resetRuleTokenUsage(ruleId);
+            return true;
+        }
+        return false;
+    }
     // Log operations
     addLog(log) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -544,8 +749,8 @@ class DatabaseManager {
                 // Import API services
                 for (const service of importData.apiServices) {
                     this.db
-                        .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, timeout, source_type, supported_models, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-                        .run(service.id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.timeout || null, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.createdAt, service.updatedAt);
+                        .prepare('INSERT INTO api_services (id, vendor_id, name, api_url, api_key, source_type, supported_models, model_limits, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+                        .run(service.id, service.vendorId, service.name, service.apiUrl, service.apiKey, service.sourceType || null, service.supportedModels ? service.supportedModels.join(',') : null, service.modelLimits ? JSON.stringify(service.modelLimits) : null, service.createdAt, service.updatedAt);
                 }
                 // Import routes
                 for (const route of importData.routes) {
@@ -556,8 +761,8 @@ class DatabaseManager {
                 // Import rules
                 for (const rule of importData.rules) {
                     this.db
-                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)')
-                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.createdAt, rule.updatedAt);
+                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.timeout || null, rule.tokenLimit || null, rule.totalTokensUsed || 0, rule.resetInterval || null, rule.lastResetAt || null, rule.createdAt, rule.updatedAt);
                 }
                 // Update config
                 this.updateConfig(importData.config);

package/dist/server/main.js

@@ -282,6 +282,7 @@ const registerRoutes = (dbManager, proxyServer) => {
     app.post('/api/rules', (req, res) => res.json(dbManager.createRule(req.body)));
     app.put('/api/rules/:id', (req, res) => res.json(dbManager.updateRule(req.params.id, req.body)));
     app.delete('/api/rules/:id', (req, res) => res.json(dbManager.deleteRule(req.params.id)));
+    app.put('/api/rules/:id/reset-tokens', (req, res) => res.json(dbManager.resetRuleTokenUsage(req.params.id)));
     app.get('/api/logs', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const rawLimit = typeof req.query.limit === 'string' ? parseInt(req.query.limit, 10) : NaN;
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;

package/dist/server/proxy-server.js

@@ -457,7 +457,12 @@ class ProxyServer {
      */
     getServiceById(serviceId) {
         const allServices = this.dbManager.getAPIServices();
-        return allServices.find(service => service.id === serviceId);
+        const service = allServices.find(s => s.id === serviceId);
+        // 调试日志: 记录获取的服务信息
+        if (process.env.NODE_ENV === 'development' && service) {
+            console.log(`[Proxy] getServiceById(${serviceId}): ${service.name} -> ${service.apiUrl}`);
+        }
+        return service;
     }
     findMatchingRule(routeId, req) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -471,32 +476,53 @@ class ProxyServer {
                 const modelMappingRules = rules.filter(rule => rule.contentType === 'model-mapping' &&
                     rule.replacedModel &&
                     requestModel.includes(rule.replacedModel));
-                // 过滤黑名单
+                // 过滤黑名单和token限制
                 for (const rule of modelMappingRules) {
                     const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, rule.contentType);
-                    if (!isBlacklisted) {
-                        return rule;
+                    if (isBlacklisted) {
+                        continue;
                     }
+                    // 检查并重置到期的规则
+                    this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                    // 检查token限制
+                    if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                        continue; // 跳过超限规则
+                    }
+                    return rule;
                 }
             }
             // 2. 查找其他内容类型的规则
             const contentType = this.determineContentType(req);
             const contentTypeRules = rules.filter(rule => rule.contentType === contentType);
-            // 过滤黑名单
+            // 过滤黑名单和token限制
             for (const rule of contentTypeRules) {
                 const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, contentType);
-                if (!isBlacklisted) {
-                    return rule;
+                if (isBlacklisted) {
+                    continue;
                 }
+                // 检查并重置到期的规则
+                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                // 检查token限制
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                    continue; // 跳过超限规则
+                }
+                return rule;
             }
             // 3. 最后返回 default 规则
             const defaultRules = rules.filter(rule => rule.contentType === 'default');
-            // 过滤黑名单
+            // 过滤黑名单和token限制
             for (const rule of defaultRules) {
                 const isBlacklisted = yield this.dbManager.isServiceBlacklisted(rule.targetServiceId, routeId, 'default');
-                if (!isBlacklisted) {
-                    return rule;
+                if (isBlacklisted) {
+                    continue;
+                }
+                // 检查并重置到期的规则
+                this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+                // 检查token限制
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined && rule.totalTokensUsed >= rule.tokenLimit) {
+                    continue; // 跳过超限规则
                 }
+                return rule;
             }
             return undefined;
         });
@@ -522,6 +548,23 @@ class ProxyServer {
         // 3. Default rules
         const defaultRules = rules.filter(rule => rule.contentType === 'default');
         candidates.push(...defaultRules);
+        // 4. 检查并重置到期的规则
+        candidates.forEach(rule => {
+            this.dbManager.checkAndResetRuleIfNeeded(rule.id);
+        });
+        // 5. 过滤掉超过token限制的规则（仅在有多个候选规则时）
+        if (candidates.length > 1) {
+            const filteredCandidates = candidates.filter(rule => {
+                if (rule.tokenLimit && rule.totalTokensUsed !== undefined) {
+                    return rule.totalTokensUsed < rule.tokenLimit;
+                }
+                return true; // 没有设置限制的规则总是可用
+            });
+            // 如果过滤后还有规则，使用过滤后的结果
+            if (filteredCandidates.length > 0) {
+                return filteredCandidates;
+            }
+        }
         return candidates;
     }
     determineContentType(req) {
@@ -768,6 +811,77 @@ class ProxyServer {
     isOpenAIChatSource(sourceType) {
         return sourceType === 'openai-chat' || sourceType === 'deepseek-chat';
     }
+    /**
+     * 判断模型是否应该使用 max_completion_tokens 字段
+     * GPT 的新模型（如 o1 系列）使用 max_completion_tokens
+     */
+    shouldUseMaxCompletionTokens(model) {
+        if (!model)
+            return false;
+        const lowerModel = model.toLowerCase();
+        // o1 系列模型使用 max_completion_tokens
+        return lowerModel.includes('o1-') ||
+            lowerModel.startsWith('o1') ||
+            lowerModel.includes('gpt-4.1') ||
+            lowerModel.includes('gpt-4o') ||
+            lowerModel.startsWith('chatgpt-');
+    }
+    /**
+     * 获取 max tokens 字段的名称
+     */
+    getMaxTokensFieldName(model) {
+        return this.shouldUseMaxCompletionTokens(model) ? 'max_completion_tokens' : 'max_tokens';
+    }
+    /**
+     * 应用 max_output_tokens 限制
+     * 根据服务的 modelLimits 配置，对具体模型应用 max_tokens/max_completion_tokens 限制
+     */
+    applyMaxOutputTokensLimit(body, service) {
+        if (!service.modelLimits || !body || typeof body !== 'object') {
+            return body;
+        }
+        const result = Object.assign({}, body);
+        const model = result.model;
+        if (!model) {
+            return body;
+        }
+        // 查找该模型的限制配置
+        // 支持精确匹配和前缀匹配（例如：gpt-4 可以匹配 gpt-4-turbo）
+        let maxOutputLimit;
+        // 1. 先尝试精确匹配
+        if (typeof service.modelLimits[model] === 'number') {
+            maxOutputLimit = service.modelLimits[model];
+        }
+        else {
+            // 2. 尝试前缀匹配（查找配置中以模型名开头的项）
+            const matchedKey = Object.keys(service.modelLimits).find(key => model.startsWith(key) || key.startsWith(model));
+            if (matchedKey && typeof service.modelLimits[matchedKey] === 'number') {
+                maxOutputLimit = service.modelLimits[matchedKey];
+            }
+        }
+        if (maxOutputLimit === undefined) {
+            // 没有找到配置，直接透传
+            return body;
+        }
+        const maxTokensFieldName = this.getMaxTokensFieldName(model);
+        // 获取请求中的 max_tokens 或 max_completion_tokens 值
+        const requestedMaxTokens = result[maxTokensFieldName] || result.max_tokens;
+        // 如果请求中指定了 max_tokens，并且超过配置的限制，则限制为配置的最大值
+        if (typeof requestedMaxTokens === 'number' && requestedMaxTokens > maxOutputLimit) {
+            console.log(`[Proxy] Limiting ${maxTokensFieldName} from ${requestedMaxTokens} to ${maxOutputLimit} for model ${model} in service ${service.name}`);
+            result[maxTokensFieldName] = maxOutputLimit;
+            // 如果使用了 max_completion_tokens，清理旧的 max_tokens 字段
+            if (maxTokensFieldName === 'max_completion_tokens' && result.max_tokens !== undefined) {
+                delete result.max_tokens;
+            }
+        }
+        else if (requestedMaxTokens === undefined) {
+            // 如果请求中没有指定 max_tokens，则使用配置的最大值
+            console.log(`[Proxy] Setting ${maxTokensFieldName} to ${maxOutputLimit} for model ${model} in service ${service.name}`);
+            result[maxTokensFieldName] = maxOutputLimit;
+        }
+        return result;
+    }
     applyModelOverride(body, rule) {
         // 如果 targetModel 为空或不存在,保留原始 model(透传)
         if (!rule.targetModel)
@@ -932,6 +1046,10 @@ class ProxyServer {
                 var _a, _b;
                 if (logged || !((_a = this.config) === null || _a === void 0 ? void 0 : _a.enableLogging))
                     return;
+                // 只记录来自编程工具的请求
+                if (!SUPPORTED_TARGETS.some(target => req.path.startsWith(`/${target}/`))) {
+                    return;
+                }
                 logged = true;
                 // 获取供应商信息
                 const vendors = this.dbManager.getVendors();
@@ -950,6 +1068,7 @@ class ProxyServer {
                     usage: usageForLog,
                     error,
                     // 新增字段
+                    ruleId: rule.id,
                     targetType,
                     targetServiceId: service.id,
                     targetServiceName: service.name,
@@ -962,6 +1081,13 @@ class ProxyServer {
                     streamChunks: streamChunksForLog,
                     upstreamRequest: upstreamRequestForLog,
                 });
+                // 更新规则的token使用量（只在成功请求时更新）
+                if (usageForLog && statusCode < 400) {
+                    const totalTokens = (usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0);
+                    if (totalTokens > 0) {
+                        this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
+                    }
+                }
             });
             try {
                 if (targetType === 'claude-code') {
@@ -990,6 +1116,8 @@ class ProxyServer {
                         return;
                     }
                 }
+                // 应用 max_output_tokens 限制
+                requestBody = this.applyMaxOutputTokensLimit(requestBody, service);
                 const streamRequested = this.isStreamRequested(req, requestBody);
                 // Build the full URL by appending the request path to the service API URL
                 let pathToAppend = req.path;
@@ -1005,7 +1133,7 @@ class ProxyServer {
                     method: req.method,
                     url: `${service.apiUrl}${mappedPath}`,
                     headers: this.buildUpstreamHeaders(req, service, sourceType, streamRequested),
-                    timeout: service.timeout || 3000000, // 默认300秒
+                    timeout: rule.timeout || 3000000, // 默认300秒
                     validateStatus: () => true,
                     responseType: streamRequested ? 'stream' : 'json',
                 };
@@ -1016,9 +1144,14 @@ class ProxyServer {
                     config.data = requestBody;
                 }
                 // 记录实际发出的请求信息作为日志的一部分
+                const actualModel = (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || '';
+                const maxTokensFieldName = this.getMaxTokensFieldName(actualModel);
+                const actualMaxTokens = (requestBody === null || requestBody === void 0 ? void 0 : requestBody[maxTokensFieldName]) || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.max_tokens);
                 upstreamRequestForLog = {
                     url: `${service.apiUrl}${mappedPath}`,
-                    model: (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || '',
+                    model: actualModel,
+                    maxTokens: actualMaxTokens,
+                    maxTokensField: maxTokensFieldName,
                 };
                 const response = yield (0, axios_1.default)(config);
                 const responseHeaders = response.headers || {};