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

package/README.md

@@ -48,10 +48,10 @@ After `start`, the CLI prints the dashboard URL (default **`http://127.0.0.1:392
 | --- | --- |
 | `/help` | Help |
 | `/new` | New AI session |
-| `/sessions` | Session history |
-| `/resume <N>` | Resume by list number |
+| `/sessions` | Session history with preview |
+| `/resume [N]` | Resume session (no arg = most recent) |
 | `/status` | AI + session info |
-| `/cd` / `/pwd` | Working directory |
+| `/cd` / `/pwd` | Switch work dir (auto-resumes that dir's session) |
 | `/allow` / `/y`, `/deny` / `/n` | Permission prompts |
 
 ## Session continuity

package/README.zh-CN.md

@@ -48,10 +48,10 @@ npx @wu529778790/open-im start
 | --- | --- |
 | `/help` | 帮助 |
 | `/new` | 新 AI 会话 |
-| `/sessions` | 历史会话 |
-| `/resume <序号>` | 按列表序号恢复 |
+| `/sessions` | 历史会话（含摘要预览） |
+| `/resume [序号]` | 恢复会话（无参数恢复最近一条） |
 | `/status` | AI 与会话信息 |
-| `/cd` / `/pwd` | 工作目录 |
+| `/cd` / `/pwd` | 切换工作目录（自动恢复该目录的历史会话） |
 | `/allow` / `/y`、`/deny` / `/n` | 权限确认 |
 
 ## 会话接力

package/dist/commands/handler.js

@@ -3,6 +3,29 @@ import { escapePathForMarkdown } from '../shared/utils.js';
 import { TERMINAL_ONLY_COMMANDS } from '../constants.js';
 import { createLogger } from '../logger.js';
 const log = createLogger('Commands');
+function formatRelativeTime(ts) {
+    const sec = Math.floor((Date.now() - ts) / 1000);
+    if (sec < 60)
+        return '刚刚';
+    const min = Math.floor(sec / 60);
+    if (min < 60)
+        return `${min}分钟前`;
+    const hr = Math.floor(min / 60);
+    if (hr < 24)
+        return `${hr}小时前`;
+    const day = Math.floor(hr / 24);
+    if (day === 1)
+        return '昨天';
+    if (day < 30)
+        return `${day}天前`;
+    return new Date(ts).toLocaleDateString('zh-CN');
+}
+function truncatePreview(msg, maxLen = 30) {
+    if (!msg)
+        return '新会话';
+    const firstLine = msg.split('\n')[0].trim();
+    return firstLine.length > maxLen ? firstLine.slice(0, maxLen) + '...' : firstLine;
+}
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { execFile } from 'node:child_process';
 import { readdirSync } from 'node:fs';
@@ -84,7 +107,7 @@ export class CommandHandler {
             '/help - 显示帮助',
             '/new - 开始新会话（AI 上下文重置）',
             '/sessions - 查看历史会话',
-            '/resume <序号> - 恢复历史会话',
+            '/resume [序号] - 恢复历史会话（无参数恢复最近一条）',
             '/status - 显示状态',
             '/cd <路径> - 切换工作目录',
             '/pwd - 当前工作目录',
@@ -101,23 +124,44 @@ export class CommandHandler {
         }
         const lines = ['📋 会话列表:', ''];
         history.forEach((entry, i) => {
-            lines.push(`${i + 1}. ${entry.convId} · ${entry.totalTurns}轮`);
+            const preview = truncatePreview(entry.firstMessage);
+            const time = entry.createdAt ? ` · ${formatRelativeTime(entry.createdAt)}` : '';
+            lines.push(`${i + 1}. ${preview} · ${entry.totalTurns}轮${time}`);
         });
         if (active) {
             const num = history.length + 1;
-            lines.push(`▸ ${num}. ${active.convId} · ${active.totalTurns}轮（当前）`);
+            const preview = truncatePreview(active.firstMessage);
+            lines.push(`▸ ${num}. ${preview} · ${active.totalTurns}轮（当前）`);
         }
-        lines.push('', '使用 /resume <序号> 恢复历史会话');
+        lines.push('', '使用 /resume <序号> 恢复，或 /resume 恢复最近一条');
         await this.replySender().sendTextReply(chatId, lines.join('\n'));
         return true;
     }
     async handleResume(chatId, userId, arg, _platform) {
+        const history = this.deps.sessionManager.listConvHistory(userId);
+        // /resume (no arg) — resume the most recent session
+        if (!arg) {
+            if (history.length === 0) {
+                await this.replySender().sendTextReply(chatId, '没有可恢复的历史会话。');
+                return true;
+            }
+            const entry = history[history.length - 1];
+            this.deps.requestQueue.cancelUser(userId);
+            const ok = this.deps.sessionManager.resumeConv(userId, entry.convId);
+            if (ok) {
+                const preview = truncatePreview(entry.firstMessage);
+                await this.replySender().sendTextReply(chatId, `✅ 已恢复最近会话: ${preview}（${entry.totalTurns}轮）\n继续发消息即可。`);
+            }
+            else {
+                await this.replySender().sendTextReply(chatId, '❌ 恢复会话失败，请重试。');
+            }
+            return true;
+        }
         const index = parseInt(arg, 10);
         if (isNaN(index) || index < 1) {
-            await this.replySender().sendTextReply(chatId, '用法: /resume <序号>\n\n使用 /sessions 查看会话列表。');
+            await this.replySender().sendTextReply(chatId, '用法: /resume [序号]\n\n不带序号则恢复最近一条会话。');
             return true;
         }
-        const history = this.deps.sessionManager.listConvHistory(userId);
         if (index > history.length) {
             await this.replySender().sendTextReply(chatId, `序号 ${index} 无效，共 ${history.length} 个历史会话。`);
             return true;
@@ -126,7 +170,8 @@ export class CommandHandler {
         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继续发消息即可。`);
