autoclaw 1.0.2 → 1.0.4

package/README.md

@@ -43,18 +43,29 @@ npm update -g autoclaw
 
 ## Configuration
 
-AutoClaw uses a global JSON configuration file located at `~/.autoclaw/setting.json`.
-You can also use a local `.env` file in your current directory to override global settings.
+AutoClaw uses a hierarchical configuration system.
 
-Priority order:
-1. Command-line arguments (e.g., `-m`)
-2. Local `.env` file
-3. Global config (`~/.autoclaw/setting.json`)
+**Priority Order (Highest to Lowest):**
+1.  **CLI Arguments**: (e.g., `-m gpt-4o`)
+2.  **Environment Variables**: (`OPENAI_API_KEY`, `.env` file)
+3.  **Project Config**: (`./.autoclaw/setting.json` in current directory)
+4.  **Global Config**: (`~/.autoclaw/setting.json`)
 
-Supported Configuration Keys:
+### Supported Configuration Keys (JSON)
 - `apiKey`: Your API Key.
 - `baseUrl`: Custom Base URL.
-- `model`: Default model to use (default: `gpt-4o`).
+- `model`: Default model to use.
+
+### Project-Level Config (Example)
+Create a file at `.autoclaw/setting.json`:
+```json
+{
+  "model": "gpt-3.5-turbo",
+  "baseUrl": "https://api.example.com/v1"
+}
+```
+
+> **⚠️ Security Warning**: If you store your `apiKey` in `.autoclaw/setting.json`, make sure to add `.autoclaw/` to your `.gitignore` file to prevent leaking secrets!
 
 ## License
 

package/dist/index.js

@@ -7,26 +7,39 @@ import { Agent } from './agent.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-const CONFIG_DIR = path.join(os.homedir(), '.autoclaw');
-const CONFIG_FILE = path.join(CONFIG_DIR, 'setting.json');
-function loadGlobalConfig() {
-    if (fs.existsSync(CONFIG_FILE)) {
+import { fileURLToPath } from 'url';
+const GLOBAL_CONFIG_DIR = path.join(os.homedir(), '.autoclaw');
+const GLOBAL_CONFIG_FILE = path.join(GLOBAL_CONFIG_DIR, 'setting.json');
+const LOCAL_CONFIG_FILE = path.join(process.cwd(), '.autoclaw', 'setting.json');
+function loadJsonConfig(filePath) {
+    if (fs.existsSync(filePath)) {
         try {
-            return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf-8'));
+            return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
         }
         catch (e) {
-            console.error(chalk.red("Error reading global config file."));
+            console.error(chalk.yellow(`Warning: Failed to parse config file at ${filePath}`));
         }
     }
     return {};
 }
 // Load local env vars
 dotenv.config();
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+// In dist/index.js, package.json is usually up one level in the root
+const pkgPath = path.join(__dirname, '..', 'package.json');
+let version = '1.0.2';
+try {
+    const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    version = pkg.version;
+}
+catch (e) {
+    // Fallback if package.json not found in expected location
+}
 const program = new Command();
 program
     .name('autoclaw')
     .description('A lightweight AI agent CLI tool')
-    .version('1.0.1');
+    .version(version);
 program
     .command('setup')
     .description('Run the interactive setup wizard to configure API keys')
@@ -43,8 +56,8 @@ program
 program.parse(process.argv);
 async function runSetup() {
     console.log(chalk.bold.cyan("AutoClaw Setup Wizard 🦞\n"));
-    console.log(chalk.dim(`Config will be saved to: ${CONFIG_FILE}`));
-    const currentConfig = loadGlobalConfig();
+    console.log(chalk.dim(`Config will be saved to: ${GLOBAL_CONFIG_FILE}`));
+    const currentConfig = loadJsonConfig(GLOBAL_CONFIG_FILE);
     const answers = await inquirer.prompt([
         {
             type: 'password',
@@ -73,11 +86,11 @@ async function runSetup() {
         model: answers.model
     };
     try {
-        if (!fs.existsSync(CONFIG_DIR)) {
-            fs.mkdirSync(CONFIG_DIR, { recursive: true });
+        if (!fs.existsSync(GLOBAL_CONFIG_DIR)) {
+            fs.mkdirSync(GLOBAL_CONFIG_DIR, { recursive: true });
         }
-        fs.writeFileSync(CONFIG_FILE, JSON.stringify(newConfig, null, 2), { mode: 0o600 });
-        console.log(chalk.green(`\n✅ Configuration saved to ${CONFIG_FILE}`));
+        fs.writeFileSync(GLOBAL_CONFIG_FILE, JSON.stringify(newConfig, null, 2), { mode: 0o600 });
+        console.log(chalk.green(`\n✅ Configuration saved to ${GLOBAL_CONFIG_FILE}`));
         console.log(chalk.cyan("You can now run 'autoclaw' to start using the agent."));
     }
     catch (error) {
@@ -86,12 +99,17 @@ async function runSetup() {
 }
 async function runChat(options) {
     console.log(chalk.bold.cyan("Welcome to AutoClaw CLI 🦞"));
-    // 1. Load Global (JSON)
-    const globalConfig = loadGlobalConfig();
-    // 2. Resolve final values (Priority: CLI > Env > Global JSON > Default)
-    let apiKey = process.env.OPENAI_API_KEY || globalConfig.apiKey;
-    let baseURL = process.env.OPENAI_BASE_URL || globalConfig.baseUrl;
-    let model = options.model || process.env.OPENAI_MODEL || globalConfig.model || 'gpt-4o';
+    // 1. Load Global JSON
+    const globalConfig = loadJsonConfig(GLOBAL_CONFIG_FILE);
+    // 2. Load Local JSON (Project Level)
+    const localConfig = loadJsonConfig(LOCAL_CONFIG_FILE);
+    if (Object.keys(localConfig).length > 0) {
+        console.log(chalk.dim(`Loaded project config from ${LOCAL_CONFIG_FILE}`));
+    }
+    // 3. Merge: CLI > Env > Local JSON > Global JSON
+    let apiKey = process.env.OPENAI_API_KEY || localConfig.apiKey || globalConfig.apiKey;
+    let baseURL = process.env.OPENAI_BASE_URL || localConfig.baseUrl || globalConfig.baseUrl;
+    let model = options.model || process.env.OPENAI_MODEL || localConfig.model || globalConfig.model || 'gpt-4o';
     if (!apiKey) {
         console.log(chalk.yellow("API Key not found."));
         const { doSetup } = await inquirer.prompt([
@@ -104,7 +122,7 @@ async function runChat(options) {
         ]);
         if (doSetup) {
             await runSetup();
-            const newConfig = loadGlobalConfig();
+            const newConfig = loadJsonConfig(GLOBAL_CONFIG_FILE);
             apiKey = newConfig.apiKey;
             baseURL = newConfig.baseUrl;
             model = options.model || newConfig.model || 'gpt-4o';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autoclaw",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
@@ -33,7 +33,7 @@
   "dependencies": {
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
-    "dotenv": "^17.2.4",
+    "dotenv": "^16.4.7",
     "inquirer": "^13.2.2",
     "openai": "^6.18.0",
     "ora": "^9.3.0"