@wu529778790/open-im 1.10.2-beta.5 → 1.10.2-beta.7

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

@@ -9,6 +9,10 @@
  * 认证：ANTHROPIC_API_KEY 或 CLAUDE_CODE_OAUTH_TOKEN
  */
 import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
+/**
+ * 由 initAdapters 根据配置调用。ttlMinutes≤0 时关闭空闲回收（仍受 MAX_ACTIVE_SESSIONS 限制）。
+ */
+export declare function configureClaudeSdkSessionIdle(ttlMinutes: number): void;
 export declare class ClaudeSDKAdapter implements ToolAdapter {
     readonly toolId = "claude-sdk";
     /**

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

@@ -53,16 +53,32 @@ const activeStreams = new Set();
 const sessionLastUsed = new Map();
 // 跟踪正在执行任务的 session ID，防止空闲清理误杀运行中的长任务
 const runningSessions = new Set();
-const SESSION_IDLE_TTL_MS = 30 * 60 * 1000; // 30 分钟未使用则清理
+let sessionIdleTtlMs = 30 * 60 * 1000; // 默认 30 分钟未使用则清理
+let sessionIdleCleanupDisabled = false;
 const CLEANUP_INTERVAL_MS = 5 * 60 * 1000; // 每 5 分钟检查一次
 const MAX_ACTIVE_SESSIONS = 100;
 let sessionSeq = 0;
+/**
+ * 由 initAdapters 根据配置调用。ttlMinutes≤0 时关闭空闲回收（仍受 MAX_ACTIVE_SESSIONS 限制）。
+ */
+export function configureClaudeSdkSessionIdle(ttlMinutes) {
+    if (ttlMinutes <= 0) {
+        sessionIdleCleanupDisabled = true;
+        log.info('Claude SDK: idle session cleanup disabled (sessionIdleTtlMinutes=0)');
+    }
+    else {
+        sessionIdleCleanupDisabled = false;
+        sessionIdleTtlMs = ttlMinutes * 60 * 1000;
+    }
+}
 const cleanupInterval = setInterval(() => {
+    if (sessionIdleCleanupDisabled)
+        return;
     const now = Date.now();
     for (const [id, lastUsed] of sessionLastUsed) {
         if (runningSessions.has(id))
             continue; // 跳过正在运行任务的 session
-        if (now - lastUsed > SESSION_IDLE_TTL_MS) {
+        if (now - lastUsed > sessionIdleTtlMs) {
             const session = activeSessions.get(id);
             if (session) {
                 try {

package/dist/adapters/registry.js

@@ -1,5 +1,5 @@
 import { getConfiguredAiCommands } from '../config.js';
-import { ClaudeSDKAdapter } from './claude-sdk-adapter.js';
+import { ClaudeSDKAdapter, configureClaudeSdkSessionIdle } from './claude-sdk-adapter.js';
 import { CodexAdapter } from './codex-adapter.js';
 import { CodeBuddyAdapter } from './codebuddy-adapter.js';
 import { createLogger } from '../logger.js';
@@ -10,6 +10,7 @@ export function initAdapters(config) {
     for (const aiCommand of getConfiguredAiCommands(config)) {
         if (aiCommand === 'claude') {
             log.info('Claude Agent SDK adapter enabled');
+            configureClaudeSdkSessionIdle(config.claudeSessionIdleTtlMinutes);
             adapters.set('claude', new ClaudeSDKAdapter());
             continue;
         }

package/dist/commands/handler.d.ts

@@ -15,10 +15,14 @@ export interface CommandHandlerDeps {
     getRunningTasksSize: () => number;
 }
 export type ClaudeRequestHandler = (userId: string, chatId: string, prompt: string, workDir: string, convId?: string, threadCtx?: ThreadContext, replyToMessageId?: string) => Promise<void>;
+export declare function normalizeSlashCommandForDispatch(text: string): string;
 export declare class CommandHandler {
     private deps;
     constructor(deps: CommandHandlerDeps);
-    dispatch(text: string, chatId: string, userId: string, platform: Platform, _handleClaudeRequest: ClaudeRequestHandler): Promise<boolean>;
+    private replySender;
+    dispatch(text: string, chatId: string, userId: string, platform: Platform, _handleClaudeRequest: ClaudeRequestHandler, 
+    /** 若提供，本条消息的斜杠命令回复走此 sender（须与 handleTextFlow 的 sendTextReply 一致，如带 msgId）。 */
+    senderOverride?: MessageSender): Promise<boolean>;
     private handleHelp;
     private handleSessions;
     private handleResume;

package/dist/commands/handler.js

@@ -3,41 +3,79 @@ import { escapePathForMarkdown } from '../shared/utils.js';
 import { TERMINAL_ONLY_COMMANDS } from '../constants.js';
 import { createLogger } from '../logger.js';
 const log = createLogger('Commands');
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { execFile } from 'node:child_process';
 import { readdirSync } from 'node:fs';
 import { dirname, join } from 'node:path';
+/**
+ * Telegram 群聊等场景下命令常为 `/new@BotName`，需与 `/new` 等价。
+ * 仅去掉「第一个」命令词上的 `@suffix`，保留 `/resume 1` 等参数。
+ */
+/** 并发 dispatch 时，用 AsyncLocalStorage 绑定「本条消息」的 sender（如 WorkBuddy 需 msgId）。 */
+const commandReplySender = new AsyncLocalStorage();
+function mergeMessageSender(override, base) {
+    return {
+        sendTextReply: (chatId, text, threadCtx) => override.sendTextReply(chatId, text, threadCtx),
+        sendDirectorySelection: override.sendDirectorySelection ?? base.sendDirectorySelection,
+    };
+}
+export function normalizeSlashCommandForDispatch(text) {
+    const trimmed = text.trim();
+    if (!trimmed.startsWith("/") || !trimmed.includes("@"))
+        return trimmed;
+    const firstSpace = trimmed.indexOf(" ");
+    const firstSegment = firstSpace === -1 ? trimmed : trimmed.slice(0, firstSpace);
+    if (!firstSegment.includes("@"))
+        return trimmed;
+    const at = firstSegment.indexOf("@");
+    const baseCmd = firstSegment.slice(0, at);
+    if (firstSpace === -1)
+        return baseCmd;
+    return `${baseCmd}${trimmed.slice(firstSpace)}`;
+}
 export class CommandHandler {
     deps;
     constructor(deps) {
         this.deps = deps;
     }
-    async dispatch(text, chatId, userId, platform, _handleClaudeRequest) {
-        const t = text.trim();
-        if (platform === 'telegram' && t === '/start') {
-            await this.deps.sender.sendTextReply(chatId, '欢迎使用 open-im AI CLI 桥接！\n\n发送消息与 AI 交互，输入 /help 查看帮助。');
-            return true;
-        }
-        if (t === '/help')
-            return this.handleHelp(chatId);
-        if (t === '/new')
-            return this.handleNew(chatId, userId);
-        if (t === '/sessions' || t === '/resume')
-            return this.handleSessions(chatId, userId, platform);
-        if (t.startsWith('/resume '))
-            return this.handleResume(chatId, userId, t.slice(8).trim(), platform);
-        if (t === '/pwd')
-            return this.handlePwd(chatId, userId);
-        if (t === '/status')
-            return this.handleStatus(chatId, userId, platform);
-        if (t === '/cd' || t.startsWith('/cd ')) {
-            return this.handleCd(chatId, userId, t.slice(3).trim(), platform);
-        }
-        const cmd = t.split(/\s+/)[0];
-        if (TERMINAL_ONLY_COMMANDS.has(cmd)) {
-            await this.deps.sender.sendTextReply(chatId, `${cmd} 命令仅在终端可用。`);
-            return true;
+    replySender() {
+        return commandReplySender.getStore() ?? this.deps.sender;
+    }
+    async dispatch(text, chatId, userId, platform, _handleClaudeRequest, 
+    /** 若提供，本条消息的斜杠命令回复走此 sender（须与 handleTextFlow 的 sendTextReply 一致，如带 msgId）。 */
+    senderOverride) {
+        const runBody = async () => {
+            const t = normalizeSlashCommandForDispatch(text);
+            if (platform === 'telegram' && t === '/start') {
+                await this.replySender().sendTextReply(chatId, '欢迎使用 open-im AI CLI 桥接！\n\n发送消息与 AI 交互，输入 /help 查看帮助。');
+                return true;
+            }
+            if (t === '/help')
+                return this.handleHelp(chatId);
+            if (t === '/new')
+                return this.handleNew(chatId, userId);
+            if (t === '/sessions' || t === '/resume')
+                return this.handleSessions(chatId, userId, platform);
+            if (t.startsWith('/resume '))
+                return this.handleResume(chatId, userId, t.slice(8).trim(), platform);
+            if (t === '/pwd')
+                return this.handlePwd(chatId, userId);
+            if (t === '/status')
+                return this.handleStatus(chatId, userId, platform);
+            if (t === '/cd' || t.startsWith('/cd ')) {
+                return this.handleCd(chatId, userId, t.slice(3).trim(), platform);
+            }
+            const cmd = t.split(/\s+/)[0];
+            if (TERMINAL_ONLY_COMMANDS.has(cmd)) {
+                await this.replySender().sendTextReply(chatId, `${cmd} 命令仅在终端可用。`);
+                return true;
+            }
+            return false;
+        };
+        if (senderOverride) {
+            return commandReplySender.run(mergeMessageSender(senderOverride, this.deps.sender), runBody);
         }
-        return false;
+        return runBody();
     }
     async handleHelp(chatId) {
         const help = [
@@ -51,14 +89,14 @@ export class CommandHandler {
             '/cd <路径> - 切换工作目录',
             '/pwd - 当前工作目录',
         ].join('\n');
-        await this.deps.sender.sendTextReply(chatId, help);
+        await this.replySender().sendTextReply(chatId, help);
         return true;
     }
     async handleSessions(chatId, userId, _platform) {
         const history = this.deps.sessionManager.listConvHistory(userId);
         const active = this.deps.sessionManager.getActiveConvInfo(userId);
         if (history.length === 0 && !active) {
-            await this.deps.sender.sendTextReply(chatId, '📋 暂无会话记录。');
+            await this.replySender().sendTextReply(chatId, '📋 暂无会话记录。');
             return true;
         }
         const lines = ['📋 会话列表:', ''];
@@ -70,40 +108,40 @@ export class CommandHandler {
             lines.push(`▸ ${num}. ${active.convId} · ${active.totalTurns}轮（当前）`);
         }
         lines.push('', '使用 /resume <序号> 恢复历史会话');
-        await this.deps.sender.sendTextReply(chatId, lines.join('\n'));
+        await this.replySender().sendTextReply(chatId, lines.join('\n'));
         return true;
     }
     async handleResume(chatId, userId, arg, _platform) {
         const index = parseInt(arg, 10);
         if (isNaN(index) || index < 1) {
-            await this.deps.sender.sendTextReply(chatId, '用法: /resume <序号>\n\n使用 /sessions 查看会话列表。');
+            await this.replySender().sendTextReply(chatId, '用法: /resume <序号>\n\n使用 /sessions 查看会话列表。');
             return true;
         }
         const history = this.deps.sessionManager.listConvHistory(userId);
         if (index > history.length) {
-            await this.deps.sender.sendTextReply(chatId, `序号 ${index} 无效，共 ${history.length} 个历史会话。`);
+            await this.replySender().sendTextReply(chatId, `序号 ${index} 无效，共 ${history.length} 个历史会话。`);
             return true;
         }
         const entry = history[index - 1];
         const ok = this.deps.sessionManager.resumeConv(userId, entry.convId);
         if (ok) {
-            await this.deps.sender.sendTextReply(chatId, `✅ 已恢复会话 ${index} (${entry.convId})，共 ${entry.totalTurns}轮对话。\n继续发消息即可。`);
+            await this.replySender().sendTextReply(chatId, `✅ 已恢复会话 ${index} (${entry.convId})，共 ${entry.totalTurns}轮对话。\n继续发消息即可。`);
         }
         else {
-            await this.deps.sender.sendTextReply(chatId, '❌ 恢复会话失败，请重试。');
+            await this.replySender().sendTextReply(chatId, '❌ 恢复会话失败，请重试。');
         }
         return true;
     }
     async handleNew(chatId, userId) {
         const ok = this.deps.sessionManager.newSession(userId);
-        await this.deps.sender.sendTextReply(chatId, ok
+        await this.replySender().sendTextReply(chatId, ok
             ? '✅ AI 会话已重置，下一条消息将使用全新上下文。'
             : '当前没有活动会话。');
         return true;
     }
     async handlePwd(chatId, userId) {
         const workDir = this.deps.sessionManager.getWorkDir(userId);
-        await this.deps.sender.sendTextReply(chatId, `当前工作目录: ${escapePathForMarkdown(workDir)}`);
+        await this.replySender().sendTextReply(chatId, `当前工作目录: ${escapePathForMarkdown(workDir)}`);
         return true;
     }
     async handleStatus(chatId, userId, platform) {
@@ -120,28 +158,29 @@ export class CommandHandler {
             `工作目录: ${escapePathForMarkdown(workDir)}`,
             `会话: ${sessionId ?? '无'}`,
         ];
-        await this.deps.sender.sendTextReply(chatId, lines.join('\n'));
+        await this.replySender().sendTextReply(chatId, lines.join('\n'));
         return true;
     }
     async handleCd(chatId, userId, dir, _platform) {
         // 如果 dir 为空，显示目录选择界面
         if (!dir) {
             const currentDir = this.deps.sessionManager.getWorkDir(userId);
-            if (this.deps.sender.sendDirectorySelection) {
-                await this.deps.sender.sendDirectorySelection(chatId, currentDir, userId);
+            const s = this.replySender();
+            if (s.sendDirectorySelection) {
+                await s.sendDirectorySelection(chatId, currentDir, userId);
             }
             else {
-                await this.deps.sender.sendTextReply(chatId, `当前目录: ${escapePathForMarkdown(currentDir)}\n使用 /cd <路径> 切换`);
+                await s.sendTextReply(chatId, `当前目录: ${escapePathForMarkdown(currentDir)}\n使用 /cd <路径> 切换`);
             }
             return true;
         }
         try {
             const resolved = await this.deps.sessionManager.setWorkDir(userId, dir);
-            await this.deps.sender.sendTextReply(chatId, `📁 工作目录已切换到: ${escapePathForMarkdown(resolved)}\n\n` +
+            await this.replySender().sendTextReply(chatId, `📁 工作目录已切换到: ${escapePathForMarkdown(resolved)}\n\n` +
                 `🔄 AI 会话已重置，下一条消息将使用全新上下文。`);
         }
         catch (err) {
-            await this.deps.sender.sendTextReply(chatId, err instanceof Error ? err.message : String(err));
+            await this.replySender().sendTextReply(chatId, err instanceof Error ? err.message : String(err));
         }
         return true;
     }

package/dist/commands/normalize-command.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/commands/normalize-command.test.js

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { normalizeSlashCommandForDispatch } from "./handler.js";
+describe("normalizeSlashCommandForDispatch", () => {
+    it("strips @bot suffix from first segment", () => {
+        expect(normalizeSlashCommandForDispatch("/new@my_open_im_bot")).toBe("/new");
+        expect(normalizeSlashCommandForDispatch("  /help@BotName  ")).toBe("/help");
+    });
+    it("preserves arguments after command", () => {
+        expect(normalizeSlashCommandForDispatch("/resume@bot 2")).toBe("/resume 2");
+        expect(normalizeSlashCommandForDispatch("/cd@bot /tmp/foo")).toBe("/cd /tmp/foo");
+    });
+    it("leaves non-command or no-at unchanged", () => {
+        expect(normalizeSlashCommandForDispatch("/new")).toBe("/new");
+        expect(normalizeSlashCommandForDispatch("hello @user")).toBe("hello @user");
+        expect(normalizeSlashCommandForDispatch("plain")).toBe("plain");
+    });
+});

package/dist/config/types.d.ts

@@ -29,6 +29,10 @@ export interface Config {
     /** Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） */
     codexProxy?: string;
     claudeWorkDir: string;
+    /**
+     * Claude SDK 进程内会话空闲多久后回收（分钟）。0 表示关闭空闲回收（仍受适配器内 MAX_ACTIVE_SESSIONS 限制）。默认 30。
+     */
+    claudeSessionIdleTtlMinutes: number;
     claudeModel?: string;
     /** 是否跳过 AI 工具的权限确认（默认 true） */
     skipPermissions?: boolean;
@@ -137,6 +141,8 @@ export interface FileToolClaude {
     cliPath?: string;
     workDir?: string;
     skipPermissions?: boolean;
+    /** 空闲会话回收间隔（分钟），0 表示关闭 */
+    sessionIdleTtlMinutes?: number;
     /** HTTP/HTTPS 代理，用于访问 Claude API（如 http://127.0.0.1:7890） */
     proxy?: string;
     /** Claude API 配置（优先级：环境变量 > tools.claude.env > ~/.claude/settings.json） */

package/dist/config-web.js

@@ -458,6 +458,7 @@ function createProbeConfig(values) {
         aiCommand: "claude",
         codexCliPath: "codex",
         claudeWorkDir: process.cwd(),
+        claudeSessionIdleTtlMinutes: 30,
         logDir: "",
         logLevel: "INFO",
         codebuddyCliPath: "codebuddy",

package/dist/config.js

@@ -219,6 +219,19 @@ export function loadConfig() {
     const skipPermissions = process.env.OPEN_IM_SKIP_PERMISSIONS === 'false'
         ? false
         : (tc.skipPermissions ?? true);
+    const envIdleRaw = process.env.OPEN_IM_CLAUDE_SESSION_IDLE_TTL_MINUTES;
+    const envIdleParsed = envIdleRaw !== undefined && envIdleRaw !== '' ? Number.parseInt(envIdleRaw, 10) : NaN;
+    const fileIdle = tc.sessionIdleTtlMinutes;
+    let claudeSessionIdleTtlMinutes;
+    if (Number.isFinite(envIdleParsed)) {
+        claudeSessionIdleTtlMinutes = Math.max(0, envIdleParsed);
+    }
+    else if (typeof fileIdle === 'number' && Number.isFinite(fileIdle)) {
+        claudeSessionIdleTtlMinutes = Math.max(0, fileIdle);
+    }
+    else {
+        claudeSessionIdleTtlMinutes = 30;
+    }
     // 6. 校验 Claude API 凭证（SDK 模式需要）
     // 支持：官方 API Key、Auth Token、或自定义 API（第三方模型等，BASE_URL + token）
     if (aiCommand === 'claude') {
@@ -442,6 +455,7 @@ export function loadConfig() {
         claudeProxy,
         codexProxy,
         claudeWorkDir,
+        claudeSessionIdleTtlMinutes,
         claudeModel: process.env.ANTHROPIC_MODEL,
         skipPermissions,
         logDir,

package/dist/index.js

@@ -104,11 +104,8 @@ async function sendLifecycleNotification(platform, message) {
         return;
     }
     log.info(`[${platform}] Sending lifecycle notification to chatId=${chatId}`);
-    await mod.sendNotification(chatId, message).then(() => {
-        log.info(`[${platform}] Lifecycle notification sent successfully`);
-    }).catch((err) => {
-        log.warn(`Failed to send ${platform} notification:`, err);
-    });
+    await mod.sendNotification(chatId, message);
+    log.info(`[${platform}] Lifecycle notification sent successfully`);
 }
 function buildStartupMessage(platform, appVersion, aiCommand, defaultWorkDir, sessionManager) {
     let sessionDir;

package/dist/platform/handle-text-flow.d.ts

@@ -7,7 +7,8 @@
  *   1. Access control check → deny with error message
  *   2. setActiveChatId(platform, chatId)
  *   3. setChatUser(chatId, userId, platform)
- *   4. Command dispatch via commandHandler.dispatch()
+ *   4. Command dispatch via commandHandler.dispatch(..., commandSender)
+ *      （与 sendTextReply 同源，保证 WorkBuddy 等平台的斜杠命令带上 msgId）
  *   5. If not handled: empty text → return, otherwise enqueue AI request
  *   6. Handle queue-full notification (rejected / queued)
  *

package/dist/platform/handle-text-flow.js

@@ -7,7 +7,8 @@
  *   1. Access control check → deny with error message
  *   2. setActiveChatId(platform, chatId)
  *   3. setChatUser(chatId, userId, platform)
- *   4. Command dispatch via commandHandler.dispatch()
+ *   4. Command dispatch via commandHandler.dispatch(..., commandSender)
+ *      （与 sendTextReply 同源，保证 WorkBuddy 等平台的斜杠命令带上 msgId）
  *   5. If not handled: empty text → return, otherwise enqueue AI request
  *   6. Handle queue-full notification (rejected / queued)
  *
@@ -61,7 +62,12 @@ export async function handleTextFlow(params) {
                 replyToMessageId,
             });
         };
-        const handled = await ctx.commandHandler.dispatch(text, chatId, userId, platform, dispatchHandler);
+        const commandSender = {
+            sendTextReply: async (chatId, text, _threadCtx) => {
+                await sendTextReply(chatId, text);
+            },
+        };
+        const handled = await ctx.commandHandler.dispatch(text, chatId, userId, platform, dispatchHandler, commandSender);
         if (handled) {
             return true;
         }

package/dist/platform/handle-text-flow.test.js

@@ -87,7 +87,9 @@ describe('handleTextFlow', () => {
         expect(setActiveChatId).toHaveBeenCalledWith('telegram', 'chat-1');
         expect(setChatUser).toHaveBeenCalledWith('chat-1', 'user-1', 'telegram');
         // Command dispatch was called with correct args
-        expect(dispatch).toHaveBeenCalledWith('/help', 'chat-1', 'user-1', 'telegram', expect.any(Function));
+        expect(dispatch).toHaveBeenCalledWith('/help', 'chat-1', 'user-1', 'telegram', expect.any(Function), expect.objectContaining({
+            sendTextReply: expect.any(Function),
+        }));
         // Does NOT enqueue (sendTextReply not called for queue messages)
         expect(sendTextReply).not.toHaveBeenCalled();
     });

package/dist/qq/client.js

@@ -254,11 +254,20 @@ async function connectWebSocket(config, handler) {
                 settle(() => { }); // 清理 ready timeout
                 clearTimers();
                 ws = null;
-                log.info(`QQ gateway closed: ${code} ${reason.toString()}`);
+                const reasonStr = reason.toString();
+                if (code === 4009) {
+                    log.info(`QQ gateway session idle timeout (4009), reconnecting… (${reasonStr})`);
+                }
+                else {
+                    log.info(`QQ gateway closed: ${code} ${reasonStr}`);
+                }
                 if (stopped)
                     return;
-                if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
+                // 4009 仅为长连接会话过期，HTTP access_token 仍有效，勿清空 tokenState
+                if (code === 4004 || code === 4006 || code === 4007) {
                     tokenState = null;
+                }
+                if (code === 4004 || code === 4006 || code === 4007 || code === 4009) {
                     sessionId = null;
                     seq = null;
                 }

package/dist/telegram/message-sender.js

@@ -124,6 +124,7 @@ export async function sendTextReply(chatId, text) {
     }
     catch (err) {
         log.error("Failed to send text:", err);
+        throw err;
     }
 }
 export async function sendImageReply(chatId, imagePath) {

package/package.json

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