@wu529778790/open-im 0.3.8 → 0.3.10

package/dist/cli.js

@@ -192,8 +192,29 @@ else if (args[0] === 'restart') {
     await stopService().catch((err) => {
         console.error('停止服务时出错:', err);
     });
-    // 等待进程完全退出
-    await new Promise(resolve => setTimeout(resolve, 1000));
+    // 等待进程完全退出 AND Telegram API 释放连接（至少 3 秒）
+    // Telegram 需要时间释放 bot 实例，否则会出现 409 Conflict 错误
+    const pid = await readPid();
+    if (pid) {
+        // 持续检查直到进程真正退出（最多 15 秒）
+        const maxWait = 15000;
+        const checkInterval = 500;
+        let waited = 0;
+        while (waited < maxWait) {
+            if (!(await isProcessRunning(pid))) {
+                // 进程已退出，再等待 3 秒让 Telegram API 完全释放
+                const remainingWait = 3000;
+                console.log(`进程已退出，等待 ${remainingWait / 1000} 秒让 Telegram API 释放连接...`);
+                await new Promise(resolve => setTimeout(resolve, remainingWait));
+                break;
+            }
+            await new Promise(resolve => setTimeout(resolve, checkInterval));
+            waited += checkInterval;
+        }
+        if (waited >= maxWait) {
+            console.log('警告: 进程退出超时，继续启动...');
+        }
+    }
     console.log('\n正在重新启动服务...\n');
     await startService();
 }

package/dist/shared/ai-task.js

@@ -12,10 +12,11 @@ function buildCompletionNote(result, sessionManager, ctx) {
         parts.push(toolInfo);
     if (result.model)
         parts.push(result.model);
-    const totalTurns = ctx.threadId
-        ? sessionManager.addTurnsForThread(ctx.userId, ctx.threadId, result.numTurns)
-        : sessionManager.addTurns(ctx.userId, result.numTurns);
-    const ctxWarning = getContextWarning(totalTurns);
+    // 获取当前的总轮数（不再累加，因为已经在请求开始时累加了）
+    const currentTurns = ctx.threadId
+        ? sessionManager.addTurnsForThread(ctx.userId, ctx.threadId, 0)
+        : sessionManager.addTurns(ctx.userId, 0);
+    const ctxWarning = getContextWarning(currentTurns);
     if (ctxWarning)
         parts.push(ctxWarning);
     return parts.join(' | ');

package/dist/telegram/event-handler.js

@@ -79,6 +79,9 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
     });
     registerPermissionSender('telegram', {});
     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);
         if (!toolAdapter) {
             await sendTextReply(chatId, `未配置 AI 工具: ${config.aiCommand}`);

package/package.json

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