@wu529778790/open-im 1.8.1-beta.14 → 1.8.1-beta.16

package/dist/adapters/claude-sdk-adapter.js

@@ -255,19 +255,28 @@ export class ClaudeSDKAdapter {
                         }
                     }
                     // 如果流正常结束但没有收到 result 消息
-                    if (!streamClosed && accumulated) {
-                        log.info('Stream ended without result message, using accumulated text');
-                        runSettled = true;
-                        clearRunTimeout();
-                        callbacks.onComplete({
-                            success: true,
-                            result: accumulated,
-                            accumulated,
-                            cost: 0,
-                            durationMs: 0,
-                            numTurns: 1,
-                            toolStats,
-                        });
+                    if (!streamClosed) {
+                        if (accumulated) {
+                            log.info('Stream ended without result message, using accumulated text');
+                            runSettled = true;
+                            clearRunTimeout();
+                            callbacks.onComplete({
+                                success: true,
+                                result: accumulated,
+                                accumulated,
+                                cost: 0,
+                                durationMs: 0,
+                                numTurns: 1,
+                                toolStats,
+                            });
+                        }
+                        else {
+                            // 流结束但无 result 也无 accumulated：必须触发回调，否则 Promise 永远挂起
+                            log.warn('Stream ended with no result and no accumulated text, calling onError to prevent stuck state');
+                            runSettled = true;
+                            clearRunTimeout();
+                            callbacks.onError('AI 响应异常结束（无输出），请重试');
+                        }
                     }
                 }
                 finally {

package/dist/telegram/event-handler.js

@@ -194,7 +194,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
                     }
                 }
             };
-            return (content, toolNote) => {
+            const wrapper = (content, toolNote) => {
                 if (content.startsWith("💭 **思考中...**")) {
                     return;
                 }
@@ -215,6 +215,17 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
                     performUpdate(content, toolNote);
                 }, Math.max(DEBOUNCE_MS, baseDelay));
             };
