@wu529778790/open-im 1.10.9-beta.2 → 1.10.9-beta.21

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,9 +47,141 @@ 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。
+ *
+ * 仅当同时满足以下两个条件时返回 true：
+ *   1. 存在包含该 sessionId 的 claude 进程（通过 ps 检测）
+ *   2. session 文件在最近 30 秒内被修改过（说明 CLI 正在处理消息）
+ *
+ * 如果 CLI 只是挂在终端等待用户输入，进程仍在但文件长时间未变，
+ * 此时安全允许 open-im 接管 session（无缝切换）。
+ *
+ * 注意：仅支持 macOS/Linux，Windows 上会静默返回 false
+ */
+function isCliSessionActive(sessionId, sessionFilePath) {
+    try {
+        // macOS/Linux: 用 ps 搜索包含该 sessionId 的 claude 进程
+        // 排除 open-im 自己的 SDK 子进程（路径含 claude-agent-sdk），只匹配用户交互式 CLI
+        // -F 固定字符串匹配，避免正则意外；-- 防止 sessionId 被误认为 flag
+        const result = execSync(`ps -axo pid,command 2>/dev/null | grep -v grep | grep "claude" | grep -v "claude-agent-sdk" | grep -F -- "${sessionId}" || true`, { encoding: 'utf-8', timeout: 3000 });
+        if (result.trim().length === 0)
+            return false;
+        // 进程存在，但可能只是 idle 在终端等输入。检查文件 mtime：
+        // 如果 session 文件超过 30 秒未修改，说明 CLI 没在活跃处理。
+        if (sessionFilePath) {
+            try {
+                const stat = statSync(sessionFilePath);
+                const ageMs = Date.now() - stat.mtimeMs;
+                if (ageMs > 30_000) {
+                    log.info(`CLI process found for ${sessionId} but session file idle for ${Math.round(ageMs / 1000)}s, treating as inactive`);
+                    return false;
+                }
+            }
+            catch {
+                // stat 失败时保守地认为活跃
+            }
+        }
+        return true;
+    }
+    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();
+// 记录每个 session 创建/恢复时的 workDir，防止跨 workDir 复用已固定 cwd 的子进程
+const sessionWorkDirs = new Map();
 // 存储正在进行的流式迭代器，用于中断
 const activeStreams = new Set();
 // 空闲会话清理：跟踪最后使用时间，定期清除超时会话
@@ -92,34 +225,53 @@ const cleanupInterval = setInterval(() => {
                 activeSessions.delete(id);
             }
             sessionLastUsed.delete(id);
+            sessionWorkDirs.delete(id);
             log.info(`Cleaned up idle session (unused ${Math.round((now - lastUsed) / 60000)}min): ${id}`);
         }
     }
 }, CLEANUP_INTERVAL_MS);
 cleanupInterval.unref(); // 不阻止进程退出
 /**
- * Serializes process.chdir() calls across concurrent users.
+ * 串行化进程级 process.chdir() —— 同一时刻仅一个 chdir 生效。
  *
- * process.chdir() is a process-wide global side effect — only one chdir can
- * be active at a time. The SDK's createSession/resumeSession do not accept a
- * `cwd` parameter, so we must chdir before calling them. This mutex ensures
- * concurrent requests don't race on the working directory.
+ * SDK V2 的 createSession/resumeSession 不接受 cwd 参数；且 send()/stream()
+ * 会以「调用时的 process.cwd()」派生 Claude Code 子进程。必须用互斥锁串行化
+ * 「整个 turn 的 cwd 切换」，否则并发多用户会让工具跑错目录。
  *
- * **TODO:** Remove this mutex entirely once @anthropic-ai/claude-agent-sdk
- * supports a `cwd` option in createSession/resumeSession. Track upstream:
+ * **TODO:** SDK 支持 cwd 选项后移除此锁。upstream:
  * https://github.com/anthropics/claude-agent-sdk/issues
  */
 let chdirMutex = Promise.resolve();
 function withChdirMutex(fn) {
     const previous = chdirMutex;
-    let resolve;
-    chdirMutex = new Promise((r) => { resolve = r; });
-    return previous.then(() => {
+    let release;
+    chdirMutex = new Promise((r) => { release = r; });
+    return previous.then(async () => {
         try {
-            return fn();
+            return await fn();
         }
         finally {
-            resolve();
+            release();
+        }
+    });
+}
+/**
+ * 在持有全局 chdir 互斥锁期间，把进程 cwd 切到 workDir 执行 fn，结束后恢复。
+ * 用于包裹 session.send()+stream()，确保子进程在正确 workDir 派生。
+ */
+function runWithWorkDir(workDir, fn) {
+    return withChdirMutex(async () => {
+        const originalCwd = process.cwd();
+        if (workDir && workDir !== originalCwd) {
+            process.chdir(workDir);
+        }
+        try {
+            return await fn();
+        }
+        finally {
+            if (workDir && workDir !== originalCwd) {
+                process.chdir(originalCwd);
+            }
         }
     });
 }
@@ -201,18 +353,21 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode, onS
                 process.chdir(workDir);
             }
             if (sessionId) {
-                // 优先复用内存中已有的 SDKSession，避免每次都启动新进程
+                // 优先复用内存中已有的 SDKSession，避免每次都启动新进程。
+                // 仅当 workDir 与创建时一致才复用：否则子进程 cwd 已固定在旧目录，
+                // 需走 resume 重新派生（在当前 workDir 启动新子进程）。
                 const existing = activeSessions.get(sessionId);
-                if (existing) {
+                if (existing && sessionWorkDirs.get(sessionId) === workDir) {
                     log.info(`Reusing existing in-memory session: ${sessionId}`);
                     sessionLastUsed.set(sessionId, Date.now());
                     return { session: existing, sessionId };
                 }
-                // 内存中没有，尝试通过 resume 恢复（会启动新 CLI 进程）
+                // 内存中没有（或 workDir 变了），尝试通过 resume 恢复（会启动新 CLI 进程）
                 try {
                     log.info(`Attempting to resume session: ${sessionId}`);
                     session = unstable_v2_resumeSession(sessionId, sessionOptions);
                     activeSessions.set(sessionId, session);
+                    sessionWorkDirs.set(sessionId, workDir);
                     sessionLastUsed.set(sessionId, Date.now());
                     log.info(`Successfully resumed session: ${sessionId}`);
                     return { session, sessionId };
@@ -222,12 +377,43 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode, onS
                     // 恢复失败，创建新会话
                 }
             }
+            // 没有指定 sessionId 时，尝试自动恢复 Claude Code CLI 的最新 session
+            // 实现手机/电脑无缝切换：同目录下默认共享同一个对话
+            if (!sessionId) {
+                const latest = findLatestClaudeSession(workDir);
+                if (latest) {
+                    // 检测 CLI 是否正在使用该 session（用于日志，不阻止 resume）
+                    const cliActive = isCliSessionActive(latest.sessionId, latest.filePath);
+                    if (cliActive) {
+                        log.info(`CLI is actively using session ${latest.sessionId}, attempting resume anyway (SDK handles concurrency)`);
+                    }
+                    // 验证文件内容一致性
+                    if (validateSessionFile(latest.filePath, latest.sessionId)) {
+                        try {
+                            log.info(`Auto-resuming latest CLI session: ${latest.sessionId}${cliActive ? ' (CLI active)' : ''}`);
+                            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}, creating new one: ${err}`);
+                        }
+                    }
+                    else {
+                        log.warn(`Session file validation failed for ${latest.sessionId}, skipping`);
+                    }
+                }
+            }
             // 创建新会话
             session = unstable_v2_createSession(sessionOptions);
             // 新会话的 sessionId 需要从第一个消息中获取
             // 暂时返回 undefined，稍后在 init 消息中获取
             const tempId = `pending-${++sessionSeq}`;
             activeSessions.set(tempId, session);
+            sessionWorkDirs.set(tempId, workDir);
             sessionLastUsed.set(tempId, Date.now());
             log.info(`Created new session (tempId: ${tempId})`);
             return { session, sessionId: tempId, wasReused: false };
@@ -267,6 +453,7 @@ export class ClaudeSDKAdapter {
         }
         activeSessions.clear();
         sessionLastUsed.clear();
+        sessionWorkDirs.clear();
     }
     /**
      * Remove a specific session from the in-memory cache and close it.
@@ -281,6 +468,7 @@ export class ClaudeSDKAdapter {
             catch { /* ignore */ }
             activeSessions.delete(sessionId);
             sessionLastUsed.delete(sessionId);
+            sessionWorkDirs.delete(sessionId);
             log.info(`Explicitly removed session: ${sessionId}`);
         }
     }
@@ -320,12 +508,16 @@ export class ClaudeSDKAdapter {
                 }
                 runningSessions.add(returnedId);
                 trackedRunningId = returnedId;
-                // 发送用户消息
-                await session.send(prompt);
-                // 获取响应流
-                const stream = session.stream();
-                currentStream = stream;
-                activeStreams.add(stream);
+                // 在持有 chdir 锁期间完成 send() + stream() 获取：SDK V2 会以当前
+                // process.cwd() 派生 Claude Code 子进程，必须保证此刻 cwd 为 workDir。
+                // 锁串行化后，并发多用户的子进程不会在错误的目录派生。
+                const stream = await runWithWorkDir(workDir, async () => {
+                    await session.send(prompt);
+                    const s = session.stream();
+                    currentStream = s;
+                    activeStreams.add(s);
+                    return s;
+                });
                 let accumulated = '';
                 let accumulatedThinking = '';
                 const toolStats = {};
@@ -348,13 +540,19 @@ export class ClaudeSDKAdapter {
                                 // 更新 sessionId 映射
                                 // 清理 pending 临时 ID（actualSessionId 尚未赋值时用 pendingTempId）
                                 const idToClean = actualSessionId ?? pendingTempId;
+                                const inheritedWorkDir = idToClean ? sessionWorkDirs.get(idToClean) : undefined;
                                 if (idToClean?.startsWith('pending-')) {
                                     activeSessions.delete(idToClean);
                                 }
                                 activeSessions.set(newSessionId, session);
+                                if (inheritedWorkDir !== undefined) {
+                                    sessionWorkDirs.set(newSessionId, inheritedWorkDir);
+                                }
                                 sessionLastUsed.set(newSessionId, Date.now());
-                                if (idToClean)
+                                if (idToClean) {
                                     sessionLastUsed.delete(idToClean);
+                                    sessionWorkDirs.delete(idToClean);
+                                }
                                 // 更新 runningSessions：移除旧 ID，添加新 ID
                                 if (idToClean)
                                     runningSessions.delete(idToClean);

package/dist/adapters/registry.js

@@ -3,6 +3,7 @@ import { ClaudeSDKAdapter, configureClaudeSdkSessionIdle } from './claude-sdk-ad
 import { CodexAdapter } from './codex-adapter.js';
 import { CodeBuddyAdapter } from './codebuddy-adapter.js';
 import { createLogger } from '../logger.js';
+import { destroyAllLiveChildren } from '../shared/process-kill.js';
 const log = createLogger('Registry');
 const adapters = new Map();
 export function initAdapters(config) {
@@ -30,5 +31,7 @@ export function getAdapter(aiCommand) {
 }
 export function cleanupAdapters() {
     ClaudeSDKAdapter.destroy();
+    // 强制终止仍在运行的 CLI 子进程（Codex/CodeBuddy），避免僵尸 / 孤儿
+    destroyAllLiveChildren();
     adapters.clear();
 }

package/dist/channels/capabilities.js

@@ -5,6 +5,7 @@ const PLATFORM_LABELS = {
     wework: "企业微信",
     dingtalk: "钉钉",
     workbuddy: "WorkBuddy",
+    clawbot: "ClawBot",
 };
 export const CHANNEL_CAPABILITIES = {
     telegram: {
@@ -31,6 +32,10 @@ export const CHANNEL_CAPABILITIES = {
         inbound: { text: "native", image: "none", file: "none", voice: "none", video: "none" },
         outbound: { streamEdit: "none", streamPush: "none", image: "none", card: "none", typing: "none" },
     },
+    clawbot: {
+        inbound: { text: "native", image: "none", file: "none", voice: "none", video: "none" },
+        outbound: { streamEdit: "none", streamPush: "none", image: "none", card: "none", typing: "none" },
+    },
 };
 function listPreferredPlatforms(kind) {
     return Object.entries(CHANNEL_CAPABILITIES)

package/dist/clawbot/client.d.ts

@@ -0,0 +1,14 @@
+/**
+ * ClawBot Client - WeChat iLink Bot API long-polling client
+ *
+ * Uses the official iLink protocol: POST + JSON body + Bearer token auth.
+ * Receives messages via long-polling ilink/bot/getupdates and dispatches
+ * them to the event handler.
+ *
+ * Reference: @tencent-weixin/openclaw-weixin, cc-wechat, claude-code-wechat-channel
+ */
+import type { Config } from '../config.js';
+import type { ClawBotState } from './types.js';
+export declare function getChannelState(): ClawBotState;
+export declare function initClawbot(config: Config, eventHandler: (chatId: string, msgId: string, content: string) => Promise<void>, onStateChange?: (state: ClawBotState) => void): Promise<void>;
+export declare function stopClawbot(): void;