coding-tool-x 3.3.8 → 3.4.0

package/src/server/services/session-cache.js

@@ -11,7 +11,7 @@ let hasMessagesPersisted = {};
 let hasMessagesPersistTimer = null;
 
 function getCcToolDir() {
-  return PATHS.base;
+  return path.dirname(PATHS.sessionHasCache);
 }
 
 function ensureDirExists(dir) {
@@ -52,7 +52,7 @@ function invalidateProjectsCache(configOrPath) {
   projectsCache.delete(key);
 }
 
-const hasMessagesCacheFile = path.join(getCcToolDir(), 'session-has-cache.json');
+const hasMessagesCacheFile = PATHS.sessionHasCache;
 loadHasMessagesCacheFromDisk();
 
 function loadHasMessagesCacheFromDisk() {

package/src/server/services/sessions.js

@@ -29,12 +29,12 @@ function getOrderFilePath() {
 
 // Get path for storing fork relations
 function getForkRelationsFilePath() {
-  return path.join(PATHS.base, 'fork-relations.json');
+  return PATHS.forkRelations;
 }
 
 // Get path for storing session order
 function getSessionOrderFilePath() {
-  return path.join(getCcToolDir(), 'session-order.json');
+  return PATHS.sessionOrder;
 }
 
 // Get saved project order

package/src/server/services/skill-service.js

@@ -10,13 +10,14 @@ const path = require('path');
 const os = require('os');
 const https = require('https');
 const http = require('http');
+const { execFileSync } = require('child_process');
 const { createWriteStream } = require('fs');
 const { pipeline } = require('stream/promises');
 const AdmZip = require('adm-zip');
 const {
   parseSkillContent,
 } = require('./format-converter');
-const { NATIVE_PATHS, HOME_DIR } = require('../../config/paths');
+const { NATIVE_PATHS, HOME_DIR, PATHS } = require('../../config/paths');
 
 const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
 const SUPPORTED_REPO_PROVIDERS = ['github', 'gitlab', 'local'];
@@ -105,6 +106,16 @@ function normalizeRepoHost(host, provider = 'github') {
   }
 }
 
+function extractHostname(host = '') {
+  const normalized = String(host || '').trim();
+  if (!normalized) return '';
+  try {
+    return new URL(normalized).hostname || '';
+  } catch {
+    return normalized.replace(/^https?:\/\//i, '').replace(/\/.*$/, '');
+  }
+}
+
 function buildRepoUrl(repo) {
   if (repo.provider === 'local') {
     return repo.localPath || '';
@@ -159,27 +170,27 @@ const DEFAULT_REPOS_BY_PLATFORM = {
 const PLATFORM_CONFIG = {
   claude: {
     installDir: path.join(HOME_DIR, '.claude', 'skills'),
-    storageDir: 'skills',
-    reposFile: 'skill-repos.json',
-    cacheFile: 'skills-cache.json'
+    storageDir: PATHS.localSkills.claude,
+    reposFile: PATHS.skillRepos.claude,
+    cacheFile: PATHS.skillCaches.claude
   },
   codex: {
     installDir: path.join(HOME_DIR, '.codex', 'skills'),
-    storageDir: 'codex-skills',
-    reposFile: 'codex-skill-repos.json',
-    cacheFile: 'codex-skills-cache.json'
+    storageDir: PATHS.localSkills.codex,
+    reposFile: PATHS.skillRepos.codex,
+    cacheFile: PATHS.skillCaches.codex
   },
   gemini: {
     installDir: path.join(HOME_DIR, '.gemini', 'skills'),
-    storageDir: 'gemini-skills',
-    reposFile: 'gemini-skill-repos.json',
-    cacheFile: 'gemini-skills-cache.json'
+    storageDir: PATHS.localSkills.gemini,
+    reposFile: PATHS.skillRepos.gemini,
+    cacheFile: PATHS.skillCaches.gemini
   },
   opencode: {
     installDir: path.join(NATIVE_PATHS.opencode.config, 'skills'),
-    storageDir: 'opencode-skills',
-    reposFile: 'opencode-skill-repos.json',
-    cacheFile: 'opencode-skills-cache.json'
+    storageDir: PATHS.localSkills.opencode,
+    reposFile: PATHS.skillRepos.opencode,
+    cacheFile: PATHS.skillCaches.opencode
   }
 };
 
@@ -189,13 +200,13 @@ const CACHE_TTL = 5 * 60 * 1000;
 class SkillService {
   constructor(platform = 'claude') {
     this.platform = normalizePlatform(platform);
-    this.configDir = path.join(HOME_DIR, '.cc-tool');
+    this.configDir = PATHS.config;
 
     const platformConfig = PLATFORM_CONFIG[this.platform];
     this.installDir = platformConfig.installDir;
-    this.storageDir = path.join(this.configDir, platformConfig.storageDir);
-    this.reposConfigPath = path.join(this.configDir, platformConfig.reposFile);
-    this.cachePath = path.join(this.configDir, platformConfig.cacheFile);
+    this.storageDir = platformConfig.storageDir;
+    this.reposConfigPath = platformConfig.reposFile;
+    this.cachePath = platformConfig.cacheFile;
 
     // 内存缓存
     this.skillsCache = null;
@@ -215,6 +226,14 @@ class SkillService {
     if (!fs.existsSync(this.storageDir)) {
       fs.mkdirSync(this.storageDir, { recursive: true });
     }
+    const reposDir = path.dirname(this.reposConfigPath);
+    if (!fs.existsSync(reposDir)) {
+      fs.mkdirSync(reposDir, { recursive: true });
+    }
+    const cacheDir = path.dirname(this.cachePath);
+    if (!fs.existsSync(cacheDir)) {
+      fs.mkdirSync(cacheDir, { recursive: true });
+    }
   }
 
   clearCache({ removeFile = false } = {}) {
@@ -232,6 +251,19 @@ class SkillService {
     }
   }
 
+  prepareSkills(skills = []) {
+    const preparedSkills = Array.isArray(skills)
+      ? skills.map(skill => ({ ...skill }))
+      : [];
+
+    this.mergeLocalSkills(preparedSkills);
+    this.deduplicateSkills(preparedSkills);
+    preparedSkills.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
+    this.updateInstallStatus(preparedSkills);
+
+    return preparedSkills;
+  }
+
   getDefaultSkillDirectory(repo) {
     if (repo.provider === 'local') {
       return path.basename(repo.localPath || '') || 'skill';
@@ -415,24 +447,30 @@ class SkillService {
    * 获取所有技能列表（带缓存）
    */
   async listSkills(forceRefresh = false) {
-    // 强制刷新时清除缓存
+    // 强制刷新时仅清空内存缓存，保留磁盘缓存作为回退来源
     if (forceRefresh) {
-      this.clearCache({ removeFile: true });
+      this.clearCache();
     }
 
+    const fileCache = this.loadCacheFromFile();
+
     // 检查内存缓存
-    if (!forceRefresh && this.skillsCache) {
-      this.updateInstallStatus(this.skillsCache);
+    if (!forceRefresh && Array.isArray(this.skillsCache) && this.skillsCache.length > 0) {
+      if (Array.isArray(fileCache) && fileCache.length > this.skillsCache.length) {
+        this.skillsCache = this.prepareSkills(fileCache);
+        this.cacheTime = Date.now();
+        return this.skillsCache;
+      }
+      this.skillsCache = this.prepareSkills(this.skillsCache);
+      this.cacheTime = Date.now();
       return this.skillsCache;
     }
 
     // 检查文件缓存
     if (!forceRefresh) {
-      const fileCache = this.loadCacheFromFile();
-      if (fileCache) {
-        this.skillsCache = fileCache;
+      if (fileCache && fileCache.length > 0) {
+        this.skillsCache = this.prepareSkills(fileCache);
         this.cacheTime = Date.now();
-        this.updateInstallStatus(this.skillsCache);
         return this.skillsCache;
       }
     }
@@ -442,6 +480,8 @@ class SkillService {
 
     // 并行获取所有启用仓库的技能（带超时保护）
     const enabledRepos = repos.filter(r => r.enabled);
+    const enabledRemoteRepos = enabledRepos.filter(repo => repo.provider !== 'local');
+    let remoteFailureCount = 0;
 
     if (enabledRepos.length > 0) {
       const results = await Promise.allSettled(
@@ -457,28 +497,40 @@ class SkillService {
 
       for (let i = 0; i < results.length; i++) {
         const result = results[i];
-        const repoInfo = `${enabledRepos[i].owner}/${enabledRepos[i].name}`;
+        const repo = enabledRepos[i];
+        const repoInfo = `${repo.owner}/${repo.name}`;
         if (result.status === 'fulfilled') {
           skills.push(...result.value);
         } else {
           console.warn(`[SkillService] Fetch repo ${repoInfo} failed:`, result.reason?.message);
+          if (repo.provider !== 'local') {
+            remoteFailureCount++;
+          }
         }
       }
     }
 
-    // 合并本地已安装的技能
-    this.mergeLocalSkills(skills);
+    const preparedSkills = this.prepareSkills(skills);
+
+    const hasUsableFileCache = Array.isArray(fileCache) && fileCache.length > 0;
+    const preparedFileCache = hasUsableFileCache ? this.prepareSkills(fileCache) : null;
+    const shouldUseStaleFileCache = hasUsableFileCache && (
+      (enabledRemoteRepos.length > 0 && remoteFailureCount === enabledRemoteRepos.length) ||
+      (remoteFailureCount > 0 && preparedFileCache.length > preparedSkills.length)
+    );
 
-    // 去重并排序
-    this.deduplicateSkills(skills);
-    skills.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
+    if (shouldUseStaleFileCache) {
+      this.skillsCache = preparedFileCache;
+      this.cacheTime = Date.now();
+      return this.skillsCache;
+    }
 
     // 更新缓存
-    this.skillsCache = skills;
+    this.skillsCache = preparedSkills;
     this.cacheTime = Date.now();
-    this.saveCacheToFile(skills);
+    this.saveCacheToFile(preparedSkills);
 
-    return skills;
+    return preparedSkills;
   }
 
   /**
@@ -744,7 +796,7 @@ class SkillService {
   buildSkillReadmeUrl(repo, fullDirectory = '') {
     const normalizedDirectory = normalizeRepoPath(fullDirectory);
     if (repo.provider === 'local') {
-      return repo.localPath || null;
+      return null;
     }
     if (repo.provider === 'gitlab') {
       const suffix = normalizedDirectory ? `/-/tree/${repo.branch}/${normalizedDirectory}` : `/-/tree/${repo.branch}`;
@@ -780,16 +832,11 @@ class SkillService {
   /**
    * 获取 GitHub Token（从环境变量或配置文件）
    */
-  getGitHubToken() {
-    // 优先从环境变量获取
-    if (process.env.GITHUB_TOKEN) {
-      return process.env.GITHUB_TOKEN;
-    }
-    // 从配置文件获取
+  getTokenFromConfigFile(fileName) {
     try {
-      const configPath = path.join(this.configDir, 'github-token.txt');
+      const configPath = path.join(this.configDir, fileName);
       if (fs.existsSync(configPath)) {
-        return fs.readFileSync(configPath, 'utf-8').trim();
+        return fs.readFileSync(configPath, 'utf-8').trim() || null;
       }
     } catch (err) {
       // ignore
@@ -797,29 +844,101 @@ class SkillService {
     return null;
   }
 
-  getGitLabToken() {
+  getTokenFromCommand(command, args = []) {
+    try {
+      const output = execFileSync(command, args, {
+        encoding: 'utf-8',
+        timeout: 3000,
+        stdio: ['ignore', 'pipe', 'ignore']
+      }).trim();
+      return output || null;
+    } catch {
+      return null;
+    }
+  }
+
+  getTokenFromGitCredential(host) {
+    const hostname = extractHostname(host);
+    if (!hostname) return null;
+
+    try {
+      const output = execFileSync('git', ['credential', 'fill'], {
+        input: `protocol=https\nhost=${hostname}\n\n`,
+        encoding: 'utf-8',
+        timeout: 3000,
+        stdio: ['pipe', 'pipe', 'ignore']
+      });
+      const passwordLine = output
+        .split(/\r?\n/)
+        .find(line => line.startsWith('password='));
+      if (!passwordLine) return null;
+      return passwordLine.slice('password='.length).trim() || null;
+    } catch {
+      return null;
+    }
+  }
+
+  getGitHubToken(host = DEFAULT_GITHUB_HOST) {
+    // 优先从环境变量获取
+    if (process.env.GITHUB_TOKEN) {
+      return process.env.GITHUB_TOKEN;
+    }
+
+    const configToken = this.getTokenFromConfigFile('github-token.txt');
+    if (configToken) {
+      return configToken;
+    }
+
+    const hostname = extractHostname(host);
+    if (hostname) {
+      const ghHostToken = this.getTokenFromCommand('gh', ['auth', 'token', '--hostname', hostname]);
+      if (ghHostToken) {
+        return ghHostToken;
+      }
+    }
+
+    const ghToken = this.getTokenFromCommand('gh', ['auth', 'token']);
+    if (ghToken) {
+      return ghToken;
+    }
+
+    return this.getTokenFromGitCredential(host);
+  }
+
+  getGitLabToken(host = DEFAULT_GITLAB_HOST) {
     if (process.env.GITLAB_TOKEN) {
       return process.env.GITLAB_TOKEN;
     }
     if (process.env.GITLAB_PRIVATE_TOKEN) {
       return process.env.GITLAB_PRIVATE_TOKEN;
     }
-    try {
-      const configPath = path.join(this.configDir, 'gitlab-token.txt');
-      if (fs.existsSync(configPath)) {
-        return fs.readFileSync(configPath, 'utf-8').trim();
+
+    const configToken = this.getTokenFromConfigFile('gitlab-token.txt');
+    if (configToken) {
+      return configToken;
+    }
+
+    const hostname = extractHostname(host);
+    if (hostname) {
+      const glabHostToken = this.getTokenFromCommand('glab', ['auth', 'token', '--hostname', hostname]);
+      if (glabHostToken) {
+        return glabHostToken;
       }
-    } catch (err) {
-      // ignore
     }
-    return null;
+
+    const glabToken = this.getTokenFromCommand('glab', ['auth', 'token']);
+    if (glabToken) {
+      return glabToken;
+    }
+
+    return this.getTokenFromGitCredential(host);
   }
 
   /**
    * 通用 GitHub API 请求
    */
   async fetchGitHubApi(url) {
-    const token = this.getGitHubToken();
+    const token = this.getGitHubToken(url);
     const headers = {
       'User-Agent': 'cc-cli-skill-service',
       'Accept': 'application/vnd.github.v3+json'
@@ -866,7 +985,7 @@ class SkillService {
   }
 
   async fetchGitLabApi(url, { raw = false } = {}) {
-    const token = this.getGitLabToken();
+    const token = this.getGitLabToken(url);
     const headers = {
       'User-Agent': 'cc-cli-skill-service'
     };
@@ -1246,13 +1365,13 @@ class SkillService {
       if (normalizedRepo.provider === 'gitlab') {
         const projectId = encodeURIComponent(normalizedRepo.projectPath);
         zipUrl = `${normalizedRepo.host}/api/v4/projects/${projectId}/repository/archive.zip?sha=${encodeURIComponent(normalizedRepo.branch)}`;
-        const token = this.getGitLabToken();
+        const token = this.getGitLabToken(normalizedRepo.host);
         if (token) {
           zipHeaders['PRIVATE-TOKEN'] = token;
         }
       } else {
         zipUrl = `https://api.github.com/repos/${normalizedRepo.owner}/${normalizedRepo.name}/zipball/${encodeURIComponent(normalizedRepo.branch)}`;
-        const token = this.getGitHubToken();
+        const token = this.getGitHubToken(normalizedRepo.host);
         zipHeaders.Accept = 'application/vnd.github+json';
         if (token) {
           zipHeaders.Authorization = `token ${token}`;

package/src/server/services/statistics-service.js

@@ -39,7 +39,7 @@ function getCSTHour(ts) {
 
 // 获取基础目录
 function getBaseDir() {
-  const dir = PATHS.base;
+  const dir = path.dirname(PATHS.statistics.summary);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -48,7 +48,7 @@ function getBaseDir() {
 
 // 获取每日统计目录
 function getDailyStatsDir() {
-  const dir = path.join(getBaseDir(), 'daily-stats');
+  const dir = PATHS.statistics.dailyStats;
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -57,7 +57,7 @@ function getDailyStatsDir() {
 
 // 获取请求日志目录
 function getRequestLogsDir(year, month) {
-  const baseDir = path.join(getBaseDir(), 'request-logs', `${year}-${month.toString().padStart(2, '0')}`);
+  const baseDir = path.join(PATHS.statistics.requestLogs, `${year}-${month.toString().padStart(2, '0')}`);
   if (!fs.existsSync(baseDir)) {
     fs.mkdirSync(baseDir, { recursive: true });
   }
@@ -66,7 +66,7 @@ function getRequestLogsDir(year, month) {
 
 // 获取统计文件路径
 function getStatisticsFilePath() {
-  return path.join(getBaseDir(), 'statistics.json');
+  return PATHS.statistics.summary;
 }
 
 // 获取每日统计文件路径
@@ -82,7 +82,7 @@ function getRequestLogFilePath(year, month, day) {
 }
 
 function getProxyLogsFilePath() {
-  return path.join(getBaseDir(), 'proxy-logs.json');
+  return PATHS.statistics.proxyLogs;
 }
 
 // 加载总体统计
@@ -920,9 +920,13 @@ async function getTrendStatistics({ startDate, endDate, granularity = 'day', ste
 
     if (granularity === 'day') {
       labels.push(dateStr);
-      const byDimension = activeFilters
+      let byDimension = activeFilters
         ? readJsonlForDay(year, month, day, groupBy, activeFilters)
         : mergeAllToolsDailyStats(dateStr, groupBy);
+      if (!activeFilters && Object.keys(byDimension).length === 0) {
+        // Fallback: if daily stats are missing, derive from JSONL logs
+        byDimension = readJsonlForDay(year, month, day, groupBy);
+      }
 
       // Accumulate dimensions seen so far with 0 for this label position
       const labelIdx = labels.length - 1;

package/src/server/services/ui-config.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
+const path = require('path');
 const { PATHS } = require('../../config/paths');
 
-const UI_CONFIG_DIR = PATHS.base;
 const UI_CONFIG_FILE = PATHS.uiConfig;
 
 // Default UI config
@@ -34,8 +34,9 @@ let cacheInitialized = false;
 
 // Ensure UI config directory exists
 function ensureConfigDir() {
-  if (!fs.existsSync(UI_CONFIG_DIR)) {
-    fs.mkdirSync(UI_CONFIG_DIR, { recursive: true });
+  const dir = path.dirname(UI_CONFIG_FILE);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
   }
 }