@foxden-app/foxclaw 0.10.0 → 0.11.0

package/dist/core/orchestrator.js

@@ -12,6 +12,7 @@ import { renderStreamPreviewContent, buildFoldedToolsSummary, combineSummaryAndR
 import { BRIDGE_SCOPE_TELEGRAM_PREFIX, BRIDGE_SCOPE_WEIXIN_PREFIX, parseTelegramTargetFromBridgeScope } from './bridge_scope.js';
 import { escapeTelegramHtml } from '../telegram/html.js';
 import { formatTokenUsageSummary, formatBackendTokenUsageBreakdown } from '../store/token_usage.js';
+import { isTransientNetworkError } from '../telegram/api.js';
 export const STREAM_THROTTLE_MS = 700;
 export const TYPING_INTERVAL_MS = 4000;
 export class UnifiedChannelOrchestrator {
@@ -299,6 +300,16 @@ export class UnifiedChannelOrchestrator {
             defaultEngine: this.adapter.id,
             backends: Array.from(this.backends.keys()),
         });
+        // Requeue any interrupted turns from previous crash/restart
+        try {
+            const requeued = this.store.requeueInterruptedQueuedTurnInputs();
+            if (requeued > 0) {
+                this.logger.info('orchestrator.requeued_interrupted_turns', { count: requeued });
+            }
+        }
+        catch (err) {
+            this.logger.warn('orchestrator.requeue_interrupted_error', { error: String(err) });
+        }
         // Crash recovery: check interrupted preview messages from before restart
         try {
             const backendIds = new Set(this.backends.keys());
@@ -312,9 +323,19 @@ export class UnifiedChannelOrchestrator {
                 }
                 return false;
             });
