evolcore 0.0.21 → 0.0.22

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

@@ -37,7 +37,7 @@ import { resolveAgentLifecycle } from '../../config/lifecycle.js';
 import { authorizationConfigRevision, checkRoleAccess, getFirstStaticAgentOwner, listStaticAgentAdmins, listStaticAgentOwners, resolvePeerRoleDetail, roleToSessionIdentity, } from '../../config/peer-role-resolver.js';
 import { insertUsageEvent, insertContextBreakdown, insertModelCalls } from '../../stats/writer.js';
 import { normalizeUsage } from '../../stats/normalizer.js';
-import { resolvePrices } from '../../stats/price-resolver.js';
+import { resolvePrices, roundCostForOutput } from '../../stats/price-resolver.js';
 import { getBudgetStatus } from '../../stats/budget.js';
 import { formatUsageSubjectKey, getRoleBudgetStatus } from '../../stats/role-budget.js';
 import { snapshot } from './response-snapshot.js';
@@ -47,7 +47,7 @@ import { registerBuiltinModes } from '../../response-system/modes/index.js';
 import { deriveSessionTitle, shouldAutoFillSessionTitle } from '../session/session-title.js';
 import { SessionTurnCoordinator } from '../session/session-turn-coordinator.js';
 import { recordTriggerExecutionAnomaly } from '../../trigger/anomaly-store.js';
-import { classifyToolErrorCode } from '../permission/tool-error-code.js';
+import { classifyToolErrorCode, normalizeToolErrorCode } from '../permission/tool-error-code.js';
 import { normalizeExecutionPermissionMode } from '../permission/mode.js';
 import { buildToolLifecycleEventKey } from '../audit/event-key.js';
 import { isFullAccessEnabled, loadDaemonConfig } from '../../config-store.js';
@@ -637,20 +637,44 @@ export class ResponseEngine {
         // 监听中断事件，标记被中断的 session
         this.eventBus.subscribe('task:interrupted', (event) => {
             if ('sessionId' in event && event.sessionId) {
+                const eventIdentity = event;
+                const eventTaskId = eventIdentity.taskId;
+                const activeTask = this.activeTaskSpans.get(event.sessionId);
+                // A delayed interruption from an older task must never invalidate a
+                // newer task that has already claimed the same session.
+                if (eventTaskId && activeTask && activeTask.taskId !== eventTaskId)
+                    return;
                 const reason = (event.reason || 'new_message');
-                this.turnCoordinator.invalidate(event.sessionId, reason);
+                const currentTurn = this.turnCoordinator.invalidate(event.sessionId, reason, { taskId: eventTaskId, generation: eventIdentity.generation });
+                if ((eventTaskId || eventIdentity.generation !== undefined) && !currentTurn)
+                    return;
                 this.interruptedSessions.set(event.sessionId, reason);
                 this.cancelRetryDelays(event.sessionId);
-                this.agentDelegationRegistry?.revokeSession(event.sessionId);
+                // The event can be delayed relative to a newer task on the same
+                // session. Revoke only when the producer supplied the matching task;
+                // the interrupt path below performs the authoritative task-scoped
+                // revocation for legacy events without a taskId.
+                const interruptedTaskId = eventTaskId;
+                if (interruptedTaskId && activeTask?.taskId === interruptedTaskId) {
+                    this.agentDelegationRegistry?.revokeTask(event.sessionId, interruptedTaskId);
+                }
             }
         });
         this.eventBus.subscribe('task:completed', event => {
-            if ('sessionId' in event && event.sessionId)
-                this.activeTaskSpans.delete(event.sessionId);
+            if ('sessionId' in event && event.sessionId) {
+                const taskId = event.taskId;
+                const active = this.activeTaskSpans.get(event.sessionId);
+                if (!taskId || active?.taskId === taskId)
+                    this.activeTaskSpans.delete(event.sessionId);
+            }
         });
         this.eventBus.subscribe('task:error', event => {
-            if ('sessionId' in event && event.sessionId)
-                this.activeTaskSpans.delete(event.sessionId);
+            if ('sessionId' in event && event.sessionId) {
+                const taskId = event.taskId;
+                const active = this.activeTaskSpans.get(event.sessionId);
+                if (!taskId || active?.taskId === taskId)
+                    this.activeTaskSpans.delete(event.sessionId);
+            }
         });
         // 初始化响应模式协调器，注册内置模式（interactive/proactive）
         const registry = new ResponseModeRegistry();
@@ -1274,7 +1298,7 @@ export class ResponseEngine {
             causation: opts.causation ?? message.causation,
         });
     }