+            const preview = truncatePreview(entry.firstMessage);
+            await this.replySender().sendTextReply(chatId, `✅ 已恢复会话: ${preview}（${entry.totalTurns}轮）\n继续发消息即可。`);
         }
         else {
             await this.replySender().sendTextReply(chatId, '❌ 恢复会话失败，请重试。');
@@ -178,9 +223,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,8 @@ interface ConvHistoryEntry {
     convId: string;
     totalTurns: number;
     createdAt: number;
+    workDir?: string;
+    firstMessage?: string;
 }
 export declare function resolveWorkDirInput(baseDir: string, targetDir: string): string;
 export declare class SessionManager {
@@ -24,17 +26,23 @@ 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[];
     getActiveConvInfo(userId: string): {
         convId: string;
         totalTurns: number;
+        firstMessage?: string;
     } | undefined;
     resumeConv(userId: string, convId: string): boolean;
     addTurns(userId: string, turns: number): number;
     addTurnsForThread(userId: string, threadId: string, turns: number): number;
+    /** Save the first message preview for the current conversation (only on first turn). */
+    setConvPreview(userId: string, preview: string): void;
     getModel(userId: string, threadId?: string): string | undefined;
     setModel(userId: string, model: string | undefined, threadId?: string): void;
     private resolveAndValidate;

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,38 @@ export class SessionManager {
                     convId: oldConvId,
                     totalTurns: s.totalTurns ?? 0,
                     createdAt: Date.now(),
+                    workDir: currentDir,
+                    firstMessage: s.firstMessage,
                 });
                 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.firstMessage = undefined;
+            }
             s.workDir = realPath;
-            s.sessionIds = {};
-            s.activeConvId = randomBytes(4).toString('hex');
         }
         else {
             this.sessions.set(userId, {
@@ -133,8 +164,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 +181,8 @@ export class SessionManager {
                     convId: oldConvId,
                     totalTurns: s.totalTurns ?? 0,
                     createdAt: Date.now(),
+                    workDir: s.workDir,
+                    firstMessage: s.firstMessage,
                 });
                 // Keep last 10 entries
                 if (s.convHistory.length > 10)
@@ -158,6 +191,7 @@ export class SessionManager {
             s.sessionIds = {};
             s.activeConvId = randomBytes(4).toString('hex');
             s.totalTurns = 0;
+            s.firstMessage = undefined;
             this.flushSync();
             log.info(`New session for user ${userId}: oldConvId=${oldConvId}, oldSessionIds=${JSON.stringify(oldSessionIds)}, newConvId=${s.activeConvId}, sessionIds={}`);
             return true;
@@ -188,7 +222,7 @@ export class SessionManager {
         const s = this.sessions.get(userId);
         if (!s?.activeConvId)
             return undefined;
-        return { convId: s.activeConvId, totalTurns: s.totalTurns ?? 0 };
+        return { convId: s.activeConvId, totalTurns: s.totalTurns ?? 0, firstMessage: s.firstMessage };
     }
     resumeConv(userId, convId) {
         const s = this.sessions.get(userId);
@@ -207,6 +241,8 @@ export class SessionManager {
                 convId: s.activeConvId,
                 totalTurns: s.totalTurns ?? 0,
                 createdAt: Date.now(),
+                workDir: s.workDir,
+                firstMessage: s.firstMessage,
             });
         }
         // Remove target from history
@@ -214,6 +250,7 @@ export class SessionManager {
         // Restore target as active
         s.activeConvId = entry.convId;
         s.totalTurns = entry.totalTurns;
+        s.firstMessage = entry.firstMessage;
         s.sessionIds = {};
         // Restore sessionIds from convSessionMap
         for (const toolId of ['claude', 'codex', 'codebuddy']) {
@@ -249,6 +286,14 @@ export class SessionManager {
         this.save();
         return t.totalTurns;
     }
+    /** Save the first message preview for the current conversation (only on first turn). */
+    setConvPreview(userId, preview) {
+        const s = this.sessions.get(userId);
+        if (!s || (s.totalTurns ?? 0) > 0)
+            return;
+        s.firstMessage = preview;
+        this.save();
+    }
     getModel(userId, threadId) {
         const s = this.sessions.get(userId);
         if (threadId) {

package/dist/shared/ai-task.js

@@ -153,6 +153,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
         const aiCommand = resolvePlatformAiCommand(config, ctx.platform);
         const startRun = () => {
             log.info(`[AITask] Starting: userId=${ctx.userId}, initialSessionId=${currentSessionId ?? 'new'}, prompt="${prompt.slice(0, 50)}..."`);
+            sessionManager.setConvPreview(ctx.userId, prompt.slice(0, 80));
             emitStructuredEvent('AITask', 'ai.task.start', {
                 platform: ctx.platform,
                 taskKey: hashUserId(ctx.taskKey),

package/package.json

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