evolcore 0.0.24 → 0.0.26

package/dist/core/command/slash-handler.js

@@ -28,7 +28,7 @@ import { isSystemControlChannel } from '../system-channels.js';
 import { launchMonitorAndConfirm, resolveMonitorLaunch, cleanupMonitorStage } from '../../utils/cross-platform.js';
 import { scanInstances } from '../../utils/instance-registry.js';
 import { inspectDataMigrationRequirement } from '../data-migration.js';
-import { guardIdleCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
+import { guardIdleCommand, guardGroupSlashCommand, guardKnownCommand, guardRoleCommand, guardThreadCommand, isRecognizedSlashCommand, normalizeSlashContent, probeSessionActivity, } from './slash-gate.js';
 const allEfforts = ['none', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'];
 const PERMISSION_MODE_KEYS = PUBLIC_PERMISSION_MODES;
 function defaultSlashChatmode(field) {
@@ -368,7 +368,7 @@ async function getGitWorkingDirInfo(projectPath) {
         return null; // git 命令失败时静默返回 null
     }
 }
-export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject, replyContext) {
+export async function handleSlashCommand(content, channel, channelId, sendMessage, userId, threadId, chatType, source, messageId, selfAID, overrideIdentity, overrideSubject, replyContext, applyGroupSlashPolicy = false) {
     // 卡片回调的 chatType 不可靠（飞书 bot 单聊 chatId 也是 oc_ 前缀），
     // 不应覆盖 session 中已有的正确值
     if (source === 'card-trigger')
@@ -434,9 +434,18 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             logger.warn(`[CommandHandler] topic session lookup failed: thread=${threadId}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    const activeChatType = topicAuthSession?.chatType
+    const activeChatType = (applyGroupSlashPolicy
+        ? replyContext?.delivery?.chatType || overrideSubject?.chatType || chatType
+        : undefined)
+        || topicAuthSession?.chatType
         || activeSession?.chatType
         || (chatType === 'group' ? 'group' : 'private');
+    const groupSlash = applyGroupSlashPolicy && activeChatType === 'group';
+    if (applyGroupSlashPolicy) {
+        const groupGuard = guardGroupSlashCommand(normalizedContent, activeChatType);
+        if (groupGuard)
+            return groupGuard;
+    }
     const getExistingSessionForCommand = async () => {
         if (threadId) {
             if (topicAuthSessionLookupFailed)
@@ -485,7 +494,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         || normalizedContent === '/upgrade'
         || normalizedContent === '/reload'
         || normalizedContent.startsWith('/reload ')
-        || normalizedContent === '/pair';
+        || normalizedContent === '/pair'
+        || /^\/diag(?:\s|$)/.test(normalizedContent);
     const roleGuard = guardRoleCommand(normalizedContent, activeChatType, isAdmin || (isDaemonOwner && isProcessLevelSlash));
     if (roleGuard)
         return roleGuard;
@@ -617,6 +627,30 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     };
     // /help 命令不需要会话
     if (normalizedContent === '/help') {
+        if (groupSlash) {
+            const lines = [
+                '群聊可用命令：',
+                '  /help - 显示帮助',
+                '  /status - 显示会话状态',
+                '  /check - 检查 Agent 健康',
+                '  /model [current|list|check] - 查询模型或检查网关',
+                '  /effort - 查看推理强度',
+                '  /baseagent - 查看 Agent 后端',
+                '  /perm - 查看权限模式',
+                '  /mentionmode - 查看群聊 @ 处理模式',
+                '  /ask <选项> - 回答待处理问题',
+                '  /pause - 在下一次工具调用前暂停任务',
+                '  /resume - 继续已暂停的任务',
+                '  /stop - 中断当前任务',
+                ...(isAdmin ? [
+                    '  /compact - 压缩会话上下文',
+                    ...(threadId ? ['  /renew - 轮换当前话题的后端会话'] : []),
+                ] : []),
+                '',
+                '模型、推理强度、后端、权限与 @ 模式在群聊中仅支持查询。',
+            ];
+            return { kind: 'command.result', text: lines.join('\n') };
+        }
         const canReadModel = canAccessSlashOperation('model.current', 'relation')
             || canAccessSlashOperation('model.list', 'relation');
         const canUseModel = canAccessSlashOperation('model.use', 'relation');
@@ -633,7 +667,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const appendProcessCommands = (lines) => {
             if (!isDaemonOwner)
                 return;
-            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码');
+            lines.push('', '🛠️ 进程级运维：', '  /restart - 重启服务', '  /upgrade - 检查版本更新', '  /reload [aid] - 热重载 Agent 配置', '  /fa <提示词> - 单次使用宿主级 fullaccess 执行（别名: /fullaccess）', '  /pair - 获取远程控制配对码', '  /diag <问题描述> - 邀请远程诊断；/diag stop 撤销授权');
         };
         if (!isAdmin && activeChatType === 'group') {
             const lines = [
@@ -773,6 +807,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         ];
         return { kind: 'command.result', text: lines.join('\n') };
     }
+    if (/^\/diag(?:\s|$)/.test(normalizedContent)) {
+        if (!isDaemonOwner || !userId || !this.diagService)
+            return { kind: 'command.error', text: '❌ /diag 需要本机 DaemonOwner 和可用的诊断入口' };
+        const problem = content.trim().slice(5).trim();
+        const result = await this.diagService.execute(problem.toLowerCase() === 'stop'
+            ? { action: 'stop' } : { action: 'start', problem }, userId);
+        return { kind: result.ok ? 'command.result' : 'command.error', text: result.message };
+    }
     // /pair is also recognized on an Agent channel so it cannot fall through
     // into model input. The daemon control channel has its own fast path; this
     // branch preserves the same daemon-owner boundary for ordinary AUN chats.
@@ -792,6 +834,26 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
     }
     // /evolhelp 命令：返回 JSON 格式的命令列表（供程序解析）
     if (normalizedContent === '/evolhelp') {
+        if (groupSlash) {
+            const commands = [
+                { command: '/help', description: '显示帮助信息', category: '帮助', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/status', description: '显示会话状态', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/check', description: '检查 EvolAgent 实例健康', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/model', args: '[current|list|check]', description: '查询模型或检查模型网关', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/effort', description: '查看推理强度', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/baseagent', description: '查看 Agent 后端', category: 'Agent 与模型', roles: [identity.role] },
+                { command: '/perm', description: '查看当前权限模式', category: '权限管理', roles: [identity.role] },
+                { command: '/mentionmode', description: '查看群聊 @ 处理模式', category: '聊天设置', roles: [identity.role] },
+                { command: '/ask', args: '<选项>', description: '回答 Agent 的交互式问题', category: '运维', roles: ['visitor', 'member', 'admin', 'owner'] },
+                { command: '/pause', description: '在下一次工具调用前暂停当前任务', category: '运维', roles: ['admin', 'owner'] },
+                { command: '/resume', description: '继续已暂停的当前任务', category: '运维', roles: ['admin', 'owner'] },
+                { command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] },
+            ];
+            if (isAdmin) {
+                commands.push({ command: '/compact', description: '压缩会话上下文', category: '会话管理', roles: ['admin', 'owner'] }, ...(threadId ? [{ command: '/renew', description: '轮换当前话题 backend', category: '会话管理', roles: ['admin', 'owner'] }] : []));
+            }
+            return { kind: 'command.result', text: JSON.stringify({ commands, categories: [...new Set(commands.map(c => c.category))] }) };
+        }
         const cmds = [];
         const canReadModel = canAccessSlashOperation('model.current', 'relation')
             || canAccessSlashOperation('model.list', 'relation');
@@ -851,6 +913,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             cmds.push({ command: '/upgrade', description: '检查版本更新', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/reload', args: '[aid]', description: '热重载 Agent 配置', category: '运维', roles: ['daemon-owner'] });
             cmds.push({ command: '/pair', description: '获取远程控制配对码', category: '运维', roles: ['daemon-owner'] });
+            cmds.push({ command: '/diag', args: '<问题描述>|stop', description: '邀请远程诊断或撤销授权', category: '运维', roles: ['daemon-owner'] });
         }
         if (!isDaemonOwner && isAdmin) {
             cmds.push({ command: '/reload', description: '热重载当前 Agent 配置', category: '运维', roles: ['admin', 'owner'] });
@@ -1063,7 +1126,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         if (!args) {
             const activeBaseagent = owningAgent?.baseagent || this.parseDefaultBaseagent();
             // 尝试发送 CommandCard 卡片
-            if (this.interactionRouter && available.length > 1) {
+            if (!groupSlash && this.interactionRouter && available.length > 1) {
                 const baseagentSession = await getExistingSessionForCommand();
                 const interaction = {
                     type: 'interaction',
@@ -1090,7 +1153,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             }
             // 降级：文本
             const list = available.map((a) => `${a === activeBaseagent ? ' ✓' : '  '} ${a}`).join('\n');
-            const canSwitchAgent = isOwner;
+            const canSwitchAgent = isOwner && !groupSlash;
             if (canSwitchAgent) {
                 return { kind: 'command.result', text: `当前 Baseagent: ${activeBaseagent}\n\n可用:\n${list}\n用法: /baseagent <name>` };
             }
@@ -1348,7 +1411,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 isDaemonOwner,
             });
             // 尝试发送 CommandCard 卡片
-            if (!args && canReadModelList && this.interactionRouter && models.length > 0) {
+            if (!groupSlash && !args && canReadModelList && this.interactionRouter && models.length > 0) {
                 const interaction = {
                     type: 'interaction',
                     id: `model-${Date.now()}-${crypto.randomBytes(4).toString('hex')}`,
@@ -1379,7 +1442,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             const catalogHint = `[${catalog.source}/${catalog.freshness}] ${catalog.diagnostics.map(d => d.message).join('; ')}`;
             const modelList = models.map((m) => `  ${modelMatches(modelAgent, m, currentModel) ? '✓' : ' '} ${modelDisplayLabel(modelAgent, m)}`).join('\n');
             const effortHint = efforts.length > 0
-                ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}  (使用 /effort 调整)`
+                ? `\n推理强度: ${currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort}${groupSlash ? '' : '  (使用 /effort 调整)'}`
                 : '';
             if (args === 'current') {
                 return {
@@ -1389,7 +1452,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 };
             }
             if (canReadModelList) {
-                const usage = !args && isAdmin ? '\n\n用法: /model <模型>' : '';
+                const usage = !groupSlash && !args && isAdmin ? '\n\n用法: /model <模型>' : '';
                 return {
                     kind: 'command.result',
                     text: `当前模型: ${modelDisplayLabel(modelAgent, currentModel)}${effortHint}${rawModels.includes(currentModel) ? '' : ' [当前配置，未列入目录]'}\n${catalogHint}\n\n可用模型：\n${modelList}${usage}`,
@@ -1659,7 +1722,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
                 return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
             }
             // /effort（无参数）：显示当前推理强度 + 发送 CommandCard 卡片
-            if (this.interactionRouter) {
+            if (!groupSlash && this.interactionRouter) {
                 const allItems = [...efforts, 'auto'];
                 const interaction = {
                     type: 'interaction',
@@ -1687,7 +1750,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
             // 降级：文本
             const effortDisplay = currentEffort === 'auto' ? 'auto (SDK默认)' : currentEffort;
             const effortOptions = [...efforts, 'auto'].join(' / ');
-            if (isAdmin) {
+            if (isAdmin && !groupSlash) {
                 return { kind: 'command.result', text: `推理强度: ${effortDisplay}  可选: ${effortOptions}  用法: /effort <level>` };
             }
             return { kind: 'command.result', text: `推理强度: ${effortDisplay}` };
@@ -2109,6 +2172,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
         const currentMode = readSlashMentionMode(mentionTarget, mentionFallback);
         if (!arg) {
             const displayMode = currentMode ?? '未设置（跟随群设置）';
+            if (groupSlash)
+                return { kind: 'command.result', text: `@ 处理模式: ${displayMode}` };
             // 尝试发送 CommandCard 卡片
             if (isAdmin) {
                 const modes = [

package/dist/core/event-catalog.js

@@ -796,6 +796,11 @@ const CATALOG = [
         fields: [
             { path: 'aid', type: 'string' },
             { path: 'avatar', type: 'string' },
+            { path: 'sha256', type: 'string', optional: true },
+            { path: 'mime', type: 'string', optional: true },
+            { path: 'width', type: 'number', optional: true },
+            { path: 'height', type: 'number', optional: true },
+            { path: 'aspectRatio', type: 'number', optional: true },
             { path: 'timestamp', type: 'number', optional: true },
         ],
     },

package/dist/core/evolagent.js

@@ -275,9 +275,9 @@ export class EvolAgent {
         return `agent-files:${this.aid}`;
     }
     /**
-     * 读取 personal/persona.md 内容。走 fileCache（mtime 门控）：persona 没有任何
-     * 写入命令、由 agent 自己带外改写，与 working memory 同样改了即应生效，故每次读
-     * stat 比对、变了自动重读。文件不存在返回 null。
+     * 读取 personal/persona.md 内容。走 fileCache（mtime 门控）：persona 可由
+     * `ec agent persona` 或 agent 自己更新，与 working memory 一样改了即应生效，
+     * 故每次读 stat 比对、变了自动重读。文件不存在返回 null。
      */
     getPersona() {
         const personaPath = path.join(agentPersonalDir(this.aid), 'persona.md');

package/dist/core/handoff/runtime.js

@@ -11,6 +11,8 @@ const HANDOFF_STALE_WARN_MS = 72 * 60 * 60 * 1000;
 const HANDOFF_RETENTION_MS = 7 * 24 * 60 * 60 * 1000;
 const HANDOFF_LARGE_AGGREGATE_COUNT = 10;
 const HANDOFF_LARGE_AGGREGATE_CHARS = 50_000;
+/** Keep origin-side context bounded; the persisted handoff remains complete. */
+const HANDOFF_ORIGIN_REQUEST_MAX_CHARS = 800;
 export class HandoffTargetBlockedError extends Error {
     blockingHandoffId;
     attentionReason;
@@ -93,6 +95,8 @@ export class HandoffRuntime {
         }, undefined, input.to, targetChatType, origin.baseagent, input.selfAid, 'aun', targetChatType === 'group' ? 'group' : 'agent');
         throwIfAborted(input.signal);
         if (target.id === origin.id) {
+            if (input.handoffContext !== undefined)
+                throw new Error('handoff context requires a different target session');
             return { crossSession: false, targetSession: target };
         }
         if (!input.explicitReturnPolicy)
@@ -119,6 +123,7 @@ export class HandoffRuntime {
                 payload: input.payload,
                 encrypt: input.encrypt,
                 contextOnly: input.contextOnly,
+                handoffContext: input.handoffContext,
                 delivery: targetChatType === 'group'
                     ? { chatType: 'group', groupId: input.to }
                     : { chatType: 'private' },
@@ -193,28 +198,108 @@ export class HandoffRuntime {
     }
     async returnHandoff(input) {
         const returnCausation = deriveCausation(normalizeCausation(input.causation) ?? createRootCausation());
-        const response = this.store.returnHandoff({ ...input, returnCausation });
+        const response = await this.mutexes.forKey(this.returnKey(input.selfAid, input.handoffId ?? input.currentSessionId))
+            .runExclusive(async () => this.store.returnHandoff({ ...input, returnCausation }));
         if (response.ok && !response.idempotent) {
             recordCausationSpan(returnCausation, 'handoff.response', {
                 status: 'completed',
-                refs: { handoffId: response.handoff_id, sessionId: input.currentSessionId },
+                refs: {
+                    handoffId: response.handoff_id,
+                    sessionId: input.currentSessionId,
+                    ...(response.result_id ? { resultId: response.result_id } : {}),
+                },
+            });
+        }
+        if (response.ok && !response.idempotent && response.result_id) {
+            void this.enqueueOrigin(input.selfAid, response.handoff_id, response.result_id);
+        }
+        else if (response.ok && !response.idempotent && response.state === 'origin_queued') {
+            void this.enqueueOrigin(input.selfAid, response.handoff_id);
+        }
+        return response;
+    }
+    /** Recover a return from the original owner session after target-session replacement. */
+    async recoverReturnHandoff(input) {
+        const instance = this.store.get(input.selfAid, input.handoffId);
+        if (!instance || instance.origin_session_id !== input.recoverySessionId) {
+            return {
+                ok: false,
+                code: 'HANDOFF_NOT_FOUND',
+                error: 'handoff is not owned by the recovery session',
+                handoff_id: input.handoffId,
+            };
+        }
+        const recovery = {
+            actorId: input.actorId,
+            recoverySessionId: input.recoverySessionId,
+        };
+        const returnCausation = deriveCausation(normalizeCausation(input.causation) ?? createRootCausation());
+        const response = await this.mutexes.forKey(this.returnKey(input.selfAid, input.handoffId))
+            .runExclusive(async () => this.store.returnHandoff({
+            selfAid: input.selfAid,
+            currentSessionId: input.recoverySessionId,
+            handoffId: input.handoffId,
+            content: input.content,
+            returnCausation,
+            recovery,
+        }));
+        if (response.ok && !response.idempotent) {
+            recordCausationSpan(returnCausation, 'handoff.response', {
+                status: 'completed',
+                refs: {
+                    handoffId: response.handoff_id,
+                    sessionId: input.recoverySessionId,
+                    ...(response.result_id ? { resultId: response.result_id } : {}),
+                },
             });
         }
-        if (response.ok && !response.idempotent && response.state === 'origin_queued') {
+        if (response.ok && !response.idempotent && response.result_id) {
+            void this.enqueueOrigin(input.selfAid, response.handoff_id, response.result_id);
+        }
+        else if (response.ok && !response.idempotent && response.state === 'origin_queued') {
             void this.enqueueOrigin(input.selfAid, response.handoff_id);
         }
         return response;
     }
-    async enqueueOrigin(selfAid, handoffId) {
+    async enqueueOrigin(selfAid, handoffId, resultId) {
+        const operationSequence = ++this.lifecycleSequence;
+        await this.mutexes.forKey(this.returnKey(selfAid, handoffId)).runExclusive(async () => {
+            await this.enqueueOriginUnlocked(selfAid, handoffId, resultId, operationSequence);
+        });
+    }
+    async enqueueOriginUnlocked(selfAid, handoffId, resultId, operationSequence) {
         const instance = this.store.get(selfAid, handoffId);
-        if (!instance || instance.state !== 'origin_queued' || !instance.return_content)
+        const result = resultId
+            ? instance?.return_results?.find(item => item.result_id === resultId)
+            : instance?.return_results?.find(item => item.state === 'origin_queued');
+        const resultStream = Array.isArray(instance?.return_results);
+        if (resultStream) {
+            if (!instance || !result || result.state !== 'origin_queued' || !result.content)
+                return;
+        }
+        else if (!instance || instance.state !== 'origin_queued' || !instance.return_content)
+            return;
+        const deliveryContent = result?.content ?? instance?.return_content;
+        if (!instance || !deliveryContent)
             return;
         const origin = await this.sessionManager.getSessionById(instance.origin_session_id);
         if (!origin) {
-            this.store.recordOriginEnqueueFailed(selfAid, handoffId, 'origin session not found');
+            if (result)
+                this.store.recordOriginResultEnqueueFailed(selfAid, handoffId, result.result_id, 'origin session not found');
+            else
+                this.store.recordOriginEnqueueFailed(selfAid, handoffId, 'origin session not found');
+            return;
+        }
+        if ((this.sessionDiscardSequence.get(this.sessionKey(selfAid, instance.origin_session_id)) ?? 0) > operationSequence) {
             return;
         }
-        const messageId = `origin-deliver:${handoffId}:${origin.id}`;
+        const deliverable = this.store.get(selfAid, handoffId);
+        const deliveryResultId = result?.result_id ?? resultId;
+        if (!this.isOriginDeliveryPending(deliverable, deliveryResultId))
+            return;
+        const messageId = result
+            ? `origin-deliver:${handoffId}:${result.result_id}:${origin.id}`
+            : `origin-deliver:${handoffId}:${origin.id}`;
         const message = {
             channel: origin.channel,
             channelType: origin.channelType,
@@ -226,21 +311,24 @@ export class HandoffRuntime {
             peerId: origin.channelId,
             peerName: origin.metadata?.peerName || origin.channelId,
             peerType: origin.metadata?.peerType,
-            content: instance.return_content,
+            content: deliveryContent,
             messageId,
             timestamp: Date.now(),
             source: 'handoff',
             groupId: origin.chatType === 'group' ? (origin.metadata?.groupId || origin.channelId) : undefined,
             replyContext: replyContextFromSession(origin),
             boundSessionId: origin.id,
-            causation: instance.return_causation
-                ? deriveCausation(instance.return_causation)
-                : instance.causation
-                    ? deriveCausation(instance.causation)
-                    : undefined,
+            causation: result?.return_causation
+                ? deriveCausation(result.return_causation)
+                : instance.return_causation
+                    ? deriveCausation(instance.return_causation)
+                    : instance.causation
+                        ? deriveCausation(instance.causation)
+                        : undefined,
             handoffDelivery: {
                 direction: 'origin',
                 handoffId,
+                ...(result ? { resultId: result.result_id } : {}),
                 ...(instance.origin_authorization
                     ? { originAuthorization: { ...instance.origin_authorization } }
                     : {}),
@@ -255,19 +343,42 @@ export class HandoffRuntime {
                 sessionKeyField: origin.sessionKey,
                 selfAID: origin.selfAID,
                 onPersisted: () => {
-                    if (this.store.get(selfAid, handoffId)?.state !== 'origin_queued') {
-                        throw new Error(`handoff is no longer deliverable: ${handoffId}`);
+                    const current = this.store.get(selfAid, handoffId);
+                    if (result) {
+                        if (!this.isOriginDeliveryPending(current, result.result_id)) {
+                            throw new Error(`handoff result is no longer deliverable: ${handoffId}/${result.result_id}`);
+                        }
+                        this.store.recordOriginResultEnqueued(selfAid, handoffId, result.result_id, messageId);
+                    }
+                    else {
+                        if (current?.state !== 'origin_queued') {
+                            throw new Error(`handoff is no longer deliverable: ${handoffId}`);
+                        }
+                        this.store.recordOriginEnqueued(selfAid, handoffId, messageId);
                     }
-                    this.store.recordOriginEnqueued(selfAid, handoffId, messageId);
                 },
             });
         }
         catch (error) {
-            if (this.store.get(selfAid, handoffId)?.state === 'origin_queued') {
+            const current = this.store.get(selfAid, handoffId);
+            if (result) {
+                if (current?.return_results?.find(item => item.result_id === result.result_id)?.state === 'origin_queued') {
+                    this.store.recordOriginResultEnqueueFailed(selfAid, handoffId, result.result_id, error instanceof Error ? error.message : String(error));
+                }
+            }
+            else if (current?.state === 'origin_queued') {
                 this.store.recordOriginEnqueueFailed(selfAid, handoffId, error instanceof Error ? error.message : String(error));
             }
         }
     }
+    isOriginDeliveryPending(instance, resultId) {
+        if (!instance || instance.state === 'discarded' || instance.state === 'failed')
+            return false;
+        if (resultId) {
+            return instance.return_results?.find(item => item.result_id === resultId)?.state === 'origin_queued';
+        }
+        return instance.state === 'origin_queued' && !!instance.return_content;
+    }
     buildPromptItem(message, fallbackPeerRole) {
         return this.buildPromptItems(message, fallbackPeerRole)[0] ?? null;
     }
@@ -297,6 +408,17 @@ export class HandoffRuntime {
                 if (instance.state !== expectedState)
                     continue;
             }
+            else if (Array.isArray(instance.return_results)) {
+                const resultIds = delivery.resultIds?.length
+                    ? delivery.resultIds
+                    : (delivery.resultId ? [delivery.resultId] : []);
+                const results = resultIds
+                    .map(resultId => instance.return_results.find(result => result.result_id === resultId))
+                    .filter((result) => !!result && result.state === 'origin_delivered');
+                if (results.length === 0)
+                    continue;
+                instance.__deliveryResults = results;
+            }
             else if (instance.state !== 'origin_delivered') {
                 continue;
             }
@@ -307,6 +429,13 @@ export class HandoffRuntime {
         if (delivery.direction === 'origin') {
             this.warnIfLargeAggregate(message, instances, 'origin');
             const first = instances[0];
+            const deliveryResultRefs = instances.flatMap(instance => ((instance.__deliveryResults ?? [])
+                .map(result => ({ handoffId: instance.handoff_id, resultId: result.result_id, result }))));
+            const originRequestSummaries = new Map();
+            const originRequestShown = new Set();
+            for (const instance of instances) {
+                originRequestSummaries.set(instance.handoff_id, this.originRequestSummary(instance));
+            }
             return [{
                     kind: 'handoff',
                     peerId: message.peerId,
@@ -329,11 +458,26 @@ export class HandoffRuntime {
                         kind: 'response_to_origin',
                         handoffId: first.handoff_id,
                         handoffIds: instances.map(instance => instance.handoff_id),
-                        originEntries: instances.map(instance => ({
-                            previousContent: this.requestSummary(instance),
-                            responseContent: instance.return_content ?? '',
-                            previousMessageId: instance.target_message_id,
-                        })),
+                        ...(deliveryResultRefs.length > 0
+                            ? {
+                                resultIds: deliveryResultRefs.map(({ result }) => result.result_id),
+                                resultRefs: deliveryResultRefs.map(({ handoffId, result }) => ({ handoffId, resultId: result.result_id })),
+                            }
+                            : {}),
+                        originEntries: deliveryResultRefs.length > 0
+                            ? deliveryResultRefs.map(({ result, handoffId }) => ({
+                                previousContent: originRequestShown.has(handoffId)
+                                    ? '[同一 handoff 的后续结果，原请求见上方]'
+                                    : (originRequestShown.add(handoffId), originRequestSummaries.get(handoffId) ?? this.originRequestSummary(first)),
+                                responseContent: result.content,
+                                previousMessageId: (instances.find(instance => instance.handoff_id === handoffId) ?? first).target_message_id,
+                                resultId: result.result_id,
+                            }))
+                            : instances.map(instance => ({
+                                previousContent: originRequestSummaries.get(instance.handoff_id) ?? this.originRequestSummary(instance),
+                                responseContent: instance.return_content ?? '',
+                                previousMessageId: instance.target_message_id,
+                            })),
                         previousContent: this.requestSummary(first),
                         previousMessageId: first.target_message_id,
                         returnPolicy: first.return_policy,
@@ -385,9 +529,14 @@ export class HandoffRuntime {
                 },
             }];
     }
-    completeOriginContext(selfAid, handoffId) {
+    completeOriginContext(selfAid, handoffId, resultId) {
         const instance = this.store.get(selfAid, handoffId);
-        if (instance?.state === 'origin_delivered')
+        if (resultId) {
+            if (instance?.return_results?.some(result => result.result_id === resultId && result.state === 'origin_delivered')) {
+                this.store.completeOriginResult(selfAid, handoffId, resultId);
+            }
+        }
+        else if (instance?.state === 'origin_delivered')
             this.store.completeOriginContext(selfAid, handoffId);
     }
     completeTargetContext(selfAid, handoffId) {
@@ -535,6 +684,11 @@ export class HandoffRuntime {
                 else if (instance.state === 'origin_queued') {
                     originEnqueues.push(this.enqueueOrigin(selfAid, instance.handoff_id));
                 }
+                else if (Array.isArray(instance.return_results)) {
+                    for (const result of instance.return_results.filter(item => item.state === 'origin_queued')) {
+                        originEnqueues.push(this.enqueueOrigin(selfAid, instance.handoff_id, result.result_id));
+                    }
+                }
             }
         }
         await Promise.all(originEnqueues);
@@ -559,10 +713,20 @@ export class HandoffRuntime {
         return true;
     }
     async cancelOriginDelivery(instance) {
+        const resultDeliveries = instance.return_results?.filter(result => (result.state === 'origin_queued' || result.state === 'origin_delivered')) ?? [];
+        if (resultDeliveries.length > 0) {
+            for (const result of resultDeliveries) {
+                await this.cancelOriginMessage(instance, result.origin_delivery_message_id
+                    ?? `origin-deliver:${instance.handoff_id}:${result.result_id}:${instance.origin_session_id}`);
+            }
+            return;
+        }
         if (instance.state !== 'origin_queued' && instance.state !== 'origin_delivered')
             return;
-        const messageId = instance.origin_delivery_message_id
-            ?? `origin-deliver:${instance.handoff_id}:${instance.origin_session_id}`;
+        await this.cancelOriginMessage(instance, instance.origin_delivery_message_id
+            ?? `origin-deliver:${instance.handoff_id}:${instance.origin_session_id}`);
+    }
+    async cancelOriginMessage(instance, messageId) {
         const queue = this.messageQueue;
         try {
             const queued = queue.cancelMessageByIdInSession?.(instance.origin_session_id, messageId) ?? false;
@@ -592,6 +756,9 @@ export class HandoffRuntime {
     sessionKey(selfAid, sessionId) {
         return `${selfAid}\u0000${sessionId}`;
     }
+    returnKey(selfAid, handoffOrSessionId) {
+        return `${selfAid}\u0000handoff-return\u0000${handoffOrSessionId}`;
+    }
     warnIfLargeAggregate(message, instances, direction) {
         const chars = message.content.length
             + instances.reduce((total, instance) => total + this.requestSummary(instance).length, 0);
@@ -606,7 +773,18 @@ export class HandoffRuntime {
             + ` count=${instances.length} chars=${chars} responseMessage=${message.messageId ?? '<none>'}`);
     }
     requestSummary(instance) {
-        return classifyAunPayloadForLog(instance.request.payload).content || '[payload]';
+        const sent = classifyAunPayloadForLog(instance.request.payload).content || '[payload]';
+        return instance.request.context ? `${sent}\n\n[本地交接上下文]\n${instance.request.context}` : sent;
+    }
+    originRequestSummary(instance) {
+        const content = this.requestSummary(instance);
+        if (content.length <= HANDOFF_ORIGIN_REQUEST_MAX_CHARS)
+            return content;
+        const marker = `\n\n[原请求过长，回流提示仅保留首尾；完整内容共 ${content.length} 字，已省略 ${content.length - HANDOFF_ORIGIN_REQUEST_MAX_CHARS} 字]\n\n`;
+        const available = HANDOFF_ORIGIN_REQUEST_MAX_CHARS - marker.length;
+        const head = Math.ceil(available * 0.6);
+        const tail = available - head;
+        return `${content.slice(0, head)}${marker}${content.slice(-tail)}`;
     }
 }
 function throwIfAborted(signal) {