@wu529778790/open-im 1.10.8 → 1.10.9-beta.0

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

@@ -59,6 +59,8 @@ let sessionIdleTtlMs = 30 * 60 * 1000; // 默认 30 分钟未使用则清理
 let sessionIdleCleanupDisabled = false;
 const CLEANUP_INTERVAL_MS = 5 * 60 * 1000; // 每 5 分钟检查一次
 const MAX_ACTIVE_SESSIONS = 100;
+const MAX_CAPTURED_STDERR_CHARS = 4000;
+const MAX_EXPOSED_STDERR_CHARS = 500;
 let sessionSeq = 0;
 /**
  * 由 initAdapters 根据配置调用。ttlMinutes≤0 时关闭空闲回收（仍受 MAX_ACTIVE_SESSIONS 限制）。
@@ -137,6 +139,35 @@ function isResult(msg) {
 function isSessionCorruptionError(msg) {
     return /session\s*(not found|expired|corrupt)|no\s*conversation\s*found/i.test(msg);
 }
+function appendStderrSnippet(previous, chunk) {
+    const next = previous + chunk;
+    if (next.length <= MAX_CAPTURED_STDERR_CHARS)
+        return next;
+    return next.slice(-MAX_CAPTURED_STDERR_CHARS);
+}
+function getUsefulStderrSnippet(stderr) {
+    const lines = stderr
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter(Boolean);
+    if (lines.length === 0)
+        return undefined;
+    const summary = lines.slice(-3).join(' | ');
+    return summary.length <= MAX_EXPOSED_STDERR_CHARS
+        ? summary
+        : summary.slice(0, MAX_EXPOSED_STDERR_CHARS - 3) + '...';
+}
+function enrichClaudeErrorMessage(message, stderr) {
+    const snippet = getUsefulStderrSnippet(stderr);
+    if (!snippet)
+        return message;
+    if (message.includes(snippet))
+        return message;
+    if (/process exited with code \d+/i.test(message) || /无输出/.test(message) || /未知错误/.test(message)) {
+        return `${message} stderr: ${snippet}`;
+    }
+    return message;
+}
 /**
  * 获取或创建 SDKSession
  * @param sessionId 已有的 sessionId，如果为 undefined 则创建新会话
@@ -145,7 +176,7 @@ function isSessionCorruptionError(msg) {
  * @param permissionMode 权限模式
  * @returns SDKSession 对象和实际的 sessionId
  */
-async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
+async function getOrCreateSession(sessionId, workDir, model, permissionMode, onStderr) {
     // 刷新 Claude 环境变量（支持 cc switch 后无需重启即可生效）
     refreshClaudeEnvToProcess();
     const resolvedModel = model?.trim() || process.env.ANTHROPIC_MODEL?.trim() || 'claude-opus-4-5';
@@ -155,6 +186,7 @@ async function getOrCreateSession(sessionId, workDir, model, permissionMode) {
     const sessionOptions = {
         model: resolvedModel,
         permissionMode,
+        stderr: onStderr,
     };
     const baseUrl = process.env.ANTHROPIC_BASE_URL ?? '(default)';
     log.info(`[V2] getOrCreateSession model param=${String(model ?? '')} resolved=${resolvedModel} baseUrl=${baseUrl} workDir=${workDir}`);
@@ -260,6 +292,7 @@ export class ClaudeSDKAdapter {
         let pendingTempId; // 记录临时 ID，用于 abort 时清理
         let runSettled = false;
         let currentStream; // 用于 abort 时立即中断 stream
+        let recentStderr = '';
         const permissionMode = options?.skipPermissions
             ? 'bypassPermissions'
             : options?.permissionMode === 'acceptEdits'
@@ -279,7 +312,9 @@ export class ClaudeSDKAdapter {
                 log.info(`[V2] Session: ${sessionId ?? 'new'}, prompt="${prompt.slice(0, 50)}..."`);
                 log.info(`[V2] model param=${String(options?.model ?? '')} baseUrl=${process.env.ANTHROPIC_BASE_URL ?? '(default)'}`);
                 // 获取或创建会话
-                const { session, sessionId: returnedId } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode);
+                const { session, sessionId: returnedId } = await getOrCreateSession(sessionId, workDir, options?.model, permissionMode, (data) => {
+                    recentStderr = appendStderrSnippet(recentStderr, data);
+                });
                 if (returnedId.startsWith('pending-')) {
                     pendingTempId = returnedId;
                 }
@@ -380,7 +415,7 @@ export class ClaudeSDKAdapter {
                                     }
                                     callbacks.onSessionInvalid?.();
                                 }
-                                const errMsg = errs[0] || '未知错误';
+                                const errMsg = enrichClaudeErrorMessage(errs[0] || '未知错误', recentStderr);
                                 callbacks.onError(errMsg);
                                 return;
                             }
@@ -425,7 +460,7 @@ export class ClaudeSDKAdapter {
                             // 流结束但无 result 也无 accumulated：必须触发回调，否则 Promise 永远挂起
                             log.warn('Stream ended with no result and no accumulated text, calling onError to prevent stuck state');
                             runSettled = true;
-                            callbacks.onError('AI 响应异常结束（无输出），请重试');
+                            callbacks.onError(enrichClaudeErrorMessage('AI 响应异常结束（无输出），请重试', recentStderr));
                         }
                     }
                 }
