evolclaw 2.5.5 → 2.5.6

package/dist/agents/codex-runner.js

@@ -5,7 +5,6 @@
  * Implements the same interface surface as AgentRunner (claude-runner.ts)
  * so MessageProcessor and CommandHandler can work with it transparently.
  */
-import { Codex } from '@openai/codex-sdk';
 import { resolveOpenaiConfig } from '../config.js';
 import { logger } from '../utils/logger.js';
 import fs from 'fs';
@@ -24,24 +23,33 @@ const CODEX_MODELS = ['gpt-5.3-codex', 'gpt-5.2-codex', 'gpt-5-codex', 'gpt-5.2'
 export class CodexRunner {
     name = 'codex';
     capabilities = { clear: false, compact: false, fork: false };
-    codex;
+    codex = null;
+    codexModule = null;
     model;
     effort;
     activeAbortControllers = new Map();
     activeStreams = new Map();
     activeSessions = new Map(); // sessionId → threadId
     onSessionIdUpdate;
+    resolvedConfig;
     constructor(config, callbacks) {
-        const resolved = resolveOpenaiConfig(config);
-        this.codex = new Codex({
-            apiKey: resolved.apiKey,
-            baseUrl: resolved.baseUrl,
-        });
-        this.model = resolved.model;
-        if (resolved.effort)
-            this.effort = resolved.effort;
+        this.resolvedConfig = resolveOpenaiConfig(config);
+        this.model = this.resolvedConfig.model;
+        if (this.resolvedConfig.effort)
+            this.effort = this.resolvedConfig.effort;
         this.onSessionIdUpdate = callbacks.onSessionIdUpdate;
     }
+    async ensureCodex() {
+        if (!this.codex || !this.codexModule) {
+            const { requireOptional } = await import('../utils/init-channel.js');
+            this.codexModule = await requireOptional('@openai/codex-sdk');
+            this.codex = new this.codexModule.Codex({
+                apiKey: this.resolvedConfig.apiKey,
+                baseUrl: this.resolvedConfig.baseUrl,
+            });
+        }
+        return { codex: this.codex, mod: this.codexModule };
+    }
     // ── ModelSwitcher ──
     setModel(model) { this.model = model; }
     getModel() { return this.model; }
@@ -89,6 +97,7 @@ export class CodexRunner {
     async runQuery(sessionId, prompt, projectPath, initialAgentSessionId, images, systemPromptAppend, sessionManager) {
         // Agent ctl: 注入 EVOLCLAW_SESSION_ID 供子进程使用
         process.env.EVOLCLAW_SESSION_ID = sessionId;
+        const { codex } = await this.ensureCodex();
         let agentSessionId = initialAgentSessionId || this.activeSessions.get(sessionId);
         const threadOptions = {
             workingDirectory: projectPath,
@@ -99,8 +108,8 @@ export class CodexRunner {
             ...(this.effort ? { modelReasoningEffort: this.effort } : {}),
         };
         const thread = agentSessionId
-            ? this.codex.resumeThread(agentSessionId, threadOptions)
-            : this.codex.startThread(threadOptions);
+            ? codex.resumeThread(agentSessionId, threadOptions)
+            : codex.startThread(threadOptions);
         const controller = new AbortController();
         this.activeAbortControllers.set(sessionId, controller);
         // 构建输入：将 base64 图片写入临时文件，转换为 Codex SDK 的 local_image 格式
@@ -226,7 +235,7 @@ export class CodexRunner {
                     yield { type: 'tool_use', name: `MCP:${item.server}/${item.tool}`, input: item.arguments };
                 }
                 else if (item.type === 'file_change') {
-                    const desc = item.changes.map(c => `${c.kind} ${c.path}`).join(', ');
+                    const desc = item.changes.map((c) => `${c.kind} ${c.path}`).join(', ');
                     yield { type: 'tool_use', name: 'FileChange', input: { description: desc } };
                 }
                 else if (item.type === 'web_search') {

package/dist/channels/dingtalk.js

@@ -1,4 +1,5 @@
 import { logger } from '../utils/logger.js';
+import { requireOptional } from '../utils/init-channel.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
 // ── Webhook SSRF validation ────────────────────────────────────────────────────
 const WEBHOOK_RE = /^https:\/\/(api|oapi)\.dingtalk\.com\//;
@@ -56,7 +57,7 @@ export class DingtalkChannel {
         if (!clientId || !clientSecret || clientId.includes('your-') || clientSecret.includes('your-')) {
             throw new Error('DingTalk clientId/clientSecret not configured');
         }
-        const { DWClient, TOPIC_ROBOT } = await import('dingtalk-stream');
+        const { DWClient, TOPIC_ROBOT } = await requireOptional('dingtalk-stream');
         this.client = new DWClient({ clientId, clientSecret });
         this.client.registerCallbackListener(TOPIC_ROBOT, async (msg) => {
             await this.handleIncoming(msg);
@@ -320,7 +321,7 @@ export class DingtalkChannel {
                 return;
             }
             // Step 1: Upload media
-            const FormData = (await import('form-data')).default;
+            const FormData = (await requireOptional('form-data')).default;
             const form = new FormData();
             form.append('type', 'image');
             form.append('media', png, { filename: 'image.png', contentType: 'image/png' });
@@ -360,7 +361,7 @@ export class DingtalkChannel {
                 return;
             }
             // Step 1: Upload media
-            const FormData = (await import('form-data')).default;
+            const FormData = (await requireOptional('form-data')).default;
             const form = new FormData();
             form.append('type', 'file');
             form.append('media', fs.createReadStream(filePath), { filename: path.basename(filePath) });

package/dist/channels/feishu.js

@@ -1,4 +1,3 @@
-import * as lark from '@larksuiteoapi/node-sdk';
 import fs from 'fs';
 import path from 'path';
 import imageType from 'image-type';
@@ -41,6 +40,8 @@ export class FeishuChannel {
         if (this.config.appId.startsWith('YOUR_') || this.config.appSecret.startsWith('YOUR_')) {
             throw new Error('Feishu credentials not configured (placeholder values detected)');
         }
+        const { requireOptional } = await import('../utils/init-channel.js');
+        const lark = await requireOptional('@larksuiteoapi/node-sdk');
         try {
             this.client = new lark.Client({
                 appId: this.config.appId,

package/dist/channels/qqbot.js

@@ -1,5 +1,6 @@
 import { logger } from '../utils/logger.js';
 import { markdownToPlainText } from '../utils/format.js';
+import { requireOptional } from '../utils/init-channel.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
 // ── QQBotChannel ────────────────────────────────────────────────────────────
 export class QQBotChannel {
@@ -37,7 +38,7 @@ export class QQBotChannel {
         if (!appId || !clientSecret || appId.includes('your-') || clientSecret.includes('your-')) {
             throw new Error('QQBot appId/clientSecret not configured');
         }
-        const { QQBotClient } = await import('pure-qqbot');
+        const { QQBotClient } = await requireOptional('pure-qqbot');
         this.client = new QQBotClient({
             appId,
             clientSecret,

package/dist/channels/wecom.js

@@ -1,5 +1,6 @@
 import crypto from 'node:crypto';
 import { logger } from '../utils/logger.js';
+import { requireOptional } from '../utils/init-channel.js';
 import { normalizeChannelInstances, getChannelShowActivities } from '../config.js';
 // ── WecomChannel ───────────────────────────────────────────────────────────────
 export class WecomChannel {
@@ -31,7 +32,7 @@ export class WecomChannel {
         if (!botId || !secret) {
             throw new Error('WeCom botId/secret not configured');
         }
-        const { WSClient } = await import('@wecom/aibot-node-sdk');
+        const { WSClient } = await requireOptional('@wecom/aibot-node-sdk');
         this.client = new WSClient({ botId, secret });
         // Message events
         this.client.on('message', (frame) => {

package/dist/core/message/message-processor.js

@@ -681,7 +681,7 @@ export class MessageProcessor {
             // 区分超时 / 中断 / 错误
             const errType = classifyError(error);
             const interruptReason = this.interruptedSessions.get(session.id);
-            const isUserInterrupt = interruptReason === 'new_message' || interruptReason === 'stop';
+            const isUserInterrupt = interruptReason === 'new_message' || interruptReason === 'stop' || interruptReason === 'recalled';
             const procStatus = errType === ErrorType.SDK_TIMEOUT ? 'timeout'
                 : errType === ErrorType.STREAM_ERROR ? 'interrupted'
                     : 'error';
@@ -889,7 +889,7 @@ export class MessageProcessor {
                         // 失败且无前置错误输出：显示 errors 摘要
                         // 但用户主动中断（新消息打断 或 /stop 命令）时不显示错误提示
                         const interruptReason = this.interruptedSessions.get(session.id);
-                        const isUserInterrupt = interruptReason === 'new_message' || interruptReason === 'stop';
+                        const isUserInterrupt = interruptReason === 'new_message' || interruptReason === 'stop' || interruptReason === 'recalled';
                         if (event.isError && !hasErrorResult && !shouldSuppress() && !isUserInterrupt) {
                             const errorSummary = event.errors?.join('; ') || '\u4efb\u52a1\u6267\u884c\u5931\u8d25';
                             // 使用 terminalReason 提供更友好的错误提示

package/dist/utils/init-channel.js

@@ -36,6 +36,22 @@ export async function npmInstallGlobal(pkg) {
         }
     }
 }
+/** Dynamic import with auto-install fallback for optional dependencies */
+export async function requireOptional(pkg, autoInstall = true) {
+    try {
+        return await import(pkg);
+    }
+    catch (e) {
+        if (e.code !== 'ERR_MODULE_NOT_FOUND' && e.code !== 'MODULE_NOT_FOUND')
+            throw e;
+        if (!autoInstall)
+            throw new Error(`依赖 ${pkg} 未安装。请运行: npm install -g ${pkg}`);
+        const { logger } = await import('./logger.js');
+        logger.info(`正在安装可选依赖 ${pkg}...`);
+        await npmInstallGlobal(pkg);
+        return await import(pkg);
+    }
+}
 function ask(rl, question) {
     return new Promise(resolve => rl.question(question, resolve));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "Lightweight AI Agent gateway connecting Claude Agent SDK to messaging channels (Feishu, ACP) with multi-project session management",
   "type": "module",
   "main": "dist/index.js",
@@ -11,8 +11,7 @@
     "dist/",
     "!dist/experimental/",
     "data/evolclaw.sample.json",
-    "evolclaw-install-aun.md",
-    "aun/pyproject.toml"
+    "evolclaw-install-aun.md"
   ],
   "scripts": {
     "dev": "tsx watch src/index.ts",
@@ -26,19 +25,20 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.100",
     "@agentunion/aun-node": "^0.2.12",
+    "image-type": "^6.0.0",
+    "qrcode-terminal": "^0.12.0"
+  },
+  "optionalDependencies": {
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@openai/codex-sdk": "^0.118.0",
-    "@types/form-data": "^2.2.1",
     "@wecom/aibot-node-sdk": "^1.0.6",
     "dingtalk-stream": "^2.1.6-beta.1",
-    "fast-xml-parser": "^5.7.2",
     "form-data": "^4.0.5",
-    "image-type": "^6.0.0",
-    "pure-qqbot": "^2.0.0",
-    "qrcode-terminal": "^0.12.0"
+    "pure-qqbot": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^25.5.0",
+    "@types/form-data": "^2.2.1",
     "@types/qrcode-terminal": "^0.12.2",
     "@vitest/coverage-v8": "^4.1.0",
     "tsx": "^4.19.0",

package/aun/pyproject.toml

@@ -1,20 +0,0 @@
-[project]
-name = "aun-cli"
-version = "0.1.0"
-description = "AUN CLI - Interactive command-line client for AUN protocol"
-requires-python = ">=3.10"
-dependencies = [
-    "aunp>=0.2.12",
-    "prompt-toolkit>=3.0.0",
-    "rich>=13.0.0",
-]
-
-[project.scripts]
-aun = "aun_cli:cli_main"
-
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[tool.setuptools]
-py-modules = ["aun_cli"]