aihezu 2.3.3 → 2.3.4

package/bin/aihezu.js

@@ -28,6 +28,16 @@ function showHelp() {
   console.log('  claude              Claude Code');
   console.log('  codex               Codex');
   console.log('  gemini              Google Gemini');
+  console.log('\n配置文件与环境变量:');
+  console.log('  Claude Code:');
+  console.log('    配置文件: ~/.claude/settings.json');
+  console.log('    环境变量: ANTHROPIC_AUTH_TOKEN, ANTHROPIC_BASE_URL');
+  console.log('  Codex:');
+  console.log('    配置文件: ~/.codex/config.toml, ~/.codex/auth.json');
+  console.log('    环境变量: AIHEZU_OAI_KEY');
+  console.log('  Google Gemini:');
+  console.log('    配置文件: ~/.gemini/.env, ~/.gemini/settings.json (可选)');
+  console.log('    环境变量: GEMINI_API_KEY, GOOGLE_GEMINI_BASE_URL');
   console.log('\n示例:');
   console.log('  aihezu install claude');
   console.log('  aihezu clear codex');

package/commands/ccusage.js

@@ -148,24 +148,24 @@ async function ccusageCommand(args = []) {
 
   const outputJson = args.includes('--json');
 
-  let baseUrl = process.env.ANTHROPIC_BASE_URL || '';
-  let authToken = process.env.ANTHROPIC_AUTH_TOKEN || '';
-  let sourceHint = '环境变量';
-
-  if (!baseUrl || !authToken) {
-    const { env, settingsPath, error } = readClaudeEnvFromSettingsFile();
-    if (error) {
-      console.log(`[WARN] 读取配置文件失败: ${settingsPath}`);
-      console.log(`       错误: ${error.message}`);
-    }
-
-    if (env) {
-      baseUrl = baseUrl || env.ANTHROPIC_BASE_URL || '';
-      authToken = authToken || env.ANTHROPIC_AUTH_TOKEN || '';
-      sourceHint = `配置文件 (${settingsPath})`;
-    }
+  // 读取环境变量
+  const envBaseUrl = process.env.ANTHROPIC_BASE_URL || '';
+  const envAuthToken = process.env.ANTHROPIC_AUTH_TOKEN || '';
+
+  // 读取配置文件
+  const { env: fileEnv, settingsPath, error } = readClaudeEnvFromSettingsFile();
+  if (error) {
+    console.log(`[WARN] 读取配置文件失败: ${settingsPath}`);
+    console.log(`       错误: ${error.message}`);
   }
 
+  const fileBaseUrl = fileEnv?.ANTHROPIC_BASE_URL || '';
+  const fileAuthToken = fileEnv?.ANTHROPIC_AUTH_TOKEN || '';
+
+  // 确定最终使用的配置（环境变量优先）
+  let baseUrl = envBaseUrl || fileBaseUrl;
+  let authToken = envAuthToken || fileAuthToken;
+
   baseUrl = normalizeHttpUrl(baseUrl);
   authToken = String(authToken || '').trim();
 
@@ -190,7 +190,31 @@ async function ccusageCommand(args = []) {
   console.log('');
   console.log('=== Claude Code 用量统计 ===');
   console.log(`域名: ${origin}`);
-  console.log(`配置来源: ${sourceHint}`);
+  console.log('');
+
+  // 展示配置来源详情
+  console.log('=== 配置来源 ===');
+
+  // 环境变量
+  console.log('环境变量:');
+  console.log(`  ANTHROPIC_BASE_URL:   ${envBaseUrl || '(未设置)'}`);
+  console.log(`  ANTHROPIC_AUTH_TOKEN: ${envAuthToken ? '***' + envAuthToken.slice(-8) : '(未设置)'}`);
+
+  // 配置文件
+  console.log('配置文件 (~/.claude/settings.json):');
+  if (error) {
+    console.log(`  状态: 读取失败 - ${error.message}`);
+  } else if (!fileEnv) {
+    console.log(`  状态: 文件不存在或无 env 字段`);
+  } else {
+    console.log(`  ANTHROPIC_BASE_URL:   ${fileBaseUrl || '(未设置)'}`);
+    console.log(`  ANTHROPIC_AUTH_TOKEN: ${fileAuthToken ? '***' + fileAuthToken.slice(-8) : '(未设置)'}`);
+  }
+
+  // 最终使用的配置
+  console.log('最终使用:');
+  console.log(`  BASE_URL: ${baseUrl} ${envBaseUrl ? '[环境变量]' : '[配置文件]'}`);
+  console.log(`  AUTH_TOKEN: ***${authToken.slice(-8)} ${envAuthToken ? '[环境变量]' : '[配置文件]'}`);
   console.log('');
 
   const keyIdRes = await postJson(keyIdUrl, { apiKey: authToken });

package/package.json

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