@@ -447,7 +482,7 @@ export class ClaudeSDKAdapter {
                 }
                 runSettled = true;
                 const errorObj = err;
-                const msg = errorObj.message || String(err);
+                const msg = enrichClaudeErrorMessage(errorObj.message || String(err), recentStderr);
                 log.error(`Claude SDK V2 error: ${msg}`);
                 if (errorObj.stack) {
                     log.error(`Error stack: ${errorObj.stack}`);

package/dist/adapters/codebuddy-adapter.js

@@ -25,14 +25,12 @@ export class CodeBuddyAdapter {
             },
             onError: (err) => {
                 const msg = typeof err === 'string' ? err : String(err);
-                const friendly = msg.includes('Authentication') || msg.includes('/login') || msg.includes('CODEBUDDY_API_KEY')
-                    ? 'CodeBuddy 需要先登录。请在终端运行 codebuddy login。'
-                    : msg.includes('No conversation found') ||
-                        msg.includes('Session not found') ||
-                        msg.includes('Invalid session') ||
-                        msg.includes('Unable to resume')
-                        ? 'CodeBuddy 会话已失效，旧 session 已清理。请直接重试当前请求。'
-                        : msg;
+                const friendly = msg.includes('No conversation found') ||
+                    msg.includes('Session not found') ||
+                    msg.includes('Invalid session') ||
+                    msg.includes('Unable to resume')
+                    ? 'CodeBuddy 会话已失效，旧 session 已清理。请直接重试当前请求。'
+                    : msg;
                 callbacks.onError(friendly);
             },
             onSessionId: callbacks.onSessionId,

package/dist/adapters/codex-adapter.js

@@ -36,19 +36,11 @@ export class CodexAdapter {
             },
             onError: (err) => {
                 const msg = typeof err === "string" ? err : String(err);
-                const friendly = msg.includes("Authentication") || msg.includes("login")
-                    ? "Codex 需要先登录。请在终端运行 codex login，或在 shell 中 export OPENAI_API_KEY。"
-                    : msg.includes("stream disconnected") ||
-                        msg.includes("error sending request") ||
-                        msg.includes("Connection refused") ||
-                        msg.includes("ENOTFOUND") ||
-                        msg.includes("ETIMEDOUT")
-                        ? "Codex 网络请求失败。如无法访问 chatgpt.com，请在 tools.codex.proxy 或 CODEX_PROXY 中配置代理。"
-                        : msg.includes("No session found") ||
-                            msg.includes("No conversation found") ||
-                            msg.includes("Unable to find session")
-                            ? "Codex 会话已失效，旧 session 已清理。请直接重试当前请求。"
-                            : msg;
+                const friendly = msg.includes("No session found") ||
+                    msg.includes("No conversation found") ||
+                    msg.includes("Unable to find session")
+                    ? "Codex 会话已失效，旧 session 已清理。请直接重试当前请求。"
+                    : msg;
                 callbacks.onError(friendly);
             },
             onSessionId: callbacks.onSessionId,

package/dist/config/file-io.d.ts

@@ -14,6 +14,8 @@ export declare function loadClaudeSettingsEnv(): Record<string, string>;
 export declare function saveClaudeSettingsEnv(env: Record<string, string>): void;
 export declare function normalizeAiCommand(value: unknown, fallback: AiCommand): AiCommand;
 export declare function hasCodexAuth(): boolean;
+export declare function hasCodeBuddyAuthIndicators(): boolean;
+export declare function getClaudeSdkRuntimeIssue(): string | null;
 export declare function parseCommaSeparated(value: string): string[];
 /**
  * 将最新的 Claude 认证环境变量按优先级合并到 process.env。

package/dist/config/file-io.js

@@ -1,6 +1,8 @@
-import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, chmodSync } from 'node:fs';
+import { readFileSync, writeFileSync, existsSync, mkdirSync, statSync, chmodSync, readdirSync } from 'node:fs';
+import { execFileSync } from 'node:child_process';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
+import { createRequire } from 'node:module';
 import { createLogger } from '../logger.js';
 import { APP_HOME } from '../constants.js';
 const log = createLogger('config');
@@ -10,12 +12,17 @@ export const CODEX_AUTH_PATHS = [
     join(homedir(), '.config', 'codex', 'auth.json'),
     join(homedir(), 'AppData', 'Roaming', 'codex', 'auth.json'),
 ];
+const CODEBUDDY_HOME_PATHS = [
+    join(homedir(), '.codebuddy'),
+    join(homedir(), '.codebuddycn'),
+];
 const OLD_ROOT_KEYS = [
     'claudeWorkDir',
     'claudeTimeoutMs',
     'claudeModel',
 ];
 const AI_COMMANDS = ['claude', 'codex', 'codebuddy'];
+const require = createRequire(import.meta.url);
 /** Claude 认证相关的环境变量 key 列表 */
 export const CLAUDE_AUTH_ENV_KEYS = [
     'ANTHROPIC_API_KEY',
@@ -231,6 +238,84 @@ export function hasCodexAuth() {
         }
     });
 }
