evolcore 0.0.25 → 0.0.26

package/dist/core/message/im-renderer.js

@@ -1,6 +1,7 @@
 import { logger } from '../../utils/logger.js';
 import { summarizeToolInput, toolInputForDisplay } from '../../utils/tool-summary.js';
 import { getErrorMessage, isContextTooLongText } from '../../utils/error-utils.js';
+import { tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { DEFAULT_FLUSH_DELAY_MS } from '../../types.js';
 export class IMRenderer {
     opts;
@@ -79,9 +80,9 @@ export class IMRenderer {
     }
     /** 是否有会抑制兜底错误消息的正文/过程内容；lifecycle 边界不算。 */
     hasNonLifecycleContent() {
-        return this.textBuffer.length > 0 || this.itemsQueue.some(it => {
+        return this.textBuffer.trim().length > 0 || this.itemsQueue.some(it => {
             if (it.kind === 'text')
-                return it.text.length > 0;
+                return it.text.trim().length > 0;
             return it.kind !== 'started' && it.kind !== 'completed';
         });
     }
@@ -95,6 +96,21 @@ export class IMRenderer {
             return;
         if (this.textBuffer.length === 0)
             return;
+        // 文件标记过滤后若只剩空白，应立即消费并告警；尤其避免 final-only
+        // 模式把工具调用前的空白继续带到最终回复。
+        const rawText = this.opts.fileMarkerPattern
+            ? this.textBuffer.replace(this.opts.fileMarkerPattern, '')
+            : this.textBuffer;
+        if (!rawText.trim()) {
+            if (this.timer) {
+                clearTimeout(this.timer);
+                this.timer = undefined;
+            }
+            this.textBuffer = '';
+            this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
+            this.hasSendableText(rawText, 'flushText');
+            return;
+        }
         if (this.suppressIntermediateText()) {
             this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
             return;
@@ -103,14 +119,8 @@ export class IMRenderer {
             clearTimeout(this.timer);
             this.timer = undefined;
         }
-        // 文件标记过滤：tool_use 前的文本块也不能把 marker 暴露给用户
-        const rawText = this.opts.fileMarkerPattern
-            ? this.textBuffer.replace(this.opts.fileMarkerPattern, '')
-            : this.textBuffer;
         this.textBuffer = '';
-        if (!rawText)
-            return;
-        // 清掉 itemsQueue 中的 text items（已发出）
+        // 清掉已消费的 text items，包括被拦截的纯空白正文。
         this.itemsQueue = this.itemsQueue.filter(it => it.kind !== 'text');
         const payload = { kind: 'result.text', text: rawText, isFinal: false };
         this.sentContent = true;
@@ -164,6 +174,7 @@ export class IMRenderer {
         this.emitProgress('text', outputTokens, turn);
         if (!text)
             return;
+        // 保留流式片段之间的空格/换行；仅在发送完整正文时判定是否纯空白。
         // 同一窗口内连续 text delta 合并到最后一个 text item
         const last = this.itemsQueue[this.itemsQueue.length - 1];
         if (last && last.kind === 'text') {
@@ -302,6 +313,8 @@ export class IMRenderer {
     async sendOperationalNoticeAsText(text) {
         if (!this.opts.operationalNoticesAsText || this.opts.envelope.chatmode === 'proactive' || !text)
             return false;
+        if (!this.hasSendableText(text, 'operational-notice'))
+            return false;
         // 保持与流式正文的到达顺序：先发出已缓冲的正文，再投影运行状态。
         await this.flushText();
         const payload = { kind: 'result.text', text, isFinal: false };
@@ -315,6 +328,17 @@ export class IMRenderer {
     synthCallId() {
         return `synth-${this.opts.envelope.taskId}-${++this.syntheticCallSeq}`;
     }
+    /** Reject blank bodies before sending, without trimming meaningful formatting. */
+    hasSendableText(text, source) {
+        if (text.trim())
+            return true;
+        // An unused buffer is normal. A nonempty whitespace body is diagnostic evidence.
+        if (text.length > 0) {
+            const { envelope, agentAid } = this.opts;
+            logger.warn(`[IMRenderer] Attempted to send empty message, skipping: code=EMPTY_MESSAGE source=${source} task=${envelope.taskId} session=${envelope.sessionId ?? '<none>'} agent=${agentAid ?? envelope.agentName} textLength=${text.length} text=${JSON.stringify(text.slice(0, 80))}`);
+        }
+        return false;
+    }
     /** Convert a structured failed receipt into the same error shape as a rejected sender. */
     receiptError(receipt) {
         return Object.assign(new Error(receipt.error), {
@@ -331,6 +355,18 @@ export class IMRenderer {
             : undefined;
         return value.code === 'OUTBOX_FULL' || cause?.code === 'OUTBOX_FULL';
     }
+    isPermanentActivityError(error) {
+        const value = error && typeof error === 'object' ? error : {};
+        const cause = value.cause && typeof value.cause === 'object'
+            ? value.cause
+            : undefined;
+        const code = String(value.code ?? cause?.code ?? '');
+        return value.permanent === true
+            || value.status === 'failed'
+            || code === 'AUN_SEND_FAILED'
+            || code === '-1'
+            || /payload is too large/i.test(String(value.message ?? value.error ?? ''));
+    }
     /**
      * Serialize durable sends while keeping the chain usable after a rejected
      * operation. Activity queue saturation is best-effort: it is logged, but
@@ -344,9 +380,19 @@ export class IMRenderer {
             }
         });
         const handled = operation.catch(error => {
-            if (payload.kind === 'activity.batch' && this.isOutboxFull(error)) {
-                logger.warn(`[IMRenderer] activity outbox full; continuing without activity batch: ${error instanceof Error ? error.message : String(error)}`);
-                return;
+            if (payload.kind === 'activity.batch') {
+                const detail = error instanceof Error ? error.message : String(error);
+                if (this.isOutboxFull(error)) {
+                    logger.warn(`[IMRenderer] activity outbox full; continuing without activity batch: ${detail}`);
+                    return;
+                }
+                if (this.isPermanentActivityError(error)) {
+                    // Activity is best-effort. A permanent structured-send failure (for
+                    // example an AUN payload-size rejection) must not requeue the same
+                    // item indefinitely or prevent the final result.text from flushing.
+                    logger.warn(`[IMRenderer] activity delivery failed; dropping activity batch and continuing: ${detail}`);
+                    return;
+                }
             }
             throw error;
         });
@@ -432,22 +478,25 @@ export class IMRenderer {
         // 文件标记过滤：marker 任何时候都不该出现在用户文本里，必须在 *每次* flush
         // （含非最终的定时 flush）执行。否则文本块若滞留 buffer 后被定时器触发，会走
         // 下方非-final 的 result.text 路径，把 [SEND_FILE:...] 原样发给用户。
-        // 非最终 flush 不做 trim，避免 trim 掉 Markdown 块级换行。
+        // 先保留空白，以便空正文告警仍能记录原长度。
         if (this.opts.fileMarkerPattern) {
-            const strip = (s) => {
-                const replaced = s.replace(this.opts.fileMarkerPattern, '');
-                return isFinal ? replaced.trim() : replaced;
-            };
-            this.textBuffer = strip(this.textBuffer);
+            this.textBuffer = this.textBuffer.replace(this.opts.fileMarkerPattern, '');
             for (const item of this.itemsQueue) {
                 if (item.kind === 'text')
                     item.text = item.text.replace(this.opts.fileMarkerPattern, '');
             }
         }
+        if (!this.hasSendableText(this.textBuffer, isFinal ? 'final' : 'flush')) {
+            this.textBuffer = '';
+        }
+        else if (isFinal && this.opts.fileMarkerPattern) {
+            // 保持既有最终文件标记过滤语义；中间文本的格式原样保留。
+            this.textBuffer = this.textBuffer.trim();
+        }
         // 清掉空 text items
         const items = this.itemsQueue.filter(it => {
             if (it.kind === 'text')
-                return it.text.length > 0;
+                return it.text.trim().length > 0;
             return true;
         });
         this.itemsQueue = [];
@@ -544,6 +593,8 @@ export class IMRenderer {
         if (!item)
             return;
         if (item.kind === 'text') {
+            if (!this.hasSendableText(item.text, 'proactive'))
+                return;
             this.hasEmittedText = true;
             this.allText += item.text;
         }
@@ -633,7 +684,7 @@ export class IMRenderer {
                 if (isContextTooLongText(event.error || ''))
                     return null;
                 const text = getErrorMessage(new Error(event.error || '任务执行失败'), undefined, false);
-                return { kind: 'notice', text, severity: 'warn' };
+                return { kind: 'notice', text: tagErrorTextWithEvolcoreVersion(text), severity: 'warn' };
             }
             case 'complete': {
                 if (event.queryFinal === false)
@@ -650,7 +701,7 @@ export class IMRenderer {
                     const text = getErrorMessage(new Error(errText), event.terminalReason, false);
                     const item = {
                         kind: 'summary',
-                        text,
+                        text: tagErrorTextWithEvolcoreVersion(text),
                         is_error: true,
                     };
                     if (event.subtype !== undefined)

package/dist/core/message/message-bridge.js

@@ -25,7 +25,7 @@ import { createRootCausation, deriveCausation, normalizeCausation } from '../cau
 import { recordCausationSpan } from '../causation/audit.js';
 import { renderActionAsText } from '../interaction-router.js';
 import { planApprovalRoute } from '../permission/approval-gateway.js';
-import { parseFullAccessCommand } from '../command/slash-gate.js';
+import { guardGroupSlashCommand, parseFullAccessCommand } from '../command/slash-gate.js';
 import { isFullAccessEnabled } from '../../config-store.js';
 import { auditFullAccessEvent } from '../auth/authorization-audit.js';
 import { consumeAdmissionReplyBudget, clearAdmissionReplyBudgets, evaluateInboundAdmissionPreflight, evaluateOrdinaryInboundAdmission, } from './message-admission.js';
@@ -500,9 +500,31 @@ export class MessageBridge {
     async sendAdmissionControlReply(context, msg, sendReply, text) {
         if (!text || !consumeAdmissionReplyBudget(context))
             return false;
-        await sendReply(msg.channelId, text, msg.replyContext);
+        if (context.chatType === 'group' && /^\s*\/(?:bind|request)(?:\s|$)/i.test(msg.content)) {
+            await this.sendSlashControlReply(context.channelKey, msg, sendReply, { kind: 'command.error', text });
+        }
+        else {
+            await sendReply(msg.channelId, text, msg.replyContext);
+        }
         return true;
     }
+    /** Controls handled before the normal slash handler still need structured group feedback. */
+    async sendSlashControlReply(channel, msg, sendReply, payload, adapter = this.processor.getChannelInfo?.(channel)?.adapter) {
+        if (msg.chatType === 'group' && adapter?.send) {
+            await adapter.send(buildEnvelope({
+                taskId: `cmd-${randomBytes(5).toString('hex')}`,
+                channel,
+                channelId: msg.channelId,
+                chatmode: 'interactive',
+                replyContext: {
+                    ...msg.replyContext,
+                    ...(msg.threadId ? { threadId: msg.threadId } : {}),
+                },
+            }), payload);
+            return;
+        }
+        await sendReply(msg.channelId, payload.text, msg.replyContext);
+    }
     admissionDeniedNotice(context, channelType) {
         if (context.contactStatus === 'pending') {
             return '联系人申请审核中；可再次发送 /request 更新说明。';
@@ -801,6 +823,16 @@ export class MessageBridge {
                     : { isMenu: false };
                 let menuResponseWarning;
                 if (menuControl.isMenu) {
+                    // Menu is an AUN private control plane. Group messages must never
+                    // execute Menu commands or participate in token issuance/rotation.
+                    if (msg.chatType === 'group') {
+                        this.logMenuDiagnostic('unsupported-chat-type', channelName, msg, menuControl, 'MENU_PRIVATE_ONLY');
+                        logMenuRequestCompleted(menuControl.request, undefined, this.menuFlowContext(channelName, msg), {
+                            delivery: 'dropped',
+                            reason: 'unsupported-chat-type',
+                        });
+                        return;
+                    }
                     // AUN captures this mark at its adapter boundary. Legacy/test
                     // adapters fall back to the bridge entry mark captured above.
                     Object.assign(msg, menuTiming);
@@ -837,7 +869,10 @@ export class MessageBridge {
                         const tokenSupplied = Object.prototype.hasOwnProperty.call(menuControl.request, 'menu_token');
                         const tokenValid = (menuTokenRequired || tokenSupplied)
                             && !!tokenOwnerAid
-                            && this.menuTokenStore.use(tokenOwnerAid, msg.peerId, menuControl.request.menu_token);
+                            && this.menuTokenStore.use(tokenOwnerAid, msg.peerId, menuControl.request.menu_token, {
+                                deviceId: msg.peerDeviceId,
+                                slotId: msg.peerSlotId,
+                            });
                         if (menuTokenRequired && !tokenValid) {
                             this.logMenuDiagnostic('token-required', channelName, msg, menuControl, 'MENU_TOKEN_REQUIRED');
                             await this.sendMenuResponse(adapter, channelName, msg, menuFailure(header, {
@@ -915,6 +950,11 @@ export class MessageBridge {
                 // internal per-call authorization carried into ResponseEngine.
                 const fullAccessCommand = parseFullAccessCommand(content);
                 if (fullAccessCommand.matched) {
+                    const groupGuard = guardGroupSlashCommand(content, chatType);
+                    if (groupGuard?.kind === 'command.error') {
+                        await this.sendSlashControlReply(channelName, msg, sendReply, groupGuard, adapter);
+                        return;
+                    }
                     const reject = async (text) => {
                         logger.warn(`[MessageBridge] fullaccess command rejected: channel=${channelName} `
                             + `actor=${authSubject.principalId ?? authSubject.actorId ?? '<none>'} reason=${text}`);
@@ -1002,6 +1042,13 @@ export class MessageBridge {
                 // 2. 命令快速路径（去除引用前缀后检查，兼容话题中引用上文的情况）
                 const contentForCmd = content.replace(/^(>[^\n]*\n)+\n?/, '').trim();
                 const cmdContent = contentForCmd || content;
+                if (msg.source !== 'handoff' && !executionPermissionOverride) {
+                    const groupGuard = guardGroupSlashCommand(cmdContent, chatType);
+                    if (groupGuard?.kind === 'command.error') {
+                        await this.sendSlashControlReply(channelName, msg, sendReply, groupGuard, adapter);
+                        return;
+                    }
+                }
                 const isCmd = msg.source !== 'handoff'
                     // Once /fa has been accepted, its remainder is always model input.
                     // A prompt such as `/fa /status` must not be re-routed as the
@@ -1411,7 +1458,10 @@ export class MessageBridge {
             }
         }
         const scope = msg.chatType === 'group' ? (msg.groupId || msg.channelId) : msg.peerId;
-        const dedupKey = [msg.selfAID || channel, channelType, msg.chatType || 'private', scope, msg.peerId, msg.threadId || '', parsed.id].join('\u001f');
+        // Separate installations can generate identical request IDs. Token
+        // issuance and replay must remain scoped to the authenticated requester.
+        const dedupKey = [msg.selfAID || channel, channelType, msg.chatType || 'private', scope, msg.peerId,
+            msg.peerDeviceId || '', msg.peerSlotId || '', msg.threadId || '', parsed.id].join('\u001f');
         let afterResponse;
         const deduped = await this.menuDeduper.execute(dedupKey, menuPayloadFingerprint(parsed.raw), () => isTokenRequest
             ? this.issueMenuTokenResponse(header, channel, msg)
@@ -1452,7 +1502,9 @@ export class MessageBridge {
                 case 'menu.list':
                     if (args?.view === 'catalog') {
                         validateMenuCatalogArgs(args);
-                        const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent');
+                        const data = await this.cmdHandler.getMenuCatalog(channel, msg.channelId, authSubject, args.context, msg.isControlChannel ? 'control' : 'agent', !msg.isControlChannel || (msg.encrypted === true
+                            && msg.protectedHeaders?.auth_method !== 'remote-access-token'
+                            && msg.protectedHeaders?.auth_method !== 'ecweb-token'));
                         return menuSuccess(header, data);
                     }
                     if (args?.view !== undefined) {
@@ -1615,6 +1667,9 @@ export class MessageBridge {
             clientName: this.menuTokenHeaderValue(headers.client_name ?? headers.app_name),
             clientVersion: this.menuTokenHeaderValue(headers.client_version ?? headers.app_version),
             evolVersion: this.menuTokenHeaderValue(headers.evol_version),
+        }, {
+            deviceId: msg.peerDeviceId,
+            slotId: msg.peerSlotId,
         });
         if (!issued) {
             return menuFailure(header, { code: 'MENU_TOKEN_REJECTED', message: '授权申请未通过' });
@@ -1732,20 +1787,25 @@ export class MessageBridge {
         logger.info(`[${channel}] ${channelId}: ${content}${source === 'card-trigger' ? ' [card]' : ''}`);
         const adapter = this.processor.getChannelInfo?.(channel)?.adapter;
         const cmdResult = await this.cmdHandler.handle(content, channel, channelId, async (_cid, text, opts, updatePayload) => {
-            if (updatePayload && adapter?.send) {
+            const payload = updatePayload ?? (chatType === 'group' ? { kind: 'command.result', text } : undefined);
+            if (payload && adapter?.send) {
                 const envelope = buildEnvelope({
                     taskId: `cmd-update-${randomBytes(5).toString('hex')}`,
                     channel,
                     channelId,
                     agentName: this.agentRegistry?.resolveByChannel(channel)?.name ?? '<unknown>',
                     chatmode: 'interactive',
-                    replyContext: opts ?? replyContext,
+                    replyContext: {
+                        ...(opts ?? {}),
+                        ...(replyContext ?? {}),
+                        metadata: { ...opts?.metadata, ...replyContext?.metadata },
+                    },
                 });
-                await adapter.send(envelope, updatePayload);
+                await adapter.send(envelope, payload);
                 return;
             }
             await sendReply(text, opts, updatePayload);
-        }, userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject, replyContext);
+        }, userId, threadId, chatType, source, messageId, selfAID, authSubject?.identity, authSubject, replyContext, true);
         logger.debug(`[MessageBridge] handleCommand: result type=${typeof cmdResult}`);
         if (cmdResult === undefined)
             return false;

package/dist/core/message/message-queue.js

@@ -1275,6 +1275,8 @@ export class MessageQueue {
             return false;
         if (first.projectPath !== next.projectPath || first.agentName !== next.agentName)
             return false;
+        // Results from the same parent handoff are still mergeable. Their
+        // resultRefs are retained and consumed individually after one turn.
         const a = first.message.handoffDelivery?.originAuthorization;
         const b = next.message.handoffDelivery?.originAuthorization;
         if (!a || !b)
@@ -1323,6 +1325,10 @@ export class MessageQueue {
         let hasMessagesAfterRestartResume = false;
         const originHandoffIds = [];
         const seenOriginHandoffIds = new Set();
+        const originResultIds = [];
+        const seenOriginResultIds = new Set();
+        const originResultRefs = [];
+        const seenOriginResultRefs = new Set();
         const allOriginHandoffs = items.every(item => this.isOriginHandoff(item.message));
         for (const item of items) {
             const m = item.message;
@@ -1347,6 +1353,24 @@ export class MessageQueue {
                         originHandoffIds.push(id);
                     }
                 }
+                const refs = m.handoffDelivery.resultRefs?.length
+                    ? m.handoffDelivery.resultRefs
+                    : (m.handoffDelivery.resultIds?.length
+                        ? m.handoffDelivery.resultIds.map(resultId => ({ handoffId: m.handoffDelivery.handoffId, resultId }))
+                        : (m.handoffDelivery.resultId
+                            ? [{ handoffId: m.handoffDelivery.handoffId, resultId: m.handoffDelivery.resultId }]
+                            : []));
+                for (const ref of refs) {
+                    const refKey = `${ref.handoffId}\u0000${ref.resultId}`;
+                    if (!seenOriginResultRefs.has(refKey)) {
+                        seenOriginResultRefs.add(refKey);
+                        originResultRefs.push(ref);
+                    }
+                    if (!seenOriginResultIds.has(ref.resultId)) {
+                        seenOriginResultIds.add(ref.resultId);
+                        originResultIds.push(ref.resultId);
+                    }
+                }
             }
             for (const id of [...(m.sourceMessageIds ?? []), ...(m.messageId ? [m.messageId] : [])]) {
                 if (!seenSourceMessageIds.has(id)) {
@@ -1418,6 +1442,8 @@ export class MessageQueue {
                     ...last.message.handoffDelivery,
                     handoffId: originHandoffIds[0],
                     handoffIds: originHandoffIds,
+                    ...(originResultIds.length > 0 ? { resultIds: originResultIds } : {}),
+                    ...(originResultRefs.length > 0 ? { resultRefs: originResultRefs } : {}),
                 }
                 : last.message.handoffDelivery,
         };

package/dist/core/message/message-utils.js

@@ -101,6 +101,7 @@ export function deliveryTargetFromSession(session) {
 export function replyContextFromSession(session, context) {
     return {
         ...(session.metadata?.replyContext ?? {}),
+        ...(session.threadId ? { threadId: session.threadId } : {}),
         ...(context ?? {}),
         // Session chatType/groupId is the persisted routing authority. The nested
         // reply context can outlive a route correction, so only an explicit

package/dist/core/message/response-engine.js

@@ -2,7 +2,7 @@ import path from 'path';
 import fs from 'fs';
 import os from 'os';
 import crypto from 'crypto';
-import { BaseagentRunnerUnavailableError, hasCompact, autoCompactWindowForContextWindow, autoCompactWindowForModel, isClaudeContextUsageModel, numericToken } from '../../agents/runner-types.js';
+import { BaseagentRunnerUnavailableError, hasCompact, autoCompactWindowForModel, isClaudeContextUsageModel, numericToken } from '../../agents/runner-types.js';
 import { buildTaskRuntimeEnv, ensureRuntimeLockDir, ensureSessionRuntimeDir } from '../../cli/task-context.js';
 import { IMRenderer } from './im-renderer.js';
 import { createSendFileMarkerPattern } from './file-markers.js';
@@ -11,7 +11,8 @@ import { StreamIdleMonitor } from './stream-idle-monitor.js';
 import { logger } from '../../utils/logger.js';
 import { isHostChinese } from '../../utils/locale.js';
 import { getErrorMessage, classifyError, ErrorType, ERROR_PREFIX, isInfraError, isAbortTerminalReason, prefixErrorType, isRetryableError, isContextTooLongText } from '../../utils/error-utils.js';
-import { isExactEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
+import { readEvolcoreRuntimeFlavor, tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
+import { describeProactiveSendCommandFailure, isExactEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
 import { summarizeToolInput } from '../../utils/tool-summary.js';
 import { agentDir as resolveAgentDir, agentMdPath, getPackageRoot, resolveRoot, resolvePaths } from '../../paths.js';
 import { renderKitSections } from '../../eck/kit-renderer.js';
@@ -485,9 +486,6 @@ export async function resolveGroupRulesForTurn(opts, sync = syncGroupRulesContex
     }
     return sync({ selfAid: opts.selfAid, groupId: opts.groupId, channel: opts.channel });
 }
-function autoCompactTokensFromMaxTokens(maxTokens) {
-    return autoCompactWindowForContextWindow(maxTokens);
-}
 /**
  * 构造 OutboundEnvelope —— 出站三件套的信封部分。
  *
@@ -915,6 +913,20 @@ export class ResponseEngine {
             causation: runtime?.causation,
         });
     }
+    async recoverAuthorizedHandoffResult(params, selfAid) {
+        if (!this.handoffRuntime) {
+            return { ok: false, code: 'HANDOFF_NOT_FOUND', error: 'handoff runtime not configured' };
+        }
+        const runtime = this.activeTaskRuntimeContexts.get(params.sessionId);
+        return this.handoffRuntime.recoverReturnHandoff({
+            selfAid,
+            recoverySessionId: params.sessionId,
+            handoffId: params.handoffId,
+            content: params.content,
+            actorId: params.actorId,
+            causation: runtime?.causation,
+        });
+    }
     agentRegistry;
     setAgentRegistry(registry) {
         this.agentRegistry = registry;
@@ -2132,6 +2144,7 @@ export class ResponseEngine {
             modeConfig: resolvedMode.context.modeConfig,
             state: modeState,
             isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, chatType, selfAid),
+            describeSendCommandFailure: describeProactiveSendCommandFailure,
             logger,
         } : null;
         if (resolvedMode?.mode.beforeProcess && modeProcessCtx) {
@@ -2764,6 +2777,7 @@ export class ResponseEngine {
             let previousFallbackState;
             let agentModel;
             let v2HandoffIds = [];
+            let v2HandoffResultRefs = [];
             let v2HandoffDirection;
             let handoffPromptRendered = false;
             let runtimeEnv;
@@ -3098,7 +3112,7 @@ export class ResponseEngine {
                         KITS_FRAGMENTS: path.join(pkgRoot, 'kits', 'templates', 'system-fragments'),
                         KITS_MESSAGE_FRAGMENTS: path.join(pkgRoot, 'kits', 'templates', 'message-fragments'),
                         // evolcore 运行模式：dev=源码仓库 | install=全局安装包
-                        evolcoreMode: fs.existsSync(path.join(pkgRoot, 'src', 'index.ts')) ? 'dev' : 'install',
+                        evolcoreMode: readEvolcoreRuntimeFlavor(),
                         // 路径变量(用于 manifest 路径展开,resolvePath 用 ctx.vars 取真值)
                         PERSONAL_DIR: selfAid ? path.join(resolveRoot(), 'agents', selfAid, 'personal') : undefined,
                         RELATIONS_DIR: selfAid ? path.join(resolveRoot(), 'agents', selfAid, 'relations') : undefined,
@@ -3241,6 +3255,7 @@ export class ResponseEngine {
                                 v2HandoffIds = Array.from(new Set(items.flatMap(item => (item.handoff?.handoffIds?.length
                                     ? item.handoff.handoffIds
                                     : (item.handoff?.handoffId ? [item.handoff.handoffId] : [])))));
+                                v2HandoffResultRefs = items.flatMap(item => item.handoff?.resultRefs ?? []);
                                 v2HandoffDirection = message.handoffDelivery.direction;
                                 return items;
                             }
@@ -3314,11 +3329,18 @@ export class ResponseEngine {
                     return;
                 }
                 if (v2HandoffIds.length > 0 && handoffPromptRendered && this.handoffRuntime && selfAid) {
-                    for (const handoffId of v2HandoffIds) {
-                        if (v2HandoffDirection === 'origin')
-                            this.handoffRuntime.completeOriginContext(selfAid, handoffId);
-                        else if (v2HandoffDirection === 'target')
-                            this.handoffRuntime.completeTargetContext(selfAid, handoffId);
+                    if (v2HandoffDirection === 'origin' && v2HandoffResultRefs.length > 0) {
+                        for (const ref of v2HandoffResultRefs) {
+                            this.handoffRuntime.completeOriginContext(selfAid, ref.handoffId, ref.resultId);
+                        }
+                    }
+                    else {
+                        for (const handoffId of v2HandoffIds) {
+                            if (v2HandoffDirection === 'origin')
+                                this.handoffRuntime.completeOriginContext(selfAid, handoffId);
+                            else if (v2HandoffDirection === 'target')
+                                this.handoffRuntime.completeTargetContext(selfAid, handoffId);
+                        }
                     }
                 }
                 // The runner may already own a stronger per-session directory (Codex
@@ -4452,7 +4474,9 @@ export class ResponseEngine {
                         kind: 'activity.batch',
                         items: [{
                                 kind: 'notice',
-                                text: userMessage,
+                                // activity.batch 载荷混合正常内容与错误，顶层出站包裹不整体打标；
+                                // 这里的 notice 是 proactive 下用户能看到的错误副本，单独打标。
+                                text: tagErrorTextWithEvolcoreVersion(userMessage),
                                 severity: 'warn',
                                 subtype: 'task-error',
                             }],
@@ -4567,12 +4591,12 @@ export class ResponseEngine {
                 return undefined;
             const shouldClose = !writerDb;
             try {
-                const row = db.prepare(`SELECT model, input_tokens, cache_creation_tokens, cache_read_tokens,
-                  context_tokens, max_tokens, auto_compact_tokens
-             FROM model_calls
-            WHERE session_id = ?
-              AND agent_session_id = ?
-            ORDER BY ts DESC, call_index DESC
+                const row = db.prepare(`SELECT model, input_tokens, cache_creation_tokens, cache_read_tokens,
+                  context_tokens
+             FROM model_calls
+            WHERE session_id = ?
+              AND agent_session_id = ?
+            ORDER BY ts DESC, call_index DESC
             LIMIT 1`).get(sessionId, agentSessionId);
                 if (!row)
                     return undefined;
@@ -4590,16 +4614,11 @@ export class ResponseEngine {
                 }
                 if (totalTokens <= 0)
                     return undefined;
-                const recordedAutoCompactTokens = row.auto_compact_tokens ?? undefined;
-                const inferredAutoCompactTokens = autoCompactTokensFromMaxTokens(row.max_tokens ?? undefined);
-                const candidateAutoCompactTokens = recordedAutoCompactTokens && recordedAutoCompactTokens > 0
-                    ? recordedAutoCompactTokens
-                    : inferredAutoCompactTokens ?? autoCompactWindowForModel(model);
-                // Historic rows may contain the old fixed 350k threshold. Never let a
-                // persisted value exceed the context window that accompanied it.
-                const autoCompactTokens = inferredAutoCompactTokens
-                    ? Math.min(candidateAutoCompactTokens, inferredAutoCompactTokens)
-                    : candidateAutoCompactTokens;
+                // EvolCore 的自动压缩阈值固定为 650k，与模型上下文窗口无关：
+                // 大窗口模型（1M）到 650k 由 EvolCore 压缩；小窗口模型（200k/128k）
+                // 到不了该阈值，交给 base agent 自身的压缩机制处理。
+                // 历史行里可能存着旧的 350k 阈值，这里一律忽略，只认当前常量。
+                const autoCompactTokens = autoCompactWindowForModel(model);
                 return { totalTokens, autoCompactTokens };
             }
             finally {