evolclaw 2.2.0 → 2.3.0

package/dist/{core/ipc-server.js → ipc.js}

@@ -1,6 +1,6 @@
 import net from 'net';
 import fs from 'fs';
-import { logger } from '../utils/logger.js';
+import { logger } from './utils/logger.js';
 export class IpcServer {
     socketPath;
     getStatus;
@@ -69,3 +69,38 @@ export class IpcServer {
         }
     }
 }
+/**
+ * Query the running EvolClaw daemon via Unix socket.
+ * Returns null if the service is not running or the socket is unreachable.
+ */
+export function ipcQuery(socketPath, cmd, timeoutMs = 3000) {
+    return new Promise((resolve) => {
+        const conn = net.connect(socketPath);
+        let buf = '';
+        const timer = setTimeout(() => {
+            conn.destroy();
+            resolve(null);
+        }, timeoutMs);
+        conn.on('connect', () => {
+            conn.write(JSON.stringify(cmd) + '\n');
+        });
+        conn.on('data', (data) => {
+            buf += data.toString();
+            const idx = buf.indexOf('\n');
+            if (idx !== -1) {
+                clearTimeout(timer);
+                try {
+                    resolve(JSON.parse(buf.slice(0, idx)));
+                }
+                catch {
+                    resolve(null);
+                }
+                conn.destroy();
+            }
+        });
+        conn.on('error', () => {
+            clearTimeout(timer);
+            resolve(null);
+        });
+    });
+}

package/dist/types.js

@@ -1 +1,4 @@
+// ── Channel config types ──
+// Single-object form: `name` is optional (defaults to channel type name).
+// Array form: `name` is required to distinguish instances.
 export {};

package/dist/utils/cross-platform.js

@@ -78,15 +78,52 @@ export function getProcessInfo(pid) {
             }
         }
         else {
-            const uptime = execFileSync('ps', ['-p', String(pid), '-o', 'etime='], { encoding: 'utf-8' }).trim();
+            const etimes = execFileSync('ps', ['-p', String(pid), '-o', 'etimes='], { encoding: 'utf-8' }).trim();
             const cpu = execFileSync('ps', ['-p', String(pid), '-o', '%cpu='], { encoding: 'utf-8' }).trim();
             const mem = execFileSync('ps', ['-p', String(pid), '-o', 'rss='], { encoding: 'utf-8' }).trim();
+            const uptime = formatUptime(parseInt(etimes, 10));
             return { uptime, cpu, memory: mem };
         }
     }
     catch { }
     return {};
 }
