evolclaw 3.1.4 → 3.1.6

package/dist/channels/qqbot.js

@@ -335,7 +335,7 @@ export class QQBotChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
                     const channelId = envelope.channelId;
@@ -427,6 +427,7 @@ export class QQBotChannelPlugin {
                             channel: adapter.channelName,
                             channelType,
                             channelId: event.channelId,
+                            selfAID: inst.agentName,
                             content: event.content,
                             images: event.images,
                             chatType: event.chatType || 'private',

package/dist/channels/wechat.js

@@ -731,7 +731,7 @@ export class WechatChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true },
+                capabilities: { file: false, image: false, interaction: false, markdown: false, thought: false, status: true, thread: false },
                 send: async (envelope, payload) => {
                     const channelId = envelope.channelId;
                     switch (payload.kind) {
@@ -823,6 +823,7 @@ export class WechatChannelPlugin {
                             channel: adapter.channelName,
                             channelType,
                             channelId,
+                            selfAID: inst.agentName,
                             content,
                             images,
                             chatType: chatType || 'private',

package/dist/channels/wecom.js

@@ -491,7 +491,7 @@ export class WecomChannelPlugin {
             const adapter = {
                 channelName: inst.name,
                 channelKey: inst.name,
-                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false },
+                capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
                     const channelId = envelope.channelId;
@@ -583,6 +583,7 @@ export class WecomChannelPlugin {
                             channel: adapter.channelName,
                             channelType,
                             channelId: event.channelId,
+                            selfAID: inst.agentName,
                             content: event.content,
                             images: event.images,
                             chatType: event.chatType || 'private',

package/dist/cli/agent.js

@@ -1,6 +1,5 @@
 import fs from 'fs';
 import path from 'path';
-import os from 'os';
 import readline from 'readline';
 import { resolvePaths, agentMdPath as getAgentMdPathFromPaths, aunPath as defaultAunPath } from '../paths.js';
 import { loadDefaults, loadAllAgents, loadAgent, saveAgent, ensureAgentDirSkeleton } from '../config-store.js';
@@ -11,11 +10,6 @@ import { commandExists } from '../utils/cross-platform.js';
 import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
-const BASEAGENT_ENV_KEY = {
-    claude: 'ANTHROPIC_API_KEY',
-    codex: 'OPENAI_API_KEY',
-    gemini: 'GEMINI_API_KEY',
-};
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
         return isCodexSdkAvailable();
@@ -30,8 +24,7 @@ function pickDefaultBaseagent(available) {
     return available.includes('claude') ? 'claude' : available[0];
 }
 function buildBaseagentsBlock(chosen) {
-    const env = BASEAGENT_ENV_KEY[chosen];
-    return { [chosen]: env ? { apiKey: `$ENV:${env}` } : {} };
+    return { [chosen]: {} };
 }
 const DEFAULT_CHATMODE = { private: 'interactive', group: 'proactive', nothuman: 'proactive' };
 const DEFAULT_DISPATCH = 'mention';
@@ -296,11 +289,11 @@ export async function agentCreateInteractive(opts = {}) {
             const defaults = loadDefaults();
             const rootPath = defaults?.projects?.rootPath
                 || (defaults?.projects?.defaultPath && path.dirname(defaults.projects.defaultPath))
-                || path.join(os.homedir(), 'evolclaw-projects');
+                || resolvePaths().root + '/projects';
             suggestedProjectPath = deriveAgentProjectPath(rootPath, aid);
         }
         catch {
-            suggestedProjectPath = deriveAgentProjectPath(path.join(os.homedir(), 'evolclaw-projects'), aid);
+            suggestedProjectPath = deriveAgentProjectPath(resolvePaths().root + '/projects', aid);
         }
         const projectInput = (await ask(`Project path [${suggestedProjectPath}]: `)).trim();
         const projectPath = projectInput || suggestedProjectPath;
@@ -419,11 +412,14 @@ export async function agentCreateInteractive(opts = {}) {
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
-        // Attempt hot-load via IPC (if daemon is running)
+        // Attempt hot-load via IPC (if daemon is running).
+        // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+        // >3s, so use a generous timeout to avoid a false "service not running"
+        // report while the daemon actually finishes bringing the agent online.
         let hotLoaded = false;
         let hotLoadError;
         try {
-            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid });
+            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid }, 30_000);
             if (ipcResult?.ok) {
                 hotLoaded = true;
             }
@@ -569,11 +565,14 @@ export async function agentCreateNonInteractive(opts) {
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
     }
-    // Attempt hot-load via IPC (if daemon is running)
+    // Attempt hot-load via IPC (if daemon is running).
+    // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
+    // >3s, so use a generous timeout to avoid a false "service not running"
+    // report while the daemon actually finishes bringing the agent online.
     let hotLoaded = false;
     let hotLoadError;
     try {
-        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid });
+        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid }, 30_000);
         if (ipcResult?.ok) {
             hotLoaded = true;
         }
