@wu529778790/open-im 1.8.1-beta.13 → 1.8.1-beta.15

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

@@ -37,39 +37,51 @@ function isResult(msg) {
  * @param permissionMode 权限模式
  * @returns SDKSession 对象和实际的 sessionId
  */
-async function getOrCreateSession(sessionId, _workDir, // 保留参数以备将来使用
-model, permissionMode) {
+async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
     const resolvedModel = model?.trim() || 'claude-opus-4-5';
     const sessionOptions = {
         model: resolvedModel,
         permissionMode,
-        // 可以添加其他选项，如 hooks, allowedTools 等
     };
     const baseUrl = process.env.ANTHROPIC_BASE_URL ?? '(default)';
-    log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl}`);
+    log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl} workDir=${workDir}`);
     let session;
-    if (sessionId) {
-        // 尝试恢复已有会话
-        try {
-            log.info(`Attempting to resume session: ${sessionId}`);
-            session = unstable_v2_resumeSession(sessionId, sessionOptions);
-            activeSessions.set(sessionId, session);
-            log.info(`Successfully resumed session: ${sessionId}`);
-            return { session, sessionId };
+    // SDK V2 的 SDKSessionOptions 没有 cwd 字段，
+    // 需要通过 process.chdir() 临时切换工作目录。
+    // 因为 createSession/resumeSession 是同步调用，且 JS 单线程，所以是安全的。
+    const originalCwd = process.cwd();
+    try {
+        if (workDir && workDir !== originalCwd) {
+            process.chdir(workDir);
         }
-        catch (err) {
-            log.warn(`Failed to resume session ${sessionId}, creating new one: ${err}`);
-            // 恢复失败，创建新会话
+        if (sessionId) {
+            // 尝试恢复已有会话
+            try {
+                log.info(`Attempting to resume session: ${sessionId}`);
+                session = unstable_v2_resumeSession(sessionId, sessionOptions);
+                activeSessions.set(sessionId, session);
+                log.info(`Successfully resumed session: ${sessionId}`);
+                return { session, sessionId };
+            }
+            catch (err) {
+                log.warn(`Failed to resume session ${sessionId}, creating new one: ${err}`);
+                // 恢复失败，创建新会话
+            }
+        }
+        // 创建新会话
+        session = unstable_v2_createSession(sessionOptions);
+        // 新会话的 sessionId 需要从第一个消息中获取
+        // 暂时返回 undefined，稍后在 init 消息中获取
+        const tempId = `pending-${Date.now()}`;
+        activeSessions.set(tempId, session);
+        log.info(`Created new session (tempId: ${tempId})`);
+        return { session, sessionId: tempId };
+    }
+    finally {
+        if (workDir && workDir !== originalCwd) {
+            process.chdir(originalCwd);
         }
     }
-    // 创建新会话
-    session = unstable_v2_createSession(sessionOptions);
-    // 新会话的 sessionId 需要从第一个消息中获取
-    // 暂时返回 undefined，稍后在 init 消息中获取
-    const tempId = `pending-${Date.now()}`;
-    activeSessions.set(tempId, session);
-    log.info(`Created new session (tempId: ${tempId})`);
-    return { session, sessionId: tempId };
 }
 export class ClaudeSDKAdapter {
     toolId = 'claude-sdk';

package/dist/wework/event-handler.js

@@ -21,6 +21,8 @@ import { buildMediaContext } from '../shared/media-context.js';
 import { buildErrorNote, buildProgressNote } from '../shared/message-note.js';
 const log = createLogger('WeWorkHandler');
 const WEWORK_MEDIA_TIMEOUT_MS = 60_000;
+// Safety timeout: abort hung tasks before stream expires (5 min TTL → 4.5 min safety)
+const WEWORK_TASK_SAFETY_TIMEOUT_MS = 4.5 * 60 * 1000;
 async function saveWeWorkUrlMedia(payload, fallbackExtension) {
     if (!payload.url) {
         throw new Error("Missing WeWork media URL");
@@ -199,6 +201,24 @@ export function setupWeWorkHandlers(config, sessionManager) {
             }
             const stopTyping = startTypingLoop(chatId);
             const taskKey = `${userId}:${msgId}`;
+            // Safety timeout: abort hung tasks before stream expires, unblocking the queue
+            let safetyTimer = setTimeout(() => {
+                safetyTimer = null;
+                const state = runningTasks.get(taskKey);
+                if (state) {
+                    log.warn(`[SAFETY_TIMEOUT] Task ${taskKey} exceeded ${WEWORK_TASK_SAFETY_TIMEOUT_MS}ms, aborting`);
+                    state.handle.abort();
+                    runningTasks.delete(taskKey);
+                    stopTyping();
+                    sendTextReply(chatId, `AI 处理超时（${Math.round(WEWORK_TASK_SAFETY_TIMEOUT_MS / 1000)}s），已自动取消。请重试。`, reqId).catch(() => { });
+                }
+            }, WEWORK_TASK_SAFETY_TIMEOUT_MS);
+            const clearSafetyTimer = () => {
+                if (safetyTimer) {
+                    clearTimeout(safetyTimer);
+                    safetyTimer = null;
+                }
+            };
             await runAITask({ config, sessionManager }, { userId, chatId, workDir, sessionId, convId, platform: 'wework', taskKey }, prompt, toolAdapter, {
                 throttleMs: WEWORK_THROTTLE_MS,
                 streamUpdate: async (content, toolNote) => {
@@ -217,6 +237,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
                     await updateMessage(chatId, msgId, `Error: ${error}`, 'error', buildErrorNote(), toolId, reqId);
                 },
                 extraCleanup: () => {
+                    clearSafetyTimer();
                     stopTyping();
                     runningTasks.delete(taskKey);
                 },

package/dist/wework/message-sender.js

@@ -187,6 +187,12 @@ export async function updateMessage(chatId, streamId, content, status, note, too
             return;
         if (Date.now() - state.createdAt >= STREAM_SAFE_TTL_MS) {
             markExpired(state, streamId);
+            // Stream expired - fall back to text delivery for errors and final states
+            if (status === 'error' || status === 'done') {
+                const reqIdUsed = getReqId(reqId);
+                sendText(reqIdUsed, message);
+                log.info(`Stream expired, sent ${status} via text fallback: streamId=${streamId}`);
+            }
             return;
         }
         state.pendingUpdate = { message, status, reqId };

package/package.json

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