aicodeswitch 5.2.13 → 6.0.1

package/dist/server/config-managed-fields.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getManagedFields = exports.CODEX_AUTH_MANAGED_FIELDS = exports.CODEX_CONFIG_MANAGED_FIELDS = exports.CLAUDE_JSON_MANAGED_FIELDS = exports.CLAUDE_SETTINGS_MANAGED_FIELDS = void 0;
+exports.getManagedFields = exports.OPENCODE_CONFIG_MANAGED_FIELDS = exports.CODEX_AUTH_MANAGED_FIELDS = exports.CODEX_CONFIG_MANAGED_FIELDS = exports.CLAUDE_JSON_MANAGED_FIELDS = exports.CLAUDE_SETTINGS_MANAGED_FIELDS = void 0;
 /**
  * Claude Code settings.json 管理字段定义
  */
@@ -50,6 +50,20 @@ exports.CODEX_CONFIG_MANAGED_FIELDS = [
 exports.CODEX_AUTH_MANAGED_FIELDS = [
     { path: ['OPENAI_API_KEY'] },
 ];
+/**
+ * OpenCode opencode.json 管理字段定义
+ *
+ * OpenCode 配置为纯 JSON，使用自定义 provider 指向本代理。
+ * 托管整个 `provider.aicodeswitch` section（npm/name/options/models）
+ * 以及 `model` / `small_model` 两个模型选择字段。其余字段（其它 provider、
+ * agent、command、mcp、theme 等）一律保留给用户。
+ */
+exports.OPENCODE_CONFIG_MANAGED_FIELDS = [
+    { path: ['provider', 'aicodeswitch'], isSection: true },
+    { path: ['model'] },
+    { path: ['small_model'], optional: true },
+    { path: ['mcp'], isSection: true, optional: true },
+];
 /**
  * 根据配置类型和文件路径获取管理字段列表
  */
@@ -70,6 +84,11 @@ const getManagedFields = (configType, filePath) => {
             return exports.CODEX_AUTH_MANAGED_FIELDS;
         }
     }
+    else if (configType === 'opencode') {
+        if (filePath.endsWith('opencode.json')) {
+            return exports.OPENCODE_CONFIG_MANAGED_FIELDS;
+        }
+    }
     return [];
 };
 exports.getManagedFields = getManagedFields;

package/dist/server/config-metadata.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanupInvalidMetadata = exports.checkCodexConfigStatus = exports.checkClaudeConfigStatus = exports.deleteMetadata = exports.loadMetadata = exports.saveMetadata = void 0;
+exports.cleanupInvalidMetadata = exports.checkOpencodeConfigStatus = exports.getOpencodeConfigPath = exports.checkCodexConfigStatus = exports.checkClaudeConfigStatus = exports.deleteMetadata = exports.loadMetadata = exports.saveMetadata = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -270,6 +270,83 @@ const checkCodexConfigStatus = () => {
     };
 };
 exports.checkCodexConfigStatus = checkCodexConfigStatus;
