autoclaw 1.3.1 → 1.3.2

package/README.md

@@ -78,7 +78,7 @@ npm install -g autoclaw
 
 ## Quick Start
 
-1.  **Setup**: Run the interactive setup wizard to configure your API keys and integrations.
+1.  **Setup**: Run the interactive setup wizard to configure your API keys and integrations. The wizard runs a live connection test (failures map to the likely wrong field: 401 = key, 404 = base URL, 400 = model name) and can list the provider's models for you to pick from.
     ```bash
     autoclaw setup
     ```

package/README.zh-CN.md

@@ -79,7 +79,7 @@ npm install -g autoclaw
 
 ## 快速上手
 
-1.  **配置**: 运行交互式设置向导以配置您的 API 密钥和集成插件。
+1.  **配置**: 运行交互式设置向导以配置您的 API 密钥和集成插件。向导会现场做连接测试(失败映射到最可能出错的字段:401=key 错、404=URL 错、400=模型名错),并能拉取服务商的模型列表供你直接选择。
     ```bash
     autoclaw setup
     ```

package/dist/index.js

@@ -6,6 +6,7 @@ import dotenv from 'dotenv';
 import { Agent } from './agent.js';
 import { parseManifest, runBatch } from './batch.js';
 import { PROVIDER_PRESETS, providerNames, resolveProvider } from './providers.js';
+import { fetchModelIds, normalizeBaseUrl, testConnection } from './setup.js';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -44,7 +45,7 @@ dotenv.config({ path: GLOBAL_ENV_FILE });
 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.3.1';
