@wu529778790/open-im 1.10.0 → 1.10.1-beta.0

package/dist/access/access-control.js

@@ -4,7 +4,7 @@ export class AccessControl {
     allowedUserIds;
     constructor(allowedUserIds) {
         this.allowedUserIds = new Set(allowedUserIds);
-        log.info(`AccessControl initialized with ${allowedUserIds.length} allowed users:`, allowedUserIds);
+        log.debug(`AccessControl initialized with ${allowedUserIds.length} allowed users:`, allowedUserIds);
     }
     isAllowed(userId) {
         if (this.allowedUserIds.size === 0) {
@@ -12,7 +12,7 @@ export class AccessControl {
             return true;
         }
         const allowed = this.allowedUserIds.has(userId);
-        log.info(`Checking user ${userId}: ${allowed ? 'ALLOWED' : 'DENIED'}`);
+        log.debug(`Checking user ${userId}: ${allowed ? 'ALLOWED' : 'DENIED'}`);
         return allowed;
     }
 }

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

@@ -79,8 +79,9 @@ cleanupInterval.unref(); // 不阻止进程退出
  * `cwd` parameter, so we must chdir before calling them. This mutex ensures
  * concurrent requests don't race on the working directory.
  *
- * **Limitation:** If the SDK ever supports a `cwd` option, this mutex should
- * be removed entirely.
+ * **TODO:** Remove this mutex entirely once @anthropic-ai/claude-agent-sdk
+ * supports a `cwd` option in createSession/resumeSession. Track upstream:
+ * https://github.com/anthropics/claude-agent-sdk/issues
  */
 let chdirMutex = Promise.resolve();
 function withChdirMutex(fn) {
@@ -429,7 +430,7 @@ export class ClaudeSDKAdapter {
                 const errIdToClean = actualSessionId ?? pendingTempId;
                 if (errIdToClean?.startsWith('pending-')) {
                     activeSessions.delete(errIdToClean);
-                    log.info(`Cleaned up pending session after error: ${errIdToClean}`);
+                    log.warn(`Cleaned up pending session after error: ${errIdToClean}`);
                 }
                 // If error suggests a corrupted session, remove it from cache to prevent reuse
                 if (actualSessionId && isSessionCorruptionError(msg)) {

package/dist/config/credentials.d.ts

@@ -17,11 +17,3 @@ export declare function resolvePlatformCredentials(envKeys: Record<string, strin
  * Extract WorkBuddy credentials, with legacy platforms.wechat migration support.
  */
 export declare function resolveWorkBuddyFileConfig(fileConfig: FileConfig): NonNullable<FileConfig['platforms']>['workbuddy'] | undefined;
-/**
- * Check if a CLI tool is available at the given path or on PATH.
- */
-export declare function checkCliAvailable(cliPath: string, toolName: string): void;
-/**
- * Resolve Windows-specific CLI path for npm global installs.
- */
-export declare function resolveWindowsCliPath(cliName: string, configuredPath: string): string;

package/dist/config/credentials.js

@@ -1,6 +1,3 @@
-import { accessSync, constants } from 'node:fs';
-import { execFileSync } from 'node:child_process';
-import { join, isAbsolute } from 'node:path';
 /**
  * Resolves a single credential value using the standard priority chain:
  * environment variable → platform file config → legacy file config.
@@ -37,49 +34,3 @@ export function resolveWorkBuddyFileConfig(fileConfig) {
     }
     return undefined;
 }
-/**
- * Check if a CLI tool is available at the given path or on PATH.
- */
-export function checkCliAvailable(cliPath, toolName) {
-    if (isAbsolute(cliPath) || cliPath.includes('/') || cliPath.includes('\\')) {
-        try {
-            accessSync(cliPath, constants.F_OK);
-        }
-        catch {
-            throw new Error(`${toolName} CLI not found at: ${cliPath}`);
-        }
-    }
-    else {
-        const checkCommand = process.platform === 'win32' ? 'where' : 'which';
-        try {
-            execFileSync(checkCommand, [cliPath], {
-                stdio: 'pipe',
-                windowsHide: process.platform === 'win32',
-            });
-        }
-        catch {
-            throw new Error(`${toolName} CLI not found on PATH: ${cliPath}`);
-        }
-    }
-}
-/**
- * Resolve Windows-specific CLI path for npm global installs.
- */
-export function resolveWindowsCliPath(cliName, configuredPath) {
-    if (process.platform !== 'win32' || configuredPath !== cliName)
-        return configuredPath;
-    const npmPaths = [
-        join(process.env.APPDATA || '', 'npm', `${cliName}.cmd`),
-        join(process.env.LOCALAPPDATA || '', 'npm', `${cliName}.cmd`),
-    ];
-    for (const p of npmPaths) {
-        try {
-            accessSync(p, constants.F_OK);
-            return p;
-        }
-        catch {
-            /* try next */
-        }
-    }
-    return configuredPath;
-}

package/dist/feishu/client.js

@@ -50,7 +50,7 @@ export async function initFeishu(config, eventHandler) {
     eventDispatcher.register({
         'im.message.receive_v1': async (data) => {
             log.info('[EVENT] Received Feishu message event');
-            log.info('[EVENT] Event data:', JSON.stringify(data).slice(0, 500));
+            log.debug('[EVENT] Event data:', JSON.stringify(data).slice(0, 500));
             try {
                 await eventHandler(data);
                 log.info('[EVENT] Event handler called successfully');
@@ -62,7 +62,7 @@ export async function initFeishu(config, eventHandler) {
         // 卡片按钮点击回调（权限允许/拒绝等）
         'card.action.trigger': async (data) => {
             log.info('[EVENT] Received Feishu card action event');
-            log.info('[EVENT] Card action data:', JSON.stringify(data).slice(0, 800));
+            log.debug('[EVENT] Card action data:', JSON.stringify(data).slice(0, 800));
             try {
                 const result = await eventHandler(data);
                 return result;
@@ -76,7 +76,7 @@ export async function initFeishu(config, eventHandler) {
     // Register catch-all handler using wildcard
     eventDispatcher.register({
         '*': (data) => {
-            log.info('Received Feishu event (catch-all):', JSON.stringify(data).slice(0, 500));
+            log.debug('Received Feishu event (catch-all):', JSON.stringify(data).slice(0, 500));
             // Don't call eventHandler for catch-all, let specific handlers handle it
         },
     });

package/dist/feishu/event-handler.js

@@ -165,7 +165,7 @@ export function setupFeishuHandlers(config, sessionManager) {
         return { toast: { type: 'warning', content: '未知操作' } };
     }
     async function handleEvent(data) {
-        log.info('[handleEvent] Called with data:', JSON.stringify(data).slice(0, 800));
+        log.debug('[handleEvent] Called with data:', JSON.stringify(data).slice(0, 800));
         try {
             const raw = data;
             const event = (raw?.event ?? raw);

package/dist/feishu/permission.d.ts

@@ -4,10 +4,6 @@
  * 统一管理权限错误码、提示消息构建、控制台输出。
  * 所有飞书发送函数遇到错误时应通过此模块检测权限问题。
  */
-/**
- * 从异常中提取飞书 API 错误码
- */
-export declare function extractFeishuErrorCode(err: unknown): number | undefined;
 /**
  * 根据错误码判断是否为权限不足
  */
@@ -16,14 +12,6 @@ export declare function isPermissionError(err: unknown): boolean;
  * 构建飞书应用权限设置页直达链接
  */
 export declare function buildPermissionUrl(appId: string): string;
-/**
- * 构建飞书开放平台应用列表页链接
- */
-export declare function buildAppListUrl(): string;
-/**
- * 构建飞书卡片用的权限指引消息（lark_md 格式）
- */
-export declare function buildPermissionGuideMessage(err: unknown, appId?: string): string;
 /**
  * 启动时输出权限要求提示（仅输出一次）
  */

package/dist/feishu/permission.js

@@ -27,7 +27,7 @@ const OPTIONAL_SCOPES = [
 /**
  * 从异常中提取飞书 API 错误码
  */
-export function extractFeishuErrorCode(err) {
+function extractFeishuErrorCode(err) {
     const e = err;
     if (e?.response?.data?.code)
         return e.response.data.code;
@@ -56,14 +56,14 @@ export function buildPermissionUrl(appId) {
 /**
  * 构建飞书开放平台应用列表页链接
  */
-export function buildAppListUrl() {
+function buildAppListUrl() {
     return 'https://open.feishu.cn/app';
 }
 // ── 消息构建 ──
 /**
  * 构建飞书卡片用的权限指引消息（lark_md 格式）
  */
-export function buildPermissionGuideMessage(err, appId) {
+function buildPermissionGuideMessage(err, appId) {
     const code = extractFeishuErrorCode(err);
     const codeHint = code ? ` (错误码: ${code})` : '';
     const lines = [

package/dist/index.js

@@ -155,6 +155,7 @@ export async function main() {
     let config;
     try {
         config = loadConfig();
+        initLogger(config.logDir, config.logLevel);
     }
     catch (err) {
         if (err instanceof Error &&
@@ -165,12 +166,12 @@ export async function main() {
             if (!saved)
                 process.exit(1);
             config = loadConfig();
+            initLogger(config.logDir, config.logLevel);
         }
         else {
             throw err;
         }
     }
-    initLogger(config.logDir, config.logLevel);
     loadActiveChats();
     initAdapters(config);
     // 尽早启动 shutdown 并写入 port 文件，使 open-im start 的 8s 就绪超时能通过（平台初始化可能较慢）

package/dist/manager-control.js

@@ -1,8 +1,9 @@
-import { execFileSync, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, extname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { APP_HOME } from "./constants.js";
+import { isRunning } from "./service-control.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PID_FILE = join(APP_HOME, "open-im.pid");
 const READY_FILE = join(APP_HOME, "open-im.ready");
@@ -23,22 +24,6 @@ function getManagerEntry() {
         args: [join(__dirname, "manager.js")],
     };
 }
-function isRunning(pid) {
-    try {
-        if (process.platform === "win32") {
-            const result = execFileSync("tasklist", ["/FI", `PID eq ${pid}`, "/NH"], {
-                stdio: "pipe",
-                windowsHide: true,
-            }).toString();
-            return result.includes(String(pid));
-        }
-        process.kill(pid, 0);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 export function getManagerPid() {
     if (!existsSync(PID_FILE))
         return null;

package/dist/platform/handle-ai-request.js

@@ -96,8 +96,9 @@ export function createPlatformAIRequestHandler(deps) {
         // Merge in platform callbacks (if provided)
         const mergedCallbacks = { ...defaultCallbacks };
         // Use taskCallbacksFactory if provided (has full context access)
+        let factoryCallbacks;
         if (taskCallbacksFactory) {
-            const factoryCallbacks = taskCallbacksFactory({
+            factoryCallbacks = taskCallbacksFactory({
                 chatId,
                 msgId,
                 taskKey,
@@ -140,7 +141,7 @@ export function createPlatformAIRequestHandler(deps) {
             mergedCallbacks.sendImage = (imagePath) => sender.sendImage(chatId, imagePath);
         }
         // Wrap extraCleanup to also call the platform's extraCleanup
-        const platformExtraCleanup = taskCallbacks?.extraCleanup ?? taskCallbacksFactory?.({ chatId, msgId, taskKey, userId, toolId, replyToMessageId }).extraCleanup;
+        const platformExtraCleanup = taskCallbacks?.extraCleanup ?? factoryCallbacks?.extraCleanup;
         const originalExtraCleanup = mergedCallbacks.extraCleanup;
         mergedCallbacks.extraCleanup = () => {
             originalExtraCleanup();

package/dist/queue/request-queue.d.ts

@@ -1,3 +1,6 @@
+export declare class QueueTimeoutError extends Error {
+    constructor(timeoutMs: number);
+}
 export type EnqueueResult = 'running' | 'queued' | 'rejected';
 export declare class RequestQueue {
     private queues;

package/dist/queue/request-queue.js

@@ -1,5 +1,11 @@
 import { createLogger } from '../logger.js';
 const log = createLogger('Queue');
+export class QueueTimeoutError extends Error {
+    constructor(timeoutMs) {
+        super(`Task timed out after ${timeoutMs / 1000}s`);
+        this.name = 'QueueTimeoutError';
+    }
+}
 const MAX_QUEUE_SIZE = 3;
 const TASK_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 export class RequestQueue {
@@ -19,7 +25,7 @@ export class RequestQueue {
             return 'queued';
         }
         q.running = true;
-        this.run(key, prompt, execute);
+        this.run(key, prompt, execute).catch(() => { });
         return 'running';
     }
     /** 清除指定用户会话的所有排队任务（不中止正在运行的任务） */
@@ -41,28 +47,34 @@ export class RequestQueue {
             const timeoutPromise = new Promise((_, reject) => {
                 timer = setTimeout(() => {
                     controller.abort();
-                    reject(new Error(`Task timed out after ${TASK_TIMEOUT_MS / 1000}s`));
+                    reject(new QueueTimeoutError(TASK_TIMEOUT_MS));
                 }, TASK_TIMEOUT_MS);
             });
             await Promise.race([execute(prompt, controller.signal), timeoutPromise]);
         }
         catch (err) {
-            log.error(`Error executing task for ${key}:`, err);
+            if (err instanceof QueueTimeoutError) {
+                log.error(`Timeout executing task for ${key}: ${err.message}`);
+            }
+            else {
+                log.error(`Error executing task for ${key}:`, err);
+            }
+            throw err;
         }
         finally {
             if (timer)
                 clearTimeout(timer);
-        }
-        const q = this.queues.get(key);
-        if (!q)
-            return;
-        const next = q.tasks.shift();
-        if (next) {
-            setImmediate(() => this.run(key, next.prompt, next.execute));
-        }
-        else {
-            q.running = false;
-            this.queues.delete(key);
+            const q = this.queues.get(key);
+            if (!q)
+                return;
+            const next = q.tasks.shift();
+            if (next) {
+                setImmediate(() => this.run(key, next.prompt, next.execute).catch(() => { }));
+            }
+            else {
+                q.running = false;
+                this.queues.delete(key);
+            }
         }
     }
 }

package/dist/sanitize.js

@@ -1,6 +1,7 @@
 const PATTERNS = [
     [/\b(sk|pk|bot)[-_][a-zA-Z0-9_-]{8,}/gi, (m) => (m.match(/^[a-zA-Z]+/)?.[0] || m.slice(0, 2)) + '_****'],
     [/\b(AIza|AKIA)[a-zA-Z0-9]{12,}/g, (m) => m.slice(0, 4) + '****'],
+    [/\b[a-zA-Z0-9]{40,}\b/g, (m) => m.slice(0, 6) + '****'],
 ];
 export function sanitize(text) {
     let result = text;

package/dist/shared/ai-task.js

@@ -203,10 +203,10 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                             sessionManager.clearSessionForConv(ctx.userId, ctx.convId, aiCommand);
                         else
                             sessionManager.clearActiveToolSession(ctx.userId, aiCommand);
-                        log.info(`Session reset for user ${ctx.userId} due to ${aiCommand} task error`);
+                        log.warn(`Session reset for user ${ctx.userId} due to ${aiCommand} task error`);
                     }
                     else if (aiCommand === 'codex' && isUsageLimitError(error)) {
-                        log.info(`Keeping codex session for user ${ctx.userId} after usage limit error`);
+                        log.warn(`Keeping codex session for user ${ctx.userId} after usage limit error`);
                     }
                     const friendlyError = hadSessionInvalid
                         ? '当前 Claude 会话已失效，已自动执行 /new 重置会话，请重新发送刚才的问题。'

package/dist/shared/chat-user-map.d.ts

@@ -1,3 +1 @@
 export declare function setChatUser(chatId: string, userId: string, platform?: string): void;
-export declare function getUserIdByChatId(chatId: string): string | undefined;
-export declare function getPlatformByChatId(chatId: string): string | undefined;

package/dist/shared/chat-user-map.js

@@ -20,9 +20,3 @@ export function setChatUser(chatId, userId, platform) {
     if (platform)
         chatToPlatform.set(chatId, platform);
 }
-export function getUserIdByChatId(chatId) {
-    return chatToUser.get(chatId);
-}
-export function getPlatformByChatId(chatId) {
-    return chatToPlatform.get(chatId);
-}

package/dist/wework/client.js

@@ -111,7 +111,7 @@ export async function initWeWork(cfg, eventHandler, onStateChange) {
     stateChangeHandler = onStateChange ?? null;
     isStopping = false;
     shouldReconnect = false;
-    log.info(`Initializing WeWork client (botId: ${config.botId})`);
+    log.info('Initializing WeWork client');
     // 首次连接支持重试：单独启用企微时偶发 TLS 连接失败，加飞书后因初始化顺序有“预热”效果则稳定
     const maxAttempts = 3;
     const retryDelayMs = 1500;

package/dist/wework/event-handler.js

@@ -251,7 +251,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
         }
     }
     async function handleEvent(data) {
-        log.info('[handleEvent] Called with data:', JSON.stringify(data).slice(0, 800));
+        log.debug('[handleEvent] Called with data:', JSON.stringify(data).slice(0, 800));
         const reqId = data.headers?.req_id ?? '';
         senderCtx.reqId = reqId;
         try {

package/dist/wework/message-sender.js

@@ -332,7 +332,7 @@ export async function sendErrorMessage(chatId, error, reqId) {
     const message = formatWeWorkMessage('错误', error, 'error');
     try {
         sendText(getReqId(reqId), message);
-        log.info(`Error message sent to user ${chatId}`);
+        log.warn(`Error message sent to user ${chatId}`);
     }
     catch (err) {
         log.error('Failed to send error message:', err);

package/dist/wework/types.d.ts

@@ -131,13 +131,6 @@ export interface MessageState {
     /** 流式回复的 streamId，用于保持同一个流式回复使用相同的 streamId */
     streamId?: string;
 }
-export interface WeWorkResponse {
-    headers: {
-        req_id: string;
-    };
-    errcode: number;
-    errmsg: string;
-}
 export interface WeWorkHttpResponseBody {
     msgtype: 'text' | 'markdown' | 'stream';
     text?: {

package/dist/workbuddy/client.js

@@ -153,7 +153,7 @@ async function connect() {
                         channelId: pc.userId ?? '', // plugin uses userId, not full channel name
                         userId: pc.userId ?? '',
                     })
-                        .then((res) => log.info(`WeChat KF channel registered (online): ${JSON.stringify(res)}`))
+                        .then((res) => log.debug(`WeChat KF channel registered (online): ${JSON.stringify(res)}`))
                         .catch((err) => log.warn(`registerChannel failed: ${String(err)}`));
                 };
                 doRegister();
@@ -176,7 +176,7 @@ async function connect() {
                         channelId: pc.userId ?? '',
                         userId: pc.userId ?? '',
                     })
-                        .then((res) => log.info(`WeChat KF channel registered (fallback): ${JSON.stringify(res)}`))
+                        .then((res) => log.debug(`WeChat KF channel registered (fallback): ${JSON.stringify(res)}`))
                         .catch((e) => log.warn(`registerChannel failed: ${String(e)}`));
                 };
                 doRegister();

package/dist/workbuddy/message-sender.js

@@ -30,7 +30,7 @@ export async function sendErrorReply(_client, chatId, error, msgId) {
         log.warn('WorkBuddy client not available, cannot send error');
         return;
     }
-    log.info(`Sending WorkBuddy error to chatId=${chatId}, msgId=${msgId}`);
+    log.warn(`Sending WorkBuddy error to chatId=${chatId}, msgId=${msgId}`);
     await client.sendPromptResponse({
         session_id: chatId,
         prompt_id: msgId,

package/package.json

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