+export function hasCodeBuddyAuthIndicators() {
+    if (process.env.CODEBUDDY_API_KEY || process.env.CODEBUDDY_AUTH_TOKEN)
+        return true;
+    return CODEBUDDY_HOME_PATHS.some((base) => {
+        try {
+            if (!existsSync(base))
+                return false;
+            const settingsPath = join(base, 'settings.json');
+            if (existsSync(settingsPath)) {
+                try {
+                    const settings = JSON.parse(readFileSync(settingsPath, 'utf-8'));
+                    if (settings.apiKeyHelper)
+                        return true;
+                    const env = settings.env;
+                    if (env && typeof env === 'object' && !Array.isArray(env)) {
+                        const envRecord = env;
+                        if (envRecord.CODEBUDDY_API_KEY || envRecord.CODEBUDDY_AUTH_TOKEN)
+                            return true;
+                    }
+                }
+                catch {
+                    // Ignore malformed settings and keep checking other indicators.
+                }
+            }
+            const localStorageDir = join(base, 'local_storage');
+            if (!existsSync(localStorageDir))
+                return false;
+            return readdirSync(localStorageDir)
+                .filter((name) => name.endsWith('.info'))
+                .some((name) => {
+                try {
+                    const content = readFileSync(join(localStorageDir, name), 'utf-8');
+                    return /"userId"\s*:|"nickname"\s*:|"enterpriseName"\s*:|"accessToken"\s*:/.test(content);
+                }
+                catch {
+                    return false;
+                }
+            });
+        }
+        catch {
+            return false;
+        }
+    });
+}
+export function getClaudeSdkRuntimeIssue() {
+    let cliPath;
+    try {
+        const sdkEntry = require.resolve('@anthropic-ai/claude-agent-sdk');
+        const sdkDir = dirname(sdkEntry);
+        cliPath = join(sdkDir, 'cli.js');
+        if (!existsSync(cliPath)) {
+            return `Claude SDK 安装不完整：缺少 ${cliPath}。请重新安装依赖后再启动。`;
+        }
+    }
+    catch (error) {
+        return `未找到 @anthropic-ai/claude-agent-sdk：${error instanceof Error ? error.message : String(error)}`;
+    }
+    try {
+        execFileSync(process.execPath, [cliPath, '--version'], {
+            stdio: 'pipe',
+            env: {
+                ...process.env,
+                CLAUDE_CODE_ENTRYPOINT: process.env.CLAUDE_CODE_ENTRYPOINT || 'sdk-ts',
+            },
+            timeout: 5000,
+            windowsHide: process.platform === 'win32',
+        });
+    }
+    catch (error) {
+        const execError = error;
+        const stderr = Buffer.isBuffer(execError.stderr)
+            ? execError.stderr.toString('utf-8')
+            : execError.stderr;
+        const details = stderr?.trim() || execError.message || String(error);
+        return `Claude SDK 运行时不可用：${details}`;
+    }
+    return null;
+}
 export function parseCommaSeparated(value) {
     return value.split(',').map((s) => s.trim()).filter(Boolean);
 }

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 export type { Platform, AiCommand, Config, FilePlatformTelegram, FilePlatformFeishu, FilePlatformQQ, FilePlatformWechat, FilePlatformWework, FilePlatformDingtalk, FilePlatformWorkBuddy, FileToolClaude, FileToolCodex, FileToolCodeBuddy, FileConfig, } from './config/types.js';
 import type { Platform, AiCommand, Config } from './config/types.js';
