aicodeswitch 6.0.0 → 6.0.1

package/bin/restore.js

@@ -5,7 +5,7 @@ const chalk = require('chalk');
 const boxen = require('boxen');
 const ora = require('ora');
 const { parseToml, stringifyToml, mergeJsonSettings, mergeTomlSettings, atomicWriteFile } = require('./utils/config-helpers');
-const { CLAUDE_SETTINGS_MANAGED_FIELDS, CLAUDE_JSON_MANAGED_FIELDS, CODEX_CONFIG_MANAGED_FIELDS, CODEX_AUTH_MANAGED_FIELDS } = require('./utils/managed-fields');
+const { CLAUDE_SETTINGS_MANAGED_FIELDS, CLAUDE_JSON_MANAGED_FIELDS, CODEX_CONFIG_MANAGED_FIELDS, CODEX_AUTH_MANAGED_FIELDS, OPENCODE_CONFIG_MANAGED_FIELDS } = require('./utils/managed-fields');
 const { isServerRunning, getServerInfo } = require('./utils/get-server');
 const { findPidByPort } = require('./utils/port-utils');
 
@@ -240,10 +240,57 @@ const restoreCodexConfig = () => {
   return results;
 };
 
+// 恢复 OpenCode 配置（使用智能合并）
+const restoreOpencodeConfig = () => {
+  const results = {
+    restored: [],
+    notFound: [],
+    errors: []
+  };
+
+  try {
+    const homeDir = os.homedir();
+    const opencodeConfigPath = path.join(homeDir, '.config', 'opencode', 'opencode.json');
+    const opencodeConfigBakPath = `${opencodeConfigPath}.aicodeswitch_backup`;
+
+    if (fs.existsSync(opencodeConfigBakPath)) {
+      try {
+        const backupConfig = JSON.parse(fs.readFileSync(opencodeConfigBakPath, 'utf-8'));
+        let currentConfig = {};
+        if (fs.existsSync(opencodeConfigPath)) {
+          try {
+            currentConfig = JSON.parse(fs.readFileSync(opencodeConfigPath, 'utf-8'));
+          } catch (e) {
+            // 忽略解析错误
+          }
+        }
+
+        const mergedConfig = mergeJsonSettings(
+          backupConfig,
+          currentConfig,
+          OPENCODE_CONFIG_MANAGED_FIELDS
+        );
+
+        atomicWriteFile(opencodeConfigPath, JSON.stringify(mergedConfig, null, 2));
+        fs.unlinkSync(opencodeConfigBakPath);
+        results.restored.push('opencode.json');
+      } catch (error) {
+        results.errors.push({ file: 'opencode.json', error: error.message });
+      }
+    } else {
+      results.notFound.push('opencode.json.aicodeswitch_backup');
+    }
+  } catch (err) {
+    results.errors.push({ file: 'opencode.json', error: err.message });
+  }
+
+  return results;
+};
+
 // 显示恢复结果
 const showRestoreResult = (target, results) => {
-  const targetName = target === 'claude-code' ? 'Claude Code' : 'Codex';
-  const targetColor = target === 'claude-code' ? chalk.cyan : chalk.magenta;
+  const targetName = target === 'claude-code' ? 'Claude Code' : target === 'opencode' ? 'OpenCode' : 'Codex';
+  const targetColor = target === 'claude-code' ? chalk.cyan : target === 'opencode' ? chalk.blue : chalk.magenta;
 
   let message = targetColor.bold(`${targetName} Configuration Restore\n\n`);
 
@@ -276,6 +323,8 @@ const showRestoreResult = (target, results) => {
     message += chalk.yellow.bold('⚠️  Important:\n\n');
     if (target === 'claude-code') {
       message += chalk.white('Please restart ') + chalk.cyan.bold('Claude Code') + chalk.white(' to apply the restored configuration.\n');
+    } else if (target === 'opencode') {
+      message += chalk.white('Please restart ') + chalk.blue.bold('OpenCode') + chalk.white(' to apply the restored configuration.\n');
     } else {
       message += chalk.white('Please restart ') + chalk.magenta.bold('Codex') + chalk.white(' to apply the restored configuration.\n');
     }
@@ -307,7 +356,7 @@ const restore = async () => {
 
   console.log('\n');
 
-  const validTargets = ['claude-code', 'codex', undefined];
+  const validTargets = ['claude-code', 'codex', 'opencode', undefined];
 
   if (target && !validTargets.includes(target)) {
     console.log(boxen(
@@ -316,6 +365,7 @@ const restore = async () => {
       chalk.white('Targets:\n') +
       chalk.white('  claude-code   Restore Claude Code configuration\n') +
       chalk.white('  codex         Restore Codex configuration\n') +
+      chalk.white('  opencode      Restore OpenCode configuration\n') +
       chalk.white('  (no arg)      Restore all configurations\n'),
       {
         padding: 1,
@@ -379,6 +429,19 @@ const restore = async () => {
     showRestoreResult('codex', codexResults);
   }
 
+  if (target === 'opencode' || !target) {
+    if (!target) console.log('');
+
+    const spinner = ora({
+      text: chalk.blue('Restoring OpenCode configuration...'),
+      color: 'blue'
+    }).start();
+
+    const opencodeResults = restoreOpencodeConfig();
+    spinner.succeed(chalk.green('OpenCode restore complete'));
+    showRestoreResult('opencode', opencodeResults);
+  }
+
   // 停用所有激活的路由
   console.log('');
   const routesSpinner = ora({

package/bin/utils/managed-fields.js

@@ -56,9 +56,21 @@ const CODEX_AUTH_MANAGED_FIELDS = [
   'OPENAI_API_KEY',
 ];
 
+/**
+ * OpenCode opencode.json 管理字段列表
+ * 托管整个 provider.aicodeswitch 段与 model/small_model/mcp
+ */
+const OPENCODE_CONFIG_MANAGED_FIELDS = [
+  'provider.aicodeswitch',
+  'model',
+  'small_model',
+  'mcp',
+];
+
 module.exports = {
   CLAUDE_SETTINGS_MANAGED_FIELDS,
   CLAUDE_JSON_MANAGED_FIELDS,
   CODEX_CONFIG_MANAGED_FIELDS,
   CODEX_AUTH_MANAGED_FIELDS,
+  OPENCODE_CONFIG_MANAGED_FIELDS,
 };

package/dist/server/agent-map/activity-extractor.js

@@ -314,6 +314,14 @@ function detectTurnEnd(agent, downstream, responseBody) {
             return true;
         return null;
     }
+    if (agent === 'opencode') {
+        // OpenAI Chat Completions：tool_calls 仍在 → 继续；finish_reason=stop / [DONE] → 本轮结束
+        if (/"finish_reason"\s*:\s*"tool_calls"/.test(raw))
+            return false;
+        if (/"finish_reason"\s*:\s*"(stop|length|content_filter)"/.test(raw) || /\[DONE\]/.test(raw))
+            return true;
+        return null;
+    }
     // Claude：看 stop_reason（流式 message_delta 或非流式 JSON 都带该字段）
     const m = raw.match(/"stop_reason"\s*:\s*"([a-z_]+)"/);
     const stopReason = m ? m[1] : null;

package/dist/server/agent-map/agent-map-service.js

@@ -599,7 +599,8 @@ class AgentMapService extends events_1.EventEmitter {
         // 异步解析本地会话元信息（项目路径 + 原始标题）；仅 global 来源、且未解析过
         this.enrichSession(st);
     }
-    /** 从本机 Claude/Codex 会话存储读取项目路径与原始标题并回填（access-key 不解析） */
+    /** 从本机 Claude/Codex 会话存储读取项目路径并回填（access-key 不解析）。
+     *  注意：不在此处覆盖标题——统一沿用 proxy 抽取的标题（与会话列表一致），避免两边标题分叉。 */
     enrichSession(st) {
         return __awaiter(this, void 0, void 0, function* () {
             if (st.source === 'access-key' || st.metaResolved)
@@ -607,18 +608,10 @@ class AgentMapService extends events_1.EventEmitter {
             st.metaResolved = true;
             try {
                 const meta = yield (0, session_meta_1.resolveSessionMeta)(st.sessionId, st.agent);
-                let changed = false;
                 if (meta.projectPath && !st.projectPath) {
                     st.projectPath = meta.projectPath;
-                    changed = true;
-                }
-                // 原始标题更标准，命中即覆盖日志截取的标题
-                if (meta.title) {
-                    st.title = meta.title;
-                    changed = true;
-                }
-                if (changed)
                     this.emitSession(st);
+                }
             }
             catch ( /* ignore */_a) { /* ignore */ }
         });
@@ -631,18 +624,16 @@ class AgentMapService extends events_1.EventEmitter {
             if (source === 'access-key' || source === 'unknown') {
                 return { source, projectPath: st === null || st === void 0 ? void 0 : st.projectPath, title: st === null || st === void 0 ? void 0 : st.title };
             }
-            // global：命中缓存或现解析
+            // global：命中缓存或现解析（仅项目路径；标题沿用 proxy 抽取值，与会话列表保持一致）
             const meta = yield (0, session_meta_1.resolveSessionMeta)(sessionId, (st === null || st === void 0 ? void 0 : st.agent) || 'claude-code');
             if (st) {
                 if (meta.projectPath && !st.projectPath)
                     st.projectPath = meta.projectPath;
-                if (meta.title)
-                    st.title = meta.title;
                 st.metaResolved = true;
                 // legacy 会话（修复前累积、拆分从未持久化）：点开详情时按日志回填输入/输出拆分
                 this.backfillTokenSplit(st).catch(err => console.error('[AgentMap] backfillTokenSplit error:', err));
             }
-            return { source, projectPath: meta.projectPath || (st === null || st === void 0 ? void 0 : st.projectPath), title: meta.title || (st === null || st === void 0 ? void 0 : st.title) };
+            return { source, projectPath: meta.projectPath || (st === null || st === void 0 ? void 0 : st.projectPath), title: st === null || st === void 0 ? void 0 : st.title };
         });
     }
     /**
@@ -736,6 +727,8 @@ class AgentMapService extends events_1.EventEmitter {
             return; // 本轮已调度
         if (st.lastStatusCode === 499)
             return; // 用户主动取消，不弹
+        if (st.thinkingInFlight > 0)
+            return; // 仍有思考请求在途，暂不弹结束通知
         st.notifiedForTurn = true;
         this.scheduleNotify(st, isError);
     }
@@ -808,7 +801,9 @@ class AgentMapService extends events_1.EventEmitter {
                 }
                 // 已开始产出：思考请求用更宽的 THINKING_SILENCE_MS，否则 SSE_SILENCE_MS（30s）
                 const limit = args.thinkingInFlight > 0 ? this.thinkingSilenceMs : this.sseSilenceMs;
-                const since = args.streamFirstChunkAt;
+                // 静默基准用「最近一次活动」（每个下游 chunk 经 heartbeat 刷新），而非首个 chunk 时刻：
+                // 否则任何总时长超过 30s 的流式响应都会被误判为停滞，在响应仍正常输出时弹出「任务已结束」通知。
+                const since = args.lastActivityAt;
                 if (args.now - since <= limit) {
                     return { status: 'active', reason: args.thinkingInFlight > 0 ? 'thinking' : 'streaming', notifyEligible: true };
                 }

package/dist/server/coding-plan.js

@@ -37,6 +37,9 @@ function isCodingToolRequest(body, format, headers) {
         // Codex: originator header
         if ((headers['originator'] || '').toLowerCase().includes('codex'))
             return { isCoding: true, reason: '' };
+        // OpenCode: user-agent 包含 "opencode"
+        if (ua.includes('opencode'))
+            return { isCoding: true, reason: '' };
     }
     // ── Layer 2: Claude Messages API ───────────────────────────────────
     if (format === 'claude' && Array.isArray(body === null || body === void 0 ? void 0 : body.messages)) {

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/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)) {