@wu529778790/open-im 1.10.7-beta.1 → 1.10.7-beta.3

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/index.js

@@ -214,9 +214,8 @@ export async function main() {
     }
     log.info(`启用平台: ${config.enabledPlatforms.join(", ")}`);
     const sessionManager = new SessionManager(startupCwd, config.claudeWorkDir);
-    // CLI 工具（Codex/CodeBuddy）的 session 是进程级别的，服务重启后一定无效。
-    // 启动时仅清除 CLI 工具自己的 sessionId，保留 Claude 的持久上下文。
-    sessionManager.clearAllCliSessionIds();
+    // Codex/CodeBuddy 的 sessionId 持久化在 sessions.json；重启后沿用以便 --resume 续聊。
+    // 若 CLI 判定会话无效，ai-task 会通过 onSessionInvalid 清理并提示重试。
     // Track active platform handles and successfully initialized platforms
     const activeHandles = new Map();
     const successfulPlatforms = [];

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/session/session-manager.d.ts

@@ -25,11 +25,6 @@ export declare class SessionManager {
     hasUserSession(userId: string): boolean;
     getConvId(userId: string): string;
     setWorkDir(userId: string, workDir: string): Promise<string>;
-    /**
-     * 服务启动时调用：清除所有用户的 CLI sessionId。
-     * Codex/CodeBuddy 的 session 是进程级别的，服务重启后旧 session 一定无效。
-     */
-    clearAllCliSessionIds(): void;
     newSession(userId: string): boolean;
     clearActiveToolSession(userId: string, toolId: ToolId): boolean;
     listConvHistory(userId: string): ConvHistoryEntry[];

package/dist/session/session-manager.js

@@ -136,41 +136,6 @@ export class SessionManager {
         log.info(`WorkDir changed for user ${userId}: ${realPath}, oldConvId=${oldConvId}`);
         return realPath;
     }
-    /**
-     * 服务启动时调用：清除所有用户的 CLI sessionId。
-     * Codex/CodeBuddy 的 session 是进程级别的，服务重启后旧 session 一定无效。
-     */
-    clearAllCliSessionIds() {
-        let changed = false;
-        for (const [, s] of this.sessions) {
-            for (const toolId of ['codex', 'codebuddy']) {
-                if (this.getToolSessionId(s, toolId) !== undefined) {
-                    this.clearToolSessionId(s, toolId);
-                    changed = true;
-                }
-            }
-            if (s.threads) {
-                for (const t of Object.values(s.threads)) {
-                    for (const toolId of ['codex', 'codebuddy']) {
-                        if (t.sessionIds?.[toolId] !== undefined) {
-                            delete t.sessionIds[toolId];
-                            changed = true;
-                        }
-                    }
-                }
-            }
-        }
-        for (const key of [...this.convSessionMap.keys()]) {
-            if (key.endsWith(':codex') || key.endsWith(':codebuddy')) {
-                this.convSessionMap.delete(key);
-                changed = true;
-            }
-        }
-        if (changed) {
-            this.flushSync();
-            log.info('Cleared CLI session IDs for codex/codebuddy on startup');
-        }
-    }
     newSession(userId) {
         const s = this.sessions.get(userId);
         if (s) {

package/package.json

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