evolclaw 2.7.3 → 2.8.1

package/dist/agents/claude-runner.js

@@ -204,7 +204,7 @@ export class AgentRunner {
         // 没有交互上下文（无渠道适配器），回退到纯文本
         const permCtx = this.permissionContexts.get(sessionId);
         if (!permCtx?.adapter?.sendInteraction || !permCtx?.channelId) {
-            return this.handleAskUserQuestionFallback(input, questions);
+            return this.handleAskUserQuestionFallback(sessionId, input, questions);
         }
         const answers = {};
         // 从 permCtx 构造 per-session 的发送函数，避免全局 sendPromptFn 被其他 channel 实例覆盖
@@ -307,20 +307,43 @@ export class AgentRunner {
         return { behavior: 'allow', updatedInput, decisionClassification: 'user_temporary' };
     }
     /**
-     * AskUserQuestion 纯文本 fallback：发送文本格式的问题，直接 allow
+     * AskUserQuestion 纯文本 fallback：发送选项列表，等待用户通过 /ask 命令选择
+     * 注册到 interactionRouter，用户回复 /ask 1 或 /ask 自定义内容
      */
-    async handleAskUserQuestionFallback(input, questions) {
-        // 自动选择每个问题的第一个选项
+    async handleAskUserQuestionFallback(sessionId, input, questions) {
+        const permCtx = this.permissionContexts.get(sessionId);
+        const sendPrompt = permCtx?.adapter && permCtx?.channelId
+            ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
+            : this.sendPromptFn;
         const answers = {};
         if (questions?.length) {
-            const lines = questions.map(q => {
-                const firstLabel = q.options[0]?.label || '';
-                answers[q.question] = firstLabel;
+            for (const q of questions) {
                 const optText = q.options.map((o, i) => `  ${i + 1}. ${o.label}${o.description ? ` — ${o.description}` : ''}`).join('\n');
-                return `${q.question}\n${optText}\n  → 自动选择：${firstLabel}`;
-            });
-            if (this.sendPromptFn) {
-                await this.sendPromptFn(`💬 以下问题已自动选择第一项：\n\n${lines.join('\n\n')}`);
+                const prompt = `💬 ${q.question}\n${optText}\n\n回复 /ask <数字> 选择，或 /ask <自定义内容>`;
+                if (sendPrompt && permCtx?.interactionRouter) {
+                    await sendPrompt(prompt);
+                    const requestId = `ask-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+                    const answer = await new Promise((resolve) => {
+                        permCtx.interactionRouter.register(requestId, sessionId, (action) => {
+                            const num = parseInt(action.trim(), 10);
+                            if (num >= 1 && num <= q.options.length) {
+                                resolve(q.options[num - 1].label);
+                            }
+                            else {
+                                resolve(action.trim());
+                            }
+                        }, { timeoutMs: 120_000, onTimeout: () => resolve(q.options[0]?.label || '') });
+                    });
+                    answers[q.question] = answer;
+                }
+                else {
+                    // 无交互能力，自动选第一项
+                    const firstLabel = q.options[0]?.label || '';
+                    answers[q.question] = firstLabel;
+                    if (sendPrompt) {
+                        await sendPrompt(`${prompt}\n  → 自动选择：${firstLabel}`);
+                    }
+                }
             }
         }
         const updatedInput = { ...input, answers };
@@ -331,51 +354,71 @@ export class AgentRunner {
      */
     async handleExitPlanMode(sessionId, input, options) {
         const permCtx = this.permissionContexts.get(sessionId);
-        // 从 permCtx 构造 per-session 的发送函数，避免全局 sendPromptFn 被其他 channel 实例覆盖
         const sendPrompt = permCtx?.adapter && permCtx?.channelId
             ? async (text) => permCtx.adapter.sendText(permCtx.channelId, text, permCtx.replyContext)
             : this.sendPromptFn;
-        // 无交互上下文，直接 allow（防御性兜底）
-        if (!permCtx?.adapter?.sendInteraction || !permCtx?.channelId || !sendPrompt) {
+        // 无任何交互能力，直接 allow
+        if (!permCtx?.channelId || !sendPrompt) {
             return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' };
         }
-        const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const interaction = {
-            type: 'interaction',
-            id: requestId,
-            kind: {
-                kind: 'action',
-                title: '📋 计划审批',
-                body: 'AI 已完成规划，等待审批。\n请查看以上计划内容后决定。',
-                buttons: [
-                    { key: 'approve', label: '✅ 批准执行', style: 'primary' },
-                    { key: 'reject', label: '❌ 拒绝', style: 'danger' },
-                ],
-            },
-            channelId: permCtx.channelId,
-            sessionId,
-        };
+        // 尝试发送交互卡片
         let cardSent = false;
-        try {
-            const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
-            cardSent = !!result;
-        }
-        catch (err) {
-            logger.warn('[AgentRunner] ExitPlanMode card send failed:', err);
-        }
-        if (!cardSent) {
-            await sendPrompt('📋 计划审批\nAI 已完成规划，等待审批。\n回复 /plan approve 批准执行 | /plan reject 拒绝');
+        if (permCtx.adapter?.sendInteraction) {
+            const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            const interaction = {
+                type: 'interaction',
+                id: requestId,
+                kind: {
+                    kind: 'action',
+                    title: '📋 计划审批',
+                    body: 'AI 已完成规划，等待审批。\n请查看以上计划内容后决定。',
+                    buttons: [
+                        { key: 'approve', label: '✅ 批准执行', style: 'primary' },
+                        { key: 'reject', label: '❌ 拒绝', style: 'danger' },
+                    ],
+                },
+                channelId: permCtx.channelId,
+                sessionId,
+            };
+            try {
+                const result = await permCtx.adapter.sendInteraction(permCtx.channelId, interaction, permCtx.replyContext);
+                cardSent = !!result;
+            }
+            catch (err) {
+                logger.warn('[AgentRunner] ExitPlanMode card send failed:', err);
+            }
+            if (cardSent) {
+                return new Promise((resolve) => {
+                    permCtx.interactionRouter?.register(requestId, sessionId, (action) => {
+                        if (action === 'approve') {
+                            resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
+                        }
+                        else {
+                            resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
+                        }
+                    });
+                });
+            }
         }
-        return new Promise((resolve) => {
-            permCtx?.interactionRouter?.register(requestId, sessionId, (action) => {
-                if (action === 'approve') {
-                    resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
-                }
-                else {
-                    resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
-                }
+        // 文本 fallback：注册到 interactionRouter，等待用户 /ask 回复
+        if (permCtx.interactionRouter) {
+            await sendPrompt('📋 计划审批\nAI 已完成规划，等待审批。\n\n  1. 批准执行\n  2. 拒绝\n\n回复 /ask 1 批准，/ask 2 拒绝：');
+            const requestId = `plan-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+            return new Promise((resolve) => {
+                permCtx.interactionRouter.register(requestId, sessionId, (action) => {
+                    const trimmed = action.trim();
+                    if (trimmed === '2' || trimmed.toLowerCase() === 'reject' || trimmed === '拒绝') {
+                        resolve({ behavior: 'deny', message: '用户拒绝了计划', decisionClassification: 'user_reject' });
+                    }
+                    else {
+                        resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' });
+                    }
+                }, { timeoutMs: 300_000, onTimeout: () => resolve({ behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' }) });
             });
-        });
+        }
+        // 无交互能力，发提示后直接 allow
+        await sendPrompt('📋 计划审批\nAI 已完成规划，自动批准执行。');
+        return { behavior: 'allow', updatedInput: input, decisionClassification: 'user_temporary' };
     }
     /**
      * SDK 原始事件 → 标准 AgentEvent 转换

package/dist/channels/aun-ops.js

@@ -0,0 +1,275 @@
+/**
+ * AUN AID / agent.md 原子操作层
+ *
+ * 短生命周期操作（创建 AID、上传 agent.md 等），供 CLI / ctl / in-chat 三层共享。
+ * 与 aun.ts（长连接运行时）分离。
+ */
+import fs from 'fs';
+import path from 'path';
+import os from 'os';
+import { fileURLToPath } from 'url';
+import { execFileSync } from 'child_process';
+import { isWindows } from '../utils/cross-platform.js';
+import { resolvePaths } from '../paths.js';
+// ==================== Constants ====================
+export const MIN_AUN_CORE_SDK = [0, 2, 14];
+export const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
+// ==================== SDK & Environment ====================
+function compareVersion(a, min) {
+    const parts = a.split('.').map(n => parseInt(n, 10));
+    if (parts.length < 3 || parts.some(isNaN))
+        return false;
+    if (parts[0] !== min[0])
+        return parts[0] > min[0];
+    if (parts[1] !== min[1])
+        return parts[1] > min[1];
+    return parts[2] >= min[2];
+}
+export function isAunSdkVersionOk(version) {
+    return compareVersion(version, MIN_AUN_CORE_SDK);
+}
+export function resolveAunCoreSdkPkg() {
+    try {
+        let dir = path.dirname(fileURLToPath(import.meta.url));
+        while (true) {
+            const candidate = path.join(dir, 'node_modules', AUN_CORE_SDK_PKG, 'package.json');
+            if (fs.existsSync(candidate)) {
+                const data = JSON.parse(fs.readFileSync(candidate, 'utf-8'));
+                if (data.name === AUN_CORE_SDK_PKG)
+                    return { version: data.version, path: candidate };
+            }
+            const parent = path.dirname(dir);
+            if (parent === dir)
+                break;
+            dir = parent;
+        }
+    }
+    catch { /* fall through */ }
+    try {
+        const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+        const globalRoot = execFileSync(npmCmd, ['root', '-g'], {
+            encoding: 'utf-8', timeout: 10000, shell: isWindows,
+        }).trim();
+        const pkgPath = path.join(globalRoot, AUN_CORE_SDK_PKG, 'package.json');
+        if (fs.existsSync(pkgPath)) {
+            const data = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+            return { version: data.version, path: pkgPath };
+        }
+    }
+    catch { /* not found */ }
+    return null;
+}
+/** Non-interactive SDK check + auto-install */
+export async function ensureAunSdk() {
+    const installed = resolveAunCoreSdkPkg();
+    if (installed && isAunSdkVersionOk(installed.version))
+        return;
+    const { npmInstallGlobal } = await import('../utils/init-channel.js');
+    console.log(`正在安装 ${AUN_CORE_SDK_PKG}@latest...`);
+    await npmInstallGlobal(`${AUN_CORE_SDK_PKG}@latest`);
+}
+/** SDK minimum version met? */
+export function isAunSdkReady() {
+    const installed = resolveAunCoreSdkPkg();
+    return !!(installed && isAunSdkVersionOk(installed.version));
+}
+// ==================== CA Root ====================
+export async function downloadCaRoot(aunPath, gatewayUrl, indent = '') {
+    const caDir = path.join(aunPath, 'CA', 'root');
+    const caCertPath = path.join(caDir, 'root.crt');
+    if (fs.existsSync(caCertPath))
+        return true;
+    if (!gatewayUrl)
+        return false;
+    try {
+        fs.mkdirSync(caDir, { recursive: true });
+        const gwHttp = gatewayUrl.replace(/^wss?:/, 'https:').replace(/\/aun$/, '');
+        const resp = await fetch(`${gwHttp}/pki/chain`, { redirect: 'follow' });
+        if (!resp.ok) {
+            console.warn(`${indent}⚠ CA 根证书下载失败: HTTP ${resp.status}`);
+            return false;
+        }
+        const body = await resp.text();
+        if (!body.includes('BEGIN CERTIFICATE')) {
+            console.warn(`${indent}⚠ CA 根证书响应内容无效，跳过写入`);
+            return false;
+        }
+        fs.writeFileSync(caCertPath, body);
+        console.log(`${indent}✓ CA 根证书已下载`);
+        return true;
+    }
+    catch (e) {
+        console.warn(`${indent}⚠ CA 根证书下载失败: ${e}，可稍后手动下载`);
+        return false;
+    }
+}
+// ==================== Validation ====================
+export function isValidAid(name) {
+    const labels = name.split('.');
+    return labels.length >= 3 && labels.every(l => /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$/.test(l));
+}
+// ==================== AUNClient Factory ====================
+/**
+ * Get a short-lived AUNClient with CA cert loaded and identity ready.
+ * Caller is responsible for closing: `try { await client.close(); } catch {}`
+ */
+export async function getAunClient(aid, opts) {
+    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
+    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
+    const { AUNClient } = await import('@agentunion/fastaun');
+    const clientOpts = { aun_path: aunPath };
+    if (fs.existsSync(caCertPath))
+        clientOpts.root_ca_path = caCertPath;
+    const client = new AUNClient(clientOpts);
+    // Ensure identity is loaded (idempotent if already created)
+    await client.auth.createAid({ aid });
+    return client;
+}
+// ==================== AID Operations ====================
+export function aidList(aunPath) {
+    const aidsDir = path.join(aunPath ?? path.join(os.homedir(), '.aun'), 'AIDs');
+    if (!fs.existsSync(aidsDir))
+        return [];
+    const entries = fs.readdirSync(aidsDir, { withFileTypes: true });
+    return entries
+        .filter(e => e.isDirectory())
+        .map(e => ({
+        aid: e.name,
+        hasPrivateKey: fs.existsSync(path.join(aidsDir, e.name, 'private')),
+        hasAgentMd: fs.existsSync(path.join(aidsDir, e.name, 'agent.md')),
+    }));
+}
+/**
+ * Create AID: keygen + register + CA download.
+ * Does NOT touch agent.md — call agentmdPut separately.
+ * Returns a reusable client (caller must close).
+ */
+export async function aidCreate(aid, opts) {
+    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
+    const aidDir = path.join(aunPath, 'AIDs', aid);
+    // Already exists locally
+    if (fs.existsSync(aidDir) && fs.existsSync(path.join(aidDir, 'private'))) {
+        const client = await getAunClient(aid, { aunPath });
+        return { aid, alreadyExisted: true, gateway: '', client };
+    }
+    const { AUNClient, GatewayDiscovery } = await import('@agentunion/fastaun');
+    let client = new AUNClient({ aun_path: aunPath });
+    try {
+        const result = await client.auth.createAid({ aid });
+        const gateway = result.gateway || '';
+        // Download CA root cert
+        const caDownloaded = await downloadCaRoot(aunPath, gateway);
+        // Rebuild client with CA cert for subsequent operations
+        const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
+        if (caDownloaded && fs.existsSync(caCertPath)) {
+            try {
+                await client.close();
+            }
+            catch { /* ignore */ }
+            client = new AUNClient({ aun_path: aunPath, root_ca_path: caCertPath });
+            await client.auth.createAid({ aid });
+        }
+        // Set gateway URL for upload operations
+        let gatewayUrl = gateway;
+        if (!gatewayUrl) {
+            try {
+                const discovery = new GatewayDiscovery({});
+                gatewayUrl = await discovery.discover(`https://${aid}/.well-known/aun-gateway`);
+            }
+            catch { /* fall through */ }
+        }
+        if (gatewayUrl) {
+            client._gatewayUrl = gatewayUrl;
+        }
+        return { aid, alreadyExisted: false, gateway: gatewayUrl, client };
+    }
+    catch (e) {
+        try {
+            await client.close();
+        }
+        catch { /* ignore */ }
+        throw e;
+    }
+}
+// ==================== AgentMd Operations ====================
+export function buildInitialAgentMd(opts) {
+    const agentName = opts.aid.split('.')[0];
+    const agentType = opts.type || 'ai';
+    return `---\naid: "${opts.aid}"\nname: "${agentName}"\ntype: "${agentType}"\nversion: "1.0.0"\ndescription: ""\ntags:\n  - evolclaw\ninitialized: false\n---\n`;
+}
+/**
+ * Get agent.md content.
+ * For self (local AID with private key): reads local file, falls back to download.
+ * For others: downloads from AUN network.
+ */
+export async function agentmdGet(aid, opts) {
+    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
+    const localPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
+    // Try local first for self AIDs (has private key)
+    const hasPrivateKey = fs.existsSync(path.join(aunPath, 'AIDs', aid, 'private'));
+    if (hasPrivateKey && fs.existsSync(localPath)) {
+        return fs.readFileSync(localPath, 'utf-8');
+    }
+    // Download from network
+    const client = opts?.client ?? await getAunClient(aid, { aunPath });
+    const ownClient = !opts?.client;
+    try {
+        return await client.auth.downloadAgentMd(aid);
+    }
+    finally {
+        if (ownClient)
+            try {
+                await client.close();
+            }
+            catch { /* ignore */ }
+    }
+}
+/**
+ * Upload agent.md (sign + upload) and sync to local file.
+ * If client is provided, reuses it; otherwise creates a short-lived one.
+ */
+export async function agentmdPut(content, opts) {
+    const aunPath = opts.aunPath ?? path.join(os.homedir(), '.aun');
+    const client = opts.client ?? await getAunClient(opts.aid, { aunPath });
+    const ownClient = !opts.client;
+    try {
+        await client.auth.uploadAgentMd(content);
+    }
+    finally {
+        if (ownClient)
+            try {
+                await client.close();
+            }
+            catch { /* ignore */ }
+    }
+    // Sync to local
+    const aidDir = path.join(aunPath, 'AIDs', opts.aid);
+    fs.mkdirSync(aidDir, { recursive: true });
+    fs.writeFileSync(path.join(aidDir, 'agent.md'), content, 'utf-8');
+}
+// ==================== Config ====================
+/**
+ * Append a new AUN instance to the config's channels.aun array and save.
+ * Handles upgrade from single-object to array format.
+ */
+export function appendAunInstance(config, inst) {
+    if (!config.channels)
+        config.channels = {};
+    const newInst = {
+        name: inst.name,
+        enabled: inst.enabled ?? true,
+        aid: inst.aid,
+        ...(inst.owner && { owner: inst.owner }),
+    };
+    if (Array.isArray(config.channels.aun)) {
+        config.channels.aun.push(newInst);
+    }
+    else if (config.channels.aun) {
+        const oldInst = { ...config.channels.aun, name: config.channels.aun.name || 'aun' };
+        config.channels.aun = [oldInst, newInst];
+    }
+    else {
+        config.channels.aun = [newInst];
+    }
+    fs.writeFileSync(resolvePaths().config, JSON.stringify(config, null, 2) + '\n');
+}