@wu529778790/open-im 1.3.2-beta.1 → 1.3.2-beta.2

package/dist/commands/handler.js

@@ -110,7 +110,7 @@ export class CommandHandler {
         const version = await this.getAiVersion();
         const workDir = this.deps.sessionManager.getWorkDir(userId);
         const convId = this.deps.sessionManager.getConvId(userId);
-        const sessionId = this.deps.sessionManager.getSessionIdForConv(userId, convId);
+        const sessionId = this.deps.sessionManager.getSessionIdForConv(userId, convId, this.deps.config.aiCommand);
         const lines = [
             '📊 状态:',
             '',

package/dist/feishu/event-handler.js

@@ -126,7 +126,7 @@ export function setupFeishuHandlers(config, sessionManager) {
             return;
         }
         log.info(`[handleAIRequest] Adapter found, getting session...`);
-        const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId) : undefined;
+        const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand) : undefined;
         log.info(`[handleAIRequest] Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
         const toolId = config.aiCommand;
         // 使用 CardKit 打字机效果（80ms 节流，约 12 次/秒，比 patch 5 QPS 更流畅）

package/dist/index.js

@@ -134,9 +134,9 @@ export async function main() {
     log.info(`启用平台: ${config.enabledPlatforms.join(", ")}`);
     const sessionManager = new SessionManager(config.claudeWorkDir, config.allowedBaseDirs);
     // CLI 工具（Cursor/Codex）的 session 是进程级别的，服务重启后一定无效。
-    // 启动时清除所有 sessionId，防止 --resume 到上次被中断的任务（如未完成的 git commit）。
+    // 启动时仅清除 CLI 工具自己的 sessionId，保留 Claude 的持久上下文。
     if (config.aiCommand !== 'claude') {
-        sessionManager.clearAllSessionIds();
+        sessionManager.clearAllCliSessionIds();
     }
     let telegramHandle = null;
     let feishuHandle = null;

package/dist/session/session-manager.d.ts

@@ -1,3 +1,4 @@
+type ToolId = 'claude' | 'codex' | 'cursor';
 export declare class SessionManager {
     private sessions;
     private convSessionMap;
@@ -5,12 +6,12 @@ export declare class SessionManager {
     private allowedBaseDirs;
     private saveTimer;
     constructor(defaultWorkDir: string, allowedBaseDirs: string[]);
-    getSessionIdForConv(userId: string, convId: string): string | undefined;
-    setSessionIdForConv(userId: string, convId: string, sessionId: string): void;
+    getSessionIdForConv(userId: string, convId: string, toolId: ToolId): string | undefined;
+    setSessionIdForConv(userId: string, convId: string, toolId: ToolId, sessionId: string): void;
     /** 清除指定会话的 sessionId（用于 SDK 报 "No conversation found" 时） */
-    clearSessionForConv(userId: string, convId: string): void;
-    getSessionIdForThread(_userId: string, _threadId: string): string | undefined;
-    setSessionIdForThread(userId: string, threadId: string, sessionId: string): void;
+    clearSessionForConv(userId: string, convId: string, toolId: ToolId): void;
+    getSessionIdForThread(_userId: string, _threadId: string, _toolId: ToolId): string | undefined;
+    setSessionIdForThread(userId: string, threadId: string, toolId: ToolId, sessionId: string): void;
     getWorkDir(userId: string): string;
     hasUserSession(userId: string): boolean;
     getConvId(userId: string): string;
@@ -20,8 +21,9 @@ export declare class SessionManager {
      * 适用于 CLI 工具（Cursor/Codex），其 session 是进程级别的，
      * 服务重启后旧的 session 一定无效，若不清除会导致 --resume 到中断任务。
      */
-    clearAllSessionIds(): void;
+    clearAllCliSessionIds(): void;
     newSession(userId: string): boolean;
+    clearActiveToolSession(userId: string, toolId: ToolId): boolean;
     addTurns(userId: string, turns: number): number;
     addTurnsForThread(userId: string, threadId: string, turns: number): number;
     getModel(userId: string, threadId?: string): string | undefined;
@@ -32,4 +34,11 @@ export declare class SessionManager {
     private flushSync;
     destroy(): void;
     private doFlush;
+    private getConvSessionKey;
+    private getToolSessionId;
+    private setToolSessionId;
+    private clearToolSessionId;
+    private persistActiveConvSessions;
+    private clearConvSessionMappings;
 }
+export {};

package/dist/session/session-manager.js

@@ -17,42 +17,44 @@ export class SessionManager {
         this.allowedBaseDirs = allowedBaseDirs;
         this.load();
     }
-    getSessionIdForConv(userId, convId) {
+    getSessionIdForConv(userId, convId, toolId) {
         const s = this.sessions.get(userId);
         if (s?.activeConvId === convId)
-            return s.sessionId;
-        return this.convSessionMap.get(`${userId}:${convId}`);
+            return this.getToolSessionId(s, toolId);
+        return this.convSessionMap.get(this.getConvSessionKey(userId, convId, toolId));
     }
-    setSessionIdForConv(userId, convId, sessionId) {
+    setSessionIdForConv(userId, convId, toolId, sessionId) {
         const s = this.sessions.get(userId);
         if (s?.activeConvId === convId) {
-            s.sessionId = sessionId;
+            this.setToolSessionId(s, toolId, sessionId);
             this.save();
         }
         else {
-            this.convSessionMap.set(`${userId}:${convId}`, sessionId);
+            this.convSessionMap.set(this.getConvSessionKey(userId, convId, toolId), sessionId);
         }
     }
     /** 清除指定会话的 sessionId（用于 SDK 报 "No conversation found" 时） */
-    clearSessionForConv(userId, convId) {
+    clearSessionForConv(userId, convId, toolId) {
         const s = this.sessions.get(userId);
         if (s?.activeConvId === convId) {
-            s.sessionId = undefined;
+            this.clearToolSessionId(s, toolId);
             this.save();
         }
-        this.convSessionMap.delete(`${userId}:${convId}`);
-        log.info(`Cleared session for user ${userId}, convId=${convId}`);
+        this.convSessionMap.delete(this.getConvSessionKey(userId, convId, toolId));
+        log.info(`Cleared ${toolId} session for user ${userId}, convId=${convId}`);
     }
-    getSessionIdForThread(_userId, _threadId) {
+    getSessionIdForThread(_userId, _threadId, _toolId) {
         return undefined;
     }
-    setSessionIdForThread(userId, threadId, sessionId) {
+    setSessionIdForThread(userId, threadId, toolId, sessionId) {
         const s = this.sessions.get(userId);
         if (s && !s.threads)
             s.threads = {};
         const t = s?.threads?.[threadId];
         if (t) {
-            t.sessionId = sessionId;
+            if (!t.sessionIds)
+                t.sessionIds = {};
+            t.sessionIds[toolId] = sessionId;
             this.save();
         }
     }
@@ -82,15 +84,12 @@ export class SessionManager {
         const s = this.sessions.get(userId);
         if (s) {
             const oldConvId = s.activeConvId;
-            if (s.activeConvId && s.sessionId) {
-                this.convSessionMap.set(`${userId}:${s.activeConvId}`, s.sessionId);
-            }
+            this.persistActiveConvSessions(userId, s);
             s.workDir = realPath;
-            s.sessionId = undefined;
+            s.sessionIds = {};
             s.activeConvId = randomBytes(4).toString('hex');
-            // 清除旧的 convSessionMap 中的映射
             if (oldConvId) {
-                this.convSessionMap.delete(`${userId}:${oldConvId}`);
+                this.clearConvSessionMappings(userId, oldConvId);
             }
         }
         else {
@@ -108,48 +107,69 @@ export class SessionManager {
      * 适用于 CLI 工具（Cursor/Codex），其 session 是进程级别的，
      * 服务重启后旧的 session 一定无效，若不清除会导致 --resume 到中断任务。
      */
-    clearAllSessionIds() {
+    clearAllCliSessionIds() {
         let changed = false;
         for (const [, s] of this.sessions) {
-            if (s.sessionId !== undefined) {
-                s.sessionId = undefined;
-                changed = true;
+            for (const toolId of ['codex', 'cursor']) {
+                if (this.getToolSessionId(s, toolId) !== undefined) {
+                    this.clearToolSessionId(s, toolId);
+                    changed = true;
+                }
             }
             if (s.threads) {
                 for (const t of Object.values(s.threads)) {
-                    if (t.sessionId !== undefined) {
-                        t.sessionId = undefined;
-                        changed = true;
+                    for (const toolId of ['codex', 'cursor']) {
+                        if (t.sessionIds?.[toolId] !== undefined) {
+                            delete t.sessionIds[toolId];
+                            changed = true;
+                        }
                     }
                 }
             }
         }
+        for (const key of [...this.convSessionMap.keys()]) {
+            if (key.endsWith(':codex') || key.endsWith(':cursor')) {
+                this.convSessionMap.delete(key);
+                changed = true;
+            }
+        }
         if (changed) {
             this.flushSync();
-            log.info('Cleared all CLI session IDs on startup');
+            log.info('Cleared CLI session IDs for codex/cursor on startup');
         }
     }
     newSession(userId) {
         const s = this.sessions.get(userId);
         if (s) {
-            const oldSessionId = s.sessionId;
+            const oldSessionIds = { ...(s.sessionIds ?? {}) };
             const oldConvId = s.activeConvId;
-            if (s.activeConvId && s.sessionId) {
-                this.convSessionMap.set(`${userId}:${s.activeConvId}`, s.sessionId);
-            }
-            s.sessionId = undefined;
+            this.persistActiveConvSessions(userId, s);
+            s.sessionIds = {};
             s.activeConvId = randomBytes(4).toString('hex');
             s.totalTurns = 0;
-            // 清除旧的 convSessionMap 中的映射，防止恢复旧的 sessionId
             if (oldConvId) {
-                this.convSessionMap.delete(`${userId}:${oldConvId}`);
+                this.clearConvSessionMappings(userId, oldConvId);
             }
             this.flushSync();
-            log.info(`New session for user ${userId}: oldConvId=${oldConvId}, oldSessionId=${oldSessionId}, newConvId=${s.activeConvId}, sessionId=undefined`);
+            log.info(`New session for user ${userId}: oldConvId=${oldConvId}, oldSessionIds=${JSON.stringify(oldSessionIds)}, newConvId=${s.activeConvId}, sessionIds={}`);
             return true;
         }
         return false;
     }
+    clearActiveToolSession(userId, toolId) {
+        const s = this.sessions.get(userId);
+        if (!s)
+            return false;
+        const activeConvId = s.activeConvId;
+        const hadSession = this.getToolSessionId(s, toolId) !== undefined;
+        this.clearToolSessionId(s, toolId);
+        if (activeConvId) {
+            this.convSessionMap.delete(this.getConvSessionKey(userId, activeConvId, toolId));
+        }
+        this.flushSync();
+        log.info(`Cleared active ${toolId} session for user ${userId}, convId=${activeConvId ?? 'none'}`);
+        return hadSession;
+    }
     addTurns(userId, turns) {
         const s = this.sessions.get(userId);
         if (!s)
@@ -243,6 +263,22 @@ export class SessionManager {
                     if (v && typeof v.workDir === 'string') {
                         if (!v.activeConvId)
                             v.activeConvId = randomBytes(4).toString('hex');
+                        if (!v.sessionIds)
+                            v.sessionIds = {};
+                        if ('sessionId' in v) {
+                            log.warn(`Legacy shared sessionId found for user ${k}; clearing it to avoid cross-tool resume conflicts`);
+                        }
+                        delete v.sessionId;
+                        if (v.threads) {
+                            for (const thread of Object.values(v.threads)) {
+                                if (!thread.sessionIds)
+                                    thread.sessionIds = {};
+                                if ('sessionId' in thread) {
+                                    log.warn(`Legacy thread sessionId found for user ${k}; clearing it during session migration`);
+                                }
+                                delete thread.sessionId;
+                            }
+                        }
                         this.sessions.set(k, v);
                     }
                 }
@@ -288,4 +324,34 @@ export class SessionManager {
             log.error('Failed to save sessions:', err);
         }
     }
+    getConvSessionKey(userId, convId, toolId) {
+        return `${userId}:${convId}:${toolId}`;
+    }
+    getToolSessionId(session, toolId) {
+        return session.sessionIds?.[toolId];
+    }
+    setToolSessionId(session, toolId, sessionId) {
+        if (!session.sessionIds)
+            session.sessionIds = {};
+        session.sessionIds[toolId] = sessionId;
+    }
+    clearToolSessionId(session, toolId) {
+        if (!session.sessionIds)
+            return;
+        delete session.sessionIds[toolId];
+    }
+    persistActiveConvSessions(userId, session) {
+        if (!session.activeConvId || !session.sessionIds)
+            return;
+        for (const [toolId, sessionId] of Object.entries(session.sessionIds)) {
+            if (sessionId) {
+                this.convSessionMap.set(this.getConvSessionKey(userId, session.activeConvId, toolId), sessionId);
+            }
+        }
+    }
+    clearConvSessionMappings(userId, convId) {
+        for (const toolId of ['claude', 'codex', 'cursor']) {
+            this.convSessionMap.delete(this.getConvSessionKey(userId, convId, toolId));
+        }
+    }
 }

package/dist/shared/ai-task.js

@@ -103,13 +103,13 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
         const handle = toolAdapter.run(prompt, ctx.sessionId, ctx.workDir, {
             onSessionId: (id) => {
                 if (ctx.threadId)
-                    sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, id);
+                    sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, config.aiCommand, id);
                 else if (ctx.convId)
-                    sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, id);
+                    sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, config.aiCommand, id);
             },
             onSessionInvalid: () => {
                 if (ctx.convId)
-                    sessionManager.clearSessionForConv(ctx.userId, ctx.convId);
+                    sessionManager.clearSessionForConv(ctx.userId, ctx.convId, config.aiCommand);
             },
             onThinking: (t) => {
                 if (!firstContentLogged) {
@@ -186,9 +186,14 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                 log.error(`Task error for user ${ctx.userId}: ${error}`);
                 // CLI 工具（cursor/codex）出错时清除 sessionId，
                 // 防止 resume 到中途被中断的会话（如未完成的 tool call 循环）
-                // Claude SDK 不需要，其 session 是对话上下文，出错仍可继续
+                // Claude SDK 不需要，其 session 是对话上下文，出错仍可继续。
+                // 这里只清当前任务所属会话里的当前工具 session，避免误伤其它 AI 工具
+                // 或用户在 /new、/cd 后已经切出的新会话。
                 if (config.aiCommand !== 'claude') {
-                    sessionManager.newSession(ctx.userId);
+                    if (ctx.convId)
+                        sessionManager.clearSessionForConv(ctx.userId, ctx.convId, config.aiCommand);
+                    else
+                        sessionManager.clearActiveToolSession(ctx.userId, config.aiCommand);
                     log.info(`Session reset for user ${ctx.userId} due to ${config.aiCommand} task error`);
                 }
                 try {

package/dist/telegram/event-handler.js

@@ -91,7 +91,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
             return;
         }
         const sessionId = convId
-            ? sessionManager.getSessionIdForConv(userId, convId)
+            ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand)
             : undefined;
         log.info(`Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? "new"}`);
         const toolId = config.aiCommand;

package/dist/wechat/event-handler.js

@@ -37,7 +37,7 @@ export function setupWeChatHandlers(config, sessionManager) {
             await sendTextReply(chatId, `未配置 AI 工具: ${config.aiCommand}`);
             return;
         }
-        const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId) : undefined;
+        const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand) : undefined;
         log.info(`[handleAIRequest] Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
         const toolId = config.aiCommand;
         let msgId;

package/dist/wework/event-handler.js

@@ -38,7 +38,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
                 await sendTextReply(chatId, `未配置 AI 工具: ${config.aiCommand}`, reqId);
                 return;
             }
-            const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId) : undefined;
+            const sessionId = convId ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand) : undefined;
             log.info(`[handleAIRequest] Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
             const toolId = config.aiCommand;
             let msgId;

package/package.json

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