-export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, processEnvForNonClaudeCliChild, CODEX_AUTH_PATHS, } from './config/file-io.js';
+export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, getClaudeSdkRuntimeIssue, hasCodeBuddyAuthIndicators, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, processEnvForNonClaudeCliChild, CODEX_AUTH_PATHS, } from './config/file-io.js';
 /** 检测是否需要交互式配置（无 token 且无环境变量） */
 export declare function needsSetup(): boolean;
 export declare function loadConfig(): Config;

package/dist/config.js

@@ -27,8 +27,8 @@ function resolveFilePlatformAi(file, platform) {
     return normalizeAiCommand(raw ?? process.env.AI_COMMAND ?? file.aiCommand, 'claude');
 }
 // Re-export file I/O and credential helpers from sub-modules
-export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, processEnvForNonClaudeCliChild, CODEX_AUTH_PATHS, } from './config/file-io.js';
-import { loadFileConfig, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, loadClaudeSettingsEnv, } from './config/file-io.js';
+export { CONFIG_PATH, loadFileConfig, saveFileConfig, getClaudeConfigHome, getClaudeSdkRuntimeIssue, hasCodeBuddyAuthIndicators, loadClaudeSettingsEnv, saveClaudeSettingsEnv, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, CLAUDE_AUTH_ENV_KEYS, refreshClaudeEnvToProcess, processEnvForNonClaudeCliChild, CODEX_AUTH_PATHS, } from './config/file-io.js';
+import { getClaudeSdkRuntimeIssue, hasCodeBuddyAuthIndicators, loadFileConfig, normalizeAiCommand, hasCodexAuth, parseCommaSeparated, loadClaudeSettingsEnv, } from './config/file-io.js';
 /** 检测是否需要交互式配置（无 token 且无环境变量） */
 export function needsSetup() {
     // 环境变量已提供任一平台的凭证，则认为已配置
@@ -275,6 +275,10 @@ export function loadConfig() {
             ].join('\n');
             throw new Error(errorMsg);
         }
+        const claudeRuntimeIssue = getClaudeSdkRuntimeIssue();
+        if (claudeRuntimeIssue) {
+            throw new Error(claudeRuntimeIssue);
+        }
     }
     // 7. 校验 Codex CLI（任一已启用渠道使用 codex 时）
     if (toolsNeeded.has('codex')) {
@@ -353,6 +357,10 @@ export function loadConfig() {
                 throw new Error(installGuide);
             }
         }
