coding-tool-x 3.3.9 → 3.4.1

package/src/server/services/codex-env-manager.js

@@ -77,6 +77,22 @@ function upsertManagedBlock(content, snippet) {
   return `${stripped.trimEnd()}\n\n${snippet}\n`;
 }
 
+function buildExportCommand(envFilePath, homeDir) {
+  return `. "${buildHomeRelativeShellPath(envFilePath, homeDir)}"`;
+}
+
+function buildPosixEnvFileContent(nextValues) {
+  const keys = Object.keys(nextValues).sort();
+  if (!keys.length) {
+    return '';
+  }
+  return [
+    '# Managed by Coding-Tool',
+    ...keys.map((key) => `export ${key}=${shellQuote(nextValues[key])}`),
+    ''
+  ].join('\n');
+}
+
 function readJsonFile(filePath, fallbackValue) {
   try {
     if (!fs.existsSync(filePath)) {
@@ -186,76 +202,60 @@ function syncPosixEnvironment(nextValues, previousState, options) {
     shellEnv,
     execSync
   } = options;
-  const { preferred, candidates } = getPosixProfileCandidates(homeDir, shellEnv);
   const nextKeys = Object.keys(nextValues).sort();
-  const previousProfiles = Array.isArray(previousState.profiles) ? previousState.profiles : [];
-  const managedProfiles = new Set(previousProfiles);
-  const sourceSnippet = buildSourceSnippet(envFilePath, homeDir);
   let changed = false;
+  const { preferred, candidates } = getPosixProfileCandidates(homeDir, shellEnv);
+  const sourceSnippet = buildSourceSnippet(envFilePath, homeDir);
+  const sourceCommand = buildExportCommand(envFilePath, homeDir);
 
-  if (nextKeys.length > 0) {
-    const envContent = [
-      '# Managed by Coding-Tool for Codex env_key providers',
-      ...nextKeys.map(key => `export ${key}=${shellQuote(nextValues[key])}`),
-      ''
-    ].join('\n');
-    changed = writeTextFileIfChanged(envFilePath, envContent) || changed;
-
-    const existingProfiles = candidates.filter(filePath => fs.existsSync(filePath));
-    if (managedProfiles.size === 0) {
-      if (existingProfiles.length > 0) {
-        for (const profilePath of existingProfiles) {
-          managedProfiles.add(profilePath);
-        }
-      } else {
-        managedProfiles.add(preferred);
-      }
-    }
-
-    for (const profilePath of managedProfiles) {
-      const currentContent = fs.existsSync(profilePath) ? fs.readFileSync(profilePath, 'utf8') : '';
-      const nextContent = upsertManagedBlock(currentContent, sourceSnippet);
-      changed = writeTextFileIfChanged(profilePath, nextContent) || changed;
-    }
-  } else {
-    if (fs.existsSync(envFilePath)) {
-      fs.unlinkSync(envFilePath);
-      changed = true;
-    }
-
-    const cleanupTargets = new Set([
-      ...previousProfiles,
-      ...candidates.filter(filePath => fs.existsSync(filePath))
-    ]);
-
-    for (const profilePath of cleanupTargets) {
-      if (!fs.existsSync(profilePath)) continue;
-      const currentContent = fs.readFileSync(profilePath, 'utf8');
-      const nextContent = stripManagedBlock(currentContent);
-      const finalContent = nextContent ? `${nextContent}\n` : '';
-      changed = writeTextFileIfChanged(profilePath, finalContent) || changed;
-    }
-    managedProfiles.clear();
+  // 清理旧版本遗留的 shell profile 注入（迁移兼容）
+  const previousProfiles = Array.isArray(previousState.profiles) ? previousState.profiles : [];
+  const cleanupTargets = new Set([
+    ...previousProfiles,
+    ...candidates.filter((filePath) => fs.existsSync(filePath))
+  ]);
+  if (!nextKeys.length) {
+    cleanupTargets.add(preferred);
   }
-
-  for (const key of Object.keys(previousState.values || {})) {
-    if (!Object.prototype.hasOwnProperty.call(nextValues, key)) {
-      delete process.env[key];
-    }
+  for (const profilePath of cleanupTargets) {
+    if (!fs.existsSync(profilePath)) continue;
+    const currentContent = fs.readFileSync(profilePath, 'utf8');
+    if (!currentContent.includes(PROFILE_MARKER_START)) continue;
+    const nextContent = stripManagedBlock(currentContent);
+    const finalContent = nextContent ? `${nextContent}\n` : '';
+    changed = writeTextFileIfChanged(profilePath, finalContent) || changed;
   }
-  for (const [key, value] of Object.entries(nextValues)) {
-    process.env[key] = value;
+
+  if (nextKeys.length > 0) {
+    changed = writeTextFileIfChanged(envFilePath, buildPosixEnvFileContent(nextValues)) || changed;
+    const currentProfileContent = fs.existsSync(preferred) ? fs.readFileSync(preferred, 'utf8') : '';
+    const nextProfileContent = upsertManagedBlock(currentProfileContent, sourceSnippet);
+    changed = writeTextFileIfChanged(preferred, nextProfileContent) || changed;
+  } else if (fs.existsSync(envFilePath)) {
+    fs.unlinkSync(envFilePath);
+    changed = true;
   }
 
+  // macOS：用 launchctl 写入全局环境变量，新开终端/进程即生效
   if (runtime === 'darwin') {
     applyLaunchctlEnvironment(previousState.values || {}, nextValues, execSync);
+    const prevValues = previousState.values || {};
+    const keysChanged =
+      Object.keys(nextValues).length !== Object.keys(prevValues).length ||
+      Object.entries(nextValues).some(([k, v]) => prevValues[k] !== v);
+    changed = changed || keysChanged;
+  }
+
+  // Linux：写 ~/.config/environment.d/（桌面/systemd）+ ~/.profile（SSH/登录shell）
+  if (runtime === 'linux') {
+    changed = applyLinuxEnvironment(nextValues, homeDir) || changed;
   }
 
   if (nextKeys.length > 0) {
     writeJsonFile(stateFilePath, {
       version: 1,
       values: nextValues,
-      profiles: Array.from(managedProfiles)
+      profiles: [preferred]
     });
   } else if (fs.existsSync(stateFilePath)) {
     fs.unlinkSync(stateFilePath);
@@ -265,14 +265,54 @@ function syncPosixEnvironment(nextValues, previousState, options) {
     changed,
     reloadRequired: changed,
     isFirstTime: Object.keys(previousState.values || {}).length === 0 && nextKeys.length > 0,
-    sourceCommand: nextKeys.length > 0 ? `source "${buildHomeRelativeShellPath(envFilePath, homeDir)}"` : null,
-    shellConfigPath: managedProfiles.size > 0 ? Array.from(managedProfiles)[0] : null,
-    shellConfigPaths: Array.from(managedProfiles),
+    sourceCommand: nextKeys.length > 0 ? sourceCommand : null,
+    shellConfigPath: nextKeys.length > 0 ? preferred : null,
+    shellConfigPaths: nextKeys.length > 0 ? [preferred] : [],
     envFilePath: nextKeys.length > 0 ? envFilePath : null,
     managedKeys: nextKeys
   };
 }
 
+function applyLinuxEnvironment(nextValues, homeDir) {
+  let changed = false;
+
+  // 1. ~/.config/environment.d/codex-env.conf（systemd 用户环境，桌面终端生效）
+  const envdDir = path.join(homeDir, '.config', 'environment.d');
+  const envdFile = path.join(envdDir, 'codex-env.conf');
+  const nextKeys = Object.keys(nextValues).sort();
+
+  if (nextKeys.length > 0) {
+    const envdContent = [
+      '# Managed by Coding-Tool',
+      ...nextKeys.map(key => `${key}=${nextValues[key]}`),
+      ''
+    ].join('\n');
+    changed = writeTextFileIfChanged(envdFile, envdContent) || changed;
+  } else if (fs.existsSync(envdFile)) {
+    fs.unlinkSync(envdFile);
+    changed = true;
+  }
+
+  // 2. ~/.profile（登录 shell，SSH 和新终端均生效）
+  const profilePath = path.join(homeDir, '.profile');
+  if (nextKeys.length > 0) {
+    const exportLines = nextKeys.map(key => `export ${key}=${shellQuote(nextValues[key])}`).join('\n');
+    const snippet = [PROFILE_MARKER_START, exportLines, PROFILE_MARKER_END].join('\n');
+    const currentContent = fs.existsSync(profilePath) ? fs.readFileSync(profilePath, 'utf8') : '';
+    const nextContent = upsertManagedBlock(currentContent, snippet);
+    changed = writeTextFileIfChanged(profilePath, nextContent) || changed;
+  } else if (fs.existsSync(profilePath)) {
+    const currentContent = fs.readFileSync(profilePath, 'utf8');
+    if (currentContent.includes(PROFILE_MARKER_START)) {
+      const nextContent = stripManagedBlock(currentContent);
+      const finalContent = nextContent ? `${nextContent}\n` : '';
+      changed = writeTextFileIfChanged(profilePath, finalContent) || changed;
+    }
+  }
+
+  return changed;
+}
+
 function applyLaunchctlEnvironment(previousValues, nextValues, execSync) {
   const previousKeys = new Set(Object.keys(previousValues || {}));
   for (const [key, value] of Object.entries(nextValues || {})) {
@@ -306,21 +346,14 @@ function syncWindowsEnvironment(nextValues, previousState, options) {
   let changed = false;
 
   for (const [key, value] of Object.entries(nextValues)) {
-    if (previousValues[key] === value) {
-      process.env[key] = value;
-      continue;
-    }
+    if (previousValues[key] === value) continue;
     setWindowsUserEnv(key, value, execSync);
-    process.env[key] = value;
     changed = true;
   }
 
   for (const key of Object.keys(previousValues)) {
-    if (Object.prototype.hasOwnProperty.call(nextValues, key)) {
-      continue;
-    }
+    if (Object.prototype.hasOwnProperty.call(nextValues, key)) continue;
     removeWindowsUserEnv(key, execSync);
-    delete process.env[key];
     changed = true;
   }
 

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

@@ -3,6 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
+const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 /**
  * Gemini 渠道管理服务（多渠道架构）
@@ -17,13 +18,7 @@ const { clearNativeOAuth } = require('./native-oauth-adapters');
  * - 使用 weight 和 maxConcurrency 控制负载均衡
  */
 
-function normalizeGatewaySourceType(value, fallback = 'gemini') {
-  const normalized = String(value || '').trim().toLowerCase();
-  if (normalized === 'claude') return 'claude';
-  if (normalized === 'codex') return 'codex';
-  if (normalized === 'gemini') return 'gemini';
-  return fallback;
-}
+// normalizeGatewaySourceType imported from base/proxy-utils
 
 // 获取 Gemini 配置目录
 function getGeminiDir() {

package/src/server/services/oauth-credentials-service.js

@@ -380,12 +380,21 @@ function stableFingerprintValue(tool, metadata) {
   return stableId;
 }
 
+function resolveFingerprintValue(tool, metadata, options = {}) {
+  if (options.fingerprintMode === 'primary-token') {
+    return metadata.primaryToken
+      || metadata.accessToken
+      || stableFingerprintValue(tool, metadata);
+  }
+  return stableFingerprintValue(tool, metadata);
+}
+
 function upsertCredential(tool, metadata, options = {}) {
   const store = readStore();
   const toolStore = getToolStore(store, tool);
   const now = Date.now();
   const primaryToken = metadata.primaryToken || metadata.accessToken || '';
-  const fingerprint = fingerprintFor(tool, stableFingerprintValue(tool, metadata));
+  const fingerprint = fingerprintFor(tool, resolveFingerprintValue(tool, metadata, options));
   const existingIndex = toolStore.credentials.findIndex((item) => item.fingerprint === fingerprint);
   const existing = existingIndex >= 0 ? toolStore.credentials[existingIndex] : null;
 
@@ -456,7 +465,8 @@ function syncLocalCredential(tool) {
   }
 
   const credentials = nativeCredentials.map((metadata) => upsertCredential(tool, metadata, {
-    source: 'synced-local'
+    source: 'synced-local',
+    fingerprintMode: 'primary-token'
   }));
 
   return {

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

@@ -4,18 +4,15 @@ const crypto = require('crypto');
 const { PATHS } = require('../../config/paths');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
 const { setChannelConfig } = require('./opencode-settings-manager');
+const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 /**
  * OpenCode 渠道管理服务
  * 存储位置: ~/.cc-tool/opencode-channels.json
  */
 
-function normalizeGatewaySourceType(value) {
-  const normalized = String(value || '').trim().toLowerCase();
-  if (normalized === 'claude') return 'claude';
-  if (normalized === 'gemini') return 'gemini';
-  return 'codex';
-}
+// normalizeGatewaySourceType imported from base/proxy-utils
+// OpenCode default fallback is 'codex'
 
 function normalizeApiKey(value) {
   if (typeof value !== 'string') return '';
@@ -80,7 +77,7 @@ function loadChannels() {
           modelRedirects: ch.modelRedirects || [],
           speedTestModel: ch.speedTestModel || null,
           wireApi: ch.wireApi || 'openai',  // OpenCode 默认使用 OpenAI 兼容格式
-          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType),
+          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex'),
           allowedModels: ch.allowedModels || []
         };
         normalized.providerKey = deriveProviderKey(normalized);
@@ -132,7 +129,7 @@ function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
     modelRedirects: extraConfig.modelRedirects || [],
     speedTestModel: extraConfig.speedTestModel || null,
     model: extraConfig.model || null,
-    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType),
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'codex'),
     providerKey: extraConfig.providerKey || null,
     presetId: extraConfig.presetId || null,
     websiteUrl: extraConfig.websiteUrl || '',
@@ -169,7 +166,8 @@ function updateChannel(channelId, updates) {
     gatewaySourceType: normalizeGatewaySourceType(
       updates.gatewaySourceType !== undefined
         ? updates.gatewaySourceType
-        : oldChannel.gatewaySourceType
+        : oldChannel.gatewaySourceType,
+      'codex'
     ),
     updatedAt: Date.now()
   };

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

@@ -7,6 +7,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const https = require('https');
 const http = require('http');
 const { createWriteStream } = require('fs');

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

@@ -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;