+            // flush 排队的 debounce 更新，防止 sendComplete 时仍有 streaming 更新在排队
+            wrapper.flush = async () => {
+                if (debounceTimer) {
+                    clearTimeout(debounceTimer);
+                    debounceTimer = null;
+                }
+                while (updateInProgress) {
+                    await new Promise((resolve) => setTimeout(resolve, 50));
+                }
+            };
+            return wrapper;
         };
         const streamUpdateWrapper = createStreamUpdateWrapper();
         await runAITask({ config, sessionManager }, {
@@ -232,12 +243,30 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
             },
             sendComplete: async (content, note) => {
                 throttle.reset();
-                try {
-                    await sendFinalMessages(chatId, msgId, content, note, toolId);
-                }
-                catch (err) {
-                    log.error("Failed to send complete message:", err);
-                    await updateMessage(chatId, msgId, content, "done", note, toolId);
+                // 先 flush 排队的 streaming 更新，防止它覆盖后续的 done 消息
+                await streamUpdateWrapper.flush?.();
+                const maxAttempts = 3;
+                for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+                    try {
+                        await sendFinalMessages(chatId, msgId, content, note, toolId);
+                        return;
+                    }
+                    catch (err) {
+                        log.error(`Failed to send complete message (attempt ${attempt}/${maxAttempts}):`, err);
+                        if (attempt < maxAttempts) {
+                            await new Promise((r) => setTimeout(r, 2000 * attempt));
+                        }
+                        else {
+                            // 最终失败：尝试发送纯文本作为最后手段
+                            try {
+                                await sendTextReply(chatId, `⚠️ 消息更新失败（网络异常），以下是 AI 回复：\n\n${content.slice(0, 4000)}`);
+                            }
+                            catch (fallbackErr) {
+                                log.error("All send attempts failed:", fallbackErr);
+                                throw err;
+                            }
+                        }
+                    }
                 }
             },
             sendError: async (error) => {

package/dist/telegram/message-sender.js

@@ -85,6 +85,10 @@ export async function updateMessage(chatId, messageId, content, status, note, to
         }
         else {
             log.error("Failed to update message:", err);
+            // 对 done/error 状态的更新失败必须 throw，否则消息永远卡在 streaming
+            if (status === "done" || status === "error") {
+                throw err;
+            }
         }
     }
     if (status === "done" || status === "error") {

package/dist/wework/event-handler.js

@@ -21,6 +21,8 @@ import { buildMediaContext } from '../shared/media-context.js';
 import { buildErrorNote, buildProgressNote } from '../shared/message-note.js';
 const log = createLogger('WeWorkHandler');
 const WEWORK_MEDIA_TIMEOUT_MS = 60_000;
+// Safety timeout: abort hung tasks before stream expires (5 min TTL → 4.5 min safety)
+const WEWORK_TASK_SAFETY_TIMEOUT_MS = 4.5 * 60 * 1000;
 async function saveWeWorkUrlMedia(payload, fallbackExtension) {
     if (!payload.url) {
         throw new Error("Missing WeWork media URL");
@@ -199,6 +201,24 @@ export function setupWeWorkHandlers(config, sessionManager) {
             }
             const stopTyping = startTypingLoop(chatId);
             const taskKey = `${userId}:${msgId}`;
+            // Safety timeout: abort hung tasks before stream expires, unblocking the queue
+            let safetyTimer = setTimeout(() => {
+                safetyTimer = null;
+                const state = runningTasks.get(taskKey);
+                if (state) {
+                    log.warn(`[SAFETY_TIMEOUT] Task ${taskKey} exceeded ${WEWORK_TASK_SAFETY_TIMEOUT_MS}ms, aborting`);
+                    state.handle.abort();
+                    runningTasks.delete(taskKey);
+                    stopTyping();
+                    sendTextReply(chatId, `AI 处理超时（${Math.round(WEWORK_TASK_SAFETY_TIMEOUT_MS / 1000)}s），已自动取消。请重试。`, reqId).catch(() => { });
+                }
+            }, WEWORK_TASK_SAFETY_TIMEOUT_MS);
+            const clearSafetyTimer = () => {
+                if (safetyTimer) {
+                    clearTimeout(safetyTimer);
+                    safetyTimer = null;
+                }
+            };
             await runAITask({ config, sessionManager }, { userId, chatId, workDir, sessionId, convId, platform: 'wework', taskKey }, prompt, toolAdapter, {
                 throttleMs: WEWORK_THROTTLE_MS,
                 streamUpdate: async (content, toolNote) => {
@@ -217,6 +237,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
                     await updateMessage(chatId, msgId, `Error: ${error}`, 'error', buildErrorNote(), toolId, reqId);
                 },
                 extraCleanup: () => {
+                    clearSafetyTimer();
                     stopTyping();
                     runningTasks.delete(taskKey);
                 },

package/dist/wework/message-sender.js

@@ -187,6 +187,12 @@ export async function updateMessage(chatId, streamId, content, status, note, too
             return;
         if (Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS) {
             markExpired(state, streamId);
+            // Stream expired - fall back to text delivery for errors and final states
+            if (status === 'error' || status === 'done') {
+                const reqIdUsed = getReqId(reqId);
+                sendText(reqIdUsed, message);
+                log.info(`Stream expired, sent ${status} via text fallback: streamId=${streamId}`);
+            }
             return;
         }
         state.pendingUpdate = { message, status, reqId };
@@ -207,17 +213,24 @@ export async function sendFinalMessages(chatId, streamId, fullContent, note, too
     const title = getToolTitle(toolId, 'done');
     const parts = splitLongContent(contentToSend, MAX_WEWORK_MESSAGE_LENGTH);
     const finalMessage = formatWeWorkMessage(title, parts[0], 'done', parts.length > 1 ? `内容较长，已分段发送 (1/${parts.length})` : note);
-    try {
-        const state = streamStates.get(streamId);
-        const shouldFallbackToText = !!state && (state.expired || Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS);
-        if (!shouldFallbackToText && state && contentToSend.length > 0) {
-            // 先发一条「输出中」带正文，再发 finish 的最终条，避免企微端一直停在「思考中」不刷新
+    const state = streamStates.get(streamId);
+    const shouldFallbackToText = !!state && (state.expired || Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS);
+    // 先发一条「输出中」带正文，再发 finish 的最终条，避免企微端一直停在「思考中」不刷新
+    // 独立 try-catch：即使此步失败，仍须发送 finish=true，否则企微永远卡在「正在思考」
+    if (!shouldFallbackToText && state && contentToSend.length > 0) {
+        try {
             await updateMessage(chatId, streamId, contentToSend, 'streaming', note, toolId, reqId);
         }
-        if (state) {
-            state.closed = true;
-            state.pendingUpdate = undefined;
+        catch (err) {
+            log.warn('Pre-finish streaming update failed, will still send finish=true:', err);
         }
+    }
+    if (state) {
+        state.closed = true;
+        state.pendingUpdate = undefined;
+    }
+    // finish=true 是关键：必须保证发出，否则企微 UI 永远停留在「正在思考」
+    try {
         if (!shouldFallbackToText) {
             if (state) {
                 const elapsed = Date.now() - state.lastSentAt;
@@ -232,21 +245,28 @@ export async function sendFinalMessages(chatId, streamId, fullContent, note, too
             sendText(getReqId(reqId), finalMessage);
             log.info(`Final stream expired, sent text fallback instead: streamId=${streamId}`);
         }
-        streamStates.delete(streamId);
-        for (let i = 1; i < parts.length; i++) {
-            try {
-                const partContent = `${parts[i]}\n\n_*(续 ${i + 1}/${parts.length})*_`;
-                const partMessage = formatWeWorkMessage(title, partContent, 'done', i === parts.length - 1 ? note : undefined);
-                sendText(getReqId(reqId), partMessage);
-                log.info(`Final message part ${i + 1}/${parts.length} sent`);
-            }
-            catch (err) {
-                log.error(`Failed to send part ${i + 1}:`, err);
-            }
-        }
     }
     catch (err) {
-        log.error('Failed to send final messages:', err);
+        log.warn('Primary finish send failed, trying text fallback:', err);
+        try {
+            sendText(getReqId(reqId), finalMessage);
+            log.info(`Fallback text sent after primary finish failure, streamId=${streamId}`);
+        }
+        catch (fallbackErr) {
+            log.error('Both primary and fallback finish sends failed:', fallbackErr);
+        }
+    }
+    streamStates.delete(streamId);
+    for (let i = 1; i < parts.length; i++) {
+        try {
+            const partContent = `${parts[i]}\n\n_*(续 ${i + 1}/${parts.length})*_`;
+            const partMessage = formatWeWorkMessage(title, partContent, 'done', i === parts.length - 1 ? note : undefined);
+            sendText(getReqId(reqId), partMessage);
+            log.info(`Final message part ${i + 1}/${parts.length} sent`);
+        }
+        catch (err) {
+            log.error(`Failed to send part ${i + 1}:`, err);
+        }
     }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.8.1-beta.14",
+  "version": "1.8.1-beta.16",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",