@@ -627,7 +626,7 @@ export async function agentSyncAids() {
     const defaults = loadDefaults();
     const rootPath = defaults?.projects?.rootPath
         || (defaults?.projects?.defaultPath && path.dirname(defaults.projects.defaultPath))
-        || path.join(os.homedir(), 'evolclaw-projects');
+        || resolvePaths().root + '/projects';
     const created = [];
     for (const aid of localAids) {
         if (existingAids.has(aid))
@@ -755,6 +754,12 @@ export async function agentSet(aid, key, rawValue) {
         return { ok: false, error: `Failed to read config: ${e?.message || e}` };
     }
     const value = parseJsonValue(rawValue);
+    // active_baseagent 白名单校验：只允许已知 baseagent，挡住把模型名（如 deepseek）误设为后端
+    if (key === 'active_baseagent') {
+        if (typeof value !== 'string' || !BASEAGENT_CANDIDATES.includes(value)) {
+            return { ok: false, error: `无效 active_baseagent: ${JSON.stringify(value)}（可选: ${BASEAGENT_CANDIDATES.join(' / ')}）` };
+        }
+    }
     setNestedValue(config, key, value);
     try {
         saveAgent(config);
@@ -829,7 +834,7 @@ export async function agentChannelUpsert(opts) {
     return {
         ok: true,
         aid: opts.aid,
-        channelKey: `${opts.channel.type}#${encodeURIComponent(opts.aid)}#${opts.channel.name}`,
+        channelKey: `${opts.channel.type}#${opts.aid}#${opts.channel.name}`,
         reloaded,
     };
 }

package/dist/cli/bench.js

@@ -7,8 +7,8 @@ import { promisify } from 'util';
 import { aidList, aidCreate } from '../aun/aid/identity.js';
 import { msgSend, msgPull } from '../aun/msg/index.js';
 import { getPackageRoot, aunPath as defaultAunPath } from '../paths.js';
-import { createAunClient } from '../aun/aid/client.js';
-import { isHelpFlag } from './help.js';
+import { getAidStore, loadClient, SLOT } from '../aun/aid/store.js';
+import { isHelpFlag, getArgValue } from './help.js';
 const execFileAsync = promisify(execFile);
 // ==================== ANSI ====================
 const GREEN = '\x1b[32m';
@@ -132,10 +132,6 @@ function percentile(sorted, p) {
     const idx = Math.ceil((p / 100) * sorted.length) - 1;
     return sorted[Math.max(0, idx)];
 }
-function getArgValue(args, flag) {
-    const idx = args.indexOf(flag);
-    return idx >= 0 && idx + 1 < args.length ? args[idx + 1] : undefined;
-}
 // ==================== Promise Pool ====================
 function withTimeout(promise, ms, label) {
     return new Promise((resolve, reject) => {
@@ -248,34 +244,48 @@ function computeMetrics(results, received, durationSec) {
 function filterBySize(results, received, cls, durationSec) {
     return computeMetrics(results.filter(r => r.sizeClass === cls), received.filter(r => r.sizeClass === cls), durationSec);
 }
-async function benchAuth(aids, concurrency, aunPath, slotId) {
-    const resolvedAunPath = aunPath ?? defaultAunPath();
-    const tasks = aids.map(aid => async () => {
+async function benchAuth(aids, concurrency, aunPath) {
+    const tasks = aids.map((aid, index) => async () => {
         const start = Date.now();
+        const slotId = `${SLOT.bench}-${index}`;
+        let store = null;
+        let client = null;
         try {
-            const client = await createAunClient({ aunPath: resolvedAunPath });
-            await client.auth.createAid({ aid });
-            const authResult = await client.auth.authenticate({ aid });
-            const accessToken = authResult?.access_token ?? client._access_token;
-            const gateway = client._gatewayUrl ?? authResult?.gateway ?? '';
-            await client.connect({ access_token: accessToken, gateway, slot_id: slotId ?? '', connection_kind: 'short' }, { auto_reconnect: false });
+            store = await getAidStore({ slotId, aunPath });
+            client = await loadClient(store, aid);
+            await client.connect({ auto_reconnect: false });
+            const gateway = ''; // Gateway URL not exposed in 0.4.3
+            const authMs = Date.now() - start;
             try {
                 await client.close();
             }
             catch { }
-            return { aid, ok: true, authMs: Date.now() - start, gateway };
+            try {
+                store.close();
+            }
+            catch { }
+            return { aid, ok: true, authMs, gateway };
         }
         catch (e) {
+            if (client)
+                try {
+                    await client.close();
+                }
+                catch { }
+            if (store)
+                try {
+                    store.close();
+                }
+                catch { }
             return { aid, ok: false, authMs: Date.now() - start, error: e.message };
         }
     });
     return runPool(tasks, concurrency);
 }
-async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
+async function benchSwitch(aids, rounds, aunPath, useCli, encrypt) {
     const results = [];
     const start = Date.now();
     let seq = 0;
-    const slot = slotId ?? 'bench';
     for (let round = 0; round < rounds; round++) {
         for (let i = 0; i < aids.length; i++) {
             const from = aids[i];
@@ -286,8 +296,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
             let ok = false;
             let serverTimestamp;
             if (useCli) {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(cliSend(from, to, text, slot, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(cliSend(from, to, text, slotId, encrypt), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.timestamp;
                 }
@@ -296,8 +307,9 @@ async function benchSwitch(aids, rounds, aunPath, useCli, slotId, encrypt) {
                 }
             }
             else {
+                const slotId = `${SLOT.bench}-${i}`;
                 try {
-                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId: slot, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
+                    const res = await withTimeout(msgSend({ from, to, body: { mode: 'text', text }, slotId, aunPath, encrypt }), 10000, `${from.split('.')[0]}→${to.split('.')[0]}`);
                     ok = res.ok;
                     serverTimestamp = res.ok ? res.timestamp : undefined;
                 }
@@ -392,7 +404,6 @@ Options:
     const defaultWait = encrypt ? '10' : '3';
     const waitSec = Math.max(1, parseInt(getArgValue(args, '--wait') || defaultWait, 10));
     const sessionId = crypto.randomBytes(4).toString('hex');
-    const benchSlot = `bench-${sessionId}`;
     if (!formatJson) {
         console.log(`\n${BOLD}  evolclaw bench${RST} — AUN 消息性能基准测试`);
         console.log(`  ${'━'.repeat(50)}`);
@@ -495,14 +506,15 @@ Options:
         authTasks.push(...aids);
     let authResults;
     if (cliMode) {
-        const cliAuthTasks = authTasks.map(aid => async () => {
-            const r = await cliAuth(aid, benchSlot);
+        const cliAuthTasks = authTasks.map((aid, index) => async () => {
+            const slotId = `${SLOT.bench}-${index}`;
+            const r = await cliAuth(aid, slotId);
             return { aid, ok: r.ok, authMs: r.authMs };
         });
         authResults = await runPool(cliAuthTasks, concurrency);
     }
     else {
-        authResults = await benchAuth(authTasks, concurrency, aunPath, benchSlot);
+        authResults = await benchAuth(authTasks, concurrency, aunPath);
     }
     const authOk = authResults.filter(r => r.ok);
     const authFail = authResults.filter(r => !r.ok);
@@ -592,7 +604,7 @@ Options:
     // Suppress SDK error logs during send phase (we track errors ourselves)
     const origError2 = console.error;
     console.error = () => { };
-    const sendFns = tasks.map(t => async () => {
+    const sendFns = tasks.map((t, taskIndex) => async () => {
         let lastError;
         let retries = 0;
         for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
@@ -605,10 +617,11 @@ Options:
                 ? buildFileChunkText(t.seq, fileChunks.length, sendTs, sessionId, fileChunks[t.seq]?.toString('base64') ?? '')
                 : buildMessageText(t.seq, t.sizeClass, sendTs, sessionId);
             const t0 = Date.now();
+            const slotId = `${SLOT.bench}-${taskIndex % concurrency}`;
             try {
                 const sendPromise = cliMode
-                    ? cliSend(t.from, t.to, text, benchSlot, encrypt)
-                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId: benchSlot, aunPath, encrypt });
+                    ? cliSend(t.from, t.to, text, slotId, encrypt)
+                    : msgSend({ from: t.from, to: t.to, body: { mode: 'text', text }, slotId, aunPath, encrypt });
                 const res = await withTimeout(sendPromise, SEND_TIMEOUT_MS, `${t.from.split('.')[0]}→${t.to.split('.')[0]}`);
                 if (cliMode) {
                     const cliRes = res;
@@ -922,7 +935,7 @@ Options:
     if (!formatJson)
         console.log(`${DIM}  Phase 5: 频繁切换账号收发测试${RST}`);
     const switchRounds = Math.max(2, Math.min(rounds, 5));
-    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, benchSlot, encrypt);
+    const switchOut = await benchSwitch(aids, switchRounds, aunPath, cliMode, encrypt);
     const switchOkResults = switchOut.results.filter(r => r.ok);
     const switchLatencies = switchOkResults
         .filter(r => r.serverTimestamp !== undefined)

package/dist/cli/help.js

@@ -21,3 +21,11 @@ export function wantsHelp(args) {
             return true;
     return false;
 }
+/**
+ * 取出 `--flag <value>` 形式的参数值。
+ * flag 不存在或其后无值时返回 undefined。
+ */
+export function getArgValue(args, flag) {
+    const idx = args.indexOf(flag);
+    return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+}