@wu529778790/open-im 1.7.0-beta.0 → 1.7.0-beta.1

package/dist/shared/ai-task.js

@@ -2,6 +2,7 @@
  * 共享 AI 任务执行层，支持多 ToolAdapter。
  */
 import { getPermissionMode } from '../permission-mode/session-mode.js';
+import { resolvePlatformAiCommand } from '../config.js';
 import { formatToolStats, formatToolCallNotification, getContextWarning, getAIToolDisplayName, } from './utils.js';
 import { createLogger } from '../logger.js';
 const log = createLogger('AITask');
@@ -102,24 +103,27 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                         : undefined)
                 : undefined;
         }
+        // 使用 aiCommand 而不是 toolAdapter.toolId，确保 sessionId 的存储和查询使用相同的 key
+        const aiCommand = resolvePlatformAiCommand(config, ctx.platform);
         const toolId = toolAdapter.toolId;
-        const timeoutMs = toolId === 'codex'
+        const timeoutMs = aiCommand === 'codex'
             ? config.codexTimeoutMs
-            : toolId === 'codebuddy'
+            : aiCommand === 'codebuddy'
                 ? config.codebuddyTimeoutMs
                 : config.claudeTimeoutMs;
         const startRun = () => {
             activeHandle = toolAdapter.run(prompt, currentSessionId, ctx.workDir, {
                 onSessionId: (id) => {
                     currentSessionId = id;
+                    // 使用 aiCommand 而不是 toolId，确保与查询时使用相同的 key
                     if (ctx.threadId)
-                        sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, toolId, id);
+                        sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, aiCommand, id);
                     else if (ctx.convId)
-                        sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, toolId, id);
+                        sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, aiCommand, id);
                 },
                 onSessionInvalid: () => {
                     if (ctx.convId)
-                        sessionManager.clearSessionForConv(ctx.userId, ctx.convId, toolId);
+                        sessionManager.clearSessionForConv(ctx.userId, ctx.convId, aiCommand);
                 },
                 onThinking: (t) => {
                     if (!firstContentLogged) {
@@ -211,14 +215,14 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     }
                     settled = true;
                     log.error(`Task error for user ${ctx.userId}: ${error}`);
-                    if (toolId !== 'claude' && !isUsageLimitError(error)) {
+                    if (aiCommand !== 'claude' && !isUsageLimitError(error)) {
                         if (ctx.convId)
-                            sessionManager.clearSessionForConv(ctx.userId, ctx.convId, toolId);
+                            sessionManager.clearSessionForConv(ctx.userId, ctx.convId, aiCommand);
                         else
-                            sessionManager.clearActiveToolSession(ctx.userId, toolId);
-                        log.info(`Session reset for user ${ctx.userId} due to ${toolId} task error`);
+                            sessionManager.clearActiveToolSession(ctx.userId, aiCommand);
+                        log.info(`Session reset for user ${ctx.userId} due to ${aiCommand} task error`);
                     }
-                    else if (toolId === 'codex' && isUsageLimitError(error)) {
+                    else if (aiCommand === 'codex' && isUsageLimitError(error)) {
                         log.info(`Keeping codex session for user ${ctx.userId} after usage limit error`);
                     }
                     try {
@@ -236,7 +240,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                 timeoutMs,
                 model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
                 chatId: ctx.chatId,
-                ...(toolId === 'codex' && config.codexProxy ? { proxy: config.codexProxy } : {}),
+                ...(aiCommand === 'codex' && config.codexProxy ? { proxy: config.codexProxy } : {}),
             });
             return activeHandle;
         };
@@ -251,7 +255,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
             latestContent: '',
             settle,
             startedAt: Date.now(),
-            toolId,
+            toolId: aiCommand,
         };
         startRun();
         platformAdapter.onTaskReady(taskState);

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

@@ -33,13 +33,28 @@ describe("runAITask", () => {
         const taskPromise = runAITask({
             config: {
                 aiCommand: "codex",
+                platforms: {},
+                enabledPlatforms: [],
                 defaultPermissionMode: "ask",
                 codexTimeoutMs: 600000,
                 claudeTimeoutMs: 600000,
+                codebuddyTimeoutMs: 600000,
                 claudeSkipPermissions: false,
                 claudeModel: "",
                 hookPort: 35801,
                 codexProxy: "",
+                wechatToken: "",
+                wechatGuid: "",
+                wechatUserId: "",
+                wechatAppId: "",
+                wechatAppSecret: "",
+                dingtalkClientId: "",
+                dingtalkClientSecret: "",
+                qqAppId: "",
+                qqSecret: "",
+                weworkCorpId: "",
+                weworkSecret: "",
+                telegramBotToken: "",
             },
             sessionManager: sessionManager,
         }, {

package/package.json

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