@wu529778790/open-im 1.10.7-beta.2 → 1.10.7-beta.4

package/dist/commands/handler.js

@@ -123,6 +123,7 @@ export class CommandHandler {
             return true;
         }
         const entry = history[index - 1];
+        this.deps.requestQueue.cancelUser(userId);
         const ok = this.deps.sessionManager.resumeConv(userId, entry.convId);
         if (ok) {
             await this.replySender().sendTextReply(chatId, `✅ 已恢复会话 ${index} (${entry.convId})，共 ${entry.totalTurns}轮对话。\n继续发消息即可。`);
@@ -133,6 +134,7 @@ export class CommandHandler {
         return true;
     }
     async handleNew(chatId, userId) {
+        this.deps.requestQueue.cancelUser(userId);
         const ok = this.deps.sessionManager.newSession(userId);
         await this.replySender().sendTextReply(chatId, ok
             ? '✅ AI 会话已重置，下一条消息将使用全新上下文。'
@@ -175,6 +177,7 @@ export class CommandHandler {
             return true;
         }
         try {
+            this.deps.requestQueue.cancelUser(userId);
             const resolved = await this.deps.sessionManager.setWorkDir(userId, dir);
             await this.replySender().sendTextReply(chatId, `📁 工作目录已切换到: ${escapePathForMarkdown(resolved)}\n\n` +
                 `🔄 AI 会话已重置，下一条消息将使用全新上下文。`);

package/dist/constants.d.ts

@@ -36,3 +36,5 @@ export declare const MAX_FEISHU_MESSAGE_LENGTH = 4000;
 export declare const MAX_STREAMING_CONTENT_LENGTH = 25000;
 export declare const MAX_WEWORK_MESSAGE_LENGTH = 2048;
 export declare const MAX_DINGTALK_MESSAGE_LENGTH = 2048;
+/** WeChat KF (微信客服) 单条消息最大字符数 */
+export declare const MAX_WORKBUDDY_MESSAGE_LENGTH = 2000;

package/dist/constants.js

@@ -66,3 +66,5 @@ export const MAX_FEISHU_MESSAGE_LENGTH = 4000;
 export const MAX_STREAMING_CONTENT_LENGTH = 25000;
 export const MAX_WEWORK_MESSAGE_LENGTH = 2048;
 export const MAX_DINGTALK_MESSAGE_LENGTH = 2048;
+/** WeChat KF (微信客服) 单条消息最大字符数 */
+export const MAX_WORKBUDDY_MESSAGE_LENGTH = 2000;

package/dist/queue/request-queue.d.ts

@@ -1,8 +1,21 @@
 export type EnqueueResult = 'running' | 'queued' | 'rejected';
 export declare class RequestQueue {
     private queues;
-    enqueue(userId: string, convId: string, prompt: string, execute: (prompt: string, signal: AbortSignal) => Promise<void>): EnqueueResult;
-    /** 清除指定用户会话的所有排队任务（不中止正在运行的任务） */
-    clear(userId: string, convId: string): number;
+    /** AbortController for the task currently running per user (key = userId). */
+    private runningControllers;
+    /**
+     * Enqueue an AI task. Tasks are serialized per `userId` only — `convId` is ignored for queue
+     * partitioning so that `/new` and `/cd` (which change `convId`) cannot leave a long-running
+     * request on the old conversation executing in parallel with new messages.
+     */
+    enqueue(userId: string, _convId: string, prompt: string, execute: (prompt: string, signal: AbortSignal) => Promise<void>): EnqueueResult;
+    /**
+     * Abort the running task for this user (if any) and drop all queued tasks.
+     * Used when `/new`, `/cd`, or `/resume` changes conversation state so stale completions
+     * are not delivered to the wrong WeChat/Telegram message.
+     */
+    cancelUser(userId: string): void;
+    /** 清除指定用户的所有排队任务（不中止正在运行的任务）。`convId` 仅保留兼容签名。 */
+    clear(userId: string, _convId: string): number;
     private run;
 }

package/dist/queue/request-queue.js

@@ -3,8 +3,15 @@ const log = createLogger('Queue');
 const MAX_QUEUE_SIZE = 3;
 export class RequestQueue {
     queues = new Map();
-    enqueue(userId, convId, prompt, execute) {
-        const key = `${userId}:${convId}`;
+    /** AbortController for the task currently running per user (key = userId). */
+    runningControllers = new Map();
+    /**
+     * Enqueue an AI task. Tasks are serialized per `userId` only — `convId` is ignored for queue
+     * partitioning so that `/new` and `/cd` (which change `convId`) cannot leave a long-running
+     * request on the old conversation executing in parallel with new messages.
+     */
+    enqueue(userId, _convId, prompt, execute) {
+        const key = userId;
         let q = this.queues.get(key);
         if (!q) {
             q = { running: false, tasks: [] };
@@ -23,9 +30,28 @@ export class RequestQueue {
         });
         return 'running';
     }
-    /** 清除指定用户会话的所有排队任务（不中止正在运行的任务） */
-    clear(userId, convId) {
-        const key = `${userId}:${convId}`;
+    /**
+     * Abort the running task for this user (if any) and drop all queued tasks.
+     * Used when `/new`, `/cd`, or `/resume` changes conversation state so stale completions
+     * are not delivered to the wrong WeChat/Telegram message.
+     */
+    cancelUser(userId) {
+        const key = userId;
+        const c = this.runningControllers.get(key);
+        if (c) {
+            c.abort();
+        }
+        const q = this.queues.get(key);
+        if (!q)
+            return;
+        const cleared = q.tasks.length;
+        q.tasks.length = 0;
+        if (cleared > 0)
+            log.info(`cancelUser: dropped ${cleared} queued task(s) for ${key}`);
+    }
+    /** 清除指定用户的所有排队任务（不中止正在运行的任务）。`convId` 仅保留兼容签名。 */
+    clear(userId, _convId) {
+        const key = userId;
         const q = this.queues.get(key);
         if (!q)
             return 0;
@@ -37,14 +63,22 @@ export class RequestQueue {
     }
     async run(key, prompt, execute) {
         const controller = new AbortController();
+        this.runningControllers.set(key, controller);
         try {
             await execute(prompt, controller.signal);
         }
         catch (err) {
-            log.error(`Error executing task for ${key}:`, err);
-            throw err;
+            const aborted = err instanceof Error && err.name === 'AbortError';
+            if (aborted) {
+                log.debug(`Task aborted for ${key}`);
+            }
+            else {
+                log.error(`Error executing task for ${key}:`, err);
+                throw err;
+            }
         }
         finally {
+            this.runningControllers.delete(key);
             const q = this.queues.get(key);
             if (!q)
                 return;

package/dist/workbuddy/message-sender.d.ts

@@ -3,7 +3,7 @@
  */
 import type { WorkBuddyCentrifugeClient } from './centrifuge-client.js';
 /**
- * Send text reply to WeChat KF
+ * Send text reply to WeChat KF, splitting long messages automatically.
  */
 export declare function sendTextReply(_client: WorkBuddyCentrifugeClient | null, chatId: string, text: string, msgId: string): Promise<void>;
 /**

package/dist/workbuddy/message-sender.js

@@ -1,12 +1,14 @@
 /**
  * WorkBuddy Message Sender - Send responses to WeChat KF
  */
+import { randomUUID } from 'node:crypto';
 import { createLogger } from '../logger.js';
-import { toReplyPlainText } from '../shared/utils.js';
+import { splitLongContent, toReplyPlainText } from '../shared/utils.js';
+import { MAX_WORKBUDDY_MESSAGE_LENGTH } from '../constants.js';
 import { getCentrifugeClient } from './client.js';
 const log = createLogger('WorkBuddySender');
 /**
- * Send text reply to WeChat KF
+ * Send text reply to WeChat KF, splitting long messages automatically.
  */
 export async function sendTextReply(_client, chatId, text, msgId) {
     const client = _client ?? getCentrifugeClient();
@@ -14,13 +16,32 @@ export async function sendTextReply(_client, chatId, text, msgId) {
         log.warn('WorkBuddy client not available, cannot send reply');
         return;
     }
-    log.info(`Sending WorkBuddy reply to chatId=${chatId}, msgId=${msgId}`);
-    await client.sendPromptResponse({
-        session_id: chatId,
-        prompt_id: msgId,
-        content: [{ type: 'text', text: toReplyPlainText(text) }],
-        stop_reason: 'end_turn',
-    });
+    const plainText = toReplyPlainText(text);
+    const parts = splitLongContent(plainText, MAX_WORKBUDDY_MESSAGE_LENGTH);
+    if (parts.length === 1) {
+        log.info(`Sending WorkBuddy reply to chatId=${chatId}, msgId=${msgId}, len=${plainText.length}`);
+        await client.sendPromptResponse({
+            session_id: chatId,
+            prompt_id: msgId,
+            content: [{ type: 'text', text: plainText }],
+            stop_reason: 'end_turn',
+        });
+        return;
+    }
+    log.info(`Sending WorkBuddy reply in ${parts.length} parts to chatId=${chatId}, msgId=${msgId}, totalLen=${plainText.length}`);
+    for (let i = 0; i < parts.length; i++) {
+        const partText = i === 0
+            ? `${parts[i]}\n\n_(1/${parts.length})_`
+            : `_(续 ${i + 1}/${parts.length})_\n\n${parts[i]}`;
+        const partMsgId = i === 0 ? msgId : randomUUID();
+        await client.sendPromptResponse({
+            session_id: chatId,
+            prompt_id: partMsgId,
+            content: [{ type: 'text', text: partText }],
+            stop_reason: 'end_turn',
+        });
+        log.info(`WorkBuddy part ${i + 1}/${parts.length} sent, msgId=${partMsgId}`);
+    }
 }
 /**
  * Send error response to WeChat KF

package/package.json

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