+        if (!hasCodeBuddyAuthIndicators()) {
+            log.warn('CodeBuddy 模式：未检测到明确的登录态或 API Key。首次使用请先运行 codebuddy login；' +
+                '若使用自定义 Token，请在 CodeBuddy 设置或环境变量中配置。');
+        }
     }
     // 7. 日志与平台配置
     const logDir = process.env.LOG_DIR ?? file.logDir ?? join(APP_HOME, 'logs');

package/dist/shared/ai-task.js

@@ -274,7 +274,9 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     resolve();
                 },
             }, {
-                model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
+                model: aiCommand === 'claude'
+                    ? (sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel)
+                    : undefined,
                 chatId: ctx.chatId,
                 // 默认跳过权限确认，保持全自动执行（可通过 config 或环境变量关闭）
                 skipPermissions: config.skipPermissions ?? true,

package/dist/workbuddy/centrifuge-client.js

@@ -1,7 +1,7 @@
 /**
  * WorkBuddy Centrifuge Client - WebSocket connection for WeChat KF messages
  */
-import { Centrifuge } from 'centrifuge';
+import { Centrifuge, SubscriptionState, } from 'centrifuge';
 import { WebSocket } from 'ws';
 import { randomUUID } from 'node:crypto';
 import { createLogger } from '../logger.js';
@@ -17,7 +17,7 @@ export class WorkBuddyCentrifugeClient {
     callbacks;
     client = null;
     sub = null;
-    extraSubs = [];
+    extraSubs = new Map();
     state = 'disconnected';
     processedMsgIds = new Set();
     consecutiveErrors = 0;
@@ -94,10 +94,10 @@ export class WorkBuddyCentrifugeClient {
         log.info(`${this.logPrefix} Stopping...`);
         this.state = 'disconnected';
         this.processedMsgIds.clear();
-        for (const sub of this.extraSubs) {
+        for (const sub of this.extraSubs.values()) {
             sub.unsubscribe();
         }
-        this.extraSubs = [];
+        this.extraSubs.clear();
         if (this.sub) {
             this.sub.unsubscribe();
             this.sub = null;
@@ -119,8 +119,28 @@ export class WorkBuddyCentrifugeClient {
             log.warn(`${this.logPrefix} Cannot subscribe: client not initialized`);
             return;
         }
+        const existing = this.extraSubs.get(channel);
+        if (existing) {
+            if (existing.state === SubscriptionState.Unsubscribed) {
+                log.info(`${this.logPrefix} Re-subscribing to additional channel: ${channel}`);
+                existing.subscribe();
+            }
+            else {
+                log.debug(`${this.logPrefix} Additional channel already tracked: ${channel} (state=${existing.state})`);
+            }
+            return;
+        }
         log.info(`${this.logPrefix} Subscribing to additional channel: ${channel}`);
-        const sub = this.client.newSubscription(channel, { token: subscriptionToken });
+        let sub;
+        try {
+            sub = this.client.newSubscription(channel, { token: subscriptionToken });
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            log.error(`${this.logPrefix} Failed to create extra subscription (${channel}): ${msg}`);
+            this.callbacks.onError?.(error instanceof Error ? error : new Error(msg));
+            return;
+        }
         sub.on('publication', (ctx) => {
             this.handlePublication(ctx.data);
         });
@@ -130,7 +150,12 @@ export class WorkBuddyCentrifugeClient {
         sub.on('subscribed', () => {
             log.info(`${this.logPrefix} Extra channel subscribed: ${channel}`);
         });
-        this.extraSubs.push(sub);
+        sub.on('unsubscribed', () => {
+            if (this.extraSubs.get(channel) === sub) {
+                this.extraSubs.delete(channel);
+            }
+        });
+        this.extraSubs.set(channel, sub);
         sub.subscribe();
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.10.8",
+  "version": "1.10.9-beta.0",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",
@@ -52,6 +52,7 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.92",
+    "@aws-sdk/client-s3": "^3.1035.0",
     "@larksuiteoapi/node-sdk": "^1.59.0",
     "centrifuge": "^5.5.3",
     "dingtalk-stream": "^2.1.4",