evolclaw 3.1.2 → 3.1.3

package/dist/channels/aun.js

@@ -6,7 +6,7 @@ import os from 'os';
 import { logger, localTimestamp } from '../utils/logger.js';
 import { LogWriter } from '../utils/log-writer.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
-import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath } from '../paths.js';
+import { resolvePaths, getPackageRoot, agentMdPath as agentMdPathFn, agentDir as agentDirPath, resolveRoot } from '../paths.js';
 import { saveToUploads, sanitizeFileName } from '../utils/media-cache.js';
 import { appendAidEvent } from '../utils/instance-registry.js';
 import { appendMessageLog, buildOutboundEntry } from '../core/message/message-log.js';
@@ -57,6 +57,46 @@ function getEvolclawVersion() {
     }
     return _cachedVersion;
 }
+function migrateAunData(targetPath) {
+    const legacyPath = path.join(os.homedir(), '.aun');
+    if (legacyPath === targetPath)
+        return;
+    // AIDs 迁移：逐个检查每个 AID，缺少 private 的就从 legacy 复制
+    const srcAIDs = path.join(legacyPath, 'AIDs');
+    const dstAIDs = path.join(targetPath, 'AIDs');
+    if (fs.existsSync(srcAIDs)) {
+        fs.mkdirSync(dstAIDs, { recursive: true });
+        try {
+            for (const entry of fs.readdirSync(srcAIDs, { withFileTypes: true })) {
+                if (!entry.isDirectory())
+                    continue;
+                const aidName = entry.name;
+                const srcAidDir = path.join(srcAIDs, aidName);
+                const dstAidDir = path.join(dstAIDs, aidName);
+                const srcPrivate = path.join(srcAidDir, 'private');
+                const dstPrivate = path.join(dstAidDir, 'private');
+                // 如果目标 AID 目录不存在或缺少 private，从源复制整个 AID 目录
+                if (fs.existsSync(srcPrivate) && !fs.existsSync(dstPrivate)) {
+                    fs.cpSync(srcAidDir, dstAidDir, { recursive: true });
+                }
+            }
+        }
+        catch { }
+    }
+    // CA 迁移
+    const srcCA = path.join(legacyPath, 'CA');
+    const dstCA = path.join(targetPath, 'CA');
+    if (fs.existsSync(srcCA) && !fs.existsSync(dstCA)) {
+        fs.cpSync(srcCA, dstCA, { recursive: true });
+    }
+    for (const file of ['.seed', '.device_id']) {
+        const src = path.join(legacyPath, file);
+        const dst = path.join(targetPath, file);
+        if (fs.existsSync(src) && !fs.existsSync(dst)) {
+            fs.copyFileSync(src, dst);
+        }
+    }
+}
 export class AUNChannel {
     config;
     client = null;
@@ -445,6 +485,10 @@ export class AUNChannel {
         'text', 'quote', 'image', 'video', 'voice', 'file', 'json',
         'merge', 'link', 'location', 'personal_card',
     ]);
+    /** Menu protocol 请求类型：自定义消息快速路径，绕过白名单直接分发到 bridge */
+    static MENU_REQUEST_TYPES = new Set([
+        'menu.list', 'menu.query', 'menu.options', 'menu.update', 'menu.action',
+    ]);
     // Reconnect state
     // SDK 自己跑无限指数退避（1s → 5min）；TS 层只在 SDK 够不到的两类场景下接管：
     //  1. flap：短命 connected 反复出现（SDK 不记忆跨轮 base delay，会从 1s 重新开始）
@@ -541,9 +585,11 @@ export class AUNChannel {
             this.client = null;
         }
         this.connected = false;
-        const aunPath = this.config.keystorePath || path.join(os.homedir(), '.aun');
+        const aunPath = this.config.keystorePath || resolveRoot();
         const aidName = this.config.aid;
         const encryptionSeed = this.config.encryptionSeed || process.env.AUN_ENCRYPTION_SEED || undefined;
