evolcore 0.0.35 → 0.0.36

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

@@ -1,4 +1,5 @@
 import { initializationBlocksTasks } from '../../cli/agent-create.js';
+import { assertOwnershipAuthorization, getDaemonOwners, refreshOwnershipForAuthorization, OWNERSHIP_CACHE_MAX_AGE_MS } from '../ownership/owner-resolver.js';
 import path from 'path';
 import fs from 'fs';
 import os from 'os';
@@ -24,7 +25,8 @@ import { ExecutionTimeoutError, OrphanedTargetSessionError, isExecutionFailure,
 import { readEvolcoreRuntimeFlavor, tagErrorTextWithEvolcoreVersion } from '../../utils/evolcore-version.js';
 import { describeProactiveSendCommandFailure, isExactEvolcoreSendCommandForSession, isThreadRoutedEvolcoreSendCommand, parseCodexToolCommand, resolveCodexShellCarrierArgv, resolveCodexShellCarrierString, } from '../permission/ec-command-parser.js';
 import { resolveThreadRouteTarget } from '../thread/thread-route.js';
-import { summarizeToolInputForDisplay } from '../../utils/tool-summary.js';
+import { isMainSession, isTopicSession, isTopicThreadId, sessionLocalTopicId, sessionTopicThreadId } from '../thread/topic-id.js';
+import { summarizeToolInputForDisplay, toolInputForDisplay } from '../../utils/tool-summary.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';
@@ -65,10 +67,13 @@ import { normalizeToolErrorClassification } from '../permission/tool-error-code.
 import { normalizeExecutionPermissionMode } from '../permission/mode.js';
 import { buildToolLifecycleEventKey } from '../audit/event-key.js';
 import { aunMessageTranscriptUuid } from '../session/session-transcript.js';
-import { loadDaemonConfig } from '../../config-store.js';
 import { assertAgentPolicyAuthorization } from '../role/runtime-policy.js';
 import { auditFullAccessEvent } from '../auth/authorization-audit.js';
-import { TaskRecoveryService, isTaskRecoveryCurrent } from '../task/task-recovery-service.js';
+import { REPLY_DELIVERY_FAILED_REASON, TaskRecoveryService, isTaskRecoveryCurrent } from '../task/task-recovery-service.js';
+/** Resolve the channel type separately from a channel instance name. */
+export function resolveMessageChannelType(options, message) {
+    return options?.channelType || message.channelType || message.channel;
+}
 const QUESTION_TTL_MS = 24 * 60 * 60 * 1000;
 /** Pending async questions outlive the originating turn, but never change its backend binding. */
 /** 带 --thread 的跨话题发送：话题存在于本端索引且目标一致时视为合法发送。 */
@@ -136,7 +141,7 @@ export class AsyncQuestionService {
                 continue;
             const replyContext = {
                 delivery: envelope.delivery ?? envelope.replyContext?.delivery,
-                threadId: session.threadId || undefined,
+                threadId: sessionTopicThreadId(session),
                 metadata: {
                     encrypted: message.encrypted ?? envelope.replyContext?.metadata?.encrypted,
                     chatmode: envelope.chatmode,
@@ -150,7 +155,7 @@ export class AsyncQuestionService {
                     channel: message.channel, channelType: session.channelType,
                     channelId: session.channelId, peerId: message.peerId, peerType: message.peerType,
                     chatType: session.chatType === 'group' ? 'group' : 'private',
-                    threadId: session.threadId || undefined, selfAID: session.selfAID,
+                    threadId: sessionTopicThreadId(session), selfAID: session.selfAID,
                 },
                 envelope: { ...envelope, sessionId: session.id, replyContext, delivery: replyContext.delivery },
                 channelKey: adapter.channelKey, createdAt: Date.now(), expiresAt: Date.now() + QUESTION_TTL_MS,
@@ -217,7 +222,7 @@ export class AsyncQuestionService {
             || session.channel !== record.origin.channel
             || session.channelType !== record.origin.channelType
             || session.channelId !== record.origin.channelId
-            || (session.threadId || '') !== (record.origin.threadId || '')
+            || (sessionTopicThreadId(session) ?? '') !== (record.origin.threadId || '')
             || !(await this.deps.authorize(record, session)))
             return undefined;
         return session;
@@ -327,11 +332,18 @@ export class AsyncQuestionService {
             },
         });
         try {
-            const receipt = await sendInteractionPayload(adapter, {
-                ...record.envelope, operationId: `${record.id}-${Date.now()}`,
-            }, interaction, renderActionAsText(interaction), record.envelope.replyContext);
+            const envelope = { ...record.envelope, operationId: record.id };
+            const receipt = await adapter.restoreInteraction?.(envelope, interaction, record.deliveryReceipt)
+                ?? await sendInteractionPayload(adapter, envelope, interaction, renderActionAsText(interaction), record.envelope.replyContext);
             if (!isInteractionSendAccepted(receipt))
                 throw new Error('Async question card was not accepted for delivery');
+            if (typeof receipt === 'object' && (receipt.status === 'sent' || receipt.status === 'queued')) {
+                const current = this.read(record.selfAid, record.id);
+                if (current) {
+                    current.deliveryReceipt = receipt;
+                    this.save(current);
+                }
+            }
         }
         catch (error) {
             // Keep the durable pending record for a later channel reconnect/daemon restore.
@@ -418,6 +430,7 @@ function isShowActivitiesMode(value) {
 }
 const TOOL_INPUT_DIAGNOSTIC_MAX_LENGTH = 96_000;
 const TOOL_INPUT_DIAGNOSTIC_MAX_FINDINGS = 3;
+const TOOL_INPUT_DIAGNOSTIC_MAX_SHELL_DEPTH = 4;
 const TOOL_INPUT_DIAGNOSTIC_TIMEOUT_MS = 1_000;
 function isToolResultFailure(event) {
     return event.isError === true
@@ -595,49 +608,59 @@ function diagnosticLocation(source, startOffset, endOffset = startOffset) {
 function diagnosticFinding(ruleId, title, advice, confidence, source, startOffset, endOffset) {
     return { ruleId, title, advice, confidence, location: diagnosticLocation(source, startOffset, endOffset) };
 }
-function diagnosticCandidates(input) {
+function diagnosticCandidate(source, command = source.value, shellDepth = 0) {
+    while (shellDepth < TOOL_INPUT_DIAGNOSTIC_MAX_SHELL_DEPTH) {
+        const carrier = resolveCodexShellCarrierString(command);
+        if (!carrier)
+            break;
+        command = carrier.command;
+        shellDepth++;
+    }
+    const commandOffset = source.value.lastIndexOf(command);
+    if (commandOffset < 0)
+        return undefined;
+    return { source, command, commandOffset, carrier: shellDepth > 0, nestedShell: shellDepth > 1 };
+}
+function diagnosticCandidates(input, displayInput) {
     const candidates = [];
-    if (typeof input.command === 'string' && boundedDiagnosticInput(input.command)) {
-        const source = { field: 'command', value: input.command };
-        const carrier = resolveCodexShellCarrierString(input.command);
-        if (carrier) {
-            const commandOffset = input.command.indexOf(carrier.command);
-            candidates.push({
-                source,
-                command: carrier.command,
-                commandOffset: commandOffset >= 0 ? commandOffset : 0,
-                carrier: true,
-            });
-        }
-        else {
-            candidates.push({ source, command: input.command, commandOffset: 0, carrier: false });
-        }
+    if (typeof displayInput.command === 'string' && boundedDiagnosticInput(displayInput.command)) {
+        const source = { field: 'command', value: displayInput.command };
+        const rawCarrier = typeof input.command === 'string'
+            ? resolveCodexShellCarrierString(input.command)
+            : undefined;
+        const candidate = diagnosticCandidate(source, rawCarrier?.command ?? source.value, rawCarrier ? 1 : 0);
+        if (candidate)
+            candidates.push(candidate);
     }
     if (isStringArgv(input.commandArgv) && input.commandArgv.every(boundedDiagnosticInput)) {
         const carrier = resolveCodexShellCarrierArgv(input.commandArgv);
         if (carrier) {
             const argumentIndex = input.commandArgv.length - 1;
-            candidates.push({
-                source: { field: 'commandArgv', value: input.commandArgv[argumentIndex], argumentIndex },
-                command: carrier.command,
-                commandOffset: 0,
-                carrier: true,
-            });
+            const candidate = diagnosticCandidate({ field: 'commandArgv', value: input.commandArgv[argumentIndex], argumentIndex }, carrier.command, 1);
+            if (candidate)
+                candidates.push(candidate);
         }
         else {
             const argumentIndex = 0;
-            if (findApplyPatchArgumentsOffset(input.commandArgv[argumentIndex] ?? '') >= 0) {
-                candidates.push({
-                    source: { field: 'commandArgv', value: input.commandArgv[argumentIndex], argumentIndex },
-                    command: input.commandArgv[argumentIndex],
-                    commandOffset: 0,
-                    carrier: false,
+            if (findApplyPatchArgumentsOffset(input.commandArgv[argumentIndex] ?? '') >= 0
+                && input.commandArgv.slice(1).every(value => value.trim() === '')) {
+                const candidate = diagnosticCandidate({
+                    field: 'commandArgv', value: input.commandArgv[argumentIndex], argumentIndex,
                 });
+                if (candidate)
+                    candidates.push(candidate);
             }
         }
     }
     return candidates;
 }
+function addApplyPatchMissingDocumentFinding(findings, candidate) {
+    const argumentsOffset = findApplyPatchArgumentsOffset(candidate.command);
+    if (argumentsOffset < 0 || candidate.command.slice(argumentsOffset).trim().length > 0)
+        return;
+    const executableStart = candidate.command.length - candidate.command.trimStart().length;
+    findings.push(diagnosticFinding('apply-patch-missing-document', 'apply_patch 缺少完整补丁文档', '提交完整补丁文档，并以 *** Begin Patch 开头、以 *** End Patch 结尾。', '高', candidate.source, candidate.commandOffset + executableStart, candidate.commandOffset + argumentsOffset));
+}
 function addHeredocDiagnosticFindings(findings, candidate) {
     const argumentsOffset = findApplyPatchArgumentsOffset(candidate.command);
     if (argumentsOffset < 0)
@@ -673,11 +696,11 @@ function addApplyPatchCompositionFinding(findings, candidate) {
     findings.push(diagnosticFinding('apply-patch-composed-command', 'apply_patch 与其它 Shell 命令组合提交', '一次工具调用只提交完整的 apply_patch；测试、检查或其它命令另行调用。', '高', candidate.source, candidate.commandOffset + separator, candidate.commandOffset + separator + 1));
 }
 function addNestedShellDiagnosticFinding(findings, candidate) {
-    if (!candidate.carrier || findApplyPatchArgumentsOffset(candidate.command) < 0)
+    if (!candidate.nestedShell || findApplyPatchArgumentsOffset(candidate.command) < 0)
         return;
     findings.push(diagnosticFinding('nested-shell-escaping-risk', '命令包含嵌套 Shell 包装层', '尽量直接提交单层 Shell 命令；需要 heredoc 或 JSON 时，减少外层转义和包装。', '中', candidate.source, candidate.commandOffset, candidate.commandOffset + candidate.command.length));
 }
-function addJsonArrayDiagnosticFinding(findings, input) {
+function addJsonArrayDiagnosticFinding(findings, input, displayInput) {
     const rawArgv = isStringArgv(input.commandArgv) ? input.commandArgv : undefined;
     const parsedArgv = rawArgv ?? (typeof input.command === 'string'
         ? (() => {
@@ -694,7 +717,7 @@ function addJsonArrayDiagnosticFinding(findings, input) {
     const value = parsedArgv[6];
     const source = rawArgv
         ? { field: 'commandArgv', value: rawArgv[6] ?? '', argumentIndex: 6 }
-        : { field: 'command', value: typeof input.command === 'string' ? input.command : '' };
+        : { field: 'command', value: typeof displayInput.command === 'string' ? displayInput.command : '' };
     if (value === undefined) {
         findings.push(diagnosticFinding('json-array-argument-missing', 'tags 参数缺少完整 JSON 数组值', '将 tags 作为一个完整参数传入，例如 PowerShell 使用单引号包住 ["DSH","AUN"]。', '高', source, source.value.length));
         return;
@@ -713,7 +736,7 @@ function addJsonArrayDiagnosticFinding(findings, input) {
         && (value.startsWith('[') || value.endsWith(','));
     findings.push(diagnosticFinding(split ? 'json-array-argument-splitting' : 'json-array-argument-invalid', split ? 'tags 的 JSON 数组疑似被拆成多个参数' : 'tags 参数不是可解析的 JSON 字符串数组', '保证整个 JSON 数组位于同一个参数中；PowerShell 普通单引号字符串内不要再添加反斜杠转义。', split ? '中' : '高', source, split ? source.value.length : 0, source.value.length));
 }
-function addCommandArgvMismatchFinding(findings, input) {
+function addCommandArgvMismatchFinding(findings, input, displayInput) {
     if (typeof input.command !== 'string' || !isStringArgv(input.commandArgv))
         return;
     const commandArgv = input.commandArgv;
@@ -725,7 +748,8 @@ function addCommandArgvMismatchFinding(findings, input) {
     if (!parsed.ok || parsed.argv.length === commandArgv.length
         && parsed.argv.every((value, index) => value === commandArgv[index]))
         return;
-    findings.push(diagnosticFinding('command-argv-mismatch', 'command 与 commandArgv 的解析结果不一致', '以执行器提供的结构化 commandArgv 为准，避免在外层重新拼接或改写命令文本。', '中', { field: 'command', value: input.command }, 0, input.command.length));
+    const displayCommand = typeof displayInput.command === 'string' ? displayInput.command : input.command;
+    findings.push(diagnosticFinding('command-argv-mismatch', 'command 与 commandArgv 的解析结果不一致', '以执行器提供的结构化 commandArgv 为准，避免在外层重新拼接或改写命令文本。', '中', { field: 'command', value: displayCommand }, 0, displayCommand.length));
 }
 function deduplicateDiagnosticFindings(findings) {
     const seen = new Set();
@@ -749,21 +773,23 @@ function diagnoseToolInput(original, event, deadline) {
             return undefined;
         }
     }
-    const candidates = diagnosticCandidates(input);
+    const displayInput = toolInputForDisplay(original.name, input) ?? input;
+    const candidates = diagnosticCandidates(input, displayInput);
     if (Date.now() > deadline)
         return undefined;
     const findings = [];
     for (const candidate of candidates) {
         if (Date.now() > deadline)
             return undefined;
+        addApplyPatchMissingDocumentFinding(findings, candidate);
         addHeredocDiagnosticFindings(findings, candidate);
         addApplyPatchCompositionFinding(findings, candidate);
         addNestedShellDiagnosticFinding(findings, candidate);
     }
     if (Date.now() <= deadline)
-        addJsonArrayDiagnosticFinding(findings, input);
+        addJsonArrayDiagnosticFinding(findings, input, displayInput);
     if (Date.now() <= deadline)
-        addCommandArgvMismatchFinding(findings, input);
+        addCommandArgvMismatchFinding(findings, input, displayInput);
     if (Date.now() > deadline)
         return undefined;
     const deduplicated = deduplicateDiagnosticFindings(findings);
@@ -944,7 +970,10 @@ function formatRetryInputAlreadySubmittedMessage(error) {
     if (retryCount !== undefined) {
         return `⚠️ Codex 已重连 ${retryCount} 次模型服务后仍失败。本次执行已停止。`;
     }
-    return '⚠️ Codex 已接收本次消息，但模型服务请求失败。本次执行已停止。';
+    // 无重试进度可报时，说明输入已提交但终态未确认：明确告知未自动重试，
+    // 避免用户误以为系统会在后台继续。
+    const reason = getErrorMessage(error, undefined, false) || 'Codex 暂时不可用';
+    return `⚠️ ${reason}\n当前输入已经提交，但本轮未能确认完成。系统未自动重试，请检查会话状态后再决定是否重试。`;
 }
 function isNonErrorInterruptReason(reason) {
     return reason === 'new_message'
@@ -1007,9 +1036,10 @@ function formatProtocolReplayExhaustedMessage(reason, replayAttempts) {
     return `${detail}（${reason}），已立即重试 ${replayAttempts} 次仍失败，任务未提交。\n请稍后重试；若持续出现，请切换模型或向上游服务商提供错误代码和发生时间。`;
 }
 function withFallbackModel(override, candidate) {
-    const { model: _model, effort: _effort, effortMode: _effortMode, ...preserved } = override || {};
+    const { model: _model, provider: _provider, effort: _effort, effortMode: _effortMode, ...preserved } = override || {};
     return {
         ...preserved,
+        ...(candidate.provider ? { provider: candidate.provider } : {}),
         model: candidate.model,
         ...(candidate.effort ? { effort: candidate.effort } : { effortMode: 'model_default' }),
     };
@@ -1109,6 +1139,9 @@ function mergeContextRecoveryResult(previous, next) {
 function isStandaloneContextLimitErrorLine(line) {
     return /^(?:(?:api )?error\s*:\s*)?(?:prompt is too long|input is too long|context too long|context_length_exceeded|context_window_exceeded|context window limit|maximum context length|上下文过长)\s*[.!。]?$/i.test(line.trim());
 }
+function stripThinkingBlocks(text) {
+    return text.replace(/<thinking>[\s\S]*?<\/thinking>/gi, '');
+}
 /**
  * 网关有时把上下文超限错误包装进 text event。只丢弃独立错误行，保留同一 event
  * 中其它行及包含错误字面量的正常输出；原文本仍由调用方保留作恢复判定。
@@ -1211,6 +1244,7 @@ export class ResponseEngine {
     agentMap;
     legacySingleRunnerMode;
     primaryRunnerKey;
+    daemonTriggerOwnerAid;
     interruptedSessions = new Map(); // sessionId → reason ('new_message' | 'stop' | ...)
     timeoutErrors = new Map();
     activeTimeoutHandlers = new Map();
@@ -1262,6 +1296,17 @@ export class ResponseEngine {
             && this.agentMap.values().next().value?.name === requestedBaseagent) {
             return this.agentMap.values().next().value;
         }
+        // The daemon scheduler has no Agent registry entry. Its runner owner is
+        // explicitly bound at startup, so multiple Agents using the same backend
+        // cannot make host-owned Trigger sessions ambiguous.
+        if (channel === 'daemon' && this.daemonTriggerOwnerAid
+            && selfAID === this.daemonTriggerOwnerAid && requestedBaseagent) {
+            const ownerName = this.primaryRunnerKey.slice(0, this.primaryRunnerKey.lastIndexOf('::'));
+            const runner = this.agentMap.get(`${ownerName}::${requestedBaseagent}`);
+            if (runner)
+                return runner;
+            throw new BaseagentRunnerUnavailableError(ownerName, requestedBaseagent, this.getAvailableBaseagentsForOwner(ownerName));
+        }
         if (selfAID && requestedBaseagent) {
             const key = `${selfAID}::${requestedBaseagent}`;
             if (this.agentMap.has(key))
@@ -1301,7 +1346,7 @@ export class ResponseEngine {
         if (!aid)
             return undefined;
         const config = resolveEffective({ self: aid }, { cache: true, expand: true });
-        return createDecisionInferenceProvider(config.decision_model);
+        return createDecisionInferenceProvider(config.decision_model, config.Services);
     }
     getAvailableBaseagentsForOwner(evolName) {
         return loadedBaseagentIds(this.agentMap.keys(), evolName);
@@ -1350,7 +1395,8 @@ export class ResponseEngine {
     }
     /** 判断是否为后台会话（仅主会话参与判断，话题会话独立） */
     isBackgroundSession(session, _channel, _channelId) {
-        if (session.threadId)
+        // 只有话题会话是独立的；主话题（含规范 id）仍是这条关系的主会话。
+        if (isTopicSession(session))
             return false;
         // 使用 session 自身的 channelType 精确定位 active.json，避免扫描误匹配
         const active = this.sessionManager.getActiveSessionSync(session.channel, session.channelId, session.channelType, session.selfAID);
@@ -1578,12 +1624,12 @@ export class ResponseEngine {
         }
     }
     async observerTargetSession(target) {
-        const session = target.threadId
-            ? await this.sessionManager.getThreadSession(target.channelKey, target.channelId, target.threadId)
+        const session = isTopicThreadId(target.threadId)
+            ? await this.sessionManager.getThreadSession(target.channelKey, target.channelId, String(target.threadId))
             : this.sessionManager.getActiveSessionSync(target.channelKey, target.channelId, 'aun', target.selfAid);
         if (!session || session.deletedAt || session.selfAID !== target.selfAid || session.channel !== target.channelKey
             || session.channelId !== target.channelId || session.chatType !== target.chatType
-            || (session.threadId || '') !== (target.threadId || '')
+            || (sessionTopicThreadId(session) ?? '') !== (target.threadId || '')
             || !this.sessionManager.hasBoundAgentSession(session)
             || (target.chatType === 'group' && (session.metadata?.groupId !== target.channelId
                 || !session.metadata?.observerLastActorId)))
@@ -1640,7 +1686,7 @@ export class ResponseEngine {
                 try {
                     await this.messageQueue.enqueuePersisted(session.id, {
                         channel: session.channel, channelType: 'aun', channelId: session.channelId,
-                        selfAID: session.selfAID, baseagent: session.baseagent, threadId: session.threadId,
+                        selfAID: session.selfAID, baseagent: session.baseagent, threadId: sessionTopicThreadId(session) ?? '',
                         chatType: target.chatType, groupId: target.chatType === 'group' ? target.channelId : undefined,
                         peerId: actorId, peerName: session.metadata?.observerLastPeerName || session.metadata?.peerName,
                         peerType: session.metadata?.observerLastPeerType || session.metadata?.peerType,
@@ -1727,7 +1773,7 @@ export class ResponseEngine {
             return { state: 'terminal', taskId: terminal.taskId, generation: terminal.generation,
                 outcome: terminal.status === 'committed' ? 'completed'
                     : ['cancelled', 'superseded', 'interrupted'].includes(terminal.status) ? 'skipped' : 'failed',
-                reason: terminal.reason };
+                reason: terminal.reason, recoverable: terminal.recoverable };
         }
         const queued = this.messageQueue?.getMessageState(sessionId, attemptId, selfAid);
         if (queued?.state === 'queued')
@@ -1765,9 +1811,9 @@ export class ResponseEngine {
         if (timeout)
             await timeout(error);
         else
-            await this.interruptSession(sessionId, error instanceof OrphanedTargetSessionError ? 'execution_error' : 'timeout');
+            await this.interruptSession(sessionId, error instanceof OrphanedTargetSessionError ? 'execution_error' : 'timeout', false, isRetryableError(error));
     }
-    async interruptSession(sessionId, reason, strict = false) {
+    async interruptSession(sessionId, reason, strict = false, recoverable) {
         this.clearPauseSession(sessionId);
         // A retry delay has no active runner stream to abort. Wake it before any
         // session-store I/O so /stop and a newer message take effect immediately.
@@ -1796,7 +1842,7 @@ export class ResponseEngine {
         // shutdown 超时退出会再次留下 started/interrupting 的悬空任务。
         const runtimeContext = this.activeTaskRuntimeContexts.get(sessionId);
         const taskSpan = this.activeTaskSpans.get(sessionId);
-        const taskId = (await this.turnCoordinator.completeInterrupt(session, effectiveReason))
+        const taskId = (await this.turnCoordinator.completeInterrupt(session, effectiveReason, recoverable))
             ?? interruptedTaskId
             ?? taskSpan?.taskId;
         if (taskId) {
@@ -1841,7 +1887,7 @@ export class ResponseEngine {
                 replyContext: {
                     ...replyContextFromSession(session),
                     sessionId: session.id,
-                    threadId: session.threadId || session.metadata?.replyContext?.threadId,
+                    threadId: sessionTopicThreadId(session) ?? session.metadata?.replyContext?.threadId,
                 },
             });
             const payload = {
@@ -2013,6 +2059,13 @@ export class ResponseEngine {
         for (const { adapter } of this.channels.values())
             this.restoreAsyncQuestions(adapter);
     }
+    /** Bind daemon-owned Trigger sessions to the configured primary runner owner. */
+    setDaemonTriggerOwner(aid) {
+        const normalized = aid.trim();
+        if (!normalized)
+            throw new Error('daemon trigger owner AID is required');
+        this.daemonTriggerOwnerAid = normalized;
+    }
     /** 更新 EvolAgent.lastActivity —— 每次发出 status.* 事件（含 progress）时调用 */
     touchAgentActivity(channelKey) {
         const owning = this.agentRegistry?.resolveByChannel(channelKey);
@@ -2085,10 +2138,10 @@ export class ResponseEngine {
         if (!peerChannelId)
             return { items: [] };
         try {
-            const claim = claimHints(resolvePaths().sessionsDir, 'aun', peerChannelId, selfAID, session.threadId, (message.chatType || session.chatType || 'private'), message.source === 'owner-inject' ? 'interrupt' : 'next', message.observerHintId, session.channel);
+            const claim = claimHints(resolvePaths().sessionsDir, 'aun', peerChannelId, selfAID, (sessionTopicThreadId(session) ?? ''), (message.chatType || session.chatType || 'private'), message.source === 'owner-inject' ? 'interrupt' : 'next', message.observerHintId, session.channel);
             if (claim.hints.length === 0)
                 return { items: [] };
-            logger.info(`[ResponseEngine] claimed ${claim.hints.length} owner-hint(s) for ${peerChannelId} thread=${session.threadId || 'main'}`);
+            logger.info(`[ResponseEngine] claimed ${claim.hints.length} owner-hint(s) for ${peerChannelId} thread=${sessionTopicThreadId(session) ?? 'main'}`);
             return { items: hintsToSubMessages(claim.hints), claim };
         }
         catch (e) {
@@ -2193,7 +2246,7 @@ export class ResponseEngine {
         // while the original override can still describe the pre-run UNBOUND
         // snapshot. Compact and retry must address the accepted backend under the
         // same complete TurnLease or a runner could create a second backend.
-        const recoveryModelOverride = session.threadId
+        const recoveryModelOverride = isTopicSession(session)
             ? {
                 ...(modelOverride || {}),
                 backend: { kind: 'topic', agentSessionId: session.agentSessionId },
@@ -2213,6 +2266,7 @@ export class ResponseEngine {
         this.announcedCompactStarts.add(session.id);
         let compacted;
         try {
+            await beforeRunQuery?.();
             compacted = await agent.compact(session.id, session.agentSessionId, absoluteProjectPath, recoveryModelOverride);
         }
         finally {
@@ -2222,7 +2276,7 @@ export class ResponseEngine {
         if (compactResult === true || compactResult?.ok === true) {
             await this.emitOperationalNotice(renderer, '✅ 压缩完成，继续处理...', 'info', 'compact-retry');
             await renderer.flush();
-            beforeRunQuery?.();
+            await beforeRunQuery?.();
             const retryStream = await agent.runQuery(session.id, insertMessagePromptContext(prompt, messagePromptContext), absoluteProjectPath, session.agentSessionId, undefined, effectiveSystemPrompt, this.sessionManager, recoveryModelOverride, runtimeEnv);
             if (await this.cancelStaleRunnerStart(agent, session.id, streamKey, turnLease, turnLease.taskId)) {
                 throw new Error('RUNNER_START_SUPERSEDED');
@@ -2355,18 +2409,27 @@ export class ResponseEngine {
             return false;
         }
         try {
-            return new Set(loadDaemonConfig().owners ?? []).has(trigger.authorizedBy);
+            return new Set(getDaemonOwners()).has(trigger.authorizedBy);
         }
         catch {
             return false;
         }
     }
+    async assertCurrentExecutionAuthorization(context, agent) {
+        if (context.executionPermission) {
+            await this.assertCurrentFullAccessExecutionAuthorization(context.executionPermission, agent);
+        }
+        else {
+            await assertOwnershipAuthorization(context);
+        }
+    }
     /**
      * The authorization envelope is immutable for one logical run, but the
      * approving owner and runner profile are live policy. Check
      * them immediately before every Runner invocation, including retries.
      */
-    assertCurrentFullAccessExecutionAuthorization(authorization, agent) {
+    async assertCurrentFullAccessExecutionAuthorization(authorization, agent) {
+        await refreshOwnershipForAuthorization(authorization.agentAid);
         if (authorization.permissionMode !== 'fullaccess'
             || authorization.processRole !== 'fullaccess-run'
             || authorization.dataScope !== 'daemon'
@@ -2384,7 +2447,7 @@ export class ResponseEngine {
         else if (authorization.source !== 'fullaccess-command' && authorization.source !== 'trigger') {
             throw new Error('fullaccess execution authorization has an unsupported source');
         }
-        const currentOwners = new Set(loadDaemonConfig().owners ?? []);
+        const currentOwners = new Set(getDaemonOwners());
         if (!currentOwners.has(authorization.authorizedBy)) {
             throw new Error('fullaccess execution authorization is no longer owned');
         }
@@ -2395,6 +2458,13 @@ export class ResponseEngine {
     resolveTriggerExecutionIdentity(message, selfAid) {
         if (message.source !== 'trigger' || !message.triggerMeta?.triggerId)
             return undefined;
+        // 跨话题复查（target_session 投递）：本轮是"T2 侧 agent 被自己的复查通知唤醒"，
+        // 身份就是 T2 会话自身的对端，与普通入站消息一致。
+        // 若沿用 originPeerId（来源话题 T1 的对端），整个轮次的角色与权限都会错位。
+        if (message.triggerMeta.reviewKind === 'cross-thread-review'
+            || message.triggerMeta.labels?.kind === 'cross-thread-review') {
+            return undefined;
+        }
         const actorId = message.triggerMeta.originPeerId;
         const channelType = message.triggerMeta.originChannelType;
         const originChannelKey = message.triggerMeta.originChannelKey;
@@ -2518,6 +2588,7 @@ export class ResponseEngine {
             originTriggerId: trigger.triggerId,
             messageId: opts.messageId ?? message.messageId ?? runId,
             error,
+            recoverable: opts.recoverable ?? isRetryableError(new Error(error)),
             targetChannel: message.channel,
             targetChannelId: message.channelId,
             fireTime: trigger.fireTime ?? 0,
@@ -2691,7 +2762,7 @@ export class ResponseEngine {
         // 先解析会话，再优先用 session.metadata.channelKey 精确定位实例级 adapter
         // message.channel 现在存实例名（channelName），可直接用于精确路由
         const { session, absoluteProjectPath } = await this.resolveSession(message);
-        if (message.source === 'owner-inject' && (!message.observerHintId || !peekHints(resolvePaths().sessionsDir, 'aun', session.channelId, session.selfAID || '', session.threadId, session.chatType, 'interrupt', session.channel).some(item => item.id === message.observerHintId))) {
+        if (message.source === 'owner-inject' && (!message.observerHintId || !peekHints(resolvePaths().sessionsDir, 'aun', session.channelId, session.selfAID || '', (sessionTopicThreadId(session) ?? ''), session.chatType, 'interrupt', session.channel).some(item => item.id === message.observerHintId))) {
             this.reportObserverHintFailureForMessage(message, 'HINT_UNAVAILABLE');
             return;
         }
@@ -2703,6 +2774,7 @@ export class ResponseEngine {
         const accessAdapter = accessChannelInfo?.adapter;
         const accessAdapterSelfAid = typeof accessAdapter?._selfAid === 'function' ? accessAdapter._selfAid() : undefined;
         const selfAidForAccess = accessAdapterSelfAid || message.selfAID || session.selfAID || undefined;
+        await refreshOwnershipForAuthorization(selfAidForAccess, { maxAgeMs: OWNERSHIP_CACHE_MAX_AGE_MS });
         if (message.handoffDelivery?.direction === 'target'
             && this.handoffRuntime
             && selfAidForAccess) {
@@ -2719,7 +2791,10 @@ export class ResponseEngine {
         const triggerExecutionIdentity = this.resolveTriggerExecutionIdentity(message, selfAidForAccess);
         const handoffExecutionIdentity = this.resolveHandoffOriginExecutionIdentity(message, selfAidForAccess);
         const executionIdentity = triggerExecutionIdentity ?? handoffExecutionIdentity;
-        if (message.source === 'trigger' && !triggerExecutionIdentity) {
+        // 跨话题复查走会话自身身份，本来就解析不出 Trigger 的 origin 身份，不属于"身份缺失"。
+        const isCrossThreadReview = message.triggerMeta?.reviewKind === 'cross-thread-review'
+            || message.triggerMeta?.labels?.kind === 'cross-thread-review';
+        if (message.source === 'trigger' && !triggerExecutionIdentity && !isCrossThreadReview) {
             logger.warn(`[ResponseEngine] Trigger execution identity missing: trigger=${message.triggerMeta?.triggerId ?? '<none>'}`);
             const channelInfo = this.resolveChannelInfo(accessChannelKey);
             if (channelInfo) {
@@ -2872,12 +2947,13 @@ export class ResponseEngine {
                 return;
             timeoutTriggered = true;
             timeoutControl.error = error;
+            timeoutControl.recoverable = isRetryableError(error);
             this.timeoutErrors.set(session.id, error);
             this.turnCoordinator.hydrate(session);
             const reason = error instanceof OrphanedTargetSessionError ? 'execution_error' : 'timeout';
             this.turnCoordinator.invalidate(session.id, reason);
             this.interruptedSessions.set(session.id, reason);
-            const barrier = this.interruptSession(session.id, reason)
+            const barrier = this.interruptSession(session.id, reason, false, timeoutControl.recoverable)
                 .catch(interruptError => {
                 logger.debug(`[ResponseEngine] Timeout interrupt barrier failed: ${interruptError instanceof Error ? interruptError.message : String(interruptError)}`);
             });
@@ -3029,7 +3105,7 @@ export class ResponseEngine {
             && commandAuthorization.authorizedBy.length > 0) {
             let currentOwner = false;
             try {
-                currentOwner = new Set(loadDaemonConfig().owners ?? []).has(commandAuthorization.authorizedBy);
+                currentOwner = new Set(getDaemonOwners()).has(commandAuthorization.authorizedBy);
                 if (commandAuthorization.source === 'agent-policy')
                     assertAgentPolicyAuthorization(commandAuthorization);
             }
@@ -3153,9 +3229,9 @@ export class ResponseEngine {
             return;
         }
         // Agent-owned turns are runnable only in the two explicit execution
-        // states. An untransitioned `created` agent or malformed lifecycle must
-        // not fall through to a base runner's default prompt. Missing lifecycle
-        // is normalized to active for legacy configurations.
+        // states. Setup and owner-pending agents must not fall through to a base
+        // runner's default prompt. Missing lifecycle is normalized to active for
+        // legacy configurations.
         if (owningAgentForTask && ((!isActive && !isBootstrapping) || initializationBlocksTasks(owningAgentForTask.config))) {
             const blockedLifecycle = lifecycle
                 ?? `invalid (${String(owningAgentForTask.config.lifecycle)})`;
@@ -3257,7 +3333,7 @@ export class ResponseEngine {
             causation: taskCausation,
         });
         // ─── 解析 self/peer/config（响应模式解析的输入）───
-        const currentChannelType = options?.channelType || message.channel;
+        const currentChannelType = resolveMessageChannelType(options, message);
         const adapterAny = channelInfo.adapter;
         const adapterSelfAid = typeof adapterAny._selfAid === 'function' ? adapterAny._selfAid() : undefined;
         // During bootstrap the lifecycle owner is the authoritative identity. Do
@@ -3283,11 +3359,20 @@ export class ResponseEngine {
         // operator.  Keep the historical private-chat fallback (where channelId
         // is the peer identity for AUN), but fail closed for group messages that
         // arrive without a sender/operator ID.
+        // 跨话题复查投递的 message.peerId 是占位的 `trigger:<id>`，不是真实对端。这一轮身份
+        // 按 T2 会话自身的对端算（resolveTriggerExecutionIdentity 对这类投递返回 undefined），
+        // 私聊即 channelId；否则 actor 落成伪身份，在唤醒话题里连本条复查都管不了。
+        const isCrossThreadReviewTurn = message.source === 'trigger'
+            && (message.triggerMeta?.reviewKind === 'cross-thread-review'
+                || message.triggerMeta?.labels?.kind === 'cross-thread-review');
+        const turnPeerId = isCrossThreadReviewTurn && configChatType === 'private'
+            ? message.channelId
+            : peerIdRaw;
         const configActorId = authorizationIdentity?.actorId
-            ?? (message.peerId || (configChatType === 'private' ? message.channelId : undefined));
+            ?? (turnPeerId || (configChatType === 'private' ? message.channelId : undefined));
         const peerKeyId = authorizationIdentity?.actorId ?? (session.chatType === 'group'
             ? (session.metadata?.groupId || message.channelId)
-            : peerIdRaw);
+            : turnPeerId);
         const peerKey = authorizationIdentity?.peerKey ?? ((configChannelType && peerKeyId)
             ? formatPeerKey(configChannelType, peerKeyId)
             : undefined);
@@ -3417,7 +3502,7 @@ export class ResponseEngine {
             return {
                 ...replyContextFromSession(session, base),
                 sessionId: session.id,
-                threadId: session.threadId || base?.threadId,
+                threadId: sessionTopicThreadId(session) ?? base?.threadId,
                 metadata: withTaskMetadata(base?.metadata),
             };
         };
@@ -3489,6 +3574,7 @@ export class ResponseEngine {
             timeoutControl.deliverUnhandled = async (timeoutError) => {
                 if (!timeoutControl.claimTerminal())
                     return;
+                const recoverable = timeoutControl.recoverable === true;
                 const isTotalExecutionTimeout = timeoutError.message === 'TOTAL_EXECUTION_TIMEOUT';
                 const totalExecutionMs = timeoutError instanceof ExecutionTimeoutError ? timeoutError.timeoutMs : this.totalExecutionLimitMs();
                 const statusPayload = timeoutError instanceof OrphanedTargetSessionError ? {
@@ -3525,6 +3611,7 @@ export class ResponseEngine {
                 await adapter.send(envelope, {
                     kind: 'result.error',
                     text: userMessage,
+                    recoverable,
                     ...(getErrorRawText(timeoutError) ? { raw: getErrorRawText(timeoutError) } : {}),
                     subtype: normalizeCoreErrorSubtype(timeoutError, undefined, isTotalExecutionTimeout ? 'timeout' : 'timeout'),
                     reason: isExecutionFailure(timeoutError)
@@ -3538,6 +3625,7 @@ export class ResponseEngine {
                 this.publishTriggerExecutionFailure(message, isExecutionFailure(timeoutError) ? timeoutError.reason : timeoutError.message, {
                     messageId,
                     causation: taskCausation,
+                    recoverable,
                 });
                 const errorType = prefixErrorType(ERROR_PREFIX.INFRA, classifyError(timeoutError));
                 this.eventBus.publish({
@@ -3550,6 +3638,7 @@ export class ResponseEngine {
                     taskId,
                     generation: turnLease?.generation,
                     error: timeoutError.message,
+                    recoverable,
                     terminalReason: isExecutionFailure(timeoutError) ? timeoutError.reason : undefined,
                     errorType,
                     agentName: agentNameForStats,
@@ -3817,6 +3906,12 @@ export class ResponseEngine {
                         }
                     }
                     opts.sessionId = session.id;
+                    // 本地日志用的完整话题身份（含主话题规范 id）。上面只合并了入站
+                    // message.replyContext，它不含主话题 id；线上字段由 threadId 单独控制，
+                    // 这里补的 localTopicId 不会进入报文。
+                    const localTopicId = sessionLocalTopicId(session);
+                    if (localTopicId)
+                        opts.localTopicId = localTopicId;
                     if (payload.kind === 'result.text' && payload.isFinal) {
                         opts.ext = { ...opts.ext, isFinal: true };
                     }
@@ -3911,6 +4006,7 @@ export class ResponseEngine {
                     approverPolicy: actorIsManager ? 'agent_manager' : 'requester',
                     owners,
                     admins,
+                    hostOwners: Array.from(new Set(getDaemonOwners())),
                     resolveApproverCandidates,
                     ownerAdapter: aunAdapter,
                     forceHandoff: !!authorizationIdentity,
@@ -3927,7 +4023,7 @@ export class ResponseEngine {
                         : undefined,
                     originAuthRevision,
                     originRole: peerRole,
-                    originThreadId: session.threadId || message.threadId || undefined,
+                    originThreadId: sessionTopicThreadId(session) ?? (isTopicThreadId(message.threadId) ? message.threadId : undefined),
                     originChatDir: this.sessionManager.getChatDir(session),
                     approvalTtlMs: 20 * 60 * 1000,
                     reauthorizeApproval: (request) => {
@@ -3959,6 +4055,7 @@ export class ResponseEngine {
                                 actor: currentApprover,
                                 owners: currentOwners,
                                 admins: currentAdmins,
+                                hostOwners: Array.from(new Set(getDaemonOwners())),
                                 originPrincipalId: hasTrustedPrincipal(currentOrigin)
                                     ? currentOrigin.principalId
                                     : undefined,
@@ -4080,13 +4177,17 @@ export class ResponseEngine {
                     }
                     : {}),
                 armApprovedDelegationCommand: this.agentDelegationRegistry
-                    ? (sessionToken, commandHash) => this.agentDelegationRegistry.armApprovedCommand({
+                    ? (sessionToken, commandHash, approvalId) => this.agentDelegationRegistry.armApprovedCommand({
                         sessionToken,
                         sessionId: session.id,
                         taskId,
                         commandHash,
+                        approvalId,
                     })
                     : undefined,
+                revokeApprovedDelegationCommand: this.agentDelegationRegistry
+                    ? (approvalId) => this.agentDelegationRegistry.revokeApprovedCommand(session.id, taskId, approvalId)
+                    : undefined,
                 bindSessionCredential: this.agentDelegationRegistry
                     ? (sessionToken, threadId) => this.agentDelegationRegistry.registerSessionCredential({
                         sessionToken, threadId, sessionId: session.id, taskId,
@@ -4240,6 +4341,7 @@ export class ResponseEngine {
             let skipEvolcoreModel = false;
             let probingPrimaryModel = false;
             let primaryModel;
+            let primaryProvider;
             let fallbackCandidates = [];
             let previousFallbackState;
             let agentModel;
@@ -4311,7 +4413,8 @@ export class ResponseEngine {
                             || !message.triggerMeta.authorizedBy) {
                             throw new Error('fullaccess Trigger override lacks trusted scheduler identity or approval provenance');
                         }
-                        const currentOwners = new Set(loadDaemonConfig().owners ?? []);
+                        await refreshOwnershipForAuthorization(selfAid);
+                        const currentOwners = new Set(getDaemonOwners());
                         if (!currentOwners.has(message.triggerMeta.authorizedBy)) {
                             throw new Error('fullaccess Trigger approval is no longer owned');
                         }
@@ -4326,7 +4429,7 @@ export class ResponseEngine {
                             authorizedBy: message.triggerMeta.authorizedBy,
                         };
                     }
-                    this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent);
+                    await this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent);
                     effectivePermissionMode = 'fullaccess';
                 }
                 else {
@@ -4394,7 +4497,10 @@ export class ResponseEngine {
                             ? `${effortResolution.source.target}:${effortResolution.source.file}`
                             : undefined;
                     if (model || effort) {
-                        evolcoreModelOverride = { model, effort };
+                        evolcoreModelOverride = {
+                            model,
+                            effort,
+                        };
                         effectiveModel = model;
                     }
                     effectiveEffort = effectiveEffortValue;
@@ -4403,6 +4509,11 @@ export class ResponseEngine {
                     logger.warn(`[ResponseEngine] effective model config resolution failed: ${e instanceof Error ? e.message : String(e)}`);
                 }
                 modelOverride = evolcoreModelOverride;
+                primaryProvider = normalizedBaseagent.canonical === 'unknown'
+                    ? undefined
+                    : effectiveAgentConfig?.baseagents?.[normalizedBaseagent.canonical]?.provider;
+                if (primaryProvider)
+                    modelOverride = { ...(modelOverride || {}), provider: primaryProvider };
                 if (triggerModelOverride || triggerEffortOverride) {
                     const constrainedOverride = { ...(modelOverride || {}) };
                     if (triggerModelOverride) {
@@ -4448,6 +4559,7 @@ export class ResponseEngine {
                         selfAid: selfAid || undefined,
                         catalog: agent.getModelCatalog?.bind(agent),
                         baseagent: normalizedBaseagent.canonical,
+                        currentProvider: primaryProvider,
                         currentModel: primaryModel,
                         resolveModelId: typeof agent.resolveModelId === 'function'
                             ? agent.resolveModelId.bind(agent)
@@ -4464,7 +4576,9 @@ export class ResponseEngine {
                     if (existingFallback
                         && (existingFallback.baseagent !== normalizedBaseagent.canonical
                             || existingFallback.primaryModel !== primaryModel
-                            || !fallbackCandidates.some(candidate => candidate.model === existingFallback.activeFallback.model))) {
+                            || existingFallback.primaryProvider !== primaryProvider
+                            || !fallbackCandidates.some(candidate => candidate.model === existingFallback.activeFallback.model
+                                && candidate.provider === existingFallback.activeFallback.provider))) {
                         this.modelFallbackMap.delete(session.id);
                     }
                     else if (existingFallback) {
@@ -4509,7 +4623,7 @@ export class ResponseEngine {
                 if (normalizedBaseagent.canonical === 'claude') {
                     modelOverride = {
                         ...(modelOverride || {}),
-                        sessionTitle: deriveSessionTitle(session.name, message.content, session.threadId),
+                        sessionTitle: deriveSessionTitle(session.name, message.content, sessionTopicThreadId(session)),
                     };
                 }
                 // Capture the authoritative topic binding after begin() has durably
@@ -4518,10 +4632,10 @@ export class ResponseEngine {
                 // happen before task-start auto compact because compact is a backend
                 // management action just like the subsequent runQuery.
                 let runAgentSessionId = session.agentSessionId;
-                if ((session.threadId || message.taskRecovery)
+                if ((isTopicSession(session) || message.taskRecovery)
                     && typeof this.sessionManager.getSessionById === 'function') {
                     const latestBackendSession = await this.sessionManager.getSessionById(session.id);
-                    if (!latestBackendSession || latestBackendSession.deletedAt || latestBackendSession.threadId !== session.threadId) {
+                    if (!latestBackendSession || latestBackendSession.deletedAt || sessionLocalTopicId(latestBackendSession) !== sessionLocalTopicId(session)) {
                         throw new Error('topic session changed before backend run started');
                     }
                     if (message.taskRecovery && (latestBackendSession.agentSessionId !== message.taskRecovery.agentSessionId
@@ -4537,7 +4651,7 @@ export class ResponseEngine {
                     ...(message.taskRecovery
                         ? { recovery: { agentSessionId: message.taskRecovery.agentSessionId } }
                         : {}),
-                    ...(session.threadId
+                    ...(isTopicSession(session)
                         ? { backend: { kind: 'topic', agentSessionId: runAgentSessionId ?? null } }
                         : {}),
                     turn: {
@@ -4549,10 +4663,10 @@ export class ResponseEngine {
                     },
                 };
                 const refreshTopicBindingForLogicalRetry = async () => {
-                    if ((!session.threadId && !message.taskRecovery) || typeof this.sessionManager.getSessionById !== 'function')
+                    if ((isMainSession(session) && !message.taskRecovery) || typeof this.sessionManager.getSessionById !== 'function')
                         return;
                     const latest = await this.sessionManager.getSessionById(session.id);
-                    if (!latest || latest.threadId !== session.threadId) {
+                    if (!latest || sessionLocalTopicId(latest) !== sessionLocalTopicId(session)) {
                         throw new Error('topic session changed during backend run');
                     }
                     const latestAgentSessionId = latest.agentSessionId;
@@ -4574,9 +4688,7 @@ export class ResponseEngine {
                 };
                 // 预压缩必须使用与本轮 runQuery 相同的有效模型/强度覆盖。
                 // 模型解析完成后再执行，避免关系级模型存在时回落到 runner 默认模型。
-                await this.runPendingAutoCompactAtTaskStart(session, agent, absoluteProjectPath, renderer, modelOverride, fullAccessAuthorization
-                    ? () => this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent)
-                    : undefined);
+                await this.runPendingAutoCompactAtTaskStart(session, agent, absoluteProjectPath, renderer, modelOverride, () => this.assertCurrentExecutionAuthorization(permissionContext, agent));
                 startTime = Date.now();
                 const causationPath = inputCausation.trigger?.path ?? [];
                 const originNode = causationPath[0];
@@ -4644,8 +4756,6 @@ export class ResponseEngine {
                         RELATIONS_DIR: selfAid ? path.join(resolveRoot(), 'agents', selfAid, 'relations') : undefined,
                         VENUES_DIR: selfAid ? path.join(resolveRoot(), 'agents', selfAid, 'venues') : undefined,
                         selfAid: selfAid || undefined,
-                        // ownerAid：当前 agent 的第一个 owner AID，用于 owner 作用域记忆路径展开。
-                        // 来源：getFirstStaticAgentOwner 读 config.json owners[0]；AID 格式不合法时置 undefined。
                         ownerAid: (() => {
                             const raw = selfAid ? getFirstStaticAgentOwner(selfAid) : undefined;
                             if (!raw)
@@ -4709,7 +4819,7 @@ export class ResponseEngine {
                         localDate: currentLocalDate(),
                         weekday: currentWeekday(),
                         osInfo: OS_INFO,
-                        threadId: session.threadId || undefined,
+                        threadId: sessionTopicThreadId(session),
                         // Stage 3: sessionKey 持久化字段
                         sessionKey: session.sessionKey,
                         chatMode: isProactive ? 'proactive' : 'interactive',
@@ -5006,7 +5116,7 @@ export class ResponseEngine {
                         executionSource: fullAccessAuthorization.source,
                     } : {}),
                     daemonRuntimeEpoch: this.agentDelegationRegistry?.getRuntimeEpoch(),
-                    threadId: session.threadId || undefined,
+                    threadId: sessionTopicThreadId(session),
                     sessionRuntimeDir,
                     runtimeLockDir: ensureRuntimeLockDir(sessionRuntimeDir),
                     handoffIds: v2HandoffIds.length > 0 && v2HandoffDirection === 'target' ? v2HandoffIds : undefined,
@@ -5038,7 +5148,7 @@ export class ResponseEngine {
                 }
                 const retryScheduler = new RetryScheduler(fallbackCandidates, modelOverride?.model || agentModel, model => (typeof agent.resolveModelId === 'function'
                     ? (agent.resolveModelId(model) ?? model)
-                    : model));
+                    : model), modelOverride?.provider ?? primaryProvider);
                 const apiRetryTimeoutMs = this.apiRetryTimeoutMs();
                 const retryInputIsAtMostOnce = agent.retryInputSemantics === 'at_most_once';
                 let runAttempt = 1;
@@ -5060,10 +5170,10 @@ export class ResponseEngine {
                     const shouldTimeoutRetryAttempt = retryScheduler.shouldTimeoutAttempt() && apiRetryTimeoutMs !== undefined;
                     let attemptTimeout;
                     try {
-                        logger.info(`[ResponseEngine] agent.runQuery start: agent=${agent.name} session=${session.id} task=${taskId} attempt=${runAttempt} apiRetries=${retryScheduler.apiRetryAttemptsMade} agentSessionId=${runAgentSessionId ?? 'none'} topicBinding=${session.threadId ? 'authoritative' : 'legacy'}`);
+                        logger.info(`[ResponseEngine] agent.runQuery start: agent=${agent.name} session=${session.id} task=${taskId} attempt=${runAttempt} apiRetries=${retryScheduler.apiRetryAttemptsMade} agentSessionId=${runAgentSessionId ?? 'none'} topicBinding=${isTopicSession(session) ? 'authoritative' : 'legacy'}`);
                         import('../../utils/msg-diag.js').then(m => m.diagLog('task_start', { aid: session.selfAID ?? '', msgId: message.messageId ?? '', taskId, sessionId: runAgentSessionId ?? undefined, text: message.content ?? '' })).catch(() => { });
+                        await this.assertCurrentExecutionAuthorization(permissionContext, agent);
                         if (fullAccessAuthorization) {
-                            this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent);
                             if (fullAccessAuditStartedAt === undefined) {
                                 fullAccessAuditProcessRole = 'fullaccess-run';
                                 fullAccessAuditStartedAt = Date.now();
@@ -5093,7 +5203,7 @@ export class ResponseEngine {
                                 // Audit is synchronous today, but it is an observable boundary.
                                 // Revalidate once more so an administrative revocation observed
                                 // there cannot be followed by a privileged Runner call.
-                                this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent);
+                                await this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent);
                             }
                             fullAccessRunnerInvoked = true;
                         }
@@ -5255,7 +5365,7 @@ export class ResponseEngine {
                         if (classifyError(retryError) === ErrorType.MODEL_UNAVAILABLE && !hasExplicitTriggerModel) {
                             if (probingPrimaryModel && previousFallbackState) {
                                 const resumedFallback = previousFallbackState.activeFallback;
-                                retryScheduler.markModelAttempted(resumedFallback.model);
+                                retryScheduler.markModelAttempted(resumedFallback.model, resumedFallback.provider ?? primaryProvider);
                                 modelOverride = withFallbackModel(modelOverride, resumedFallback);
                                 usedFallback = resumedFallback;
                                 skipEvolcoreModel = true;
@@ -5277,6 +5387,7 @@ export class ResponseEngine {
                                     this.modelFallbackMap.set(session.id, {
                                         baseagent: normalizedBaseagent.canonical,
                                         primaryModel,
+                                        primaryProvider,
                                         activeFallback: modelFallback.candidate,
                                         messagesSinceFallback: 0,
                                         nextProbeAt: 2,
@@ -5293,7 +5404,7 @@ export class ResponseEngine {
                             const candidateHint = fallbackCandidates.length === 0
                                 ? '未配置可用备用模型'
                                 : '备用模型均不可用';
-                            throw markModelFallbackExhausted(new Error(`model_not_found: ${primaryModel ?? 'runner_default'}`), `当前模型 ${primaryModel ?? '默认模型'} 不可用，${candidateHint}。请稍后重试；管理员可在 agents/defaults.json 的 baseagents.${normalizedBaseagent.canonical}.fallbackModels 配置同类备用模型。`, retryError);
+                            throw markModelFallbackExhausted(new Error(`model_not_found: ${primaryModel ?? 'runner_default'}`), `当前模型 ${primaryModel ?? '默认模型'} 不可用，${candidateHint}。请稍后重试；管理员可在 agents/defaults.json 的 baseagents.${normalizedBaseagent.canonical}.fallback 配置同类备用模型。`, retryError);
                         }
                         if (retryAttemptTimedOut || isRetryableError(retryError)) {
                             await recordRetryHealthError(retryError);
@@ -5350,9 +5461,7 @@ export class ResponseEngine {
                         permissionMode: effectivePermissionMode,
                         turnLease,
                         messagePromptContext: fullAccessMessagePromptContext,
-                        beforeRunQuery: fullAccessAuthorization
-                            ? () => this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent)
-                            : undefined,
+                        beforeRunQuery: () => this.assertCurrentExecutionAuthorization(permissionContext, agent),
                     });
                 }
                 else {
@@ -5397,9 +5506,7 @@ export class ResponseEngine {
                     permissionMode: effectivePermissionMode,
                     turnLease,
                     messagePromptContext: fullAccessMessagePromptContext,
-                    beforeRunQuery: fullAccessAuthorization
-                        ? () => this.assertCurrentFullAccessExecutionAuthorization(fullAccessAuthorization, agent)
-                        : undefined,
+                    beforeRunQuery: () => this.assertCurrentExecutionAuthorization(permissionContext, agent),
                 });
                 // 重试后仍然 prompt_too_long：显示友好提示
                 const retryStillTooLong = streamResult.isError && streamHitContextLimit(streamResult);
@@ -5608,6 +5715,9 @@ export class ResponseEngine {
                 await this.publishTriggerExecutionInterrupted(message, adapter, envelope, 'stale_turn', taskCausation);
                 return;
             }
+            const streamRecoverable = !permissionTerminalFailure
+                && !isExpectedTerminalInterrupt(streamResult.terminalReason)
+                && isRetryableError(new Error(getStreamErrorText(streamResult)));
             if ((visibleFinalReplyText || streamResult.syntheticDiagnosticText) && !isTriggerNoop) {
                 // `hasReceivedText` 是任务级计数。工具调用前的文字已经显示，并不表示最后一轮
                 // （通常来自 complete.result）的文字也已显示；用本轮投影标记避免终态丢失。
@@ -5623,7 +5733,6 @@ export class ResponseEngine {
                 const errorText = visibleFinalReplyText || streamResult.syntheticDiagnosticText || getStreamErrorMessage(streamResult, false);
                 if (streamResult.isError) {
                     // 用原始诊断文本（含错误码）判断可重试性，不用已过 stripContextLimitErrorLines 的展示文本
-                    const recoverable = isRetryableError(new Error(getStreamErrorText(streamResult)));
                     const subtype = normalizeCoreErrorSubtype(new Error(streamRawErrorText || getStreamErrorText(streamResult)), streamResult.subtype, streamResult.terminalReason);
                     const reason = normalizeCoreErrorReason(streamResult.terminalReason);
                     await adapter.send(envelope, {
@@ -5632,7 +5741,7 @@ export class ResponseEngine {
                         ...(streamRawErrorText ? { raw: streamRawErrorText } : {}),
                         subtype,
                         ...(reason ? { reason } : {}),
-                        recoverable,
+                        recoverable: streamRecoverable,
                     }).catch(() => { });
                     sentErrorAsSystemError = true;
                 }
@@ -5673,11 +5782,22 @@ export class ResponseEngine {
                 // Flush 剩余内容（文件标记已在 flush 时自动移除）
                 // A final text flush can also contain failed output. Preserve the
                 // outcome so AUN does not label that text as normal completion.
-                if (streamResult.isError && !isExpectedTerminalInterrupt(streamResult.terminalReason)) {
-                    await renderer.flush(true, 'failed');
+                try {
+                    if (streamResult.isError && !isExpectedTerminalInterrupt(streamResult.terminalReason)) {
+                        await renderer.flush(true, 'failed');
+                    }
+                    else {
+                        await renderer.flush(!isExpectedTerminalInterrupt(streamResult.terminalReason));
+                    }
                 }
-                else {
-                    await renderer.flush(!isExpectedTerminalInterrupt(streamResult.terminalReason));
+                catch (flushError) {
+                    // Agent 已正常跑完，只是最终回复投递失败：打标记，让 catch 记录
+                    // reply_delivery_failed，__task-recovery 不再为投递问题重跑 agent。
+                    if (streamResult.isError)
+                        throw flushError;
+                    const tagged = flushError instanceof Error ? flushError : new Error(String(flushError));
+                    tagged._replyDeliveryFailed = true;
+                    throw tagged;
                 }
             }
             const terminalInterrupt = isExpectedTerminalInterrupt(streamResult.terminalReason);
@@ -5702,7 +5822,7 @@ export class ResponseEngine {
             }
             else {
                 await this.turnCoordinator.finish(session, turnLease, terminalInterrupt ? 'cancelled' : 'failed', permissionTerminalFailure ? 'permission_denied'
-                    : streamResult.protocolIncompleteReason || streamResult.terminalReason || streamResult.subtype);
+                    : streamResult.protocolIncompleteReason || streamResult.terminalReason || streamResult.subtype, streamRecoverable);
             }
             // 注意：不在此处清除 interruptedSessions，由下一条消息的 prompt 包装逻辑消费
             const interruptReason = this.interruptedSessions.get(session.id);
@@ -5730,6 +5850,7 @@ export class ResponseEngine {
                 if (!isExpectedInterrupt && !permissionTerminalFailure) {
                     const terminalMetadata = {
                         errorType: rawSubtype,
+                        recoverable: streamRecoverable,
                         message: userErrorSummary,
                         durationMs: Date.now() - startTime,
                         numTurns: streamResult.numTurns,
@@ -5748,6 +5869,7 @@ export class ResponseEngine {
                             await adapter.send(envelope, {
                                 kind: 'result.error',
                                 text: userErrorSummary,
+                                recoverable: streamRecoverable,
                                 ...(streamRawErrorText ? { raw: streamRawErrorText } : {}),
                                 subtype: coreSubtype,
                                 ...(coreReason ? { reason: coreReason } : {}),
@@ -5759,6 +5881,7 @@ export class ResponseEngine {
                             await adapter.send(envelope, {
                                 kind: 'result.error',
                                 text: userErrorSummary,
+                                recoverable: streamRecoverable,
                                 ...(streamRawErrorText ? { raw: streamRawErrorText } : {}),
                                 subtype: coreSubtype,
                                 ...(coreReason ? { reason: coreReason } : {}),
@@ -5795,7 +5918,7 @@ export class ResponseEngine {
                 else {
                     logger.error(`[ResponseEngine] Task failed: session=${session.id} task=${taskId} ` +
                         `type=${errorType} terminalReason=${streamResult.terminalReason ?? 'none'} error=${errorSummary}`);
-                    this.publishTriggerExecutionFailure(message, errorSummary, { messageId, causation: taskCausation });
+                    this.publishTriggerExecutionFailure(message, errorSummary, { messageId, causation: taskCausation, recoverable: streamRecoverable });
                     this.eventBus.publish({
                         type: 'task:error',
                         sessionId: session.id,
@@ -5806,6 +5929,7 @@ export class ResponseEngine {
                         taskId,
                         generation: turnLease?.generation,
                         error: errorSummary,
+                        recoverable: streamRecoverable,
                         errorType,
                         agentName: agentNameForStats,
                         terminalReason: streamResult.terminalReason,
@@ -5874,7 +5998,7 @@ export class ResponseEngine {
                         // 写库即得价格对（原价 + 网关价），无需再调 calcCost 重复计算。
                         // 网关价格缓存（/v1/models 的 pricing/effective_pricing，1h TTL）由当前 runner 提供。
                         const gwPricing = agent.getGatewayPricing?.();
-                        const prices = insertUsageEvent(resolveRoot(), event, gwPricing);
+                        const prices = insertUsageEvent(resolveRoot(), event, gwPricing, streamResult.modelCalls);
                         turnCost = { official: prices.official, gateway: prices.gateway };
                         // 逐次大模型调用明细落库（model_calls 表）
                         if (streamResult.modelCalls?.length) {
@@ -5887,6 +6011,8 @@ export class ResponseEngine {
                                 peer_key: statsPeerKey,
                                 call_index: mc.call_index,
                                 model: mc.model || statsModel,
+                                source: mc.source,
+                                provider_thread_id: mc.providerThreadId,
                                 request_id: mc.request_id,
                                 message_id: mc.message_id,
                                 input_tokens: mc.tokenUsage.input_tokens ?? 0,
@@ -6127,6 +6253,8 @@ export class ResponseEngine {
                 && !isTotalExecutionTimeout;
             const isUserInterrupt = isNonErrorInterruptReason(interruptReason) || staleSupersededTurn;
             const errorMsg = error instanceof Error ? error.message : String(error);
+            const recoverable = !isUserInterrupt && !error?._replyDeliveryFailed
+                && (error === timeoutControl?.error ? timeoutControl?.recoverable === true : isRetryableError(error));
             if (isUserInterrupt) {
                 await this.publishTriggerExecutionInterrupted(message, adapter, envelope, interruptReason ?? 'stale_turn', taskCausation);
             }
@@ -6134,10 +6262,14 @@ export class ResponseEngine {
                 this.publishTriggerExecutionFailure(message, errorMsg, {
                     messageId,
                     causation: taskCausation,
+                    recoverable,
                 });
             }
             if (leaseWasCurrent && turnLease) {
-                await this.turnCoordinator.finish(session, turnLease, 'failed', error instanceof Error ? error.message : String(error));
+                const failureReason = error instanceof Error ? error.message : String(error);
+                await this.turnCoordinator.finish(session, turnLease, 'failed', error?._replyDeliveryFailed
+                    ? `${REPLY_DELIVERY_FAILED_REASON}: ${failureReason}`
+                    : failureReason, recoverable);
             }
             const totalExecutionMs = error instanceof ExecutionTimeoutError ? error.timeoutMs : this.totalExecutionLimitMs();
             const procStatus = errType === ErrorType.SDK_TIMEOUT || isTotalExecutionTimeout ? 'timeout'
@@ -6184,6 +6316,7 @@ export class ResponseEngine {
                     taskId,
                     generation: turnLease?.generation,
                     error: errorMsg,
+                    recoverable,
                     terminalReason: isExecutionFailure(error) ? error.reason : undefined,
                     errorType,
                     agentName: agentNameForStats,
@@ -6275,6 +6408,7 @@ export class ResponseEngine {
                 const errorPayload = {
                     kind: 'result.error',
                     text: userMessage,
+                    recoverable,
                     subtype: errorSubtype,
                     ...(rawErrorText ? { raw: rawErrorText } : {}),
                     ...(errorReason ? { reason: errorReason } : {}),
@@ -6289,6 +6423,7 @@ export class ResponseEngine {
                         metadata: {
                             errorType: errType,
                             message: userMessage,
+                            recoverable,
                             durationMs: Date.now() - startTime,
                             numTurns: streamResult.numTurns,
                             toolCallCount: streamResult.toolUseCount ?? 0,
@@ -6428,7 +6563,7 @@ export class ResponseEngine {
             // fullaccess run. Revalidate immediately before invoking the runner so a
             // daemon gate/owner revocation observed after task setup cannot still
             // cause host-level runner activity.
-            beforeCompact?.();
+            await beforeCompact?.();
             const compacted = await agent.compact(session.id, session.agentSessionId, absoluteProjectPath, modelOverride);
             const compactResult = compacted;
             if (compactResult === true || compactResult?.ok === true) {
@@ -6507,7 +6642,7 @@ export class ResponseEngine {
             if (!message.observerHintId || !bound || bound.deletedAt || !bound.agentSessionId
                 || bound.channel !== message.channel || bound.channelId !== message.channelId
                 || bound.selfAID !== message.selfAID || bound.chatType !== message.chatType
-                || (bound.threadId || '') !== (message.threadId || '')) {
+                || sessionTopicThreadId(bound) !== (isTopicThreadId(message.threadId) ? message.threadId : undefined)) {
                 throw new Error('Observer hint target session is no longer available');
             }
             // An enqueued priority hint is bound to exactly the session selected at
@@ -6515,7 +6650,7 @@ export class ResponseEngine {
             // file must never silently resume a stale/different backend session.
             const current = await this.observerTargetSession({
                 channelKey: bound.channel, channelId: bound.channelId,
-                chatType: bound.chatType, threadId: bound.threadId,
+                chatType: bound.chatType, threadId: sessionTopicThreadId(bound),
                 selfAid: bound.selfAID,
             });
             if (current?.id !== bound.id || current.agentSessionId !== bound.agentSessionId) {
@@ -6526,7 +6661,7 @@ export class ResponseEngine {
                     ? bound.projectPath : path.resolve(process.cwd(), bound.projectPath) };
         }
         // 话题会话创建时写入创建者和 replyContext（threadId 路由）；主会话不写（避免群聊覆盖）
-        const metadata = message.threadId
+        const metadata = isTopicThreadId(message.threadId)
             ? {
                 ...(message.replyContext ? { replyContext: message.replyContext } : {}),
                 ...(message.peerId ? { peerId: message.peerId } : {}),
@@ -6558,7 +6693,7 @@ export class ResponseEngine {
                 // valid mapped owner/admin to role=none at the execution boundary.
                 if (resolvedIdentity)
                     bound.identity = resolvedIdentity;
-                if (bound.threadId || bound.metadata?.diagnostic) {
+                if (isTopicSession(bound) || bound.metadata?.diagnostic) {
                     const absoluteProjectPath = path.isAbsolute(bound.projectPath)
                         ? bound.projectPath : path.resolve(process.cwd(), bound.projectPath);
                     return { session: bound, absoluteProjectPath };
@@ -6756,6 +6891,7 @@ export class ResponseEngine {
                     if (hasText)
                         textCount++;
                     assistantUuid = event.assistantUuid ?? assistantUuid;
+                    event = { ...event, text: stripThinkingBlocks(event.text) };
                 }
                 else if (event.type === 'tool_use') {
                     // 产生工具调用同样证明输入已被消费，且此时重放会重复发起副作用。
@@ -6827,6 +6963,12 @@ export class ResponseEngine {
                 else if (event.type === 'complete') {
                     assistantUuid = event.assistantUuid ?? assistantUuid;
                     protocolIncompleteReason = event.protocolIncompleteReason ?? protocolIncompleteReason;
+                    if (event.result) {
+                        const result = stripThinkingBlocks(event.result);
+                        if (textCount === 0 && event.result.trim() && !result.trim())
+                            textCount++;
+                        event = { ...event, result };
+                    }
                 }
                 // 记录事件类型：高价值事件（含子任务生命周期）INFO，
                 // 框架事件（session_id/state_changed/status）DEBUG
@@ -7341,7 +7483,7 @@ export class ResponseEngine {
                         const isAbort = isExpectedTerminalInterrupt(event.terminalReason);
                         logger.info(`[ResponseEngine] ${isAbort ? 'task interrupted' : 'complete event'}: queryFinal=${event.queryFinal !== false} isError=${event.isError} terminalReason=${event.terminalReason ?? 'none'} subtype=${event.subtype ?? 'none'} hasReceivedText=${hasReceivedText}`);
                         // 自动回填会话名称
-                        if (event.sessionTitle && shouldAutoFillSessionTitle(session.name, session.threadId)) {
+                        if (event.sessionTitle && shouldAutoFillSessionTitle(session.name, sessionTopicThreadId(session))) {
                             await this.sessionManager.renameSession(session.id, event.sessionTitle);
                             logger.info(`[ResponseEngine] Auto-filled session name: ${event.sessionTitle}`);
                         }
@@ -7392,7 +7534,7 @@ export class ResponseEngine {
                     continue;
                 }
                 // 自动回填会话名称
-                if (event.sessionTitle && shouldAutoFillSessionTitle(session.name, session.threadId)) {
+                if (event.sessionTitle && shouldAutoFillSessionTitle(session.name, sessionTopicThreadId(session))) {
                     await this.sessionManager.renameSession(session.id, event.sessionTitle);
                     logger.info(`[ResponseEngine] Auto-filled session name: ${event.sessionTitle}`);
                 }