@wu529778790/open-im 1.6.2 → 1.6.3-beta.2

package/dist/shared/ai-task.test.js

@@ -0,0 +1,69 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+vi.mock("../permission-mode/session-mode.js", () => ({
+    getPermissionMode: vi.fn(() => "ask"),
+}));
+import { runAITask } from "./ai-task.js";
+describe("runAITask", () => {
+    beforeEach(() => {
+        vi.useFakeTimers();
+    });
+    it("keeps the codex session on usage limit errors", async () => {
+        const clearSessionForConv = vi.fn();
+        const clearActiveToolSession = vi.fn();
+        const setSessionIdForConv = vi.fn();
+        const sessionManager = {
+            addTurnsForThread: vi.fn(() => 0),
+            addTurns: vi.fn(() => 0),
+            setSessionIdForThread: vi.fn(),
+            setSessionIdForConv,
+            clearSessionForConv,
+            clearActiveToolSession,
+            getModel: vi.fn(() => undefined),
+        };
+        const streamUpdate = vi.fn();
+        const sendComplete = vi.fn(async () => { });
+        const sendError = vi.fn(async () => { });
+        const toolAdapter = {
+            toolId: "codex",
+            run(_prompt, _sessionId, _workDir, callbacks) {
+                callbacks.onError("You've hit your usage limit. To get more access now, send a request to your admin or try again at 12:56 PM.");
+                return { abort: vi.fn() };
+            },
+        };
+        const taskPromise = runAITask({
+            config: {
+                aiCommand: "codex",
+                defaultPermissionMode: "ask",
+                codexTimeoutMs: 600000,
+                claudeTimeoutMs: 600000,
+                claudeSkipPermissions: false,
+                claudeModel: "",
+                useSdkMode: true,
+                hookPort: 35801,
+                codexProxy: "",
+            },
+            sessionManager: sessionManager,
+        }, {
+            userId: "u1",
+            chatId: "c1",
+            workDir: "D:\\coding\\open-im",
+            sessionId: "sess-1",
+            convId: "conv-1",
+            platform: "wework",
+            taskKey: "task-1",
+        }, "hello", toolAdapter, {
+            streamUpdate,
+            sendComplete,
+            sendError,
+            throttleMs: 0,
+            onTaskReady: vi.fn(),
+        });
+        await taskPromise;
+        expect(clearSessionForConv).not.toHaveBeenCalled();
+        expect(clearActiveToolSession).not.toHaveBeenCalled();
+        expect(sendComplete).not.toHaveBeenCalled();
+        expect(sendError).toHaveBeenCalledOnce();
+        expect(sendError).toHaveBeenCalledWith(expect.stringContaining("usage limit"));
+        expect(streamUpdate).not.toHaveBeenCalled();
+    });
+});

package/dist/telegram/event-handler.d.ts

@@ -1,5 +1,5 @@
 import type { Telegraf } from "telegraf";
