evolclaw 3.1.1 → 3.1.3

package/dist/aun/aid/agentmd.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
-import os from 'os';
 import { getAunClient } from './client.js';
+import { agentMdPath, aidLocalDir, resolveRoot } from '../../paths.js';
 export function buildInitialAgentMd(opts) {
     const agentName = opts.aid.split('.')[0];
     const agentType = opts.type || 'ai';
@@ -82,16 +82,17 @@ async function verifyContent(content, aid, certPem, client) {
  * Create a bare AUNClient (no createAid) for read-only operations.
  */
 async function createBareClient(aunPath) {
+    const p = aunPath ?? resolveRoot();
     const { AUNClient } = await import('@agentunion/fastaun');
-    const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
-    const clientOpts = { aun_path: aunPath, debug: false };
+    const caCertPath = path.join(p, 'CA', 'root', 'root.crt');
+    const clientOpts = { aun_path: p, debug: false };
     if (fs.existsSync(caCertPath))
         clientOpts.root_ca_path = caCertPath;
     return new AUNClient(clientOpts);
 }
 export async function agentmdGet(aid, opts) {
-    const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
-    const localPath = path.join(aunPath, 'AIDs', aid, 'agent.md');
+    const aunPath = opts?.aunPath ?? resolveRoot();
+    const localPath = agentMdPath(aid);
     // === Path A: local agent.md exists ===
     if (fs.existsSync(localPath)) {
         const content = fs.readFileSync(localPath, 'utf-8');
@@ -108,7 +109,8 @@ export async function agentmdGet(aid, opts) {
             }
             // Fallback: local invalid → try remote
             try {
-                const remote = await client.auth.downloadAgentMd(aid);
+                const info = await client.fetchAgentMd(aid);
+                const remote = info.content;
                 if (remote) {
                     const remoteVerification = await verifyContent(remote, aid, certPem, client);
                     if (remoteVerification.status === 'verified') {
@@ -132,20 +134,13 @@ export async function agentmdGet(aid, opts) {
     const client = opts?.client ?? await createBareClient(aunPath);
     const ownClient = !opts?.client;
     try {
-        const raw = await client.auth.downloadAgentMd(aid);
+        const info = await client.fetchAgentMd(aid);
+        const raw = info.content;
         if (!opts?.withVerification) {
-            // Persist without verification
-            const aidDir = path.join(aunPath, 'AIDs', aid);
-            fs.mkdirSync(aidDir, { recursive: true });
-            fs.writeFileSync(path.join(aidDir, 'agent.md'), raw, 'utf-8');
             return raw;
         }
         const certPem = await obtainCertPem(aid, aunPath, client);
         const verification = await verifyContent(raw, aid, certPem, client);
-        // Persist to local
-        const aidDir = path.join(aunPath, 'AIDs', aid);
-        fs.mkdirSync(aidDir, { recursive: true });
-        fs.writeFileSync(path.join(aidDir, 'agent.md'), raw, 'utf-8');
         return { content: raw, verification };
     }
     finally {
@@ -157,24 +152,52 @@ export async function agentmdGet(aid, opts) {
     }
 }
 /**
- * Upload agent.md: auto-sign + upload + sync to local file.
+ * Upload agent.md: write to local file → publishAgentMd (auto-sign + upload).
  */
 export async function agentmdPut(content, opts) {
-    const aunPath = opts.aunPath ?? path.join(os.homedir(), '.aun');
+    const aunPath = opts.aunPath ?? resolveRoot();
     const client = opts.client ?? await getAunClient(opts.aid, { aunPath });
     const ownClient = !opts.client;
+    const dir = aidLocalDir(opts.aid);
+    const filePath = path.join(dir, 'agent.md');
+    const existed = fs.existsSync(filePath);
     try {
-        let signed;
-        try {
-            signed = await client.auth.signAgentMd(content);
-        }
-        catch {
-            signed = content;
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(filePath, content, 'utf-8');
+        await client.publishAgentMd();
+    }
+    catch (e) {
+        if (!existed)
+            try {
+                fs.unlinkSync(filePath);
+            }
+            catch { /* ignore */ }
+        throw e;
+    }
+    finally {
+        if (ownClient)
+            try {
+                await client.close();
+            }
+            catch { /* ignore */ }
+    }
+}
+/**
+ * Check if agent.md is up-to-date (30-day cache), fetch if changed.
+ * Returns changed=true + content when a new version was downloaded.
+ */
+export async function agentmdSync(aid, opts) {
+    const client = opts?.client ?? await createBareClient();
+    const ownClient = !opts?.client;
+    try {
+        const state = await client.checkAgentMd(aid, 30);
+        if (!state.in_sync || !state.local_found) {
+            const info = await client.fetchAgentMd(aid);
+            return { changed: true, content: info.content };
         }
-        await client.auth.uploadAgentMd(signed);
-        const aidDir = path.join(aunPath, 'AIDs', opts.aid);
-        fs.mkdirSync(aidDir, { recursive: true });
-        fs.writeFileSync(path.join(aidDir, 'agent.md'), signed, 'utf-8');
+        const localPath = agentMdPath(aid);
+        const content = fs.existsSync(localPath) ? fs.readFileSync(localPath, 'utf-8') : undefined;
+        return { changed: false, content };
     }
     finally {
         if (ownClient)

package/dist/aun/aid/client.js

@@ -14,21 +14,15 @@ export function suppressSdkLogs() {
     const _origLog = console.log;
     const _origInfo = console.info;
     const _origWarn = console.warn;
-    const _origError = console.error;
-    const SDK_LOG_RE = /^\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+\]\[(?:DEBUG|INFO|WARN)\]/;
-    const SDK_ERROR_RE = /^\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+\]\[ERROR\]/;
-    console.log = (...args) => { if (typeof args[0] === 'string') {
-        if (SDK_LOG_RE.test(args[0]))
-            return;
-        if (SDK_ERROR_RE.test(args[0])) {
-            _origError(...args);
-            return;
-        }
-    } _origLog(...args); };
+    const SDK_LOG_RE = /^\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+\]\[(?:DEBUG|INFO|WARN|ERROR)\]/;
+    console.log = (...args) => { if (typeof args[0] === 'string' && SDK_LOG_RE.test(args[0]))
+        return; _origLog(...args); };
     console.info = (...args) => { if (typeof args[0] === 'string' && SDK_LOG_RE.test(args[0]))
         return; _origInfo(...args); };
     console.warn = (...args) => { if (typeof args[0] === 'string' && SDK_LOG_RE.test(args[0]))
         return; _origWarn(...args); };
+    console.error = (...args) => { if (typeof args[0] === 'string' && SDK_LOG_RE.test(args[0]))
+        return; process.stderr.write(args.map(String).join(' ') + '\n'); };
 }
 // ==================== Constants ====================
 export const MIN_AUN_CORE_SDK = [0, 2, 17];

package/dist/aun/aid/identity.js

@@ -3,7 +3,7 @@ import path from 'path';
 import os from 'os';
 import crypto from 'crypto';
 import { getAunClient, downloadCaRoot } from './client.js';
-import { resolvePaths } from '../../paths.js';
+import { resolvePaths, aidsDir as evolclawAidsDir, agentMdPath } from '../../paths.js';
 // ==================== Validation ====================
 export function isValidAid(name) {
     const labels = name.split('.');
@@ -11,17 +11,36 @@ export function isValidAid(name) {
 }
 // ==================== 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')),
-    }));
+    const aunAidsDir = path.join(aunPath ?? path.join(os.homedir(), '.aun'), 'AIDs');
+    const ecAidsDir = evolclawAidsDir();
+    const seen = new Map();
+    // Scan ~/.aun/AIDs (private keys live here)
+    if (fs.existsSync(aunAidsDir)) {
+        for (const e of fs.readdirSync(aunAidsDir, { withFileTypes: true })) {
+            if (!e.isDirectory())
+                continue;
+            seen.set(e.name, {
+                aid: e.name,
+                hasPrivateKey: fs.existsSync(path.join(aunAidsDir, e.name, 'private')),
+                hasAgentMd: fs.existsSync(agentMdPath(e.name)),
+            });
+        }
+    }
+    // Scan $EVOLCLAW_HOME/AIDs (agent.md lives here)
+    if (fs.existsSync(ecAidsDir) && ecAidsDir !== aunAidsDir) {
+        for (const e of fs.readdirSync(ecAidsDir, { withFileTypes: true })) {
+            if (!e.isDirectory())
+                continue;
+            if (seen.has(e.name))
+                continue;
+            seen.set(e.name, {
+                aid: e.name,
+                hasPrivateKey: fs.existsSync(path.join(aunAidsDir, e.name, 'private')),
+                hasAgentMd: fs.existsSync(agentMdPath(e.name)),
+            });
+        }
+    }
+    return [...seen.values()];
 }
 export async function aidCreate(aid, opts) {
     const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
@@ -71,7 +90,7 @@ export function aidShow(aid, opts) {
     const aunPath = opts?.aunPath ?? path.join(os.homedir(), '.aun');
     const aidDir = path.join(aunPath, 'AIDs', aid);
     const hasPrivateKey = fs.existsSync(path.join(aidDir, 'private'));
-    const hasAgentMd = fs.existsSync(path.join(aidDir, 'agent.md'));
+    const hasAgentMd = fs.existsSync(agentMdPath(aid));
     let certExpiresAt = null;
     let certSubject = null;
     const certPath = path.join(aidDir, 'public', 'cert.pem');

package/dist/aun/aid/index.js

@@ -1,3 +1,3 @@
 export { isValidAid, aidList, aidCreate, aidShow, aidDelete, aidLookup, appendAidLifecycle, readAidLifecycle } from './identity.js';
-export { buildInitialAgentMd, agentmdGet, agentmdPut } from './agentmd.js';
+export { buildInitialAgentMd, agentmdGet, agentmdPut, agentmdSync } from './agentmd.js';
 export { MIN_AUN_CORE_SDK, AUN_CORE_SDK_PKG, isAunSdkVersionOk, resolveAunCoreSdkPkg, ensureAunSdk, isAunSdkReady, downloadCaRoot, getAunClient, suppressSdkLogs, } from './client.js';

package/dist/aun/msg/group.js

@@ -17,6 +17,7 @@ export async function groupSend(args) {
                     contentType: args.body.contentType,
                     text: args.body.text,
                     transcript: args.body.transcript,
+                    onProgress: args.onUploadProgress,
                 });
                 payload = built.payload;
                 break;

package/dist/aun/msg/p2p.js

@@ -37,6 +37,7 @@ export async function msgSend(args) {
                     contentType: args.body.contentType,
                     text: args.body.text,
                     transcript: args.body.transcript,
+                    onProgress: args.onUploadProgress,
                 });
                 payload = built.payload;
                 break;
@@ -44,11 +45,18 @@ export async function msgSend(args) {
         }
         // 4. 写入 payload.chatmode
         payload.chatmode = chatmode;
+        // 5. 写入 payload.thread_id（如果指定）
+        if (args.thread) {
+            payload.thread_id = args.thread;
+        }
         const sendParams = { to: args.to, payload };
         // Default: plaintext. Set encrypt: true to enable E2EE.
         sendParams.encrypt = args.encrypt === true;
         const result = await conn.call('message.send', sendParams);
-        // 5. 写出方向 jsonl（与 daemon 一致格式，标记 source=cli）
+        // 5. 写出方向 jsonl（与 daemon 一致格式，标记 source）
+        // source 标记：
+        // - 'cli': 用户手动调用 ec msg send
+        // - 'msg': agent 在会话中调用 ec msg send
         if (result?.message_id) {
             try {
                 const sessionsDir = resolvePaths().sessionsDir;
@@ -57,6 +65,11 @@ export async function msgSend(args) {
                     : args.body.mode === 'link' ? `[link] ${args.body.url}`
                         : args.body.mode === 'file' ? `[file] ${args.body.filePath}`
                             : `[payload]`;
+                // 判断是 agent 调用还是用户手动调用
+                // 优先通过 --thread 参数判断（有 thread → msg，无 → cli）
+                // 兜底通过环境变量判断（向后兼容）
+                const isInSession = !!process.env.EVOLCLAW_SESSION_ID;
+                const source = args.thread ? 'msg' : (isInSession ? 'msg' : 'cli');
                 appendMessageLog(chatDir, buildOutboundEntry({
                     from: args.from,
                     to: args.to,
@@ -66,7 +79,7 @@ export async function msgSend(args) {
                     encrypt: args.encrypt === true,
                     chatmode, // 使用解析出的 chatmode
                     msgType: 'text',
-                    source: 'cli',
+                    source,
                 }));
             }
             catch { }

package/dist/aun/msg/upload.js

@@ -3,21 +3,19 @@ import fs from 'fs';
 import path from 'path';
 import { guessMime, formatSize } from '../../utils/media-cache.js';
 import { inferPayloadType, isValidPayloadType } from './payload-type.js';
-/** 小文件阈值：≤64KB 走 storage.put_object 内联 base64；>64KB 走 create_upload_session + HTTP PUT。 */
-const INLINE_UPLOAD_LIMIT = 64 * 1024;
 /** 单次上传最大大小（与 daemon sendFile 一致）。 */
 const MAX_FILE_SIZE = 10 * 1024 * 1024;
+/** server 端 inline 上限错误的识别特征。优先匹配错误消息里的“inline 上限”字样。 */
+function isInlineLimitError(err) {
+    const msg = err?.message ?? '';
+    return /inline\s*上限|inline limit|create_upload_session/i.test(msg);
+}
 /**
  * 上传本地文件并构造发送用的 payload。
  *
- * 流程：
- * 1. 读文件、算 sha256、推断 content_type
- * 2. 小文件 storage.put_object，大文件 storage.create_upload_session + HTTP PUT + storage.complete_upload
- * 3. 按 as / 扩展名 确定 payload.type
- * 4. 构造 payload（含 attachments 引用）
- *
- * 不做 outbox 持久化、不做 E2EE 加密兜底——这些是 daemon 的职责。
- * CLI 短连接场景假定网络稳定，失败抛异常给调用方处理。
+ * 策略：先无脑 storage.put_object（内联 base64）。server 报“超过 inline 上限”
+ * 时降级到 storage.create_upload_session + HTTP PUT + storage.complete_upload，
+ * 此时通过 onProgress 上报字节级进度。
  */
 export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts) {
     const absPath = path.resolve(filePath);
@@ -29,14 +27,19 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         throw new Error(`文件为空: ${absPath}`);
     }
     if (stat.size > MAX_FILE_SIZE) {
-        throw new Error(`文件过大 (${formatSize(stat.size)}, 上 ${formatSize(MAX_FILE_SIZE)}): ${absPath}`);
+        throw new Error(`文件过大 (${formatSize(stat.size)}, 上限 ${formatSize(MAX_FILE_SIZE)}): ${absPath}`);
     }
     const filename = path.basename(absPath);
     const fileData = fs.readFileSync(absPath);
     const sha256 = crypto.createHash('sha256').update(fileData).digest('hex');
     const contentType = opts?.contentType ?? guessMime(filename);
     const objectKey = `shared/${crypto.randomUUID()}/${filename}`;
-    if (stat.size <= INLINE_UPLOAD_LIMIT) {
+    const total = stat.size;
+    const report = (phase, bytes) => opts?.onProgress?.({ phase, bytes, total });
+    // 1. 先按 inline 走
+    let inlineRejected = false;
+    try {
+        report('inline', 0);
         await conn.call('storage.put_object', {
             object_key: objectKey,
             content: fileData.toString('base64'),
@@ -44,32 +47,68 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
             is_private: false,
             overwrite: true,
         });
+        report('inline', total);
     }
-    else {
+    catch (e) {
+        if (!isInlineLimitError(e))
+            throw e;
+        inlineRejected = true;
+    }
+    // 2. inline 被拒：降级到 session + HTTP PUT
+    if (inlineRejected) {
+        report('session-create', 0);
         const session = await conn.call('storage.create_upload_session', {
             object_key: objectKey,
-            size_bytes: stat.size,
+            size_bytes: total,
             content_type: contentType,
         });
         const uploadUrl = session?.upload_url;
         if (!uploadUrl)
             throw new Error('storage.create_upload_session 未返回 upload_url');
-        const uploadResp = await fetch(uploadUrl, { method: 'PUT', body: fileData });
+        // 简单 Buffer 上传 + 周期性进度（不用流，避免某些 storage 网关对 chunked / duplex 不友好）
+        report('http-put', 0);
+        const PROGRESS_TICK_MS = 250;
+        let lastBytes = 0;
+        const tickerStart = Date.now();
+        // 简单的“估算”进度：实际上一次性发，但在等待响应期间按 elapsed 模拟字节数，让用户看到在跑
+        const ticker = setInterval(() => {
+            const elapsed = Date.now() - tickerStart;
+            // 假设 2MB/s 估算；不超过 99%
+            const estimated = Math.min(total - 1, Math.floor((elapsed / 1000) * 2 * 1024 * 1024));
+            if (estimated > lastBytes) {
+                lastBytes = estimated;
+                report('http-put', estimated);
+            }
+        }, PROGRESS_TICK_MS);
+        let uploadResp;
+        try {
+            uploadResp = await fetch(uploadUrl, {
+                method: 'PUT',
+                body: new Blob([new Uint8Array(fileData)], { type: contentType }),
+                headers: { 'Content-Type': contentType },
+            });
+        }
+        finally {
+            clearInterval(ticker);
+        }
         if (!uploadResp.ok)
             throw new Error(`HTTP 上传失败: ${uploadResp.status}`);
+        report('http-put', total);
+        report('session-complete', total);
         await conn.call('storage.complete_upload', {
             object_key: objectKey,
             sha256,
             content_type: contentType,
             is_private: false,
-            size_bytes: stat.size,
+            size_bytes: total,
         });
     }
+    report('done', total);
     const attachment = {
         owner_aid: ownerAid,
         object_key: objectKey,
         filename,
-        size_bytes: stat.size,
+        size_bytes: total,
         sha256,
         content_type: contentType,
     };
@@ -91,7 +130,7 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
     if (opts?.text)
         payload.text = opts.text;
     else if (type === 'file')
-        payload.text = `📎 ${filename} (${formatSize(stat.size)})`;
+        payload.text = `📎 ${filename} (${formatSize(total)})`;
     if (type === 'voice' && opts?.transcript)
         payload.transcript = opts.transcript;
     return { payload, type, attachment };

package/dist/aun/rpc/connection.js

@@ -6,9 +6,12 @@ export async function createShortConnection(aid, opts) {
     const slotId = opts?.slotId ?? '';
     const caCertPath = path.join(aunPath, 'CA', 'root', 'root.crt');
     const { AUNClient } = await import('@agentunion/fastaun');
+    const encryptionSeed = process.env.AUN_ENCRYPTION_SEED || undefined;
     const clientOpts = { aun_path: aunPath, debug: false };
     if (fs.existsSync(caCertPath))
         clientOpts.root_ca_path = caCertPath;
+    if (encryptionSeed)
+        clientOpts.encryption_seed = encryptionSeed;
     const client = new AUNClient(clientOpts);
     await client.auth.createAid({ aid });
     const authResult = await client.auth.authenticate({ aid });