evolclaw 3.1.11 → 3.3.0

package/dist/channels/wecom.js

@@ -1,7 +1,7 @@
 import crypto from 'node:crypto';
 import { logger } from '../utils/logger.js';
 import { requireOptional } from '../utils/npm-ops.js';
-import { normalizeChannelInstances, getChannelShowActivities } from '../utils/channel-helpers.js';
+import { resolveShowActivities, showActivitiesPolicy } from '../core/channel-loader.js';
 import { formatItemsAsText } from '../core/message/items-formatter.js';
 // ── WecomChannel ───────────────────────────────────────────────────────────────
 export class WecomChannel {
@@ -465,143 +465,80 @@ function isValidCredential(value) {
 }
 export class WecomChannelPlugin {
     name = 'wecom';
-    isEnabled(config) {
-        const raw = config.channels?.wecom;
-        if (!raw)
-            return false;
-        if (Array.isArray(raw)) {
-            return raw.some(inst => inst.enabled !== false && isValidCredential(inst.botId) && isValidCredential(inst.secret));
-        }
-        if (raw.enabled === false)
-            return false;
-        return isValidCredential(raw.botId) && isValidCredential(raw.secret);
-    }
-    async createChannels(config) {
-        const instances = normalizeChannelInstances(config.channels?.wecom, 'wecom');
-        const result = [];
-        for (const inst of instances) {
-            if (inst.enabled === false)
-                continue;
-            if (!isValidCredential(inst.botId) || !isValidCredential(inst.secret))
-                continue;
-            const channel = new WecomChannel({
-                botId: inst.botId,
-                secret: inst.secret,
-            });
-            const adapter = {
-                channelName: inst.name,
-                channelKey: inst.name,
-                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;
-                    switch (payload.kind) {
-                        case 'result.text':
-                        case 'command.result':
-                        case 'command.error':
-                        case 'system.notice':
-                        case 'system.error':
-                        case 'result.error':
-                            await channel.sendMessage(channelId, payload.text);
-                            return;
-                        case 'result.file':
-                            await channel.sendFile(channelId, payload.filePath);
-                            return;
-                        case 'result.image':
-                            await channel.sendImage(channelId, payload.data);
-                            return;
-                        case 'activity.batch': {
-                            const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
-                            const text = formatItemsAsText(filtered);
-                            if (text)
-                                await channel.sendMessage(channelId, text);
-                            return;
-                        }
-                        case 'interaction':
-                            if (payload.fallbackText)
-                                await channel.sendMessage(channelId, payload.fallbackText);
-                            return;
-                        case 'status.started':
-                        case 'status.completed':
-                        case 'status.interrupted':
-                        case 'status.error':
-                        case 'status.timeout':
-                        case 'status.progress':
-                        case 'custom':
-                            return;
-                        default:
-                            logger.warn(`[WeCom] Unhandled payload kind: ${payload.kind}`);
+    async createInstance(inst, ctx) {
+        if (inst.enabled === false)
+            return null;
+        if (!isValidCredential(inst.botId) || !isValidCredential(inst.secret))
+            return null;
+        const channel = new WecomChannel({
+            botId: inst.botId,
+            secret: inst.secret,
+        });
+        const mode = resolveShowActivities(inst);
+        const adapter = {
+            channelName: inst.name,
+            channelKey: inst.name,
+            capabilities: { file: true, image: true, interaction: false, markdown: true, thought: false, status: false, thread: false },
+            send: async (envelope, payload) => {
+                const channelId = envelope.channelId;
+                switch (payload.kind) {
+                    case 'result.text':
+                    case 'command.result':
+                    case 'command.error':
+                    case 'system.notice':
+                    case 'system.error':
+                    case 'result.error':
+                        await channel.sendMessage(channelId, payload.text);
+                        return;
+                    case 'result.file':
+                        await channel.sendFile(channelId, payload.filePath);
+                        return;
+                    case 'result.image':
+                        await channel.sendImage(channelId, payload.data);
+                        return;
+                    case 'activity.batch': {
+                        const filtered = payload.items.filter((i) => !(i.kind === 'tool_result' && i.ok));
+                        const text = formatItemsAsText(filtered);
+                        if (text)
+                            await channel.sendMessage(channelId, text);
+                        return;
                     }
-                },
-            };
-            const policy = {
-                canSwitchProject: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                canListProjects: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                canCreateSession: () => true,
-                canDeleteSession: () => true,
-                canImportCliSession: (_chatType, identity) => identity === 'owner' || identity === 'admin',
-                messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
-                showMiddleResult: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                showIdleMonitor: (chatType, identity) => {
-                    const mode = getChannelShowActivities(config, inst.name);
-                    if (mode === 'none')
-                        return false;
-                    if (mode === 'dm-only')
-                        return chatType === 'private';
-                    if (mode === 'owner-dm-only')
-                        return chatType === 'private' && identity === 'owner';
-                    return true;
-                },
-                accumulateErrors: () => true,
-            };
-            const options = {
-                fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g,
-                supportsImages: true,
-                flushDelay: inst.flushDelay,
-            };
-            result.push({
-                channelType: 'wecom',
-                adapter,
-                channel,
-                policy,
-                options,
-                connect: () => channel.connect(),
-                disconnect: () => channel.disconnect(),
-                onProjectPathRequest: () => Promise.resolve(config.projects?.defaultPath || process.cwd()),
-                registerBridge(bridge, channelType) {
-                    bridge.register(adapter.channelName, (handler) => channel.onMessage(async (event) => {
-                        handler({
-                            channel: adapter.channelName,
-                            channelType,
-                            channelId: event.channelId,
-                            selfAID: inst.agentName,
-                            content: event.content,
-                            images: event.images,
-                            chatType: event.chatType || 'private',
-                            peerId: event.peerId || '',
-                            peerName: event.peerName,
-                            messageId: event.messageId,
-                        });
-                    }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
-                },
-            });
-        }
-        return result;
-    }
-    async createChannel(config) {
-        const instances = await this.createChannels(config);
-        if (instances.length === 0) {
-            throw new Error('WeCom config missing or invalid');
-        }
-        return instances[0];
+                    case 'interaction':
+                        if (payload.fallbackText)
+                            await channel.sendMessage(channelId, payload.fallbackText);
+                        return;
+                    default: return;
+                }
+            },
+        };
+        const policy = {
+            canSwitchProject: (_, identity) => identity === 'owner' || identity === 'admin',
+            canListProjects: (_, identity) => identity === 'owner' || identity === 'admin',
+            canCreateSession: () => true,
+            canDeleteSession: () => true,
+            canImportCliSession: (_, identity) => identity === 'owner' || identity === 'admin',
+            messagePrefix: (chatType, peerName) => (chatType === 'group' && peerName) ? `[${peerName}] ` : '',
+            showMiddleResult: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            showIdleMonitor: (chatType, identity) => showActivitiesPolicy(mode, chatType, identity),
+            accumulateErrors: () => true,
+        };
+        return {
+            channelType: 'wecom', adapter, channel,
+            policy,
+            options: { fileMarkerPattern: /\[SEND_FILE:(?:(\w+):)?([^\]]+)\]/g, supportsImages: true, flushDelay: inst.flushDelay },
+            connect: () => channel.connect(),
+            disconnect: () => channel.disconnect(),
+            onProjectPathRequest: () => Promise.resolve(ctx.defaultProjectPath),
+            registerBridge(bridge, channelType) {
+                bridge.register(adapter.channelName, (handler) => channel.onMessage(async (event) => {
+                    handler({
+                        channel: adapter.channelName, channelType, channelId: event.channelId,
+                        selfAID: ctx.agentName, content: event.content, images: event.images,
+                        chatType: event.chatType || 'private', peerId: event.peerId || '',
+                        peerName: event.peerName, messageId: event.messageId,
+                    });
+                }), (channelId, text) => channel.sendMessage(channelId, text), adapter, channelType);
+            },
+        };
     }
 }

package/dist/cli/agent.js

@@ -7,12 +7,12 @@ 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';
+import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../agents/codex-runner.js';
 // ==================== Helpers ====================
 const BASEAGENT_CANDIDATES = ['claude', 'codex', 'gemini'];
 function isBaseagentAvailable(baseagent) {
     if (baseagent === 'codex')
-        return isCodexSdkAvailable();
+        return isCodexAppServerAvailable();
     return commandExists(baseagent);
 }
 function detectAvailableBaseagents() {
@@ -313,7 +313,7 @@ export async function agentCreateInteractive(opts = {}) {
         // Baseagent
         const available = detectAvailableBaseagents();
         if (available.length === 0) {
-            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
+            return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server.` };
         }
         const defaultBa = pickDefaultBaseagent(available);
         let baseagent;
@@ -450,26 +450,35 @@ export async function agentCreateInteractive(opts = {}) {
 export async function agentCreateNonInteractive(opts) {
     const p = resolvePaths();
     const { isValidAid, aidCreate } = await import('../aun/aid/index.js');
+    opts.onPhase?.('validating', 'begin');
+    /** 校验失败：透出 failed 进度并返回原结构（控制流不变）。 */
+    const failValidating = (error) => {
+        opts.onPhase?.('validating', 'failed', error);
+        return { ok: false, error };
+    };
     if (!isValidAid(opts.aid)) {
-        return { ok: false, error: `Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)` };
+        return failValidating(`Invalid AID "${opts.aid}": must be a valid multi-level domain (e.g. mybot.agentid.pub)`);
     }
     const agentDirPath = path.join(p.agentsDir, opts.aid);
     const configExists = fs.existsSync(path.join(agentDirPath, 'config.json'));
     if (configExists && !opts.force) {
-        return { ok: false, error: `Agent "${opts.aid}" already exists: ${agentDirPath}/config.json (use --force to overwrite)` };
+        return failValidating(`Agent "${opts.aid}" already exists: ${agentDirPath}/config.json (use --force to overwrite)`);
     }
     // Baseagent
     const available = detectAvailableBaseagents();
     if (available.length === 0) {
-        return { ok: false, error: `No usable baseagent detected. Install claude/gemini CLI or optional dependency @openai/codex-sdk.` };
+        return failValidating(`No usable baseagent detected. Install claude/gemini CLI or codex CLI with app-server.`);
     }
     let baseagent;
     if (opts.baseagent) {
         if (!BASEAGENT_CANDIDATES.includes(opts.baseagent)) {
-            return { ok: false, error: `Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})` };
+            return failValidating(`Invalid baseagent: ${opts.baseagent} (options: ${BASEAGENT_CANDIDATES.join('/')})`);
         }
         if (!available.includes(opts.baseagent)) {
-            return { ok: false, error: `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})` };
+            const reason = opts.baseagent === 'codex'
+                ? getCodexAppServerAvailability().reason
+                : undefined;
+            return failValidating(reason || `${opts.baseagent} is not available in the current environment (available: ${available.join('/')})`);
         }
         baseagent = opts.baseagent;
     }
@@ -477,20 +486,22 @@ export async function agentCreateNonInteractive(opts) {
         baseagent = pickDefaultBaseagent(available);
     }
     if (!path.isAbsolute(opts.project)) {
-        return { ok: false, error: `--project must be absolute: ${opts.project}` };
+        return failValidating(`--project must be absolute: ${opts.project}`);
     }
     if (!fs.existsSync(opts.project)) {
         try {
             fs.mkdirSync(opts.project, { recursive: true });
         }
         catch (e) {
-            return { ok: false, error: `Failed to create ${opts.project}: ${e?.message || e}` };
+            return failValidating(`Failed to create ${opts.project}: ${e?.message || e}`);
         }
     }
     if (opts.owner && !isValidAid(opts.owner)) {
-        return { ok: false, error: `Invalid owner: ${opts.owner}` };
+        return failValidating(`Invalid owner: ${opts.owner}`);
     }
+    opts.onPhase?.('validating', 'done');
     // Register AID
+    opts.onPhase?.('registering_aid', 'begin');
     let aidCreated = false;
     try {
         const result = await aidCreate(opts.aid);
@@ -499,9 +510,12 @@ export async function agentCreateNonInteractive(opts) {
         }
         catch { /* ignore */ }
         aidCreated = !result.alreadyExisted;
+        opts.onPhase?.('registering_aid', 'done', aidCreated ? 'created' : 'existed');
     }
     catch (e) {
-        return { ok: false, error: `AID creation failed: ${e?.message || e}` };
+        const error = `AID creation failed: ${e?.message || e}`;
+        opts.onPhase?.('registering_aid', 'failed', error);
+        return { ok: false, error };
     }
     // Force 模式下若 agent 已存在且已 initialized，保留该状态（避免重复发欢迎）
     let preservedInitialized = false;
@@ -526,9 +540,12 @@ export async function agentCreateNonInteractive(opts) {
         chatmode: { ...DEFAULT_CHATMODE },
         dispatch: DEFAULT_DISPATCH,
     };
+    opts.onPhase?.('config_saved', 'begin');
     saveAgent(agentConfig);
     ensureAgentDirSkeleton(opts.aid);
+    opts.onPhase?.('config_saved', 'done');
     // Generate and upload agent.md
+    opts.onPhase?.('uploading_agentmd', 'begin');
     let agentmdUploaded = false;
     try {
         const { buildInitialAgentMd, agentmdPut } = await import('../aun/aid/index.js');
@@ -550,6 +567,7 @@ export async function agentCreateNonInteractive(opts) {
                     await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
                 await agentmdPut(content, { aid: opts.aid, aunPath });
                 agentmdUploaded = true;
+                opts.onPhase?.('uploading_agentmd', 'done');
                 break;
             }
             catch (e) {
@@ -559,11 +577,13 @@ export async function agentCreateNonInteractive(opts) {
         if (!agentmdUploaded) {
             console.warn(`⚠ agent.md upload failed: ${lastError?.message || lastError}`);
             console.warn(`  Retry later with: evolclaw aid agentmd put ${opts.aid}`);
+            opts.onPhase?.('uploading_agentmd', 'warn', `upload failed: ${lastError?.message || lastError}`);
         }
         await new Promise(r => setTimeout(r, 0));
     }
     catch (e) {
         console.warn(`⚠ agent.md generation failed: ${e?.message || e}`);
+        opts.onPhase?.('uploading_agentmd', 'warn', `generation failed: ${e?.message || e}`);
     }
     // Attempt hot-load via IPC (if daemon is running).
     // Cold-starting a new agent (connecting AUN WebSocket) routinely takes
@@ -571,16 +591,24 @@ export async function agentCreateNonInteractive(opts) {
     // report while the daemon actually finishes bringing the agent online.
     let hotLoaded = false;
     let hotLoadError;
+    opts.onPhase?.('hot_loading', 'begin');
     try {
         const ipcResult = await ipcQuery(p.socket, { type: 'evolagent.load', aid: opts.aid }, 30_000);
         if (ipcResult?.ok) {
             hotLoaded = true;
+            opts.onPhase?.('hot_loading', 'done');
         }
         else if (ipcResult) {
             hotLoadError = ipcResult.error;
+            opts.onPhase?.('hot_loading', 'warn', hotLoadError);
+        }
+        else {
+            opts.onPhase?.('hot_loading', 'warn', 'daemon not running');
         }
     }
-    catch { /* daemon not running */ }
+    catch {
+        opts.onPhase?.('hot_loading', 'warn', 'daemon not running'); /* daemon not running */
+    }
     return {
         ok: true,
         aid: opts.aid,
@@ -858,6 +886,9 @@ export async function agentDelete(aid, purge = false) {
     }
     else {
         fs.unlinkSync(configPath);
+        // 清理构建进度文件（非 purge 删除只移除 config.json，需显式清理 create-status.json）
+        const { removeCreateStatus } = await import('../core/message/create-status.js');
+        removeCreateStatus(agentDir);
     }
     // Trigger resync so daemon drops the agent
     try {