-import type { Config } from "../config.js";
+import { type Config } from "../config.js";
 import type { SessionManager } from "../session/session-manager.js";
 export interface TelegramEventHandlerHandle {
     stop: () => void;

package/dist/telegram/event-handler.js

@@ -1,4 +1,5 @@
 import { message } from "telegraf/filters";
+import { resolvePlatformAiCommand } from "../config.js";
 import { AccessControl } from "../access/access-control.js";
 import { RequestQueue } from "../queue/request-queue.js";
 import { sendThinkingMessage, updateMessage, sendFinalMessages, sendTextReply, startTypingLoop, sendImageReply, sendModeKeyboard, sendDirectorySelection, } from "./message-sender.js";
@@ -93,16 +94,17 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
     async function handleAIRequest(userId, chatId, prompt, workDir, convId, _threadCtx, replyToMessageId) {
         const currentTurns = sessionManager.addTurns(userId, 1);
         log.info(`User request: total turns = ${currentTurns} for user ${userId}`);
-        const toolAdapter = getAdapter(config.aiCommand);
+        const aiCommand = resolvePlatformAiCommand(config, "telegram");
+        const toolAdapter = getAdapter(aiCommand);
         if (!toolAdapter) {
-            await sendTextReply(chatId, `未配置 AI 工具: ${config.aiCommand}`);
+            await sendTextReply(chatId, `未配置 AI 工具: ${aiCommand}`);
             return;
         }
         const sessionId = convId
-            ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand)
+            ? sessionManager.getSessionIdForConv(userId, convId, aiCommand)
             : undefined;
-        log.info(`Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? "new"}`);
-        const toolId = config.aiCommand;
+        log.info(`Running ${aiCommand} for user ${userId}, sessionId=${sessionId ?? "new"}`);
+        const toolId = aiCommand;
         let msgId;
         try {
             msgId = await sendThinkingMessage(chatId, replyToMessageId, toolId);
@@ -271,7 +273,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
                 taskInfo.settle();
                 taskInfo.handle.abort();
                 const chatId = String(ctx.chat?.id ?? "");
-                await updateMessage(chatId, messageId, taskInfo.latestContent || "已停止", "error", "⏹️ 已停止", config.aiCommand);
+                await updateMessage(chatId, messageId, taskInfo.latestContent || "已停止", "error", "⏹️ 已停止", taskInfo.toolId);
                 await ctx.answerCbQuery("已停止执行");
             }
             else {

package/dist/wechat/event-handler.d.ts

@@ -1,7 +1,7 @@
 /**
  * WeChat Event Handler - Handle WeChat message events from AGP WebSocket
  */
-import type { Config } from '../config.js';
+import { type Config } from '../config.js';
 import type { SessionManager } from '../session/session-manager.js';
 export interface WeChatEventHandlerHandle {
     stop: () => void;

package/dist/wechat/event-handler.js

@@ -1,6 +1,7 @@
 /**
  * WeChat Event Handler - Handle WeChat message events from AGP WebSocket
  */
+import { resolvePlatformAiCommand } from '../config.js';
 import { AccessControl } from '../access/access-control.js';
 import { RequestQueue } from '../queue/request-queue.js';
 import { sendThinkingMessage, updateMessage, sendFinalMessages, sendTextReply, sendImageReply, startTypingLoop, sendPermissionCard, sendModeCard, } from './message-sender.js';
@@ -115,17 +116,18 @@ export function setupWeChatHandlers(config, sessionManager) {
     }
     async function handleAIRequest(userId, chatId, prompt, workDir, convId, _threadCtx, replyToMessageId) {
         log.info(`[AI_REQUEST] userId=${userId}, chatId=${chatId}, promptLength=${prompt.length}`);
-        const toolAdapter = getAdapter(config.aiCommand);
+        const aiCommand = resolvePlatformAiCommand(config, 'wechat');
+        const toolAdapter = getAdapter(aiCommand);
         if (!toolAdapter) {
-            log.error(`[handleAIRequest] No adapter found for: ${config.aiCommand}`);
-            await sendTextReply(chatId, `AI tool is not configured: ${config.aiCommand}`);
+            log.error(`[handleAIRequest] No adapter found for: ${aiCommand}`);
+            await sendTextReply(chatId, `AI tool is not configured: ${aiCommand}`);
             return;
         }
         const sessionId = convId
-            ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand)
+            ? sessionManager.getSessionIdForConv(userId, convId, aiCommand)
             : undefined;
-        log.info(`[handleAIRequest] Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
-        const toolId = config.aiCommand;
+        log.info(`[handleAIRequest] Running ${aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
+        const toolId = aiCommand;
         let msgId;
         try {
             msgId = await sendThinkingMessage(chatId, replyToMessageId, toolId);

package/dist/wework/event-handler.d.ts

@@ -1,7 +1,7 @@
 /**
  * WeWork Event Handler - Handle WeWork message events
  */
-import type { Config } from '../config.js';
+import { type Config } from '../config.js';
 import type { SessionManager } from '../session/session-manager.js';
 import type { WeWorkCallbackMessage } from './types.js';
 type MediaKind = 'image' | 'file' | 'voice' | 'video';

package/dist/wework/event-handler.js

@@ -1,6 +1,7 @@
 /**
  * WeWork Event Handler - Handle WeWork message events
  */
+import { resolvePlatformAiCommand } from '../config.js';
 import { AccessControl } from '../access/access-control.js';
 import { RequestQueue } from '../queue/request-queue.js';
 import { sendThinkingMessage, updateMessage, sendFinalMessages, sendTextReply, sendImageReply, startTypingLoop, sendPermissionCard, sendModeCard, setCurrentReqId, } from './message-sender.js';
@@ -174,17 +175,18 @@ export function setupWeWorkHandlers(config, sessionManager) {
         if (reqId)
             setCurrentReqId(reqId);
         try {
-            const toolAdapter = getAdapter(config.aiCommand);
+            const aiCommand = resolvePlatformAiCommand(config, 'wework');
+            const toolAdapter = getAdapter(aiCommand);
             if (!toolAdapter) {
-                log.error(`[handleAIRequest] No adapter found for: ${config.aiCommand}`);
-                await sendTextReply(chatId, `AI tool is not configured: ${config.aiCommand}`, reqId);
+                log.error(`[handleAIRequest] No adapter found for: ${aiCommand}`);
+                await sendTextReply(chatId, `AI tool is not configured: ${aiCommand}`, reqId);
                 return;
             }
             const sessionId = convId
-                ? sessionManager.getSessionIdForConv(userId, convId, config.aiCommand)
+                ? sessionManager.getSessionIdForConv(userId, convId, aiCommand)
                 : undefined;
-            log.info(`[handleAIRequest] Running ${config.aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
-            const toolId = config.aiCommand;
+            log.info(`[handleAIRequest] Running ${aiCommand} for user ${userId}, sessionId=${sessionId ?? 'new'}`);
+            const toolId = aiCommand;
             const msgId = await sendThinkingMessage(chatId, replyToMessageId, toolId, reqId);
             const stopTyping = startTypingLoop(chatId);
             const taskKey = `${userId}:${msgId}`;

package/package.json

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