@wu529778790/open-im 1.9.3-beta.13 → 1.9.3-beta.14

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

@@ -212,6 +212,7 @@ export class ClaudeSDKAdapter {
         let pendingTempId; // 记录临时 ID，用于 abort 时清理
         let runSettled = false;
         let currentStream; // 用于 abort 时立即中断 stream
+        let timeoutHandle;
         const permissionMode = options?.skipPermissions
             ? 'bypassPermissions'
             : options?.permissionMode === 'acceptEdits'
@@ -304,6 +305,8 @@ export class ClaudeSDKAdapter {
                             log.info(`[V2] Result: subtype=${m.subtype}, num_turns=${m.num_turns}, sessionId=${actualSessionId ?? 'unknown'}`);
                             // 检查会话错误
                             if (!success) {
+                                if (timeoutHandle)
+                                    clearTimeout(timeoutHandle);
                                 runSettled = true;
                                 const noConvErr = errs.find((e) => e.includes('No conversation found') || e.includes('session not found'));
                                 if (noConvErr) {
@@ -340,6 +343,8 @@ export class ClaudeSDKAdapter {
                                 result.result = accumulated;
                             }
                             runSettled = true;
+                            if (timeoutHandle)
+                                clearTimeout(timeoutHandle);
                             callbacks.onComplete(result);
                             return;
                         }
@@ -348,6 +353,8 @@ export class ClaudeSDKAdapter {
                     if (!streamClosed) {
                         if (accumulated) {
                             log.info('Stream ended without result message, using accumulated text');
+                            if (timeoutHandle)
+                                clearTimeout(timeoutHandle);
                             runSettled = true;
                             callbacks.onComplete({
                                 success: true,
@@ -362,6 +369,8 @@ export class ClaudeSDKAdapter {
                         else {
                             // 流结束但无 result 也无 accumulated：必须触发回调，否则 Promise 永远挂起
                             log.warn('Stream ended with no result and no accumulated text, calling onError to prevent stuck state');
+                            if (timeoutHandle)
+                                clearTimeout(timeoutHandle);
                             runSettled = true;
                             callbacks.onError('AI 响应异常结束（无输出），请重试');
                         }
@@ -384,6 +393,8 @@ export class ClaudeSDKAdapter {
                     return;
                 }
                 runSettled = true;
+                if (timeoutHandle)
+                    clearTimeout(timeoutHandle);
                 const errorObj = err;
                 const msg = errorObj.message || String(err);
                 log.error(`Claude SDK V2 error: ${msg}`);
@@ -417,15 +428,38 @@ export class ClaudeSDKAdapter {
         runSession().catch((err) => {
             if (!runSettled) {
                 runSettled = true;
+                if (timeoutHandle)
+                    clearTimeout(timeoutHandle);
                 const msg = err instanceof Error ? err.message : String(err);
                 log.error(`Unhandled runSession error: ${msg}`);
                 callbacks.onError(msg);
             }
         });
+        // 强制执行超时
+        if (options?.timeoutMs && options.timeoutMs > 0) {
+            timeoutHandle = setTimeout(() => {
+                if (!runSettled) {
+                    log.warn(`Session timed out after ${options.timeoutMs}ms, aborting`);
+                    abortController.abort();
+                    // 立即中断 stream，不等下一条消息
+                    if (currentStream) {
+                        try {
+                            currentStream.return?.();
+                        }
+                        catch { /* ignore */ }
+                    }
+                    runSettled = true;
+                    callbacks.onError(`AI 响应超时（${Math.round(options.timeoutMs / 1000)}s），请重试`);
+                }
+            }, options.timeoutMs);
+            timeoutHandle.unref();
+        }
         return {
             abort: () => {
                 log.info('Aborting session run');
                 abortController.abort();
+                if (timeoutHandle)
+                    clearTimeout(timeoutHandle);
                 // 立即中断 stream，不等下一条消息
                 if (currentStream) {
                     try {

package/dist/adapters/codebuddy-adapter.js

@@ -40,6 +40,7 @@ export class CodeBuddyAdapter {
         }, {
             skipPermissions: options?.skipPermissions,
             permissionMode: options?.permissionMode,
+            timeoutMs: options?.timeoutMs,
             model: options?.model,
         });
     }

package/dist/adapters/codex-adapter.js

@@ -12,6 +12,7 @@ export class CodexAdapter {
         const opts = {
             skipPermissions: options?.skipPermissions,
             permissionMode: options?.permissionMode,
+            timeoutMs: options?.timeoutMs,
             model: options?.model,
             chatId: options?.chatId,
             hookPort: options?.hookPort,

package/dist/adapters/tool-adapter.interface.d.ts

@@ -25,6 +25,7 @@ export interface RunOptions {
     skipPermissions?: boolean;
     /** Claude --permission-mode: default | acceptEdits | plan（yolo 时用 skipPermissions） */
     permissionMode?: 'default' | 'acceptEdits' | 'plan';
+    timeoutMs?: number;
     model?: string;
     chatId?: string;
     hookPort?: number;

package/dist/codebuddy/cli-runner.d.ts

@@ -19,6 +19,7 @@ export interface CodeBuddyRunCallbacks {
 export interface CodeBuddyRunOptions {
     skipPermissions?: boolean;
     permissionMode?: 'default' | 'acceptEdits' | 'plan';
+    timeoutMs?: number;
     model?: string;
 }
 export interface CodeBuddyRunHandle {

package/dist/codebuddy/cli-runner.js

@@ -3,6 +3,18 @@ import { accessSync, constants } from 'node:fs';
 import { isAbsolute, join } from 'node:path';
 import { createLogger } from '../logger.js';
 const log = createLogger('CodeBuddyCli');
+const MAX_TIMEOUT_MS = 2_147_483_647;
+const DEFAULT_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
+function getIdleTimeoutMs(totalTimeoutMs) {
+    const raw = process.env.CODEBUDDY_IDLE_TIMEOUT_MS;
+    const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
+    const configuredIdleTimeoutMs = Number.isFinite(parsed) && parsed > 0
+        ? Math.min(parsed, MAX_TIMEOUT_MS)
+        : DEFAULT_IDLE_TIMEOUT_MS;
+    return totalTimeoutMs > 0
+        ? Math.min(configuredIdleTimeoutMs, totalTimeoutMs)
+        : configuredIdleTimeoutMs;
+}
 export function buildCodeBuddyArgs(prompt, sessionId, options) {
     const args = ['--print', '--output-format', 'stream-json'];
     if (options?.skipPermissions) {
@@ -191,7 +203,50 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
     let currentModel;
     const toolStats = {};
     const startTime = Date.now();
+    const timeoutMs = options?.timeoutMs && options.timeoutMs > 0
+        ? Math.min(options.timeoutMs, MAX_TIMEOUT_MS)
+        : 0;
+    const idleTimeoutMs = getIdleTimeoutMs(timeoutMs);
+    let timeoutHandle = null;
+    let idleTimeoutHandle = null;
     const stdoutState = { buffer: '' };
+    const clearTimers = () => {
+        if (timeoutHandle) {
+            clearTimeout(timeoutHandle);
+            timeoutHandle = null;
+        }
+        if (idleTimeoutHandle) {
+            clearTimeout(idleTimeoutHandle);
+            idleTimeoutHandle = null;
+        }
+    };
+    const resetIdleTimeout = () => {
+        if (idleTimeoutMs <= 0 || completed)
+            return;
+        if (idleTimeoutHandle)
+            clearTimeout(idleTimeoutHandle);
+        idleTimeoutHandle = setTimeout(() => {
+            if (completed)
+                return;
+            completed = true;
+            clearTimers();
+            if (!child.killed)
+                child.kill('SIGTERM');
+            callbacks.onError(`CodeBuddy 执行长时间无输出，已自动终止（${idleTimeoutMs}ms）`);
+        }, idleTimeoutMs);
+    };
+    if (timeoutMs > 0) {
+        timeoutHandle = setTimeout(() => {
+            if (completed)
+                return;
+            completed = true;
+            clearTimers();
+            if (!child.killed)
+                child.kill('SIGTERM');
+            callbacks.onError(`CodeBuddy 执行超时（${timeoutMs}ms），已终止`);
+        }, timeoutMs);
+    }
+    resetIdleTimeout();
     const MAX_STDERR = 8 * 1024;
     let stderrText = '';
     const handleErrorText = (message) => {
@@ -244,6 +299,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
             if (completed)
                 return;
             completed = true;
+            clearTimers();
             const isError = payload.is_error === true;
             const resultText = typeof payload.result === 'string'
                 ? payload.result
@@ -268,6 +324,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         }
     };
     child.stdout?.on('data', (chunk) => {
+        resetIdleTimeout();
         stdoutState.buffer += chunk.toString();
         const payloads = extractBufferedPayloads(stdoutState);
         for (const payload of payloads) {
@@ -280,12 +337,14 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         }
     });
     child.stderr?.on('data', (chunk) => {
+        resetIdleTimeout();
         stderrText += chunk.toString();
         if (stderrText.length > MAX_STDERR) {
             stderrText = stderrText.slice(-MAX_STDERR);
         }
     });
     child.on('close', (code) => {
+        clearTimers();
         if (completed)
             return;
         if (stdoutState.buffer.trim()) {
@@ -318,6 +377,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         });
     });
     child.on('error', (err) => {
+        clearTimers();
         if (completed)
             return;
         completed = true;
@@ -326,6 +386,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
     return {
         abort: () => {
             completed = true;
+            clearTimers();
             if (!child.killed)
                 child.kill('SIGTERM');
         },

package/dist/codex/cli-runner.d.ts

@@ -22,6 +22,7 @@ export interface CodexRunCallbacks {
 export interface CodexRunOptions {
     skipPermissions?: boolean;
     permissionMode?: 'default' | 'acceptEdits' | 'plan';
+    timeoutMs?: number;
     model?: string;
     chatId?: string;
     hookPort?: number;

package/dist/codex/cli-runner.js

@@ -8,6 +8,8 @@ import { createInterface } from 'node:readline';
 import { createLogger } from '../logger.js';
 const log = createLogger('CodexCli');
 const windowsCodexLaunchCache = new Map();
+const MAX_TIMEOUT_MS = 2_147_483_647;
+const DEFAULT_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
 const SUPPORTED_IMAGE_EXTENSIONS = new Set([
     '.png',
     '.jpg',
@@ -19,6 +21,16 @@ const SUPPORTED_IMAGE_EXTENSIONS = new Set([
     '.tiff',
     '.avif',
 ]);
+function getIdleTimeoutMs(totalTimeoutMs) {
+    const raw = process.env.CODEX_IDLE_TIMEOUT_MS;
+    const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
+    const configuredIdleTimeoutMs = Number.isFinite(parsed) && parsed > 0
+        ? Math.min(parsed, MAX_TIMEOUT_MS)
+        : DEFAULT_IDLE_TIMEOUT_MS;
+    return totalTimeoutMs > 0
+        ? Math.min(configuredIdleTimeoutMs, totalTimeoutMs)
+        : configuredIdleTimeoutMs;
+}
 function parseCodexEvent(line) {
     const trimmed = line.trim();
     if (!trimmed)
@@ -213,7 +225,51 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     let completed = false;
     const toolStats = {};
     const startTime = Date.now();
+    const timeoutMs = options?.timeoutMs && options.timeoutMs > 0
+        ? Math.min(options.timeoutMs, MAX_TIMEOUT_MS)
+        : 0;
+    const idleTimeoutMs = getIdleTimeoutMs(timeoutMs);
+    let timeoutHandle = null;
+    let idleTimeoutHandle = null;
     const rl = createInterface({ input: child.stdout });
+    const clearTimers = () => {
+        if (timeoutHandle) {
+            clearTimeout(timeoutHandle);
+            timeoutHandle = null;
+        }
+        if (idleTimeoutHandle) {
+            clearTimeout(idleTimeoutHandle);
+            idleTimeoutHandle = null;
+        }
+    };
+    const failAndTerminate = (message, logMessage) => {
+        if (completed)
+            return;
+        completed = true;
+        clearTimers();
+        log.warn(logMessage);
+        rl.close();
+        if (!child.killed)
+            child.kill('SIGTERM');
+        callbacks.onError(message);
+    };
+    const resetIdleTimeout = () => {
+        if (idleTimeoutMs <= 0 || completed)
+            return;
+        if (idleTimeoutHandle)
+            clearTimeout(idleTimeoutHandle);
+        idleTimeoutHandle = setTimeout(() => {
+            failAndTerminate(`Codex 执行长时间无输出，已自动终止（${idleTimeoutMs}ms）`, `Codex CLI idle timeout after ${idleTimeoutMs}ms, killing pid=${child.pid}`);
+        }, idleTimeoutMs);
+    };
+    if (timeoutMs > 0) {
+        timeoutHandle = setTimeout(() => {
+            if (!completed && !child.killed) {
+                failAndTerminate(`执行超时（${timeoutMs}ms），已终止进程`, `Codex CLI timeout after ${timeoutMs}ms, killing pid=${child.pid}`);
+            }
+        }, timeoutMs);
+    }
+    resetIdleTimeout();
     const MAX_STDERR_HEAD = 4 * 1024;
     const MAX_STDERR_TAIL = 6 * 1024;
     let stderrHead = '';
@@ -221,6 +277,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     let stderrTotal = 0;
     let stderrHeadFull = false;
     child.stderr?.on('data', (chunk) => {
+        resetIdleTimeout();
         const text = chunk.toString();
         stderrTotal += text.length;
         if (!stderrHeadFull) {
@@ -238,6 +295,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
         log.debug(`[stderr] ${text.trimEnd()}`);
     });
     rl.on('line', (line) => {
+        resetIdleTimeout();
         const event = parseCodexEvent(line);
         if (!event)
             return;
@@ -251,6 +309,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
         }
         if (type === 'turn.failed') {
             completed = true;
+            clearTimers();
             const err = event.error;
             callbacks.onError(err?.message ?? 'Codex turn failed');
             return;
@@ -261,6 +320,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
                 return;
             }
             completed = true;
+            clearTimers();
             callbacks.onError(msg ?? 'Codex stream error');
             return;
         }
@@ -314,6 +374,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
         }
         if (type === 'turn.completed') {
             completed = true;
+            clearTimers();
             callbacks.onComplete({
                 success: true,
                 result: accumulated,
@@ -331,6 +392,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     const finalize = () => {
         if (!rlClosed || !childClosed)
             return;
+        clearTimers();
         if (completed)
             return;
         if (exitCode !== null && exitCode !== 0) {
@@ -381,6 +443,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     child.on('error', (err) => {
         const errorCode = err.code;
         log.error(`Codex CLI spawn error: ${err.message}, code=${errorCode}, path=${cliPath}`);
+        clearTimers();
         if (!completed) {
             completed = true;
             callbacks.onError(`Failed to start Codex CLI: ${err.message}`);
@@ -391,6 +454,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     return {
         abort: () => {
             completed = true;
+            clearTimers();
             rl.close();
             if (!child.killed)
                 child.kill('SIGTERM');

package/dist/config-web-page-i18n.d.ts

@@ -101,11 +101,14 @@ export declare const PAGE_TEXTS: {
         readonly codexCli: "Codex CLI path";
         readonly codebuddyCli: "CodeBuddy CLI path";
         readonly codexProxy: "Codex proxy";
+        readonly claudeTimeout: "Claude timeout (ms)";
         readonly claudeConfigPath: "Config file location";
         readonly claudeAuthToken: "ANTHROPIC_AUTH_TOKEN";
         readonly claudeBaseUrl: "ANTHROPIC_BASE_URL";
         readonly claudeModel: "ANTHROPIC_MODEL";
         readonly claudeProxy: "Proxy (optional)";
+        readonly codexTimeout: "Codex timeout (ms)";
+        readonly codebuddyTimeout: "CodeBuddy timeout (ms)";
         readonly hookPort: "Hook port";
         readonly logLevel: "Log level";
         readonly logLevelDefault: "default (app default)";
@@ -250,8 +253,11 @@ export declare const PAGE_TEXTS: {
         readonly codexCli: "Codex CLI 路径";
         readonly codebuddyCli: "CodeBuddy CLI 路径";
         readonly codexProxy: "Codex 代理";
+        readonly claudeTimeout: "Claude 超时（毫秒）";
         readonly claudeConfigPath: "配置文件位置";
         readonly claudeProxy: "代理（可选）";
+        readonly codexTimeout: "Codex 超时（毫秒）";
+        readonly codebuddyTimeout: "CodeBuddy 超时（毫秒）";
         readonly hookPort: "Hook 端口";
         readonly logLevel: "日志级别";
         readonly logLevelDefault: "default（程序默认）";

package/dist/config-web-page-i18n.js

@@ -101,11 +101,14 @@ export const PAGE_TEXTS = {
         codexCli: "Codex CLI path",
         codebuddyCli: "CodeBuddy CLI path",
         codexProxy: "Codex proxy",
+        claudeTimeout: "Claude timeout (ms)",
         claudeConfigPath: "Config file location",
         claudeAuthToken: "ANTHROPIC_AUTH_TOKEN",
         claudeBaseUrl: "ANTHROPIC_BASE_URL",
         claudeModel: "ANTHROPIC_MODEL",
         claudeProxy: "Proxy (optional)",
+        codexTimeout: "Codex timeout (ms)",
+        codebuddyTimeout: "CodeBuddy timeout (ms)",
         hookPort: "Hook port",
         logLevel: "Log level",
         logLevelDefault: "default (app default)",
@@ -250,8 +253,11 @@ export const PAGE_TEXTS = {
         codexCli: "Codex CLI \u8def\u5f84",
         codebuddyCli: "CodeBuddy CLI \u8def\u5f84",
         codexProxy: "Codex \u4ee3\u7406",
+        claudeTimeout: "Claude \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
         claudeConfigPath: "\u914d\u7f6e\u6587\u4ef6\u4f4d\u7f6e",
         claudeProxy: "\u4ee3\u7406\uff08\u53ef\u9009\uff09",
+        codexTimeout: "Codex \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
+        codebuddyTimeout: "CodeBuddy \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
         hookPort: "Hook \u7aef\u53e3",
         logLevel: "\u65e5\u5fd7\u7ea7\u522b",
         logLevelDefault: "default\uff08\u7a0b\u5e8f\u9ed8\u8ba4\uff09",

package/dist/config-web-page-script.js

@@ -229,11 +229,14 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
           { id: "aiCommonTitle", key: "aiCommonTitle" },
           { id: "ai-aiCommand-label", key: "aiTool" },
           { id: "ai-claudeWorkDir-label", key: "workDir" },
+          { id: "ai-claudeTimeoutMs-label", key: "claudeTimeout" },
           { id: "ai-claudeConfigPath-label", key: "claudeConfigPath" },
           { id: "ai-claudeProxy-label", key: "claudeProxy" },
           { id: "ai-codexCliPath-label", key: "codexCli" },
+          { id: "ai-codexTimeoutMs-label", key: "codexTimeout" },
           { id: "ai-codexProxy-label", key: "codexProxy" },
           { id: "ai-codebuddyCliPath-label", key: "codebuddyCli" },
+          { id: "ai-codebuddyTimeoutMs-label", key: "codebuddyTimeout" },
           { id: "ai-hookPort-label", key: "hookPort" },
           { id: "ai-logLevel-label", key: "logLevel" },
         ],
@@ -596,11 +599,14 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
       const AI_FIELD_MAPPINGS = [
         { id: "ai-aiCommand", key: "aiCommand" },
         { id: "ai-claudeWorkDir", key: "claudeWorkDir" },
+        { id: "ai-claudeTimeoutMs", key: "claudeTimeoutMs" },
         { id: "ai-claudeConfigPath", key: "claudeConfigPath" },
         { id: "ai-claudeProxy", key: "claudeProxy" },
         { id: "ai-codexCliPath", key: "codexCliPath" },
+        { id: "ai-codexTimeoutMs", key: "codexTimeoutMs" },
         { id: "ai-codexProxy", key: "codexProxy" },
         { id: "ai-codebuddyCliPath", key: "codebuddyCliPath" },
+        { id: "ai-codebuddyTimeoutMs", key: "codebuddyTimeoutMs" },
         { id: "ai-hookPort", key: "hookPort" },
         { id: "ai-logLevel", key: "logLevel" },
       ];
@@ -917,8 +923,11 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
         ai: {
           aiCommand: getValue("ai-aiCommand"),
           claudeWorkDir: getValue("ai-claudeWorkDir"),
+          claudeTimeoutMs: getNumber("ai-claudeTimeoutMs"),
           claudeConfigPath: getValue("ai-claudeConfigPath"),
           claudeProxy: getValue("ai-claudeProxy"),
+          codexTimeoutMs: getNumber("ai-codexTimeoutMs"),
+          codebuddyTimeoutMs: getNumber("ai-codebuddyTimeoutMs"),
           codexCliPath: getValue("ai-codexCliPath"),
           codexProxy: getValue("ai-codexProxy"),
           codebuddyCliPath: getValue("ai-codebuddyCliPath"),

package/dist/config-web-page-template.js

@@ -1237,6 +1237,10 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
                 </div>
                 <div class="ai-card-body">
                   <div id="ai-tool-claude" class="ai-tool-panel active" data-tool-panel="claude">
+                    <div class="form-group">
+                      <label class="form-label" id="ai-claudeTimeoutMs-label">Timeout (ms)</label>
+                      <input id="ai-claudeTimeoutMs" class="form-input" type="number" min="1" />
+                    </div>
                     <div class="form-group">
                       <label class="form-label" id="ai-claudeProxy-label">Proxy (optional)</label>
                       <input id="ai-claudeProxy" class="form-input mono" type="text" />
@@ -1255,6 +1259,10 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
                       <label class="form-label" id="ai-codexCliPath-label">CLI Path</label>
                       <input id="ai-codexCliPath" class="form-input mono" type="text" />
                     </div>
+                    <div class="form-group">
+                      <label class="form-label" id="ai-codexTimeoutMs-label">Timeout (ms)</label>
+                      <input id="ai-codexTimeoutMs" class="form-input" type="number" min="1" />
+                    </div>
                     <div class="form-group">
                       <label class="form-label" id="ai-codexProxy-label">Proxy (optional)</label>
                       <input id="ai-codexProxy" class="form-input mono" type="text" />
@@ -1266,6 +1274,10 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
                       <label class="form-label" id="ai-codebuddyCliPath-label">CLI Path</label>
                       <input id="ai-codebuddyCliPath" class="form-input mono" type="text" />
                     </div>
+                    <div class="form-group">
+                      <label class="form-label" id="ai-codebuddyTimeoutMs-label">Timeout (ms)</label>
+                      <input id="ai-codebuddyTimeoutMs" class="form-input" type="number" min="1" />
+                    </div>
                   </div>
                 </div>
               </div>

package/dist/config-web.js

@@ -278,6 +278,7 @@ function buildInitialPayload(file) {
         ai: {
             aiCommand: file.aiCommand ?? "claude",
             claudeWorkDir: file.tools?.claude?.workDir ?? process.cwd(),
+            claudeTimeoutMs: file.tools?.claude?.timeoutMs ?? 600000,
             claudeConfigPath: process.platform === 'win32'
                 ? getClaudeConfigHome() + "\\.claude\\settings.json"
                 : getClaudeConfigHome() + "/.claude/settings.json",
@@ -285,6 +286,8 @@ function buildInitialPayload(file) {
             claudeBaseUrl: claudeEnv.ANTHROPIC_BASE_URL ?? "",
             claudeModel: claudeEnv.ANTHROPIC_MODEL ?? "",
             claudeProxy: file.tools?.claude?.proxy ?? "",
+            codexTimeoutMs: file.tools?.codex?.timeoutMs ?? 600000,
+            codebuddyTimeoutMs: file.tools?.codebuddy?.timeoutMs ?? 600000,
             codexCliPath: file.tools?.codex?.cliPath ?? "codex",
             codebuddyCliPath: file.tools?.codebuddy?.cliPath ?? "codebuddy",
             codexProxy: file.tools?.codex?.proxy ?? "",
@@ -324,6 +327,12 @@ function validatePayload(payload) {
         errors.push("WorkBuddy user ID is required.");
     if (!clean(payload.ai.claudeWorkDir))
         errors.push("Default work directory is required.");
+    if (!Number.isFinite(payload.ai.claudeTimeoutMs) || payload.ai.claudeTimeoutMs <= 0)
+        errors.push("Claude timeout must be positive.");
+    if (!Number.isFinite(payload.ai.codexTimeoutMs) || payload.ai.codexTimeoutMs <= 0)
+        errors.push("Codex timeout must be positive.");
+    if (!Number.isFinite(payload.ai.codebuddyTimeoutMs) || payload.ai.codebuddyTimeoutMs <= 0)
+        errors.push("CodeBuddy timeout must be positive.");
     return errors;
 }
 function validateConfigForPlatform(platform, config) {
@@ -413,6 +422,9 @@ function createProbeConfig(values) {
         aiCommand: "claude",
         codexCliPath: "codex",
         claudeWorkDir: process.cwd(),
+        claudeTimeoutMs: 600000,
+        codexTimeoutMs: 600000,
+        codebuddyTimeoutMs: 600000,
         logDir: "",
         logLevel: "INFO",
         codebuddyCliPath: "codebuddy",
@@ -576,6 +588,7 @@ function toFileConfig(payload, existing) {
             claude: {
                 ...existing.tools?.claude,
                 workDir: clean(payload.ai.claudeWorkDir) ?? process.cwd(),
+                timeoutMs: payload.ai.claudeTimeoutMs,
                 proxy: clean(payload.ai.claudeProxy),
                 // model is now saved to ~/.claude/settings.json as env var
             },
@@ -583,11 +596,13 @@ function toFileConfig(payload, existing) {
                 ...existing.tools?.codex,
                 cliPath: clean(payload.ai.codexCliPath) ?? "codex",
                 workDir: clean(payload.ai.claudeWorkDir) ?? process.cwd(),
+                timeoutMs: payload.ai.codexTimeoutMs,
                 proxy: clean(payload.ai.codexProxy),
             },
             codebuddy: {
                 ...existing.tools?.codebuddy,
                 cliPath: clean(payload.ai.codebuddyCliPath) ?? "codebuddy",
+                timeoutMs: payload.ai.codebuddyTimeoutMs,
             },
         },
         platforms: {

package/dist/config.d.ts

@@ -28,6 +28,9 @@ export interface Config {
     claudeProxy?: string;
     /** Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） */
     codexProxy?: string;
+    claudeTimeoutMs: number;
+    codexTimeoutMs: number;
+    codebuddyTimeoutMs: number;
     claudeWorkDir: string;
     claudeModel?: string;
     logDir: string;
@@ -134,6 +137,7 @@ interface FilePlatformWorkBuddy {
 export interface FileToolClaude {
     cliPath?: string;
     workDir?: string;
+    timeoutMs?: number;
     skipPermissions?: boolean;
     /** HTTP/HTTPS 代理，用于访问 Claude API（如 http://127.0.0.1:7890） */
     proxy?: string;
@@ -143,11 +147,13 @@ export interface FileToolClaude {
 export interface FileToolCodex {
     cliPath?: string;
     workDir?: string;
+    timeoutMs?: number;
     /** HTTP/HTTPS 代理，用于访问 chatgpt.com（如 http://127.0.0.1:7890） */
     proxy?: string;
 }
 export interface FileToolCodeBuddy {
     cliPath?: string;
+    timeoutMs?: number;
 }
 export interface FileConfig {
     telegramBotToken?: string;

package/dist/config.js

@@ -20,8 +20,7 @@ const CODEX_AUTH_PATHS = [
 ];
 const OLD_ROOT_KEYS = [
     'claudeWorkDir',
-    'claudeTimeoutMs',
-    'claudeModel',
+    'claudeTimeoutMs', 'claudeModel',
 ];
 // Config cache with mtime tracking
 let cachedConfig = null;
@@ -58,6 +57,7 @@ function migrateToNewConfigFormat(raw) {
         claude: {
             ...tc,
             workDir: tc.workDir ?? raw.claudeWorkDir ?? process.cwd(),
+            timeoutMs: tc.timeoutMs ?? raw.claudeTimeoutMs ?? 600000,
             proxy: tc.proxy,
             // model 现在通过 env 配置，不再在这里处理
         },
@@ -65,11 +65,13 @@ function migrateToNewConfigFormat(raw) {
             ...tcod,
             cliPath: tcod.cliPath ?? 'codex',
             workDir: tcod.workDir ?? raw.claudeWorkDir ?? process.cwd(),
+            timeoutMs: tcod.timeoutMs ?? raw.claudeTimeoutMs ?? 600000,
             proxy: tcod.proxy,
         },
         codebuddy: {
             ...tcb,
             cliPath: tcb.cliPath ?? 'codebuddy',
+            timeoutMs: tcb.timeoutMs ?? raw.claudeTimeoutMs ?? 600000,
         },
     };
     for (const k of OLD_ROOT_KEYS) {
@@ -405,6 +407,15 @@ export function loadConfig() {
         }
     }
     const claudeWorkDir = process.env.CLAUDE_WORK_DIR ?? tc.workDir ?? process.cwd();
+    const claudeTimeoutMs = process.env.CLAUDE_TIMEOUT_MS !== undefined
+        ? parseInt(process.env.CLAUDE_TIMEOUT_MS, 10) || 600000
+        : tc.timeoutMs ?? 600000;
+    const codexTimeoutMs = process.env.CODEX_TIMEOUT_MS !== undefined
+        ? parseInt(process.env.CODEX_TIMEOUT_MS, 10) || 600000
+        : tcod.timeoutMs ?? 600000;
+    const codebuddyTimeoutMs = process.env.CODEBUDDY_TIMEOUT_MS !== undefined
+        ? parseInt(process.env.CODEBUDDY_TIMEOUT_MS, 10) || 600000
+        : tcb.timeoutMs ?? 600000;
     // 6. 校验 Claude API 凭证（SDK 模式需要）
     // 支持：官方 API Key、Auth Token、或自定义 API（第三方模型等，BASE_URL + token）
     if (aiCommand === 'claude') {
@@ -628,6 +639,9 @@ export function loadConfig() {
         claudeProxy,
         codexProxy,
         claudeWorkDir,
+        claudeTimeoutMs,
+        codexTimeoutMs,
+        codebuddyTimeoutMs,
         claudeModel: process.env.ANTHROPIC_MODEL,
         logDir,
         logLevel,

package/dist/dingtalk/event-handler.js

@@ -6,6 +6,7 @@ import { ackMessage, downloadRobotMessageFile, registerSessionWebhook } from './
 import { CommandHandler } from '../commands/handler.js';
 import { getAdapter } from '../adapters/registry.js';
 import { runAITask } from '../shared/ai-task.js';
+import { startTaskCleanup } from '../shared/task-cleanup.js';
 import { setActiveChatId, setDingTalkActiveTarget } from '../shared/active-chats.js';
 import { setChatUser } from '../shared/chat-user-map.js';
 import { createLogger } from '../logger.js';
@@ -158,6 +159,7 @@ export function setupDingTalkHandlers(config, sessionManager) {
     const accessControl = new AccessControl(config.dingtalkAllowedUserIds);
     const requestQueue = new RequestQueue();
     const runningTasks = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     const commandHandler = new CommandHandler({
         config,
         sessionManager,
@@ -299,7 +301,7 @@ export function setupDingTalkHandlers(config, sessionManager) {
         ackMessage(callbackId, { queued: enqueueResult });
     }
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
         handleEvent,
     };

package/dist/feishu/event-handler.js

@@ -7,6 +7,7 @@ import { getAdapter } from '../adapters/registry.js';
 import { runAITask } from '../shared/ai-task.js';
 import { buildCardV2 } from './card-builder.js';
 import { disableStreaming, updateCardFull, destroySession } from './cardkit-manager.js';
+import { startTaskCleanup } from '../shared/task-cleanup.js';
 import { CARDKIT_THROTTLE_MS } from '../constants.js';
 import { setActiveChatId } from '../shared/active-chats.js';
 import { setChatUser } from '../shared/chat-user-map.js';
@@ -125,6 +126,7 @@ export function setupFeishuHandlers(config, sessionManager) {
     const accessControl = new AccessControl(config.feishuAllowedUserIds);
     const requestQueue = new RequestQueue();
     const runningTasks = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     const commandHandler = new CommandHandler({
         config,
         sessionManager,
@@ -606,7 +608,7 @@ export function setupFeishuHandlers(config, sessionManager) {
         }
     }
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
         handleEvent,
     };

package/dist/qq/event-handler.js

@@ -5,6 +5,7 @@ import { sendThinkingMessage, updateMessage, sendFinalMessages, sendErrorMessage
 import { CommandHandler } from "../commands/handler.js";
 import { getAdapter } from "../adapters/registry.js";
 import { runAITask } from "../shared/ai-task.js";
+import { startTaskCleanup } from "../shared/task-cleanup.js";
 import { setActiveChatId } from "../shared/active-chats.js";
 import { setChatUser } from "../shared/chat-user-map.js";
 import { createLogger } from "../logger.js";
@@ -118,6 +119,7 @@ export function setupQQHandlers(config, sessionManager) {
     const runningTasks = new Map();
     const recentEventIds = new Map();
     const recentEventFingerprints = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     const commandHandler = new CommandHandler({
         config,
         sessionManager,
@@ -256,7 +258,7 @@ export function setupQQHandlers(config, sessionManager) {
         log.info(`QQ message handled: user=${userId}, chat=${chatId}, status=${enqueueResult}, attachments=${event.attachments?.length ?? 0}`);
     }
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
         handleEvent,
     };

package/dist/setup.js

@@ -75,10 +75,11 @@ function printManualInstructions(configPath) {
   "tools": {
     "claude": {
       "cliPath": "claude",
-      "workDir": "${process.cwd().replace(/\\/g, "/")}"
+      "workDir": "${process.cwd().replace(/\\/g, "/")}",
+      "timeoutMs": 600000
     },
     "codex": { "cliPath": "codex", "workDir": "${process.cwd().replace(/\\/g, "/")}", "proxy": "http://127.0.0.1:7890" },
-    "codebuddy": { "cliPath": "codebuddy" }
+    "codebuddy": { "cliPath": "codebuddy", "timeoutMs": 600000 }
   },
   "platforms": {
     "telegram": {
@@ -861,6 +862,7 @@ export async function runInteractiveSetup() {
                 ...baseTools.claude,
                 cliPath: baseTools.claude?.cliPath ?? "claude",
                 workDir,
+                timeoutMs: baseTools.claude?.timeoutMs ?? 600000,
             },
             codex: {
                 ...baseTools.codex,
@@ -873,6 +875,7 @@ export async function runInteractiveSetup() {
             codebuddy: {
                 ...baseTools.codebuddy,
                 cliPath: baseTools.codebuddy?.cliPath ?? "codebuddy",
+                timeoutMs: baseTools.codebuddy?.timeoutMs ?? 600000,
             },
         },
     };

package/dist/shared/ai-task.js

@@ -86,6 +86,11 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
         // 使用 aiCommand 而不是 toolAdapter.toolId，确保 sessionId 的存储和查询使用相同的 key
         const aiCommand = resolvePlatformAiCommand(config, ctx.platform);
         const toolId = toolAdapter.toolId;
+        const timeoutMs = aiCommand === 'codex'
+            ? config.codexTimeoutMs
+            : aiCommand === 'codebuddy'
+                ? config.codebuddyTimeoutMs
+                : config.claudeTimeoutMs;
         const startRun = () => {
             log.info(`[AITask] Starting: userId=${ctx.userId}, initialSessionId=${currentSessionId ?? 'new'}, prompt="${prompt.slice(0, 50)}..."`);
             activeHandle = toolAdapter.run(prompt, currentSessionId, ctx.workDir, {
@@ -220,6 +225,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     resolve();
                 },
             }, {
+                timeoutMs,
                 model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
                 chatId: ctx.chatId,
                 // 默认跳过权限确认，保持全自动执行

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

@@ -35,6 +35,9 @@ describe("runAITask", () => {
                 aiCommand: "codex",
                 platforms: {},
                 enabledPlatforms: [],
+                codexTimeoutMs: 600000,
+                claudeTimeoutMs: 600000,
+                codebuddyTimeoutMs: 600000,
                 claudeModel: "",
                 codexProxy: "",
                 wechatUserId: "",

package/dist/shared/task-cleanup.d.ts

@@ -0,0 +1,2 @@
+import type { TaskRunState } from './ai-task.js';
+export declare function startTaskCleanup(runningTasks: Map<string, TaskRunState>): () => void;

package/dist/shared/task-cleanup.js

@@ -0,0 +1,19 @@
+import { createLogger } from '../logger.js';
+const log = createLogger('TaskCleanup');
+const TASK_TIMEOUT_MS = 30 * 60 * 1000;
+const INTERVAL_MS = 10 * 60 * 1000;
+export function startTaskCleanup(runningTasks) {
+    const timer = setInterval(() => {
+        const now = Date.now();
+        for (const [key, task] of runningTasks) {
+            if (now - task.startedAt > TASK_TIMEOUT_MS) {
+                log.warn(`Auto-cleaning timeout task: ${key}`);
+                task.settle();
+                task.handle.abort();
+                runningTasks.delete(key);
+            }
+        }
+    }, INTERVAL_MS);
+    timer.unref();
+    return () => clearInterval(timer);
+}

package/dist/telegram/event-handler.js

@@ -6,6 +6,7 @@ import { sendThinkingMessage, updateMessage, sendFinalMessages, sendTextReply, s
 import { CommandHandler } from "../commands/handler.js";
 import { getAdapter } from "../adapters/registry.js";
 import { runAITask } from "../shared/ai-task.js";
+import { startTaskCleanup } from "../shared/task-cleanup.js";
 import { TELEGRAM_THROTTLE_MS } from "../constants.js";
 import { setActiveChatId } from "../shared/active-chats.js";
 import { setChatUser } from "../shared/chat-user-map.js";
@@ -65,6 +66,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
     const accessControl = new AccessControl(config.telegramAllowedUserIds);
     const requestQueue = new RequestQueue();
     const runningTasks = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     const commandHandler = new CommandHandler({
         config,
         sessionManager,
@@ -486,7 +488,7 @@ export function setupTelegramHandlers(bot, config, sessionManager) {
         }
     });
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
     };
 }

package/dist/wework/event-handler.js

@@ -8,6 +8,7 @@ import { sendThinkingMessage, updateMessage, sendFinalMessages, sendTextReply, s
 import { CommandHandler } from '../commands/handler.js';
 import { getAdapter } from '../adapters/registry.js';
 import { runAITask } from '../shared/ai-task.js';
+import { startTaskCleanup } from '../shared/task-cleanup.js';
 import { WEWORK_THROTTLE_MS } from '../constants.js';
 import { setActiveChatId } from '../shared/active-chats.js';
 import { setChatUser } from '../shared/chat-user-map.js';
@@ -162,6 +163,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
     const accessControl = new AccessControl(config.weworkAllowedUserIds);
     const requestQueue = new RequestQueue();
     const runningTasks = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     // Mutable ref that captures the req_id of the message currently being handled.
     // WeWork requires req_id to reply; CommandHandler doesn't carry it, so we inject
     // it via a closure.  WeWork delivers messages sequentially over WebSocket, so
@@ -330,7 +332,7 @@ export function setupWeWorkHandlers(config, sessionManager) {
         }
     }
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
         handleEvent,
     };

package/dist/workbuddy/event-handler.js

@@ -8,6 +8,7 @@ import { sendTextReply, sendErrorReply } from './message-sender.js';
 import { CommandHandler } from '../commands/handler.js';
 import { getAdapter } from '../adapters/registry.js';
 import { runAITask } from '../shared/ai-task.js';
+import { startTaskCleanup } from '../shared/task-cleanup.js';
 import { WORKBUDDY_THROTTLE_MS } from '../constants.js';
 import { setActiveChatId } from '../shared/active-chats.js';
 import { setChatUser } from '../shared/chat-user-map.js';
@@ -18,6 +19,7 @@ export function setupWorkBuddyHandlers(config, sessionManager) {
     const requestQueue = new RequestQueue();
     const runningTasks = new Map();
     const taskKeyByChatId = new Map();
+    const stopTaskCleanup = startTaskCleanup(runningTasks);
     // Base dependencies for creating per-event CommandHandler
     const baseCommandDeps = {
         config,
@@ -114,7 +116,7 @@ export function setupWorkBuddyHandlers(config, sessionManager) {
         }
     }
     return {
-        stop: () => { },
+        stop: () => stopTaskCleanup(),
         getRunningTaskCount: () => runningTasks.size,
         handleEvent,
     };

package/package.json

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