+/**
+ * 检查 OpenCode 配置文件是否包含我们的代理特征
+ */
+const isOpencodeProxyConfig = (filePath) => {
+    var _a, _b;
+    try {
+        if (!fs_1.default.existsSync(filePath)) {
+            return false;
+        }
+        const content = fs_1.default.readFileSync(filePath, 'utf-8');
+        const config = JSON.parse(content);
+        // 检查是否包含我们的自定义 provider（provider.aicodeswitch）
+        const provider = (_a = config === null || config === void 0 ? void 0 : config.provider) === null || _a === void 0 ? void 0 : _a.aicodeswitch;
+        if (provider && typeof provider === 'object') {
+            const baseUrl = (_b = provider.options) === null || _b === void 0 ? void 0 : _b.baseURL;
+            // baseURL 指向本代理的 /opencode 路径
+            if (baseUrl && typeof baseUrl === 'string' && /\/opencode(\/|$)/.test(baseUrl)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    catch (error) {
+        console.error(`Failed to check OpenCode config:`, error);
+        return false;
+    }
+};
+/**
+ * OpenCode 配置文件路径（~/.config/opencode/opencode.json）
+ */
+const getOpencodeConfigPath = () => {
+    const homeDir = os_1.default.homedir();
+    return path_1.default.join(homeDir, '.config', 'opencode', 'opencode.json');
+};
+exports.getOpencodeConfigPath = getOpencodeConfigPath;
+/**
+ * 检查 OpenCode 配置状态
+ */
+const checkOpencodeConfigStatus = () => {
+    var _a;
+    const configPath = (0, exports.getOpencodeConfigPath)();
+    const configBakPath = `${configPath}.aicodeswitch_backup`;
+    // 检查备份文件是否存在
+    const hasBackup = fs_1.default.existsSync(configBakPath);
+    // 尝试加载元数据
+    const metadata = (0, exports.loadMetadata)('opencode');
+    if (metadata) {
+        const currentHash = calculateFileHash(configPath);
+        const isProxyConfig = isOpencodeProxyConfig(configPath);
+        let isModified = false;
+        if (currentHash && ((_a = metadata.files[0]) === null || _a === void 0 ? void 0 : _a.currentHash)) {
+            isModified = currentHash !== metadata.files[0].currentHash;
+        }
+        const isOverwritten = isProxyConfig;
+        return {
+            isOverwritten,
+            isModified,
+            hasBackup,
+            metadata
+        };
+    }
+    if (hasBackup) {
+        const isProxyConfig = isOpencodeProxyConfig(configPath);
+        return {
+            isOverwritten: isProxyConfig,
+            isModified: false,
+            hasBackup
+        };
+    }
+    const isProxyConfig = isOpencodeProxyConfig(configPath);
+    return {
+        isOverwritten: isProxyConfig,
+        isModified: false,
+        hasBackup: false
+    };
+};
+exports.checkOpencodeConfigStatus = checkOpencodeConfigStatus;
 /**
  * 清理无效的元数据
  * 当备份文件不存在但元数据存在时,说明状态不一致,需要清理

package/dist/server/conversions/index.js

@@ -276,8 +276,16 @@ function buildTargetBody(options) {
             if (result.messages) {
                 result.messages = (0, mapper_js_2.fixThinkingHistory)(result.messages, 'completions');
             }
-            // 剥离 stream_options（reasoning_content 提供商通常不支持）
-            delete result.stream_options;
+            // stream_options 剥离策略由 providerConfig.streamOptions 决定：
+            //   'supported'   → 保留（DeepSeek 等支持 include_usage，能拿到真实 usage）
+            //   'unsupported' → 剥离（已知会报错的供应商）
+            //   'auto'/缺省   → 维持历史行为：reasoning_content 剥离
+            const streamOpt = providerConfig.streamOptions || 'auto';
+            const shouldStripStreamOptions = streamOpt === 'unsupported' ||
+                (streamOpt === 'auto' && isReasoningContentCompletion);
+            if (shouldStripStreamOptions) {
+                delete result.stream_options;
+            }
         }
         // 注入 thinking 参数（如 thinking: { type: 'enabled' }）和 effort 参数
         if (providerConfig.supportsThinking || providerConfig.supportsEffort) {

package/dist/server/conversions/thinking/providers.js

@@ -6,17 +6,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_CONFIG = void 0;
 exports.getReasoningConfig = getReasoningConfig;
 exports.applyReasoningConfig = applyReasoningConfig;
+// streamOptions 语义（决定流式请求是否保留 stream_options.include_usage）：
+//   'supported'   → 已知支持 include_usage 的供应商，保留 → 流式可拿到真实 usage
+//   'unsupported' → 已知会对 stream_options 报错的供应商，剥离
+//   'auto'        → 未明确，由 conversions/index.ts 按 outputFormat 兜底（reasoning_content 剥离，其余保留）
 const PROVIDER_CONFIGS = [
-    { patterns: ['deepseek'], config: { supportsThinking: true, supportsEffort: true, thinkingParam: 'thinking', effortParam: 'reasoning_effort', effortValueMode: 'deepseek', outputFormat: 'reasoning_content' } },
-    { patterns: ['moonshot', 'kimi'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
-    { patterns: ['qwen', 'dashscope'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'enable_thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
-    { patterns: ['zhipu', 'glm', 'bigmodel'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
+    { patterns: ['deepseek'], config: { supportsThinking: true, supportsEffort: true, thinkingParam: 'thinking', effortParam: 'reasoning_effort', effortValueMode: 'deepseek', outputFormat: 'reasoning_content', streamOptions: 'supported' } },
+    { patterns: ['moonshot', 'kimi'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'supported' } },
+    { patterns: ['qwen', 'dashscope'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'enable_thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'supported' } },
+    { patterns: ['zhipu', 'glm', 'bigmodel'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'supported' } },
     { patterns: ['minimax'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'reasoning_split', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_details' } },
-    { patterns: ['mimo', 'xiaomimimo'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
+    { patterns: ['mimo', 'xiaomimimo'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'auto' } },
     { patterns: ['openrouter'], config: { supportsThinking: false, supportsEffort: true, thinkingParam: 'none', effortParam: 'reasoning.effort', effortValueMode: 'openrouter', outputFormat: 'reasoning' } },
-    { patterns: ['siliconflow'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'enable_thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
+    { patterns: ['siliconflow'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'enable_thinking', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'supported' } },
     { patterns: ['stepfun', 'step'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'none', effortParam: 'reasoning_effort', effortValueMode: 'low_high', outputFormat: 'reasoning' } },
-    { patterns: ['agnes'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'chat_template_kwargs', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content' } },
+    { patterns: ['agnes'], config: { supportsThinking: true, supportsEffort: false, thinkingParam: 'chat_template_kwargs', effortParam: 'none', effortValueMode: 'passthrough', outputFormat: 'reasoning_content', streamOptions: 'auto' } },
 ];
 const DEFAULT_CONFIG = {
     supportsThinking: false,
@@ -25,6 +29,7 @@ const DEFAULT_CONFIG = {
     effortParam: 'none',
     effortValueMode: 'passthrough',
     outputFormat: 'reasoning_content',
+    streamOptions: 'auto',
 };
 exports.DEFAULT_CONFIG = DEFAULT_CONFIG;
 /** Detect reasoning config for a given provider */

package/dist/server/fs-database.js

@@ -190,6 +190,7 @@ class FileSystemDatabaseManager {
             value: {
                 'claude-code': { tool: 'claude-code', routeId: null },
                 'codex': { tool: 'codex', routeId: null },
+                'opencode': { tool: 'opencode', routeId: null },
             }
         });
         // 持久化统计数据
@@ -552,6 +553,7 @@ class FileSystemDatabaseManager {
                 this.toolBindings = {
                     'claude-code': parsed['claude-code'] || { tool: 'claude-code', routeId: null },
                     'codex': parsed['codex'] || { tool: 'codex', routeId: null },
+                    'opencode': parsed['opencode'] || { tool: 'opencode', routeId: null },
                 };
             }
             catch (_a) {
@@ -559,6 +561,7 @@ class FileSystemDatabaseManager {
                 this.toolBindings = {
                     'claude-code': { tool: 'claude-code', routeId: null },
                     'codex': { tool: 'codex', routeId: null },
+                    'opencode': { tool: 'opencode', routeId: null },
                 };
             }
         });
@@ -908,7 +911,7 @@ class FileSystemDatabaseManager {
                     // Only migrate routes that are explicitly active and have a targetType
                     if (route.isActive === true && route.targetType) {
                         const tool = route.targetType;
-                        if (tool === 'claude-code' || tool === 'codex') {
+                        if (tool === 'claude-code' || tool === 'codex' || tool === 'opencode') {
                             // Only write if tool-bindings doesn't already have a binding
                             // (avoid overwriting user's newer tool-binding choices)
                             if (!((_a = this.toolBindings[tool]) === null || _a === void 0 ? void 0 : _a.routeId)) {
@@ -2323,6 +2326,8 @@ class FileSystemDatabaseManager {
                     lastRequestAt: now,
                     requestCount: 1,
                     totalTokens: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
                 };
                 this.sessions.push(session);
                 yield this.saveSessions();
@@ -2478,6 +2483,8 @@ class FileSystemDatabaseManager {
             existing.lastRequestAt = now;
             existing.requestCount++;
             existing.totalTokens += session.totalTokens || 0;
+            existing.inputTokens = (existing.inputTokens || 0) + (session.inputTokens || 0);
+            existing.outputTokens = (existing.outputTokens || 0) + (session.outputTokens || 0);
             if (session.vendorId !== undefined)
                 existing.vendorId = session.vendorId;
             if (session.vendorName !== undefined)
@@ -2510,6 +2517,8 @@ class FileSystemDatabaseManager {
                 lastRequestAt: now,
                 requestCount: 1,
                 totalTokens: session.totalTokens || 0,
+                inputTokens: session.inputTokens || 0,
+                outputTokens: session.outputTokens || 0,
                 vendorId: session.vendorId,
                 vendorName: session.vendorName,
                 serviceId: session.serviceId,