evolcore 0.0.38 → 0.0.40

package/dist/agents/ecagent-runner.js

@@ -136,24 +136,27 @@ function openAiMessages(context) {
             continue;
         }
         if (message.role === 'assistant') {
-            const text = message.content
+            const content = Array.isArray(message.content) ? message.content : [];
+            const text = content
                 .filter((block) => block.type === 'text')
                 .map(block => block.text)
                 .join('');
-            const thinking = message.content
+            const thinking = content
                 .filter((block) => block.type === 'thinking')
                 .map((block) => block.thinking)
                 .join('');
-            const toolCalls = message.content
+            const toolCalls = content
                 .filter((block) => block.type === 'toolCall')
                 .map((block) => ({
                 id: block.id,
                 type: 'function',
                 function: { name: block.name, arguments: JSON.stringify(block.arguments ?? {}) },
             }));
+            if (!text && !thinking && toolCalls.length === 0)
+                continue;
             messages.push({
                 role: 'assistant',
-                content: text || null,
+                content: text || [],
                 ...(thinking ? { reasoning_content: thinking } : {}),
                 ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
             });
@@ -1383,15 +1386,23 @@ export class EcagentRunner {
                 harness?.abort(),
                 ...runs.map(run => run.done),
             ]), 'ecagent');
+            for (const run of runs) {
+                if (run.cancelled)
+                    run.interruptError = undefined;
+            }
         }
         catch (error) {
+            for (const run of runs) {
+                if (run.cancelled && run.interruptError === undefined)
+                    run.interruptError = error;
+            }
             logger.warn(`[EcagentRunner] Interrupted execution still requires quiescence: session=${sessionKey} error=${String(error)}`);
         }
     }
     assertInterruptSettled(sessionId) {
-        if ([...(this.sessionRuns.get(sessionId) ?? [])].some(run => run.cancelled)) {
-            throw unsettledInterruptError('ecagent');
-        }
+        const unsettled = [...(this.sessionRuns.get(sessionId) ?? [])].find(run => run.cancelled);
+        if (unsettled)
+            throw unsettledInterruptError('ecagent', unsettled.interruptError);
     }
     injectUserMessage(sessionId, text) {
         const harness = this.runtimes.get(sessionId)?.harness;

package/dist/agents/gemini-runner.js

@@ -760,8 +760,7 @@ export class GeminiRunner {
         if (context?.approvalInteractionPolicy !== 'deny')
             return;
         if (isGeminiUnattendedInteraction(toolName)) {
-            logger.info(`[GeminiRunner] interaction.auto_resolved kind=${normalizeGeminiToolName(toolName)} session=${sessionId}`);
-            return;
+            throw new Error('无人值守任务不能自动回答用户问题');
         }
         const lifecycleRequestId = requestId ?? `gemini-approval-${crypto.randomUUID()}`;
         const auditSummary = `${toolName} runtime authorization denied by Gemini headless policy`;

package/dist/agents/runner-types.js

@@ -34,7 +34,23 @@ export function parseAsyncUserQuestions(value) {
             || question.options.length > 20 || question.options.some((option) => typeof option !== 'string' || !option.trim() || option.length > 4_096))) {
             throw new Error('Invalid asynchronous question options');
         }
-        return { title: question.title, ...(question.options ? { options: [...question.options] } : {}) };
+        if (question.blocking != null && typeof question.blocking !== 'boolean') {
+            throw new Error('Invalid asynchronous question blocking flag');
+        }
+        if (question.recommendedOption != null
+            && (typeof question.recommendedOption !== 'string' || !question.recommendedOption.trim())) {
+            throw new Error('Invalid asynchronous question recommended option');
+        }
+        if (question.recommendedOption != null && question.options
+            && !question.options.includes(question.recommendedOption)) {
+            throw new Error('Asynchronous question recommended option is not in options');
+        }
+        return {
+            title: question.title,
+            ...(question.options ? { options: [...question.options] } : {}),
+            blocking: question.blocking !== false,
+            ...(question.recommendedOption ? { recommendedOption: question.recommendedOption } : {}),
+        };
     });
 }
 export function hasTrustedFullAccessContext(context) {
@@ -44,10 +60,13 @@ export function hasTrustedFullAccessContext(context) {
         || authorization.processRole !== 'fullaccess-run'
         || authorization.dataScope !== 'daemon')
         return false;
-    if (authorization.source === 'fullaccess-command' || authorization.source === 'agent-policy') {
+    if (authorization.source === 'fullaccess-command' || authorization.source === 'agent-policy' || authorization.source === 'session-policy') {
         return typeof authorization.authorizedBy === 'string' && authorization.authorizedBy.length > 0
-            && (authorization.source !== 'agent-policy'
-                || (typeof authorization.agentAid === 'string' && authorization.agentAid.length > 0));
+            && (authorization.source === 'fullaccess-command'
+                || (typeof authorization.agentAid === 'string'
+                    && authorization.agentAid.length > 0
+                    && (authorization.source !== 'session-policy'
+                        || (typeof authorization.sessionId === 'string' && authorization.sessionId.length > 0))));
     }
     return authorization.source === 'trigger'
         && typeof authorization.authorizedBy === 'string' && authorization.authorizedBy.length > 0
@@ -75,10 +94,13 @@ export async function withInterruptDeadline(operation, label, timeoutMs = 5_000)
             clearTimeout(timer);
     }
 }
