evolcore 0.0.7 → 0.0.9

package/dist/aun/msg/group.js

@@ -5,7 +5,7 @@ import { TextDecoder } from 'util';
 import { createShortConnection } from '../rpc/index.js';
 import { getAidStore, loadClient, SLOT } from '../aid/store.js';
 import { uploadFileAndBuildPayload } from './upload.js';
-import { daemonTaskSendIpcTimeoutMs } from './p2p.js';
+import { daemonTaskSendIpcTimeoutMs, resolveAunMessageEncrypt } from './p2p.js';
 import { checkGroupIndex, getGroupIndex } from './group-index.js';
 import { appendMessageLog, buildOutboundEntry, classifyAunPayloadForLog } from '../../core/message/message-log.js';
 import { chatDirPath } from '../../core/session/session-fs-store.js';
@@ -50,7 +50,7 @@ function groupSendLogMetadata(args, payload, runtimeContext) {
         source: (runtimeContext ? 'msg' : 'cli'),
     };
 }
-function appendGroupSendOutboundLog(args, messageId, payload, runtimeContext) {
+function appendGroupSendOutboundLog(args, messageId, payload, runtimeContext, encrypt = resolveAunMessageEncrypt(args.encrypt)) {
     const log = groupSendLogMetadata(args, payload, runtimeContext);
     const chatDir = chatDirPath(resolvePaths().sessionsDir, 'aun', args.groupId, args.from);
     fs.mkdirSync(chatDir, { recursive: true });
@@ -63,7 +63,7 @@ function appendGroupSendOutboundLog(args, messageId, payload, runtimeContext) {
         groupId: args.groupId,
         msgId: messageId,
         content: log.content,
-        encrypt: args.encrypt === true,
+        encrypt,
         msgType: log.msgType,
         payloadType: log.payloadType,
         payloadSummary: log.payloadSummary,
@@ -95,7 +95,7 @@ async function tryDaemonGroupSend(args, payload, runtimeContext, file) {
         scope: 'group',
         ...(payload ? { payload } : { file }),
         mentions: args.mentions,
-        encrypt: args.encrypt === true,
+        encrypt: args.encrypt,
         thread,
         returnPolicy: args.returnPolicy,
         originSessionId: runtimeContext.sessionId,
@@ -135,7 +135,7 @@ async function daemonGroupSendResult(args, payload, runtimeContext, result) {
     const messageId = result.message_id
         ?? (typeof result.message.message_id === 'string' ? result.message.message_id : undefined);
     if (messageId && !result.log_written) {
-        appendGroupSendOutboundLog(args, messageId, payload, runtimeContext);
+        appendGroupSendOutboundLog(args, messageId, payload, runtimeContext, result.encrypt ?? resolveAunMessageEncrypt(args.encrypt));
     }
     return {
         ok: true,
@@ -193,12 +193,12 @@ export async function groupSend(args) {
             payload.mentions = args.mentions;
         }
         applyGroupRoutingPayloadFields(payload, args, runtimeContext);
-        const sendParams = { group_id: args.groupId, payload };
-        sendParams.encrypt = args.encrypt === true;
+        const encrypt = resolveAunMessageEncrypt(args.encrypt);
+        const sendParams = { group_id: args.groupId, payload, encrypt };
         const result = await conn.call('group.send', sendParams);
         const messageId = typeof result?.message?.message_id === 'string' ? result.message.message_id : undefined;
         if (messageId)
-            appendGroupSendOutboundLog(args, messageId, payload, runtimeContext);
+            appendGroupSendOutboundLog(args, messageId, payload, runtimeContext, encrypt);
         return {
             ok: true,
             group_id: result?.group_id ?? args.groupId,
@@ -954,7 +954,7 @@ async function sendGroupRulesUpdatedNotice(client, args) {
         const result = await client.group.send({
             group_id: args.groupId,
             payload,
-            encrypt: false,
+            encrypt: resolveAunMessageEncrypt(),
         });
         const message = isRecord(result.message) ? result.message : {};
         const messageId = typeof result.message_id === 'string'

package/dist/aun/msg/p2p.js

@@ -9,6 +9,7 @@ import { chatDirPath } from '../../core/session/session-fs-store.js';
 import { resolvePaths } from '../../paths.js';
 import { ipcQuery } from '../../ipc.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../../core/auth/agent-delegation.js';
+import { loadDaemonConfig } from '../../config-store.js';
 const DEFAULT_TASK_EXECUTION_MS = 60 * 60 * 1000;
 const DAEMON_SEND_TIMEOUT_GRACE_MS = 10_000;
 const MAX_TIMER_MS = 2_147_483_647;
@@ -24,6 +25,11 @@ export function daemonTaskSendIpcTimeoutMs(file = false) {
     catch { }
     return Math.min(MAX_TIMER_MS, Math.max(file ? 120_000 : 5_000, executionMs + DAEMON_SEND_TIMEOUT_GRACE_MS));
 }
+export function resolveAunMessageEncrypt(explicit) {
+    if (typeof explicit === 'boolean')
+        return explicit;
+    return loadDaemonConfig().aun?.defaultEncrypt ?? true;
+}
 function buildSimplePayload(body) {
     switch (body.mode) {
         case 'text':
@@ -113,7 +119,7 @@ async function tryDaemonMsgSend(args, payload, runtimeContext, file) {
         to: args.to,
         scope: 'msg',
         ...(payload ? { payload } : { file }),
-        encrypt: args.encrypt === true,
+        encrypt: args.encrypt,
         thread,
         returnPolicy: args.returnPolicy,
         originSessionId: runtimeContext.sessionId,
@@ -155,7 +161,7 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
             payload,
             runtimeContext,
             chatmode: daemonResult.chatmode,
-            encrypt: daemonResult.encrypt ?? args.encrypt === true,
+            encrypt: daemonResult.encrypt ?? resolveAunMessageEncrypt(args.encrypt),
         });
     }
     return sent;
@@ -259,9 +265,8 @@ export async function msgSend(args) {
         // 5. 写入 payload.thread_id/ref_message_id（如果指定）
         applyRoutingPayloadFields(payload, args, runtimeContext, false);
         applyRoutingPayloadFields(payload, args, runtimeContext);
-        const sendParams = { to: args.to, payload };
-        // Default: plaintext. Set encrypt: true to enable E2EE.
-        sendParams.encrypt = args.encrypt === true;
+        const encrypt = resolveAunMessageEncrypt(args.encrypt);
+        const sendParams = { to: args.to, payload, encrypt };
         const result = await conn.call('message.send', sendParams);
         // 5. 写出方向 jsonl（与 daemon 一致格式，标记 source）
         // source 标记：
@@ -273,7 +278,7 @@ export async function msgSend(args) {
                     payload,
                     runtimeContext,
                     chatmode,
-                    encrypt: args.encrypt === true,
+                    encrypt,
                 });
             }
             catch { }

package/dist/aun/msg/upload.js

@@ -4,37 +4,30 @@ import path from 'path';
 import { guessMime, formatSize } from '../../utils/media-cache.js';
 import { inferPayloadType, isValidPayloadType } from './payload-type.js';
 /** 单次上传最大大小（与 daemon sendFile 一致）。 */
-const MAX_FILE_SIZE = 10 * 1024 * 1024;
+export const MAX_AUN_ATTACHMENT_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。
- *
- * 策略：先无脑 storage.put_object（内联 base64）。server 报“超过 inline 上限”
- * 时降级到 storage.create_upload_session + HTTP PUT + storage.complete_upload，
- * 此时通过 onProgress 上报字节级进度。
+ * 上传内存中的二进制内容并构造发送用的标准附件 payload。
  */
-export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts) {
-    const absPath = path.resolve(filePath);
-    if (!fs.existsSync(absPath)) {
-        throw new Error(`文件不存在: ${absPath}`);
+export async function uploadBufferAndBuildPayload(conn, ownerAid, data, filename, opts) {
+    const safeFilename = path.basename(filename.trim());
+    if (!safeFilename || safeFilename === '.' || safeFilename === '..') {
+        throw new Error('文件名不能为空');
     }
-    const stat = fs.statSync(absPath);
-    if (stat.size === 0) {
-        throw new Error(`文件为空: ${absPath}`);
+    if (data.length === 0) {
+        throw new Error(`文件为空: ${safeFilename}`);
     }
-    if (stat.size > MAX_FILE_SIZE) {
-        throw new Error(`文件过大 (${formatSize(stat.size)}, 上限 ${formatSize(MAX_FILE_SIZE)}): ${absPath}`);
+    if (data.length > MAX_AUN_ATTACHMENT_SIZE) {
+        throw new Error(`文件过大 (${formatSize(data.length)}, 上限 ${formatSize(MAX_AUN_ATTACHMENT_SIZE)}): ${safeFilename}`);
     }
-    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}`;
-    const total = stat.size;
+    const sha256 = crypto.createHash('sha256').update(data).digest('hex');
+    const contentType = opts?.contentType ?? guessMime(safeFilename);
+    const objectKey = `shared/${crypto.randomUUID()}/${safeFilename}`;
+    const total = data.length;
     const report = (phase, bytes) => opts?.onProgress?.({ phase, bytes, total });
     // 1. 先按 inline 走
     let inlineRejected = false;
@@ -42,7 +35,7 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         report('inline', 0);
         await conn.call('storage.put_object', {
             object_key: objectKey,
-            content: fileData.toString('base64'),
+            content: data.toString('base64'),
             content_type: contentType,
             is_private: false,
             overwrite: true,
@@ -70,10 +63,9 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         const PROGRESS_TICK_MS = 250;
         let lastBytes = 0;
         const tickerStart = Date.now();
-        // 简单的“估算”进度：实际上一次性发，但在等待响应期间按 elapsed 模拟字节数，让用户看到在跑
+        // 实际上一次性发送；等待响应期间按 2MB/s 估算进度，且不超过 99%。
         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;
@@ -84,7 +76,7 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         try {
             uploadResp = await fetch(uploadUrl, {
                 method: 'PUT',
-                body: new Blob([new Uint8Array(fileData)], { type: contentType }),
+                body: new Blob([new Uint8Array(data)], { type: contentType }),
                 headers: { 'Content-Type': contentType },
             });
         }
@@ -107,12 +99,11 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
     const attachment = {
         owner_aid: ownerAid,
         object_key: objectKey,
-        filename,
+        filename: safeFilename,
         size_bytes: total,
         sha256,
         content_type: contentType,
     };
-    // 确定渲染类型
     let type;
     if (opts?.as) {
         if (!isValidPayloadType(opts.as)) {
@@ -121,7 +112,7 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
         type = opts.as;
     }
     else {
-        type = inferPayloadType(filename);
+        type = inferPayloadType(safeFilename);
     }
     const payload = {
         type,
@@ -130,8 +121,31 @@ export async function uploadFileAndBuildPayload(conn, ownerAid, filePath, opts)
     if (opts?.text)
         payload.text = opts.text;
     else if (type === 'file')
-        payload.text = `📎 ${filename} (${formatSize(total)})`;
+        payload.text = `📎 ${safeFilename} (${formatSize(total)})`;
     if (type === 'voice' && opts?.transcript)
         payload.transcript = opts.transcript;
     return { payload, type, attachment };
 }
+/**
+ * 上传本地文件并构造发送用的 payload。
+ *
+ * 策略：先无脑 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);
+    if (!fs.existsSync(absPath)) {
+        throw new Error(`文件不存在: ${absPath}`);
+    }
+    const stat = fs.statSync(absPath);
+    if (stat.size === 0) {
+        throw new Error(`文件为空: ${absPath}`);
+    }
+    if (stat.size > MAX_AUN_ATTACHMENT_SIZE) {
+        throw new Error(`文件过大 (${formatSize(stat.size)}, 上限 ${formatSize(MAX_AUN_ATTACHMENT_SIZE)}): ${absPath}`);
+    }
+    const filename = path.basename(absPath);
+    const fileData = fs.readFileSync(absPath);
+    return uploadBufferAndBuildPayload(conn, ownerAid, fileData, filename, opts);
+}

package/dist/aun/outbox.js

@@ -59,6 +59,7 @@ export function enqueue(aid, opts) {
         payload: opts.payload,
         text: opts.text,
         filePath: opts.filePath,
+        image: opts.image,
         logText: opts.logText,
         context: opts.context,
         ttl: opts.ttl ?? DEFAULT_TTL,
@@ -81,6 +82,16 @@ export function remove(aid, id) {
     const entries = readEntries(aid).filter(e => e.id !== id);
     writeEntries(aid, entries);
 }
+/** Replace an existing entry without consuming another outbox slot. */
+export function replace(aid, entry) {
+    const entries = readEntries(aid);
+    const index = entries.findIndex(candidate => candidate.id === entry.id);
+    if (index < 0)
+        return false;
+    entries[index] = entry;
+    writeEntries(aid, entries);
+    return true;
+}
 /** Remove durable interaction cards that were cancelled before delivery. */
 export function removeInteractionCards(aid, requestId) {
     const entries = readEntries(aid);
@@ -102,7 +113,11 @@ export function cleanup(aid) {
         writeEntries(aid, valid);
     return removed;
 }
-export async function drain(aid, sender) {
+// Each caller gets its own pass over the current disk state. This prevents
+// duplicate sends while allowing a later drain trigger to pick up entries
+// enqueued during an active pass.
+const activeDrainTails = new Map();
+async function drainOnce(aid, sender) {
     const entries = readEntries(aid);
     if (entries.length === 0)
         return { sent: 0, expired: 0, failed: 0 };
@@ -135,12 +150,40 @@ export async function drain(aid, sender) {
         }
     }
     const current = readEntries(aid);
-    const currentIds = new Set(current.map(e => e.id));
-    const retainedNewEntries = current.filter(e => !drainedIds.has(e.id));
-    const retainedFailedEntries = remaining.filter(e => currentIds.has(e.id));
-    writeEntries(aid, [...retainedFailedEntries, ...retainedNewEntries]);
+    const failedById = new Map(remaining.map(entry => [entry.id, entry]));
+    const retained = current.flatMap(entry => {
+        if (!drainedIds.has(entry.id))
+            return [entry];
+        const failedEntry = failedById.get(entry.id);
+        if (!failedEntry)
+            return [];
+        return [{
+                ...failedEntry,
+                ...entry,
+                attempts: failedEntry.attempts,
+                lastError: failedEntry.lastError,
+            }];
+    });
+    writeEntries(aid, retained);
     return { sent, expired, failed };
 }
+export async function drain(aid, sender) {
+    const previous = activeDrainTails.get(aid);
+    let releaseTurn;
+    const turn = new Promise(resolve => { releaseTurn = resolve; });
+    const tail = (previous ?? Promise.resolve()).then(() => turn);
+    activeDrainTails.set(aid, tail);
+    if (previous)
+        await previous;
+    try {
+        return await drainOnce(aid, sender);
+    }
+    finally {
+        releaseTurn();
+        if (activeDrainTails.get(aid) === tail)
+            activeDrainTails.delete(aid);
+    }
+}
 export function hasPending(aid) {
     const file = outboxFile(aid);
     if (!fs.existsSync(file))