+        // Migrate legacy ~/.aun data to EVOLCLAW_HOME on first run
+        migrateAunData(aunPath);
         // Gateway URL 解析：优先用配置的 gatewayUrl，否则通过 well-known 自动发现
         let gateway = this.config.gatewayUrl || '';
         if (!gateway) {
@@ -781,9 +827,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
             fs.mkdirSync(path.dirname(agentMdLocalPath), { recursive: true });
             fs.writeFileSync(agentMdLocalPath, newAgentMd, 'utf-8');
             logger.info(`${this.logPrefix()} Updated agent.md for ${aidName}`);
-            // Publish to AUN network via auth.uploadAgentMd
+            // Publish to AUN network via publishAgentMd (auto-sign)
             try {
-                await this.client.auth.uploadAgentMd(newAgentMd);
+                await this.client.publishAgentMd();
                 logger.info(`${this.logPrefix()} Published agent.md to AUN network`);
             }
             catch (e) {
@@ -800,8 +846,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
 2. **查看帮助**：发送 \`/help\` 查看所有可用命令
 3. **切换项目**：发送 \`/project <项目名>\` 切换到其他项目
 4. **查看状态**：发送 \`/status\` 查看当前会话状态
-5. **查看 Agent 信息**：发送 \`/agentmd\` 查看 agent.md 内容
-6. **会话管理**：发送 \`/session\` 查看和切换会话
+5. **会话管理**：发送 \`/session\` 查看和切换会话
 
 💡 **提示**：
 - 直接发送消息即可与 Claude/Codex 对话
@@ -963,8 +1008,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         // action_card_reply 已在 extractTextPayload 中消费，不分发给 agent
         if (p2pPayloadType === 'action_card_reply')
             return;
-        // menu.query：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
-        if (p2pPayloadType === 'menu.query') {
+        // menu.* 协议：自定义消息快速路径，需要原始 payload JSON 传递给 bridge
+        if (AUNChannel.MENU_REQUEST_TYPES.has(p2pPayloadType)) {
             this.acknowledgeImmediately(messageId, seq);
             this.dispatchMessage({
                 channelId: chatId, userId: fromAid,
@@ -1069,8 +1114,8 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         {
             const payloadObj = (payload && typeof payload === 'object') ? payload : null;
             const payloadType = payloadObj?.type ?? '';
-            // menu.query：自定义消息快速路径
-            if (payloadType === 'menu.query') {
+            // menu.* 协议：自定义消息快速路径
+            if (AUNChannel.MENU_REQUEST_TYPES.has(payloadType)) {
                 this.acknowledgeImmediately(messageId, seq);
                 this.dispatchMessage({
                     channelId: groupId, userId: senderAid,
@@ -2373,7 +2418,9 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         if (!this.client)
             return { type: null };
         try {
-            const md = await this.client.auth.downloadAgentMd(aid);
+            const { agentmdSync } = await import('../aun/aid/agentmd.js');
+            const result = await agentmdSync(aid, { client: this.client });
+            const md = result.content ?? '';
             const typeMatch = md.match(/^type:\s*["']?(\w+)["']?/m);
             const nameMatch = md.match(/^name:\s*["']?(.+?)["']?\s*$/m);
             const type = typeMatch?.[1] === 'human' ? 'human' : 'ai';
@@ -2385,7 +2432,7 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
         }
         catch (e) {
             logger.debug(`${this.logPrefix()} fetchPeerInfo failed for ${aid}: ${e}`);
-            return { type: null }; // no agent.md → unknown
+            return { type: null };
         }
     }
     /** 同步取 peerInfo 缓存，未命中返回 undefined，不发起任何网络请求。 */
@@ -2401,12 +2448,18 @@ EvolClaw AI Agent 网关，支持多项目会话管理和多 AI 后端切换。
     async uploadAgentMd(content) {
         if (!this.client)
             throw new Error('not connected');
-        await this.client.auth.uploadAgentMd(content);
+        const { agentMdPath } = await import('../paths.js');
+        const localPath = agentMdPath(this.config.aid);
+        fs.mkdirSync(path.dirname(localPath), { recursive: true });
+        fs.writeFileSync(localPath, content, 'utf-8');
+        await this.client.publishAgentMd();
     }
     async downloadAgentMd(aid) {
         if (!this.client)
             throw new Error('not connected');
-        return this.client.auth.downloadAgentMd(aid);
+        const { agentmdSync } = await import('../aun/aid/agentmd.js');
+        const result = await agentmdSync(aid, { client: this.client });
+        return result.content ?? '';
     }
 }
 // Plugin implementation

package/dist/cli/agent.js

@@ -8,6 +8,7 @@ import { ipcQuery } from '../ipc.js';
 import { CONFIG_SCHEMA_VERSION } from '../types.js';
 import { isValidChannelName } from '../core/channel-loader.js';
 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 = {
@@ -15,8 +16,13 @@ const BASEAGENT_ENV_KEY = {
     codex: 'OPENAI_API_KEY',
     gemini: 'GEMINI_API_KEY',
 };
+function isBaseagentAvailable(baseagent) {
+    if (baseagent === 'codex')
+        return isCodexSdkAvailable();
+    return commandExists(baseagent);
+}
 function detectAvailableBaseagents() {
-    return BASEAGENT_CANDIDATES.filter(b => commandExists(b));
+    return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefaultBaseagent(available) {
     if (available.length === 0)
@@ -316,7 +322,7 @@ export async function agentCreateInteractive(opts = {}) {
         // Baseagent
         const available = detectAvailableBaseagents();
         if (available.length === 0) {
-            return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
+            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
         }
         const defaultBa = pickDefaultBaseagent(available);
         let baseagent;
@@ -333,7 +339,7 @@ export async function agentCreateInteractive(opts = {}) {
                     continue;
                 }
                 if (!available.includes(input)) {
-                    console.log(`  ${input} not detected on PATH. Available: ${available.join('/')}`);
+                    console.log(`  ${input} is not available in the current environment. Available: ${available.join('/')}`);
                     continue;
                 }
                 chosen = input;
@@ -463,7 +469,7 @@ export async function agentCreateNonInteractive(opts) {
     // Baseagent
     const available = detectAvailableBaseagents();
     if (available.length === 0) {
-        return { ok: false, error: `No baseagent CLI detected on PATH. Install one of: ${BASEAGENT_CANDIDATES.join('/')}` };
+        return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
     }
     let baseagent;
     if (opts.baseagent) {
@@ -471,7 +477,7 @@ export async function agentCreateNonInteractive(opts) {
             return { ok: false, error: `Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})` };
         }
         if (!available.includes(opts.baseagent)) {
-            return { ok: false, error: `${opts.baseagent} not detected on PATH (available: ${available.join('/')})` };
+            return { ok: false, error: `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})` };
         }
         baseagent = opts.baseagent;
     }
@@ -592,7 +598,8 @@ export async function agentCreateNonInteractive(opts) {
         hotLoadError,
     };
 }
-// ==================== agentSyncAids ====================
+// ==================== agentSyncAids (deprecated) ====================
+/** @deprecated sync-aids 已废弃，不再从 CLI 调用 */
 export async function agentSyncAids() {
     const p = resolvePaths();
     const { aidList } = await import('../aun/aid/index.js');

package/dist/cli/index.js

@@ -2739,6 +2739,7 @@ async function cmdCtl(args) {
 查询:
   status                    查看会话状态
   check                     检查渠道健康状态
+  pwd                       显示当前项目路径
   help                      显示帮助
 
 配置:
@@ -2747,15 +2748,14 @@ async function cmdCtl(args) {
   compact                   压缩当前会话上下文
   perm [mode]               查看/切换权限模式
 
-项目:
-  bind <path>               注册项目目录（不切换当前会话）
-
 消息:
   send <消息内容>           主动发送文本消息（proactive 模式）
   file [channel] <path>     发送项目内文件
 
+Agent:
+  agent <subcommand>        EvolAgent 管理（list/show/new/enable/disable/reload/delete）
+
 运维:
-  agentmd [put|set <内容>]  查看/管理 agent.md（仅 AUN 通道）
   restart [channel]         重启服务或重连指定渠道
 
 示例:
@@ -2808,7 +2808,6 @@ Commands:
   show <aid>              查看 agent 详情（身份 + 配置 + 连接 + 会话 + 路径）
   new [aid]               交互式创建 agent
   new <aid> --non-interactive ...  非交互式创建
-  sync-aids               从本地 AID 批量创建 agent
   enable <aid>            启用 agent
   disable <aid>           停用 agent
   get <aid> <key>         读取单个配置字段（支持点路径）
@@ -2831,7 +2830,7 @@ Options:
   evolclaw agent delete mybot.agentid.pub --purge`);
         return;
     }