+function formatUptime(totalSeconds) {
+    if (isNaN(totalSeconds) || totalSeconds < 0)
+        return 'unknown';
+    const days = Math.floor(totalSeconds / 86400);
+    const hours = Math.floor((totalSeconds % 86400) / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
+    const seconds = totalSeconds % 60;
+    const parts = [];
+    if (days > 0)
+        parts.push(`${days}d`);
+    if (hours > 0)
+        parts.push(`${hours}h`);
+    if (minutes > 0)
+        parts.push(`${minutes}m`);
+    if (parts.length === 0)
+        parts.push(`${seconds}s`);
+    return parts.join(' ');
+}
+/**
+ * Read a specific environment variable from a running process.
+ * Returns undefined if the process doesn't exist or the variable is not set.
+ * Linux: reads /proc/<pid>/environ; Windows: not supported (returns undefined).
+ */
+export function getProcessEnv(pid, varName) {
+    if (isWindows)
+        return undefined;
+    try {
+        const environ = fs.readFileSync(`/proc/${pid}/environ`, 'utf-8');
+        const prefix = `${varName}=`;
+        const entry = environ.split('\0').find(e => e.startsWith(prefix));
+        return entry ? entry.slice(prefix.length) : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * Cross-platform command existence check.
  */

package/dist/utils/error-utils.js

@@ -2,11 +2,66 @@ export var ErrorType;
 (function (ErrorType) {
     ErrorType["SDK_TIMEOUT"] = "sdk_timeout";
     ErrorType["API_ERROR"] = "api_error";
+    ErrorType["AUTH_ERROR"] = "auth_error";
     ErrorType["FILE_CORRUPT"] = "file_corrupt";
     ErrorType["STREAM_ERROR"] = "stream_error";
     ErrorType["CONTEXT_TOO_LONG"] = "context_too_long";
     ErrorType["UNKNOWN"] = "unknown";
 })(ErrorType || (ErrorType = {}));
+/**
+ * 错误来源前缀 — 区分基础设施异常 vs Agent 任务失败
+ *
+ * infra:  基础设施级（SDK 崩溃、API 不可用、文件损坏）— 应累计安全模式
+ * agent:  Agent 任务级（权限拒绝、max turns、工具失败）— 仅统计，不累计安全模式
+ */
+export const ERROR_PREFIX = {
+    INFRA: 'infra',
+    AGENT: 'agent',
+};
+/**
+ * 判断 Agent complete.subtype 是否属于系统级故障（应累计安全模式）
+ *
+ * 非系统级（用户操作或任务边界）：
+ * - end_turn / max_turns: Agent 正常结束或达到轮次上限
+ * - permission_denied: 用户主动拒绝权限
+ * - stop: 用户主动停止
+ *
+ * 系统级（SDK/模型/平台故障）：
+ * - error_model / error_tool_use / error_api 等：基础设施异常
+ * - 未知 subtype：保守地视为系统级
+ *
+ * terminalReason 提供更精确的判断（SDK 0.2.100+）：
+ * - rapid_refill_breaker: API 限流，不是代码问题
+ * - tool_deferred: 工具延迟，不是错误
+ * - stop_hook_prevented: Stop hook 阻止，不是错误
+ * - aborted_streaming / aborted_tools: 中断，已有中断处理逻辑
+ */
+const NON_INFRA_SUBTYPES = new Set([
+    'end_turn',
+    'max_turns',
+    'permission_denied',
+    'stop',
+]);
+const NON_INFRA_TERMINAL_REASONS = new Set([
+    'rapid_refill_breaker',
+    'tool_deferred',
+    'stop_hook_prevented',
+    'aborted_streaming',
+    'aborted_tools',
+]);
+export function isInfraError(subtype, terminalReason) {
+    // terminalReason 优先级更高（更精确）
+    if (terminalReason && NON_INFRA_TERMINAL_REASONS.has(terminalReason)) {
+        return false;
+    }
+    if (!subtype)
+        return true; // 未知 subtype，保守视为系统级
+    return !NON_INFRA_SUBTYPES.has(subtype);
+}
+/** 为 errorType 添加来源前缀 */
+export function prefixErrorType(prefix, errorType) {
+    return `${prefix}:${errorType}`;
+}
 export function classifyError(error) {
     const msg = (error?.message || '').toLowerCase();
     if (msg.includes('上下文过长') || msg.includes('context too long')
@@ -14,12 +69,21 @@ export function classifyError(error) {
         || msg.includes('prompt is too long') || msg.includes('context limit')) {
         return ErrorType.CONTEXT_TOO_LONG;
     }
+    // 认证错误（401 / Invalid API Key / key_not_found）— 不可恢复，不应触发安全模式
+    if (msg.includes('401') || msg.includes('invalid api key') || msg.includes('key_not_found')
+        || msg.includes('authentication_error') || msg.includes('failed to authenticate')) {
+        return ErrorType.AUTH_ERROR;
+    }
     if (msg.includes('timeout') || msg.includes('etimedout')) {
         return ErrorType.SDK_TIMEOUT;
     }
     if (msg.includes('5') && (msg.includes('00') || msg.includes('02') || msg.includes('03') || msg.includes('04'))) {
         return ErrorType.API_ERROR;
     }
+    // "X is not valid JSON" — API 返回了非 JSON 响应（如算力池切换提示），属于 API 错误
+    if (msg.includes('is not valid json')) {
+        return ErrorType.API_ERROR;
+    }
     if (msg.includes('enoent') || msg.includes('corrupt') || msg.includes('invalid json')) {
         return ErrorType.FILE_CORRUPT;
     }
@@ -28,7 +92,61 @@ export function classifyError(error) {
     }
     return ErrorType.UNKNOWN;
 }
-export function getErrorMessage(error) {
+/**
+ * 判断错误是否可重试（暂时性 API 错误）
+ * 403 算力池切换、429 限流、5xx 服务端错误
+ * 注意：401 认证错误不可重试（API Key 无效不会因重试恢复）
+ */
+export function isRetryableError(error) {
+    const msg = error?.message || String(error);
+    const lower = msg.toLowerCase();
+    // 认证错误不可重试：重试不会恢复无效/缺失凭据
+    if (lower.includes('401')
+        || lower.includes('invalid api key')
+        || lower.includes('key_not_found')
+        || lower.includes('authentication_error')
+        || lower.includes('failed to authenticate')
+        || (lower.includes('api error: 403') && (lower.includes('auth') || lower.includes('key') || lower.includes('token')))) {
+        return false;
+    }
+    if (msg.includes('API Error: 403'))
+        return true;
+    if (msg.includes('API Error: 429'))
+        return true;
+    if (msg.includes('API Error: 500'))
+        return true;
+    if (msg.includes('API Error: 502'))
+        return true;
+    if (msg.includes('API Error: 503'))
+        return true;
+    if (msg.includes('API Error: 504'))
+        return true;
+    return false;
+}
+export function getErrorMessage(error, terminalReason) {
+    // terminalReason 提供更精确的错误提示（SDK 0.2.100+）
+    if (terminalReason) {
+        switch (terminalReason) {
+            case 'max_turns':
+                return '❌ 任务达到最大轮次限制，请简化需求或分步执行';
+            case 'prompt_too_long':
+                return '⚠️ 输入过长，请精简提问或使用 /compact 压缩上下文';
+            case 'rapid_refill_breaker':
+                return '⚠️ API 限流中，请稍后重试';
+            case 'context_compact_failed':
+                return '⚠️ 上下文过长，自动压缩失败，请手动输入 /compact 重试';
+            case 'model_error':
+                return '❌ 模型服务异常，请稍后重试';
+            case 'tool_error':
+                return '❌ 工具执行失败，请检查操作或重试';
+            case 'permission_denied':
+                return '❌ 权限被拒绝，操作已取消';
+            case 'aborted_streaming':
+            case 'aborted_tools':
+                return '❌ 任务已中断';
+        }
+    }
+    // 回退到原有的错误消息匹配逻辑
     const msg = error?.message || String(error);
     if (msg.includes('CONTEXT_COMPACT_FAILED')) {
         return '⚠️ 上下文过长，自动压缩失败，请手动输入 /compact 重试';
@@ -38,10 +156,17 @@ export function getErrorMessage(error) {
         return '⚠️ 上下文过长，自动压缩重试失败，请手动输入 /compact 重试';
     }
     if (msg.includes('API Error: 400')) {
-        return '⚠️ 请求格式错误，请检查输入内容';
+        return '❌ 请求格式错误，请检查输入内容';
+    }
+    if (msg.includes('401') || msg.includes('Invalid API key') || msg.includes('key_not_found')
+        || msg.includes('authentication_error')) {
+        return '❌ API Key 无效，请检查密钥配置。使用 /status 查看当前配置';
     }
     if (msg.includes('API Error: 500')) {
-        return '⚠️ API 服务暂时不可用，请稍后重试';
+        return '❌ API 服务暂时不可用，请稍后重试';
+    }
+    if (msg.includes('API Error: 403')) {
+        return '❌ API 认证失败，请检查密钥配置或稍后重试';
     }
     if (msg.includes('API Error: 429')) {
         return '⚠️ 请求过于频繁，请稍后再试';
@@ -50,7 +175,7 @@ export function getErrorMessage(error) {
         return '⚠️ 请求超时，请重试';
     }
     if (msg.includes('permission') || msg.includes('im:resource')) {
-        return '⚠️ 权限不足，请联系管理员配置应用权限';
+        return '❌ 权限不足，请联系管理员配置应用权限';
     }
-    return '⚠️ 处理消息时出错，请稍后重试';
+    return '❌ 处理消息时出错，请稍后重试';
 }