coding-tool-x 3.5.9 → 3.5.11

package/src/server/api/codex-proxy.js

@@ -14,7 +14,7 @@ const {
   hasBackup,
   readConfig
 } = require('../services/codex-settings-manager');
-const { getChannels, getEnabledChannels } = require('../services/codex-channels');
+const { getChannels, getEnabledChannels, markChannelAsRecentlyUsed } = require('../services/codex-channels');
 const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { clearAllLogs } = require('../websocket-server');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
@@ -61,6 +61,31 @@ function resolveActiveChannel(channels, activeChannelId = null) {
     || null;
 }
 
+function recoverChannelAfterMissingUpdate(previousChannel) {
+  const { channels } = getChannels();
+  const allChannels = Array.isArray(channels) ? channels : [];
+  const enabledChannels = allChannels.filter(channel => channel.enabled !== false);
+
+  const previousProviderKey = String(previousChannel?.providerKey || '').trim();
+  if (previousProviderKey) {
+    const sameProvider = enabledChannels.find(channel => channel.providerKey === previousProviderKey);
+    if (sameProvider) {
+      return sameProvider;
+    }
+  }
+
+  if (allChannels.length > 0) {
+    return resolveActiveChannel(allChannels, null);
+  }
+
+  const refreshedEnabledChannels = getEnabledChannels();
+  if (Array.isArray(refreshedEnabledChannels) && refreshedEnabledChannels.length > 0) {
+    return refreshedEnabledChannels[0];
+  }
+
+  return null;
+}
+
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
   ensureStorageDirMigrated();
@@ -149,6 +174,24 @@ router.post('/start', async (req, res) => {
       });
     }
 
+    try {
+      currentChannel = markChannelAsRecentlyUsed(currentChannel.id) || currentChannel;
+    } catch (error) {
+      if (error?.message !== 'Channel not found') {
+        throw error;
+      }
+
+      const recoveredChannel = recoverChannelAfterMissingUpdate(currentChannel);
+      if (!recoveredChannel) {
+        return res.status(400).json({
+          error: 'No enabled Codex channel found. Please create and enable a channel first.'
+        });
+      }
+
+      currentChannel = recoveredChannel;
+      console.warn(`[Codex Proxy] Active channel disappeared before startup, falling back to ${currentChannel.name} (${currentChannel.id})`);
+    }
+
     // 3. 保存当前激活渠道ID（用于代理模式）
     saveActiveChannelId(currentChannel.id);
     console.log(`[Codex Proxy] Saved active channel: ${currentChannel.name} (${currentChannel.id})`);