-    publishTriggerExecutionSkipped(message, reason, causation) {
+    publishTriggerExecutionSkipped(message, reason, causation, interruption) {
         const terminal = this.claimTriggerTerminal(message);
         if (!terminal)
             return;
@@ -1287,6 +1311,7 @@ export class ResponseEngine {
             attemptId: trigger.attemptId,
             originTriggerId: trigger.triggerId,
             reason,
+            ...(interruption ?? {}),
             targetChannel: message.channel,
             targetChannelId: message.channelId,
             fireTime: trigger.fireTime,
@@ -1294,16 +1319,25 @@ export class ResponseEngine {
         });
     }
     /** Close the internal daemon conversation before returning from an interrupted Trigger turn. */
-    async publishTriggerExecutionInterrupted(message, adapter, envelope, reason, causation) {
+    async publishTriggerExecutionInterrupted(message, adapter, envelope, reason, causation, generation) {
+        const interruption = reason === 'stale_generation'
+            ? {
+                reasonCode: 'stale_generation',
+                decisionSource: 'infrastructure',
+                executionState: 'interrupted',
+                ...(generation?.expected !== undefined ? { generation: generation.expected } : {}),
+                ...(generation?.current !== undefined ? { currentGeneration: generation.current } : {}),
+            }
+            : undefined;
         if (this.isTrustedDaemonTrigger(message)) {
             await adapter.send(envelope, {
                 kind: 'status.interrupted',
-                metadata: { reason },
+                metadata: { reason, ...(interruption ?? {}) },
             }).catch(error => {
                 logger.warn(`[ResponseEngine] Failed to close interrupted Trigger run=${message.triggerMeta?.runId ?? '<unknown>'}: ${error instanceof Error ? error.message : String(error)}`);
             });
         }
-        this.publishTriggerExecutionSkipped(message, reason, causation);
+        this.publishTriggerExecutionSkipped(message, reason, causation, interruption);
     }
     publishTriggerExecutionCompleted(message, messageId, durationMs, causation) {
         const terminal = this.claimTriggerTerminal(message);
@@ -2130,6 +2164,8 @@ export class ResponseEngine {
                 this.eventBus.publish({
                     type: 'task:error',
                     sessionId: session.id,
+                    taskId,
+                    generation: turnLease?.generation,
                     error: timeoutError.message,
                     errorType,
                     agentName: agentNameForStats,
@@ -2255,7 +2291,10 @@ export class ResponseEngine {
             const contentPreview = formatInboundMessageLogText(message.content);
             logger.info(`[${message.channel}] ${message.channelId}: ${contentPreview}${imageInfo}${modeInfo}${e2eeInfo}`);
             // 构建 peer 标识（优先 peerName，退化到 peerId / channelId）
-            const peerName = session.metadata?.peerName ?? message.peerName;
+            // Group sessions are shared by multiple senders. The current inbound
+            // message is authoritative; session metadata is only a fallback for
+            // legacy paths that do not carry a per-message display name.
+            const peerName = message.peerName ?? session.metadata?.peerName;
             const peerId = session.metadata?.peerId ?? message.peerId ?? message.channelId;
             const peerShort = peerId ? peerId.split('.')[0].split(':')[0] : '?';
             const peerLabel = peerName && peerName !== peerShort ? `${peerShort}(${peerName})` : peerShort;
@@ -2266,7 +2305,16 @@ export class ResponseEngine {
             turnLease = await this.turnCoordinator.begin(session, taskId);
             // 记录开始处理
             const taskEncrypt = message.replyContext?.metadata?.encrypted != null ? !!(message.replyContext.metadata.encrypted) : undefined;
-            this.eventBus.publish({ type: 'task:started', sessionId: session.id, agentName: agentNameForStats, encrypt: taskEncrypt, chatmode, causation: taskCausation });
+            this.eventBus.publish({
+                type: 'task:started',
+                sessionId: session.id,
+                taskId,
+                generation: turnLease.generation,
+                agentName: agentNameForStats,
+                encrypt: taskEncrypt,
+                chatmode,
+                causation: taskCausation,
+            });
             this.touchAgentActivity(channelKey);
             // Upgrade the channel acknowledgement at task start, before compaction and
             // runner setup, so processing feedback remains visible for the whole run.
@@ -2292,6 +2340,7 @@ export class ResponseEngine {
                 adapter,
                 envelope,
                 agentAid: session.selfAID,
+                permissionMode: () => effectivePermissionMode,
                 flushDelay: (options?.flushDelay ?? this.agentRegistry?.resolveByChannel(channelKey)?.config?.flush_delay ?? 3) * 1000,
                 suppressActivityItems: isProactive ? false : middleOutputMode !== 'all',
                 suppressIntermediateText: isProactive ? false : middleOutputMode === 'none',
@@ -3108,7 +3157,7 @@ export class ResponseEngine {
                             }];
                     const peerItems = (() => {
                         if (message.handoffDelivery && this.handoffRuntime) {
-                            const items = this.handoffRuntime.buildPromptItems(message);
+                            const items = this.handoffRuntime.buildPromptItems(message, peerRole);
                             if (items.length > 0) {
                                 v2HandoffIds = Array.from(new Set(items.flatMap(item => (item.handoff?.handoffIds?.length
                                     ? item.handoff.handoffIds
@@ -3205,12 +3254,14 @@ export class ResponseEngine {
                     peerName: peerName || undefined,
                     peerType: message.peerType || session.metadata?.peerType || undefined,
                     peerRole,
+                    permissionMode: effectivePermissionMode,
                     ...(fullAccessAuthorization ? {
                         processRole: fullAccessAuthorization.processRole,
                         dataScope: fullAccessAuthorization.dataScope,
                         authorizedBy: fullAccessAuthorization.authorizedBy,
                         executionSource: fullAccessAuthorization.source,
                     } : {}),
+                    daemonRuntimeEpoch: this.agentDelegationRegistry?.getRuntimeEpoch(),
                     threadId: session.threadId || undefined,
                     sessionRuntimeDir,
                     runtimeLockDir: ensureRuntimeLockDir(sessionRuntimeDir),
@@ -3547,7 +3598,10 @@ export class ResponseEngine {
                     }
                     this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                     logger.info(`[ResponseEngine] Stale turn stopped before publish: session=${session.id} task=${taskId}`);
-                    await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_generation', taskCausation);
+                    await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_generation', taskCausation, {
+                        expected: turnLease?.generation,
+                        current: this.turnCoordinator.current(session).generation,
+                    });
                     return;
                 }
                 if (!commitDecision.ok) {
@@ -3559,7 +3613,10 @@ export class ResponseEngine {
                         }
                         this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                         logger.info(`[ResponseEngine] Stale turn stopped before protocol rejection: session=${session.id} task=${taskId}`);
-                        await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_generation', taskCausation);
+                        await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_generation', taskCausation, {
+                            expected: turnLease?.generation,
+                            current: this.turnCoordinator.current(session).generation,
+                        });
                         return;
                     }
                     const reason = streamResult.protocolIncompleteReason || commitDecision.reason;
@@ -3761,7 +3818,10 @@ export class ResponseEngine {
                 if (!commitDecision.ok) {
                     logger.info(`[ResponseEngine] Turn commit rejected after flush: session=${session.id} task=${taskId} reason=${commitDecision.reason}`);
                     if (commitDecision.reason === 'stale_generation') {
-                        await this.publishTriggerExecutionInterrupted(message, adapter, envelope, commitDecision.reason, taskCausation);
+                        await this.publishTriggerExecutionInterrupted(message, adapter, envelope, commitDecision.reason, taskCausation, {
+                            expected: turnLease?.generation,
+                            current: this.turnCoordinator.current(session).generation,
+                        });
                     }
                     else {
                         this.publishTriggerExecutionFailure(message, `turn_commit_rejected:${commitDecision.reason}`, {
@@ -3848,6 +3908,8 @@ export class ResponseEngine {
                     this.eventBus.publish({
                         type: 'task:error',
                         sessionId: session.id,
+                        taskId,
+                        generation: turnLease?.generation,
                         error: errorSummary,
                         errorType,
                         agentName: agentNameForStats,
@@ -3965,12 +4027,18 @@ export class ResponseEngine {
                             cache_read_tokens: sum.cache_read_tokens,
                             cache_creation_tokens: sum.cache_creation_tokens,
                             // 顶层 cost_usd/cost_cny 保持向后兼容 = 网关实际价
-                            cost_usd: sum.cost_gateway_usd,
-                            cost_cny: sum.cost_gateway_cny,
+                            cost_usd: roundCostForOutput(sum.cost_gateway_usd),
+                            cost_cny: roundCostForOutput(sum.cost_gateway_cny),
                             call_count: sum.calls,
                             cost: {
-                                official: { usd: sum.cost_official_usd, cny: sum.cost_official_cny },
-                                gateway: { usd: sum.cost_gateway_usd, cny: sum.cost_gateway_cny },
+                                official: {
+                                    usd: roundCostForOutput(sum.cost_official_usd),
+                                    cny: roundCostForOutput(sum.cost_official_cny),
+                                },
+                                gateway: {
+                                    usd: roundCostForOutput(sum.cost_gateway_usd),
+                                    cny: roundCostForOutput(sum.cost_gateway_cny),
+                                },
                             },
                         };
                     }
@@ -3988,10 +4056,13 @@ export class ResponseEngine {
                     }
                     else {
                         // cost 同时给原价(official)与网关实际价(gateway)；顶层 cost_usd/cost_cny 保持向后兼容 = 网关价。
-                        const gatewayUsd = turnCost.gateway?.usd ?? turnCost.official?.usd ?? 0;
-                        const gatewayCny = turnCost.gateway?.cny ?? turnCost.official?.cny ?? 0;
+                        const gatewayUsd = roundCostForOutput(turnCost.gateway?.usd ?? turnCost.official?.usd ?? 0);
+                        const gatewayCny = roundCostForOutput(turnCost.gateway?.cny ?? turnCost.official?.cny ?? 0);
                         const turnCostBlock = {
-                            official: { usd: turnCost.official?.usd ?? 0, cny: turnCost.official?.cny ?? 0 },
+                            official: {
+                                usd: roundCostForOutput(turnCost.official?.usd ?? 0),
+                                cny: roundCostForOutput(turnCost.official?.cny ?? 0),
+                            },
                             gateway: { usd: gatewayUsd, cny: gatewayCny },
                         };
                         // 最后一次访问：本轮可能有多次大模型调用（numTurns>1），整轮的 turnCostBlock 不等于
@@ -4006,10 +4077,13 @@ export class ResponseEngine {
                                     model: lastModel, turns: 1,
                                 });
                                 const lp = resolvePrices(resolveRoot(), lastEvent, agent.getGatewayPricing?.());
-                                const lpGwUsd = lp.gateway?.usd ?? lp.official?.usd ?? 0;
-                                const lpGwCny = lp.gateway?.cny ?? lp.official?.cny ?? 0;
+                                const lpGwUsd = roundCostForOutput(lp.gateway?.usd ?? lp.official?.usd ?? 0);
+                                const lpGwCny = roundCostForOutput(lp.gateway?.cny ?? lp.official?.cny ?? 0);
                                 lastModelCall = { ...lastModelCall, cost: {
-                                        official: { usd: lp.official?.usd ?? 0, cny: lp.official?.cny ?? 0 },
+                                        official: {
+                                            usd: roundCostForOutput(lp.official?.usd ?? 0),
+                                            cny: roundCostForOutput(lp.official?.cny ?? 0),
+                                        },
                                         gateway: { usd: lpGwUsd, cny: lpGwCny },
                                     } };
                             }
@@ -4057,6 +4131,8 @@ export class ResponseEngine {
                 this.eventBus.publish({
                     type: 'task:completed',
                     sessionId: session.id,
+                    taskId,
+                    generation: turnLease.generation,
                     channel: message.channel,
                     channelId: message.channelId,
                     terminalReason: streamResult.terminalReason,
@@ -4188,6 +4264,8 @@ export class ResponseEngine {
                 this.eventBus.publish({
                     type: 'task:error',
                     sessionId: session.id,
+                    taskId,
+                    generation: turnLease?.generation,
                     error: errorMsg,
                     errorType,
                     agentName: agentNameForStats,
@@ -4208,14 +4286,15 @@ export class ResponseEngine {
             }
             // 发送用户友好的错误消息
             // 用户主动中断（新消息打断 或 /stop 命令）时静默，不发送错误提示
-            // processEventStream 已通过 renderer 发过错误时也跳过
+            // 普通渠道可跳过 renderer 已发送的重复错误；daemon trigger 仍必须
+            // 发送结构化终态，否则 DaemonChannel 会一直等到 watchdog。
             const retryExhaustedCount = getRetryExhaustedCount(error);
             const modelFallbackExhaustedMessage = getModelFallbackExhaustedMessage(error);
             const retryInputAlreadySubmitted = wasRetryInputAlreadySubmitted(error);
             if (isUserInterrupt) {
                 logger.info(`[ResponseEngine] User interrupt by new_message, skip sending error message`);
             }
-            else if (error?._errorAlreadySent && !retryExhaustedCount && !isTimeout && !isTotalExecutionTimeout) {
+            else if (error?._errorAlreadySent && !daemonTrigger && !retryExhaustedCount && !isTimeout && !isTotalExecutionTimeout) {
                 logger.info(`[ResponseEngine] Error already sent via renderer, skip sending duplicate message`);
             }
             else {
@@ -4633,11 +4712,17 @@ export class ResponseEngine {
                 if (event.type === 'complete') {
                     event = normalizeCompleteAgentEvent(event);
                 }
-                if (event.type === 'tool_result' && event.isError && !event.errorCode) {
-                    event = {
-                        ...event,
-                        errorCode: classifyToolErrorCode({ error: event.error, result: event.result }),
-                    };
+                if (event.type === 'tool_result' && event.isError) {
+                    const classificationMissing = !normalizeToolErrorCode(event.errorCode)
+                        && event.decisionSource !== 'policy'
+                        && event.decisionSource !== 'approval';
+                    const errorCode = classifyToolErrorCode({
+                        errorCode: event.errorCode,
+                        decisionSource: event.decisionSource,
+                    });
+                    if (event.errorCode !== errorCode) {
+                        event = { ...event, errorCode, ...(classificationMissing ? { classificationMissing: true } : {}) };
+                    }
                 }
                 // 每收到事件重置空闲超时
                 const toolName = event.type === 'tool_use' ? event.name : undefined;
@@ -4740,7 +4825,13 @@ export class ResponseEngine {
                     eventDetail = ` tool=${event.name}${desc ? ` desc="${desc}"` : ''}`;
                 }
                 else if (event.type === 'tool_result') {
-                    eventDetail = ` tool=${event.name} ok=${!event.isError}`;
+                    const decision = event.decision ?? (event.isError ? 'error' : 'allow');
+                    const executed = event.executed ?? !event.isError;
+                    const executionState = event.executionState
+                        ?? (decision === 'deny' ? 'blocked' : event.isError ? 'failed' : 'completed');
+                    eventDetail = ` tool=${event.name} ok=${decision === 'allow' && executed}`
+                        + ` decision=${decision} executed=${executed} executionState=${executionState}`
+                        + (event.policyCode ? ` policy=${event.policyCode}` : '');
                 }
                 const frameworkEvents = new Set(['session_id', 'state_changed', 'status']);
                 if (frameworkEvents.has(event.type)) {
@@ -5006,6 +5097,16 @@ export class ResponseEngine {
                                 toolName: event.name,
                                 toolInput: event.input || {},
                                 injectToModel: (text) => { agent.injectUserMessage?.(session.id, text); },
+                                recordReminder: reminder => {
+                                    this.eventBus.publish({
+                                        type: 'runner:proactive-reminder',
+                                        sessionId: session.id,
+                                        ...reminder,
+                                        injection: 'requested',
+                                        timestamp: Date.now(),
+                                        causation,
+                                    });
+                                },
                                 getQueueLength: () => this.messageQueue?.getQueueLength(session.id) ?? 0,
                                 isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID),
                                 logger,
@@ -5031,6 +5132,7 @@ export class ResponseEngine {
                             sessionId: session.id,
                             callId: event.callId,
                             correlationId: event.correlationId,
+                            requestId: event.requestId,
                         });
                         this.eventBus.publish({
                             type: 'tool:result',
@@ -5039,16 +5141,29 @@ export class ResponseEngine {
                             sessionId: session.id,
                             toolName: event.name,
                             isError: event.isError,
-                            ...(event.isError ? { errorCode: classifyToolErrorCode({ errorCode: event.errorCode, error: event.error, result: event.result }) } : {}),
+                            ...(event.isError ? {
+                                errorCode: classifyToolErrorCode({
+                                    errorCode: event.errorCode,
+                                    decisionSource: event.decisionSource,
+                                }),
+                                ...((event.classificationMissing || (!normalizeToolErrorCode(event.errorCode)
+                                    && event.decisionSource !== 'policy'
+                                    && event.decisionSource !== 'approval')) ? { classificationMissing: true } : {}),
+                            } : {}),
                             ...(event.callId ? { callId: event.callId } : {}),
                             ...(event.correlationId || event.callId ? { correlationId: event.correlationId ?? event.callId } : {}),
+                            ...(event.requestId ? { requestId: event.requestId } : {}),
                             agentName: lifecycleAgentName,
                             agentAid: lifecycleAgentAid ?? 'unknown',
                             permissionMode: lifecyclePermissionMode,
-                            decision: event.isError ? 'error' : 'allow',
-                            decisionSource: 'runner',
-                            executed: true,
-                            executionState: event.isError ? 'failed' : 'completed',
+                            decision: event.decision ?? (event.isError ? 'error' : 'allow'),
+                            decisionSource: event.decisionSource ?? 'runner',
+                            ...(event.policyCode ? { policyCode: event.policyCode } : {}),
+                            ...(event.reason ? { reason: event.reason } : {}),
+                            executed: event.executed ?? (event.decision === 'deny' ? false : true),
+                            executionState: event.executionState ?? (event.decision === 'deny'
+                                ? 'blocked'
+                                : event.isError ? 'failed' : 'completed'),
                             timestamp: Date.now(),
                             causation,
                         });
@@ -5095,7 +5210,23 @@ export class ResponseEngine {
                                 result: event.result,
                                 isError: event.isError,
                                 error: event.error,
+                                decision: event.decision,
+                                decisionSource: event.decisionSource,
+                                executed: event.executed,
+                                executionState: event.executionState,
+                                policyCode: event.policyCode,
+                                requestId: event.requestId,
                                 injectToModel: (text) => { agent.injectUserMessage?.(session.id, text); },
+                                recordReminder: reminder => {
+                                    this.eventBus.publish({
+                                        type: 'runner:proactive-reminder',
+                                        sessionId: session.id,
+                                        ...reminder,
+                                        injection: 'requested',
+                                        timestamp: Date.now(),
+                                        causation,
+                                    });
+                                },
                                 getQueueLength: () => this.messageQueue?.getQueueLength(session.id) ?? 0,
                                 isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID),
                                 logger,