evolclaw 3.1.1 → 3.1.3

package/dist/cli/init.js

@@ -3,7 +3,8 @@ import readline from 'readline';
 import { resolvePaths, ensureDataDirs } from '../paths.js';
 import { commandExists } from '../utils/cross-platform.js';
 import { scanInstances } from '../utils/instance-registry.js';
-import { saveDefaultsSafe } from '../config-store.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;
@@ -81,19 +88,21 @@ export async function cmdInit(options) {
         writeDefaults(defaultsPath, chosen);
         console.log(`✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
         console.log(`  active_baseagent: ${chosen}`);
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('\n提示：尚无 agent，运行以下命令创建：');
+            console.log('  evolclaw agent new <aid>.agentid.pub');
+        }
         return;
     }
     // ── 4. 交互式分支 ──
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    try {
-        if (exists) {
-            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
-            if (ans !== 'y' && ans !== 'yes') {
-                console.log('  已取消');
-                return;
-            }
-        }
+    async function askBaseagent() {
         const defaultBa = pickDefault(available);
+        if (available.length === 1) {
+            console.log(`  baseagent: ${defaultBa}`);
+            return defaultBa;
+        }
         let chosen = null;
         while (chosen === null) {
             const input = (await ask(rl, `默认 baseagent (${available.join('/')}) [${defaultBa}]: `)).trim() || defaultBa;
@@ -102,22 +111,42 @@ export async function cmdInit(options) {
                 continue;
             }
             if (!available.includes(input)) {
-                console.log(`  ${input} 未在 PATH 中检测到（可用: ${available.join('/')}）`);
+                console.log(`  ${input} 当前环境不可用（可用: ${available.join('/')}）`);
                 continue;
             }
             chosen = input;
         }
-        writeDefaults(defaultsPath, chosen);
-        console.log(`\n✓ 已${exists ? '覆盖' : '创建'}: ${defaultsPath}`);
-        console.log(`  active_baseagent: ${chosen}\n`);
-        rl.close();
-        // ── 5. 嵌套 agent new ──
-        console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
-        console.log('下一步：创建 agent\n');
-        const { agentCreateInteractive } = await import('./agent.js');
-        const result = await agentCreateInteractive();
-        if (!result.ok) {
-            console.error(`❌ ${result.error}`);
+        return chosen;
+    }
+    try {
+        if (exists) {
+            const ans = (await ask(rl, `配置文件已存在: ${defaultsPath}\n  是否覆盖？[y/N] `)).trim().toLowerCase();
+            if (ans === 'y' || ans === 'yes') {
+                const chosen = await askBaseagent();
+                writeDefaults(defaultsPath, chosen);
+                console.log(`\n✓ 已覆盖: ${defaultsPath}`);
+                console.log(`  active_baseagent: ${chosen}\n`);
+            }
+            else {
+                console.log('  已跳过（保留现有配置）\n');
+            }
+        }
+        else {
+            const chosen = await askBaseagent();
+            writeDefaults(defaultsPath, chosen);
+            console.log(`\n✓ 已创建: ${defaultsPath}`);
+            console.log(`  active_baseagent: ${chosen}\n`);
+        }
+        // ── 5. 无 agent 时自动进入 agent new ──
+        const { agents } = loadAllAgents();
+        if (agents.length === 0) {
+            console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
+            console.log('下一步：创建 agent\n');
+            const { agentCreateInteractive } = await import('./agent.js');
+            const result = await agentCreateInteractive({ rl });
+            if (!result.ok) {
+                console.error(`❌ ${result.error}`);
+            }
         }
     }
     finally {

package/dist/cli/watch-msg.js

@@ -316,7 +316,9 @@ function renderMessagesPanel(state, width, height) {
         const metaTags = (m.encrypt != null || m.chatmode) ? `${MAGENTA}[${encLabel}|${modeLabel}]${RST}` : '';
         let typeTag = '';
         if (m.dir === 'out') {
-            const source = m.source === 'cli' ? 'cli' : 'daemon';
+            const rawSource = m.source;
+            // 4 种来源: daemon | ctl | msg | cli
+            const source = (rawSource === 'ctl' || rawSource === 'msg' || rawSource === 'cli') ? rawSource : 'daemon';
             const method = m.msgType === 'thought' ? 'thought' : 'send';
             typeTag = `${DIM}[${source}|${method}]${RST}`;
         }

package/dist/config-store.js

@@ -348,9 +348,30 @@ export function loadAgent(aid) {
     if (raw.aid !== aid) {
         throw new Error(`[config] ${p}: aid field "${raw.aid}" != directory name "${aid}"`);
     }
-    return expandEnvRefs(raw);
+    const cfg = expandEnvRefs(raw);
+    if (cfg.projects?.defaultPath) {
+        cfg.projects.defaultPath = cfg.projects.defaultPath.replace(/[/\\]+$/, '');
+    }
+    return cfg;
 }
 export function saveAgent(value) {
+    if (!isValidAid(value.aid)) {
+        throw new Error(`[config] saveAgent: invalid aid "${value.aid}" (must be a valid multi-level domain like mybot.agentid.pub)`);
+    }
+    if (value.owners) {
+        for (const o of value.owners) {
+            if (!isValidAid(o)) {
+                throw new Error(`[config] saveAgent: invalid owner AID "${o}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
+    if (value.admins) {
+        for (const a of value.admins) {
+            if (!isValidAid(a)) {
+                throw new Error(`[config] saveAgent: invalid admin AID "${a}" in ${value.aid} (must be a valid multi-level domain like alice.agentid.pub)`);
+            }
+        }
+    }
     atomicWriteJson(agentConfigPath(value.aid), value);
 }
 /**

package/dist/core/channel-loader.js

@@ -128,18 +128,18 @@ export class ChannelLoader {
 }
 const SEP = '#';
 export function formatChannelKey(k) {
-    return `${k.aid}${SEP}${k.type}${SEP}${k.name}`;
+    return `${k.type}${SEP}${encodeURIComponent(k.selfPeerId)}${SEP}${k.name}`;
 }
 export function parseChannelKey(key) {
     const parts = key.split(SEP);
     if (parts.length !== 3) {
         throw new Error(`Invalid channel key (expected 3 segments separated by '#'): ${key}`);
     }
-    const [aid, type, name] = parts;
-    if (!aid || !type || !name) {
+    const [type, encodedSelfPeerId, name] = parts;
+    if (!type || !encodedSelfPeerId || !name) {
         throw new Error(`Invalid channel key (empty segment): ${key}`);
     }
-    return { aid, type, name };
+    return { type, selfPeerId: decodeURIComponent(encodedSelfPeerId), name };
 }
 export function tryParseChannelKey(key) {
     try {