evolclaw 2.0.1 → 2.0.3

package/dist/utils/init-wechat.js

@@ -0,0 +1,170 @@
+import fs from 'fs';
+import readline from 'readline';
+import { resolvePaths } from '../paths.js';
+const DEFAULT_BASE_URL = 'https://ilinkai.weixin.qq.com';
+const BOT_TYPE = '3';
+const QR_POLL_TIMEOUT_MS = 35_000;
+const LOGIN_TIMEOUT_MS = 480_000;
+function ask(rl, question) {
+    return new Promise(resolve => rl.question(question, resolve));
+}
+async function fetchQRCode(baseUrl) {
+    const base = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+    const url = `${base}ilink/bot/get_bot_qrcode?bot_type=${BOT_TYPE}`;
+    const res = await fetch(url);
+    if (!res.ok)
+        throw new Error(`QR fetch failed: ${res.status}`);
+    return (await res.json());
+}
+async function pollQRStatus(baseUrl, qrcode) {
+    const base = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
+    const url = `${base}ilink/bot/get_qrcode_status?qrcode=${encodeURIComponent(qrcode)}`;
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), QR_POLL_TIMEOUT_MS);
+    try {
+        const res = await fetch(url, {
+            headers: { 'iLink-App-ClientVersion': '1' },
+            signal: controller.signal,
+        });
+        clearTimeout(timer);
+        if (!res.ok)
+            throw new Error(`QR status failed: ${res.status}`);
+        return (await res.json());
+    }
+    catch (err) {
+        clearTimeout(timer);
+        if (err instanceof Error && err.name === 'AbortError') {
+            return { status: 'wait' };
+        }
+        throw err;
+    }
+}
+export async function runWechatQrFlow() {
+    const qrResp = await fetchQRCode(DEFAULT_BASE_URL);
+    try {
+        const qrterm = await import('qrcode-terminal');
+        await new Promise(resolve => {
+            qrterm.default.generate(qrResp.qrcode_img_content, { small: true }, (qr) => {
+                console.log(qr);
+                resolve();
+            });
+        });
+    }
+    catch {
+        console.log(`请在浏览器中打开此链接扫码: ${qrResp.qrcode_img_content}\n`);
+    }
+    console.log('请用微信扫描上方二维码...\n');
+    const deadline = Date.now() + LOGIN_TIMEOUT_MS;
+    let scannedPrinted = false;
+    while (Date.now() < deadline) {
+        const status = await pollQRStatus(DEFAULT_BASE_URL, qrResp.qrcode);
+        switch (status.status) {
+            case 'wait':
+                process.stdout.write('.');
+                break;
+            case 'scaned':
+                if (!scannedPrinted) {
+                    console.log('\n👀 已扫码，请在微信中确认...');
+                    scannedPrinted = true;
+                }
+                break;
+            case 'expired':
+                console.error('\n二维码已过期');
+                return null;
+            case 'confirmed':
+                if (!status.ilink_bot_id || !status.bot_token) {
+                    console.error('\n登录失败：服务器未返回完整信息');
+                    return null;
+                }
+                return {
+                    baseUrl: status.baseurl || DEFAULT_BASE_URL,
+                    token: status.bot_token,
+                };
+        }
+        await new Promise(r => setTimeout(r, 1000));
+    }
+    console.log('\n登录超时');
+    return null;
+}
+export async function cmdInitWechat() {
+    const p = resolvePaths();
+    if (!fs.existsSync(p.config)) {
+        console.log(`❌ 配置文件不存在，请先运行 evolclaw init`);
+        return;
+    }
+    const config = JSON.parse(fs.readFileSync(p.config, 'utf-8'));
+    // 检查已有配置
+    if (config.channels?.wechat?.token) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        try {
+            const answer = (await ask(rl, '已有微信配置，是否重新登录？[y/N] ')).trim().toLowerCase();
+            if (answer !== 'y' && answer !== 'yes') {
+                console.log('已取消');
+                return;
+            }
+        }
+        finally {
+            rl.close();
+        }
+    }
+    console.log('正在获取微信登录二维码...\n');
+    const qrResp = await fetchQRCode(DEFAULT_BASE_URL);
+    // 终端显示二维码
+    try {
+        const qrterm = await import('qrcode-terminal');
+        await new Promise(resolve => {
+            qrterm.default.generate(qrResp.qrcode_img_content, { small: true }, (qr) => {
+                console.log(qr);
+                resolve();
+            });
+        });
+    }
+    catch {
+        console.log(`请在浏览器中打开此链接扫码: ${qrResp.qrcode_img_content}\n`);
+    }
+    console.log('请用微信扫描上方二维码...\n');
+    const deadline = Date.now() + LOGIN_TIMEOUT_MS;
+    let scannedPrinted = false;
+    while (Date.now() < deadline) {
+        const status = await pollQRStatus(DEFAULT_BASE_URL, qrResp.qrcode);
+        switch (status.status) {
+            case 'wait':
+                process.stdout.write('.');
+                break;
+            case 'scaned':
+                if (!scannedPrinted) {
+                    console.log('\n👀 已扫码，请在微信中确认...');
+                    scannedPrinted = true;
+                }
+                break;
+            case 'expired':
+                console.log('\n二维码已过期，请重新运行 evolclaw init wechat');
+                process.exit(1);
+                break;
+            case 'confirmed': {
+                if (!status.ilink_bot_id || !status.bot_token) {
+                    console.error('\n登录失败：服务器未返回完整信息');
+                    process.exit(1);
+                }
+                // 写入配置
+                if (!config.channels)
+                    config.channels = {};
+                config.channels.wechat = {
+                    enabled: true,
+                    baseUrl: status.baseurl || DEFAULT_BASE_URL,
+                    token: status.bot_token,
+                };
+                fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');
+                console.log(`\n✅ 微信连接成功！`);
+                console.log(`  Bot ID: ${status.ilink_bot_id}`);
+                console.log(`  User ID: ${status.ilink_user_id}`);
+                console.log(`  配置已写入: ${p.config}`);
+                console.log(`\n现在可以启动服务: evolclaw restart`);
+                return;
+            }
+        }
+        await new Promise(r => setTimeout(r, 1000));
+    }
+    console.log('\n登录超时，请重新运行');
+    process.exit(1);
+}

