evolcore 0.0.35 → 0.0.36

package/dist/aun/msg/p2p.js

@@ -11,6 +11,7 @@ import { ipcQuery } from '../../ipc.js';
 import { readDelegationCredential } from '../../core/auth/agent-delegation.js';
 import { loadDaemonConfig } from '../../config-store.js';
 import { normalizeAunMentionEntries, withAunAttention } from './mention-schema.js';
+import { isTopicThreadId } from '../../core/thread/topic-id.js';
 const DAEMON_SEND_TIMEOUT_GRACE_MS = 10_000;
 const DEFAULT_IDLE_TIMEOUT_MS = 120_000;
 const MAX_TIMER_MS = 2_147_483_647;
@@ -27,7 +28,7 @@ function readDaemonConfigForSend() {
         return {};
     }
 }
-export function daemonTaskSendIpcTimeoutMs(file = false) {
+export function daemonTaskSendIpcTimeoutMs(file = false, requestTimeoutMs) {
     let idleTimeoutMs = DEFAULT_IDLE_TIMEOUT_MS;
     // Use the ConfigStore read path so managed tasks never open daemon.json
     // directly. The daemon-owned config reader handles missing, invalid, and
@@ -36,7 +37,7 @@ export function daemonTaskSendIpcTimeoutMs(file = false) {
     if (typeof seconds === 'number' && Number.isFinite(seconds) && seconds > 0) {
         idleTimeoutMs = seconds * 1000;
     }
-    return Math.min(MAX_TIMER_MS, Math.max(file ? 120_000 : 5_000, idleTimeoutMs + DAEMON_SEND_TIMEOUT_GRACE_MS));
+    return Math.min(MAX_TIMER_MS, Math.max(file ? 120_000 : 5_000, idleTimeoutMs + DAEMON_SEND_TIMEOUT_GRACE_MS, (requestTimeoutMs ?? 0) + DAEMON_SEND_TIMEOUT_GRACE_MS));
 }
 export function resolveAunMessageEncrypt(explicit) {
     if (typeof explicit === 'boolean')
@@ -59,6 +60,9 @@ function buildSimplePayload(body) {
         }
     }
 }
+function isRawPayloadBody(body) {
+    return body.mode === 'payload';
+}
 function messageLogContent(body) {
     return body.mode === 'text' ? body.text
         : body.mode === 'link' ? `[link] ${body.url}`
@@ -67,8 +71,13 @@ function messageLogContent(body) {
 }
 function applyRoutingPayloadFields(payload, args, runtimeContext, includeRuntimeRef = true) {
     const threadId = msgSendThreadId(args, payload, runtimeContext);
-    if (threadId)
+    // 主话题的规范 id（`main:<a>:<b>`）是本端身份，不进线上报文：主话题的线上
+    // 形态就是"不带 thread_id"，对端按无话题落到同一条关系的主话题。
+    // `args.thread` 可能是历史写法（裸对端 AID / `<peer>/<id>`），同样只放行话题。
+    if (isTopicThreadId(threadId))
         payload.thread_id = threadId;
+    else if (payload.thread_id !== undefined)
+        delete payload.thread_id;
     if (!includeRuntimeRef)
         return;
     const refMessageId = runtimeRefMessageIdForMsgSend({ from: args.from, runtime: runtimeContext });
@@ -125,21 +134,24 @@ async function tryDaemonMsgSend(args, payload, runtimeContext, file) {
     if (args.slotId || args.aunPath) {
         return { ok: false, code: 'INVALID_DELEGATION', error: 'Task sends cannot override the daemon AUN connection' };
     }
-    const thread = msgSendThreadId(args, payload, runtimeContext);
+    const thread = args.body.mode === 'payload' ? undefined : msgSendThreadId(args, payload, runtimeContext);
     const response = await ipcQuery(resolvePaths().socket, {
         type: 'aun-msg-send',
         aid: args.from,
         to: args.to,
         scope: 'msg',
         ...(payload ? { payload } : { file }),
+        rawPayload: args.body.mode === 'payload',
         encrypt: args.encrypt,
+        returnPolicy: args.returnPolicy,
+        timeoutMs: args.timeoutMs,
         thread,
         handoffContext: args.handoffContext,
         originSessionId: runtimeContext.sessionId,
         originMessageId: runtimeContext.messageId,
         delegationToken: readDelegationCredential(),
         log: msgSendLogMetadata(args, payload, runtimeContext),
-    }, daemonTaskSendIpcTimeoutMs(!!file), { throwOnError: true });
+    }, daemonTaskSendIpcTimeoutMs(!!file, args.returnPolicy === 'required' ? (args.timeoutMs ?? 60_000) : undefined), { throwOnError: true });
     return response ?? {
         ok: false,
         code: 'AUN_DAEMON_UNAVAILABLE',
@@ -154,9 +166,14 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
             code: daemonResult.code,
             handoff_id: daemonResult.handoff_id,
             target_session_id: daemonResult.target_session_id,
+            request_id: daemonResult.request_id,
+            request_state: daemonResult.request_state,
         };
     }
-    if (!daemonResult.message_id && !daemonResult.handoff_id) {
+    const completedRequest = args.returnPolicy === 'required' && !!daemonResult.request_id
+        && daemonResult.request_state === 'completed' && !!daemonResult.response
+        && typeof daemonResult.response === 'object' && !Array.isArray(daemonResult.response);
+    if (!daemonResult.message_id && !daemonResult.handoff_id && !completedRequest) {
         return { ok: false, error: 'daemon AUN message send returned no message_id' };
     }
     const sent = {
@@ -168,8 +185,12 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
         timestamp: daemonResult.timestamp,
         status: daemonResult.status,
         delivery_mode: daemonResult.delivery_mode,
+        request_id: daemonResult.request_id,
+        request_state: daemonResult.request_state,
+        response: daemonResult.response,
+        transport_error: daemonResult.transport_error,
     };
-    if (!daemonResult.handoff_id && !daemonResult.log_written) {
+    if (sent.message_id && !daemonResult.handoff_id && !daemonResult.log_written) {
         await appendMsgSendOutboundLog(args, sent, {
             payload,
             runtimeContext,
@@ -227,11 +248,14 @@ export async function msgSend(args) {
     try {
         let payload;
         if (args.body.mode !== 'file') {
-            payload = withAunAttention(buildSimplePayload(args.body));
-            if (Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
+            payload = args.body.mode === 'payload'
+                ? buildSimplePayload(args.body)
+                : withAunAttention(buildSimplePayload(args.body));
+            if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
                 payload.mentions = normalizeAunMentionEntries(payload.mentions);
             }
-            applyRoutingPayloadFields(payload, args, runtimeContext, false);
+            if (!isRawPayloadBody(args.body))
+                applyRoutingPayloadFields(payload, args, runtimeContext, false);
             const daemonResult = await tryDaemonMsgSend(args, payload, runtimeContext);
             if (daemonResult)
                 return daemonMsgSendResult(args, payload, runtimeContext, daemonResult);
@@ -248,6 +272,13 @@ export async function msgSend(args) {
                 return daemonMsgSendResult(args, { type: args.body.as || 'file' }, runtimeContext, daemonResult);
             }
         }
+        if (args.returnPolicy === 'required') {
+            return {
+                ok: false,
+                code: 'REQUEST_WAIT_REQUIRES_DAEMON',
+                error: 'request/reply waiting requires a managed EvolCore daemon session',
+            };
+        }
         conn = await createShortConnection(args.from, { aunPath: args.aunPath, slotId: args.slotId });
         if (args.body.mode === 'file') {
             const built = await uploadFileAndBuildPayload(conn, args.from, args.body.filePath, {
@@ -302,15 +333,20 @@ export async function msgSend(args) {
             payload = buildSimplePayload(args.body);
         }
         // 4. 写入 payload.chatmode
-        payload.chatmode = chatmode;
+        if (args.body.mode !== 'payload')
+            payload.chatmode = chatmode;
         // 5. 写入 payload.thread_id/ref_message_id（如果指定）
-        applyRoutingPayloadFields(payload, args, runtimeContext, false);
-        applyRoutingPayloadFields(payload, args, runtimeContext);
-        if (Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
+        if (args.body.mode !== 'payload') {
+            if (!isRawPayloadBody(args.body))
+                applyRoutingPayloadFields(payload, args, runtimeContext, false);
+            applyRoutingPayloadFields(payload, args, runtimeContext);
+        }
+        if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
             payload.mentions = normalizeAunMentionEntries(payload.mentions);
         }
         const encrypt = resolveAunMessageEncrypt(args.encrypt);
-        payload = withAunAttention(payload);
+        if (args.body.mode !== 'payload')
+            payload = withAunAttention(payload);
         const sendParams = { to: args.to, payload, encrypt };
         const result = await conn.call('message.send', sendParams);
         const messageId = typeof result?.message_id === 'string' && result.message_id.trim()

package/dist/aun/outbox.js

@@ -229,6 +229,10 @@ export function removeInteractionCards(aid, requestId, queue = 'default') {
 export function load(aid, queue = 'default') {
     return readEntries(aid, queue).filter(e => !e.terminal && !e.deliveryResult && !isExpired(e));
 }
+export function findInteractionCards(aid, requestId) {
+    return readEntries(aid).filter(entry => entry.postSend?.type === 'register_interaction_card'
+        && entry.postSend.requestId === requestId);
+}
 export function findByDedupeKey(aid, dedupeKey, opts = {}, queue = 'default') {
     const entries = opts.includeTerminal
         ? readEntries(aid, queue).filter(entry => !isExpired(entry))