aihezu 2.8.0 → 2.8.2

package/README.md

@@ -16,7 +16,7 @@
 
 - `ccinstall` / `install`：交互式配置 Claude（默认）或 Codex
   - Claude：默认 `https://cc.aihezu.dev/api`，企业可用 `--api` / `--api-url` 指定独立域名
-  - Codex：默认 `https://cc.aihezu.dev/openai`，企业可用 `--api` / `--api-url` 指定独立域名；写入 `~/.codex/config.toml` 和 `auth.json`，使用 `AIHEZU_OAI_KEY`
+  - Codex：默认 `https://cc.aihezu.dev/openai`，企业可用 `--api` / `--api-url` 指定独立域名；写入 `~/.codex/config.toml` 和 `auth.json`，使用 `OPENAI_API_KEY`
 - `ccclear`：清理 Claude Code 缓存和配置
 - `usage`：查看 Claude Code / Codex / Gemini 用量统计（支持 `--key` 指定 API Key）
 

package/bin/aihezu.js

@@ -52,7 +52,7 @@ function showHelp() {
   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('    环境变量: OPENAI_API_KEY');
   console.log('  Google Gemini:');
   console.log('    配置文件: ~/.gemini/.env, ~/.gemini/settings.json (可选)');
   console.log('    环境变量: GEMINI_API_KEY, GOOGLE_GEMINI_BASE_URL');

package/commands/check.js

@@ -113,7 +113,7 @@ function checkCodex() {
     try {
       const authData = JSON.parse(fs.readFileSync(authPath, 'utf8'));
       console.log('   ✅ 文件存在');
-      console.log('   📝 AIHEZU_OAI_KEY:', maskSensitive(authData.AIHEZU_OAI_KEY));
+      console.log('   📝 OPENAI_API_KEY:', maskSensitive(authData.OPENAI_API_KEY));
     } catch (e) {
       console.log('   ❌ 文件存在但格式错误:', e.message);
     }
@@ -123,8 +123,8 @@ function checkCodex() {
 
   // Check environment variables
   console.log('\n3️⃣  环境变量:');
-  const envKey = process.env.AIHEZU_OAI_KEY;
-  console.log('   📝 AIHEZU_OAI_KEY:', maskSensitive(envKey));
+  const envKey = process.env.OPENAI_API_KEY;
+  console.log('   📝 OPENAI_API_KEY:', maskSensitive(envKey));
 
   // Priority explanation
   console.log('\n4️⃣  优先级说明:');

package/commands/config.js

@@ -53,24 +53,35 @@ async function configCommand(service, args = []) {
     const apiUrlInput = await askQuestion(rl, '请输入 API 地址 (直接回车使用默认地址): ');
     let apiUrl = apiUrlInput || defaultUrl;
 
-    // Append service-specific suffix if needed
-    const suffix = service.apiSuffix || '';
-    if (suffix) {
-      const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
-      const trimmedUrl = apiUrl.replace(/\/+$/, '');
-      if (!trimmedUrl.endsWith(normalizedSuffix)) {
-        apiUrl = trimmedUrl + normalizedSuffix;
-      } else {
-        apiUrl = trimmedUrl;
-      }
-    }
-
     // Basic URL validation/normalization
     // This part should handle http/https prefixing.
     if (!/^https?:\/\//i.test(apiUrl)) {
       apiUrl = 'https://' + apiUrl;
     }
 
+    // Append service-specific suffix only for aihezu.dev domains
+    const suffix = service.apiSuffix || '';
+    if (suffix) {
+      try {
+        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')) {
+          const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
+          const trimmedUrl = apiUrl.replace(/\/+$/, '');
+          if (!trimmedUrl.endsWith(normalizedSuffix)) {
+            apiUrl = trimmedUrl + normalizedSuffix;
+          } else {
+            apiUrl = trimmedUrl;
+          }
+        }
+      } catch (e) {
+        // If URL parsing fails, keep the URL as-is
+        console.log('⚠️  URL 解析失败，保持原样');
+      }
+    }
+
     // 2. API Key
     let defaultApiKey = cliApiKey || '';
     let apiKeyPrompt = '请输入您的 API Key: ';

package/commands/install.js

@@ -54,24 +54,35 @@ async function installCommand(service, args = []) {
     const apiUrlInput = await askQuestion(rl, '请输入 API 地址 (直接回车使用默认地址): ');
     let apiUrl = apiUrlInput || defaultUrl;
 
-    // Append service-specific suffix if needed
-    const suffix = service.apiSuffix || '';
-    if (suffix) {
-      const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
-      const trimmedUrl = apiUrl.replace(/\/+$/, '');
-      if (!trimmedUrl.endsWith(normalizedSuffix)) {
-        apiUrl = trimmedUrl + normalizedSuffix;
-      } else {
-        apiUrl = trimmedUrl;
-      }
-    }
-
     // Basic URL validation/normalization
     // This part should handle http/https prefixing.
     if (!/^https?:\/\//i.test(apiUrl)) {
       apiUrl = 'https://' + apiUrl;
     }
 
+    // Append service-specific suffix only for aihezu.dev domains
+    const suffix = service.apiSuffix || '';
+    if (suffix) {
+      try {
+        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')) {
+          const normalizedSuffix = suffix.startsWith('/') ? suffix : `/${suffix}`;
+          const trimmedUrl = apiUrl.replace(/\/+$/, '');
+          if (!trimmedUrl.endsWith(normalizedSuffix)) {
+            apiUrl = trimmedUrl + normalizedSuffix;
+          } else {
+            apiUrl = trimmedUrl;
+          }
+        }
+      } catch (e) {
+        // If URL parsing fails, keep the URL as-is
+        console.log('⚠️  URL 解析失败，保持原样');
+      }
+    }
+
     // 2. API Key
     let defaultApiKey = cliApiKey || '';
     let apiKeyPrompt = '请输入您的 API Key: ';

package/commands/usage.js

@@ -133,7 +133,7 @@ function readCodexConfig() {
   const configs = [];
 
   // 读取环境变量
-  const envAuthToken = process.env.AIHEZU_OAI_KEY || '';
+  const envAuthToken = process.env.OPENAI_API_KEY || '';
 
   // 读取配置文件中的 base_url
   let fileBaseUrl = '';
@@ -159,7 +159,7 @@ function readCodexConfig() {
     try {
       const content = fs.readFileSync(authPath, 'utf8');
       const authData = JSON.parse(content);
-      fileAuthToken = authData.AIHEZU_OAI_KEY || '';
+      fileAuthToken = authData.OPENAI_API_KEY || '';
     } catch (error) {
       // 忽略错误
     }

package/docs/TROUBLESHOOTING.md

@@ -225,7 +225,7 @@ copy C:\Windows\System32\drivers\etc\hosts.backup-20260130123456 C:\Windows\Syst
 ```bash
 echo $ANTHROPIC_BASE_URL
 echo $ANTHROPIC_AUTH_TOKEN
-echo $AIHEZU_OAI_KEY
+echo $OPENAI_API_KEY
 echo $GEMINI_API_KEY
 ```
 

package/package.json

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

package/services/codex.js

@@ -32,75 +32,22 @@ module.exports = {
       fs.mkdirSync(configDir, { recursive: true });
     }
 
-    // Handle config.toml
-    let configContent = '';
-    let existingConfig = '';
-    let providerName = 'aihezu';
-
-    if (fs.existsSync(configPath)) {
-      existingConfig = fs.readFileSync(configPath, 'utf8');
-      
-      const providerMatch = existingConfig.match(/model_provider\s*=\s*"([^"]+)"/);
-      if (providerMatch) {
-        providerName = providerMatch[1];
-      }
-
-      // Update logic (simplified from original)
-      let newConfig = existingConfig;
-      
-      // Update model
-      const modelPattern = /^model\s*=\s*"[^"]*"/m;
-      if (modelPattern.test(newConfig)) {
-        newConfig = newConfig.replace(modelPattern, `model = "${modelName}"`);
-      }
-
-      // Update base_url
-      const baseUrlPattern = new RegExp(
-        `(\[model_providers\.${providerName}\][\s\S]*?base_url\s*=\s*)"[^"]*"`,
-        'm'
-      );
-
-      if (baseUrlPattern.test(newConfig)) {
-        newConfig = newConfig.replace(baseUrlPattern, `$1"${apiUrl}"`);
-      } else {
-        // If provider block exists but no base_url (rare), or provider block missing
-        const providerSectionPattern = new RegExp(`\[model_providers\.${providerName}\]`, 'm');
-        if (providerSectionPattern.test(newConfig)) {
-           newConfig = newConfig.replace(
-            providerSectionPattern,
-            `[model_providers.${providerName}]\nbase_url = "${apiUrl}"`
-          );
-        } else {
-          // Append new provider
-           newConfig = newConfig.trim() + '\n\n' +
-            `[model_providers.${providerName}]\n` +
-            `name = "${providerName}"\n` +
-            `base_url = "${apiUrl}"\n` +
-            `wire_api = "responses"\n` +
-            `requires_openai_auth = true\n` +
-            `env_key = "AIHEZU_OAI_KEY"\n`;
-        }
-      }
-      configContent = newConfig;
-
-    } else {
-      // New Config
-      configContent = [
-        'model_provider = "aihezu"',
-        `model = "${modelName}"`, 
-        'model_reasoning_effort = "high"',
-        'disable_response_storage = true',
-        'preferred_auth_method = "apikey"',
-        '',
-        '[model_providers.aihezu]',
-        'name = "aihezu"',
-        `base_url = "${apiUrl}"`, 
-        'wire_api = "responses"',
-        'requires_openai_auth = true',
-        'env_key = "AIHEZU_OAI_KEY"',
-        ''
-      ].join('\n');
-    }
+    // Handle config.toml - always regenerate to avoid duplication issues
+    const providerName = 'aihezu';
+    const configContent = [
+      `model_provider = "${providerName}"`,
+      `model = "${modelName}"`,
+      'model_reasoning_effort = "high"',
+      'disable_response_storage = true',
+      'preferred_auth_method = "apikey"',
+      '',
+      `[model_providers.${providerName}]`,
+      `name = "${providerName}"`,
+      `base_url = "${apiUrl}"`,
+      'wire_api = "responses"',
+      'requires_openai_auth = true',
+      ''
+    ].join('\n');
 
     fs.writeFileSync(configPath, configContent, 'utf8');
 
@@ -113,7 +60,9 @@ module.exports = {
         authData = {};
       }
     }
-    authData.AIHEZU_OAI_KEY = apiKey;
+    // Remove legacy key if present
+    delete authData.AIHEZU_OAI_KEY;
+    authData.OPENAI_API_KEY = apiKey;
     fs.writeFileSync(authPath, JSON.stringify(authData, null, 2), 'utf8');
 
     // Fix permissions if running with sudo