@wu529778790/open-im 1.9.4-beta.6 → 1.9.4-beta.8

package/dist/feishu/event-handler.js

@@ -1,5 +1,5 @@
 import { resolvePlatformAiCommand } from '../config.js';
-import { sendTextReply, startTypingLoop, sendImageReply, sendThinkingCard, streamContentUpdate, } from './message-sender.js';
+import { sendTextReply, startTypingLoop, sendImageReply, sendThinkingCard, streamContentUpdate, sendFinalCards, sendErrorCard, } from './message-sender.js';
 import { buildCardV2 } from './card-builder.js';
 import { disableStreaming, updateCardFull, destroySession } from './cardkit-manager.js';
 import { CARDKIT_THROTTLE_MS } from '../constants.js';
@@ -172,33 +172,6 @@ export function setupFeishuHandlers(config, sessionManager) {
             await sendImageReply(chatId, imagePath);
         },
     };
-    // Feishu-specific task callbacks for CardKit streaming
-    const feishuTaskCallbacks = {
-        streamUpdate: async (content, toolNote) => {
-            if (consecutiveStreamErrors >= MAX_STREAM_ERRORS)
-                return; // Stop trying
-            const note = buildProgressNote(toolNote);
-            // Note: cardId is passed via taskKey format: userId:cardId
-            const cardId = content; // Placeholder, will be overridden via context
-            streamContentUpdate(cardId, content, note).then(() => {
-                consecutiveStreamErrors = 0;
-            }).catch((e) => {
-                consecutiveStreamErrors++;
-                if (consecutiveStreamErrors >= MAX_STREAM_ERRORS) {
-                    log.warn(`Stream update failed ${consecutiveStreamErrors} times consecutively, giving up: ${e?.message ?? e}`);
-                }
-                else {
-                    log.debug('Stream update failed (will retry on next update):', e?.message ?? e);
-                }
-            });
-        },
-        sendComplete: async (content, note) => {
-            // Will be customized via context
-        },
-        sendError: async (error) => {
-            // Will be customized via context
-        },
-    };
     // Create platform-specific AI request handler
     const handleAIRequest = createPlatformAIRequestHandler({
         platform: 'feishu',
@@ -214,6 +187,30 @@ export function setupFeishuHandlers(config, sessionManager) {
             const resetCard = buildCardV2({ content: content || '...', status: 'streaming', toolName: resolvePlatformAiCommand(config, 'feishu') }, cardId);
             updateCardFull(cardId, resetCard).catch((e) => log.warn('Thinking→text transition update failed:', e?.message ?? e));
         },
+        taskCallbacksFactory: ({ chatId, msgId: cardId, toolId }) => ({
+            streamUpdate: async (content, toolNote) => {
+                if (consecutiveStreamErrors >= MAX_STREAM_ERRORS)
+                    return;
+                const note = buildProgressNote(toolNote);
+                streamContentUpdate(cardId, content, note).then(() => {
+                    consecutiveStreamErrors = 0;
+                }).catch((e) => {
+                    consecutiveStreamErrors++;
+                    if (consecutiveStreamErrors >= MAX_STREAM_ERRORS) {
+                        log.warn(`Stream update failed ${consecutiveStreamErrors} times consecutively, giving up: ${e?.message ?? e}`);
+                    }
+                    else {
+                        log.debug('Stream update failed (will retry on next update):', e?.message ?? e);
+                    }
+                });
+            },
+            sendComplete: async (content, note, thinkingText) => {
+                await sendFinalCards(chatId, '', cardId, content, note ?? '', thinkingText, toolId);
+            },
+            sendError: async (error) => {
+                await sendErrorCard(cardId, error);
+            },
+        }),
     });
     /**
      * 解析 action value（兼容对象、JSON 字符串）

package/dist/qq/event-handler.js

@@ -1,4 +1,4 @@
-import { sendThinkingMessage, sendTextReply, sendImageReply, sendDirectorySelection, startTypingLoop, } from "./message-sender.js";
+import { sendThinkingMessage, sendFinalMessages, sendErrorMessage, sendTextReply, sendImageReply, sendDirectorySelection, startTypingLoop, } from "./message-sender.js";
 import { createLogger } from "../logger.js";
 import { buildMediaMetadataPrompt } from "../shared/media-prompt.js";
 import { buildSavedMediaBatchPrompt, buildSavedMediaPrompt } from "../shared/media-analysis-prompt.js";
@@ -153,31 +153,21 @@ export function setupQQHandlers(config, sessionManager) {
                 qqTaskContextMap.delete(ctx.taskKey);
             };
         },
-        taskCallbacks: {
-            streamUpdate: async (content, toolNote) => {
-                // QQ doesn't support streaming updates; this is a no-op
+        taskCallbacksFactory: ({ chatId, msgId, toolId }) => ({
+            streamUpdate: async () => {
+                // QQ doesn't support streaming updates
             },
             sendComplete: async (content, note) => {
-                // QQ sends final - handled via pendingReplies in message-sender.ts
+                await sendFinalMessages(chatId, msgId, content, note ?? '', toolId);
             },
             sendError: async (error) => {
-                // QQ sends error - handled via pendingReplies in message-sender.ts
+                await sendErrorMessage(chatId, msgId, error, toolId);
             },
-        },
+        }),
     });
-    // Wrap factory handleAIRequest to match ClaudeRequestHandler signature
-    // (used by commandHandler.dispatch and handleTextFlow)
-    async function handleAIRequest(userId, chatId, prompt, workDir, convId, _threadCtx, replyToMessageId, signal) {
-        await factoryHandleAIRequest({
-            userId,
-            chatId,
-            prompt,
-            workDir,
-            convId,
-            replyToMessageId,
-            signal,
-        });
-    }
+    // NOTE: handleTextFlow calls handleAIRequest with an OBJECT argument,
+    // so we pass factoryHandleAIRequest directly (it takes HandleAIRequestParams).
+    // The attachment path also uses factoryHandleAIRequest with object syntax.
     function cleanupRecentEvents(now) {
         for (const [eventId, timestamp] of recentEventIds) {
             if (now - timestamp > QQ_EVENT_DEDUP_TTL_MS) {
@@ -238,7 +228,7 @@ export function setupQQHandlers(config, sessionManager) {
                     chatId,
                     text,
                     ctx: platformContext,
-                    handleAIRequest,
+                    handleAIRequest: factoryHandleAIRequest,
                     sendTextReply,
                     workDir: sessionManager.getWorkDir(userId),
                     convId: sessionManager.getConvId(userId),
@@ -266,7 +256,15 @@ export function setupQQHandlers(config, sessionManager) {
                 setChatUser(chatId, userId, "qq");
                 // Enqueue attachment prompt
                 const enqueueResult = requestQueue.enqueue(userId, convId ?? '', attachmentPrompt, async (prompt, signal) => {
-                    await handleAIRequest(userId, chatId, prompt, workDir, convId, undefined, event.id, signal);
+                    await factoryHandleAIRequest({
+                        userId,
+                        chatId,
+                        prompt,
+                        workDir,
+                        convId,
+                        replyToMessageId: event.id,
+                        signal,
+                    });
                 });
                 if (enqueueResult === "rejected") {
                     await sendTextReply(chatId, "Request queue is full. Please try again later.");

package/dist/shared/ai-task.js

@@ -143,6 +143,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     throttledUpdate(taskState.latestContent, true);
                 },
                 onComplete: async (result) => {
+                    log.info(`[AITask] onComplete fired: settled=${settled}, success=${result.success}, platform=${ctx.platform}, taskKey=${ctx.taskKey}`);
                     if (settled)
                         return;
                     settled = true;

package/package.json

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