@wu529778790/open-im 1.11.1-beta.4 → 1.11.1-beta.5

package/dist/commands/handler.js

@@ -178,9 +178,11 @@ export class CommandHandler {
         }
         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 会话已重置，下一条消息将使用全新上下文。`);
+            const result = await this.deps.sessionManager.setWorkDir(userId, dir);
+            const msg = result.resumed
+                ? `📁 工作目录已切换到: ${escapePathForMarkdown(result.path)}\n\n🔄 已恢复该目录的最近会话，继续之前的上下文。`
+                : `📁 工作目录已切换到: ${escapePathForMarkdown(result.path)}\n\n🆕 该目录暂无历史会话，已创建全新上下文。`;
+            await this.replySender().sendTextReply(chatId, msg);
         }
         catch (err) {
             await this.replySender().sendTextReply(chatId, err instanceof Error ? err.message : String(err));

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

@@ -3,6 +3,7 @@ interface ConvHistoryEntry {
     convId: string;
     totalTurns: number;
     createdAt: number;
+    workDir?: string;
 }
 export declare function resolveWorkDirInput(baseDir: string, targetDir: string): string;
 export declare class SessionManager {
@@ -24,7 +25,10 @@ export declare class SessionManager {
     getWorkDir(userId: string): string;
     hasUserSession(userId: string): boolean;
     getConvId(userId: string): string;
-    setWorkDir(userId: string, workDir: string): Promise<string>;
+    setWorkDir(userId: string, workDir: string): Promise<{
+        path: string;
+        resumed: boolean;
+    }>;
     newSession(userId: string): boolean;
     clearActiveToolSession(userId: string, toolId: ToolId): boolean;
     listConvHistory(userId: string): ConvHistoryEntry[];

package/dist/session/session-manager.js

@@ -108,9 +108,15 @@ export class SessionManager {
         const realPath = await this.resolveAndValidate(currentDir, workDir);
         const s = this.sessions.get(userId);
         let oldConvId;
+        let resumed = false;
         if (s) {
+            // Same directory — no-op
+            if (realPath === currentDir) {
+                return { path: realPath, resumed: false };
+            }
             oldConvId = s.activeConvId;
             this.persistActiveConvSessions(userId, s);
+            // Archive current conversation with its workDir
             if (oldConvId) {
                 if (!s.convHistory)
                     s.convHistory = [];
@@ -118,13 +124,36 @@ export class SessionManager {
                     convId: oldConvId,
                     totalTurns: s.totalTurns ?? 0,
                     createdAt: Date.now(),
+                    workDir: currentDir,
                 });
                 if (s.convHistory.length > 10)
                     s.convHistory = s.convHistory.slice(-10);
             }
+            // Look for a previous conversation in the target directory
+            if (!s.convHistory)
+                s.convHistory = [];
+            const matchIdx = s.convHistory.findIndex((e) => e.workDir === realPath);
+            if (matchIdx !== -1) {
+                const [entry] = s.convHistory.splice(matchIdx, 1);
+                s.activeConvId = entry.convId;
+                s.totalTurns = entry.totalTurns;
+                s.sessionIds = {};
+                for (const toolId of ['claude', 'codex', 'codebuddy', 'opencode']) {
+                    const sessionId = this.convSessionMap.get(this.getConvSessionKey(userId, entry.convId, toolId));
+                    if (sessionId) {
+                        if (!s.sessionIds)
+                            s.sessionIds = {};
+                        s.sessionIds[toolId] = sessionId;
+                    }
+                }
+                resumed = true;
+                log.info(`Resumed session for user ${userId}: convId=${entry.convId}, workDir=${realPath}, turns=${entry.totalTurns}`);
+            }
+            else {
+                s.sessionIds = {};
+                s.activeConvId = randomBytes(4).toString('hex');
+            }
             s.workDir = realPath;
-            s.sessionIds = {};
-            s.activeConvId = randomBytes(4).toString('hex');
         }
         else {
             this.sessions.set(userId, {
@@ -133,8 +162,8 @@ export class SessionManager {
             });
         }
         this.flushSync();
-        log.info(`WorkDir changed for user ${userId}: ${realPath}, oldConvId=${oldConvId}`);
-        return realPath;
+        log.info(`WorkDir changed for user ${userId}: ${realPath}, oldConvId=${oldConvId}, resumed=${resumed}`);
+        return { path: realPath, resumed };
     }
     newSession(userId) {
         const s = this.sessions.get(userId);
@@ -150,6 +179,7 @@ export class SessionManager {
                     convId: oldConvId,
                     totalTurns: s.totalTurns ?? 0,
                     createdAt: Date.now(),
+                    workDir: s.workDir,
                 });
                 // Keep last 10 entries
                 if (s.convHistory.length > 10)
@@ -207,6 +237,7 @@ export class SessionManager {
                 convId: s.activeConvId,
                 totalTurns: s.totalTurns ?? 0,
                 createdAt: Date.now(),
+                workDir: s.workDir,
             });
         }
         // Remove target from history

package/package.json

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