evolcore 0.0.31 → 0.0.33

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

@@ -11,6 +11,7 @@ import { authorizeAccess, authorizeOperation, buildAuthSubject } from '../auth/a
 import { buildTaskRuntimeEnv, ensureRuntimeLockDir, ensureSessionRuntimeDir } from '../../cli/task-context.js';
 import { memorySessionPolicyHook } from '../memory/memory-session-policy.js';
 import { IMRenderer } from './im-renderer.js';
+import { projectSubtaskStarted, projectSubtaskTerminal } from './subtask-tool-projection.js';
 import { TaskActivityStore } from '../task/task-activity-store.js';
 import { createSendFileMarkerPattern } from './file-markers.js';
 import { createDecisionInferenceProvider, createTextInferenceProvider } from '../inference/text-inference.js';
@@ -19,9 +20,10 @@ import { logger } from '../../utils/logger.js';
 import { isHostChinese } from '../../utils/locale.js';
 import { ExecutionTimeoutError, OrphanedTargetSessionError, isExecutionFailure, getErrorMessage, classifyError, ErrorType, ERROR_PREFIX, isInfraError, isAbortTerminalReason, prefixErrorType, isRetryableError, isContextTooLongText } from '../../utils/error-utils.js';
 import { readEvolcoreRuntimeFlavor, tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
-import { describeProactiveSendCommandFailure, isExactEvolcoreSendCommandForSession } from '../permission/ec-command-parser.js';
+import { describeProactiveSendCommandFailure, isExactEvolcoreSendCommandForSession, isThreadRoutedEvolcoreSendCommand } from '../permission/ec-command-parser.js';
+import { resolveThreadRouteTarget } from '../thread/thread-route.js';
 import { summarizeToolInputForDisplay } from '../../utils/tool-summary.js';
-import { agentDataDir, agentDir as resolveAgentDir, agentMdPath, getPackageRoot, resolveRoot, resolvePaths } from '../../paths.js';
+import { agentDataDir, agentDir as resolveAgentDir, agentMdPath, getPackageRoot, resolveRoot, resolvePaths, debugSessionsDir } from '../../paths.js';
 import { renderKitSections, resolveSessionManifest, DEFAULT_MANIFEST_FILE } from '../../eck/kit-renderer.js';
 import { renderMessageBody } from '../../eck/message-renderer.js';
 import { syncGroupRulesContext } from '../../eck/group-rules-sync.js';
@@ -67,6 +69,10 @@ import { auditFullAccessEvent } from '../auth/authorization-audit.js';
 import { TaskRecoveryService, isTaskRecoveryCurrent } from '../task/task-recovery-service.js';
 const QUESTION_TTL_MS = 24 * 60 * 60 * 1000;
 /** Pending async questions outlive the originating turn, but never change its backend binding. */
+/** 带 --thread 的跨话题发送：话题存在于本端索引且目标一致时视为合法发送。 */
+function isThreadRoutedSendForSelf(toolName, toolInput, selfAid) {
+    return isThreadRoutedEvolcoreSendCommand(toolName, toolInput, selfAid, (scope, threadId, target) => !!selfAid && !!resolveThreadRouteTarget(selfAid, threadId, scope, target));
+}
 export class AsyncQuestionService {
     deps;
     registered = new Map();
@@ -673,16 +679,8 @@ function getStreamErrorText(result) {
     return parts.join('\n');
 }
 function getStreamErrorMessage(result, includeEmoji = false) {
-    const raw = getStreamErrorText(result) || '任务执行失败';
-    const mapped = getErrorMessage(new Error(raw), result.terminalReason, includeEmoji);
-    const generic = includeEmoji ? '❌ 处理消息时出错，请稍后重试' : '处理消息时出错，请稍后重试';
-    // Unknown runner-specific terminal reasons do not have a friendly mapping.
-    // Preserve their diagnostic text instead of collapsing it to the generic
-    // "处理消息时出错" message.
-    if (raw && mapped === generic) {
-        return includeEmoji ? `❌ ${raw}` : raw;
-    }
-    return mapped;
+    const raw = getStreamErrorText(result);
+    return getErrorMessage(new Error(raw), result.terminalReason, includeEmoji);
 }
 function streamHitContextLimit(result) {
     return result.terminalReason === 'prompt_too_long' ||
@@ -826,6 +824,8 @@ export class ResponseEngine {
     activeMonitors = new Map();
     /** sessionId → 当前正在处理任务的运行时上下文，供 in-task CLI 通过 IPC 查询。 */
     activeTaskRuntimeContexts = new Map();
+    /** sessionId → 本轮最近一次 runQuery 请求的模型；仅在任务活跃时对外可见（见 getOutboundDebug）。 */
+    activeRunnerModels = new Map();
     /** task.run started 后立即登记，覆盖运行时上下文尚未建立的 shutdown 窗口。 */
     activeTaskSpans = new Map();
     /** sessionId → 尚未收到 runner:task-notification 的子任务。 */
@@ -1404,6 +1404,7 @@ export class ResponseEngine {
             this.sessionManager.clearProcessingIfTask(sessionId, taskId);
             if (this.activeTaskRuntimeContexts.get(sessionId)?.taskId === taskId) {
                 this.activeTaskRuntimeContexts.delete(sessionId);
+                this.activeRunnerModels.delete(sessionId);
             }
             this.agentDelegationRegistry?.revokeTask(sessionId, taskId);
         }
@@ -1482,6 +1483,64 @@ export class ResponseEngine {
     getTaskRuntimeContext(sessionId) {
         return this.activeTaskRuntimeContexts.get(sessionId) ?? null;
     }
+    /** debug 模式下写/删 debug-sessions 临时文件 */
+    debugWriteSessionSnapshot(sessionId, ctx) {
+        if (process.env.EVOLCORE_DEBUG_MODE !== '1')
+            return;
+        try {
+            const dir = debugSessionsDir();
+            if (!fs.existsSync(dir))
+                fs.mkdirSync(dir, { recursive: true });
+            const snapshot = {
+                schemaVersion: 1,
+                sessionId,
+                selfAid: ctx.selfAid ?? '',
+                channel: ctx.channel ?? '',
+                channelKey: ctx.channelKey ?? '',
+                channelId: ctx.channelId ?? '',
+                peerKey: ctx.peerKey ?? '',
+                chatType: ctx.chatType ?? 'private',
+                threadId: ctx.threadId ?? '',
+                sessionType: ctx.sessionType ?? 'main',
+                baseagent: ctx.baseagent ?? '',
+                writtenAt: Date.now(),
+            };
+            fs.writeFileSync(`${dir}/${sessionId}.json`, JSON.stringify(snapshot), 'utf-8');
+        }
+        catch (err) {
+            logger.debug(`[Debug] failed to write debug session snapshot for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    debugDeleteSessionSnapshot(sessionId) {
+        if (process.env.EVOLCORE_DEBUG_MODE !== '1')
+            return;
+        try {
+            const snapshotPath = `${debugSessionsDir()}/${sessionId}.json`;
+            if (fs.existsSync(snapshotPath))
+                fs.rmSync(snapshotPath, { force: true });
+        }
+        catch (err) {
+            logger.debug(`[Debug] failed to delete debug session snapshot for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+    }
+    /**
+     * 出站 payload.debug 的会话侧字段（不含 sentAt，由发送方盖戳）。
+     * 供 agent 经 CLI（ec msg send / ec group send）委托发送的路径使用，
+     * 与 IMRenderer 回复路径写入的 debug 同构。会话不存在返回 undefined。
+     */
+    async getOutboundDebug(sessionId) {
+        const session = await this.sessionManager.getSessionById(sessionId);
+        if (!session)
+            return undefined;
+        const model = this.activeTaskRuntimeContexts.has(sessionId)
+            ? this.activeRunnerModels.get(sessionId)
+            : undefined;
+        return {
+            sessionId: session.id,
+            ...(session.agentSessionId ? { agentSessionId: session.agentSessionId } : {}),
+            ...(model ? { model } : {}),
+        };
+    }
     setAgentDelegationRegistry(registry) {
         this.agentDelegationRegistry = registry;
     }
@@ -1796,6 +1855,71 @@ export class ResponseEngine {
             && message.source === 'trigger'
             && !!message.triggerMeta?.triggerId;
     }
+    isTrustedBgSession(message) {
+        return message.channel === 'daemon'
+            && message.source === 'bg-session'
+            && !!message.bgSessionMeta?.runId;
+    }
+    bgSessionTerminalMessages = new WeakSet();
+    claimBgSessionTerminal(message) {
+        const meta = message.bgSessionMeta;
+        if (message.source !== 'bg-session' || !meta?.runId || this.bgSessionTerminalMessages.has(message)) {
+            return undefined;
+        }
+        this.bgSessionTerminalMessages.add(message);
+        return { meta, runId: meta.runId };
+    }
+    publishBgSessionError(message, error, opts = {}) {
+        const terminal = this.claimBgSessionTerminal(message);
+        if (!terminal)
+            return;
+        const { meta, runId } = terminal;
+        this.eventBus.publish({
+            type: 'bg-session:error',
+            kind: meta.kind,
+            runId,
+            sessionId: meta.boundSessionId ?? '',
+            messageId: opts.messageId ?? message.messageId ?? runId,
+            error,
+            targetChannel: message.channel,
+            targetChannelId: message.channelId,
+            causation: opts.causation ?? message.causation,
+        });
+    }
+    publishBgSessionInterrupted(message, reason, causation) {
+        const terminal = this.claimBgSessionTerminal(message);
+        if (!terminal)
+            return;
+        const { meta, runId } = terminal;
+        this.eventBus.publish({
+            type: 'bg-session:interrupted',
+            kind: meta.kind,
+            runId,
+            sessionId: meta.boundSessionId ?? '',
+            messageId: message.messageId ?? runId,
+            reason,
+            targetChannel: message.channel,
+            targetChannelId: message.channelId,
+            causation: causation ?? message.causation,
+        });
+    }
+    publishBgSessionCompleted(message, messageId, durationMs, causation) {
+        const terminal = this.claimBgSessionTerminal(message);
+        if (!terminal)
+            return;
+        const { meta, runId } = terminal;
+        this.eventBus.publish({
+            type: 'bg-session:completed',
+            kind: meta.kind,
+            runId,
+            sessionId: meta.boundSessionId ?? '',
+            messageId,
+            durationMs,
+            targetChannel: message.channel,
+            targetChannelId: message.channelId,
+            causation: causation ?? message.causation,
+        });
+    }
     /**
      * A fullaccess Trigger may run with no current relation access for its
      * origin actor, but only after its persisted owner provenance still
@@ -1859,6 +1983,8 @@ export class ResponseEngine {
         if (!selfAid || !actorId || !channelType || !originChannelKey)
             return undefined;
         const chatType = message.triggerMeta.originChatType ?? 'private';
+        if (chatType === 'group' && !message.triggerMeta.originConversationId)
+            return undefined;
         const conversationId = message.triggerMeta.originConversationId ?? actorId;
         const control = message.triggerMeta.originControl === true;
         let actor;
@@ -1889,10 +2015,25 @@ export class ResponseEngine {
             actorId,
             channelType,
             originChannelKey,
+            conversationId: chatType === 'group' ? conversationId : actorId,
             control,
             peerKey: formatPeerKey(channelType, chatType === 'group' ? conversationId : actorId),
         };
     }
+    resolveTaskApprovalInteractionPolicy(message) {
+        if (message.taskRecovery) {
+            const policy = message.taskRecovery.approvalInteractionPolicy;
+            if (policy === 'interactive' || policy === 'deny')
+                return policy;
+            return message.taskRecovery.automatic ? 'deny' : 'interactive';
+        }
+        if (message.source === 'handoff' && message.handoffDelivery?.direction === 'origin') {
+            return message.handoffDelivery.originAuthorization?.approvalInteractionPolicy === 'interactive'
+                ? 'interactive'
+                : 'deny';
+        }
+        return message.source === 'trigger' ? 'deny' : 'interactive';
+    }
     resolveHandoffOriginExecutionIdentity(message, selfAid) {
         const authorization = message.handoffDelivery?.originAuthorization;
         if (message.source !== 'handoff'
@@ -1944,8 +2085,11 @@ export class ResponseEngine {
     /** Publish a terminal outcome before an early return from Trigger execution. */
     publishTriggerExecutionFailure(message, error, opts = {}) {
         const terminal = this.claimTriggerTerminal(message);
-        if (!terminal)
+        if (!terminal) {
+            // bg-session 路径：trigger terminal 不匹配时尝试 bg-session
+            this.publishBgSessionError(message, error, { messageId: opts.messageId, causation: opts.causation });
             return;
+        }
         const { trigger, runId } = terminal;
         const attemptId = trigger.attemptId;
         this.eventBus.publish({
@@ -1966,8 +2110,11 @@ export class ResponseEngine {
     }
     publishTriggerExecutionSkipped(message, reason, causation, interruption) {
         const terminal = this.claimTriggerTerminal(message);
-        if (!terminal)
+        if (!terminal) {
+            // bg-session 路径
+            this.publishBgSessionInterrupted(message, reason, causation);
             return;
+        }
         const { trigger, runId } = terminal;
         this.eventBus.publish({
             type: 'trigger:skipped',
@@ -2003,6 +2150,14 @@ export class ResponseEngine {
                 logger.warn(`[ResponseEngine] Failed to close interrupted Trigger run=${message.triggerMeta?.runId ?? '<unknown>'}: ${error instanceof Error ? error.message : String(error)}`);
             });
         }
+        else if (this.isTrustedBgSession(message)) {
+            await adapter.send(envelope, {
+                kind: 'status.interrupted',
+                metadata: { reason },
+            }).catch(error => {
+                logger.warn(`[ResponseEngine] Failed to close interrupted bg-session run=${message.bgSessionMeta?.runId ?? '<unknown>'}: ${error instanceof Error ? error.message : String(error)}`);
+            });
+        }
         this.publishTriggerExecutionSkipped(message, reason, causation, interruption);
     }
     publishTriggerExecutionCompleted(message, messageId, durationMs, causation) {
@@ -2701,6 +2856,7 @@ export class ResponseEngine {
         const triggerExecutionIdentity = this.resolveTriggerExecutionIdentity(message, selfAid);
         const authorizationIdentity = triggerExecutionIdentity
             ?? this.resolveHandoffOriginExecutionIdentity(message, selfAid);
+        const approvalInteractionPolicy = this.resolveTaskApprovalInteractionPolicy(message);
         const configChannelType = authorizationIdentity?.channelType ?? currentChannelType;
         const configChatType = authorizationIdentity
             ? (message.triggerMeta?.originChatType ?? message.handoffDelivery?.originAuthorization?.chatType ?? 'private')
@@ -2873,8 +3029,12 @@ export class ResponseEngine {
                     ? { kind: 'restartResume', groupId: message.groupId, threadId: message.threadId }
                     : undefined,
             previousTurnState: this.turnCoordinator.current(session),
-            isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, chatType, selfAid),
-            describeSendCommandFailure: describeProactiveSendCommandFailure,
+            isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, chatType, selfAid) || isThreadRoutedSendForSelf(toolName, toolInput, selfAid),
+            describeSendCommandFailure: (toolName, toolInput) => describeProactiveSendCommandFailure(toolName, toolInput, {
+                selfAid,
+                channelId: session.channelId,
+                chatType: chatType,
+            }),
             logger,
         } : null;
         if (resolvedMode?.mode.beforeProcess && modeProcessCtx) {
@@ -2937,6 +3097,7 @@ export class ResponseEngine {
                 this.sessionManager.clearProcessingIfTask(session.id, taskId);
                 if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                     this.activeTaskRuntimeContexts.delete(session.id);
+                    this.activeRunnerModels.delete(session.id); // F1修复
                 }
                 this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                 const daemonTrigger = this.isTrustedDaemonTrigger(message);
@@ -3122,6 +3283,7 @@ export class ResponseEngine {
                 : undefined;
             turnLease = await this.turnCoordinator.begin(session, taskId, inputId, configActorId ? {
                 peerId: configActorId,
+                approvalInteractionPolicy,
                 encrypted: message.encrypted ?? message.replyContext?.metadata?.encrypted,
                 baseagent: session.baseagent,
                 agentSessionId: session.agentSessionId,
@@ -3285,9 +3447,9 @@ export class ResponseEngine {
                 await adapter.send(withEnvelopeReplyContext(envelope, capturedReplyContext), { kind: 'result.text', text, isFinal: false });
             };
             const authChatType = configChatType;
-            const authConversationId = authChatType === 'group'
+            const authConversationId = triggerExecutionIdentity?.conversationId ?? (authChatType === 'group'
                 ? (session.metadata?.groupId || session.channelId || capturedChannelId)
-                : configActorId;
+                : configActorId);
             const authPeerKey = configChannelType && authConversationId
                 ? formatPeerKey(configChannelType, authConversationId)
                 : undefined;
@@ -3439,7 +3601,7 @@ export class ResponseEngine {
                 peerKey: authPeerKey,
                 causation: taskCausation,
                 approvalRouting,
-                approvalInteractionPolicy: authorizationIdentity ? 'deny' : 'interactive',
+                approvalInteractionPolicy,
                 permissionMode: effectivePermissionMode,
                 recordExecutionAnomaly,
                 pauseController: taskPauseController,
@@ -3536,16 +3698,31 @@ export class ResponseEngine {
                     const pluginHook = pureSessionPolicyHook;
                     if (!pluginHook)
                         return undefined;
-                    return (toolName, toolInput) => {
+                    return (toolName, toolInput, meta) => {
                         const stBefore = modeState.get('proactive');
                         const wasFirstPending = stBefore && !stBefore.firstToolDone;
-                        const result = pluginHook(toolName, toolInput);
+                        const result = pluginHook(toolName, toolInput, meta);
                         // 整理会话的拦截原因已经写清楚怎么改，不套 proactive 违规提醒
                         if (result?.block && result.policyCode?.startsWith('memory_session_'))
                             return result;
                         if (result?.block) {
                             // 拦截事件（首工具非表态 / 工具进展汇报未完成）
                             snapshot.set(session.id, taskId, { policyHook: { triggered: true, blocked: true, toolName } });
+                            // 问题1/2修复：熔断码表示连续违规已超阈值，停止注入提醒，直接中断任务。
+                            // F5修复：向渠道发一条人类可读的错误说明，避免静默中断。
+                            if (result.policyCode === 'proactive_circuit_break') {
+                                void adapter.send(withEnvelopeReplyContext(envelope, capturedReplyContext), {
+                                    kind: 'result.text',
+                                    text: '⚠️ 任务执行遇到循环障碍，已自动中断。请重新描述你的需求。',
+                                    isFinal: true,
+                                }).catch(err => {
+                                    logger.warn(`[ResponseEngine] circuit break channel send failed: session=${session.id} error=${err instanceof Error ? err.message : String(err)}`);
+                                });
+                                void agent.interrupt(session.id).catch(error => {
+                                    logger.debug(`[ResponseEngine] circuit break interrupt failed: session=${session.id} error=${error instanceof Error ? error.message : String(error)}`);
+                                });
+                                return result;
+                            }
                             const errorMsg = `⚠️ proactive 模式违规：${result.reason ?? '请先发送必要说明'}。请重新执行正确的命令。`;
                             agent.injectUserMessage?.(session.id, errorMsg);
                             return result;
@@ -3589,6 +3766,8 @@ export class ResponseEngine {
             let previousFallbackState;
             let agentModel;
             let v2HandoffIds = [];
+            /** T3: 本次注入的 Thread Context 条目（渲染后据此清空 inbox）。 */
+            let threadContextItems = [];
             let v2HandoffResultRefs = [];
             let v2HandoffDirection;
             let handoffPromptRendered = false;
@@ -4121,6 +4300,16 @@ export class ResponseEngine {
                     const rawPeerItems = message.source === 'owner-inject' ? [] : message.items && message.items.length > 0
                         ? message.items
                         : [{
+                                // T9.5/T10: trigger 消息填充专属 kind + triggerInfo（含 labels），走 msg-trigger-session/thread-check 渲染
+                                ...(message.source === 'trigger' && message.triggerMeta?.triggerId ? {
+                                    kind: 'trigger',
+                                    triggerInfo: {
+                                        triggerId: message.triggerMeta.triggerId,
+                                        triggerName: message.triggerMeta.triggerName,
+                                        fireTime: message.triggerMeta.fireTime,
+                                        labels: message.triggerMeta.labels,
+                                    },
+                                } : {}),
                                 peerId: message.peerId, peerName: peerName || undefined,
                                 peerType: message.peerType,
                                 peerRole: message.batchRole || session.identity?.role || 'none',
@@ -4131,6 +4320,34 @@ export class ResponseEngine {
                                 mentions: message.mentions,
                                 mentionAids: message.mentionAids,
                             }];
+                    // T3.2: 读取 Thread Context inbox —— 跨话题发送留在本端的注入提醒。
+                    // 注入一次后立即删除整个文件（T3.3），不依赖任何消费标记。
+                    threadContextItems = [];
+                    if (selfAid && message.source !== 'owner-inject') {
+                        try {
+                            const { ThreadService } = await import('../thread/index.js');
+                            const inbox = ThreadService.readInbox(selfAid, session.id);
+                            threadContextItems = inbox.map(entry => ({
+                                kind: 'thread-context',
+                                peerId: entry.originPeer,
+                                peerType: 'agent',
+                                peerRole: 'none',
+                                content: entry.content,
+                                timestamp: entry.timestamp,
+                                threadContext: {
+                                    messageId: entry.messageId,
+                                    originThreadId: entry.originThreadId,
+                                    originPeer: entry.originPeer,
+                                    originSessionId: entry.originSessionId,
+                                    ...(entry.triggerId ? { triggerId: entry.triggerId } : {}),
+                                    gapDetection: entry.gapDetection,
+                                },
+                            }));
+                        }
+                        catch (e) {
+                            logger.warn(`[ResponseEngine] ThreadContext inbox 读取失败: ${e?.message ?? e}`);
+                        }
+                    }
                     const peerItems = (() => {
                         if (message.handoffDelivery && this.handoffRuntime) {
                             const items = this.handoffRuntime.buildPromptItems(message, peerRole);
@@ -4140,10 +4357,10 @@ export class ResponseEngine {
                                     : (item.handoff?.handoffId ? [item.handoff.handoffId] : [])))));
                                 v2HandoffResultRefs = items.flatMap(item => item.handoff?.resultRefs ?? []);
                                 v2HandoffDirection = message.handoffDelivery.direction;
-                                return items;
+                                return [...threadContextItems, ...items];
                             }
                         }
-                        return rawPeerItems;
+                        return [...threadContextItems, ...rawPeerItems];
                     })();
                     // 将匹配的 pending hint 暂时 claim，排在真实消息之前；渲染或启动
                     // 失败时释放 claim，只有 runner 接受 prompt 后才持久化 consumed。
@@ -4247,15 +4464,30 @@ export class ResponseEngine {
                         }
                     }
                 }
+                // T3.3: 渲染成功、prompt 非空 —— 注入完成，删除 inbox（注入一次语义）。
+                if (threadContextItems.length > 0 && selfAid) {
+                    try {
+                        const { ThreadService } = await import('../thread/index.js');
+                        ThreadService.clearInbox(selfAid, session.id);
+                    }
+                    catch (e) {
+                        logger.warn(`[ResponseEngine] ThreadContext inbox 清理失败: ${e?.message ?? e}`);
+                    }
+                }
                 // Pass the stable session directory explicitly so sandboxed helper
                 // commands never fall back to a process, agent, or project directory
                 // for transient state.
                 const taskRuntimeContext = {
                     taskId,
                     sessionId: session.id,
+                    projectPath: path.resolve(session.projectPath),
                     messageId: message.messageId,
                     baseagent: normalizedBaseagent.canonical,
                     channel: configChannelType,
+                    // 完整 channelKey（= adapter.channelName / inst.name，如 `aun#<selfAid>#main`）。
+                    // 必须与下面 issue() 的 `channel:` 用同一表达式，否则 debug 路径拿到的
+                    // origin.channelKey 会与真实任务路径不一致（见 D5）。
+                    channelKey: authorizationIdentity?.originChannelKey ?? message.channel,
                     channelId: message.channelId,
                     chatType: configChatType,
                     selfAid,
@@ -4287,6 +4519,7 @@ export class ResponseEngine {
                     causation: taskCausation,
                 };
                 this.activeTaskRuntimeContexts.set(session.id, taskRuntimeContext);
+                this.debugWriteSessionSnapshot(session.id, taskRuntimeContext);
                 runtimeEnv = buildTaskRuntimeEnv(taskRuntimeContext);
                 if (this.agentDelegationRegistry && configActorId && selfAid && peerKey) {
                     const delegationToken = this.agentDelegationRegistry.issue({
@@ -4300,7 +4533,9 @@ export class ResponseEngine {
                         selfAid,
                         peerKey,
                         issuedRole: peerRole,
+                        executionSource: fullAccessAuthorization?.source ?? (message.source === 'trigger' ? 'trigger' : 'user'),
                         permissionMode: effectivePermissionMode,
+                        approvalInteractionPolicy,
                         ...(sessionRuntimeDir ? { sessionRuntimeDir } : {}),
                         ...(fullAccessAuthorization ? { executionIdentity: fullAccessAuthorization } : {}),
                     });
@@ -4390,6 +4625,10 @@ export class ResponseEngine {
                             mimeType: image.mimeType,
                         }));
                         debugRunnerModel = modelOverride?.model || agentModel;
+                        if (debugRunnerModel)
+                            this.activeRunnerModels.set(session.id, debugRunnerModel);
+                        else
+                            this.activeRunnerModels.delete(session.id);
                         const stream = await agent.runQuery(session.id, effectivePrompt, absoluteProjectPath, runAgentSessionId, runnerImages, effectiveSystemPrompt, this.sessionManager, modelOverride, runtimeEnv);
                         // The turn may be superseded while the runner is still creating its
                         // backend query. Replay the interrupt after runQuery resolves, when
@@ -4685,6 +4924,7 @@ export class ResponseEngine {
                     this.sessionManager.clearProcessingIfTask(session.id, taskId);
                     if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                         this.activeTaskRuntimeContexts.delete(session.id);
+                        this.activeRunnerModels.delete(session.id); // F1修复
                     }
                     this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                     logger.info(`[ResponseEngine] Stale turn stopped before publish: session=${session.id} task=${taskId}`);
@@ -4700,6 +4940,7 @@ export class ResponseEngine {
                         this.sessionManager.clearProcessingIfTask(session.id, taskId);
                         if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                             this.activeTaskRuntimeContexts.delete(session.id);
+                            this.activeRunnerModels.delete(session.id); // F1修复
                         }
                         this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                         logger.info(`[ResponseEngine] Stale turn stopped before protocol rejection: session=${session.id} task=${taskId}`);
@@ -4851,9 +5092,10 @@ export class ResponseEngine {
                 });
             }
             // 最终回复文本：suppressed 模式或无 text 事件时需要兜底添加
+            // 错误诊断串已通过 system.error 单独发出时置 true，下游跳过 result.error 避免重复
+            let sentErrorAsSystemError = false;
             const finalReplyText = streamResult.lastReplyText || streamResult.fullText;
             const visibleFinalReplyText = stripContextLimitErrorLines(finalReplyText);
-            const isDiagnosticFallback = streamResult.isError && !streamResult.hasReceivedText;
             const isTriggerNoop = message.source === 'trigger'
                 && typeof message.triggerMeta?.noopSentinel === 'string'
                 && message.triggerMeta.noopSentinel.length > 0
@@ -4863,16 +5105,38 @@ export class ResponseEngine {
                 this.sessionManager.clearProcessingIfTask(session.id, taskId);
                 if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                     this.activeTaskRuntimeContexts.delete(session.id);
+                    this.activeRunnerModels.delete(session.id); // F1修复
                 }
                 this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                 logger.info(`[ResponseEngine] Stale turn stopped before final flush: session=${session.id} task=${taskId}`);
                 await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_turn', taskCausation);
                 return;
             }
-            if (visibleFinalReplyText && !isDiagnosticFallback && !isTriggerNoop) {
+            if ((visibleFinalReplyText || streamResult.syntheticDiagnosticText) && !isTriggerNoop) {
                 // `hasReceivedText` 是任务级计数。工具调用前的文字已经显示，并不表示最后一轮
                 // （通常来自 complete.result）的文字也已显示；用本轮投影标记避免终态丢失。
-                if (shouldSuppress() || !streamResult.hasProjectedCurrentReplyText) {
+                //
+                // 终态路由按"本轮是否以错误收场"（isError）判定，不再按"有没有收到过文本"判定。
+                // 原因：上游会把错误原文当正文送进来——Claude Code 用 `<synthetic>` assistant 表达
+                // 传输/API 故障（runner 已标 synthetic，见上方 text 分支），网关也会把上下文超限错误
+                // 伪装成 text event。这两种情况下 hasReceivedText / lastReplyText 都非空，旧判据
+                // （isError && !lastReplyText）拦不住，错误串会被当成模型的最终回复发出去
+                // （2026-10-11 403「无法连接到积分服务器」案例）。
+                // 以错误收场的轮次一律走 system.error：前端收到的单条消息即可判断来源，
+                // 不需要等后续的 result.error。
+                const errorText = visibleFinalReplyText || streamResult.syntheticDiagnosticText || getStreamErrorMessage(streamResult, false);
+                if (streamResult.isError) {
+                    // 用原始诊断文本（含错误码）判断可重试性，不用已过 stripContextLimitErrorLines 的展示文本
+                    const recoverable = isRetryableError(new Error(getStreamErrorText(streamResult)));
+                    await adapter.send(envelope, {
+                        kind: 'system.error',
+                        text: errorText,
+                        subtype: streamResult.subtype ?? 'api_error',
+                        recoverable,
+                    }).catch(() => { });
+                    sentErrorAsSystemError = true;
+                }
+                else if (visibleFinalReplyText && (shouldSuppress() || !streamResult.hasProjectedCurrentReplyText)) {
                     await renderer.addText(visibleFinalReplyText, undefined, undefined, streamResult.assistantUuid);
                 }
             }
@@ -4882,6 +5146,7 @@ export class ResponseEngine {
             this.sessionManager.clearProcessingIfTask(session.id, taskId);
             if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                 this.activeTaskRuntimeContexts.delete(session.id);
+                this.activeRunnerModels.delete(session.id); // F1修复
             }
             this.agentDelegationRegistry?.revokeTask(session.id, taskId);
             logger.info(`[ResponseEngine] session ${session.id} processing cleared task=${taskId}`);
@@ -4972,12 +5237,17 @@ export class ResponseEngine {
                     // DaemonChannel settles a trigger when it receives a terminal
                     // payload. Send the metadata-bearing status first so failed runs do
                     // not lose their tool counts and recovery diagnostics.
+                    // system.error 已在 finalReplyText 分支把错误文本发给了前端，不再重复发 result.error
                     if (this.isTrustedDaemonTrigger(message)) {
                         await adapter.send(envelope, { kind: 'status.error', metadata: terminalMetadata }).catch(() => { });
-                        await adapter.send(envelope, { kind: 'result.error', text: userErrorSummary, reason: rawSubtype }).catch(() => { });
+                        if (!sentErrorAsSystemError) {
+                            await adapter.send(envelope, { kind: 'result.error', text: userErrorSummary, reason: rawSubtype }).catch(() => { });
+                        }
                     }
                     else {
-                        await adapter.send(envelope, { kind: 'result.error', text: userErrorSummary, reason: rawSubtype }).catch(() => { });
+                        if (!sentErrorAsSystemError) {
+                            await adapter.send(envelope, { kind: 'result.error', text: userErrorSummary, reason: rawSubtype }).catch(() => { });
+                        }
                         await adapter.send(envelope, { kind: 'status.error', metadata: terminalMetadata }).catch(() => { });
                     }
                     this.touchAgentActivity(channelKey);
@@ -5230,6 +5500,7 @@ export class ResponseEngine {
                 }
                 if (!interruptReason) {
                     this.publishTriggerExecutionCompleted(message, messageId, durationMs, taskCausation);
+                    this.publishBgSessionCompleted(message, messageId, durationMs, taskCausation);
                 }
                 if (!this.turnCoordinator.canPublish(turnLease))
                     return;
@@ -5319,6 +5590,7 @@ export class ResponseEngine {
                 this.sessionManager.clearProcessingIfTask(session.id, taskId);
                 if (this.activeTaskRuntimeContexts.get(session.id)?.taskId === taskId) {
                     this.activeTaskRuntimeContexts.delete(session.id);
+                    this.activeRunnerModels.delete(session.id); // F1修复
                 }
                 this.agentDelegationRegistry?.revokeTask(session.id, taskId);
                 logger.info(`[ResponseEngine] session ${session.id} processing cleared (on error) task=${taskId}`);
@@ -5870,6 +6142,9 @@ export class ResponseEngine {
         });
         // 追踪最后一轮 assistant 回复文本（tool_use 之后的纯文本）
         let lastReplyText = '';
+        // 上游合成错误帧的原文（runner 标记 synthetic 的 text）。与正文通道分开存放：
+        // 它只能作为终态错误文案的来源，不得进入 lastReplyText / 投影 / hasReceivedText。
+        let syntheticDiagnosticText = '';
         // callId → description 映射，用于 tool_result 回显描述
         const toolDescByCallId = new Map();
         const toolInputByCallId = new Map();
@@ -5932,14 +6207,23 @@ export class ResponseEngine {
                 if (event.type === 'input_accepted') {
                     inputAccepted = !turnLease || event.inputId === turnLease.inputId;
                     logger.debug(`[ResponseEngine] Input accepted: session=${session.id} input=${event.inputId}`);
+                    // 通知队列：本批次输入已真正提交给模型，此后不可回队重放。
+                    this.messageQueue?.markInputSubmitted?.(session.id, turnLease?.taskId);
                     continue;
                 }
                 if (event.type === 'text') {
-                    if (event.text.trim())
+                    const hasText = !!event.text.trim();
+                    // 模型已产出文本 ⇒ 输入必然已被消费。覆盖不发 input_accepted 的 runner
+                    // （codex/ecagent/gemini），避免它们在 pre-submit 回队时重复用户轮次。
+                    if (hasText)
+                        this.messageQueue?.markInputSubmitted?.(session.id, turnLease?.taskId);
+                    if (hasText)
                         textCount++;
                     assistantUuid = event.assistantUuid ?? assistantUuid;
                 }
                 else if (event.type === 'tool_use') {
+                    // 产生工具调用同样证明输入已被消费，且此时重放会重复发起副作用。
+                    this.messageQueue?.markInputSubmitted?.(session.id, turnLease?.taskId);
                     toolUseCount++;
                     assistantUuid = event.assistantUuid ?? assistantUuid;
                     if (event.callId) {
@@ -6085,6 +6369,7 @@ export class ResponseEngine {
                         toolUseId: event.toolUseId,
                         description: event.description,
                         subagentType: event.subagentType,
+                        taskType: event.taskType,
                         skipTranscript: event.skipTranscript,
                     });
                     this.eventBus.publish({
@@ -6103,15 +6388,21 @@ export class ResponseEngine {
                         causation,
                     });
                     if (!event.skipTranscript) {
-                        renderer.addLifecycle('started', {
-                            scope: 'runner_task',
-                            taskId: event.taskId,
-                            taskKind: event.taskKind,
-                            toolUseId: event.toolUseId,
-                            description: event.description,
-                            subagentType: event.subagentType,
-                            taskType: event.taskType,
-                        }, `${event.taskKind === 'agent' ? 'Agent' : 'Background'} task started: ${event.description}`);
+                        // 子任务就是来源工具调用的执行过程：来源卡片在本轮可见时归拢进它的 tool_result，
+                        // 不另出卡片；否则（如 Codex 子智能体无来源工具）退回合成卡片。见 subtask-tool-projection.ts。
+                        const folded = renderer.beginParentSubtask(event.toolUseId);
+                        tasks.get(event.taskId).projection = folded ? 'parent' : 'synthetic';
+                        if (!folded) {
+                            renderer.addSubtaskActivity(projectSubtaskStarted({
+                                taskId: event.taskId,
+                                taskKind: event.taskKind,
+                                description: event.description,
+                                taskType: event.taskType,
+                                subagentType: event.subagentType,
+                                toolUseId: event.toolUseId,
+                                workflowName: event.workflowName,
+                            }));
+                        }
                     }
                     continue;
                 }
@@ -6127,6 +6418,7 @@ export class ResponseEngine {
                 }
                 if (event.type === 'task_notification') {
                     const tasks = this.activeRunnerTasks.get(session.id);
+                    const started = tasks?.get(event.taskId);
                     tasks?.delete(event.taskId);
                     if (tasks?.size === 0)
                         this.activeRunnerTasks.delete(session.id);
@@ -6147,19 +6439,26 @@ export class ResponseEngine {
                         causation,
                     });
                     if (!event.skipTranscript) {
-                        const label = event.description || event.taskId;
-                        renderer.addLifecycle('completed', {
-                            scope: 'runner_task',
-                            taskId: event.taskId,
-                            taskKind: event.taskKind,
-                            toolUseId: event.toolUseId,
-                            description: event.description,
-                            subagentType: event.subagentType,
-                            status: event.status,
-                            outputFile: event.outputFile,
-                            summary: event.summary,
-                            usage: event.usage,
-                        }, `${event.taskKind === 'agent' ? 'Agent' : 'Background'} task ${event.status}: ${label}`);
+                        const terminal = { status: event.status, summary: event.summary, durationMs: event.usage?.durationMs };
+                        const toolUseId = event.toolUseId ?? started?.toolUseId;
+                        // 归拢的子任务：终态合并进来源工具的 tool_result（前台等真实结果、后台放出扣住的占位结果）。
+                        const merged = started?.projection === 'parent' && renderer.endParentSubtask(toolUseId, terminal);
+                        if (!merged) {
+                            // 没归拢上：开始时就是合成卡片，则终态配同一张合成卡片；
+                            // 否则来源卡片已在本轮之外，补发一条同 call_id 的终态结果更新那张卡片。
+                            // taskType/subagentType 只在 task_started 事件上，从已登记的任务元数据补齐。
+                            const toParent = started?.projection !== 'synthetic' && !!toolUseId;
+                            renderer.addSubtaskActivity(projectSubtaskTerminal({
+                                taskId: event.taskId,
+                                taskKind: event.taskKind,
+                                description: event.description ?? started?.description,
+                                taskType: started?.taskType,
+                                subagentType: event.subagentType ?? started?.subagentType,
+                                toolUseId,
+                                ...terminal,
+                                ...(toParent ? { callId: toolUseId, toolName: renderer.toolNameForCall(toolUseId) } : {}),
+                            }));
+                        }
                     }
                     continue;
                 }
@@ -6196,21 +6495,30 @@ export class ResponseEngine {
                 if (!isCurrentlyBackground) {
                     // 流式文本
                     if (event.type === 'text') {
-                        // 网关偶尔会把上下文超限错误伪装成普通 text event。不要向事件总线或
-                        // 渲染器投影错误行；lastReplyText 仍保留原文本，以便流结束后触发恢复。
-                        const visibleText = stripContextLimitErrorLines(event.text);
-                        if (visibleText) {
-                            hasReceivedText = true;
-                            if (visibleText.trim())
-                                madeProgress = true;
-                        }
-                        lastReplyText += event.text;
-                        if (visibleText) {
-                            this.eventBus.publish({ type: 'message:text', sessionId: session.id, text: visibleText, isFinal: false });
+                        // 上游合成错误帧（Claude Code 的 `<synthetic>` assistant）会把 API/传输故障的
+                        // 错误原文当成正文送进来。这段字是诊断回显，不是模型正文——出身由 runner 标注，
+                        // 不靠字符串或计数猜。不进入正文通道（lastReplyText / hasReceivedText / 投影），
+                        // 只单独留存，供终态错误分支取用。
+                        if (event.synthetic) {
+                            syntheticDiagnosticText = event.text;
                         }
-                        if (visibleText && !shouldSuppress()) {
-                            await renderer.addText(visibleText, event.outputTokens, event.turn, event.assistantUuid, event.phase);
-                            hasProjectedCurrentReplyText = true;
+                        else {
+                            // 网关偶尔会把上下文超限错误伪装成普通 text event。不要向事件总线或
+                            // 渲染器投影错误行；lastReplyText 仍保留原文本，以便流结束后触发恢复。
+                            const visibleText = stripContextLimitErrorLines(event.text);
+                            if (visibleText) {
+                                hasReceivedText = true;
+                                if (visibleText.trim())
+                                    madeProgress = true;
+                            }
+                            lastReplyText += event.text;
+                            if (visibleText) {
+                                this.eventBus.publish({ type: 'message:text', sessionId: session.id, text: visibleText, isFinal: false });
+                            }
+                            if (visibleText && !shouldSuppress()) {
+                                await renderer.addText(visibleText, event.outputTokens, event.turn, event.assistantUuid, event.phase);
+                                hasProjectedCurrentReplyText = true;
+                            }
                         }
                     }
                     // compact 完成
@@ -6302,6 +6610,7 @@ export class ResponseEngine {
                                 state: modeHooks.state,
                                 sessionState: modeHooks.sessionState,
                                 turn: turnLease,
+                                modelTurn: typeof event.turn === 'number' ? event.turn : undefined,
                                 toolName: event.name,
                                 toolInput: event.input || {},
                                 injectToModel: (text) => { agent.injectUserMessage?.(session.id, text); },
@@ -6316,7 +6625,7 @@ export class ResponseEngine {
                                     });
                                 },
                                 getQueueLength: () => this.messageQueue?.getQueueLength(session.id) ?? 0,
-                                isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID),
+                                isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID) || isThreadRoutedSendForSelf(toolName, toolInput, proactiveSelfAid || session.selfAID),
                                 logger,
                             });
                         }
@@ -6436,7 +6745,7 @@ export class ResponseEngine {
                                     });
                                 },
                                 getQueueLength: () => this.messageQueue?.getQueueLength(session.id) ?? 0,
-                                isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID),
+                                isSendCommand: (toolName, toolInput) => isExactEvolcoreSendCommandForSession(toolName, toolInput, session.channelId, proactiveState?.chatType === 'group' ? 'group' : 'private', proactiveSelfAid || session.selfAID) || isThreadRoutedSendForSelf(toolName, toolInput, proactiveSelfAid || session.selfAID),
                                 logger,
                             });
                         }
@@ -6474,6 +6783,7 @@ export class ResponseEngine {
                             errors: [event.error],
                             lastReplyText,
                             fullText: '',
+                            syntheticDiagnosticText,
                         };
                     }
                     // 完成事件
@@ -6488,7 +6798,7 @@ export class ResponseEngine {
                             logger.info(`[ResponseEngine] Auto-filled session name: ${event.sessionTitle}`);
                         }
                         // 记录完成状态 + 最后一轮回复文本（后续 complete 覆盖前序）
-                        completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, numTurns: event.numTurns, ttftMs: event.ttftMs, model: event.model, tokenUsage: event.tokenUsage, contextUsage: event.contextUsage, lastModelCall: event.lastModelCall, modelCalls: event.modelCalls };
+                        completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, numTurns: event.numTurns, ttftMs: event.ttftMs, model: event.model, tokenUsage: event.tokenUsage, contextUsage: event.contextUsage, lastModelCall: event.lastModelCall, modelCalls: event.modelCalls, syntheticDiagnosticText };
                         if (!event.isError)
                             madeProgress = true;
                         // thought jsonl 写入已下沉到 aun.ts:sendThought 成功后，
@@ -6539,7 +6849,7 @@ export class ResponseEngine {
                     logger.info(`[ResponseEngine] Auto-filled session name: ${event.sessionTitle}`);
                 }
                 // 记录完成状态
-                completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, numTurns: event.numTurns, ttftMs: event.ttftMs, model: event.model, tokenUsage: event.tokenUsage, contextUsage: event.contextUsage, lastModelCall: event.lastModelCall };
+                completeResult = { isError: !!event.isError, subtype: event.subtype, errors: event.errors, terminalReason: event.terminalReason, lastReplyText, fullText: event.result || '', hasReceivedText, syntheticDiagnosticText, numTurns: event.numTurns, ttftMs: event.ttftMs, model: event.model, tokenUsage: event.tokenUsage, contextUsage: event.contextUsage, lastModelCall: event.lastModelCall };
                 if (event.subtype === 'success')
                     madeProgress = true;
             }