package/dist/utils/init.js

@@ -29,12 +29,9 @@ async function sudoExec(cmd, args) {
     // 让 n 安装到当前 node 所在的 prefix 目录
     const env = { ...process.env };
     if (cmd === 'n' && !env.N_PREFIX) {
-        try {
-            const nodePrefix = execFileSync('node', ['-e', 'process.stdout.write(process.config.variables.node_prefix)'], { encoding: 'utf-8' });
-            if (nodePrefix)
-                env.N_PREFIX = nodePrefix;
-        }
-        catch { }
+        const nodePrefix = process.config.variables?.node_prefix;
+        if (nodePrefix)
+            env.N_PREFIX = nodePrefix;
     }
     try {
         await execFileAsync(cmd, args, { timeout: 120000, env });
@@ -129,7 +126,8 @@ async function checkEnvironment(rl) {
                 await npmInstallGlobal('n');
                 console.log('  正在升级 Node.js...');
                 await sudoExec('n', ['22']);
-                console.log('  ✓ Node.js 升级完成，请重新运行 evolclaw init');
+                console.log('  ✓ Node.js 升级完成');
+                console.log('  → 请打开新终端后重新运行 evolclaw init');
                 return false;
             }
             catch (e) {
@@ -186,22 +184,10 @@ async function checkEnvironment(rl) {
     // @anthropic-ai/claude-agent-sdk >= 0.2.75
     let sdkAction = 'ok';
     try {
-        let sdkPkgPath = null;
+        // 用 require.resolve 找到 SDK 入口，推导 package.json 路径
         const esmRequire = createRequire(import.meta.url);
-        try {
-            sdkPkgPath = esmRequire.resolve('@anthropic-ai/claude-agent-sdk/package.json');
-        }
-        catch {
-            try {
-                const globalRoot = execFileSync('npm', ['root', '-g'], { encoding: 'utf-8' }).trim();
-                const globalPath = path.join(globalRoot, '@anthropic-ai', 'claude-agent-sdk', 'package.json');
-                if (fs.existsSync(globalPath))
-                    sdkPkgPath = globalPath;
-            }
-            catch { }
-        }
-        if (!sdkPkgPath)
-            throw new Error('not found');
+        const sdkEntry = esmRequire.resolve('@anthropic-ai/claude-agent-sdk');
+        const sdkPkgPath = path.join(path.dirname(sdkEntry), 'package.json');
         const sdkPkg = JSON.parse(fs.readFileSync(sdkPkgPath, 'utf-8'));
         const sdkVer = sdkPkg.version;
         const parts = sdkVer.split('.').map(Number);
@@ -270,11 +256,50 @@ function setupEnvVar(home) {
     }
     console.log('  ⚠ 请重新打开终端或执行 source 使其生效');
 }
+// ==================== Feishu Manual Input ====================
+async function initFeishuManual(rl, config) {
+    let appId = '';
+    while (!appId) {
+        appId = (await ask(rl, '  飞书 App ID: ')).trim();
+        if (!appId)
+            console.log('  ⚠ 不能为空');
+    }
+    let appSecret = '';
+    while (!appSecret) {
+        appSecret = (await ask(rl, '  飞书 App Secret: ')).trim();
+        if (!appSecret)
+            console.log('  ⚠ 不能为空');
+    }
+    console.log('  正在验证飞书凭证...');
+    try {
+        const lark = await import('@larksuiteoapi/node-sdk');
+        const client = new lark.Client({ appId, appSecret });
+        const res = await client.auth.tenantAccessToken.internal({
+            data: { app_id: appId, app_secret: appSecret },
+        });
+        if (res.code === 0) {
+            console.log('  ✓ 飞书凭证验证通过');
+        }
+        else {
+            console.log(`  ✗ 飞书凭证验证失败: ${res.msg}`);
+            const answer = (await ask(rl, '  → 是否继续？[y/N] ')).trim().toLowerCase();
+            if (answer !== 'y' && answer !== 'yes') {
+                return false;
+            }
+        }
+    }
+    catch (e) {
+        console.log(`  ⚠ 飞书凭证验证跳过: ${e.message?.slice(0, 100) || e}`);
+    }
+    config.channels.feishu.appId = appId;
+    config.channels.feishu.appSecret = appSecret;
+    config.channels.feishu.enabled = true;
+    return true;
+}
 // ==================== Main ====================
 export async function cmdInit() {
     const p = resolvePaths();
     ensureDataDirs();
-    // 检查服务是否在运行
     if (fs.existsSync(p.pid)) {
         const pid = parseInt(fs.readFileSync(p.pid, 'utf-8').trim(), 10);
         try {
@@ -302,49 +327,11 @@ export async function cmdInit() {
             return;
         }
         console.log('📝 交互式配置\n');
-        // feishu.appId
-        let appId = '';
-        while (!appId) {
-            appId = (await ask(rl, '  飞书 App ID: ')).trim();
-            if (!appId)
-                console.log('  ⚠ 不能为空');
-        }
-        // feishu.appSecret
-        let appSecret = '';
-        while (!appSecret) {
-            appSecret = (await ask(rl, '  飞书 App Secret: ')).trim();
-            if (!appSecret)
-                console.log('  ⚠ 不能为空');
-        }
-        // 验证飞书凭证
-        console.log('  正在验证飞书凭证...');
-        try {
-            const lark = await import('@larksuiteoapi/node-sdk');
-            const client = new lark.Client({ appId, appSecret });
-            const res = await client.auth.tenantAccessToken.internal({
-                data: { app_id: appId, app_secret: appSecret },
-            });
-            if (res.code === 0) {
-                console.log('  ✓ 飞书凭证验证通过');
-            }
-            else {
-                console.log(`  ✗ 飞书凭证验证失败: ${res.msg}`);
-                const answer = (await ask(rl, '  → 是否继续？[y/N] ')).trim().toLowerCase();
-                if (answer !== 'y' && answer !== 'yes') {
-                    console.log('  已取消');
-                    return;
-                }
-            }
-        }
-        catch (e) {
-            console.log(`  ⚠ 飞书凭证验证跳过: ${e.message?.slice(0, 100) || e}`);
-        }
-        // projects.defaultPath
+        // 通用配置
         const defaultSuggestion = path.join(os.homedir(), 'evolclaw-project');
         let defaultPath = (await ask(rl, `  默认项目路径 [${defaultSuggestion}]: `)).trim();
-        if (!defaultPath) {
+        if (!defaultPath)
             defaultPath = defaultSuggestion;
-        }
         if (defaultPath.startsWith('~/')) {
             defaultPath = path.join(os.homedir(), defaultPath.slice(2));
         }
@@ -355,19 +342,61 @@ export async function cmdInit() {
             fs.mkdirSync(defaultPath, { recursive: true });
             console.log(`  ✓ 已创建目录: ${defaultPath}`);
         }
-        // anthropic.model
         const modelInput = (await ask(rl, '  模型 [sonnet(默认)/opus/haiku]: ')).trim().toLowerCase();
         const model = ['opus', 'haiku'].includes(modelInput) ? modelInput : 'sonnet';
-        // Generate config
+        // 渠道选择
+        console.log('\n选择消息渠道:');
+        console.log('  1. 飞书 (Feishu)');
+        console.log('  2. 微信 (WeChat)');
+        const channelChoice = (await ask(rl, '请选择 [1]: ')).trim() || '1';
         const config = JSON.parse(fs.readFileSync(sampleSrc, 'utf-8'));
-        config.feishu.appId = appId;
-        config.feishu.appSecret = appSecret;
         config.projects.defaultPath = defaultPath;
         config.projects.list = { [path.basename(defaultPath)]: defaultPath };
-        config.anthropic.model = model;
+        config.agents.anthropic.model = model;
+        if (channelChoice === '1') {
+            console.log('\n飞书配置方式:');
+            console.log('  1. 扫码自动注册（推荐）');
+            console.log('  2. 手动输入 App ID/Secret');
+            const feishuMethod = (await ask(rl, '请选择 [1]: ')).trim() || '1';
+            if (feishuMethod === '1') {
+                const { runFeishuQrFlow } = await import('./init-feishu.js');
+                const result = await runFeishuQrFlow();
+                if (!result) {
+                    console.log('已取消');
+                    return;
+                }
+                config.channels.feishu.appId = result.appId;
+                config.channels.feishu.appSecret = result.appSecret;
+                config.channels.feishu.enabled = true;
+                if (result.openId)
+                    config.channels.feishu.owner = result.openId;
+            }
+            else {
+                if (!await initFeishuManual(rl, config)) {
+                    console.log('已取消');
+                    return;
+                }
+            }
+        }
+        else if (channelChoice === '2') {
+            const { runWechatQrFlow } = await import('./init-wechat.js');
+            const result = await runWechatQrFlow();
+            if (!result) {
+                console.log('已取消');
+                return;
+            }
+            config.channels.wechat = {
+                enabled: true,
+                baseUrl: result.baseUrl,
+                token: result.token,
+            };
+        }
+        else {
+            console.log('无效选择');
+            return;
+        }
         fs.writeFileSync(p.config, JSON.stringify(config, null, 2) + '\n');
         console.log(`\n✓ 已创建配置文件: ${p.config}`);
-        // Setup EVOLCLAW_HOME in shell profile
         setupEnvVar(resolveRoot());
     }
     finally {

package/dist/utils/stream-flusher.js

@@ -1,3 +1,4 @@
+import { logger } from './logger.js';
 /**
  * 流式输出缓冲器
  * 按时间窗口批量推送文本和活动事件
@@ -137,10 +138,10 @@ export class StreamFlusher {
             const before = output;
             output = output.replace(this.fileMarkerPattern, '').trim();
             if (before !== output) {
-                console.log('[StreamFlusher] Removed file markers, before length:', before.length, 'after:', output.length);
+                logger.debug('[StreamFlusher] Removed file markers, before length:', before.length, 'after:', output.length);
             }
         }
-        console.log('[StreamFlusher] flush called, output length:', output.length, 'isEmpty:', !output, 'preview:', output.substring(0, 100));
+        logger.debug('[StreamFlusher] flush called, output length:', output.length, 'isEmpty:', !output, 'preview:', output.substring(0, 100));
         if (output) {
             await this.send(output, isFinal);
             this.sentContent = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evolclaw",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "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",
@@ -23,16 +23,17 @@
     "prepublishOnly": "npm run build && npm test"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "^0.2.77",
+    "@anthropic-ai/claude-agent-sdk": "^0.2.75",
     "@larksuiteoapi/node-sdk": "^1.59.0",
-    "dotenv": "^16.6.1",
-    "image-type": "^6.0.0"
+    "image-type": "^6.0.0",
+    "qrcode-terminal": "^0.12.0"
   },
   "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@vitest/coverage-v8": "^2.1.9",
+    "@types/node": "^25.5.0",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@vitest/coverage-v8": "^4.1.0",
     "tsx": "^4.19.0",
     "typescript": "^5.6.0",
-    "vitest": "^2.1.9"
+    "vitest": "^4.1.0"
   }
 }