evolclaw 3.1.0 → 3.1.2

package/dist/channels/feishu.js

@@ -219,7 +219,7 @@ export class FeishuChannel {
                             const imageData = await this.downloadAndSaveImage(imageKey, msg.chat_id, msg.message_id, projectPath);
                             if (imageData) {
                                 const allImages = [...quotedImages, imageData];
-                                const prompt = quotedText + '用户发送了一张图片，请分析这张图片的内容。';
+                                const prompt = quotedText + '用户发送了一张图片，请结合上下文理解用户意图并回应。';
                                 await this.messageHandler({ channelId: msg.chat_id, content: prompt, images: allImages, peerId, peerName, messageId: msg.message_id, threadId, rootId, chatType });
                             }
                             else {
@@ -329,12 +329,11 @@ export class FeishuChannel {
                             }
                             logger.info(`[Feishu] CommandCard trigger: command=${value._command}, operator=${operatorId}`);
                             if (this.messageHandler) {
-                                // Feishu chatId 前缀：oc_ = group chat，ou_ = private user open_id
-                                const chatType = typeof chatId === 'string' && chatId.startsWith('oc_') ? 'group' : 'private';
+                                // 卡片回调不传 chatType——oc_ 前缀不区分群聊/单聊，
+                                // 由 ensureSession 从已有 session 中继承正确的 chatType
                                 await this.messageHandler({
                                     channelId: chatId,
                                     content: value._command,
-                                    chatType,
                                     peerId: operatorId,
                                     messageId: `card-trigger-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
                                     source: 'card-trigger',
@@ -573,7 +572,14 @@ export class FeishuChannel {
                 const truncated = content.slice(0, 28000) + '\n\n⚠️ 消息过长，已截断';
                 return this.sendMessage(chatId, truncated, options);
             }
-            logger.error('[Feishu] Failed to send message:', error);
+            const respData = error?.response?.data;
+            const code = respData?.code;
+            logger.error('[Feishu] Failed to send message:', respData ? JSON.stringify(respData) : error?.message ?? error);
+            // post 格式相关错误（400/230001）：降级为纯文本重试
+            if (!options?.forceText && (error?.response?.status === 400 || code === 230001)) {
+                logger.warn('[Feishu] Retrying as plain text (forceText)');
+                return this.sendMessage(chatId, content, { ...options, forceText: true });
+            }
             throw error;
         }
     }
@@ -1320,6 +1326,7 @@ export class FeishuChannelPlugin {
             });
             const adapter = {
                 channelName: inst.name,
+                channelKey: inst.name,
                 capabilities: { file: true, image: true, interaction: true, markdown: true, thought: false, status: true },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -1357,6 +1364,7 @@ export class FeishuChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                             // Feishu 通过 acknowledge (✓ 表情) 表达状态，由 channel 自行处理
                             return;
                         case 'interaction':
@@ -1416,7 +1424,8 @@ export class FeishuChannelPlugin {
                 registerBridge(bridge, channelType) {
                     bridge.register(adapter.channelName, (handler) => channel.onMessage(async ({ channelId: chatId, content, images, peerId, peerName, messageId, mentions, threadId, rootId, chatType, source }) => {
                         await handler({
-                            channel: adapter.channelName, channelType, channelId: chatId, content, images, chatType,
+                            channel: adapter.channelName, channelType, channelId: chatId, content, images,
+                            chatType: chatType || 'private',
                             peerId: peerId || '', peerName, messageId, mentions, threadId,
                             replyContext: threadId ? { replyToMessageId: rootId ?? threadId, replyInThread: true } : undefined,
                             source,

package/dist/channels/qqbot.js

@@ -334,6 +334,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 },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -369,6 +370,7 @@ export class QQBotChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/channels/wechat.js

@@ -730,6 +730,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 },
                 send: async (envelope, payload) => {
                     const channelId = envelope.channelId;
@@ -766,6 +767,7 @@ export class WechatChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/channels/wecom.js

@@ -490,6 +490,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 },
                 send: async (envelope, payload) => {
                     const ctx = envelope.replyContext;
@@ -525,6 +526,7 @@ export class WecomChannelPlugin {
                         case 'status.interrupted':
                         case 'status.error':
                         case 'status.timeout':
+                        case 'status.progress':
                         case 'custom':
                             return;
                         default:

package/dist/cli/agent.js

@@ -239,22 +239,30 @@ export async function agentShow(aid) {
 }
 export async function agentCreateInteractive(opts = {}) {
     const p = resolvePaths();
-    const rl = readline.createInterface({
+    const ownRl = !opts.rl;
+    const rl = opts.rl ?? readline.createInterface({
         input: opts.stdin || process.stdin,
         output: opts.stdout || process.stdout,
     });
     const ask = (q) => new Promise(r => rl.question(q, r));
     try {
+        const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
         const aidPrompt = opts.suggestedName
             ? `AID [${opts.suggestedName}]: `
             : 'AID (e.g. mybot.agentid.pub): ';
-        const aidInput = (await ask(aidPrompt)).trim();
-        const aid = aidInput || opts.suggestedName;
-        if (!aid)
-            return { ok: false, error: 'AID is required.' };
-        const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
-        if (!isValidAid(aid)) {
-            return { ok: false, error: `Invalid AID "${aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)` };
+        let aid = '';
+        while (!aid) {
+            const aidInput = (await ask(aidPrompt)).trim();
+            const candidate = aidInput || opts.suggestedName;
+            if (!candidate) {
+                console.log('  ⚠ AID is required.');
+                continue;
+            }
+            if (!isValidAid(candidate)) {
+                console.log(`  ⚠ Invalid AID "${candidate}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
+                continue;
+            }
+            aid = candidate;
         }
         const agentDirPath = path.join(p.agentsDir, aid);
         const configExists = fs.existsSync(path.join(agentDirPath, 'config.json'));
@@ -311,26 +319,48 @@ export async function agentCreateInteractive(opts = {}) {
             return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
         }
         const defaultBa = pickDefaultBaseagent(available);
-        let baseagent = null;
-        while (baseagent === null) {
-            const input = (await ask(`Baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
-            if (!BASEAGENT_CANDIDATES.includes(input)) {
-                console.log(`  Invalid choice. Options: ${BASEAGENT_CANDIDATES.join('/')}`);
-                continue;
+        let baseagent;
+        if (available.length === 1) {
+            console.log(`  Baseagent: ${defaultBa}`);
+            baseagent = defaultBa;
+        }
+        else {
+            let chosen = null;
+            while (chosen === null) {
+                const input = (await ask(`Baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
+                if (!BASEAGENT_CANDIDATES.includes(input)) {
+                    console.log(`  Invalid choice. Options: ${BASEAGENT_CANDIDATES.join('/')}`);
+                    continue;
+                }
+                if (!available.includes(input)) {
+                    console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+                    continue;
+                }
+                chosen = input;
+            }
+            baseagent = chosen;
+        }
+        // Owner
+        let owner;
+        while (true) {
+            const ownerInput = (await ask('Owner AID (leave empty for auto-bind on first message): ')).trim();
+            if (!ownerInput) {
+                owner = undefined;
+                break;
             }
-            if (!available.includes(input)) {
-                console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+            if (!isValidAid(ownerInput)) {
+                console.log(`  ⚠ Invalid Owner AID "${ownerInput}": must be a valid multi-level domain (e.g. alice.agentid.pub)`);
                 continue;
             }
-            baseagent = input;
+            owner = ownerInput;
+            break;
         }
-        // Owner
-        const owner = (await ask('Owner AID (leave empty for auto-bind on first message): ')).trim() || undefined;
         // Name + description for agent.md
         const defaultName = aid.split('.')[0];
         const agentName = (await ask(`Display name [${defaultName}]: `)).trim() || defaultName;
         const agentDescription = (await ask('Description (optional): ')).trim() || '';
-        rl.close();
+        if (ownRl)
+            rl.close();
         const agentConfig = {
             $schema_version: CONFIG_SCHEMA_VERSION,
             aid,
@@ -359,31 +389,64 @@ export async function agentCreateInteractive(opts = {}) {
             const agentMdPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
             fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
             fs.writeFileSync(agentMdPath, content, 'utf-8');
-            try {
-                await agentmdPut(content, { aid, aunPath });
-                agentmdUploaded = true;
+            // Upload with retry (3 attempts, 2s delay between retries)
+            const MAX_ATTEMPTS = 3;
+            const RETRY_DELAY_MS = 2000;
+            let lastError;
+            for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+                try {
+                    if (attempt > 1) {
+                        process.stdout.write(`  ↻ agent.md 上传重试 (${attempt}/${MAX_ATTEMPTS})...\n`);
+                        await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+                    }
+                    await agentmdPut(content, { aid, aunPath });
+                    agentmdUploaded = true;
+                    break;
+                }
+                catch (e) {
+                    lastError = e;
+                }
             }
-            catch (e) {
-                console.warn(`  ⚠ agent.md upload failed: ${e?.message || e}`);
+            if (!agentmdUploaded) {
+                console.warn(`  ⚠ agent.md upload failed: ${lastError?.message || lastError}`);
                 console.warn(`  → Retry later with: evolclaw aid agentmd put ${aid}`);
             }
+            // Yield to allow the SDK WebSocket to fully close before IPC
+            await new Promise(r => setTimeout(r, 0));
         }
         catch (e) {
             console.warn(`  ⚠ agent.md generation failed: ${e?.message || e}`);
         }
+        // Attempt hot-load via IPC (if daemon is running)
+        let hotLoaded = false;
+        let hotLoadError;
+        try {
+            const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid });
+            if (ipcResult?.ok) {
+                hotLoaded = true;
+            }
+            else if (ipcResult) {
+                hotLoadError = ipcResult.error;
+            }
+        }
+        catch { /* daemon not running */ }
         return {
             ok: true,
             aid,
             configPath: toPosix(path.join(agentDirPath, 'config.json')),
             aidCreated,
             agentmdUploaded,
+            hotLoaded,
+            hotLoadError,
         };
     }
     finally {
-        try {
-            rl.close();
+        if (ownRl) {
+            try {
+                rl.close();
+            }
+            catch { /* ignore */ }
         }
-        catch { /* ignore */ }
     }
 }
 export async function agentCreateNonInteractive(opts) {
@@ -482,24 +545,51 @@ export async function agentCreateNonInteractive(opts) {
         const agentMdPath = path.join(aunPath, 'AIDs', opts.aid, 'agent.md');
         fs.mkdirSync(path.dirname(agentMdPath), { recursive: true });
         fs.writeFileSync(agentMdPath, content, 'utf-8');
-        try {
-            await agentmdPut(content, { aid: opts.aid, aunPath });
-            agentmdUploaded = true;
+        const MAX_ATTEMPTS = 3;
+        const RETRY_DELAY_MS = 2000;
+        let lastError;
+        for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+            try {
+                if (attempt > 1)
+                    await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+                await agentmdPut(content, { aid: opts.aid, aunPath });
+                agentmdUploaded = true;
+                break;
+            }
+            catch (e) {
+                lastError = e;
+            }
         }
-        catch (e) {
-            console.warn(`⚠ agent.md upload failed: ${e?.message || e}`);
+        if (!agentmdUploaded) {
+            console.warn(`⚠ agent.md upload failed: ${lastError?.message || lastError}`);
             console.warn(`  Retry later with: evolclaw aid agentmd put ${opts.aid}`);
         }
+        await new Promise(r => setTimeout(r, 0));
     }
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
     }
+    // Attempt hot-load via IPC (if daemon is running)
+    let hotLoaded = false;
+    let hotLoadError;
+    try {
+        const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid });
+        if (ipcResult?.ok) {
+            hotLoaded = true;
+        }
+        else if (ipcResult) {
+            hotLoadError = ipcResult.error;
+        }
+    }
+    catch { /* daemon not running */ }
     return {
         ok: true,
         aid: opts.aid,
         configPath: toPosix(path.join(agentDirPath, 'config.json')),
         aidCreated,
         agentmdUploaded,
+        hotLoaded,
+        hotLoadError,
     };
 }
 // ==================== agentSyncAids ====================
@@ -665,7 +755,12 @@ export async function agentSet(aid, key, rawValue) {
     }
     const value = parseJsonValue(rawValue);
     setNestedValue(config, key, value);
-    saveAgent(config);
+    try {
+        saveAgent(config);
+    }
+    catch (e) {
+        return { ok: false, error: e?.message || String(e) };
+    }
     // Try hot-reload
     let reloaded = false;
     try {
@@ -733,7 +828,7 @@ export async function agentChannelUpsert(opts) {
     return {
         ok: true,
         aid: opts.aid,
-        channelKey: `${opts.aid}#${opts.channel.type}#${opts.channel.name}`,
+        channelKey: `${opts.channel.type}#${encodeURIComponent(opts.aid)}#${opts.channel.name}`,
         reloaded,
     };
 }