coding-tool-x 3.7.2 → 3.7.4

package/src/server/api/dashboard.js

@@ -29,6 +29,108 @@ const { getTodayStatistics: getCodexTodayStatistics } = require('../services/cod
 const { getTodayStatistics: getGeminiTodayStatistics } = require('../services/gemini-statistics-service');
 const { getTodayStatistics: getOpenCodeTodayStatistics } = require('../services/opencode-statistics-service');
 const { getTodayStatistics: getOmpTodayStatistics } = require('../services/omp-statistics-service');
+const { getSnapshot } = require('../services/snapshot-cache');
+const { projectCountKey } = require('../services/project-snapshots');
+
+const SNAPSHOT_TTL_MS = 60 * 1000;
+const EMPTY_COUNTS = { projectCount: 0, sessionCount: 0 };
+const EMPTY_STATS = { requests: 0, tokens: 0, cost: 0, byModel: {}, byChannel: {} };
+
+function safeRead(label, reader, fallback) {
+  try {
+    return reader();
+  } catch (error) {
+    console.warn(`[Dashboard] ${label} failed:`, error.message);
+    return fallback;
+  }
+}
+
+function channelSnapshotKey(source) {
+  return `dashboard:channels:${source}`;
+}
+
+function todayStatsSnapshotKey(source) {
+  return `dashboard:today-stats:${source}`;
+}
+
+function normalizeChannelTokens(tokens) {
+  if (tokens && typeof tokens === 'object') {
+    return Number(tokens.total ?? tokens.input ?? 0) || 0;
+  }
+  return Number(tokens) || 0;
+}
+
+function normalizeByChannel(byChannel = {}) {
+  if (!byChannel || typeof byChannel !== 'object') {
+    return {};
+  }
+
+  return Object.fromEntries(Object.entries(byChannel).map(([channelId, item = {}]) => [
+    channelId,
+    {
+      ...item,
+      requests: Number(item.requests) || 0,
+      tokens: normalizeChannelTokens(item.tokens),
+      cost: Number(item.cost) || 0
+    }
+  ]));
+}
+
+// 格式化统计数据：取 summary、byModel 和 byChannel 中的数据
+function formatStats(stats) {
+  if (stats && stats.summary) {
+    return {
+      requests: stats.summary.requests || 0,
+      tokens: normalizeChannelTokens(stats.summary.tokens),
+      cost: stats.summary.cost || 0,
+      byModel: stats.byModel || {},
+      byChannel: normalizeByChannel(stats.byChannel || {})
+    };
+  }
+  return { ...EMPTY_STATS };
+}
+
+async function readDashboardSnapshot(key, fallbackValue, refresh) {
+  return getSnapshot(key, {
+    ttlMs: SNAPSHOT_TTL_MS,
+    fallbackValue,
+    refresh
+  });
+}
+
+function summarizePart(partSnapshots = {}) {
+  const items = {};
+  let stale = false;
+  let refreshing = false;
+  let generatedAt = null;
+
+  Object.entries(partSnapshots).forEach(([source, snapshot]) => {
+    const meta = snapshot.meta || {};
+    items[source] = meta;
+    stale = stale || Boolean(meta.stale);
+    refreshing = refreshing || Boolean(meta.refreshing);
+    if (meta.generatedAt && (!generatedAt || meta.generatedAt > generatedAt)) {
+      generatedAt = meta.generatedAt;
+    }
+  });
+
+  return {
+    generatedAt,
+    stale,
+    refreshing,
+    items
+  };
+}
+
+function dashboardMeta(parts) {
+  const partValues = Object.values(parts);
+  return {
+    generatedAt: new Date().toISOString(),
+    stale: partValues.some(part => part.stale),
+    refreshing: partValues.some(part => part.refreshing),
+    parts
+  };
+}
 
 /**
  * GET /api/dashboard/init
@@ -38,20 +140,22 @@ router.get('/init', async (req, res) => {
   try {
     const config = loadConfig();
 
-    // 并行获取所有数据
+    const uiConfig = safeRead('uiConfig', () => loadUIConfig(), {});
+    const favorites = safeRead('favorites', () => loadFavorites(), {});
+    const proxyStatus = {
+      claude: safeRead('claude proxy status', () => getProxyStatus(), {}),
+      codex: safeRead('codex proxy status', () => getCodexProxyStatus(), {}),
+      gemini: safeRead('gemini proxy status', () => getGeminiProxyStatus(), {}),
+      opencode: safeRead('opencode proxy status', () => getOpenCodeProxyStatus(), {}),
+      omp: safeRead('omp proxy status', () => getOmpProxyStatus(), {})
+    };
+
     const [
-      uiConfig,
-      favorites,
       claudeChannels,
       codexChannels,
       geminiChannels,
       opencodeChannels,
       ompChannels,
-      claudeProxyStatus,
-      codexProxyStatus,
-      geminiProxyStatus,
-      opencodeProxyStatus,
-      ompProxyStatus,
       claudeTodayStats,
       codexTodayStats,
       geminiTodayStats,
@@ -63,52 +167,45 @@ router.get('/init', async (req, res) => {
       opencodeCounts,
       ompCounts
     ] = await Promise.all([
-      // UI Config
-      Promise.resolve(loadUIConfig()),
-
-      // Favorites
-      Promise.resolve(loadFavorites()),
-
-      // Channels
-      Promise.resolve(getAllChannels()),
-      Promise.resolve(getCodexChannels()),
-      Promise.resolve(getGeminiChannels()),
-      Promise.resolve(getOpenCodeChannels()),
-      Promise.resolve(getOmpChannels()),
-
-      // Proxy Status
-      Promise.resolve(getProxyStatus()),
-      Promise.resolve(getCodexProxyStatus()),
-      Promise.resolve(getGeminiProxyStatus()),
-      Promise.resolve(getOpenCodeProxyStatus()),
-      Promise.resolve(getOmpProxyStatus()),
-
-      // Today Stats (所有平台)
-      Promise.resolve(getClaudeTodayStatistics()),
-      Promise.resolve(getCodexTodayStatistics()),
-      Promise.resolve(getGeminiTodayStatistics()),
-      Promise.resolve(getOpenCodeTodayStatistics()),
-      Promise.resolve(getOmpTodayStatistics()),
-
-      // 轻量级统计
-      Promise.resolve(getClaudeCounts(config)),
-      Promise.resolve(getCodexCounts()),
-      Promise.resolve(getGeminiCounts()),
-      Promise.resolve(getOpenCodeCounts()),
-      Promise.resolve(getOmpCounts())
+      readDashboardSnapshot(channelSnapshotKey('claude'), [], () => getAllChannels()),
+      readDashboardSnapshot(channelSnapshotKey('codex'), { channels: [] }, () => getCodexChannels()),
+      readDashboardSnapshot(channelSnapshotKey('gemini'), { channels: [] }, () => getGeminiChannels()),
+      readDashboardSnapshot(channelSnapshotKey('opencode'), { channels: [] }, () => getOpenCodeChannels()),
+      readDashboardSnapshot(channelSnapshotKey('omp'), { channels: [] }, () => getOmpChannels()),
+      readDashboardSnapshot(todayStatsSnapshotKey('claude'), null, () => getClaudeTodayStatistics()),
+      readDashboardSnapshot(todayStatsSnapshotKey('codex'), null, () => getCodexTodayStatistics()),
+      readDashboardSnapshot(todayStatsSnapshotKey('gemini'), null, () => getGeminiTodayStatistics()),
+      readDashboardSnapshot(todayStatsSnapshotKey('opencode'), null, () => getOpenCodeTodayStatistics()),
+      readDashboardSnapshot(todayStatsSnapshotKey('omp'), null, () => getOmpTodayStatistics()),
+      readDashboardSnapshot(projectCountKey('claude'), EMPTY_COUNTS, () => getClaudeCounts(config)),
+      readDashboardSnapshot(projectCountKey('codex'), EMPTY_COUNTS, () => getCodexCounts()),
+      readDashboardSnapshot(projectCountKey('gemini'), EMPTY_COUNTS, () => getGeminiCounts()),
+      readDashboardSnapshot(projectCountKey('opencode'), EMPTY_COUNTS, () => getOpenCodeCounts()),
+      readDashboardSnapshot(projectCountKey('omp'), EMPTY_COUNTS, () => getOmpCounts())
     ]);
 
-    // 格式化统计数据：取 summary 和 byModel 中的数据
-    const formatStats = (stats) => {
-      if (stats && stats.summary) {
-        return {
-          requests: stats.summary.requests || 0,
-          tokens: stats.summary.tokens || 0,
-          cost: stats.summary.cost || 0,
-          byModel: stats.byModel || {}
-        };
-      }
-      return { requests: 0, tokens: 0, cost: 0, byModel: {} };
+    const parts = {
+      counts: summarizePart({
+        claude: claudeCounts,
+        codex: codexCounts,
+        gemini: geminiCounts,
+        opencode: opencodeCounts,
+        omp: ompCounts
+      }),
+      todayStats: summarizePart({
+        claude: claudeTodayStats,
+        codex: codexTodayStats,
+        gemini: geminiTodayStats,
+        opencode: opencodeTodayStats,
+        omp: ompTodayStats
+      }),
+      channels: summarizePart({
+        claude: claudeChannels,
+        codex: codexChannels,
+        gemini: geminiChannels,
+        opencode: opencodeChannels,
+        omp: ompChannels
+      })
     };
 
     res.json({
@@ -117,33 +214,28 @@ router.get('/init', async (req, res) => {
         uiConfig,
         favorites,
         channels: {
-          claude: claudeChannels,
-          codex: codexChannels,
-          gemini: geminiChannels,
-          opencode: opencodeChannels.channels || [],
-          omp: ompChannels.channels || []
-        },
-        proxyStatus: {
-          claude: claudeProxyStatus,
-          codex: codexProxyStatus,
-          gemini: geminiProxyStatus,
-          opencode: opencodeProxyStatus,
-          omp: ompProxyStatus
+          claude: claudeChannels.value,
+          codex: codexChannels.value,
+          gemini: geminiChannels.value,
+          opencode: opencodeChannels.value.channels || [],
+          omp: ompChannels.value.channels || []
         },
+        proxyStatus,
         counts: {
-          claude: claudeCounts || { projectCount: 0, sessionCount: 0 },
-          codex: codexCounts || { projectCount: 0, sessionCount: 0 },
-          gemini: geminiCounts || { projectCount: 0, sessionCount: 0 },
-          opencode: opencodeCounts || { projectCount: 0, sessionCount: 0 },
-          omp: ompCounts || { projectCount: 0, sessionCount: 0 }
+          claude: claudeCounts.value || EMPTY_COUNTS,
+          codex: codexCounts.value || EMPTY_COUNTS,
+          gemini: geminiCounts.value || EMPTY_COUNTS,
+          opencode: opencodeCounts.value || EMPTY_COUNTS,
+          omp: ompCounts.value || EMPTY_COUNTS
         },
         todayStats: {
-          claude: formatStats(claudeTodayStats),
-          codex: formatStats(codexTodayStats),
-          gemini: formatStats(geminiTodayStats),
-          opencode: formatStats(opencodeTodayStats),
-          omp: formatStats(ompTodayStats)
-        }
+          claude: formatStats(claudeTodayStats.value),
+          codex: formatStats(codexTodayStats.value),
+          gemini: formatStats(geminiTodayStats.value),
+          opencode: formatStats(opencodeTodayStats.value),
+          omp: formatStats(ompTodayStats.value)
+        },
+        meta: dashboardMeta(parts)
       }
     });
   } catch (error) {

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

@@ -6,7 +6,8 @@ const {
   updateChannel,
   deleteChannel,
   getEnabledChannels,
-  saveChannelOrder
+  saveChannelOrder,
+  syncCurrentGeminiChannel
 } = require('../services/gemini-channels');
 const { getSchedulerState } = require('../services/channel-scheduler');
 const { getChannelHealthStatus, resetChannelHealth } = require('../services/channel-health');
@@ -53,6 +54,25 @@ module.exports = (config) => {
     }
   });
 
+  /**
+   * POST /api/gemini/channels/sync-current
+   * 将当前 Gemini 原生/ctx 配置同步到渠道列表
+   */
+  router.post('/sync-current', (req, res) => {
+    try {
+      if (!isGeminiInstalled()) {
+        return res.status(404).json({ error: 'Gemini CLI not installed' });
+      }
+
+      const result = syncCurrentGeminiChannel();
+      res.json(result);
+      broadcastSchedulerState('gemini', getSchedulerState('gemini'));
+    } catch (err) {
+      console.error('[Gemini Channels API] Failed to sync current channel:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   /**
    * GET /api/gemini/channels/:id/models
    * 获取渠道可用模型列表

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

@@ -2,29 +2,43 @@ const express = require('express');
 const router = express.Router();
 const { getProjects, saveProjectOrder, deleteProject } = require('../services/gemini-sessions');
 const { isGeminiInstalled } = require('../services/gemini-config');
+const {
+  emptyProjectList,
+  getProjectListSnapshot,
+  invalidateProjectSnapshots
+} = require('../services/project-snapshots');
 
 module.exports = (config) => {
+  function buildProjectsPayload() {
+    const projects = getProjects();
+    return {
+      projects,
+      currentProject: projects[0] ? projects[0].name : null
+    };
+  }
+
   /**
    * GET /api/gemini/projects
    * 获取所有 Gemini 项目列表
    */
-  router.get('/', (req, res) => {
+  router.get('/', async (req, res) => {
     try {
       // 检查 Gemini 是否安装
       if (!isGeminiInstalled()) {
         return res.json({
           projects: [],
           currentProject: null,
-          error: 'Gemini CLI not installed or not found'
+          error: 'Gemini CLI not installed or not found',
+          meta: { generatedAt: new Date().toISOString(), stale: false, refreshing: false, fallback: true, error: null }
         });
       }
 
-      const projects = getProjects();
-
-      res.json({
-        projects,
-        currentProject: projects[0] ? projects[0].name : null
+      const snapshot = await getProjectListSnapshot('gemini', {
+        fallbackValue: emptyProjectList(null),
+        force: req.query?.fresh === '1',
+        refresh: buildProjectsPayload
       });
+      res.json({ ...snapshot.value, meta: snapshot.meta });
     } catch (err) {
       console.error('[Gemini API] Failed to get projects:', err);
 
@@ -59,6 +73,7 @@ module.exports = (config) => {
       }
 
       saveProjectOrder(order);
+      invalidateProjectSnapshots('gemini');
 
       res.json({ success: true });
     } catch (err) {
@@ -79,6 +94,7 @@ module.exports = (config) => {
 
       const { projectHash } = req.params;
       const result = deleteProject(projectHash);
+      invalidateProjectSnapshots('gemini');
 
       res.json(result);
     } catch (err) {

package/src/server/api/omp-channels.js

@@ -5,7 +5,8 @@ const {
   createChannel,
   updateChannel,
   deleteChannel,
-  saveChannelOrder
+  saveChannelOrder,
+  syncCurrentOmpChannel
 } = require('../services/omp-channels');
 const { isOmpInstalled } = require('../services/omp-sessions');
 const { getSchedulerState } = require('../services/channel-scheduler');
@@ -171,6 +172,21 @@ module.exports = () => {
     }
   });
 
+  router.post('/sync-current', (req, res) => {
+    try {
+      if (!isOmpInstalled()) {
+        return res.status(404).json({ error: 'OMP CLI not installed' });
+      }
+
+      const result = syncCurrentOmpChannel();
+      res.json(result);
+      broadcastSchedulerState('omp', getSchedulerState('omp'));
+    } catch (err) {
+      console.error('[OMP Channels API] Failed to sync current channel:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   router.post('/probe-models', async (req, res) => {
     try {
       const {

package/src/server/api/omp-projects.js

@@ -6,27 +6,42 @@ const {
   deleteProject,
   isOmpInstalled
 } = require('../services/omp-sessions');
+const {
+  emptyProjectList,
+  getProjectListSnapshot,
+  invalidateProjectSnapshots
+} = require('../services/project-snapshots');
 
 function isNotFoundError(error) {
   return !!(error && error.message === 'Project not found');
 }
 
 module.exports = () => {
-  router.get('/', (req, res) => {
+  function buildProjectsPayload() {
+    const projects = getProjects();
+    return {
+      projects,
+      currentProject: projects[0] ? projects[0].name : null
+    };
+  }
+
+  router.get('/', async (req, res) => {
     try {
       if (!isOmpInstalled()) {
         return res.json({
           projects: [],
           currentProject: null,
-          error: 'OMP CLI not installed or not found'
+          error: 'OMP CLI not installed or not found',
+          meta: { generatedAt: new Date().toISOString(), stale: false, refreshing: false, fallback: true, error: null }
         });
       }
 
-      const projects = getProjects();
-      res.json({
-        projects,
-        currentProject: projects[0] ? projects[0].name : null
+      const snapshot = await getProjectListSnapshot('omp', {
+        fallbackValue: emptyProjectList(null),
+        force: req.query?.fresh === '1',
+        refresh: buildProjectsPayload
       });
+      res.json({ ...snapshot.value, meta: snapshot.meta });
     } catch (err) {
       console.error('[OMP API] Failed to get projects:', err);
       if (err.code === 'ENOENT') {
@@ -49,6 +64,7 @@ module.exports = () => {
         return res.status(400).json({ error: 'order must be an array' });
       }
       saveProjectOrder(order);
+      invalidateProjectSnapshots('omp');
       res.json({ success: true });
     } catch (err) {
       console.error('[OMP API] Failed to save project order:', err);
@@ -62,6 +78,7 @@ module.exports = () => {
         return res.status(404).json({ error: 'OMP CLI not installed' });
       }
       const result = deleteProject(req.params.projectName);
+      invalidateProjectSnapshots('omp');
       res.json(result);
     } catch (err) {
       if (isNotFoundError(err)) {

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

@@ -5,7 +5,8 @@ const {
   createChannel,
   updateChannel,
   deleteChannel,
-  saveChannelOrder
+  saveChannelOrder,
+  syncCurrentOpenCodeChannel
 } = require('../services/opencode-channels');
 const { isOpenCodeInstalled } = require('../services/opencode-sessions');
 const { getSchedulerState } = require('../services/channel-scheduler');
@@ -131,6 +132,25 @@ module.exports = (config) => {
     }
   });
 
+  /**
+   * POST /api/opencode/channels/sync-current
+   * 将当前 OpenCode 原生/ctx 配置同步到渠道列表
+   */
+  router.post('/sync-current', (req, res) => {
+    try {
+      if (!isOpenCodeInstalled()) {
+        return res.status(404).json({ error: 'OpenCode CLI not installed' });
+      }
+
+      const result = syncCurrentOpenCodeChannel();
+      res.json(result);
+      broadcastSchedulerState('opencode', getSchedulerState('opencode'));
+    } catch (err) {
+      console.error('[OpenCode Channels API] Failed to sync current channel:', err);
+      res.status(500).json({ error: err.message });
+    }
+  });
+
   /**
    * POST /api/opencode/channels/probe-models
    * 用临时配置（新建渠道时）获取模型列表，无需 channelId

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

@@ -6,32 +6,46 @@ const {
   deleteProject,
   isOpenCodeInstalled
 } = require('../services/opencode-sessions');
+const {
+  emptyProjectList,
+  getProjectListSnapshot,
+  invalidateProjectSnapshots
+} = require('../services/project-snapshots');
 
 function isNotFoundError(error) {
   return !!(error && error.message === 'Project not found');
 }
 
 module.exports = (config) => {
+  function buildProjectsPayload() {
+    const projects = getProjects();
+    return {
+      projects,
+      currentProject: projects[0] ? projects[0].name : null
+    };
+  }
+
   /**
    * GET /api/opencode/projects
    * 获取所有 OpenCode 项目列表
    */
-  router.get('/', (req, res) => {
+  router.get('/', async (req, res) => {
     try {
       if (!isOpenCodeInstalled()) {
         return res.json({
           projects: [],
           currentProject: null,
-          error: 'OpenCode CLI not installed or not found'
+          error: 'OpenCode CLI not installed or not found',
+          meta: { generatedAt: new Date().toISOString(), stale: false, refreshing: false, fallback: true, error: null }
         });
       }
 
-      const projects = getProjects();
-
-      res.json({
-        projects,
-        currentProject: projects[0] ? projects[0].name : null
+      const snapshot = await getProjectListSnapshot('opencode', {
+        fallbackValue: emptyProjectList(null),
+        force: req.query?.fresh === '1',
+        refresh: buildProjectsPayload
       });
+      res.json({ ...snapshot.value, meta: snapshot.meta });
     } catch (err) {
       console.error('[OpenCode API] Failed to get projects:', err);
 
@@ -65,6 +79,7 @@ module.exports = (config) => {
       }
 
       saveProjectOrder(order);
+      invalidateProjectSnapshots('opencode');
       res.json({ success: true });
     } catch (err) {
       console.error('[OpenCode API] Failed to save project order:', err);
@@ -84,6 +99,7 @@ module.exports = (config) => {
 
       const { projectName } = req.params;
       const result = deleteProject(projectName);
+      invalidateProjectSnapshots('opencode');
       res.json(result);
     } catch (err) {
       if (isNotFoundError(err)) {

package/src/server/api/projects.js

@@ -1,33 +1,47 @@
 const express = require('express');
 const router = express.Router();
 const { getProjectsWithStats, saveProjectOrder, getProjectOrder, deleteProject } = require('../services/sessions');
+const {
+  emptyProjectList,
+  getProjectListSnapshot,
+  invalidateProjectSnapshots
+} = require('../services/project-snapshots');
 
 module.exports = (config) => {
+  async function buildProjectsPayload() {
+    const projects = await getProjectsWithStats(config);
+    const order = getProjectOrder(config);
+
+    // Sort projects by saved order
+    let sortedProjects = projects;
+    if (order && order.length > 0) {
+      const orderMap = new Map(order.map((name, idx) => [name, idx]));
+      sortedProjects = [...projects].sort((a, b) => {
+        const aIdx = orderMap.has(a.name) ? orderMap.get(a.name) : 999999;
+        const bIdx = orderMap.has(b.name) ? orderMap.get(b.name) : 999999;
+        if (aIdx === bIdx) {
+          // Both are new, sort by lastUsed
+          return (b.lastUsed || 0) - (a.lastUsed || 0);
+        }
+        return aIdx - bIdx;
+      });
+    }
+
+    return {
+      projects: sortedProjects,
+      currentProject: config.currentProject || (sortedProjects[0] ? sortedProjects[0].name : null)
+    };
+  }
+
   // GET /api/projects - Get all projects with stats
   router.get('/', async (req, res) => {
     try {
-      const projects = await getProjectsWithStats(config);
-      const order = getProjectOrder(config);
-
-      // Sort projects by saved order
-      let sortedProjects = projects;
-      if (order && order.length > 0) {
-        const orderMap = new Map(order.map((name, idx) => [name, idx]));
-        sortedProjects = [...projects].sort((a, b) => {
-          const aIdx = orderMap.has(a.name) ? orderMap.get(a.name) : 999999;
-          const bIdx = orderMap.has(b.name) ? orderMap.get(b.name) : 999999;
-          if (aIdx === bIdx) {
-            // Both are new, sort by lastUsed
-            return (b.lastUsed || 0) - (a.lastUsed || 0);
-          }
-          return aIdx - bIdx;
-        });
-      }
-
-      res.json({
-        projects: sortedProjects,
-        currentProject: config.currentProject || (sortedProjects[0] ? sortedProjects[0].name : null)
+      const snapshot = await getProjectListSnapshot('claude', {
+        fallbackValue: emptyProjectList(config.currentProject || null),
+        force: req.query?.fresh === '1',
+        refresh: buildProjectsPayload
       });
+      res.json({ ...snapshot.value, meta: snapshot.meta });
     } catch (error) {
       console.error('Error fetching projects:', error);
       res.status(500).json({ error: error.message });
@@ -42,6 +56,7 @@ module.exports = (config) => {
         return res.status(400).json({ error: 'Order must be an array' });
       }
       saveProjectOrder(config, order);
+      invalidateProjectSnapshots('claude');
       res.json({ success: true });
     } catch (error) {
       console.error('Error saving project order:', error);
@@ -96,6 +111,7 @@ module.exports = (config) => {
         'utf8'
       );
 
+      invalidateProjectSnapshots('claude');
       res.json({
         success: true,
         projectName,
@@ -113,6 +129,7 @@ module.exports = (config) => {
     try {
       const { projectName } = req.params;
       deleteProject(config, projectName);
+      invalidateProjectSnapshots('claude');
       res.json({ success: true });
     } catch (error) {
       console.error('Error deleting project:', error);