@arcadialdev/arcality 2.4.23 → 2.4.25

package/src/configLoader.mjs

@@ -1,185 +1,179 @@
-// src/configLoader.mjs
-// Configuration loader — supports arcality.config (primary) and .env / global config (fallback)
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import dotenv from 'dotenv';
-
-dotenv.config();
-
-export const CONFIG_DIR = path.join(os.homedir(), '.arcality');
-export const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
-
-/**
- * Returns the internal API URL for the Arcality backend.
- * This is loaded exclusively from the tool's .env file (via dotenv).
- * It is NOT configurable by the user, CLI flags, or arcality.config.
- * To change it, modify the ARCALITY_API_URL variable in the tool's .env.
- * @returns {string}
- */
-export function getApiUrl() {
-    return process.env.ARCALITY_API_URL || 'https://arcalityqadev.arcadial.lat';
-}
-
-/**
- * Loads the local arcality.config file from cwd (if it exists).
- * @returns {object|null}
- */
-function loadLocalArcalityConfig() {
-    try {
-        const configPath = path.join(process.cwd(), 'arcality.config');
-        if (fs.existsSync(configPath)) {
-            let raw = fs.readFileSync(configPath, 'utf8');
-            if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
-            return JSON.parse(raw);
-        }
-    } catch { }
-    return null;
-}
-
-/**
- * Loads configuration from multiple sources:
- *   1. arcality.config (local project config — highest priority)
- *   2. .env (environment variables)
- *   3. ~/.arcality/config.json (global config)
- * 
- * NOTE: ARCALITY_API_URL is NOT included here — use getApiUrl() instead.
- * 
- * @returns {{
- *   ARCALITY_API_KEY: string,
- *   ARCALITY_PROJECT_ID?: string
- * }}
- */
-export function loadConfig() {
-    const localConfig = loadLocalArcalityConfig();
-    const globalConfig = loadGlobalConfig();
-
-    const config = {
-        ARCALITY_API_KEY: localConfig?.apiKey || process.env.ARCALITY_API_KEY || globalConfig?.api_key,
-        ARCALITY_PROJECT_ID: localConfig?.projectId || process.env.ARCALITY_PROJECT_ID,
-    };
-
-    if (!config.ARCALITY_API_KEY) {
-        throw new Error('ARCALITY_API_KEY is not defined. Run `arcality init` or set it in your .env file.');
-    }
-
-    return config;
-}
-
-
-/**
- * Reads the user's global config (~/.arcality/config.json)
- * @returns {{ api_key?: string, install_dir?: string, version?: string } | null}
- */
-export function loadGlobalConfig() {
-    try {
-        if (fs.existsSync(CONFIG_FILE)) {
-            let raw = fs.readFileSync(CONFIG_FILE, 'utf8');
-            // Strip BOM that PowerShell adds with -Encoding UTF8
-            if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
-            return JSON.parse(raw);
-        }
-    } catch { }
-    return null;
-}
-
-/**
- * Saves/updates the user's global config
- * @param {object} updates - Fields to update
- */
-export function saveGlobalConfig(updates) {
-    try {
-        if (!fs.existsSync(CONFIG_DIR)) {
-            fs.mkdirSync(CONFIG_DIR, { recursive: true });
-        }
-        const existing = loadGlobalConfig() || {};
-        const merged = { ...existing, ...updates };
-        fs.writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2), 'utf8');
-        return true;
-    } catch {
-        return false;
-    }
-}
-
-/**
- * Gets the API Key (priority: arcality.config > env var > global config)
- * @returns {{ key: string | null, source: 'config' | 'env' | 'global' | 'none' }}
- */
-export function getApiKey() {
-    // 1. Local arcality.config
-    const localConfig = loadLocalArcalityConfig();
-    if (localConfig?.apiKey) {
-        process.env.ARCALITY_API_KEY = localConfig.apiKey;
-        return { key: localConfig.apiKey, source: 'config' };
-    }
-
-    // 2. Environment variable (.env or shell)
-    if (process.env.ARCALITY_API_KEY) {
-        return { key: process.env.ARCALITY_API_KEY, source: 'env' };
-    }
-
-    // 3. Global config ~/.arcality/config.json
-    const globalCfg = loadGlobalConfig();
-    if (globalCfg?.api_key) {
-        process.env.ARCALITY_API_KEY = globalCfg.api_key;
-        return { key: globalCfg.api_key, source: 'global' };
-    }
-
-    return { key: null, source: 'none' };
-}
-
-/**
- * Loads additional secrets (like Anthropic) from global config
- */
-export function setupProcessEnv() {
-    const config = loadGlobalConfig();
-    if (!config) return;
-
-    // Load Arcality API Key
-    getApiKey();
-
-    // Load Anthropic API Key if not already in env
-    if (config.anthropic_api_key && !process.env.ANTHROPIC_API_KEY) {
-        process.env.ANTHROPIC_API_KEY = config.anthropic_api_key;
-    }
-
-    // Load default model if exists
-    if (config.model && !process.env.CLAUDE_MODEL) {
-        process.env.CLAUDE_MODEL = config.model;
-    }
-
-    // Also inject arcality.config values into process.env for backward compat
-    const localConfig = loadLocalArcalityConfig();
-    if (localConfig) {
-        if (localConfig.apiKey && !process.env.ARCALITY_API_KEY) {
-            process.env.ARCALITY_API_KEY = localConfig.apiKey;
-        }
-        if (localConfig.projectId && !process.env.ARCALITY_PROJECT_ID) {
-            process.env.ARCALITY_PROJECT_ID = localConfig.projectId;
-        }
-        if (localConfig.project?.baseUrl && !process.env.BASE_URL) {
-            process.env.BASE_URL = localConfig.project.baseUrl;
-        }
-        if (localConfig.auth?.username && !process.env.LOGIN_USER) {
-            process.env.LOGIN_USER = localConfig.auth.username;
-        }
-        if (localConfig.auth?.password && !process.env.LOGIN_PASSWORD) {
-            process.env.LOGIN_PASSWORD = localConfig.auth.password;
-        }
-    }
-    // SIEMPRE garantizar que la URL interna de la API esté en process.env.
-    // Esta URL es interna de la herramienta, no configurable por el usuario.
-    // Proviene del .env de la librería o usa el valor por defecto.
-    if (!process.env.ARCALITY_API_URL) {
-        process.env.ARCALITY_API_URL = 'https://arcalityqadev.arcadial.lat';
-    }
-}
-
-/**
- * Visual mask of API Key for banner display
- * "arc_k_live_abc123xyz" → "arc_k_****xyz"
- */
-export function maskApiKey(key) {
-    if (!key || key.length < 8) return '***';
-    return key.slice(0, 6) + '****' + key.slice(-4);
-}
+// src/configLoader.mjs
+// Configuration loader — supports arcality.config (primary) and .env / global config (fallback)
+import fs from 'node:fs';
+import path from 'node:path';
+import os from 'node:os';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+export const CONFIG_DIR = path.join(os.homedir(), '.arcality');
+export const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
+
+/**
+ * Returns the internal API URL for the Arcality backend.
+ * This is loaded exclusively from the tool's .env file (via dotenv).
+ * It is NOT configurable by the user, CLI flags, or arcality.config.
+ * To change it, modify the ARCALITY_API_URL variable in the tool's .env.
+ * @returns {string}
+ */
+export function getApiUrl() {
+    return process.env.ARCALITY_API_URL || 'https://arcalityqadev.arcadial.lat';
+}
+
+/**
+ * Loads the local arcality.config file from cwd (if it exists).
+ * @returns {object|null}
+ */
+function loadLocalArcalityConfig() {
+    try {
+        const configPath = path.join(process.cwd(), 'arcality.config');
+        if (fs.existsSync(configPath)) {
+            let raw = fs.readFileSync(configPath, 'utf8');
+            if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
+            return JSON.parse(raw);
+        }
+    } catch { }
+    return null;
+}
+
+/**
+ * Loads configuration from multiple sources:
+ *   1. arcality.config (local project config — highest priority)
+ *   2. .env (environment variables)
+ *   3. ~/.arcality/config.json (global config)
+ * 
+ * NOTE: ARCALITY_API_URL is NOT included here — use getApiUrl() instead.
+ * 
+ * @returns {{
+ *   ARCALITY_API_KEY: string,
+ *   ARCALITY_PROJECT_ID?: string
+ * }}
+ */
+export function loadConfig() {
+    const localConfig = loadLocalArcalityConfig();
+
+    const config = {
+        ARCALITY_API_KEY: localConfig?.apiKey || process.env.ARCALITY_API_KEY,
+        ARCALITY_PROJECT_ID: localConfig?.projectId || process.env.ARCALITY_PROJECT_ID,
+    };
+
+    if (!config.ARCALITY_API_KEY) {
+        throw new Error('ARCALITY_API_KEY is not defined. Run `arcality init` or set it in your .env file.');
+    }
+
+    return config;
+}
+
+
+/**
+ * Reads the user's global config (~/.arcality/config.json)
+ * @returns {{ api_key?: string, install_dir?: string, version?: string } | null}
+ */
+export function loadGlobalConfig() {
+    try {
+        if (fs.existsSync(CONFIG_FILE)) {
+            let raw = fs.readFileSync(CONFIG_FILE, 'utf8');
+            // Strip BOM that PowerShell adds with -Encoding UTF8
+            if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
+            return JSON.parse(raw);
+        }
+    } catch { }
+    return null;
+}
+
+/**
+ * Saves/updates the user's global config
+ * @param {object} updates - Fields to update
+ */
+export function saveGlobalConfig(updates) {
+    try {
+        if (!fs.existsSync(CONFIG_DIR)) {
+            fs.mkdirSync(CONFIG_DIR, { recursive: true });
+        }
+        const existing = loadGlobalConfig() || {};
+        const merged = { ...existing, ...updates };
+        fs.writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2), 'utf8');
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+/**
+ * Gets the API Key (priority: arcality.config > env var > global config)
+ * @returns {{ key: string | null, source: 'config' | 'env' | 'global' | 'none' }}
+ */
+export function getApiKey() {
+    // 1. Local arcality.config
+    const localConfig = loadLocalArcalityConfig();
+    if (localConfig?.apiKey) {
+        process.env.ARCALITY_API_KEY = localConfig.apiKey;
+        return { key: localConfig.apiKey, source: 'config' };
+    }
+
+    // 2. Environment variable (.env or shell)
+    if (process.env.ARCALITY_API_KEY) {
+        return { key: process.env.ARCALITY_API_KEY, source: 'env' };
+    }
+
+    // Global config fallback removed strictly per project requirements
+
+    return { key: null, source: 'none' };
+}
+
+/**
+ * Loads additional secrets (like Anthropic) from global config
+ */
+export function setupProcessEnv() {
+    const config = loadGlobalConfig();
+    if (!config) return;
+
+    // Load Arcality API Key
+    getApiKey();
+
+    // Load Anthropic API Key if not already in env
+    if (config.anthropic_api_key && !process.env.ANTHROPIC_API_KEY) {
+        process.env.ANTHROPIC_API_KEY = config.anthropic_api_key;
+    }
+
+    // Load default model if exists
+    if (config.model && !process.env.CLAUDE_MODEL) {
+        process.env.CLAUDE_MODEL = config.model;
+    }
+
+    // Also inject arcality.config values into process.env for backward compat
+    const localConfig = loadLocalArcalityConfig();
+    if (localConfig) {
+        if (localConfig.apiKey && !process.env.ARCALITY_API_KEY) {
+            process.env.ARCALITY_API_KEY = localConfig.apiKey;
+        }
+        if (localConfig.projectId && !process.env.ARCALITY_PROJECT_ID) {
+            process.env.ARCALITY_PROJECT_ID = localConfig.projectId;
+        }
+        if (localConfig.project?.baseUrl && !process.env.BASE_URL) {
+            process.env.BASE_URL = localConfig.project.baseUrl;
+        }
+        if (localConfig.auth?.username && !process.env.LOGIN_USER) {
+            process.env.LOGIN_USER = localConfig.auth.username;
+        }
+        if (localConfig.auth?.password && !process.env.LOGIN_PASSWORD) {
+            process.env.LOGIN_PASSWORD = localConfig.auth.password;
+        }
+    }
+    // SIEMPRE garantizar que la URL interna de la API esté en process.env.
+    // Esta URL es interna de la herramienta, no configurable por el usuario.
+    // Proviene del .env de la librería o usa el valor por defecto.
+    if (!process.env.ARCALITY_API_URL) {
+        process.env.ARCALITY_API_URL = 'https://arcalityqadev.arcadial.lat';
+    }
+}
+
+/**
+ * Visual mask of API Key for banner display
+ * "arc_k_live_abc123xyz" → "arc_k_****xyz"
+ */
+export function maskApiKey(key) {
+    if (!key || key.length < 8) return '***';
+    return key.slice(0, 6) + '****' + key.slice(-4);
+}