-    const { agentList, agentShow, agentCreateInteractive, agentCreateNonInteractive, agentSyncAids, agentReload, agentEnable, agentDisable, agentGet, agentSet, agentDelete, agentRename, } = await import('./agent.js');
+    const { agentList, agentShow, agentCreateInteractive, agentCreateNonInteractive, agentReload, agentEnable, agentDisable, agentGet, agentSet, agentDelete, agentRename, } = await import('./agent.js');
     // --- list ---
     if (!sub || sub === 'list') {
         const result = await agentList();
@@ -2966,36 +2965,28 @@ Options:
         }
         return;
     }
-    // --- sync-aids ---
-    if (sub === 'sync-aids') {
-        const result = await agentSyncAids();
-        if (!result.ok) {
-            if (formatJson) {
-                console.log(JSON.stringify(result));
-            }
-            else {
-                console.error(`❌ ${result.error}`);
-            }
-            process.exit(1);
-        }
-        if (formatJson) {
-            console.log(JSON.stringify(result, null, 2));
-            return;
-        }
-        if (result.created.length === 0) {
-            console.log('所有本地 AID 都已有对应 agent，无需同步。');
-        }
-        else {
-            console.log(`✓ 同步完成：新建 ${result.created.length} 个 agent（模板: ${result.template}）`);
-            for (const aid of result.created)
-                console.log(`  ✓ ${aid}`);
-            if (result.hotReloaded)
-                console.log('  ✓ 已热加载到运行中的进程');
-            else
-                console.log('  evolclaw 未运行，新 agent 将在下次启动时加载。');
-        }
-        return;
-    }
+    // --- sync-aids (deprecated, commented out) ---
+    // if (sub === 'sync-aids') {
+    //   const result = await agentSyncAids();
+    //   if (!result.ok) {
+    //     if (formatJson) { console.log(JSON.stringify(result)); }
+    //     else { console.error(`❌ ${result.error}`); }
+    //     process.exit(1);
+    //   }
+    //   if (formatJson) {
+    //     console.log(JSON.stringify(result, null, 2));
+    //     return;
+    //   }
+    //   if (result.created.length === 0) {
+    //     console.log('所有本地 AID 都已有对应 agent，无需同步。');
+    //   } else {
+    //     console.log(`✓ 同步完成：新建 ${result.created.length} 个 agent（模板: ${result.template}）`);
+    //     for (const aid of result.created) console.log(`  ✓ ${aid}`);
+    //     if (result.hotReloaded) console.log('  ✓ 已热加载到运行中的进程');
+    //     else console.log('  evolclaw 未运行，新 agent 将在下次启动时加载。');
+    //   }
+    //   return;
+    // }
     // --- reload ---
     if (sub === 'reload') {
         const target = args[1] && !args[1].startsWith('--') ? args[1] : undefined;
@@ -4645,7 +4636,6 @@ Commands:
                           --name <display-name>
                           --description <text>
                           --force                            (覆盖已有 config.json)
-                  agent sync-aids    从本地 AID 批量同步创建 agent（以最早 agent 为模板）
                   agent reload       全量 resync（扫磁盘，新增上线、删除下线、修改热更新）
                   agent reload <n>   热重载指定 agent 配置
   aid           AID 身份管理

package/dist/cli/init.js

@@ -4,6 +4,7 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
 import { saveDefaultsSafe, loadAllAgents } from '../config-store.js';
+import { isCodexSdkAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
@@ -14,8 +15,13 @@ const BASEAGENT_ENV_KEY = {
     codex: 'OPENAI_API_KEY',
     gemini: 'GEMINI_API_KEY',
 };
+function isBaseagentAvailable(baseagent) {
+    if (baseagent === 'codex')
+        return isCodexSdkAvailable();
+    return commandExists(baseagent);
+}
 function detectAvailable() {
-    return BASEAGENT_CANDIDATES.filter(b => commandExists(b));
+    return BASEAGENT_CANDIDATES.filter(isBaseagentAvailable);
 }
 function pickDefault(available) {
     return (available.includes('claude') ? 'claude' : available[0]);
@@ -45,9 +51,10 @@ export async function cmdInit(options) {
     // ── 2. 探测 baseagent ──
     const available = detectAvailable();
     if (available.length === 0) {
-        console.log('❌ 未检测到任何 baseagent CLI，请先安装至少一款：');
-        for (const b of BASEAGENT_CANDIDATES)
-            console.log(`  - ${b}`);
+        console.log('❌ 未检测到可用 baseagent。请安装至少一款：');
+        console.log('  - claude CLI');
+        console.log('  - gemini CLI');
+        console.log('  - optional dependency @openai/codex-sdk');
         console.log('\n安装后重新运行 evolclaw init');
         return;
     }
@@ -70,7 +77,7 @@ export async function cmdInit(options) {
                 return;
             }
             if (!available.includes(options.baseagent)) {
-                console.log(`❌ ${options.baseagent} 未在 PATH 中检测到（可用: ${available.join('/')}）`);
+                console.log(`❌ ${options.baseagent} 当前环境不可用（可用: ${available.join('/')}）`);
                 return;
             }
             chosen = options.baseagent;
@@ -104,7 +111,7 @@ export async function cmdInit(options) {
                 continue;
             }
             if (!available.includes(input)) {
-                console.log(`  ${input} 未在 PATH 中检测到（可用: ${available.join('/')}）`);
+                console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
                 continue;
             }
             chosen = input;