evolclaw 2.8.3 → 3.1.0

package/dist/paths.js

@@ -10,7 +10,7 @@ export function resolveRoot() {
     if (process.env.EVOLCLAW_HOME) {
         _root = process.env.EVOLCLAW_HOME;
     }
-    else if (fs.existsSync(path.join(process.cwd(), 'data', 'evolclaw.json'))) {
+    else if (fs.existsSync(path.join(process.cwd(), 'agents', 'defaults.json'))) {
         _root = process.cwd();
     }
     else {
@@ -26,31 +26,95 @@ export function resolvePaths() {
     const root = resolveRoot();
     return {
         root,
-        config: path.join(root, 'data', 'evolclaw.json'),
-        configSample: path.join(root, 'data', 'evolclaw.sample.json'),
-        db: path.join(root, 'data', 'sessions.db'),
-        pid: path.join(root, 'logs', 'evolclaw.pid'),
+        sessionsDir: path.join(root, 'data', 'sessions'),
+        instanceDir: path.join(root, 'data', 'instance'),
+        outboxDir: path.join(root, 'data', 'outbox'),
         dataDir: path.join(root, 'data'),
         logs: path.join(root, 'logs'),
         agentsDir: path.join(root, 'agents'),
         lineStats: path.join(root, 'logs', 'line-stats.log'),
-        readySignal: path.join(root, 'logs', 'ready.signal'),
+        readySignal: path.join(root, 'data', 'instance', 'ready.signal'),
         selfHealLog: path.join(root, 'logs', 'self-heal.md'),
-        socket: resolveSocketPath(root),
+        socket: resolveInstanceSocketPath(root),
+        // ── 新结构（evolclaw-directory-design.md）────────────────
+        defaultsConfig: path.join(root, 'agents', 'defaults.json'),
+        processConfig: path.join(root, 'config.json'),
+        eckDir: path.join(root, 'eck'),
+        instanceReadySignal: path.join(root, 'data', 'instance', 'ready.signal'),
+        instanceSocket: resolveInstanceSocketPath(root),
+        aidLogsDir: path.join(root, 'logs', 'aids'),
     };
 }
-function resolveSocketPath(root) {
+// ── per-agent 路径（参数化，不进 resolvePaths() 的固定 map）──
+export function agentDir(aid) {
+    return path.join(resolveRoot(), 'agents', aid);
+}
+export function agentConfig(aid) {
+    return path.join(agentDir(aid), 'config.json');
+}
+export function agentPersonalDir(aid) {
+    return path.join(agentDir(aid), 'personal');
+}
+export function agentRelationsDir(aid) {
+    return path.join(agentDir(aid), 'relations');
+}
+/** @deprecated Use agentRelationsDir instead */
+export function agentIdentitiesDir(aid) {
+    return agentRelationsDir(aid);
+}
+export function agentIndexDir(aid) {
+    return path.join(agentDir(aid), 'index');
+}
+export function agentVenuesDir(aid) {
+    return path.join(agentDir(aid), 'venues');
+}
+export function agentSessionsDir(aid) {
+    return path.join(agentDir(aid), 'sessions');
+}
+export function agentDataDir(aid) {
+    return path.join(agentDir(aid), 'data');
+}
+export function agentDataCacheDir(aid) {
+    return path.join(agentDataDir(aid), 'cache');
+}
+export function agentTriggersDir(aid) {
+    return path.join(resolveRoot(), 'data', 'triggers', aid);
+}
+function resolveInstanceSocketPath(root) {
     if (isWindows) {
         const hash = crypto.createHash('sha1').update(root).digest('hex').slice(0, 12);
         return `\\\\.\\pipe\\evolclaw-${hash}`;
     }
-    return path.join(root, 'logs', 'evolclaw.sock');
+    return path.join(root, 'data', 'instance', 'evolclaw.sock');
 }
 export function ensureDataDirs() {
     const p = resolvePaths();
     fs.mkdirSync(p.dataDir, { recursive: true });
     fs.mkdirSync(p.logs, { recursive: true });
+    fs.mkdirSync(p.aidLogsDir, { recursive: true });
     fs.mkdirSync(p.agentsDir, { recursive: true });
+    fs.mkdirSync(p.sessionsDir, { recursive: true });
+    fs.mkdirSync(p.instanceDir, { recursive: true });
+    fs.mkdirSync(p.outboxDir, { recursive: true });
+    fs.mkdirSync(p.eckDir, { recursive: true });
+    fs.mkdirSync(eckDebugDir(), { recursive: true });
+}
+// ── kits 路径（始终从包内读取，不复制到 EVOLCLAW_HOME）──
+export function kitsDir() {
+    return path.join(getPackageRoot(), 'kits');
+}
+export function kitsRulesDir() {
+    return path.join(getPackageRoot(), 'kits', 'rules');
+}
+export function kitsDocsDir() {
+    return path.join(getPackageRoot(), 'kits', 'docs');
+}
+export function kitsTemplatesDir() {
+    return path.join(getPackageRoot(), 'kits', 'templates');
+}
+// ── 调试输出 ──
+export function eckDebugDir() {
+    return path.join(resolveRoot(), 'data', 'eck-debug');
 }
 export function getPackageRoot() {
     // import.meta.dirname is available in Node.js 21.2+ and always returns

package/dist/types.js

@@ -3,5 +3,11 @@
 // Array form: `name` is required to distinguish instances.
 /** Default permission mode applied to new sessions. Change here to affect all roles. */
 export const DEFAULT_PERMISSION_MODE = 'bypass';
-/** Reserved agent name used for DefaultAgent (no agent.json file). */
-export const DEFAULT_AGENT_NAME = '[default]';
+/** Placeholder agent name for legacy code paths that haven't been migrated. */
+export const DEFAULT_AGENT_NAME = '<unknown>';
+// ── 新结构：defaults.json + per-agent config.json（evolclaw-home-directory.md）──
+//
+// 旧 Config / EvolAgentConfig 保留至阶段 3 退场。新结构的承载是
+// DefaultsConfig（agents/defaults.json）+ AgentConfig（agents/<aid>/config.json），
+// 由 ConfigStore 加载并算 effective merged 值。
+export const CONFIG_SCHEMA_VERSION = 1;

package/dist/utils/aid-lifecycle-log.js

@@ -0,0 +1,33 @@
+import fs from 'fs';
+import path from 'path';
+import { resolvePaths } from '../paths.js';
+function ensureDir(dir) {
+    fs.mkdirSync(dir, { recursive: true });
+}
+function logPath(aid) {
+    const aidName = aid.startsWith('@') ? aid.slice(1) : aid;
+    return path.join(resolvePaths().aidLogsDir, `${aidName}.jsonl`);
+}
+export function appendAidLifecycle(event) {
+    const filePath = logPath(event.aid);
+    ensureDir(path.dirname(filePath));
+    fs.appendFileSync(filePath, JSON.stringify(event) + '\n');
+}
+export function readAidLifecycle(aid, lastN = 50) {
+    const filePath = logPath(aid);
+    try {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        const lines = content.trim().split('\n').filter(Boolean);
+        const events = [];
+        for (const line of lines.slice(-lastN)) {
+            try {
+                events.push(JSON.parse(line));
+            }
+            catch { }
+        }
+        return events;
+    }
+    catch {
+        return [];
+    }
+}

package/dist/utils/atomic-write.js

@@ -0,0 +1,89 @@
+/**
+ * Atomic write via dual rename.
+ *
+ * 写入流程（写 foo.json）：
+ *   1. 把当前 foo.json 改名为 foo.json_   （保留旧版作为热备）
+ *   2. 把新内容写到 foo.json__            （写入完成才有完整内容）
+ *   3. 把 foo.json__ rename 为 foo.json   （原子切换）
+ *   foo.json_ 留到下次写入时被覆盖。
+ *
+ * 读取时按以下顺序探测，自动恢复中途崩溃的状态：
+ *   - foo.json__ 存在 → 上次写入未完成，丢弃
+ *   - foo.json    存在 → 直接读
+ *   - foo.json_   存在 → rename 步骤崩溃，rename 回 foo.json 再读
+ *   - 都不存在 → null
+ */
+import fs from 'fs';
+import path from 'path';
+const HOT = '_'; // foo.json_   旧版热备
+const TMP = '__'; // foo.json__  写入中
+/**
+ * 原子写入 JSON 文件（双 rename）。dirname 不存在时会自动创建。
+ *
+ * @param filePath 目标文件
+ * @param content 完整内容（不含末尾换行也可，由调用方控制）
+ */
+export function atomicWrite(filePath, content) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    const hot = filePath + HOT;
+    const tmp = filePath + TMP;
+    // 步骤 1：当前文件 → hot（保留旧版作热备）
+    if (fs.existsSync(filePath)) {
+        if (fs.existsSync(hot))
+            fs.unlinkSync(hot);
+        fs.renameSync(filePath, hot);
+    }
+    // 步骤 2：写到 tmp
+    fs.writeFileSync(tmp, content, 'utf-8');
+    // 步骤 3：tmp → 目标（原子）
+    fs.renameSync(tmp, filePath);
+}
+export function atomicWriteJson(filePath, value) {
+    atomicWrite(filePath, JSON.stringify(value, null, 2) + '\n');
+}
+/**
+ * 原子读取——自动按状态恢复。文件不存在时返回 null。
+ *
+ * 调用方拿到 null 应当作"文件不存在"处理；解析失败抛错。
+ */
+export function atomicRead(filePath) {
+    const hot = filePath + HOT;
+    const tmp = filePath + TMP;
+    // 中途崩溃残留 → 丢弃
+    if (fs.existsSync(tmp)) {
+        try {
+            fs.unlinkSync(tmp);
+        }
+        catch { /* best effort */ }
+    }
+    if (fs.existsSync(filePath)) {
+        return fs.readFileSync(filePath, 'utf-8');
+    }
+    // rename 步骤崩溃 → 把 hot 移回正式名
+    if (fs.existsSync(hot)) {
+        fs.renameSync(hot, filePath);
+        return fs.readFileSync(filePath, 'utf-8');
+    }
+    return null;
+}
+export function atomicReadJson(filePath) {
+    const text = atomicRead(filePath);
+    if (text === null)
+        return null;
+    return JSON.parse(text);
+}
+export function ensureDir(dirPath) {
+    if (!fs.existsSync(dirPath)) {
+        fs.mkdirSync(dirPath, { recursive: true });
+    }
+}
+/**
+ * Simple atomic write for plain-text files (ECK runtime files).
+ * Uses write-tmp-then-rename (no hot-backup needed for these files).
+ */
+export function atomicWriteText(filePath, content) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    const tmp = filePath + '.tmp.' + process.pid;
+    fs.writeFileSync(tmp, content, 'utf-8');
+    fs.renameSync(tmp, filePath);
+}

package/dist/utils/channel-helpers.js

@@ -0,0 +1,46 @@
+/**
+ * Channel 配置归一化工具——给 ChannelLoader 时代的 channel adapter 用。
+ *
+ * 旧结构里 `Config.channels.<type>` 可以是 single object 或 array；这些工具
+ * 用来抹平这种差异。新结构（agents/<aid>/config.json）的 channels 已经统一为
+ * 列表形态，这些工具仍被 ChannelLoader 调用方使用——index.ts 把新结构翻成旧
+ * dict 形态喂给 ChannelLoader，所以 normalizeChannelInstances 仍然有用武之地。
+ *
+ * 当 ChannelLoader 重写为直接吃 ChannelInstance[] 后，本文件可删。
+ */
+export const channelTypes = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
+/**
+ * 把 channel 配置（单对象 / 数组 / undefined）归一为带 name 的数组。
+ */
+export function normalizeChannelInstances(cfg, defaultName) {
+    if (cfg === undefined || cfg === null)
+        return [];
+    if (Array.isArray(cfg)) {
+        return cfg.map((item, i) => ({
+            ...item,
+            name: item.name ?? (cfg.length === 1 ? defaultName : `${defaultName}-${i + 1}`),
+        }));
+    }
+    return [{ ...cfg, name: cfg.name ?? defaultName }];
+}
+/**
+ * 从 globalConfig.channels 字典里按实例名找 showActivities，找不到回退到全局。
+ */
+export function getChannelShowActivities(config, instanceName) {
+    for (const type of channelTypes) {
+        const raw = config.channels?.[type];
+        if (raw === undefined)
+            continue;
+        if (Array.isArray(raw)) {
+            const inst = raw.find((item) => item.name === instanceName);
+            if (inst)
+                return inst.showActivities ?? config.showActivities ?? 'all';
+        }
+        else {
+            const effectiveName = raw.name ?? type;
+            if (effectiveName === instanceName)
+                return raw.showActivities ?? config.showActivities ?? 'all';
+        }
+    }
+    return config.showActivities ?? 'all';
+}

package/dist/utils/cross-platform.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { execFileSync, execFile, spawn } from 'child_process';
+import { execFileSync, execFile, spawn, spawnSync } from 'child_process';
 import { promisify } from 'util';
 import fs from 'fs';
 const execFileAsync = promisify(execFile);
@@ -33,7 +33,7 @@ export function isProcessRunning(pid) {
 export function killProcess(pid, force = false) {
     if (isWindows && force) {
         try {
-            execFileSync('taskkill', ['/PID', String(pid), '/F']);
+            spawnSync('taskkill', ['/PID', String(pid), '/F'], { windowsHide: true });
         }
         catch { }
     }
@@ -51,7 +51,8 @@ export function killProcess(pid, force = false) {
 export function findProcesses(pattern) {
     try {
         if (isWindows) {
-            const output = execFileSync('wmic', ['process', 'where', `CommandLine like '%${pattern}%'`, 'get', 'ProcessId'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+            const result = spawnSync('wmic', ['process', 'where', `CommandLine like '%${pattern}%'`, 'get', 'ProcessId'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });
+            const output = result.stdout || '';
             return output.split('\n')
                 .map(line => parseInt(line.trim(), 10))
                 .filter(pid => !isNaN(pid) && pid !== process.pid);
@@ -68,8 +69,8 @@ export function findProcesses(pattern) {
 export function getProcessInfo(pid) {
     try {
         if (isWindows) {
-            // Use wmic on Windows
-            const output = execFileSync('wmic', ['process', 'where', `ProcessId=${pid}`, 'get', 'WorkingSetSize,CreationDate'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] });
+            const result = spawnSync('wmic', ['process', 'where', `ProcessId=${pid}`, 'get', 'WorkingSetSize,CreationDate'], { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'], windowsHide: true });
+            const output = result.stdout || '';
             const lines = output.trim().split('\n').filter(l => l.trim());
             if (lines.length >= 2) {
                 const parts = lines[1].trim().split(/\s+/);
@@ -106,40 +107,30 @@ function formatUptime(totalSeconds) {
         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.
  */
+const _commandExistsCache = new Map();
 export function commandExists(cmd) {
+    const cached = _commandExistsCache.get(cmd);
+    if (cached !== undefined)
+        return cached;
+    let exists = false;
     try {
         if (isWindows) {
-            execFileSync('where', [cmd], { encoding: 'utf-8', stdio: 'pipe' });
+            const r = spawnSync('where', [cmd], { encoding: 'utf-8', stdio: 'pipe', windowsHide: true });
+            exists = r.status === 0;
         }
         else {
             execFileSync('which', [cmd], { encoding: 'utf-8', stdio: 'pipe' });
+            exists = true;
         }
-        return true;
     }
     catch {
-        return false;
+        exists = false;
     }
+    _commandExistsCache.set(cmd, exists);
+    return exists;
 }
 /**
  * Cross-platform live log tailing (replaces tail -f).

package/dist/utils/error-utils.js

@@ -73,7 +73,14 @@ let _rules = [];
 let _lastMtime = 0;
 function getDictPath() {
     if (!_dictPath) {
-        _dictPath = path.join(resolvePaths().dataDir, 'error-dict.json');
+        const userDict = path.join(resolvePaths().dataDir, 'error-dict.json');
+        if (fs.existsSync(userDict)) {
+            _dictPath = userDict;
+        }
+        else {
+            // Bundled default: src/utils/ → src/data/ (dev) or dist/utils/ → dist/data/ (prod)
+            _dictPath = path.resolve(import.meta.dirname, '..', 'data', 'error-dict.json');
+        }
     }
     return _dictPath;
 }
@@ -199,7 +206,8 @@ export function classifyError(error) {
     }
     // 内置兜底规则（结构性、稳定的错误模式）
     if (msg.includes('context_length_exceeded') || msg.includes('context_compact_failed')
-        || msg.includes('context limit')) {
+        || msg.includes('context limit') || msg.includes('input is too long')
+        || msg.includes('上下文过长')) {
         return ErrorType.CONTEXT_TOO_LONG;
     }
     if (msg.includes('401') || msg.includes('authentication_error')) {