@@ -166,7 +209,7 @@ router.post('/start', async (req, res) => {
 
     const updatedStatus = getCodexProxyStatus();
     const { channels: allChannels } = getChannels();
-    const activeChannel = allChannels.filter(ch => ch.enabled !== false)[0];
+    const activeChannel = allChannels.find(ch => ch.id === currentChannel.id) || currentChannel;
     const { broadcastProxyState } = require('../websocket-server');
     broadcastProxyState('codex', updatedStatus, activeChannel, allChannels);
 

package/src/server/api/codex-sessions.js

@@ -11,7 +11,6 @@ const {
 } = require('../services/codex-sessions');
 const { isCodexInstalled } = require('../services/codex-config');
 const { loadAliases } = require('../services/alias');
-const { buildLaunchCommand } = require('../services/session-launch-command');
 
 const DEBUG_CODEX_PERF = process.env.DEBUG_CODEX_PERF === '1';
 
@@ -22,6 +21,24 @@ function logPerf(route, startMs, detail = '') {
   console.log(`[Codex Perf] ${route}: ${duration}ms${suffix}`);
 }
 
+function normalizeForkOptions(body = {}) {
+  const alias = typeof body.alias === 'string' ? body.alias.trim() : '';
+  const rawNumber = body.afterUserMessageNumber;
+  const hasExplicitNumber = rawNumber !== undefined && rawNumber !== null && rawNumber !== '';
+  const parsedNumber = hasExplicitNumber ? parseInt(rawNumber, 10) : null;
+
+  if (hasExplicitNumber && (!Number.isInteger(parsedNumber) || parsedNumber <= 0)) {
+    const error = new Error('afterUserMessageNumber must be a positive integer');
+    error.statusCode = 400;
+    throw error;
+  }
+
+  return {
+    afterUserMessageNumber: parsedNumber,
+    alias: alias || null
+  };
+}
+
 module.exports = (config) => {
   // ============================================
   // 静态路由必须放在参数路由之前
@@ -203,6 +220,67 @@ module.exports = (config) => {
     }
   });
 
+  router.get('/:projectName/:sessionId/status', (req, res) => {
+    try {
+      if (!isCodexInstalled()) {
+        return res.status(404).json({ error: 'Codex CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session || !session.filePath) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      const fs = require('fs');
+      const stats = fs.statSync(session.filePath);
+      res.json({
+        sessionId,
+        lastModified: stats.mtime.toISOString(),
+        size: stats.size
+      });
+    } catch (err) {
+      console.error('[Codex API] Failed to get session status:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  router.get('/:projectName/:sessionId/outline', (req, res) => {
+    try {
+      if (!isCodexInstalled()) {
+        return res.status(404).json({ error: 'Codex CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      let userMessageNumber = 0;
+      const items = [];
+      for (const msg of session.messages || []) {
+        if (msg.role !== 'user') continue;
+        const preview = typeof msg.content === 'string' ? msg.content.trim() : '';
+        if (!preview) continue;
+        userMessageNumber += 1;
+        items.push({
+          userMessageNumber,
+          preview: preview.length > 42 ? `${preview.slice(0, 42)}...` : preview,
+          timestamp: msg.timestamp || null
+        });
+      }
+
+      res.json({
+        sessionId,
+        items
+      });
+    } catch (err) {
+      console.error('[Codex API] Failed to get session outline:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   /**
    * GET /api/codex/sessions/:projectName/:sessionId/messages
    * 获取会话的消息列表
@@ -228,14 +306,17 @@ module.exports = (config) => {
       // 转换消息格式为前端期望的格式
       const convertedMessages = [];
 
+      let userMessageNumber = 0;
       for (const msg of session.messages) {
         // 用户消息
         if (msg.role === 'user') {
+          userMessageNumber += 1;
           convertedMessages.push({
             type: 'user',
             content: msg.content || '[空消息]',
             timestamp: msg.timestamp,
-            model: null
+            model: null,
+            userMessageNumber
           });
         }
         // 助手消息（普通回复）
@@ -422,12 +503,12 @@ module.exports = (config) => {
       }
 
       const { sessionId } = req.params;
-      const result = forkSession(sessionId);
+      const result = forkSession(sessionId, normalizeForkOptions(req.body));
 
       res.json(result);
     } catch (err) {
       console.error('[Codex API] Failed to fork session:', err);
-      res.status(500).json({ error: err.message });
+      res.status(err.statusCode || 500).json({ error: err.message });
     }
   });
 
@@ -468,7 +549,6 @@ module.exports = (config) => {
       }
 
       const { sessionId } = req.params;
-      const fork = Boolean(req.body?.fork);
       const fs = require('fs');
 
       // 获取会话详情
@@ -511,17 +591,15 @@ module.exports = (config) => {
       broadcastLog({
         type: 'action',
         action: 'launch_codex_session',
-        message: `${fork ? '复制 Codex 会话 Fork 命令' : '复制 Codex 会话启动命令'} ${alias || sessionId.substring(0, 8)}`,
+        message: `复制 Codex 会话启动命令 ${alias || sessionId.substring(0, 8)}`,
         sessionId: sessionId,
         alias: alias || null,
         timestamp: Date.now()
       });
 
-      const { command, copyCommand } = buildLaunchCommand({
-        cwd,
-        executable: 'codex',
-        args: fork ? ['fork', sessionId] : ['resume', sessionId]
-      });
+      const command = `codex resume ${sessionId}`;
+      const quotedCwd = `"${String(cwd).replace(/"/g, '\\"')}"`;
+      const copyCommand = `cd ${quotedCwd} && ${command}`;
 
       res.json({
         success: true,
@@ -529,7 +607,6 @@ module.exports = (config) => {
         sessionFile: session.filePath,
         sessionId,
         tool: 'codex',
-        fork,
         command,
         copyCommand
       });

package/src/server/api/commands.js

@@ -35,11 +35,8 @@ function getCommandsService(req) {
 router.get('/', (req, res) => {
   try {
     const { platform, service } = getCommandsService(req);
-    const { projectPath, refresh } = req.query;
-    const forceRefresh = refresh === '1';
-    const result = service.listCommands(projectPath || null, {
-      syncManagedLocalCommands: forceRefresh
-    });
+    const { projectPath } = req.query;
+    const result = service.listCommands(projectPath || null);
 
     res.json({
       success: true,
@@ -449,39 +446,6 @@ router.post('/install', async (req, res) => {
   }
 });
 
-/**
- * 安装本地托管命令
- * POST /api/commands/install-local
- * Body: { path }
- */
-router.post('/install-local', (req, res) => {
-  try {
-    const { platform, service } = getCommandsService(req);
-    const { path } = req.body;
-
-    if (!path) {
-      return res.status(400).json({
-        success: false,
-        message: 'Missing path'
-      });
-    }
-
-    const result = service.installLocalCommand(path);
-
-    res.json({
-      success: true,
-      platform,
-      ...result
-    });
-  } catch (err) {
-    console.error('[Commands API] Install local command error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
 /**
  * 卸载命令
  * POST /api/commands/uninstall

package/src/server/api/dashboard.js

@@ -26,30 +26,6 @@ const { getTodayStatistics: getCodexTodayStatistics } = require('../services/cod
 const { getTodayStatistics: getGeminiTodayStatistics } = require('../services/gemini-statistics-service');
 const { getTodayStatistics: getOpenCodeTodayStatistics } = require('../services/opencode-statistics-service');
 
-function filterEntriesByToolType(entries = {}, toolType) {
-  return Object.fromEntries(
-    Object.entries(entries || {}).filter(([, value]) => !toolType || !value?.toolType || value.toolType === toolType)
-  );
-}
-
-function extractToolScopedStats(stats, toolType) {
-  if (!stats || !toolType || !stats.byToolType) {
-    return stats;
-  }
-
-  const toolScope = stats.byToolType[toolType] || {};
-  return {
-    ...stats,
-    summary: {
-      requests: toolScope.requests || 0,
-      tokens: toolScope.tokens?.total || 0,
-      cost: toolScope.cost || 0
-    },
-    byChannel: filterEntriesByToolType(stats.byChannel, toolType),
-    byModel: filterEntriesByToolType(stats.byModel, toolType)
-  };
-}
-
 /**
  * GET /api/dashboard/init
  * 聚合首页所需的所有数据，一次请求返回
@@ -147,7 +123,7 @@ router.get('/init', async (req, res) => {
           opencode: opencodeCounts || { projectCount: 0, sessionCount: 0 }
         },
         todayStats: {
-          claude: formatStats(extractToolScopedStats(claudeTodayStats, 'claude-code')),
+          claude: formatStats(claudeTodayStats),
           codex: formatStats(codexTodayStats),
           gemini: formatStats(geminiTodayStats),
           opencode: formatStats(opencodeTodayStats)

package/src/server/api/gemini-proxy.js

@@ -15,7 +15,7 @@ const {
   hasBackup,
   readEnv
 } = require('../services/gemini-settings-manager');
-const { getChannels, getEnabledChannels } = require('../services/gemini-channels');
+const { getChannels, getEnabledChannels, markChannelAsRecentlyUsed } = require('../services/gemini-channels');
 const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
@@ -147,6 +147,8 @@ router.post('/start', async (req, res) => {
       });
     }
 
+    currentChannel = markChannelAsRecentlyUsed(currentChannel.id);
+
     // 3. 保存当前激活渠道ID（用于代理模式）
     saveActiveChannelId(currentChannel.id);
     console.log(`[Gemini Proxy] Saved active channel: ${currentChannel.name} (${currentChannel.id})`);
@@ -165,7 +167,7 @@ router.post('/start', async (req, res) => {
     const { broadcastProxyState } = require('../websocket-server');
     const proxyStatus = getGeminiProxyStatus();
     const { channels: allChannels } = getChannels();
-    const activeChannel = allChannels.filter(ch => ch.enabled !== false)[0];
+    const activeChannel = allChannels.find(ch => ch.id === currentChannel.id) || currentChannel;
     broadcastProxyState('gemini', proxyStatus, activeChannel, allChannels);
 
     res.json({

package/src/server/api/gemini-sessions.js

@@ -13,7 +13,24 @@ const {
 } = require('../services/gemini-sessions');
 const { isGeminiInstalled } = require('../services/gemini-config');
 const { loadAliases } = require('../services/alias');
-const { buildLaunchCommand } = require('../services/session-launch-command');
+
+function normalizeForkOptions(body = {}) {
+  const alias = typeof body.alias === 'string' ? body.alias.trim() : '';
+  const rawNumber = body.afterUserMessageNumber;
+  const hasExplicitNumber = rawNumber !== undefined && rawNumber !== null && rawNumber !== '';
+  const parsedNumber = hasExplicitNumber ? parseInt(rawNumber, 10) : null;
+
+  if (hasExplicitNumber && (!Number.isInteger(parsedNumber) || parsedNumber <= 0)) {
+    const error = new Error('afterUserMessageNumber must be a positive integer');
+    error.statusCode = 400;
+    throw error;
+  }
+
+  return {
+    afterUserMessageNumber: parsedNumber,
+    alias: alias || null
+  };
+}
 
 module.exports = (config) => {
   /**
@@ -146,6 +163,65 @@ module.exports = (config) => {
     }
   });
 
+  router.get('/:projectHash/:sessionId/status', (req, res) => {
+    try {
+      if (!isGeminiInstalled()) {
+        return res.status(404).json({ error: 'Gemini CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      res.json({
+        sessionId,
+        lastModified: session.lastUpdated || session.mtime || null,
+        size: session.size || 0
+      });
+    } catch (err) {
+      console.error('[Gemini API] Failed to get session status:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
+  router.get('/:projectHash/:sessionId/outline', (req, res) => {
+    try {
+      if (!isGeminiInstalled()) {
+        return res.status(404).json({ error: 'Gemini CLI not installed' });
+      }
+
+      const { sessionId } = req.params;
+      const session = getSessionById(sessionId);
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
+      }
+
+      let userMessageNumber = 0;
+      const items = [];
+      for (const msg of session.messages || []) {
+        if (msg.type !== 'user') continue;
+        const preview = typeof msg.content === 'string' ? msg.content.trim() : '';
+        if (!preview) continue;
+        userMessageNumber += 1;
+        items.push({
+          userMessageNumber,
+          preview: preview.length > 42 ? `${preview.slice(0, 42)}...` : preview,
+          timestamp: msg.timestamp || null
+        });
+      }
+
+      res.json({
+        sessionId,
+        items
+      });
+    } catch (err) {
+      console.error('[Gemini API] Failed to get session outline:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   /**
    * GET /api/gemini/sessions/:projectHash/:sessionId/messages
    * 获取会话的消息列表
@@ -168,14 +244,17 @@ module.exports = (config) => {
       // 转换消息格式为前端期望的格式
       const convertedMessages = [];
 
+      let userMessageNumber = 0;
       for (const msg of session.messages || []) {
         // 用户消息
         if (msg.type === 'user') {
+          userMessageNumber += 1;
           convertedMessages.push({
             type: 'user',
             content: msg.content || '[空消息]',
             timestamp: msg.timestamp,
-            model: null
+            model: null,
+            userMessageNumber
           });
         }
         // Gemini 助手消息（type 是 'gemini' 而不是 'assistant'）
@@ -322,12 +401,12 @@ module.exports = (config) => {
       }
 
       const { sessionId } = req.params;
-      const result = forkSession(sessionId);
+      const result = forkSession(sessionId, normalizeForkOptions(req.body));
 
       res.json(result);
     } catch (err) {
       console.error('[Gemini API] Failed to fork session:', err);
-      res.status(500).json({ error: err.message });
+      res.status(err.statusCode || 500).json({ error: err.message });
     }
   });
 
@@ -408,11 +487,9 @@ module.exports = (config) => {
       const resumeIndex = sessionIndex + 1;
 
       // 构建 Gemini CLI 命令（使用 --resume <index> 恢复特定会话）
-      const { command, copyCommand } = buildLaunchCommand({
-        cwd: projectPath,
-        executable: 'gemini',
-        args: ['--resume', String(resumeIndex)]
-      });
+      const command = `gemini --resume ${resumeIndex}`;
+      const quotedCwd = `"${String(projectPath).replace(/"/g, '\\"')}"`;
+      const copyCommand = `cd ${quotedCwd} && ${command}`;
 
       res.json({
         success: true,

package/src/server/api/hooks.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const notificationHooks = require('../services/notification-hooks');
-const { createSameOriginGuard, isLoopbackRequest } = require('../services/network-access');
+const { createSameOriginGuard } = require('../services/network-access');
 
 router.use(createSameOriginGuard({
   message: '禁止跨站访问通知配置接口'
@@ -42,20 +42,4 @@ router.post('/test', async (req, res) => {
   }
 });
 
-router.post('/browser-event', (req, res) => {
-  try {
-    if (!isLoopbackRequest(req)) {
-      return res.status(403).json({
-        error: '浏览器提醒事件仅允许本机触发'
-      });
-    }
-
-    notificationHooks.emitBrowserNotificationEvent(req.body || {});
-    res.json({ success: true });
-  } catch (error) {
-    console.error('Error emitting browser notification event:', error);
-    res.status(error.statusCode || 500).json({ error: error.message });
-  }
-});
-
 module.exports = router;

package/src/server/api/opencode-proxy.js

@@ -21,6 +21,7 @@ const {
   getChannels,
   getEnabledChannels,
   applyChannelToSettings,
+  markChannelAsRecentlyUsed,
   getEffectiveApiKeyCandidates
 } = require('../services/opencode-channels');
 const { getSchedulerState } = require('../services/channel-scheduler');
@@ -218,7 +219,9 @@ router.post('/start', async (req, res) => {
     }
 
     const { channels: allChannels } = getChannels();
-    const currentChannel = findActiveChannelFromNativeConfig(allChannels) || enabledChannels[0];
+    let currentChannel = findActiveChannelFromNativeConfig(allChannels) || enabledChannels[0];
+
+    currentChannel = markChannelAsRecentlyUsed(currentChannel.id);
 
     // 2. 保存当前激活渠道ID
     saveActiveChannelId(currentChannel.id);
@@ -285,7 +288,9 @@ router.post('/start', async (req, res) => {
     // 5. 广播状态更新
     const { broadcastProxyState } = require('../websocket-server');
     const updatedStatus = getOpenCodeProxyStatus();
-    broadcastProxyState('opencode', updatedStatus, currentChannel, allChannels);
+    const { channels: latestChannels } = getChannels();
+    const activeChannel = latestChannels.find(channel => channel.id === currentChannel.id) || currentChannel;
+    broadcastProxyState('opencode', updatedStatus, activeChannel, latestChannels);
 
     res.json({
       success: true,