@x-all-in-one/coding-helper 0.2.0 → 0.3.0

package/dist/lib/tools/codex-tool.d.ts

@@ -1,22 +1,21 @@
 import { BaseTool } from './base-tool.js';
+export interface ModelProviderInfo {
+    name: string;
+    base_url?: string;
+    env_key?: string;
+    wire_api?: 'chat' | 'responses';
+}
 export interface CodexConfig {
     model?: string;
-    provider?: {
-        name?: string;
-        baseURL?: string;
-        apiKey?: string;
-    };
-    [key: string]: any;
+    model_provider?: string;
+    model_providers?: Record<string, ModelProviderInfo>;
+    [key: string]: unknown;
 }
 export interface CodexModelConfig {
     apiKey: string;
     model: string;
     baseUrl?: string;
 }
-/**
- * Codex 工具实现
- * 实现 ITool 接口，管理 Codex 的配置和生命周期
- */
 export declare class CodexTool extends BaseTool {
     private static instance;
     readonly name = "codex";
@@ -26,33 +25,15 @@ export declare class CodexTool extends BaseTool {
     readonly configPath: string;
     private constructor();
     static getInstance(): CodexTool;
-    /**
-     * Ensure config directory exists
-     */
     private ensureDir;
-    /**
-     * Read codex config
-     */
     getConfig(): CodexConfig;
-    /**
-     * Save codex config
-     */
-    saveConfig(config: unknown): void;
-    /**
-     * Fetch available models from API
-     */
+    saveConfig(config: CodexConfig): void;
     fetchAvailableModels(apiKey: string): Promise<string[]>;
-    /**
-     * Save model config to Codex
-     */
     saveModelConfig(config: unknown): Promise<void>;
-    /**
-     * Get current model config
-     */
+    private setApiKeyEnv;
+    private getShellRcPath;
+    private getEnvValue;
     getModelConfig(): CodexModelConfig | null;
-    /**
-     * Clear model config
-     */
     clearModelConfig(): void;
 }
 export declare const codexTool: CodexTool;

package/dist/lib/tools/codex-tool.js

@@ -1,13 +1,11 @@
+import { execSync } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
+import { parse, stringify } from 'smol-toml';
 import { BaseTool } from './base-tool.js';
-// 使用相同的 X-AIO API 端点
 const DEFAULT_BASE_URL = 'https://code-api.x-aio.com/v1';
-/**
- * Codex 工具实现
- * 实现 ITool 接口，管理 Codex 的配置和生命周期
- */
+const X_AIO_CODE_API_KEY_ENV = 'X_AIO_CODE_API_KEY';
 export class CodexTool extends BaseTool {
     static instance;
     name = 'codex';
@@ -17,10 +15,7 @@ export class CodexTool extends BaseTool {
     configPath;
     constructor() {
         super();
-        // Codex config file path (cross-platform support)
-        // - macOS/Linux: ~/.codex/config.json
-        // - Windows: %USERPROFILE%\.codex\config.json
-        this.configPath = join(homedir(), '.codex', 'config.json');
+        this.configPath = join(homedir(), '.codex', 'config.toml');
     }
     static getInstance() {
         if (!CodexTool.instance) {
@@ -28,24 +23,17 @@ export class CodexTool extends BaseTool {
         }
         return CodexTool.instance;
     }
-    /**
-     * Ensure config directory exists
-     */
     ensureDir(filePath) {
         const dir = dirname(filePath);
         if (!existsSync(dir)) {
             mkdirSync(dir, { recursive: true });
         }
     }
-    // ==================== ITool 接口实现 ====================
-    /**
-     * Read codex config
-     */
     getConfig() {
         try {
             if (existsSync(this.configPath)) {
                 const content = readFileSync(this.configPath, 'utf-8');
-                return JSON.parse(content);
+                return parse(content);
             }
         }
         catch (error) {
@@ -53,21 +41,15 @@ export class CodexTool extends BaseTool {
         }
         return {};
     }
-    /**
-     * Save codex config
-     */
     saveConfig(config) {
         try {
             this.ensureDir(this.configPath);
-            writeFileSync(this.configPath, JSON.stringify(config, null, 2), 'utf-8');
+            writeFileSync(this.configPath, stringify(config), 'utf-8');
         }
         catch (error) {
             throw new Error(`Failed to save Codex config: ${error}`);
         }
     }
-    /**
-     * Fetch available models from API
-     */
     async fetchAvailableModels(apiKey) {
         try {
             const controller = new AbortController();
@@ -95,48 +77,145 @@ export class CodexTool extends BaseTool {
             return [];
         }
     }
-    /**
-     * Save model config to Codex
-     */
     async saveModelConfig(config) {
         const modelConfig = config;
-        // Read current config (preserve user's other settings)
         const currentConfig = this.getConfig();
-        // Build new config
+        const providerKey = 'x-aio';
         const newConfig = {
             ...currentConfig,
             model: modelConfig.model,
-            provider: {
-                name: 'X-AIO',
-                baseURL: modelConfig.baseUrl || DEFAULT_BASE_URL,
-                apiKey: modelConfig.apiKey,
+            model_provider: providerKey,
+            model_providers: {
+                ...currentConfig.model_providers,
+                [providerKey]: {
+                    name: 'X-AIO',
+                    base_url: modelConfig.baseUrl || DEFAULT_BASE_URL,
+                    env_key: X_AIO_CODE_API_KEY_ENV,
+                    wire_api: 'responses',
+                },
             },
         };
         this.saveConfig(newConfig);
+        this.setApiKeyEnv(modelConfig.apiKey);
+    }
+    setApiKeyEnv(apiKey) {
+        const isWindows = process.platform === 'win32';
+        if (isWindows) {
+            const escapedKey = apiKey.replace(/'/g, '\'\'');
+            const psCommand = `[Environment]::SetEnvironmentVariable('${X_AIO_CODE_API_KEY_ENV}', '${escapedKey}', 'User')`;
+            try {
+                execSync(`powershell -Command "${psCommand}"`, { stdio: 'ignore' });
+            }
+            catch {
+                console.warn('Failed to set Windows environment variable');
+            }
+        }
+        else {
+            const shellRcPath = this.getShellRcPath();
+            if (shellRcPath) {
+                let content = existsSync(shellRcPath) ? readFileSync(shellRcPath, 'utf-8') : '';
+                const exportLine = `export ${X_AIO_CODE_API_KEY_ENV}="${apiKey}"`;
+                const regex = new RegExp(`^export ${X_AIO_CODE_API_KEY_ENV}=.*$`, 'm');
+                if (regex.test(content)) {
+                    content = content.replace(regex, exportLine);
+                }
+                else {
+                    content = content ? `${content}\n${exportLine}\n` : `${exportLine}\n`;
+                }
+                writeFileSync(shellRcPath, content, 'utf-8');
+            }
+        }
+        process.env[X_AIO_CODE_API_KEY_ENV] = apiKey;
+    }
+    getShellRcPath() {
+        const home = homedir();
+        const shell = process.env.SHELL || '';
+        if (shell.includes('zsh')) {
+            const zshrc = join(home, '.zshrc');
+            const zprofile = join(home, '.zprofile');
+            if (existsSync(zshrc))
+                return zshrc;
+            if (existsSync(zprofile))
+                return zprofile;
+            return zshrc;
+        }
+        if (shell.includes('bash')) {
+            const bashrc = join(home, '.bashrc');
+            const bashProfile = join(home, '.bash_profile');
+            if (existsSync(bashrc))
+                return bashrc;
+            if (existsSync(bashProfile))
+                return bashProfile;
+            return bashrc;
+        }
+        return join(home, '.profile');
+    }
+    getEnvValue(envKey) {
+        if (process.env[envKey]) {
+            return process.env[envKey];
+        }
+        if (process.platform === 'win32') {
+            try {
+                const result = execSync(`powershell -Command "[Environment]::GetEnvironmentVariable('${envKey}', 'User')"`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+                if (result && result !== '') {
+                    return result;
+                }
+            }
+            catch {
+                // Ignore errors
+            }
+        }
+        else {
+            try {
+                const shellRcPath = this.getShellRcPath();
+                if (existsSync(shellRcPath)) {
+                    const content = readFileSync(shellRcPath, 'utf-8');
+                    const regex = new RegExp(`^export ${envKey}=["']?([^"'\\n]+)["']?`, 'm');
+                    const match = content.match(regex);
+                    if (match && match[1]) {
+                        return match[1];
+                    }
+                }
+            }
+            catch {
+                // Ignore errors
+            }
+        }
+        return undefined;
     }
-    /**
-     * Get current model config
-     */
     getModelConfig() {
         const config = this.getConfig();
-        if (!config.provider?.apiKey) {
+        const providerKey = config.model_provider;
+        if (!providerKey || !config.model_providers?.[providerKey]) {
+            return null;
+        }
+        const provider = config.model_providers[providerKey];
+        const envKey = provider.env_key;
+        const apiKey = envKey ? this.getEnvValue(envKey) : undefined;
+        if (!apiKey) {
             return null;
         }
         return {
-            apiKey: config.provider.apiKey,
+            apiKey,
             model: config.model || '',
-            baseUrl: config.provider.baseURL || '',
+            baseUrl: provider.base_url || '',
         };
     }
-    /**
-     * Clear model config
-     */
     clearModelConfig() {
         const currentConfig = this.getConfig();
-        delete currentConfig.model;
-        delete currentConfig.provider;
+        const providerKey = 'x-aio';
+        if (currentConfig.model_provider === providerKey) {
+            delete currentConfig.model;
+            delete currentConfig.model_provider;
+        }
+        if (currentConfig.model_providers?.[providerKey]) {
+            delete currentConfig.model_providers[providerKey];
+            if (Object.keys(currentConfig.model_providers).length === 0) {
+                delete currentConfig.model_providers;
+            }
+        }
         this.saveConfig(currentConfig);
+        delete process.env[X_AIO_CODE_API_KEY_ENV];
     }
 }
-// 单例导出
 export const codexTool = CodexTool.getInstance();

package/dist/lib/wizard/menus/tool-menu.js

@@ -358,6 +358,9 @@ export class ToolMenu {
             }
             await new Promise(resolve => setTimeout(resolve, 800));
             spinner.succeed(chalk.green(i18n.t('wizard.config_loaded', { tool: toolRegistry.getTool(toolName)?.displayName })));
+            if (toolName === 'codex' && process.platform === 'win32') {
+                console.log(chalk.yellow(`  ${i18n.t('wizard.restart_terminal_hint')}`));
+            }
             await new Promise(resolve => setTimeout(resolve, 2000));
         }
         catch (error) {

package/dist/locales/en_US.json

@@ -201,7 +201,8 @@
     "prompt_refresh_models": "Refresh model list now? (Update available models to config)",
     "refreshing_models": "Refreshing model list...",
     "models_refreshed": "Model list refreshed, {{count}} models synced",
-    "refresh_models_failed": "Failed to refresh model list"
+    "refresh_models_failed": "Failed to refresh model list",
+    "restart_terminal_hint": "Environment variable set. Please restart your terminal before using Codex"
   },
   "doctor": {
     "checking": "Running health check...",

package/dist/locales/zh_CN.json

@@ -201,7 +201,8 @@
     "prompt_refresh_models": "是否立即刷新模型列表？(更新可用模型到配置)",
     "refreshing_models": "正在刷新模型列表...",
     "models_refreshed": "模型列表已刷新，共同步 {{count}} 个模型",
-    "refresh_models_failed": "刷新模型列表失败"
+    "refresh_models_failed": "刷新模型列表失败",
+    "restart_terminal_hint": "环境变量已设置，请重新打开终端后再使用 Codex"
   },
   "doctor": {
     "checking": "正在进行健康检查...",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x-all-in-one/coding-helper",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "X All In One Coding Helper",
   "author": "X.AIO",
   "homepage": "https://docs.x-aio.com/zh/docs",
@@ -37,6 +37,7 @@
     "js-yaml": "^4.1.0",
     "open": "^11.0.0",
     "ora": "^8.0.1",
+    "smol-toml": "^1.6.0",
     "terminal-link": "^5.0.0"
   },
   "devDependencies": {