+            const recoveredScopes = new Set();
             for (const prev of activePreviews) {
                 this.store.removeActiveTurnPreview(prev.turnId);
-                this.editMessage(prev.scopeId, prev.messageId, '🔄 **Foxclaw 服务已重新加载/重启**\n\n检测到上一轮任务执行被服务重启中断，正在自动继续执行…').catch(() => { });
+                recoveredScopes.add(prev.scopeId);
+                // Bind existing threadId immediately so auto-resume continues in the exact same thread
+                if (prev.threadId) {
+                    const currentBinding = this.store.getBinding(prev.scopeId);
+                    this.store.setBinding(prev.scopeId, prev.threadId, currentBinding?.cwd ?? this.config.defaultCwd);
+                }
+                const locale = this.store.getChatSettings(prev.scopeId)?.locale || 'zh';
+                this.editMessage(prev.scopeId, prev.messageId, locale === 'zh'
+                    ? '🔄 **[Foxclaw 服务已重新加载/重启]**\n\n检测到上一轮任务执行被服务重启中断，正在自动继续执行…'
+                    : '🔄 **[FoxClaw Service Reloaded / Restarted]**\n\nInterrupted turn detected. Resuming automatically…').catch(() => { });
                 const fakeEvent = {
                     scopeId: prev.scopeId,
                     chatId: prev.scopeId,
@@ -327,8 +348,14 @@ export class UnifiedChannelOrchestrator {
                     entities: [],
                     replyToBot: false,
                 };
+                const resumePrompt = prev.threadId
+                    ? (locale === 'zh' ? 'FoxClaw 服务重启中断，请在当前会话中从中断处继续完成刚才的工作。' : 'FoxClaw restarted while previous turn was running. Please resume and complete the work from where it left off.')
+                    : (locale === 'zh' ? '请继续完成上一步未完成的任务。' : 'Please continue and complete the unfinished task from previous step.');
                 const resumeTimer = setTimeout(() => {
-                    this.startPromptTurn(fakeEvent, '请继续完成上一步未完成的任务', 'zh').catch((err) => {
+                    this.startPromptTurn(fakeEvent, resumePrompt, locale, {
+                        reuseMessageId: prev.messageId,
+                        forcedThreadId: prev.threadId || undefined,
+                    }).catch((err) => {
                         this.logger.warn('orchestrator.auto_resume_failed', {
                             scopeId: prev.scopeId,
                             error: String(err),
@@ -337,6 +364,32 @@ export class UnifiedChannelOrchestrator {
                 }, 1500);
                 resumeTimer?.unref?.();
             }
+            // Check for queued turns on scopes without active previews
+            const queuedInputs = this.store.listQueuedTurnInputs();
+            for (const q of queuedInputs) {
+                if (!recoveredScopes.has(q.scopeId) && !this.activeTurns.has(q.scopeId)) {
+                    recoveredScopes.add(q.scopeId);
+                    const locale = this.store.getChatSettings(q.scopeId)?.locale || 'zh';
+                    const fakeEvent = {
+                        scopeId: q.scopeId,
+                        chatId: q.chatId,
+                        topicId: q.topicId ?? null,
+                        chatType: q.chatType || 'private',
+                        userId: 'system',
+                        messageId: q.messageId ?? 0,
+                        text: q.sourceSummary,
+                        attachments: [],
+                        entities: [],
+                        replyToBot: false,
+                    };
+                    const drainTimer = setTimeout(() => {
+                        this.drainNextQueuedTurn(fakeEvent, locale).catch((err) => {
+                            this.logger.warn('orchestrator.auto_drain_failed', { scopeId: q.scopeId, error: String(err) });
+                        });
+                    }, 2000);
+                    drainTimer?.unref?.();
+                }
+            }
         }
         catch (err) {
             this.logger.warn('orchestrator.restore_active_turns_error', { error: String(err) });
@@ -370,8 +423,36 @@ export class UnifiedChannelOrchestrator {
         return lastMsgId;
     }
     async editMessage(scopeId, messageId, text, keyboard) {
+        if (!messageId || messageId <= 0) {
+            await this.sendMessage(scopeId, text, keyboard);
+            return;
+        }
         await this.messaging.editRichMarkdown(scopeId, messageId, text, keyboard);
     }
+    async safeDeliverChunks(scopeId, messageId, chunks) {
+        if (!chunks || chunks.length === 0)
+            return;
+        try {
+            if (messageId > 0) {
+                await this.editMessage(scopeId, messageId, chunks[0]).catch(async () => {
+                    await this.sendMessage(scopeId, chunks[0]).catch(() => { });
+                });
+            }
+            else {
+                await this.sendMessage(scopeId, chunks[0]).catch(() => { });
+            }
+            for (let i = 1; i < chunks.length; i++) {
+                await this.sendMessage(scopeId, chunks[i]).catch(() => { });
+            }
+        }
+        catch (err) {
+            this.logger.warn('orchestrator.safe_deliver_chunks_failed', { error: String(err) });
+        }
+    }
+    async safeDeliverMessage(scopeId, messageId, text) {
+        const chunks = chunkTelegramMessage(text);
+        await this.safeDeliverChunks(scopeId, messageId, chunks);
+    }
     async handleText(event) {
         const scopeId = event.scopeId;
         const locale = this.store.getChatSettings(scopeId)?.locale ?? 'zh';
@@ -423,7 +504,7 @@ export class UnifiedChannelOrchestrator {
                     return;
                 case 'model':
                     if (argsString) {
-                        this.store.setChatSettings(scopeId, argsString, null);
+                        this.store.setChatModel(scopeId, argsString === 'default' ? null : argsString);
                         this.syncCurrentBackendSettings(scopeId);
                         await this.sendMessage(scopeId, locale === 'zh' ? `✅ 模型已切换为: \`${argsString}\`` : `✅ Model switched to: \`${argsString}\``);
                     }
@@ -500,7 +581,7 @@ export class UnifiedChannelOrchestrator {
                 ? data.slice('engine:m:'.length)
                 : decodeURIComponent(data.slice('setup:model:'.length));
             const model = rawModel === 'default' ? null : rawModel;
-            this.store.setChatSettings(scopeId, model, null);
+            this.store.setChatModel(scopeId, model);
             this.syncCurrentBackendSettings(scopeId);
             await this.messaging.answerCallback(event.callbackQueryId, `Model: ${rawModel}`);
             await this.sendSetupMenu(scopeId, locale, messageId);
@@ -515,7 +596,7 @@ export class UnifiedChannelOrchestrator {
             if (targetEffort !== 'high' && settings?.serviceTier === 'boost') {
                 this.store.setChatServiceTier(scopeId, null);
             }
-            this.store.setChatSettings(scopeId, null, targetEffort);
+            this.store.setChatEffort(scopeId, targetEffort);
             this.syncCurrentBackendSettings(scopeId);
             await this.messaging.answerCallback(event.callbackQueryId, `Effort: ${rawEffort}`);
             await this.sendSetupMenu(scopeId, locale, messageId);
@@ -533,7 +614,7 @@ export class UnifiedChannelOrchestrator {
                 const nextBoost = !isBoost;
                 this.store.setChatServiceTier(scopeId, nextBoost ? 'boost' : null);
                 if (nextBoost) {
-                    this.store.setChatSettings(scopeId, null, 'high');
+                    this.store.setChatEffort(scopeId, 'high');
                 }
                 this.syncCurrentBackendSettings(scopeId);
                 await this.messaging.answerCallback(event.callbackQueryId, nextBoost ? (locale === 'zh' ? '🚀 Boost 模式已开启 (深度 High)' : '🚀 Boost Mode enabled (High)') : (locale === 'zh' ? '⚪ Boost 模式已关闭' : '⚪ Boost Mode disabled'));
@@ -567,11 +648,11 @@ export class UnifiedChannelOrchestrator {
             }
         }
     }
-    async startPromptTurn(event, prompt, locale) {
+    async startPromptTurn(event, prompt, locale, options) {
         const scopeId = event.scopeId;
         const binding = this.store.getBinding(scopeId);
         const cwd = binding?.cwd || this.config.defaultCwd;
-        const threadId = binding?.threadId || 'default';
+        const threadId = options?.forcedThreadId ?? binding?.threadId ?? 'default';
         let effectivePrompt = prompt;
         let stagedAttachments;
         if (event.attachments && event.attachments.length > 0) {
@@ -600,13 +681,13 @@ export class UnifiedChannelOrchestrator {
                 await this.sendMessage(scopeId, locale === 'zh'
                     ? `⚡ **已插话中断前置任务，立即开始新指令**：\n> ${effectivePrompt}`
                     : `⚡ **Interrupted previous turn, executing new instruction**:\n> ${effectivePrompt}`);
-                await this.executeTurn(event, effectivePrompt, locale, 0, stagedAttachments);
+                await this.executeTurn(event, effectivePrompt, locale, 0, stagedAttachments, options);
                 return;
             }
             await this.enqueuePromptTurn(event, effectivePrompt, locale);
             return;
         }
-        await this.executeTurn(event, effectivePrompt, locale, 0, stagedAttachments);
+        await this.executeTurn(event, effectivePrompt, locale, 0, stagedAttachments, options);
     }
     async enqueuePromptTurn(event, prompt, locale) {
         const scopeId = event.scopeId;
@@ -663,22 +744,41 @@ export class UnifiedChannelOrchestrator {
             this.logger.warn('orchestrator.drain_queue_failed', { error: String(err) });
         }
     }
-    async executeTurn(event, prompt, locale, retryCount = 0, stagedAttachments) {
+    async executeTurn(event, prompt, locale, retryCount = 0, stagedAttachments, options) {
         const scopeId = event.scopeId;
         const binding = this.store.getBinding(scopeId);
         const settings = this.store.getChatSettings(scopeId);
         const adapter = this.getAdapterForScope(scopeId);
         const cwd = binding?.cwd || this.config.defaultCwd;
-        const threadId = binding?.threadId || null;
+        const threadId = options?.forcedThreadId ?? binding?.threadId ?? null;
         const model = settings?.model || 'default';
         const isBoost = settings?.serviceTier === 'boost';
         const effort = isBoost ? 'high' : (settings?.reasoningEffort ?? 'high');
         const effectivePrompt = isBoost && !prompt.startsWith('[Boost Mode:')
             ? `[Boost Mode: Proceed with deep thinking, strategic planning, multiple perspectives, and rigorous verification.]\n\n${prompt}`
             : prompt;
-        const initialMsgId = await this.sendMessage(scopeId, locale === 'zh'
-            ? (isBoost ? `🚀 ${adapter.name} (Boost 模式) 正在深度思考中…` : `⏳ ${adapter.name} 正在思考中…`)
-            : (isBoost ? `🚀 ${adapter.name} (Boost Mode) is thinking deeply…` : `⏳ ${adapter.name} is thinking…`));
+        let initialMsgId = 0;
+        if (options?.reuseMessageId) {
+            initialMsgId = options.reuseMessageId;
+            try {
+                await this.editMessage(scopeId, initialMsgId, locale === 'zh'
+                    ? `🔄 **[重启恢复] ${adapter.name} 正在继续执行…**`
+                    : `🔄 **[Resuming after restart] ${adapter.name} is continuing…**`);
+            }
+            catch (editErr) {
+                this.logger.warn('orchestrator.reuse_message_failed', { error: String(editErr) });
+            }
+        }
+        else {
+            try {
+                initialMsgId = await this.sendMessage(scopeId, locale === 'zh'
+                    ? (isBoost ? `🚀 ${adapter.name} (Boost 模式) 正在深度思考中…` : `⏳ ${adapter.name} 正在思考中…`)
+                    : (isBoost ? `🚀 ${adapter.name} (Boost Mode) is thinking deeply…` : `⏳ ${adapter.name} is thinking…`));
+            }
+            catch (sendErr) {
+                this.logger.warn('orchestrator.initial_message_failed', { error: String(sendErr) });
+            }
+        }
         const turnKey = `${adapter.id}_${scopeId}_${Date.now()}`;
         try {
             this.store.saveActiveTurnPreview({
@@ -786,79 +886,47 @@ export class UnifiedChannelOrchestrator {
             }
             scheduleFlush();
         });
+        execution.on('conversation', (convId) => {
+            if (!convId)
+                return;
+            activeTurn.threadId = convId;
+            this.store.setBinding(scopeId, convId, cwd);
+            this.store.saveActiveTurnPreview({
+                turnId: turnKey,
+                scopeId,
+                threadId: convId,
+                messageId: activeTurn.messageId,
+            });
+            this.syncCurrentBackendSettings(scopeId);
+        });
         const retryTurn = async (nextRetryCount) => {
-            await this.executeTurn(event, prompt, locale, nextRetryCount, stagedAttachments);
+            await this.executeTurn(event, prompt, locale, nextRetryCount, stagedAttachments, options);
         };
         execution.on('result', async (res) => {
-            if (activeTurn.flushTimer)
-                clearTimeout(activeTurn.flushTimer);
-            if (activeTurn.typingTimer)
-                clearInterval(activeTurn.typingTimer);
-            this.activeTurns.delete(scopeId);
-            this.store.removeActiveTurnPreview(turnKey);
-            if (res.conversationId && (!binding?.threadId || binding.threadId !== res.conversationId)) {
-                this.store.setBinding(scopeId, res.conversationId, cwd);
-                this.syncCurrentBackendSettings(scopeId);
-            }
-            if (res.usage) {
-                this.store.recordTokenUsage({
-                    inputTokens: res.usage.inputTokens,
-                    outputTokens: res.usage.outputTokens,
-                    cachedTokens: res.usage.cachedTokens,
-                    totalTokens: res.usage.totalTokens,
-                }, adapter.id);
-            }
-            if (res.status === 'SUCCESS') {
-                let finalText = (res.response || '').trim();
-                if (!finalText && activeTurn.accumulatedText) {
-                    finalText = activeTurn.accumulatedText.trim();
-                }
-                const foldedTools = buildFoldedToolsSummary({
-                    stepIndex: activeTurn.stepIndex,
-                    toolLines: activeTurn.toolLines,
-                    toolCount: activeTurn.toolCount || activeTurn.toolLines.length,
-                    startTime: activeTurn.startTime,
-                    usage: res.usage,
-                    locale,
-                });
-                const chunks = combineSummaryAndResponse(foldedTools, finalText || '(无输出 / No output)');
-                if (chunks.length > 0) {
-                    await this.editMessage(scopeId, activeTurn.messageId, chunks[0]).catch(() => {
-                        return this.sendMessage(scopeId, chunks[0]);
-                    });
-                    for (let i = 1; i < chunks.length; i++) {
-                        await this.sendMessage(scopeId, chunks[i]);
-                    }
-                }
-                await this.drainNextQueuedTurn(event, locale);
-                return;
-            }
-            if (res.status === 'ERROR') {
-                const errorText = (res.error || res.response || res.error || 'Unknown error').trim();
-                if (adapter.handleTurnError) {
-                    const handled = await adapter.handleTurnError({
-                        error: errorText,
-                        request: req,
-                        retryCount,
-                        retryTurn,
-                        sendMessage: (text) => this.sendMessage(scopeId, text),
-                        editMessage: (messageId, text) => this.editMessage(scopeId, messageId, text),
-                    });
-                    if (handled)
-                        return;
+            try {
+                if (activeTurn.flushTimer)
+                    clearTimeout(activeTurn.flushTimer);
+                if (activeTurn.typingTimer)
+                    clearInterval(activeTurn.typingTimer);
+                this.activeTurns.delete(scopeId);
+                this.store.removeActiveTurnPreview(turnKey);
+                if (res.conversationId && (!binding?.threadId || binding.threadId !== res.conversationId)) {
+                    this.store.setBinding(scopeId, res.conversationId, cwd);
+                    this.syncCurrentBackendSettings(scopeId);
                 }
-                // If the agent actually produced substantive response text, do NOT mask it with an error box!
-                let finalText = (res.response || '').trim();
-                if (!finalText && activeTurn.accumulatedText) {
-                    finalText = activeTurn.accumulatedText.trim();
+                if (res.usage) {
+                    this.store.recordTokenUsage({
+                        inputTokens: res.usage.inputTokens,
+                        outputTokens: res.usage.outputTokens,
+                        cachedTokens: res.usage.cachedTokens,
+                        totalTokens: res.usage.totalTokens,
+                    }, adapter.id);
                 }
-                const isPureError = !finalText ||
-                    finalText === errorText ||
-                    finalText.startsWith('Process exited with code') ||
-                    finalText.startsWith('Verification Required') ||
-                    finalText.startsWith('Error:') ||
-                    finalText.length <= 20;
-                if (!isPureError) {
+                if (res.status === 'SUCCESS') {
+                    let finalText = (res.response || '').trim();
+                    if (!finalText && activeTurn.accumulatedText) {
+                        finalText = activeTurn.accumulatedText.trim();
+                    }
                     const foldedTools = buildFoldedToolsSummary({
                         stepIndex: activeTurn.stepIndex,
                         toolLines: activeTurn.toolLines,
@@ -867,71 +935,155 @@ export class UnifiedChannelOrchestrator {
                         usage: res.usage,
                         locale,
                     });
-                    const warningNote = errorText && errorText !== 'Unknown error' && errorText !== 'Antigravity execution failed'
-                        ? `\n\n⚠️ <i>(注意：任务结束时伴随提示: ${escapeTelegramHtml(errorText.slice(0, 120))})</i>`
-                        : '';
-                    const chunks = combineSummaryAndResponse(foldedTools, finalText + warningNote);
-                    if (chunks.length > 0) {
-                        await this.editMessage(scopeId, activeTurn.messageId, chunks[0]).catch(() => {
-                            return this.sendMessage(scopeId, chunks[0]);
-                        });
-                        for (let i = 1; i < chunks.length; i++) {
-                            await this.sendMessage(scopeId, chunks[i]);
+                    const chunks = combineSummaryAndResponse(foldedTools, finalText || '(无输出 / No output)');
+                    await this.safeDeliverChunks(scopeId, activeTurn.messageId, chunks);
+                    await this.drainNextQueuedTurn(event, locale).catch(() => { });
+                    return;
+                }
+                if (res.status === 'ERROR') {
+                    const errorText = (res.error || res.response || res.error || 'Unknown error').trim();
+                    if (adapter.handleTurnError) {
+                        try {
+                            const handled = await adapter.handleTurnError({
+                                error: errorText,
+                                request: req,
+                                retryCount,
+                                retryTurn,
+                                sendMessage: (text) => this.sendMessage(scopeId, text),
+                                editMessage: (messageId, text) => this.editMessage(scopeId, messageId, text),
+                            });
+                            if (handled)
+                                return;
+                        }
+                        catch (adapterErr) {
+                            this.logger.warn('orchestrator.adapter_handle_turn_error_failed', { error: String(adapterErr) });
+                        }
+                    }
+                    if (isTransientNetworkError(errorText) && retryCount < 3) {
+                        const backoffMs = Math.min(15000, 3000 * Math.pow(2, retryCount));
+                        const delaySec = Math.round(backoffMs / 1000);
+                        try {
+                            await this.sendMessage(scopeId, locale === 'zh'
+                                ? `🌐 **网络波动重试 (第 ${retryCount + 1}/3 次)**: 正在等待网络稳定 (${delaySec}s) 后自动恢复任务…`
+                                : `🌐 **Network Retry (${retryCount + 1}/3)**: Waiting for connection (${delaySec}s) to resume task…`);
                         }
+                        catch {
+                            /* ignore messaging error during network glitch */
+                        }
+                        await new Promise((r) => setTimeout(r, backoffMs));
+                        try {
+                            await retryTurn(retryCount + 1);
+                        }
+                        catch (retryErr) {
+                            this.logger.error('orchestrator.retry_turn_failed', { error: String(retryErr) });
+                        }
+                        return;
                     }
-                    await this.drainNextQueuedTurn(event, locale);
+                    // If the agent actually produced substantive response text, do NOT mask it with an error box!
+                    let finalText = (res.response || '').trim();
+                    if (!finalText && activeTurn.accumulatedText) {
+                        finalText = activeTurn.accumulatedText.trim();
+                    }
+                    const isPureError = !finalText ||
+                        finalText === errorText ||
+                        finalText.startsWith('Process exited with code') ||
+                        finalText.startsWith('Verification Required') ||
+                        finalText.startsWith('Error:') ||
+                        finalText.length <= 20;
+                    if (!isPureError) {
+                        const foldedTools = buildFoldedToolsSummary({
+                            stepIndex: activeTurn.stepIndex,
+                            toolLines: activeTurn.toolLines,
+                            toolCount: activeTurn.toolCount || activeTurn.toolLines.length,
+                            startTime: activeTurn.startTime,
+                            usage: res.usage,
+                            locale,
+                        });
+                        const warningNote = errorText && errorText !== 'Unknown error' && errorText !== 'Antigravity execution failed'
+                            ? `\n\n⚠️ <i>(注意：任务结束时伴随提示: ${escapeTelegramHtml(errorText.slice(0, 120))})</i>`
+                            : '';
+                        const chunks = combineSummaryAndResponse(foldedTools, finalText + warningNote);
+                        await this.safeDeliverChunks(scopeId, activeTurn.messageId, chunks);
+                        await this.drainNextQueuedTurn(event, locale).catch(() => { });
+                        return;
+                    }
+                    await this.safeDeliverMessage(scopeId, activeTurn.messageId, `❌ **${adapter.name} 错误**:\n\`\`\`\n${errorText}\n\`\`\``);
+                    await this.drainNextQueuedTurn(event, locale).catch(() => { });
                     return;
                 }
-                await this.editMessage(scopeId, activeTurn.messageId, `❌ **${adapter.name} 错误**:\n\`\`\`\n${errorText}\n\`\`\``);
-                await this.drainNextQueuedTurn(event, locale);
-                return;
+                await this.safeDeliverMessage(scopeId, activeTurn.messageId, activeTurn.accumulatedText || '⚠️ 执行结束');
+                await this.drainNextQueuedTurn(event, locale).catch(() => { });
+            }
+            catch (fatalErr) {
+                this.logger.error('orchestrator.turn_result_unhandled', { error: String(fatalErr) });
             }
-            await this.editMessage(scopeId, activeTurn.messageId, activeTurn.accumulatedText || '⚠️ 执行结束');
-            await this.drainNextQueuedTurn(event, locale);
         });
         execution.on('error', async (err) => {
-            if (activeTurn.flushTimer)
-                clearTimeout(activeTurn.flushTimer);
-            if (activeTurn.typingTimer)
-                clearInterval(activeTurn.typingTimer);
-            this.activeTurns.delete(scopeId);
-            this.store.removeActiveTurnPreview(turnKey);
-            if (adapter.handleTurnError) {
-                const handled = await adapter.handleTurnError({
-                    error: err.message,
-                    request: req,
-                    retryCount,
-                    retryTurn,
-                    sendMessage: (text) => this.sendMessage(scopeId, text),
-                    editMessage: (messageId, text) => this.editMessage(scopeId, messageId, text),
-                });
-                if (handled)
+            try {
+                if (activeTurn.flushTimer)
+                    clearTimeout(activeTurn.flushTimer);
+                if (activeTurn.typingTimer)
+                    clearInterval(activeTurn.typingTimer);
+                this.activeTurns.delete(scopeId);
+                this.store.removeActiveTurnPreview(turnKey);
+                if (adapter.handleTurnError) {
+                    try {
+                        const handled = await adapter.handleTurnError({
+                            error: err.message,
+                            request: req,
+                            retryCount,
+                            retryTurn,
+                            sendMessage: (text) => this.sendMessage(scopeId, text),
+                            editMessage: (messageId, text) => this.editMessage(scopeId, messageId, text),
+                        });
+                        if (handled)
+                            return;
+                    }
+                    catch (adapterErr) {
+                        this.logger.warn('orchestrator.adapter_handle_error_failed', { error: String(adapterErr) });
+                    }
+                }
+                if (isTransientNetworkError(err.message) && retryCount < 3) {
+                    const backoffMs = Math.min(15000, 3000 * Math.pow(2, retryCount));
+                    const delaySec = Math.round(backoffMs / 1000);
+                    try {
+                        await this.sendMessage(scopeId, locale === 'zh'
+                            ? `🌐 **网络波动重试 (第 ${retryCount + 1}/3 次)**: 正在等待网络稳定 (${delaySec}s) 后自动恢复任务…`
+                            : `🌐 **Network Retry (${retryCount + 1}/3)**: Waiting for connection (${delaySec}s) to resume task…`);
+                    }
+                    catch {
+                        /* ignore */
+                    }
+                    await new Promise((r) => setTimeout(r, backoffMs));
+                    try {
+                        await retryTurn(retryCount + 1);
+                    }
+                    catch (retryErr) {
+                        this.logger.error('orchestrator.retry_turn_failed', { error: String(retryErr) });
+                    }
                     return;
-            }
-            if (activeTurn.accumulatedText && activeTurn.accumulatedText.trim().length > 20) {
-                const foldedTools = buildFoldedToolsSummary({
-                    stepIndex: activeTurn.stepIndex,
-                    toolLines: activeTurn.toolLines,
-                    toolCount: activeTurn.toolCount || activeTurn.toolLines.length,
-                    startTime: activeTurn.startTime,
-                    locale,
-                });
-                const fullAnswer = activeTurn.accumulatedText.trim() +
-                    `\n\n⚠️ <i>(注意：任务执行中途异常中断: ${escapeTelegramHtml(err.message.slice(0, 120))})</i>`;
-                const chunks = combineSummaryAndResponse(foldedTools, fullAnswer);
-                if (chunks.length > 0) {
-                    await this.editMessage(scopeId, activeTurn.messageId, chunks[0]).catch(() => {
-                        return this.sendMessage(scopeId, chunks[0]);
+                }
+                if (activeTurn.accumulatedText && activeTurn.accumulatedText.trim().length > 20) {
+                    const foldedTools = buildFoldedToolsSummary({
+                        stepIndex: activeTurn.stepIndex,
+                        toolLines: activeTurn.toolLines,
+                        toolCount: activeTurn.toolCount || activeTurn.toolLines.length,
+                        startTime: activeTurn.startTime,
+                        locale,
                     });
-                    for (let i = 1; i < chunks.length; i++) {
-                        await this.sendMessage(scopeId, chunks[i]);
-                    }
+                    const fullAnswer = activeTurn.accumulatedText.trim() +
+                        `\n\n⚠️ <i>(注意：任务执行中途异常中断: ${escapeTelegramHtml(err.message.slice(0, 120))})</i>`;
+                    const chunks = combineSummaryAndResponse(foldedTools, fullAnswer);
+                    await this.safeDeliverChunks(scopeId, activeTurn.messageId, chunks);
+                    await this.drainNextQueuedTurn(event, locale).catch(() => { });
+                    return;
                 }
-                await this.drainNextQueuedTurn(event, locale);
-                return;
+                await this.safeDeliverMessage(scopeId, activeTurn.messageId, `❌ **执行异常**:\n\`\`\`\n${err.message}\n\`\`\``);
+                await this.drainNextQueuedTurn(event, locale).catch(() => { });
+            }
+            catch (fatalErr) {
+                this.logger.error('orchestrator.turn_error_unhandled', { error: String(fatalErr) });
             }
-            await this.editMessage(scopeId, activeTurn.messageId, `❌ **执行异常**:\n\`\`\`\n${err.message}\n\`\`\``);
-            await this.drainNextQueuedTurn(event, locale);
         });
     }
     async handleEffortCommand(scopeId, args, locale) {
@@ -941,7 +1093,7 @@ export class UnifiedChannelOrchestrator {
             if (target !== 'high' && settings?.serviceTier === 'boost') {
                 this.store.setChatServiceTier(scopeId, null);
             }
-            this.store.setChatSettings(scopeId, null, target);
+            this.store.setChatEffort(scopeId, target);
             this.syncCurrentBackendSettings(scopeId);
             await this.sendMessage(scopeId, locale === 'zh' ? `✅ 思考深度已设置为: \`${target}\`` : `✅ Reasoning effort set to: \`${target}\``);
         }
@@ -962,7 +1114,7 @@ export class UnifiedChannelOrchestrator {
             nextBoost = false;
         this.store.setChatServiceTier(scopeId, nextBoost ? 'boost' : null);
         if (nextBoost) {
-            this.store.setChatSettings(scopeId, null, 'high');
+            this.store.setChatEffort(scopeId, 'high');
         }
         this.syncCurrentBackendSettings(scopeId);
         const msg = locale === 'zh'