@wu529778790/open-im 1.11.8-beta.3 → 1.11.8-beta.30

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

@@ -21,6 +21,7 @@ interface ClaudeSessionMeta {
 export declare function findLatestClaudeSession(workDir: string): Promise<ClaudeSessionMeta | undefined>;
 export declare class ClaudeSDKAdapter implements ToolAdapter {
     readonly toolId = "claude-sdk";
+    readonly interactionMode = "native";
     /**
      * 清理所有活跃的查询
      */

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

@@ -205,6 +205,7 @@ function enrichClaudeErrorMessage(message, stderr) {
 }
 export class ClaudeSDKAdapter {
     toolId = 'claude-sdk';
+    interactionMode = 'native';
     /**
      * 清理所有活跃的查询
      */

package/dist/adapters/codebuddy-adapter.d.ts

@@ -2,6 +2,7 @@ import type { RunCallbacks, RunHandle, RunOptions, ToolAdapter } from './tool-ad
 export declare class CodeBuddyAdapter implements ToolAdapter {
     private cliPath;
     readonly toolId = "codebuddy";
+    readonly interactionMode = "open";
     constructor(cliPath: string);
     run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
 }

package/dist/adapters/codebuddy-adapter.js

@@ -1,7 +1,9 @@
 import { runCodeBuddy } from '../codebuddy/cli-runner.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
 export class CodeBuddyAdapter {
     cliPath;
     toolId = 'codebuddy';
+    interactionMode = 'open';
     constructor(cliPath) {
         this.cliPath = cliPath;
     }
@@ -10,25 +12,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.d.ts

@@ -5,6 +5,7 @@ import type { RunCallbacks, RunHandle, RunOptions, ToolAdapter } from "./tool-ad
 export declare class CodexAdapter implements ToolAdapter {
     private cliPath;
     readonly toolId = "codex";
+    readonly interactionMode = "open";
     constructor(cliPath: string);
     run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
 }

package/dist/adapters/codex-adapter.js

@@ -2,9 +2,11 @@
  * 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";
+    interactionMode = "open";
     constructor(cliPath) {
         this.cliPath = cliPath;
     }
@@ -21,24 +23,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.d.ts

@@ -1,5 +1,6 @@
 import type { RunCallbacks, RunHandle, RunOptions, ToolAdapter } from './tool-adapter.interface.js';
 export declare class OpenCodeAdapter implements ToolAdapter {
     readonly toolId = "opencode";
+    readonly interactionMode = "open";
     run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
 }

package/dist/adapters/opencode-adapter.js

@@ -1,29 +1,17 @@
 import { runOpenCodeSdk } from '../opencode/sdk-runner.js';
+import { isSessionInvalidMessage } from '../shared/session-invalid-detector.js';
 export class OpenCodeAdapter {
     toolId = 'opencode';
+    interactionMode = 'open';
     run(prompt, sessionId, workDir, callbacks, options) {
         const handle = runOpenCodeSdk(prompt, sessionId, workDir, {
             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/adapters/tool-adapter.interface.d.ts

@@ -40,7 +40,9 @@ export interface RunOptions {
 export interface RunHandle {
     abort: () => void;
 }
+export type InteractionMode = 'native' | 'open';
 export interface ToolAdapter {
     readonly toolId: string;
+    readonly interactionMode: InteractionMode;
     run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
 }

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) {
@@ -122,6 +125,17 @@ function startPolling() {
                     const extracted = extractTextContent(msg);
                     if (!extracted)
                         continue;
+                    // Skip echoed bot messages (iLink API echoes bot's own messages as USER type)
+                    // 1) Messages sent by this bot have client_id starting with "open-im:"
+                    if (msg.client_id?.startsWith('open-im:')) {
+                        log.debug(`Skipping echoed bot message: client_id=${msg.client_id}`);
+                        continue;
+                    }
+                    // 2) Bot lifecycle notifications and tool call notifications echoed back
+                    if (isBotNotificationEcho(extracted)) {
+                        log.debug(`Skipping bot notification echo: content="${extracted.substring(0, 80)}"`);
+                        continue;
+                    }
                     const chatId = msg.from_user_id ?? '';
                     const msgId = String(msg.message_id ?? msg.seq ?? '');
                     if (!chatId) {
@@ -178,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();
     }
 }
 /**
@@ -313,6 +293,23 @@ async function extractImages(msg) {
     }
     return paths;
 }
+/**
+ * Check if extracted text is a bot notification being echoed back by the iLink API.
+ * Bot notifications have distinctive emoji prefixes that are unlikely in real user messages.
+ */
+function isBotNotificationEcho(text) {
+    const firstLine = text.split('\n')[0]?.trim() ?? '';
+    // Lifecycle/AI info notifications
+    if (firstLine.startsWith('🤖 AI:'))
+        return true;
+    // Service status notifications
+    if (firstLine.startsWith('✅ ') || firstLine.startsWith('🔄 ') || firstLine.startsWith('ℹ️ '))
+        return true;
+    // Tool call notifications (sent by streamUpdate in event-handler)
+    if (firstLine.startsWith('⚙️ '))
+        return true;
+    return false;
+}
 /**
  * Extract text content from an iLink message's item_list.
  * Returns the first text item found, or a placeholder for media types.
@@ -334,7 +331,7 @@ function extractTextContent(msg) {
             case 3 /* MessageItemType.VOICE */: {
                 const transcript = item.voice_item?.text;
                 if (transcript)
-                    return `[语音转文字] ${transcript}`;
+                    return transcript;
                 return '[语音消息（无文字转录）]';
             }
             case 2 /* MessageItemType.IMAGE */:
@@ -413,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/clawbot/qr-login.d.ts

@@ -8,6 +8,7 @@ export interface QRLoginSession {
     sessionKey: string;
     qrcode: string;
     qrcodeUrl: string;
+    qrcodeImage?: string;
     startedAt: number;
 }
 export interface QRLoginResult {

package/dist/clawbot/qr-login.js

@@ -5,6 +5,7 @@
  * Returns bot_token on success.
  */
 import { randomUUID } from 'node:crypto';
+import QRCode from 'qrcode';
 import { createLogger } from '../logger.js';
 const log = createLogger('ClawBotQR');
 const ILINK_BASE_URL = 'https://ilinkai.weixin.qq.com';
@@ -64,10 +65,16 @@ export async function startQRLogin() {
     log.info('Starting ClawBot QR login...');
     const { qrcode, qrcodeUrl } = await fetchQRCode();
     log.info(`QR code received, url=${qrcodeUrl}`);
+    // iLink 返回的 qrcodeUrl 是一个 HTML 中转页（X-Frame-Options: SAMEORIGIN，
+    // Content-Type: text/html），前端无法用 <img> 或 iframe 直接展示。
+    // 把这个 URL 本身编码成二维码 PNG——用户扫码后微信打开中转页完成绑定。
+    const qrcodeImage = await QRCode.toDataURL(qrcodeUrl, { width: 280, margin: 1 });
+    log.info('QR code PNG generated (base64)');
     return {
         sessionKey: randomUUID(),
         qrcode,
         qrcodeUrl,
+        qrcodeImage,
         startedAt: Date.now(),
     };
 }

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;