+let version = '1.3.2';
 try {
     const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
     version = pkg.version;
@@ -109,7 +110,7 @@ async function runSetup(options = {}) {
     }
     const providerAnswer = await inquirer.prompt([
         {
-            type: 'list',
+            type: 'select',
             name: 'provider',
             message: 'Select your LLM provider:',
             choices: [
@@ -121,34 +122,101 @@ async function runSetup(options = {}) {
     ]);
     const provider = providerAnswer.provider;
     const preset = resolveProvider(provider === 'custom' ? undefined : provider);
-    const answers = await inquirer.prompt([
-        {
-            type: 'password',
-            name: 'apiKey',
-            message: currentConfig.apiKey
-                ? `Enter OpenAI API Key (Leave empty to keep ${maskSecret(currentConfig.apiKey)}):`
-                : 'Enter OpenAI API Key:',
-            mask: '*',
-            validate: (input) => {
-                if (input.length > 0)
-                    return true;
-                if (currentConfig.apiKey)
-                    return true;
-                return 'API Key cannot be empty.';
+    // The connection part (key / Base URL / model) is asked in a loop with a
+    // live test, so typos never make it into the saved config.
+    const askConnection = async () => {
+        const defaults = {
+            apiKey: currentConfig.apiKey,
+            baseUrl: currentConfig.baseUrl || preset?.baseUrl || 'https://api.openai.com/v1',
+            model: currentConfig.model || preset?.defaultModel || 'gpt-5.6'
+        };
+        const core = await inquirer.prompt([
+            {
+                type: 'password',
+                name: 'apiKey',
+                message: defaults.apiKey
+                    ? `Enter API Key (Leave empty to keep ${maskSecret(defaults.apiKey)}):`
+                    : `Enter API Key${preset?.apiKeyEnv ? ` (or set ${preset.apiKeyEnv} in your environment)` : ''}:`,
+                mask: '*',
+                validate: (input) => {
+                    if (input.length > 0)
+                        return true;
+                    if (defaults.apiKey)
+                        return true;
+                    return 'API Key cannot be empty.';
+                }
+            },
+            {
+                type: 'input',
+                name: 'baseUrl',
+                message: 'Enter API Base URL:',
+                default: defaults.baseUrl
             }
-        },
-        {
-            type: 'input',
-            name: 'baseUrl',
-            message: 'Enter API Base URL:',
-            default: currentConfig.baseUrl || preset?.baseUrl || 'https://api.openai.com/v1'
-        },
-        {
-            type: 'input',
-            name: 'model',
-            message: 'Enter default Model:',
-            default: currentConfig.model || preset?.defaultModel || 'gpt-5.6'
-        },
+        ]);
+        const apiKey = core.apiKey || defaults.apiKey || '';
+        const baseUrl = normalizeBaseUrl(core.baseUrl || defaults.baseUrl);
+        // Prefer the provider's own catalog over guessing model names.
+        console.log(chalk.dim('Fetching available models...'));
+        const ids = await fetchModelIds(baseUrl, apiKey);
+        let model;
+        if (ids) {
+            console.log(chalk.dim(`Found ${ids.length} models.`));
+            const picked = await inquirer.prompt([
+                {
+                    type: 'select',
+                    name: 'model',
+                    message: 'Select default Model:',
+                    choices: [{ name: '✎ Enter manually', value: '__manual__' }, ...ids.map(id => ({ name: id, value: id }))],
+                    default: ids.includes(defaults.model) ? defaults.model : undefined,
+                    pageSize: 12
+                }
+            ]);
+            if (picked.model === '__manual__') {
+                const manual = await inquirer.prompt([
+                    { type: 'input', name: 'model', message: 'Enter default Model:', default: defaults.model }
+                ]);
+                model = manual.model;
+            }
+            else {
+                model = picked.model;
+            }
+        }
+        else {
+            const manual = await inquirer.prompt([
+                { type: 'input', name: 'model', message: 'Enter default Model (catalog unavailable):', default: defaults.model }
+            ]);
+            model = manual.model;
+        }
+        return { apiKey, baseUrl, model };
+    };
+    let connection = await askConnection();
+    console.log(chalk.dim('Running connection test (sends one tiny prompt — normal provider billing applies)...'));
+    let test = await testConnection(connection.baseUrl, connection.apiKey, connection.model);
+    while (!test.ok) {
+        console.log(chalk.red(`\n✗ ${test.message}`));
+        const next = await inquirer.prompt([
+            {
+                type: 'select',
+                name: 'action',
+                message: 'Connection test failed. What next?',
+                choices: [
+                    { name: 'Re-enter API key / Base URL / model', value: 'edit' },
+                    { name: 'Test again', value: 'retry' },
+                    { name: 'Save anyway (e.g. the provider is temporarily down)', value: 'save' }
+                ],
+                default: 'edit'
+            }
+        ]);
+        if (next.action === 'save')
+            break;
+        if (next.action === 'edit')
+            connection = await askConnection();
+        console.log(chalk.dim('Running connection test...'));
+        test = await testConnection(connection.baseUrl, connection.apiKey, connection.model);
+    }
+    if (test.ok)
+        console.log(chalk.green('✓ Connection test passed.'));
+    const answers = await inquirer.prompt([
         {
             type: 'confirm',
             name: 'configureImage',
@@ -183,7 +251,7 @@ async function runSetup(options = {}) {
         }
     ]);
     // Resolve sensitive values (Keep old if empty)
-    const finalApiKey = answers.apiKey || currentConfig.apiKey;
+    const finalApiKey = connection.apiKey || currentConfig.apiKey;
     let imageConfig = {
         imageApiKey: currentConfig.imageApiKey,
         imageBaseUrl: currentConfig.imageBaseUrl,
@@ -346,8 +414,8 @@ async function runSetup(options = {}) {
     }
     const newConfig = {
         apiKey: finalApiKey,
-        baseUrl: answers.baseUrl,
-        model: answers.model,
+        baseUrl: connection.baseUrl,
+        model: connection.model,
         provider: provider === 'custom' ? undefined : provider,
         ...imageConfig,
         ...emailConfig,
@@ -360,6 +428,8 @@ async function runSetup(options = {}) {
         }
         fs.writeFileSync(targetFile, JSON.stringify(newConfig, null, 2), { mode: 0o600 });
         console.log(chalk.green(`\n✅ Configuration saved to ${targetFile}`));
+        console.log(chalk.dim(`   provider: ${provider === 'custom' ? 'custom' : provider}  |  baseUrl: ${connection.baseUrl}  |  model: ${connection.model}`));
+        console.log(chalk.dim(`   connection test: ${test.ok ? 'passed ✓' : 'skipped (saved without a passing test)'}`));
         console.log(chalk.cyan("You can now run 'autoclaw' to start using the agent."));
     }
     catch (error) {

package/dist/setup.js

@@ -0,0 +1,61 @@
+// Pure helpers behind the setup wizard: URL normalization, a live
+// connection test with actionable error mapping, and provider model
+// catalog fetching. Kept free of inquirer so they are unit-testable.
+export function normalizeBaseUrl(url) {
+    let u = String(url ?? '').trim();
+    if (u && !/^https?:\/\//i.test(u))
+        u = `https://${u}`;
+    return u.replace(/\/+$/, '');
+}
+// Sends one tiny real prompt through the exact endpoint the user
+// configured, and maps failures to the field that is most likely wrong.
+export async function testConnection(baseUrl, apiKey, model) {
+    const url = `${normalizeBaseUrl(baseUrl)}/chat/completions`;
+    let resp;
+    try {
+        resp = await fetch(url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
+            body: JSON.stringify({ model, messages: [{ role: 'user', content: 'ping' }], stream: false }),
+            signal: AbortSignal.timeout(15000)
+        });
+    }
+    catch (err) {
+        return { ok: false, kind: 'network', message: `Cannot reach ${url} (${err?.message ?? err}). Check the Base URL and your network.` };
+    }
+    if (resp.ok) {
+        return { ok: true, kind: 'ok', message: `Connection OK — ${model} responded.` };
+    }
+    const detail = (await resp.text().catch(() => '')).slice(0, 300);
+    if (resp.status === 401 || resp.status === 403) {
+        return { ok: false, kind: 'auth', message: `API key rejected (${resp.status}). Double-check the key. ${detail}` };
+    }
+    if (resp.status === 404) {
+        return { ok: false, kind: 'not-found', message: `Endpoint not found (404). The Base URL is likely wrong. ${detail}` };
+    }
+    if (resp.status === 400) {
+        return { ok: false, kind: 'model', message: `Request rejected (400). The model name "${model}" is likely wrong for this endpoint. ${detail}` };
+    }
+    return { ok: false, kind: 'server', message: `Provider returned ${resp.status}. ${detail}` };
+}
+// Returns the provider's model IDs (sorted) or null when the endpoint does
+// not offer a catalog — the wizard then falls back to manual entry.
+export async function fetchModelIds(baseUrl, apiKey) {
+    try {
+        const resp = await fetch(`${normalizeBaseUrl(baseUrl)}/models`, {
+            headers: apiKey ? { Authorization: `Bearer ${apiKey}` } : {},
+            signal: AbortSignal.timeout(15000)
+        });
+        if (!resp.ok)
+            return null;
+        const data = await resp.json();
+        const ids = (Array.isArray(data?.data) ? data.data : [])
+            .map((m) => m?.id)
+            .filter((id) => typeof id === 'string' && id.length > 0);
+        ids.sort();
+        return ids.length > 0 ? ids : null;
+    }
+    catch {
+        return null;
+    }
+}

package/dist/tools/core.js

@@ -5,6 +5,9 @@ import chalk from 'chalk';
 import { execShellCommand } from '../shell.js';
 const DEFAULT_SHELL_TIMEOUT_MS = 120000;
 const SHELL_MAX_BUFFER = 10 * 1024 * 1024;
+// Bounded reads keep a huge file from exhausting memory or the model context;
+// the agent-level truncation in truncate.ts applies on top of this.
+const READ_FILE_MAX_BYTES = 1024 * 1024;
 export const ShellTool = {
     name: "Shell Execution",
     definition: {
@@ -78,13 +81,30 @@ export const ReadFileTool = {
         }
     },
     handler: async (args) => {
+        let fh;
         try {
-            const content = await fs.readFile(args.path, 'utf-8');
+            fh = await fs.open(args.path, 'r');
+            const buf = Buffer.alloc(READ_FILE_MAX_BYTES);
+            const { bytesRead } = await fh.read(buf, 0, READ_FILE_MAX_BYTES, 0);
+            const slice = buf.subarray(0, bytesRead);
+            // NUL bytes are the reliable tell for binary content; returning them
+            // as "utf-8" would only hand the model mojibake.
+            if (slice.includes(0)) {
+                return `Error: ${args.path} looks like a binary file (${bytesRead} bytes read). Inspect it with execute_shell_command instead (e.g. strings, xxd, file).`;
+            }
+            const content = slice.toString('utf-8');
+            if (bytesRead === READ_FILE_MAX_BYTES) {
+                const { size } = await fh.stat();
+                return `${content}\n[AutoClaw] File truncated at ${READ_FILE_MAX_BYTES} bytes (file is ${size} bytes). Use execute_shell_command to read specific ranges.`;
+            }
             return content;
         }
         catch (error) {
             return `Error reading file: ${error.message}`;
         }
+        finally {
+            await fh?.close();
+        }
     }
 };
 export const WriteFileTool = {

package/dist/tools/email.js

@@ -34,6 +34,9 @@ export const EmailTool = {
                 host: config.smtpHost,
                 port: parseInt(config.smtpPort || '587'),
                 secure: parseInt(config.smtpPort) === 465, // true for 465, false for other ports
+                connectionTimeout: 30000,
+                greetingTimeout: 30000,
+                socketTimeout: 120000,
                 auth: {
                     user: config.smtpUser,
                     pass: config.smtpPass,

package/dist/tools/image.js

@@ -64,7 +64,7 @@ const toolDefinition = {
     }
 };
 async function downloadImage(url, destPath) {
-    const response = await fetch(url);
+    const response = await fetch(url, { signal: AbortSignal.timeout(120000) });
     if (!response.ok)
         throw new Error(`Failed to download image: ${response.statusText}`);
     const buffer = await response.arrayBuffer();

package/dist/tools/notify.js

@@ -80,7 +80,8 @@ export const NotifyTool = {
             const response = await fetch(webhookUrl, {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
-                body: JSON.stringify(payload)
+                body: JSON.stringify(payload),
+                signal: AbortSignal.timeout(30000)
             });
             const result = await response.json();
             // Platform specific success checks

package/dist/tools/search.js

@@ -42,7 +42,8 @@ export const SearchTool = {
                     include_answer: true,
                     include_images: false,
                     max_results: 5
-                })
+                }),
+                signal: AbortSignal.timeout(30000)
             });
             if (!response.ok) {
                 const errText = await response.text();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autoclaw",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "type": "module",
   "main": "dist/index.js",
   "bin": {