coding-tool-x 3.3.7 → 3.3.9

package/src/server/services/proxy-log-helper.js

@@ -0,0 +1,242 @@
+function toNumber(value) {
+  const num = Number(value);
+  return Number.isFinite(num) ? num : 0;
+}
+
+function normalizeToolSource(source = '') {
+  const normalized = String(source || '').trim().toLowerCase();
+  if (normalized === 'claude' || normalized === 'claude-code') return 'claude';
+  if (normalized === 'codex') return 'codex';
+  if (normalized === 'gemini') return 'gemini';
+  if (normalized === 'opencode') return 'opencode';
+  return 'claude';
+}
+
+function normalizeUsageTokens(source, tokens = {}) {
+  const normalizedSource = normalizeToolSource(source);
+  const input = toNumber(tokens.input);
+  const output = toNumber(tokens.output);
+  const cacheCreation = toNumber(tokens.cacheCreation);
+  const cacheRead = toNumber(tokens.cacheRead);
+  const cached = toNumber(tokens.cached);
+  const reasoning = toNumber(tokens.reasoning);
+  let total = toNumber(tokens.total);
+
+  if (total <= 0) {
+    if (normalizedSource === 'claude') {
+      total = input + output + cacheCreation + cacheRead;
+    } else {
+      total = input + output;
+    }
+  }
+
+  return {
+    input,
+    output,
+    cacheCreation,
+    cacheRead,
+    cached,
+    reasoning,
+    total
+  };
+}
+
+function hasMeaningfulUsage(source, tokens = {}) {
+  const normalized = normalizeUsageTokens(source, tokens);
+  if (normalized.total > 0) return true;
+  if (normalized.input > 0 || normalized.output > 0) return true;
+  if (normalized.cacheCreation > 0 || normalized.cacheRead > 0) return true;
+  if (normalized.cached > 0 || normalized.reasoning > 0) return true;
+  return false;
+}
+
+function formatRealtimeTime(timestamp = Date.now()) {
+  return new Date(timestamp).toLocaleTimeString('zh-CN', {
+    hour12: false,
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit'
+  });
+}
+
+function buildSuccessLogPayload({
+  source,
+  requestId,
+  channel,
+  model,
+  tokens,
+  cost = 0,
+  timestamp = Date.now()
+}) {
+  const normalized = normalizeUsageTokens(source, tokens);
+  return {
+    type: 'log',
+    status: 'success',
+    id: requestId,
+    time: formatRealtimeTime(timestamp),
+    channel,
+    model: model || '',
+    inputTokens: normalized.input,
+    outputTokens: normalized.output,
+    cacheCreation: normalized.cacheCreation,
+    cacheRead: normalized.cacheRead,
+    cachedTokens: normalized.cached,
+    reasoningTokens: normalized.reasoning,
+    totalTokens: normalized.total,
+    cost,
+    source: normalizeToolSource(source),
+    timestamp
+  };
+}
+
+function buildFailureLogPayload({
+  source,
+  requestId,
+  channel,
+  model,
+  message,
+  error,
+  statusCode,
+  stage,
+  timestamp = Date.now()
+}) {
+  const errorMessage = String(
+    error?.message
+    || message
+    || error
+    || 'Request failed'
+  );
+
+  return {
+    type: 'log',
+    status: 'error',
+    id: requestId || `${normalizeToolSource(source)}-error-${timestamp}-${Math.random().toString(36).slice(2, 8)}`,
+    time: formatRealtimeTime(timestamp),
+    channel: channel || 'Unknown',
+    model: model || '',
+    message: errorMessage,
+    error: errorMessage,
+    statusCode: Number.isFinite(Number(statusCode)) ? Number(statusCode) : null,
+    stage: stage || 'proxy',
+    inputTokens: 0,
+    outputTokens: 0,
+    cacheCreation: 0,
+    cacheRead: 0,
+    cachedTokens: 0,
+    reasoningTokens: 0,
+    totalTokens: 0,
+    cost: 0,
+    source: normalizeToolSource(source),
+    timestamp
+  };
+}
+
+function publishUsageLog({
+  source,
+  metadata = {},
+  model,
+  tokens,
+  calculateCost,
+  broadcastLog,
+  recordRequest,
+  recordSuccess,
+  allowBroadcast = true
+}) {
+  if (!hasMeaningfulUsage(source, tokens)) {
+    return null;
+  }
+
+  const normalizedSource = normalizeToolSource(source);
+  const normalizedTokens = normalizeUsageTokens(normalizedSource, tokens);
+  const requestId = metadata.id || `${normalizedSource}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+  const timestamp = Date.now();
+  const cost = typeof calculateCost === 'function'
+    ? calculateCost(model || '', normalizedTokens)
+    : 0;
+
+  if (allowBroadcast && typeof broadcastLog === 'function') {
+    broadcastLog(buildSuccessLogPayload({
+      source: normalizedSource,
+      requestId,
+      channel: metadata.channel,
+      model,
+      tokens: normalizedTokens,
+      cost,
+      timestamp
+    }));
+  }
+
+  if (typeof recordRequest === 'function') {
+    recordRequest({
+      id: requestId,
+      timestamp: new Date(metadata.startTime || timestamp).toISOString(),
+      toolType: normalizedSource === 'claude' ? 'claude-code' : normalizedSource,
+      channel: metadata.channel,
+      channelId: metadata.channelId,
+      model: model || '',
+      tokens: {
+        input: normalizedTokens.input,
+        output: normalizedTokens.output,
+        reasoning: normalizedTokens.reasoning,
+        cached: normalizedTokens.cached,
+        cacheCreation: normalizedTokens.cacheCreation,
+        cacheRead: normalizedTokens.cacheRead,
+        total: normalizedTokens.total
+      },
+      duration: Math.max(0, timestamp - toNumber(metadata.startTime || timestamp)),
+      success: true,
+      cost
+    });
+  }
+
+  if (typeof recordSuccess === 'function' && metadata.channelId) {
+    recordSuccess(metadata.channelId, normalizedSource);
+  }
+
+  return {
+    cost,
+    tokens: normalizedTokens,
+    timestamp
+  };
+}
+
+function publishFailureLog({
+  source,
+  metadata = {},
+  channel,
+  model,
+  message,
+  error,
+  statusCode,
+  stage,
+  broadcastLog
+}) {
+  if (typeof broadcastLog !== 'function') {
+    return null;
+  }
+
+  const payload = buildFailureLogPayload({
+    source,
+    requestId: metadata.id,
+    channel: channel || metadata.channel,
+    model: model || metadata.model,
+    message,
+    error,
+    statusCode,
+    stage
+  });
+  broadcastLog(payload);
+  return payload;
+}
+
+module.exports = {
+  toNumber,
+  normalizeToolSource,
+  normalizeUsageTokens,
+  hasMeaningfulUsage,
+  formatRealtimeTime,
+  buildSuccessLogPayload,
+  buildFailureLogPayload,
+  publishUsageLog,
+  publishFailureLog
+};

package/src/server/services/proxy-runtime.js

@@ -3,11 +3,13 @@ const path = require('path');
 const { PATHS } = require('../../config/paths');
 
 function getRuntimeFilePath(proxyType) {
-  const ccToolDir = PATHS.base;
-  if (!fs.existsSync(ccToolDir)) {
-    fs.mkdirSync(ccToolDir, { recursive: true });
+  const filePath = PATHS.proxyRuntime?.[proxyType]
+    || path.join(path.dirname(PATHS.proxyRuntime.claude), `${proxyType}-proxy.json`);
+  const dir = path.dirname(filePath);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
   }
-  return path.join(ccToolDir, `${proxyType}-proxy-runtime.json`);
+  return filePath;
 }
 
 function saveProxyStartTime(proxyType, preserveExisting = false) {

package/src/server/services/repo-scanner-base.js

@@ -11,7 +11,7 @@ const https = require('https');
 const http = require('http');
 const { createWriteStream } = require('fs');
 const AdmZip = require('adm-zip');
-const { HOME_DIR } = require('../../config/paths');
+const { PATHS, getRepoScannerReposPath, getRepoScannerCachePath } = require('../../config/paths');
 
 // 缓存有效期（5分钟）
 const CACHE_TTL = 5 * 60 * 1000;
@@ -70,9 +70,9 @@ class RepoScannerBase {
     this.fileExtension = options.fileExtension || '.md';
     this.defaultRepos = options.defaultRepos || [];
 
-    this.configDir = path.join(HOME_DIR, '.cc-tool');
-    this.reposConfigPath = path.join(this.configDir, `${this.type}-repos.json`);
-    this.cachePath = path.join(this.configDir, `${this.type}-cache.json`);
+    this.configDir = PATHS.config;
+    this.reposConfigPath = getRepoScannerReposPath(this.type);
+    this.cachePath = getRepoScannerCachePath(this.type);
 
     // 内存缓存
     this.itemsCache = null;
@@ -89,6 +89,14 @@ class RepoScannerBase {
     if (!fs.existsSync(this.configDir)) {
       fs.mkdirSync(this.configDir, { 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 });
+    }
   }
 
   // ==================== 仓库配置管理 ====================

package/src/server/services/request-logger.js

@@ -18,7 +18,7 @@ const fs = require('fs');
 const path = require('path');
 const { PATHS } = require('../../config/paths');
 
-const CC_TOOL_DIR = PATHS.base;
+const REQUEST_SNAPSHOTS_DIR = path.dirname(PATHS.requestSnapshots.claude);
 
 function ensureDir(dir) {
   if (!fs.existsSync(dir)) {
@@ -55,8 +55,8 @@ function persistProxyRequestSnapshot(source, payload) {
   if (!isProxyRequestLoggingEnabled()) return;
 
   try {
-    ensureDir(CC_TOOL_DIR);
-    const logPath = path.join(CC_TOOL_DIR, `${source}-requests.jsonl`);
+    const logPath = PATHS.requestSnapshots[source] || path.join(REQUEST_SNAPSHOTS_DIR, `${source}.jsonl`);
+    ensureDir(path.dirname(logPath));
     fs.appendFile(logPath, `${JSON.stringify(payload)}\n`, (error) => {
       if (error) {
         console.error(`[request-logger] Failed to persist ${source} request snapshot:`, error);
@@ -97,8 +97,8 @@ function createApiRequestLogger() {
       };
 
       try {
-        ensureDir(path.join(CC_TOOL_DIR, 'logs'));
-        const logPath = path.join(CC_TOOL_DIR, 'logs', 'api-requests.jsonl');
+        ensureDir(PATHS.logs);
+        const logPath = path.join(PATHS.logs, 'api-requests.jsonl');
         fs.appendFile(logPath, `${JSON.stringify(entry)}\n`, (err) => {
           if (err) {
             console.error('[request-logger] Failed to write API request log:', err);
@@ -122,7 +122,7 @@ function createApiRequestLogger() {
   };
 }
 
-const CLAUDE_TEMPLATE_PATH = path.join(CC_TOOL_DIR, 'claude-request-template.json');
+const CLAUDE_TEMPLATE_PATH = PATHS.claudeRequestTemplate;
 const CLAUDE_TEMPLATE_MIN_SYSTEM_CHARS = 100;
 
 const FALLBACK_CLAUDE_SYSTEM = Object.freeze([
@@ -280,7 +280,7 @@ function persistClaudeRequestTemplate(body) {
   if (systemCharCount < CLAUDE_TEMPLATE_MIN_SYSTEM_CHARS) return;
 
   try {
-    ensureDir(CC_TOOL_DIR);
+    ensureDir(path.dirname(CLAUDE_TEMPLATE_PATH));
     const template = { updatedAt: Date.now(), userId, system, tools };
     fs.writeFile(CLAUDE_TEMPLATE_PATH, JSON.stringify(template), (err) => {
       if (err) console.error('[request-logger] Failed to write claude-request-template.json:', err);

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

@@ -3,8 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { PATHS } = require('../../config/paths');
 
-const SECURITY_DIR = PATHS.base;
-const SECURITY_FILE = path.join(SECURITY_DIR, 'security.json');
+const SECURITY_FILE = PATHS.security;
 
 const DEFAULT_SECURITY_CONFIG = {
   passwordHash: '',
@@ -17,8 +16,9 @@ const PBKDF2_KEYLEN = 64;
 const PBKDF2_DIGEST = 'sha512';
 
 function ensureSecurityDir() {
-  if (!fs.existsSync(SECURITY_DIR)) {
-    fs.mkdirSync(SECURITY_DIR, { recursive: true });
+  const dir = path.dirname(SECURITY_FILE);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
   }
 }
 

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/settings-manager.js

@@ -84,6 +84,18 @@ function restoreSettings() {
   }
 }
 
+function deleteBackup() {
+  try {
+    if (fs.existsSync(getBackupPath())) {
+      fs.unlinkSync(getBackupPath());
+    }
+    return { success: true };
+  } catch (err) {
+    console.warn('Failed to delete Claude backup file:', err.message);
+    return { success: false, error: err.message };
+  }
+}
+
 // 设置代理配置
 function setProxyConfig(proxyPort) {
   try {
@@ -156,6 +168,7 @@ module.exports = {
   writeSettings,
   backupSettings,
   restoreSettings,
+  deleteBackup,
   setProxyConfig,
   isProxyConfig,
   getCurrentProxyPort