@wu529778790/open-im 1.11.8-beta.7 → 1.11.8-beta.9

package/dist/adapters/codebuddy-adapter.js

@@ -1,4 +1,5 @@
 import { runCodeBuddy } from '../codebuddy/cli-runner.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
 export class CodeBuddyAdapter {
     cliPath;
     toolId = 'codebuddy';
@@ -10,25 +11,10 @@ export class CodeBuddyAdapter {
             onText: callbacks.onText,
             onThinking: callbacks.onThinking,
             onToolUse: callbacks.onToolUse,
-            onComplete: (raw) => {
-                const result = {
-                    success: raw.success,
-                    result: raw.result,
-                    accumulated: raw.accumulated,
-                    cost: raw.cost,
-                    durationMs: raw.durationMs,
-                    model: raw.model,
-                    numTurns: raw.numTurns,
-                    toolStats: raw.toolStats,
-                };
-                callbacks.onComplete(result);
-            },
+            onComplete: callbacks.onComplete,
             onError: (err) => {
                 const msg = typeof err === 'string' ? err : String(err);
-                const friendly = msg.includes('No conversation found') ||
-                    msg.includes('Session not found') ||
-                    msg.includes('Invalid session') ||
-                    msg.includes('Unable to resume')
+                const friendly = isSessionInvalidMessage(msg)
                     ? 'CodeBuddy 会话已失效，旧 session 已清理。请直接重试当前请求。'
                     : msg;
                 callbacks.onError(friendly);

package/dist/adapters/codex-adapter.js

@@ -2,6 +2,7 @@
  * Codex Adapter - run tasks through OpenAI Codex CLI (`codex exec`)
  */
 import { runCodex } from "../codex/cli-runner.js";
+import { isSessionInvalidMessage } from "../shared/session-invalid-detector.js";
 export class CodexAdapter {
     cliPath;
     toolId = "codex";
@@ -21,24 +22,10 @@ export class CodexAdapter {
             onText: callbacks.onText,
             onThinking: callbacks.onThinking,
             onToolUse: callbacks.onToolUse,
-            onComplete: (raw) => {
-                const result = {
-                    success: raw.success,
-                    result: raw.result,
-                    accumulated: raw.accumulated,
-                    cost: raw.cost,
-                    durationMs: raw.durationMs,
-                    model: raw.model,
-                    numTurns: raw.numTurns,
-                    toolStats: raw.toolStats,
-                };
-                callbacks.onComplete(result);
-            },
+            onComplete: callbacks.onComplete,
             onError: (err) => {
                 const msg = typeof err === "string" ? err : String(err);
-                const friendly = msg.includes("No session found") ||
-                    msg.includes("No conversation found") ||
-                    msg.includes("Unable to find session")
+                const friendly = isSessionInvalidMessage(msg)
                     ? "Codex 会话已失效，旧 session 已清理。请直接重试当前请求。"
                     : msg;
                 callbacks.onError(friendly);

package/dist/adapters/opencode-adapter.js

@@ -1,4 +1,5 @@
 import { runOpenCodeSdk } from '../opencode/sdk-runner.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
 export class OpenCodeAdapter {
     toolId = 'opencode';
     run(prompt, sessionId, workDir, callbacks, options) {
@@ -6,24 +7,10 @@ export class OpenCodeAdapter {
             onText: callbacks.onText,
             onThinking: callbacks.onThinking,
             onToolUse: callbacks.onToolUse,
-            onComplete: (raw) => {
-                const result = {
-                    success: raw.success,
-                    result: raw.result,
-                    accumulated: raw.accumulated,
-                    cost: raw.cost,
-                    durationMs: raw.durationMs,
-                    model: raw.model,
-                    numTurns: raw.numTurns,
-                    toolStats: raw.toolStats,
-                };
-                callbacks.onComplete(result);
-            },
+            onComplete: callbacks.onComplete,
             onError: (err) => {
                 const msg = typeof err === 'string' ? err : String(err);
-                const friendly = msg.includes('session not found') ||
-                    msg.includes('Session not found') ||
-                    msg.includes('no sessions found')
+                const friendly = isSessionInvalidMessage(msg)
                     ? 'OpenCode 会话已失效，旧 session 已清理。请直接重试当前请求。'
                     : msg;
                 callbacks.onError(friendly);

package/dist/clawbot/client.js

@@ -9,7 +9,8 @@
  */
 import { randomBytes } from 'node:crypto';
 import { createLogger } from '../logger.js';
-import { jitteredDelay, isFatalReconnectError, SLOW_PROBE_MS } from '../shared/reconnect.js';
+import { isFatalReconnectError } from '../shared/reconnect.js';
+import { ReconnectManager, HeartbeatMonitor, StateManager } from '../shared/connection-manager.js';
 import { cacheContextToken } from './message-sender.js';
 import { setClawbotContextToken, clearClawbotContextToken } from '../shared/active-chats.js';
 import { createMediaTargetPath } from '../shared/media-storage.js';
@@ -19,27 +20,30 @@ const log = createLogger('ClawBot');
 const RECONNECT_DELAYS_MS = [3000, 5000, 10000, 20000, 30000];
 const BASE_INFO = { channel_version: '0.1.0' };
 let pollController = null;
-let channelState = 'disconnected';
 let messageHandler = null;
-let stateChangeHandler = null;
-let reconnectTimer = null;
-let watchdogTimer = null;
-let reconnectAttempt = 0;
-let fatal = false;
 let stopped = false;
 let apiUrl = 'https://ilinkai.weixin.qq.com';
 let apiToken = '';
 /** Opaque cursor for getupdates pagination (replaces numeric offset) */
 let getUpdatesBuf = '';
-/** Timestamp of last successful poll response (for watchdog) */
-let lastResponseAt = 0;
 /** Per-request timeout for long-polling (ms) */
 const POLL_REQUEST_TIMEOUT_MS = 3 * 60 * 1000; // 3 minutes
 /** Watchdog interval: force reconnect if no response for this long (ms) */
 const WATCHDOG_INTERVAL_MS = 60_000; // check every 60s
 const WATCHDOG_STALE_MS = 5 * 60 * 1000; // 5 minutes without response = stale
+// Connection infrastructure (shared managers replace raw timers/counters)
+const stateManager = new StateManager('disconnected');
+const heartbeatMonitor = new HeartbeatMonitor();
+const reconnectManager = new ReconnectManager({
+    name: 'ClawBot',
+    backoff: { mode: 'stepped', delays: RECONNECT_DELAYS_MS },
+    onReconnect: () => {
+        stateManager.set('connected');
+        startPolling();
+    },
+});
 export function getChannelState() {
-    return channelState;
+    return stateManager.current;
 }
 export async function initClawbot(config, eventHandler, onStateChange) {
     const pc = config.platforms?.clawbot;
@@ -52,14 +56,14 @@ export async function initClawbot(config, eventHandler, onStateChange) {
     apiUrl = pc.apiUrl ?? 'https://ilinkai.weixin.qq.com';
     apiToken = pc.apiToken;
     messageHandler = eventHandler;
-    stateChangeHandler = onStateChange ?? null;
+    stateManager.setOnChange(onStateChange);
     stopped = false;
-    reconnectAttempt = 0;
-    fatal = false;
+    reconnectManager.reset();
+    reconnectManager.resume();
     getUpdatesBuf = '';
     // Start polling directly — no blocking connectivity check.
     // The polling loop handles errors and reconnection internally.
-    updateState('connected');
+    stateManager.set('connected');
     startPolling();
     log.info('ClawBot client initialized');
 }
@@ -82,18 +86,18 @@ function startPolling() {
                     base_info: BASE_INFO,
                 }, combinedSignal);
                 // Record successful response time for watchdog
-                lastResponseAt = Date.now();
+                heartbeatMonitor.recordResponse();
                 if (signal.aborted)
                     break;
                 if (!res.ok) {
                     // Detect fatal errors (e.g. errcode -14 "session timeout") — retrying won't help
                     if (res.errcode === -14 || isFatalReconnectError(res.error)) {
                         log.warn(`ClawBot fatal error (errcode=${res.errcode}), entering slow-probe mode`);
-                        fatal = true;
+                        reconnectManager.setFatal(true);
                         getUpdatesBuf = ''; // session expired, cursor is stale
                         clearClawbotContextToken(); // session expired, token is stale
-                        updateState('error');
-                        scheduleReconnect();
+                        stateManager.set('error');
+                        reconnectManager.schedule();
                         return;
                     }
                     log.warn(`ClawBot getupdates error: ${res.error ?? 'unknown'}`);
@@ -101,10 +105,9 @@ function startPolling() {
                     continue;
                 }
                 // Successful response — clear fatal mode and reset backoff
-                if (fatal || reconnectAttempt > 0) {
+                if (reconnectManager.fatal || reconnectManager.attemptCount > 0) {
                     log.info('ClawBot connection recovered');
-                    fatal = false;
-                    reconnectAttempt = 0;
+                    reconnectManager.reset();
                 }
                 // Update cursor for next poll
                 if (res.updatesBuf) {
@@ -189,69 +192,35 @@ function startPolling() {
                 if (err instanceof Error && err.name === 'AbortError')
                     break;
                 log.error('ClawBot polling error:', err);
-                updateState('error');
-                scheduleReconnect();
+                stateManager.set('error');
+                reconnectManager.schedule();
                 return;
             }
         }
     })();
 }
-function scheduleReconnect() {
-    if (stopped)
-        return;
-    if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
-    }
-    const baseDelay = RECONNECT_DELAYS_MS[Math.min(reconnectAttempt, RECONNECT_DELAYS_MS.length - 1)];
-    const delay = fatal ? jitteredDelay(SLOW_PROBE_MS) : jitteredDelay(baseDelay);
-    reconnectAttempt++;
-    if (fatal) {
-        log.warn(`ClawBot fatal error, slow-probe in ${Math.round(delay / 1000)}s (attempt ${reconnectAttempt})...`);
-    }
-    else {
-        log.info(`ClawBot reconnecting in ${delay}ms (attempt ${reconnectAttempt})...`);
-    }
-    reconnectTimer = setTimeout(() => {
-        reconnectTimer = null;
-        if (stopped)
-            return;
-        updateState('connected');
-        startPolling();
-    }, delay);
-}
-function updateState(state) {
-    channelState = state;
-    stateChangeHandler?.(state);
-    log.debug(`ClawBot state: ${state}`);
-}
 /**
  * Watchdog: periodically check if the poll loop is alive.
  * After Mac sleep or network drop, the fetch may hang without throwing.
  * If no successful response for WATCHDOG_STALE_MS, force a reconnect.
  */
 function startWatchdog() {
-    stopWatchdog();
-    lastResponseAt = Date.now();
-    watchdogTimer = setInterval(() => {
-        if (stopped)
-            return;
-        const elapsed = Date.now() - lastResponseAt;
-        if (elapsed > WATCHDOG_STALE_MS) {
-            log.warn(`ClawBot watchdog: no response for ${Math.round(elapsed / 1000)}s, forcing reconnect`);
-            if (pollController) {
-                pollController.abort();
-                pollController = null;
-            }
-            updateState('error');
-            scheduleReconnect();
-        }
-    }, WATCHDOG_INTERVAL_MS);
+    heartbeatMonitor.recordResponse();
+    heartbeatMonitor.start(WATCHDOG_INTERVAL_MS, watchdogTick);
 }
-function stopWatchdog() {
-    if (watchdogTimer) {
-        clearInterval(watchdogTimer);
-        watchdogTimer = null;
+function watchdogTick() {
+    if (stopped)
+        return;
+    if (heartbeatMonitor.isStale(WATCHDOG_STALE_MS)) {
+        const elapsed = Date.now() - heartbeatMonitor.lastResponseTime;
+        log.warn(`ClawBot watchdog: no response for ${Math.round(elapsed / 1000)}s, forcing reconnect`);
+        heartbeatMonitor.stop();
+        if (pollController) {
+            pollController.abort();
+            pollController = null;
+        }
+        stateManager.set('error');
+        reconnectManager.schedule();
     }
 }
 /**
@@ -441,13 +410,10 @@ export function stopClawbot() {
         pollController.abort();
         pollController = null;
     }
-    if (reconnectTimer) {
-        clearTimeout(reconnectTimer);
-        reconnectTimer = null;
-    }
-    stopWatchdog();
+    reconnectManager.stop();
+    heartbeatMonitor.stop();
     messageHandler = null;
     // Don't clear context_token here — it's persisted for startup notifications
-    updateState('disconnected');
+    stateManager.set('disconnected');
     log.info('ClawBot client stopped');
 }

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

@@ -1,29 +1,9 @@
-export interface CodeBuddyRunCallbacks {
-    onText: (accumulated: string) => void;
-    onThinking?: (accumulated: string) => void;
-    onToolUse?: (toolName: string, toolInput?: Record<string, unknown>) => void;
-    onComplete: (result: {
-        success: boolean;
-        result: string;
-        accumulated: string;
-        cost: number;
-        durationMs: number;
-        model?: string;
-        numTurns: number;
-        toolStats: Record<string, number>;
-    }) => void;
-    onError: (error: string) => void;
-    onSessionId?: (sessionId: string) => void;
-    onSessionInvalid?: () => void;
-}
+import type { RunCallbacks, RunHandle } from '../adapters/tool-adapter.interface.js';
 export interface CodeBuddyRunOptions {
     skipPermissions?: boolean;
     permissionMode?: 'default' | 'acceptEdits' | 'plan';
     model?: string;
 }
-export interface CodeBuddyRunHandle {
-    abort: () => void;
-}
 export declare function buildCodeBuddyArgs(prompt: string, sessionId: string | undefined, options?: CodeBuddyRunOptions): string[];
 export declare function extractBufferedPayloads(state: {
     buffer: string;
@@ -41,4 +21,4 @@ export declare function flushBufferedPayloads(state: {
  * - 其他情况 → 拼接（不丢内容）
  */
 export declare function mergeAssistantReply(previous: string, incoming: string): string;
-export declare function runCodeBuddy(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: CodeBuddyRunCallbacks, options?: CodeBuddyRunOptions): CodeBuddyRunHandle;
+export declare function runCodeBuddy(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: CodeBuddyRunOptions): RunHandle;

package/dist/codebuddy/cli-runner.js

@@ -2,8 +2,9 @@ import { execFileSync, spawn } from 'node:child_process';
 import { accessSync, constants } from 'node:fs';
 import { isAbsolute, join } from 'node:path';
 import { createLogger } from '../logger.js';
-import { processEnvForNonClaudeCliChild } from '../config/file-io.js';
 import { killProcessTree, trackChild } from '../shared/process-kill.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
+import { clearWallClockTimeout, buildBaseSpawnOptions } from '../shared/cli-runner-base.js';
 const log = createLogger('CodeBuddyCli');
 export function buildCodeBuddyArgs(prompt, sessionId, options) {
     const args = ['--print', '--output-format', 'stream-json'];
@@ -190,24 +191,12 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         ...options,
         permissionMode: normalizePermissionMode(options?.permissionMode),
     });
-    const env = processEnvForNonClaudeCliChild();
-    if (process.platform === 'win32') {
-        env.LANG = env.LANG || 'C.UTF-8';
-        env.LC_ALL = env.LC_ALL || 'C.UTF-8';
-    }
     const isCmd = process.platform === 'win32' && (/\.(cmd|bat)$/i.test(normalizedCliPath) ||
         normalizedCliPath === 'codebuddy');
     const spawnCmd = isCmd ? 'cmd.exe' : normalizedCliPath;
     const spawnArgs = isCmd ? ['/c', normalizedCliPath, ...args] : args;
     log.info(`Spawning CodeBuddy CLI: path=${normalizedCliPath}, cwd=${workDir}, session=${sessionId ?? 'new'}, args=${args.join(' ')}`);
-    const child = spawn(spawnCmd, spawnArgs, {
-        cwd: workDir,
-        // Unix 上放入独立进程组，使 abort/关停能用 process.kill(-pid) 杀掉整棵子树（含 MCP/shell 孙进程）
-        detached: process.platform !== 'win32',
-        stdio: ['ignore', 'pipe', 'pipe'],
-        env,
-        windowsHide: process.platform === 'win32',
-    });
+    const child = spawn(spawnCmd, spawnArgs, buildBaseSpawnOptions(workDir, ['ignore', 'pipe', 'pipe']));
     trackChild(child);
     let cliTimeoutHandle = null;
     let accumulated = '';
@@ -222,7 +211,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
     const MAX_STDERR = 8 * 1024;
     let stderrText = '';
     const handleErrorText = (message) => {
-        if (sessionId && /No conversation found|Session not found|Invalid session|Unable to resume/i.test(message)) {
+        if (sessionId && isSessionInvalidMessage(message)) {
             callbacks.onSessionInvalid?.();
         }
         callbacks.onError(message);
@@ -317,10 +306,8 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         }
     });
     child.on('close', (code) => {
-        if (cliTimeoutHandle) {
-            clearTimeout(cliTimeoutHandle);
-            cliTimeoutHandle = null;
-        }
+        clearWallClockTimeout(cliTimeoutHandle);
+        cliTimeoutHandle = null;
         if (completed)
             return;
         if (stdoutState.buffer.trim()) {
@@ -353,10 +340,8 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         });
     });
     child.on('error', (err) => {
-        if (cliTimeoutHandle) {
-            clearTimeout(cliTimeoutHandle);
-            cliTimeoutHandle = null;
-        }
+        clearWallClockTimeout(cliTimeoutHandle);
+        cliTimeoutHandle = null;
         if (completed)
             return;
         completed = true;
@@ -378,10 +363,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
             if (completed)
                 return;
             completed = true;
-            if (cliTimeoutHandle) {
-                clearTimeout(cliTimeoutHandle);
-                cliTimeoutHandle = null;
-            }
+            clearWallClockTimeout(cliTimeoutHandle);
             killProcessTree(child);
         },
     };

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

@@ -1,24 +1,7 @@
 /**
  * Codex CLI runner for `codex exec --json` JSONL output.
  */
-export interface CodexRunCallbacks {
-    onText: (accumulated: string) => void;
-    onThinking?: (accumulated: string) => void;
-    onToolUse?: (toolName: string, toolInput?: Record<string, unknown>) => void;
-    onComplete: (result: {
-        success: boolean;
-        result: string;
-        accumulated: string;
-        cost: number;
-        durationMs: number;
-        model?: string;
-        numTurns: number;
-        toolStats: Record<string, number>;
-    }) => void;
-    onError: (error: string) => void;
-    onSessionId?: (sessionId: string) => void;
-    onSessionInvalid?: () => void;
-}
+import type { RunCallbacks, RunHandle } from '../adapters/tool-adapter.interface.js';
 export interface CodexRunOptions {
     skipPermissions?: boolean;
     permissionMode?: 'default' | 'acceptEdits' | 'plan';
@@ -27,9 +10,6 @@ export interface CodexRunOptions {
     hookPort?: number;
     proxy?: string;
 }
-export interface CodexRunHandle {
-    abort: () => void;
-}
 export declare function extractPromptImagePaths(prompt: string): string[];
 export declare function buildCodexArgs(prompt: string, sessionId: string | undefined, workDir: string, options?: CodexRunOptions): string[];
-export declare function runCodex(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: CodexRunCallbacks, options?: CodexRunOptions): CodexRunHandle;
+export declare function runCodex(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: CodexRunOptions): RunHandle;

package/dist/codex/cli-runner.js

@@ -6,8 +6,9 @@ import { existsSync, readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { createInterface } from 'node:readline';
 import { createLogger } from '../logger.js';
-import { processEnvForNonClaudeCliChild } from '../config/file-io.js';
 import { killProcessTree, trackChild } from '../shared/process-kill.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
+import { createStderrBuffer, appendStderr, reconstructStderr, createFinalizeGate, isFinalizeReady, clearWallClockTimeout, buildBaseSpawnOptions, } from '../shared/cli-runner-base.js';
 const log = createLogger('CodexCli');
 const windowsCodexLaunchCache = new Map();
 const SUPPORTED_IMAGE_EXTENSIONS = new Set([
@@ -163,22 +164,18 @@ function resolveWindowsCodexLaunch(cliPath, args) {
 }
 export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options) {
     const args = buildCodexArgs(prompt, sessionId, workDir, options);
-    const env = processEnvForNonClaudeCliChild();
+    const extraEnv = {};
     if (options?.chatId)
-        env.CC_IM_CHAT_ID = options.chatId;
+        extraEnv.CC_IM_CHAT_ID = options.chatId;
     if (options?.hookPort)
-        env.CC_IM_HOOK_PORT = String(options.hookPort);
+        extraEnv.CC_IM_HOOK_PORT = String(options.hookPort);
     if (options?.proxy) {
-        env.HTTPS_PROXY = options.proxy;
-        env.HTTP_PROXY = options.proxy;
-        env.https_proxy = options.proxy;
-        env.http_proxy = options.proxy;
-        env.ALL_PROXY = options.proxy;
-        env.all_proxy = options.proxy;
-    }
-    if (process.platform === 'win32') {
-        env.LANG = env.LANG || 'C.UTF-8';
-        env.LC_ALL = env.LC_ALL || 'C.UTF-8';
+        extraEnv.HTTPS_PROXY = options.proxy;
+        extraEnv.HTTP_PROXY = options.proxy;
+        extraEnv.https_proxy = options.proxy;
+        extraEnv.http_proxy = options.proxy;
+        extraEnv.ALL_PROXY = options.proxy;
+        extraEnv.all_proxy = options.proxy;
     }
     const argsForLog = args.join(' ');
     log.info(`Spawning Codex CLI: path=${cliPath}, cwd=${workDir}, session=${sessionId ?? 'new'}, args=${argsForLog}`);
@@ -200,14 +197,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
                 `chcp 65001>nul && ${formatWindowsCommandName(cliPath)} ${args.map(quoteForWindowsCmd).join(' ')}`,
             ]
             : args;
-    const child = spawn(spawnCmd, spawnArgs, {
-        cwd: workDir,
-        // Unix 上放入独立进程组，使 abort/关停能用 process.kill(-pid) 杀掉整棵子树（含 MCP/shell 孙进程）
-        detached: process.platform !== 'win32',
-        stdio: ['pipe', 'pipe', 'pipe'],
-        env,
-        windowsHide: process.platform === 'win32',
-    });
+    const child = spawn(spawnCmd, spawnArgs, buildBaseSpawnOptions(workDir, ['pipe', 'pipe', 'pipe'], extraEnv));
     trackChild(child);
     child.stdin?.write(prompt);
     child.stdin?.end();
@@ -217,27 +207,10 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     const toolStats = {};
     const startTime = Date.now();
     const rl = createInterface({ input: child.stdout });
-    const MAX_STDERR_HEAD = 4 * 1024;
-    const MAX_STDERR_TAIL = 6 * 1024;
-    let stderrHead = '';
-    let stderrTail = '';
-    let stderrTotal = 0;
-    let stderrHeadFull = false;
+    const stderrBuf = createStderrBuffer();
     child.stderr?.on('data', (chunk) => {
         const text = chunk.toString();
-        stderrTotal += text.length;
-        if (!stderrHeadFull) {
-            const room = MAX_STDERR_HEAD - stderrHead.length;
-            if (room > 0) {
-                stderrHead += text.slice(0, room);
-                if (stderrHead.length >= MAX_STDERR_HEAD)
-                    stderrHeadFull = true;
-            }
-        }
-        stderrTail += text;
-        if (stderrTail.length > MAX_STDERR_TAIL) {
-            stderrTail = stderrTail.slice(-MAX_STDERR_TAIL);
-        }
+        appendStderr(stderrBuf, text);
         log.debug(`[stderr] ${text.trimEnd()}`);
     });
     rl.on('line', (line) => {
@@ -329,38 +302,18 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
         }
     });
     let exitCode = null;
-    let rlClosed = false;
-    let childClosed = false;
+    const gate = createFinalizeGate();
     let cliTimeoutHandle = null;
     const finalize = () => {
-        if (cliTimeoutHandle) {
-            clearTimeout(cliTimeoutHandle);
-            cliTimeoutHandle = null;
-        }
-        if (!rlClosed || !childClosed)
+        clearWallClockTimeout(cliTimeoutHandle);
+        cliTimeoutHandle = null;
+        if (!isFinalizeReady(gate))
             return;
         if (completed)
             return;
         if (exitCode !== null && exitCode !== 0) {
-            let errMsg = '';
-            if (stderrTotal > 0) {
-                if (!stderrHeadFull) {
-                    errMsg = stderrHead;
-                }
-                else if (stderrTotal <= MAX_STDERR_HEAD + MAX_STDERR_TAIL) {
-                    errMsg = stderrHead + stderrTail.slice(stderrTail.length - (stderrTotal - MAX_STDERR_HEAD));
-                }
-                else {
-                    errMsg =
-                        stderrHead +
-                            `\n\n... (omitted ${stderrTotal - MAX_STDERR_HEAD - MAX_STDERR_TAIL} bytes) ...\n\n` +
-                            stderrTail;
-                }
-            }
-            if (sessionId &&
-                (errMsg.includes('No session found') ||
-                    errMsg.includes('No conversation found') ||
-                    errMsg.includes('Unable to find session'))) {
+            const errMsg = reconstructStderr(stderrBuf);
+            if (sessionId && isSessionInvalidMessage(errMsg)) {
                 callbacks.onSessionInvalid?.();
             }
             callbacks.onError(errMsg || `Codex CLI exited with code ${exitCode}`);
@@ -379,11 +332,11 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     child.on('close', (code) => {
         log.info(`Codex CLI closed: exitCode=${code}, pid=${child.pid}`);
         exitCode = code;
-        childClosed = true;
+        gate.childClosed = true;
         finalize();
     });
     rl.on('close', () => {
-        rlClosed = true;
+        gate.rlClosed = true;
         finalize();
     });
     child.on('error', (err) => {
@@ -393,7 +346,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
             completed = true;
             callbacks.onError(`Failed to start Codex CLI: ${err.message}`);
         }
-        childClosed = true;
+        gate.childClosed = true;
         finalize();
     });
     // 墙钟超时：防止 CLI 挂死（网络卡住、工具死循环等）永久占用用户队列槽
@@ -401,7 +354,6 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
     cliTimeoutHandle = setTimeout(() => {
         if (completed)
             return;
-        log.warn(`Codex CLI 超过 ${cliTimeoutMs}ms，强制终止 (pid=${child.pid})`);
         completed = true;
         rl.close();
         killProcessTree(child);
@@ -413,10 +365,7 @@ export function runCodex(cliPath, prompt, sessionId, workDir, callbacks, options
             if (completed)
                 return;
             completed = true;
-            if (cliTimeoutHandle) {
-                clearTimeout(cliTimeoutHandle);
-                cliTimeoutHandle = null;
-            }
+            clearWallClockTimeout(cliTimeoutHandle);
             rl.close();
             killProcessTree(child);
         },

package/dist/config-web-auth.d.ts

@@ -0,0 +1,13 @@
+import type { IncomingMessage } from "node:http";
+export interface LoginTokenInfo {
+    expiresAt: number;
+}
+export declare function getWebConfigHost(): string;
+/** 设为 true 时，非本机绑定的 Web 配置服务跳过登录 Cookie 校验（仅适用于受信网络；生产建议配合 HTTPS 反向代理） */
+export declare function allowRemoteApiWithoutAuth(): boolean;
+export declare function consumeLoginToken(loginToken: string): LoginTokenInfo | undefined;
+export declare function createLoginToken(ttlMs: number): string;
+export declare function createSession(request: IncomingMessage, ttlMs: number): string;
+export declare function isSessionValid(request: IncomingMessage): boolean;
+export declare function buildSessionCookie(sessionId: string, ttlMs: number): string;
+export declare function generateLoginUrl(host: string, port: number, loginTtlMs: number): string;