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

package/README.md

@@ -66,6 +66,27 @@ After `start`, the CLI prints the dashboard URL (default **`http://127.0.0.1:392
 
 Session state is stored in **`~/.open-im/data/sessions.json`** (per user, not IM chat logs).
 
+## Session continuity
+
+open-im and Claude Code CLI share the same session storage. When you work in the same directory, you can seamlessly switch between phone and computer.
+
+**Phone → Computer:** open-im automatically resumes the latest CLI session in the same directory — no configuration needed.
+
+**Computer → Phone:** use `claude --continue` (or `claude -c`) to pick up the conversation that was continued on open-im.
+
+```
+# On computer
+cd /my-project && claude        # work as usual, then Ctrl+C
+
+# On phone (via IM)
+"help me fix the login bug"     # open-im auto-resumes the same session
+
+# Back on computer
+claude -c                       # continues the phone conversation
+```
+
+> **Note:** only one side can be active at a time. Exit the CLI before sending messages from the phone, and vice versa.
+
 ## Configuration
 
 ### Per-platform AI

package/README.zh-CN.md

@@ -66,6 +66,27 @@ npx @wu529778790/open-im start
 
 会话状态保存在 **`~/.open-im/data/sessions.json`**（按用户，与 IM 聊天记录无关）。
 
+## 会话接力
+
+open-im 和 Claude Code CLI 共享同一份 session 存储。在同一个目录下，手机和电脑可以无缝切换。
+
+**手机接电脑：** open-im 自动恢复同目录下最新的 CLI session，无需配置。
+
+**电脑接手机：** 使用 `claude --continue`（或 `claude -c`）接上 open-im 端的对话。
+
+```bash
+# 电脑端
+cd /my-project && claude        # 正常工作，退出时 Ctrl+C
+
+# 手机端（IM 消息）
+"帮我修复登录 bug"              # open-im 自动接续同一个 session
+
+# 回到电脑端
+claude -c                       # 接上手机端的对话
+```
+
+> **注意：** 同一时刻只能有一端活跃。从手机发消息前先退出 CLI，反之亦然。
+
 ## 配置说明
 
 ### 按平台指定 AI

package/dist/adapters/claude-sdk-adapter.d.ts

@@ -9,6 +9,18 @@
  * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN
  */
 import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
+interface ClaudeSessionMeta {
+    sessionId: string;
+    mtime: number;
+    filePath: string;
+    size: number;
+}
+/**
+ * 扫描 ~/.claude/projects/<encoded-path>/ 找到最新的 CLI session。
+ * 只返回 JSONL 文件（排除子目录如 subagents/），按修改时间倒序。
+ * @param homeOverride 测试用：覆盖 homedir() 的返回值
+ */
+export declare function findLatestClaudeSession(workDir: string, homeOverride?: string): ClaudeSessionMeta | undefined;
 /**
  * 由 initAdapters 根据配置调用。ttlMinutes≤0 时关闭空闲回收（仍受 MAX_ACTIVE_SESSIONS 限制）。
  */
@@ -26,3 +38,4 @@ export declare class ClaudeSDKAdapter implements ToolAdapter {
     static removeSession(sessionId: string): void;
     run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
 }
+export {};

package/dist/adapters/claude-sdk-adapter.js

@@ -9,7 +9,8 @@
  * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN
  */
 import { unstable_v2_createSession, unstable_v2_resumeSession } from '@anthropic-ai/claude-agent-sdk';
-import { existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, readdirSync, statSync, openSync, readSync, closeSync } from 'fs';
+import { execSync } from 'child_process';
 import { homedir } from 'os';
 import { join } from 'path';
 import { createLogger } from '../logger.js';
@@ -46,6 +47,110 @@ function loadUserPluginSettings() {
 }
 // Pre-load user plugin settings to cache Claude Code user preferences
 loadUserPluginSettings();
+// ── 扫描 Claude Code CLI 的最新 session，支持手机/电脑无缝切换 ──
+/**
+ * 将 workDir（如 /Users/mac/github/open-im）转换为 Claude Code 的项目路径编码
+ * ~/.claude/projects/-Users-mac-github-open-im/
+ */
+function workDirToProjectPath(workDir) {
+    // Claude Code 将路径中的 / 替换为 -，leading - 保留
+    // /Users/mac/github/open-im → -Users-mac-github-open-im
+    return workDir.replace(/\//g, '-');
+}
+/**
+ * 检查 CLI 进程是否正在使用某个 session（通过 ps 检测）
+ * 注意：仅支持 macOS/Linux，Windows 上会静默返回 false
+ */
+function isCliSessionActive(sessionId) {
+    try {
+        // macOS/Linux: 用 ps 搜索包含该 sessionId 的 claude 进程
+        // -F 固定字符串匹配，避免正则意外；-- 防止 sessionId 被误认为 flag
+        const result = execSync(`ps -axo pid,command 2>/dev/null | grep -v grep | grep "claude" | grep -F -- "${sessionId}" || true`, { encoding: 'utf-8', timeout: 3000 });
+        return result.trim().length > 0;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 扫描 ~/.claude/projects/<encoded-path>/ 找到最新的 CLI session。
+ * 只返回 JSONL 文件（排除子目录如 subagents/），按修改时间倒序。
+ * @param homeOverride 测试用：覆盖 homedir() 的返回值
+ */
+export function findLatestClaudeSession(workDir, homeOverride) {
+    const projectDir = join(homeOverride ?? homedir(), '.claude', 'projects', workDirToProjectPath(workDir));
+    if (!existsSync(projectDir)) {
+        log.info(`No Claude Code project dir found: ${projectDir}`);
+        return undefined;
+    }
+    try {
+        const entries = readdirSync(projectDir, { withFileTypes: true });
+        const sessions = [];
+        for (const entry of entries) {
+            // 只处理 .jsonl 文件，跳过子目录（如 subagents/）和 memory 目录
+            if (!entry.isFile() || !entry.name.endsWith('.jsonl'))
+                continue;
+            const sessionId = entry.name.replace('.jsonl', '');
+            // 校验 UUID 格式
+            if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.test(sessionId))
+                continue;
+            const filePath = join(projectDir, entry.name);
+            try {
+                const stat = statSync(filePath);
+                // 跳过空文件
+                if (stat.size === 0)
+                    continue;
+                sessions.push({ sessionId, mtime: stat.mtimeMs, filePath, size: stat.size });
+            }
+            catch {
+                continue;
+            }
+        }
+        if (sessions.length === 0) {
+            log.info(`No session files found in ${projectDir}`);
+            return undefined;
+        }
+        // 按修改时间倒序，最新的在前
+        sessions.sort((a, b) => b.mtime - a.mtime);
+        const latest = sessions[0];
+        log.info(`Found latest Claude Code session: ${latest.sessionId} (mtime: ${new Date(latest.mtime).toISOString()}, size: ${latest.size})`);
+        return latest;
+    }
+    catch (err) {
+        log.warn(`Failed to scan Claude Code project dir: ${err}`);
+        return undefined;
+    }
+}
+/**
+ * 从 JSONL 文件的第一行提取 sessionId，验证文件内容与文件名一致。
+ * 只读取前 4KB，避免大文件全量读入内存。
+ */
+function validateSessionFile(filePath, expectedSessionId) {
+    let fd;
+    try {
+        fd = openSync(filePath, 'r');
+        const buf = Buffer.alloc(4096);
+        const bytesRead = readSync(fd, buf, 0, 4096, 0);
+        if (bytesRead === 0)
+            return false;
+        const firstLine = buf.toString('utf-8', 0, bytesRead).split('\n')[0];
+        if (!firstLine)
+            return false;
+        const firstEntry = JSON.parse(firstLine);
+        return firstEntry.sessionId === expectedSessionId;
+    }
+    catch {
+        return false;
+    }
+    finally {
+        if (fd !== undefined) {
+            try {
+                closeSync(fd);
+            }
+            catch { /* ignore */ }
+        }
+    }
+}
 // 存储所有活跃的 SDKSession 对象，key 为 sessionId
 // 使用 Map 而不是 Set，因为我们需要通过 sessionId 获取 session
 const activeSessions = new Map();
@@ -246,6 +351,37 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode, onS
                     // 恢复失败，创建新会话
                 }
             }
+            // 没有指定 sessionId 时，尝试自动恢复 Claude Code CLI 的最新 session
+            // 实现手机/电脑无缝切换：同目录下默认共享同一个对话
+            if (!sessionId) {
+                const latest = findLatestClaudeSession(workDir);
+                if (latest) {
+                    // 安全检查：如果 CLI 正在使用该 session，不能接管
+                    if (isCliSessionActive(latest.sessionId)) {
+                        log.info(`CLI is actively using session ${latest.sessionId}, skipping auto-resume`);
+                    }
+                    else {
+                        // 验证文件内容一致性
+                        if (validateSessionFile(latest.filePath, latest.sessionId)) {
+                            try {
+                                log.info(`Auto-resuming latest CLI session: ${latest.sessionId}`);
+                                session = unstable_v2_resumeSession(latest.sessionId, sessionOptions);
+                                activeSessions.set(latest.sessionId, session);
+                                sessionWorkDirs.set(latest.sessionId, workDir);
+                                sessionLastUsed.set(latest.sessionId, Date.now());
+                                log.info(`Successfully auto-resumed CLI session: ${latest.sessionId}`);
+                                return { session, sessionId: latest.sessionId };
+                            }
+                            catch (err) {
+                                log.warn(`Failed to auto-resume CLI session ${latest.sessionId}, skipping auto-resume: ${err}`);
+                            }
+                        }
+                        else {
+                            log.warn(`Session file validation failed for ${latest.sessionId}, skipping`);
+                        }
+                    }
+                }
+            }
             // 创建新会话
             session = unstable_v2_createSession(sessionOptions);
             // 新会话的 sessionId 需要从第一个消息中获取

package/package.json

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