aihezu 2.8.7 → 2.8.9

package/bin/aihezu.js

@@ -40,7 +40,6 @@ function showHelp() {
   console.log('  aihezu usage              显示所有已配置服务的用量');
   console.log('  aihezu usage cc           只显示 Claude Code 用量');
   console.log('  aihezu usage codex        只显示 Codex 用量');
-  console.log('  aihezu usage gemini       只显示 Google Gemini 用量');
   console.log('  aihezu usage --key sk-xxx 使用指定 API Key 查询');
   console.log('\n服务:');
   console.log('  claude              Claude Code');

package/commands/config.js

@@ -66,8 +66,9 @@ async function configCommand(service, args = []) {
         const urlObj = new URL(apiUrl);
         const hostname = urlObj.hostname;
 
-        // Only add suffix for aihezu.dev and its subdomains
-        if (hostname === 'aihezu.dev' || hostname.endsWith('.aihezu.dev')) {
+        // Only add suffix for aihezu.dev/aihezu.top and their subdomains
+        if (hostname === 'aihezu.dev' || hostname.endsWith('.aihezu.dev') ||
+            hostname === 'aihezu.top' || hostname.endsWith('.aihezu.top')) {
           const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
           const trimmedUrl = apiUrl.replace(/\/+$/, '');
           if (!trimmedUrl.endsWith(normalizedSuffix)) {

package/commands/install.js

@@ -67,8 +67,9 @@ async function installCommand(service, args = []) {
         const urlObj = new URL(apiUrl);
         const hostname = urlObj.hostname;
 
-        // Only add suffix for aihezu.dev and its subdomains
-        if (hostname === 'aihezu.dev' || hostname.endsWith('.aihezu.dev')) {
+        // Only add suffix for aihezu.dev/aihezu.top and their subdomains
+        if (hostname === 'aihezu.dev' || hostname.endsWith('.aihezu.dev') ||
+            hostname === 'aihezu.top' || hostname.endsWith('.aihezu.top')) {
           const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
           const trimmedUrl = apiUrl.replace(/\/+$/, '');
           if (!trimmedUrl.endsWith(normalizedSuffix)) {

package/commands/usage.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { postJson } = require('../lib/http');
+const { postJson, getJson } = require('../lib/http');
 const platform = require('../lib/platform');
 
 function normalizeHttpUrl(url) {
@@ -189,66 +189,6 @@ function readCodexConfig() {
   return configs;
 }
 
-// 读取 Gemini 配置
-function readGeminiConfig() {
-  const configs = [];
-
-  // 读取环境变量
-  const envBaseUrl = process.env.GOOGLE_GEMINI_BASE_URL || '';
-  const envAuthToken = process.env.GEMINI_API_KEY || '';
-
-  if (envBaseUrl && envAuthToken) {
-    configs.push({
-      source: '环境变量',
-      baseUrl: normalizeHttpUrl(envBaseUrl),
-      authToken: envAuthToken.trim()
-    });
-  }
-
-  // 读取配置文件
-  const envFilePath = path.join(os.homedir(), '.gemini', '.env');
-  if (fs.existsSync(envFilePath)) {
-    try {
-      const content = fs.readFileSync(envFilePath, 'utf8');
-      const lines = content.split('\n');
-
-      let fileBaseUrl = '';
-      let fileAuthToken = '';
-
-      for (const line of lines) {
-        const match = line.match(/^(\w+)="?([^"]+)"?$/);
-        if (match) {
-          const [, key, value] = match;
-          if (key === 'GOOGLE_GEMINI_BASE_URL') {
-            fileBaseUrl = value;
-          } else if (key === 'GEMINI_API_KEY') {
-            fileAuthToken = value;
-          }
-        }
-      }
-
-      if (fileBaseUrl && fileAuthToken) {
-        const isDuplicate = configs.some(c =>
-          c.baseUrl === normalizeHttpUrl(fileBaseUrl) &&
-          c.authToken === fileAuthToken.trim()
-        );
-
-        if (!isDuplicate) {
-          configs.push({
-            source: '配置文件',
-            baseUrl: normalizeHttpUrl(fileBaseUrl),
-            authToken: fileAuthToken.trim()
-          });
-        }
-      }
-    } catch (error) {
-      // 忽略错误
-    }
-  }
-
-  return configs;
-}
-
 function asNumber(value) {
   if (typeof value === 'number' && Number.isFinite(value)) return value;
   if (typeof value === 'string' && value.trim() !== '' && Number.isFinite(Number(value))) {
@@ -355,6 +295,167 @@ function usageHint(current, limit) {
   return '';
 }
 
+function getCodexUsageBase(baseUrl) {
+  // 用户的 Codex base_url 形如 https://xxx.aihezu.dev/openai 或 https://xxx.aihezu.dev
+  // 新 usage 接口位于 /v1/usage，需要去掉可能存在的 /openai 后缀
+  try {
+    const url = new URL(baseUrl);
+    let pathname = url.pathname.replace(/\/+$/, '');
+    if (pathname.toLowerCase().endsWith('/openai')) {
+      pathname = pathname.slice(0, -'/openai'.length);
+    }
+    return `${url.origin}${pathname}`;
+  } catch (error) {
+    return baseUrl.replace(/\/+$/, '').replace(/\/openai$/i, '');
+  }
+}
+
+async function queryCodexUsage(baseUrl, authToken) {
+  try {
+    const apiBase = getCodexUsageBase(baseUrl);
+    const usageUrl = `${apiBase}/v1/usage`;
+    const res = await getJson(usageUrl, {
+      headers: { Authorization: `Bearer ${authToken}` }
+    });
+
+    if (res.statusCode < 200 || res.statusCode >= 300) {
+      const msg = res.json && (res.json.message || res.json.error || res.json.code);
+      return { error: msg ? `HTTP ${res.statusCode} - ${msg}` : `HTTP ${res.statusCode}` };
+    }
+
+    if (!res.json || typeof res.json !== 'object') {
+      return { error: '返回内容不是合法的 JSON' };
+    }
+
+    return { stats: res.json, origin: new URL(usageUrl).origin };
+  } catch (error) {
+    return { error: error.message };
+  }
+}
+
+function displayCodexUsageStats(stats, origin, source) {
+  const subscription = stats.subscription || {};
+  const today = (stats.usage && stats.usage.today) || {};
+  const total = (stats.usage && stats.usage.total) || {};
+
+  const dailyUsage = asNumber(subscription.daily_usage_usd);
+  const dailyLimit = asNumber(subscription.daily_limit_usd);
+  const weeklyUsage = asNumber(subscription.weekly_usage_usd);
+  const weeklyLimit = asNumber(subscription.weekly_limit_usd);
+  const monthlyUsage = asNumber(subscription.monthly_usage_usd);
+  const monthlyLimit = asNumber(subscription.monthly_limit_usd);
+
+  const unit = stats.unit || 'USD';
+  const planName = stats.planName || '-';
+  const mode = stats.mode || '-';
+  const isValid = stats.isValid === false ? '否' : '是';
+
+  console.log(`域名: ${origin}`);
+  console.log(`来源: ${source}`);
+  console.log(`套餐: ${planName} | 模式: ${mode} | 有效: ${isValid} | 单位: ${unit}`);
+  console.log('');
+
+  if (dailyUsage !== null || dailyLimit !== null) {
+    const usageText = formatCost(dailyUsage);
+    if (dailyLimit !== null && dailyLimit > 0) {
+      console.log(
+        `日额度: ${usageText} / ${formatCost(dailyLimit)} (${formatPercent(dailyUsage, dailyLimit)}) ` +
+        `${renderBar(dailyUsage, dailyLimit)} ${usageHint(dailyUsage, dailyLimit)}`.trimEnd()
+      );
+      const dailyRemaining = asNumber(stats.remaining);
+      if (dailyRemaining !== null) {
+        console.log(`日剩余: ${formatCost(dailyRemaining)}`);
+      } else if (dailyUsage !== null) {
+        console.log(`日剩余: ${formatCost(dailyLimit - dailyUsage)}`);
+      }
+    } else {
+      console.log(`日用量: ${usageText} (无限制)`);
+    }
+  }
+
+  if (weeklyUsage !== null && weeklyLimit !== null && weeklyLimit > 0) {
+    console.log(
+      `周额度: ${formatCost(weeklyUsage)} / ${formatCost(weeklyLimit)} (${formatPercent(weeklyUsage, weeklyLimit)}) ` +
+      `${renderBar(weeklyUsage, weeklyLimit)} ${usageHint(weeklyUsage, weeklyLimit)}`.trimEnd()
+    );
+  } else if (weeklyUsage !== null && weeklyUsage > 0) {
+    console.log(`周用量: ${formatCost(weeklyUsage)}`);
+  }
+
+  if (monthlyUsage !== null && monthlyLimit !== null && monthlyLimit > 0) {
+    console.log(
+      `月额度: ${formatCost(monthlyUsage)} / ${formatCost(monthlyLimit)} (${formatPercent(monthlyUsage, monthlyLimit)}) ` +
+      `${renderBar(monthlyUsage, monthlyLimit)} ${usageHint(monthlyUsage, monthlyLimit)}`.trimEnd()
+    );
+  } else if (monthlyUsage !== null && monthlyUsage > 0) {
+    console.log(`月用量: ${formatCost(monthlyUsage)}`);
+  }
+
+  const expiresAt = subscription.expires_at;
+  if (expiresAt) {
+    const expiresMs = Date.parse(expiresAt);
+    if (!Number.isNaN(expiresMs)) {
+      console.log(`套餐到期: ${formatDateTime(expiresMs)}`);
+    }
+  }
+
+  if (Object.keys(today).length > 0) {
+    console.log('');
+    console.log('今日:');
+    const todayParts = [];
+    if (asNumber(today.requests) !== null) todayParts.push(`请求 ${formatNumber(today.requests)} 次`);
+    if (asNumber(today.total_tokens) !== null) todayParts.push(`Token ${formatCompactNumber(today.total_tokens)}`);
+    if (asNumber(today.input_tokens) !== null) todayParts.push(`输入 ${formatCompactNumber(today.input_tokens)}`);
+    if (asNumber(today.output_tokens) !== null) todayParts.push(`输出 ${formatCompactNumber(today.output_tokens)}`);
+    if (asNumber(today.cache_read_tokens) !== null) todayParts.push(`缓存读 ${formatCompactNumber(today.cache_read_tokens)}`);
+    if (asNumber(today.cache_creation_tokens) !== null) todayParts.push(`缓存写 ${formatCompactNumber(today.cache_creation_tokens)}`);
+    if (todayParts.length) console.log(`  ${todayParts.join(' | ')}`);
+    if (asNumber(today.cost) !== null) console.log(`  费用: ${formatCost(today.cost)}`);
+  }
+
+  if (Object.keys(total).length > 0 && total !== today) {
+    const totalRequests = asNumber(total.requests);
+    const totalCost = asNumber(total.cost);
+    if (totalRequests !== null || totalCost !== null) {
+      console.log('');
+      console.log('累计:');
+      const parts = [];
+      if (totalRequests !== null) parts.push(`请求 ${formatNumber(total.requests)} 次`);
+      if (asNumber(total.total_tokens) !== null) parts.push(`Token ${formatCompactNumber(total.total_tokens)}`);
+      if (totalCost !== null) parts.push(`费用 ${formatCost(total.cost)}`);
+      if (parts.length) console.log(`  ${parts.join(' | ')}`);
+    }
+  }
+
+  const usage = stats.usage || {};
+  const rpm = asNumber(usage.rpm);
+  const tpm = asNumber(usage.tpm);
+  const avgDuration = asNumber(usage.average_duration_ms);
+  if (rpm !== null || tpm !== null || avgDuration !== null) {
+    const parts = [];
+    if (rpm !== null) parts.push(`RPM ${rpm}`);
+    if (tpm !== null) parts.push(`TPM ${tpm}`);
+    if (avgDuration !== null) parts.push(`平均耗时 ${avgDuration} ms`);
+    console.log(`实时: ${parts.join(' | ')}`);
+  }
+
+  if (Array.isArray(stats.model_stats) && stats.model_stats.length > 0) {
+    console.log('');
+    console.log('模型用量:');
+    for (const m of stats.model_stats) {
+      const parts = [
+        `${m.model || '-'}`,
+        `请求 ${formatNumber(m.requests)} 次`,
+        `Token ${formatCompactNumber(m.total_tokens)}`,
+        `费用 ${formatCost(m.cost)}`
+      ];
+      console.log(`  - ${parts.join(' | ')}`);
+    }
+  }
+
+  console.log('');
+}
+
 async function queryUsage(baseUrl, authToken) {
   try {
     const origin = new URL(baseUrl).origin;
@@ -494,7 +595,7 @@ function showUsageHelp() {
   console.log('用法: aihezu usage [service] [--json] [--key <apiKey>]');
   console.log('');
   console.log('说明:');
-  console.log('  - 自动检测 Claude Code、Codex、Google Gemini 的配置');
+  console.log('  - 自动检测 Claude Code、Codex 的配置');
   console.log('  - 从环境变量和配置文件读取配置');
   console.log('  - 如果两者都存在且不同，将分别查询两个账号的用量');
   console.log('  - 使用 --key 可查询指定 API Key 的用量');
@@ -502,7 +603,6 @@ function showUsageHelp() {
   console.log('可选服务参数:');
   console.log('  cc, claude          只显示 Claude Code 用量');
   console.log('  codex               只显示 Codex 用量');
-  console.log('  gemini              只显示 Google Gemini 用量');
   console.log('  (不指定)            显示所有已配置服务的用量');
   console.log('');
   console.log('可选参数:');
@@ -513,7 +613,6 @@ function showUsageHelp() {
   console.log('  npx aihezu usage              # 显示所有服务');
   console.log('  npx aihezu usage cc           # 只显示 Claude Code');
   console.log('  npx aihezu usage codex        # 只显示 Codex');
-  console.log('  npx aihezu usage gemini       # 只显示 Gemini');
   console.log('  npx aihezu usage --json       # JSON 格式输出所有服务');
   console.log('  npx aihezu usage cc --json    # JSON 格式输出 Claude Code');
   console.log('  npx aihezu usage --key sk-xxx # 使用指定 Key 查询');
@@ -537,8 +636,7 @@ async function usageCommand(args = []) {
   const serviceAliases = {
     'cc': 'Claude Code',
     'claude': 'Claude Code',
-    'codex': 'Codex',
-    'gemini': 'Google Gemini'
+    'codex': 'Codex'
   };
 
   let filterServiceName = null;
@@ -549,7 +647,7 @@ async function usageCommand(args = []) {
     if (!filterServiceName) {
       console.error(`[错误] 未知的服务: ${serviceFilter}`);
       console.error('');
-      console.error('可用服务: cc, claude, codex, gemini');
+      console.error('可用服务: cc, claude, codex');
       console.error('');
       console.error('使用 "aihezu usage --help" 查看帮助');
       process.exit(1);
@@ -559,8 +657,7 @@ async function usageCommand(args = []) {
   // 收集所有服务的配置
   const allServices = [
     { name: 'Claude Code', configs: readClaudeConfig() },
-    { name: 'Codex', configs: readCodexConfig() },
-    { name: 'Google Gemini', configs: readGeminiConfig() }
+    { name: 'Codex', configs: readCodexConfig() }
   ];
 
   // 根据过滤参数筛选服务
@@ -591,10 +688,10 @@ async function usageCommand(args = []) {
       const effectiveKey = overrideKey || config.authToken;
       const sourceLabel = overrideKey ? `命令行 Key (${config.source})` : config.source;
       console.log(`[查询中] ${sourceLabel} - Token: ${maskToken(effectiveKey)}`);
-      return {
-        sourceLabel,
-        promise: queryUsage(config.baseUrl, effectiveKey)
-      };
+      const promise = service.name === 'Codex'
+        ? queryCodexUsage(config.baseUrl, effectiveKey)
+        : queryUsage(config.baseUrl, effectiveKey);
+      return { sourceLabel, promise };
     });
 
     const results = await Promise.allSettled(requests.map(item => item.promise));
@@ -615,7 +712,11 @@ async function usageCommand(args = []) {
         });
       } else {
         if (!outputJson) {
-          displayUsageStats(result.stats, result.origin, sourceLabel);
+          if (service.name === 'Codex') {
+            displayCodexUsageStats(result.stats, result.origin, sourceLabel);
+          } else {
+            displayUsageStats(result.stats, result.origin, sourceLabel);
+          }
         }
         allResults[service.name].push({
           source: sourceLabel,
@@ -637,7 +738,6 @@ async function usageCommand(args = []) {
     console.log('请先运行以下命令进行配置:');
     console.log('  npx aihezu install claude   # 配置 Claude Code');
     console.log('  npx aihezu install codex    # 配置 Codex');
-    console.log('  npx aihezu install gemini   # 配置 Google Gemini');
     console.log('');
     console.log('或者手动设置环境变量:');
     console.log('');

package/docs/plans/2026-01-30-cross-platform-compatibility-design.md

@@ -243,7 +243,7 @@ function getTroubleshootingGuide(errorType)
 
   2. 永久设置（需要重启终端）:
      setx ANTHROPIC_AUTH_TOKEN "sk-xxx"
-     setx ANTHROPIC_BASE_URL "https://cn.aihezu.dev/api"
+     setx ANTHROPIC_BASE_URL "https://code.aihezu.top/api"
 
   3. 推荐：使用配置文件而非环境变量
      npx aihezu config claude
@@ -629,7 +629,7 @@ function getEnvVarGuide(varName) {
       '',
       '方式 2: 永久设置（需要重启终端）',
       `  setx ${varName} "your-value"`,
-      `  setx ANTHROPIC_BASE_URL "https://cn.aihezu.dev/api"`,
+      `  setx ANTHROPIC_BASE_URL "https://code.aihezu.top/api"`,
       '',
       '⚠️  注意: setx 后必须重启 PowerShell/CMD 才能生效',
       '',

package/lib/http.js

@@ -8,11 +8,22 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
-function sendJsonRequest(method, urlString, body, timeoutMs) {
+function sendJsonRequest(method, urlString, body, timeoutMs, extraHeaders = {}) {
   const url = new URL(urlString);
-  const payload = JSON.stringify(body ?? {});
+  const hasBody = body !== undefined && body !== null;
+  const payload = hasBody ? JSON.stringify(body) : '';
   const transport = url.protocol === 'https:' ? https : http;
 
+  const headers = {
+    'Accept': 'application/json',
+    'User-Agent': 'aihezu-cli',
+    ...extraHeaders
+  };
+  if (hasBody) {
+    headers['Content-Type'] = 'application/json';
+    headers['Content-Length'] = Buffer.byteLength(payload);
+  }
+
   return new Promise((resolve, reject) => {
     const req = transport.request(
       {
@@ -20,12 +31,7 @@ function sendJsonRequest(method, urlString, body, timeoutMs) {
         hostname: url.hostname,
         port: url.port || (url.protocol === 'https:' ? 443 : 80),
         path: `${url.pathname}${url.search || ''}`,
-        headers: {
-          'Content-Type': 'application/json',
-          'Accept': 'application/json',
-          'Content-Length': Buffer.byteLength(payload),
-          'User-Agent': 'aihezu-cli'
-        }
+        headers
       },
       res => {
         res.setEncoding('utf8');
@@ -57,7 +63,9 @@ function sendJsonRequest(method, urlString, body, timeoutMs) {
       req.destroy(new Error(`Request timed out after ${timeoutMs}ms`));
     });
 
-    req.write(payload);
+    if (hasBody) {
+      req.write(payload);
+    }
     req.end();
   });
 }
@@ -67,7 +75,43 @@ async function postJson(urlString, body, options = {}) {
     timeoutMs = HTTP_TIMEOUT,
     retryCount = HTTP_RETRY_COUNT,
     retryDelayMs = HTTP_RETRY_DELAY,
-    retryStatusCodes = DEFAULT_RETRY_STATUS_CODES
+    retryStatusCodes = DEFAULT_RETRY_STATUS_CODES,
+    headers = {}
+  } = options;
+
+  const retryCodes = retryStatusCodes instanceof Set ? retryStatusCodes : new Set(retryStatusCodes);
+  let attempt = 0;
+  let lastError = null;
+
+  while (attempt <= retryCount) {
+    try {
+      const response = await sendJsonRequest('POST', urlString, body, timeoutMs, headers);
+      if (retryCodes.has(response.statusCode) && attempt < retryCount) {
+        await sleep(retryDelayMs * Math.pow(2, attempt));
+        attempt += 1;
+        continue;
+      }
+      return response;
+    } catch (error) {
+      lastError = error;
+      if (attempt >= retryCount) {
+        break;
+      }
+      await sleep(retryDelayMs * Math.pow(2, attempt));
+      attempt += 1;
+    }
+  }
+
+  throw lastError || new Error('Request failed');
+}
+
+async function getJson(urlString, options = {}) {
+  const {
+    timeoutMs = HTTP_TIMEOUT,
+    retryCount = HTTP_RETRY_COUNT,
+    retryDelayMs = HTTP_RETRY_DELAY,
+    retryStatusCodes = DEFAULT_RETRY_STATUS_CODES,
+    headers = {}
   } = options;
 
   const retryCodes = retryStatusCodes instanceof Set ? retryStatusCodes : new Set(retryStatusCodes);
@@ -76,7 +120,7 @@ async function postJson(urlString, body, options = {}) {
 
   while (attempt <= retryCount) {
     try {
-      const response = await sendJsonRequest('POST', urlString, body, timeoutMs);
+      const response = await sendJsonRequest('GET', urlString, null, timeoutMs, headers);
       if (retryCodes.has(response.statusCode) && attempt < retryCount) {
         await sleep(retryDelayMs * Math.pow(2, attempt));
         attempt += 1;
@@ -97,5 +141,6 @@ async function postJson(urlString, body, options = {}) {
 }
 
 module.exports = {
-  postJson
+  postJson,
+  getJson
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aihezu",
-  "version": "2.8.7",
+  "version": "2.8.9",
   "description": "AI 开发环境配置工具 - 支持 Claude Code, Codex, Google Gemini 的本地化配置、代理设置与缓存清理",
   "main": "bin/aihezu.js",
   "bin": {

package/services/claude.js

@@ -10,7 +10,7 @@ const settingsPath = path.join(configDir, 'settings.json');
 module.exports = {
   name: 'claude',
   displayName: 'Claude Code',
-  defaultApiUrl: 'https://cn.aihezu.dev/api',
+  defaultApiUrl: 'https://code.aihezu.top/api',
   apiSuffix: '/api',
   
   // Cache cleaning configuration