@wu529778790/open-im 1.1.3 → 1.1.4-beta.0

package/README.md

@@ -84,6 +84,22 @@ npm run dev        # 直接运行源码（tsx，无需 build）
 | `ALLOWED_BASE_DIRS` | 允许访问的目录（逗号分隔） |
 | `LOG_DIR` | 日志目录，默认 `~/.open-im/logs` |
 | `LOG_LEVEL` | 日志级别：INFO/DEBUG/WARN/ERROR |
+| `USE_SDK_MODE` | 默认 `true`（SDK 模式，更快）；设为 `false` 使用 CLI 模式 |
+
+### SDK 模式（默认，更快）
+
+默认使用 Agent SDK 模式，进程内执行，每次对话不再 spawn 新进程，响应更快。若需改用 CLI 模式，可配置：
+
+```json
+{
+  "useSdkMode": false,
+  "aiCommand": "claude"
+}
+```
+
+或环境变量：`USE_SDK_MODE=false`
+
+**认证**：需设置 `ANTHROPIC_API_KEY`（从 [Console](https://console.anthropic.com/) 获取）或运行 `claude setup-token` 生成 `CLAUDE_CODE_OAUTH_TOKEN`。SDK 模式无需安装 Claude CLI。
 
 ### 配置文件
 

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

@@ -0,0 +1,15 @@
+/**
+ * Claude SDK Adapter - 使用 Agent SDK 实现持久会话，无需每次 spawn 进程
+ *
+ * 优势：
+ * 1. 进程内执行 - 无 fork/exec 开销，响应更快
+ * 2. 会话复用 - resume 保留上下文，无需重新加载历史
+ * 3. 流式输出 - includePartialMessages 支持 text_delta、thinking_delta
+ *
+ * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN（claude setup-token）
+ */
+import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
+export declare class ClaudeSDKAdapter implements ToolAdapter {
+    readonly toolId = "claude-sdk";
+    run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
+}

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

@@ -0,0 +1,139 @@
+/**
+ * Claude SDK Adapter - 使用 Agent SDK 实现持久会话，无需每次 spawn 进程
+ *
+ * 优势：
+ * 1. 进程内执行 - 无 fork/exec 开销，响应更快
+ * 2. 会话复用 - resume 保留上下文，无需重新加载历史
+ * 3. 流式输出 - includePartialMessages 支持 text_delta、thinking_delta
+ *
+ * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN（claude setup-token）
+ */
+import { query } from '@anthropic-ai/claude-agent-sdk';
+import { createLogger } from '../logger.js';
+const log = createLogger('ClaudeSDK');
+function isStreamEvent(msg) {
+    return msg.type === 'stream_event';
+}
+function isSystemInit(msg) {
+    const m = msg;
+    return m.type === 'system' && m.subtype === 'init';
+}
+function isResult(msg) {
+    return msg.type === 'result';
+}
+function isAssistant(msg) {
+    return msg.type === 'assistant';
+}
+export class ClaudeSDKAdapter {
+    toolId = 'claude-sdk';
+    run(prompt, sessionId, workDir, callbacks, options) {
+        const abortController = new AbortController();
+        let queryClosed = false;
+        const permissionMode = options?.skipPermissions
+            ? 'bypassPermissions'
+            : options?.permissionMode === 'acceptEdits'
+                ? 'acceptEdits'
+                : options?.permissionMode === 'plan'
+                    ? 'plan'
+                    : 'default';
+        const runQuery = async () => {
+            try {
+                const opts = {
+                    cwd: workDir,
+                    resume: sessionId,
+                    includePartialMessages: true,
+                    permissionMode,
+                    model: options?.model,
+                    abortController,
+                    allowDangerouslySkipPermissions: permissionMode === 'bypassPermissions',
+                };
+                const q = query({
+                    prompt,
+                    options: opts,
+                });
+                let accumulated = '';
+                let accumulatedThinking = '';
+                const toolStats = {};
+                try {
+                    for await (const msg of q) {
+                        if (abortController.signal.aborted)
+                            break;
+                        if (isSystemInit(msg)) {
+                            callbacks.onSessionId?.(msg.session_id);
+                            continue;
+                        }
+                        if (isStreamEvent(msg)) {
+                            const ev = msg.event;
+                            if (ev?.type === 'content_block_delta' && ev.delta) {
+                                if (ev.delta.type === 'text_delta' && ev.delta.text) {
+                                    accumulated += ev.delta.text;
+                                    callbacks.onText(accumulated);
+                                }
+                                else if (ev.delta.type === 'thinking_delta' && ev.delta.thinking) {
+                                    accumulatedThinking += ev.delta.thinking;
+                                    callbacks.onThinking?.(accumulatedThinking);
+                                }
+                            }
+                            continue;
+                        }
+                        if (isAssistant(msg)) {
+                            const content = msg.message?.content;
+                            for (const block of content ?? []) {
+                                if (block?.type === 'tool_use' && block.name) {
+                                    toolStats[block.name] = (toolStats[block.name] || 0) + 1;
+                                    callbacks.onToolUse?.(block.name, block.input);
+                                }
+                            }
+                            continue;
+                        }
+                        if (isResult(msg)) {
+                            queryClosed = true;
+                            const m = msg;
+                            const success = m.subtype === 'success';
+                            const result = {
+                                success,
+                                result: m.result ?? '',
+                                accumulated: success ? accumulated : '',
+                                cost: m.total_cost_usd ?? 0,
+                                durationMs: m.duration_ms ?? 0,
+                                numTurns: m.num_turns ?? 0,
+                                toolStats,
+                            };
+                            if (!result.accumulated && result.result)
+                                result.accumulated = result.result;
+                            callbacks.onComplete(result);
+                            return;
+                        }
+                    }
+                    if (!queryClosed) {
+                        callbacks.onComplete({
+                            success: true,
+                            result: accumulated,
+                            accumulated,
+                            cost: 0,
+                            durationMs: 0,
+                            numTurns: 0,
+                            toolStats,
+                        });
+                    }
+                }
+                finally {
+                    q.close();
+                }
+            }
+            catch (err) {
+                if (abortController.signal.aborted)
+                    return;
+                const msg = err instanceof Error ? err.message : String(err);
+                log.error(`Claude SDK error: ${msg}`);
+                callbacks.onError(msg);
+            }
+        };
+        runQuery();
+        return {
+            abort: () => {
+                abortController.abort();
+            },
+        };
+    }
+}

package/dist/adapters/registry.js

@@ -1,13 +1,20 @@
 import { ClaudeAdapter } from './claude-adapter.js';
+import { ClaudeSDKAdapter } from './claude-sdk-adapter.js';
 const adapters = new Map();
 export function initAdapters(config) {
     adapters.clear();
     if (config.aiCommand === 'claude') {
-        // Enable process pool with 2 minute idle timeout
-        adapters.set('claude', new ClaudeAdapter(config.claudeCliPath, {
-            useProcessPool: true,
-            idleTimeoutMs: 2 * 60 * 1000, // 2 minutes
-        }));
+        if (config.useSdkMode) {
+            console.log('⚡ 启用 Claude Agent SDK 模式 - 进程内执行，响应更快');
+            adapters.set('claude', new ClaudeSDKAdapter());
+        }
+        else {
+            console.log('🚀 使用标准 Claude 适配器');
+            adapters.set('claude', new ClaudeAdapter(config.claudeCliPath, {
+                useProcessPool: true,
+                idleTimeoutMs: 2 * 60 * 1000, // 2 minutes
+            }));
+        }
     }
 }
 export function getAdapter(aiCommand) {

package/dist/config.d.ts

@@ -33,6 +33,8 @@ export interface Config {
     hookPort: number;
     logDir: string;
     logLevel: LogLevel;
+    /** 是否使用 Agent SDK（进程内执行，无 spawn 开销，响应更快） */
+    useSdkMode: boolean;
     platforms: {
         telegram?: {
             enabled: boolean;

package/dist/config.js

@@ -146,8 +146,11 @@ export function loadConfig() {
     const hookPort = process.env.HOOK_PORT !== undefined
         ? parseInt(process.env.HOOK_PORT, 10) || 35801
         : file.hookPort ?? 35801;
-    // 6. 校验 Claude CLI
-    if (aiCommand === 'claude') {
+    const useSdkMode = process.env.USE_SDK_MODE !== undefined
+        ? process.env.USE_SDK_MODE === 'true'
+        : file.useSdkMode ?? true;
+    // 6. 校验 Claude CLI（SDK 模式不需要 CLI）
+    if (aiCommand === 'claude' && !useSdkMode) {
         if (isAbsolute(claudeCliPath) || claudeCliPath.includes('/') || claudeCliPath.includes('\\')) {
             try {
                 accessSync(claudeCliPath, constants.F_OK | constants.X_OK);
@@ -272,6 +275,7 @@ export function loadConfig() {
         hookPort,
         logDir,
         logLevel,
+        useSdkMode,
         platforms,
     };
 }

package/dist/setup.js

@@ -409,6 +409,7 @@ export async function runInteractiveSetup() {
         claudeWorkDir: (commonResp.workDir || process.cwd()).trim(),
         claudeSkipPermissions: base?.claudeSkipPermissions ?? true,
         aiCommand: commonResp.aiCommand ?? base?.aiCommand ?? "claude",
+        useSdkMode: base?.useSdkMode ?? true,
     };
     if (selectedPlatforms.includes("telegram")) {
         out.platforms.telegram = {

package/dist/shared/ai-task.js

@@ -74,9 +74,13 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
             }
         };
         const mode = getPermissionMode(ctx.userId, config.defaultPermissionMode);
-        // 全部交给 Claude 自己处理：yolo 用 --dangerously-skip-permissions，其他用 --permission-mode
-        const skipPermissions = mode === 'yolo' || config.claudeSkipPermissions;
-        const permissionMode = !skipPermissions
+        process.env.CC_IM_CHAT_ID = ctx.chatId;
+        // 构建运行选项
+        let skipPermissions;
+        let permissionMode;
+        // 标准模式 / SDK 模式：传递权限模式参数
+        skipPermissions = mode === 'yolo' || config.claudeSkipPermissions;
+        permissionMode = !skipPermissions
             ? (mode === 'ask'
                 ? 'default'
                 : mode === 'accept-edits'
@@ -85,7 +89,6 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                         ? 'plan'
                         : undefined)
             : undefined;
-        process.env.CC_IM_CHAT_ID = ctx.chatId;
         const handle = toolAdapter.run(prompt, ctx.sessionId, ctx.workDir, {
             onSessionId: (id) => {
                 if (ctx.threadId)
@@ -171,7 +174,8 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
             timeoutMs: config.claudeTimeoutMs,
             model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
             chatId: ctx.chatId,
-            hookPort: config.hookPort,
+            // SDK 模式下不使用 hookPort
+            ...(config.useSdkMode ? {} : { hookPort: config.hookPort }),
         });
         taskState = { handle, latestContent: '', settle, startedAt: Date.now() };
         platformAdapter.onTaskReady(taskState);

package/dist/wework/client.d.ts

@@ -34,6 +34,8 @@ export declare function initWeWork(cfg: Config, eventHandler: (data: WeWorkCallb
 export declare function sendMessage(message: WeWorkResponseMessage): void;
 /**
  * Send text message via WebSocket (requires req_id from callback)
+ * 企业微信 aibot_respond_msg 仅支持 stream 和 template_card，不支持 text/markdown
+ * 使用 stream 格式，finish=true 表示一次性回复
  */
 export declare function sendText(reqId: string, content: string): void;
 /**

package/dist/wework/client.js

@@ -289,11 +289,14 @@ export function sendMessage(message) {
 }
 /**
  * Send text message via WebSocket (requires req_id from callback)
+ * 企业微信 aibot_respond_msg 仅支持 stream 和 template_card，不支持 text/markdown
+ * 使用 stream 格式，finish=true 表示一次性回复
  */
 export function sendText(reqId, content) {
+    const streamId = `${Date.now()}-${randomBytes(8).toString('hex')}`;
     sendWebSocketReply(reqId, {
-        msgtype: 'text',
-        text: { content },
+        msgtype: 'stream',
+        stream: { id: streamId, finish: true, content },
     });
 }
 /**

package/dist/wework/message-sender.js

@@ -162,9 +162,12 @@ export async function sendProactiveTextReply(chatId, text) {
  */
 export async function sendTextReply(chatId, text, threadCtxOrReqId) {
     const message = formatWeWorkMessage('📢 open-im', text, 'done');
-    const reqId = typeof threadCtxOrReqId === 'string' ? threadCtxOrReqId : undefined;
+    // 显式传递的 reqId（用于兼容 MessageSender 接口）
+    const explicitReqId = typeof threadCtxOrReqId === 'string' ? threadCtxOrReqId : undefined;
+    // 回退到当前请求的 reqId（在 handleEvent 中通过 setCurrentReqId 设置）
+    const effectiveReqId = explicitReqId ?? currentReqId;
     try {
-        sendText(getReqId(reqId), message);
+        sendText(getReqId(effectiveReqId ?? undefined), message);
         log.info(`Text reply sent to user ${chatId}`);
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.1.3",
+  "version": "1.1.4-beta.0",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, Cursor)",
   "type": "module",
   "main": "dist/index.js",
@@ -19,7 +19,8 @@
     "init": "tsx src/cli.ts init",
     "start": "node dist/cli.js start",
     "stop": "node dist/cli.js stop",
-    "test": "npm run build",
+    "test": "vitest run",
+    "test:watch": "vitest watch",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -42,6 +43,7 @@
     "url": "https://github.com/wu529778790/open-im/issues"
   },
   "dependencies": {
+    "@anthropic-ai/claude-agent-sdk": "^0.2.72",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "@wecom/wecom-openclaw-plugin": "^1.0.6",
     "prompts": "^2.4.2",
@@ -54,9 +56,11 @@
     "@types/prompts": "^2.4.9",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.5.13",
+    "@vitest/coverage-v8": "4.0.18",
     "dotenv": "^16.0.0",
     "tsx": "^4.0.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "4.0.18"
   },
   "engines": {
     "node": ">=20"