-export function unsettledInterruptError(runner) {
-    return Object.assign(new Error(`${runner} 的上一次执行尚未确认停止，本次任务未启动；旧执行结束后可在原会话继续。`), {
+export function unsettledInterruptError(runner, cause) {
+    const error = Object.assign(new Error(`${runner} 的上一次执行尚未确认停止，本次任务未启动；旧执行结束后可在原会话继续。`), {
         code: 'RUNNER_INTERRUPT_UNCONFIRMED',
     });
+    if (cause !== undefined)
+        error.cause = cause;
+    return error;
 }
 // ── 类型守卫 ──
 export function hasModelSwitcher(agent) {

package/dist/aun/aid/agentmd.js

@@ -538,6 +538,27 @@ function verifyLocal(store, aid, content) {
         return { status: 'invalid', reason: `certificate not available: ${String(e?.message || e).slice(0, 100)}` };
     }
 }
+/** Verify a locally stored agent.md without contacting the AUN gateway. */
+export async function verifyLocalAgentMd(aid, opts = {}) {
+    const aunPath = resolveAgentMdAunPath(opts);
+    const localPath = agentMdPath(aid, aunPath);
+    if (!fs.existsSync(localPath))
+        return { status: 'missing' };
+    const store = opts.store ?? await getAidStore({ slotId: SLOT.cli, aunPath });
+    const ownStore = !opts.store;
+    try {
+        const content = fs.readFileSync(localPath, 'utf-8');
+        const result = verifyLocal(store, aid, content);
+        return { status: result.status, ...(result.reason ? { reason: result.reason } : {}) };
+    }
+    finally {
+        if (ownStore)
+            try {
+                store.close();
+            }
+            catch { /* ignore */ }
+    }
+}
 export async function agentmdGet(aid, opts) {
     const aunPath = resolveAgentMdAunPath(opts);
     const store = opts?.store ?? await getAidStore({ slotId: SLOT.cli, aunPath });

package/dist/aun/aid/client.js

@@ -39,7 +39,7 @@ export function suppressSdkLogs() {
     };
 }
 // ==================== SDK package ====================
-export const MIN_AUN_CORE_SDK = [0, 5, 22];
+export const MIN_AUN_CORE_SDK = [0, 5, 25];
 export const AUN_CORE_SDK_PKG = '@agentunion/fastaun';
 function compareVersion(a, min) {
     const parts = a.split('.').map(n => parseInt(n, 10));

package/dist/aun/aid/control-aid.js

@@ -8,7 +8,6 @@ import { getAidStore, loadClient, SLOT } from './store.js';
 import { LocalTokenStore, validateAgentMdDocument, verifyAgentMdUpload, } from '@agentunion/fastaun';
 import { AUN_KEYSTORE_ENCRYPTION_SEED } from './encryption-seed-policy.js';
 import { isValidAid } from './validation.js';
-import { OwnerResolver } from '../../core/ownership/owner-resolver.js';
 import { agentMdPath, resolvePaths } from '../../paths.js';
 import { PeerIdentityCache } from '../../core/relation/peer-identity.js';
 import { agentmdPut, buildInitialAgentMd, invalidateAgentDisplayName, stripAgentMdSignature } from './agentmd.js';
@@ -331,7 +330,6 @@ export async function submitControlAidRegistration(aid, owner, options = {}) {
     let connecting = false;
     let sentOperationIds = new Set();
     let invitationObserver;
-    const resolver = new OwnerResolver();
     async function bounded(operation, timeoutMs = deadline - Date.now()) {
         let timer;
         try {
@@ -346,27 +344,6 @@ export async function submitControlAidRegistration(aid, owner, options = {}) {
                 clearTimeout(timer);
         }
     }
-    function readTask() {
-        const raw = records.loadOwnershipTask(aid, operationId)?.task;
-        if (!raw)
-            return;
-        if (raw.operation_id !== operationId || raw.operation !== 'bind' || raw.sub_aid !== aid
-            || raw.owner_aid !== ownerAid || raw.initiator_aid !== aid || raw.new_owner_aid !== undefined
-            || !['pending', 'completed', 'rejected', 'stopped', 'error'].includes(String(raw.status))
-            || typeof raw.step !== 'string' || !Number.isSafeInteger(raw.base_relation_version)
-            || raw.target_relation_version !== Number(raw.base_relation_version) + 1) {
-            throw Object.assign(new Error('SDK registration task does not match its original intent'), { code: 'TASK_MISMATCH' });
-        }
-        task = {
-            operation_id: operationId, operation: 'bind', sub_aid: aid, owner_aid: ownerAid,
-            base_relation_version: raw.base_relation_version,
-            target_relation_version: raw.target_relation_version,
-            status: raw.status, step: raw.step,
-            ...(typeof raw.code === 'string' ? { code: raw.code } : {}),
-            ...(typeof raw.reason === 'string' ? { reason: raw.reason } : {}),
-            ...(typeof raw.retryable === 'boolean' ? { retryable: raw.retryable } : {}),
-        };
-    }
     function result(status, error) {
         return { status, ...(operationId ? { operationId } : {}), ...(task ? { task } : {}), ...(error ? { error } : {}) };
     }
@@ -374,10 +351,8 @@ export async function submitControlAidRegistration(aid, owner, options = {}) {
         records = new LocalTokenStore(resolvePaths().root, { encryptionSeed: AUN_KEYSTORE_ENCRYPTION_SEED });
         const intent = records.loadMetadata(aid)?.registration_intent;
         const registrationIntentOwner = typeof intent?.owner === 'string' ? intent.owner.toLowerCase() : undefined;
-        // Preserve an existing SDK registration task and let the same SDK client
-        // resume it during connect before OwnerResolver checks/binds the subject.
         if (intent && Object.prototype.hasOwnProperty.call(intent, 'owner')) {
-            if (!registrationIntentOwner) {
+            if (!registrationIntentOwner || !isValidAid(registrationIntentOwner)) {
                 return result('unknown', {
                     code: 'REGISTRATION_INTENT_PRESENT',
                     message: 'Control AID has an invalid SDK registration Owner intent',
@@ -386,93 +361,44 @@ export async function submitControlAidRegistration(aid, owner, options = {}) {
             if (registrationIntentOwner !== ownerAid) {
                 return result('failed', { code: 'OWNER_INTENT_CONFLICT', message: 'Control AID was registered for a different Owner' });
             }
-            if (typeof intent.operation_id === 'string' && REGISTRATION_OPERATION_ID.test(intent.operation_id)) {
-                operationId = intent.operation_id;
-                readTask();
-            }
-            if (!operationId) {
-                return result('unknown', {
-                    code: 'REGISTRATION_INTENT_PRESENT',
-                    message: 'Control AID has an SDK registration intent without a valid operation ID',
-                });
-            }
         }
         if (options.agentMdError) {
             return result('failed', { code: 'CONTROL_AGENTMD_NOT_READY', message: options.agentMdError });
         }
-        store = await bounded(getAidStore({ slotId: SLOT.cli }));
-        const ownershipTasks = records.listOwnershipTasks(aid).map(snapshot => snapshot.task);
-        const conflictingTask = ownershipTasks.find(candidate => candidate.sub_aid === aid
-            && (candidate.status === 'pending' || candidate.status === 'error' && candidate.retryable === true)
-            && !(candidate.operation === 'bind' && candidate.owner_aid === ownerAid
-                && candidate.initiator_aid === aid && candidate.new_owner_aid === undefined));
-        if (conflictingTask) {
-            return result('failed', { code: 'BIND_CONFLICT', message: 'A different active ownership task must be resolved first' });
-        }
+        store = await bounded(getAidStore({ slotId: `ownership-${crypto.randomUUID()}` }));
         client = await bounded(loadClient(store, aid));
         connecting = true;
         sentOperationIds = new Set();
         invitationObserver = observeInvitationSend(client, ownerAid, sentOperationIds);
         await bounded(client.connect({
-            connection_kind: 'long', auto_reconnect: false, background_sync: false,
+            connection_kind: 'short', short_ttl_ms: 30_000, auto_reconnect: false, background_sync: false,
             connect_timeout: 10, call_timeout: 10,
         }));
-        if (registrationIntentOwner === ownerAid && operationId) {
-            readTask();
-            if ((!task || task.status === 'pending') && !sentOperationIds.has(operationId)) {
-                await bounded(invitationObserver.waitFor(operationId));
-                readTask();
+        task = await bounded(client.bindOwneraid(ownerAid));
+        if (task.operation !== 'bind' || task.sub_aid !== aid || task.owner_aid !== ownerAid
+            || task.new_owner_aid !== undefined || !REGISTRATION_OPERATION_ID.test(task.operation_id)
+            || !Number.isSafeInteger(task.base_relation_version)
+            || task.target_relation_version !== task.base_relation_version + 1) {
+            throw Object.assign(new Error('SDK returned a binding result for a different subject or Owner'), { code: 'TASK_MISMATCH' });
+        }
+        operationId = task.operation_id;
+        if (task.status === 'completed') {
+            let consensus;
+            try {
+                consensus = await bounded(client.checkOwnershipConsensus(aid));
             }
-            if (!task) {
+            catch (error) {
                 return result('unknown', {
-                    code: 'BIND_TASK_NOT_PERSISTED',
-                    message: 'SDK did not expose the recovered registration task after connect',
-                });
-            }
-            if (task?.status === 'completed') {
-                const consensus = await bounded(client.checkOwnershipConsensus(aid));
-                if (consensus.status === 'consensus' && consensus.sub_aid === aid && consensus.owner_aid === ownerAid) {
-                    return result('already_bound');
-                }
-                return result('failed', {
-                    code: 'CONSENSUS_REQUIRED',
-                    message: 'A completed binding task has no current verified Owner consensus',
+                    code: 'BIND_SUBMIT_UNKNOWN',
+                    message: error instanceof Error ? error.message : String(error),
                 });
             }
-            if (task && (['rejected', 'stopped', 'error'].includes(task.status) || task.code)) {
-                return result('failed', { code: task.code ?? 'BIND_SUBMIT_FAILED', message: task.reason ?? `Binding task ${task.status}` });
-            }
-            if (sentOperationIds.has(operationId))
-                return result('submitted');
-            return result('unknown', {
-                code: 'BIND_SUBMIT_UNKNOWN',
-                message: 'SDK is recovering the original registration task; no matching message.send acknowledgement was observed',
-            });
-        }
-        // Reuse the same service as agent-create, including its fresh consensus
-        // check, explicit SDK bind call, and persistent task projection.
-        resolver.attachClient(aid, client, true);
-        const view = await bounded(resolver.bind(aid, ownerAid));
-        if (view.consensusStatus === 'consensus' && view.ownerAid === ownerAid) {
-            return result('already_bound');
-        }
-        const returnedTask = view.task;
-        if (!returnedTask || returnedTask.operation !== 'bind' || returnedTask.sub_aid !== aid
-            || returnedTask.owner_aid !== ownerAid || returnedTask.new_owner_aid !== undefined
-            || typeof returnedTask.operation_id !== 'string' || !REGISTRATION_OPERATION_ID.test(returnedTask.operation_id)) {
-            throw Object.assign(new Error('SDK returned a binding task for a different subject or Owner'), { code: 'TASK_MISMATCH' });
-        }
-        operationId = returnedTask.operation_id;
-        readTask();
-        if (!task) {
-            throw Object.assign(new Error('SDK binding task was not persisted'), { code: 'BIND_TASK_NOT_PERSISTED' });
-        }
-        if (task.status === 'completed') {
-            const consensus = await bounded(client.checkOwnershipConsensus(aid));
             if (consensus.status === 'consensus' && consensus.sub_aid === aid && consensus.owner_aid === ownerAid) {
                 return result('already_bound');
             }
-            return result('failed', { code: 'CONSENSUS_REQUIRED', message: 'Completed binding has no current verified Owner consensus' });
+            if (sentOperationIds.has(operationId))
+                return result('submitted');
+            return result('unknown', { code: 'BIND_SUBMIT_UNKNOWN', message: 'SDK completed the local bind without a message.send acknowledgement' });
         }
         if (['rejected', 'stopped', 'error'].includes(task.status)) {
             return result('failed', { code: task.code ?? 'BIND_SUBMIT_FAILED', message: task.reason ?? `Binding task ${task.status}` });
@@ -489,15 +415,14 @@ export async function submitControlAidRegistration(aid, owner, options = {}) {
         const details = error;
         const code = typeof details.stringCode === 'string' ? details.stringCode
             : typeof details.code === 'string' ? details.code : undefined;
-        const uncertain = connecting && (code === 'BIND_SUBMIT_TIMEOUT' || !code
-            || resolver.snapshot(aid).requestStatus === 'interrupted');
+        operationId ??= sentOperationIds.values().next().value;
+        const uncertain = connecting && (code === 'BIND_SUBMIT_TIMEOUT' || !code || !!operationId);
         return result(uncertain ? 'unknown' : 'failed', {
             code: uncertain ? 'BIND_SUBMIT_UNKNOWN' : code ?? 'BIND_SUBMIT_FAILED',
             message: details.message ?? String(error),
         });
     }
     finally {
-        resolver.stop();
         invitationObserver?.restore();
         if (client) {
             try {

package/dist/aun/aid/ownership-operation.js

@@ -1,6 +1,8 @@
 import { isValidAid } from './validation.js';
 import { ownerResolver, OwnershipError } from '../../core/ownership/owner-resolver.js';
 import { logger } from '../../utils/logger.js';
+import { MAIN_CLI_BIN } from '../../product.js';
+const OWNERSHIP_OPERATION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 export function ownershipFailure(error) {
     const details = error && typeof error === 'object' ? error : {};
     return {
@@ -14,34 +16,55 @@ export function ownershipFailure(error) {
 export function parseOwnershipCommand(argv) {
     const args = argv[0] === 'aid' ? argv.slice(1) : [...argv];
     if (args[0] !== 'bind' || !args[1]) {
-        throw new OwnershipError('INVALID_ARGUMENT', 'Use ec aid bind <ownerAid> or ec aid bind status');
+        throw new OwnershipError('INVALID_ARGUMENT', `Use ${MAIN_CLI_BIN} aid bind <ownerAid>, status, accept, or reject`);
     }
-    const action = args[1] === 'status' ? 'status' : 'bind';
+    const action = ['status', 'accept', 'reject'].includes(args[1]) ? args[1] : 'bind';
     if (action === 'bind' && !isValidAid(args[1]))
         throw new OwnershipError('INVALID_AID', 'A valid owner AID is required');
+    if ((action === 'accept' || action === 'reject') && !OWNERSHIP_OPERATION_ID.test(args[2] ?? '')) {
+        throw new OwnershipError('INVALID_OPERATION', 'A valid ownership operation ID is required');
+    }
     let subjectAid;
+    let reason;
     let formatSeen = false;
-    for (let index = 2; index < args.length; index += 2) {
-        if (args[index] === '--subject' && !subjectAid && isValidAid(args[index + 1] ?? ''))
-            subjectAid = args[index + 1];
-        else if (args[index] === '--format' && args[index + 1] === 'json' && !formatSeen)
+    const positionalEnd = action === 'bind' || action === 'status' ? 2 : 3;
+    for (let index = positionalEnd; index < args.length; index += 2) {
+        const flag = args[index];
+        const value = args[index + 1];
+        if (flag === '--subject' && !subjectAid && isValidAid(value ?? '')) {
+            subjectAid = value;
+        }
+        else if (flag === '--format' && value === 'json' && !formatSeen) {
             formatSeen = true;
-        else
-            throw new OwnershipError('INVALID_ARGUMENT', 'Only one --subject <subjectAid> and --format json are supported');
+        }
+        else if (flag === '--reason' && action === 'reject' && reason === undefined
+            && value !== undefined && !value.startsWith('--')) {
+            reason = value;
+        }
+        else {
+            throw new OwnershipError('INVALID_ARGUMENT', 'Supported options are --subject <subjectAid>, --reason <text>, and --format json');
+        }
     }
-    return action === 'status' ? { action, subjectAid } : { action, subjectAid, ownerAid: args[1] };
+    if (action === 'status')
+        return { action, subjectAid };
+    if (action === 'accept')
+        return { action, operationId: args[2], subjectAid };
+    if (action === 'reject')
+        return { action, operationId: args[2], ...(reason !== undefined ? { reason } : {}), subjectAid };
+    return { action, subjectAid, ownerAid: args[1] };
 }
 export async function executeOwnershipCommand(command, defaultSubjectAid) {
     const subjectAid = command.subjectAid ?? defaultSubjectAid;
     if (!subjectAid)
         throw new OwnershipError('SUBJECT_REQUIRED', 'No local subject AID is available');
     if (command.action === 'status') {
-        ownerResolver.assertLocalSubject(subjectAid);
-        return ownerResolver.refresh(subjectAid);
+        return ownerResolver.status(subjectAid);
+    }
+    if (command.action === 'accept' || command.action === 'reject') {
+        return ownerResolver.decide(subjectAid, command.operationId, command.action, command.action === 'reject' ? command.reason : undefined);
     }
     logger.info(`[ownership] bind requested subject=${subjectAid} owner=${command.ownerAid}`);
     try {
-        ownerResolver.assertLocalSubject(subjectAid);
         const result = await ownerResolver.bind(subjectAid, command.ownerAid);
         const task = result.task;
         const log = task && ['rejected', 'stopped', 'error'].includes(task.status) ? logger.warn : logger.info;

package/dist/aun/group/invite-service.js

@@ -372,6 +372,12 @@ export class GroupInviteReviewService {
         if (!runtime)
             return Promise.reject(new Error('邀请审核服务未就绪'));
         const task = this.serial(selfAid, async () => {
+            if (!this.active(runtime)) {
+                runtime.ready = false;
+                runtime.failures = 0;
+                runtime.nextSync = Date.now() + 15 * 60_000;
+                return;
+            }
             try {
                 await this.sync(runtime);
                 runtime.failures = 0;

package/dist/aun/msg/p2p.js

@@ -10,6 +10,7 @@ import { resolvePaths } from '../../paths.js';
 import { ipcQuery } from '../../ipc.js';
 import { readDelegationCredential } from '../../core/auth/agent-delegation.js';
 import { loadDaemonConfig } from '../../config-store.js';
+import { formatPeerKey } from '../../core/relation/peer-identity.js';
 import { normalizeAunMentionEntries, withAunAttention } from './mention-schema.js';
 import { isTopicThreadId } from '../../core/thread/topic-id.js';
 const DAEMON_SEND_TIMEOUT_GRACE_MS = 10_000;
@@ -60,9 +61,6 @@ 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}`
@@ -134,7 +132,7 @@ 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 = args.body.mode === 'payload' ? undefined : msgSendThreadId(args, payload, runtimeContext);
+    const thread = msgSendThreadId(args, payload, runtimeContext);
     const response = await ipcQuery(resolvePaths().socket, {
         type: 'aun-msg-send',
         aid: args.from,
@@ -254,8 +252,7 @@ export async function msgSend(args) {
             if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
                 payload.mentions = normalizeAunMentionEntries(payload.mentions);
             }
-            if (!isRawPayloadBody(args.body))
-                applyRoutingPayloadFields(payload, args, runtimeContext, false);
+            applyRoutingPayloadFields(payload, args, runtimeContext, false);
             const daemonResult = await tryDaemonMsgSend(args, payload, runtimeContext);
             if (daemonResult)
                 return daemonMsgSendResult(args, payload, runtimeContext, daemonResult);
@@ -327,7 +324,10 @@ export async function msgSend(args) {
             }).effectiveRole;
         }
         catch { /* 角色解析失败时按未知处理（proactive） */ }
-        const chatmode = chatmodeForPeerIdentity(peerIdentity, peerRole);
+        const chatmode = chatmodeForPeerIdentity(peerIdentity, peerRole, {
+            self: args.from,
+            peerKey: formatPeerKey('aun', args.to),
+        });
         // 3. 构建 payload
         if (!payload) {
             payload = buildSimplePayload(args.body);
@@ -336,11 +336,7 @@ export async function msgSend(args) {
         if (args.body.mode !== 'payload')
             payload.chatmode = chatmode;
         // 5. 写入 payload.thread_id/ref_message_id（如果指定）
-        if (args.body.mode !== 'payload') {
-            if (!isRawPayloadBody(args.body))
-                applyRoutingPayloadFields(payload, args, runtimeContext, false);
-            applyRoutingPayloadFields(payload, args, runtimeContext);
-        }
+        applyRoutingPayloadFields(payload, args, runtimeContext, args.body.mode !== 'payload');
         if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
             payload.mentions = normalizeAunMentionEntries(payload.mentions);
         }