@wu529778790/open-im 1.3.1-beta.0 → 1.3.1-beta.1

package/README.md

@@ -55,7 +55,6 @@ open-im start
 | `ALLOWED_USER_IDS` | 白名单（逗号分隔，空=所有人） |
 | `CLAUDE_WORK_DIR` | 工作目录，默认当前目录 |
 | `ALLOWED_BASE_DIRS` | 允许访问的目录（逗号分隔） |
-| `CURSOR_API_KEY` | Cursor Agent API Key（使用 cursor 时必填，或先运行 agent login） |
 
 ### Claude API 配置
 
@@ -161,5 +160,3 @@ EOF
 **飞书卡片报错**：未配置卡片回调，使用命令替代：`/mode ask`、`/mode yolo`
 
 **企业微信收不到通知**：需先发一条消息给机器人，才能接收启动通知
-
-**Cursor 报 Authentication required**：需先认证。方式 1：在终端运行 `agent login`；方式 2：在 `~/.open-im/config.json` 的 `env` 中添加 `"CURSOR_API_KEY": "你的 API Key"`

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

@@ -117,9 +117,18 @@ export class ClaudeSDKAdapter {
                             queryClosed = true;
                             const m = msg;
                             const success = m.subtype === 'success';
+                            const errs = m.errors ?? [];
+                            const noConvErr = errs.find((e) => e.includes('No conversation found with session ID'));
+                            if (!success && noConvErr) {
+                                log.warn(`SDK session invalid: ${noConvErr}`);
+                                callbacks.onSessionInvalid?.();
+                                callbacks.onError('会话已过期，请发送 /new 开始新会话');
+                                return;
+                            }
+                            const resultText = m.result ?? '';
                             const result = {
                                 success,
-                                result: m.result ?? '',
+                                result: resultText,
                                 accumulated: success ? accumulated : '',
                                 cost: m.total_cost_usd ?? 0,
                                 durationMs: m.duration_ms ?? 0,
@@ -128,6 +137,17 @@ export class ClaudeSDKAdapter {
                             };
                             if (!result.accumulated && result.result)
                                 result.accumulated = result.result;
+                            if (!result.accumulated && !result.result && accumulated) {
+                                log.debug(`Result event had no text but accumulated=${accumulated.length} chars, using accumulated`);
+                                result.accumulated = accumulated;
+                                result.result = accumulated;
+                            }
+                            if (!result.accumulated && !result.result) {
+                                const errMsg = errs[0] ?? '未知错误';
+                                log.warn(`SDK result empty: subtype=${m.subtype}, errors=${JSON.stringify(errs)}`);
+                                callbacks.onError(errMsg);
+                                return;
+                            }
                             callbacks.onComplete(result);
                             return;
                         }

package/dist/adapters/registry.js

@@ -1,6 +1,5 @@
 import { ClaudeAdapter } from './claude-adapter.js';
 import { ClaudeSDKAdapter } from './claude-sdk-adapter.js';
-import { CursorAdapter } from './cursor-adapter.js';
 const adapters = new Map();
 export function initAdapters(config) {
     adapters.clear();
@@ -17,10 +16,6 @@ export function initAdapters(config) {
             }));
         }
     }
-    else if (config.aiCommand === 'cursor') {
-        console.log('🖱️ 使用 Cursor Agent CLI 适配器');
-        adapters.set('cursor', new CursorAdapter(config.cursorCliPath));
-    }
 }
 export function getAdapter(aiCommand) {
     return adapters.get(aiCommand);

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

@@ -18,6 +18,8 @@ export interface RunCallbacks {
     onComplete: (result: ParsedResult) => void;
     onError: (error: string) => void;
     onSessionId?: (sessionId: string) => void;
+    /** SDK 报 "No conversation found" 时调用，用于清除无效 session */
+    onSessionInvalid?: () => void;
 }
 export interface RunOptions {
     skipPermissions?: boolean;

package/dist/commands/handler.d.ts

@@ -31,7 +31,7 @@ export declare class CommandHandler {
     private handleCd;
     private handleAllow;
     private handleDeny;
-    private getAiVersion;
+    private getClaudeVersion;
 }
 /**
  * 列出目录并返回目录信息

package/dist/commands/handler.js

@@ -107,7 +107,7 @@ export class CommandHandler {
         return true;
     }
     async handleStatus(chatId, userId) {
-        const version = await this.getAiVersion();
+        const version = await this.getClaudeVersion();
         const workDir = this.deps.sessionManager.getWorkDir(userId);
         const convId = this.deps.sessionManager.getConvId(userId);
         const sessionId = this.deps.sessionManager.getSessionIdForConv(userId, convId);
@@ -166,10 +166,9 @@ export class CommandHandler {
         }
         return true;
     }
-    getAiVersion() {
-        const cmd = this.deps.config.aiCommand === 'cursor' ? this.deps.config.cursorCliPath : this.deps.config.claudeCliPath;
+    getClaudeVersion() {
         return new Promise((resolve) => {
-            execFile(cmd, ['--version'], { timeout: 5000 }, (err, stdout) => {
+            execFile(this.deps.config.claudeCliPath, ['--version'], { timeout: 5000 }, (err, stdout) => {
                 resolve(err ? '未知' : (stdout?.toString().trim() || '未知'));
             });
         });

package/dist/config.d.ts

@@ -24,7 +24,6 @@ export interface Config {
     weworkAllowedUserIds: string[];
     aiCommand: AiCommand;
     claudeCliPath: string;
-    cursorCliPath: string;
     claudeWorkDir: string;
     allowedBaseDirs: string[];
     claudeSkipPermissions: boolean;

package/dist/config.js

@@ -183,18 +183,6 @@ export function loadConfig() {
     // 5. AI / 工作目录 / 安全配置
     const aiCommand = (process.env.AI_COMMAND ?? file.aiCommand ?? 'claude');
     const claudeCliPath = process.env.CLAUDE_CLI_PATH ?? file.claudeCliPath ?? 'claude';
-    let cursorCliPath = process.env.CURSOR_CLI_PATH ?? file.cursorCliPath ?? 'agent';
-    // Windows: spawn 无法解析 .cmd，需使用完整路径（Cursor 默认安装在 %LOCALAPPDATA%\cursor-agent\agent.cmd）
-    if (process.platform === 'win32' && cursorCliPath === 'agent') {
-        const winAgentPath = join(process.env.LOCALAPPDATA || '', 'cursor-agent', 'agent.cmd');
-        try {
-            accessSync(winAgentPath, constants.F_OK);
-            cursorCliPath = winAgentPath;
-        }
-        catch {
-            /* 使用默认 agent，由后续 where 校验 */
-        }
-    }
     const claudeWorkDir = process.env.CLAUDE_WORK_DIR ?? file.claudeWorkDir ?? process.cwd();
     const allowedBaseDirs = process.env.ALLOWED_BASE_DIRS !== undefined
         ? parseCommaSeparated(process.env.ALLOWED_BASE_DIRS)
@@ -247,46 +235,7 @@ export function loadConfig() {
             throw new Error(errorMsg);
         }
     }
-    // 7. 校验 Cursor CLI（使用 cursor 时）
-    if (aiCommand === 'cursor') {
-        if (isAbsolute(cursorCliPath) || cursorCliPath.includes('/') || cursorCliPath.includes('\\')) {
-            try {
-                accessSync(cursorCliPath, constants.F_OK);
-            }
-            catch {
-                throw new Error(`Cursor CLI 不可执行: ${cursorCliPath}`);
-            }
-        }
-        else {
-            const checkCommand = process.platform === 'win32' ? 'where' : 'which';
-            try {
-                execFileSync(checkCommand, [cursorCliPath], { stdio: 'pipe' });
-            }
-            catch {
-                const installGuide = [
-                    '',
-                    '━━━ Cursor CLI 未安装 ━━━',
-                    '',
-                    '使用 Cursor 需要先安装 Cursor Agent CLI。',
-                    '',
-                    '安装方法：',
-                    '',
-                    '  macOS/Linux: curl https://cursor.com/install -fsSL | bash',
-                    '  Windows: irm \'https://cursor.com/install?win32=true\' | iex',
-                    '',
-                    '安装后运行 agent --version 验证。',
-                    '',
-                ].join('\n');
-                throw new Error(installGuide);
-            }
-        }
-        // 提示 Cursor 认证：需 agent login 或 CURSOR_API_KEY
-        if (!process.env.CURSOR_API_KEY) {
-            console.warn('\n⚠ Cursor 模式：未检测到 CURSOR_API_KEY。首次使用请先运行 agent login，\n' +
-                '  或在 ~/.open-im/config.json 的 env 中添加 "CURSOR_API_KEY": "你的 API Key"。\n');
-        }
-    }
-    // 8. 校验 Claude CLI（SDK 模式不需要 CLI）
+    // 7. 校验 Claude CLI（SDK 模式不需要 CLI）
     if (aiCommand === 'claude' && !useSdkMode) {
         if (isAbsolute(claudeCliPath) || claudeCliPath.includes('/') || claudeCliPath.includes('\\')) {
             try {
@@ -403,7 +352,6 @@ export function loadConfig() {
         weworkAllowedUserIds,
         aiCommand,
         claudeCliPath,
-        cursorCliPath,
         claudeWorkDir,
         allowedBaseDirs,
         claudeSkipPermissions,

package/dist/session/session-manager.d.ts

@@ -7,6 +7,8 @@ export declare class SessionManager {
     constructor(defaultWorkDir: string, allowedBaseDirs: string[]);
     getSessionIdForConv(userId: string, convId: string): string | undefined;
     setSessionIdForConv(userId: string, convId: string, sessionId: string): void;
+    /** 清除指定会话的 sessionId（用于 SDK 报 "No conversation found" 时） */
+    clearSessionForConv(userId: string, convId: string): void;
     getSessionIdForThread(_userId: string, _threadId: string): string | undefined;
     setSessionIdForThread(userId: string, threadId: string, sessionId: string): void;
     getWorkDir(userId: string): string;

package/dist/session/session-manager.js

@@ -33,6 +33,16 @@ export class SessionManager {
             this.convSessionMap.set(`${userId}:${convId}`, sessionId);
         }
     }
+    /** 清除指定会话的 sessionId（用于 SDK 报 "No conversation found" 时） */
+    clearSessionForConv(userId, convId) {
+        const s = this.sessions.get(userId);
+        if (s?.activeConvId === convId) {
+            s.sessionId = undefined;
+            this.save();
+        }
+        this.convSessionMap.delete(`${userId}:${convId}`);
+        log.info(`Cleared session for user ${userId}, convId=${convId}`);
+    }
     getSessionIdForThread(_userId, _threadId) {
         return undefined;
     }

package/dist/shared/ai-task.js

@@ -103,6 +103,10 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                 else if (ctx.convId)
                     sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, id);
             },
+            onSessionInvalid: () => {
+                if (ctx.convId)
+                    sessionManager.clearSessionForConv(ctx.userId, ctx.convId);
+            },
             onThinking: (t) => {
                 if (!firstContentLogged) {
                     firstContentLogged = true;
@@ -147,9 +151,19 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     pendingUpdate = null;
                 }
                 const note = buildCompletionNote(result, sessionManager, ctx, mode);
-                const finalContent = result.accumulated || result.result || '(无输出)';
+                // 优先用 adapter 返回的 accumulated/result；若为空则用流式期间累积的 latestContent（SDK 有时 result 事件不携带文本）
+                const output = result.accumulated ||
+                    result.result ||
+                    taskState.latestContent ||
+                    '(无输出)';
+                if (!result.accumulated && !result.result && taskState.latestContent) {
+                    log.warn(`Empty AI output from adapter but had streamed content (${taskState.latestContent.length} chars), using latestContent. platform=${ctx.platform}, taskKey=${ctx.taskKey}`);
+                }
+                else if (!output || output === '(无输出)') {
+                    log.warn(`Empty AI output for user ${ctx.userId}, platform=${ctx.platform}, taskKey=${ctx.taskKey}`);
+                }
                 try {
-                    await platformAdapter.sendComplete(finalContent, note, thinkingText || undefined);
+                    await platformAdapter.sendComplete(output, note, thinkingText || undefined);
                 }
                 catch (err) {
                     log.error('Failed to send complete:', err);

package/package.json

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

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

@@ -1,11 +0,0 @@
-/**
- * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
- * 需要预先安装: curl https://cursor.com/install -fsSL | bash
- */
-import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';
-export declare class CursorAdapter implements ToolAdapter {
-    private cliPath;
-    readonly toolId = "cursor";
-    constructor(cliPath: string);
-    run(prompt: string, sessionId: string | undefined, workDir: string, callbacks: RunCallbacks, options?: RunOptions): RunHandle;
-}

package/dist/adapters/cursor-adapter.js

@@ -1,50 +0,0 @@
-/**
- * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
- * 需要预先安装: curl https://cursor.com/install -fsSL | bash
- */
-import { runCursor } from '../cursor/cli-runner.js';
-import { createLogger } from '../logger.js';
-const log = createLogger('CursorAdapter');
-export class CursorAdapter {
-    cliPath;
-    toolId = 'cursor';
-    constructor(cliPath) {
-        this.cliPath = cliPath;
-    }
-    run(prompt, sessionId, workDir, callbacks, options) {
-        const opts = {
-            skipPermissions: options?.skipPermissions,
-            permissionMode: options?.permissionMode,
-            timeoutMs: options?.timeoutMs,
-            model: options?.model,
-            chatId: options?.chatId,
-            hookPort: options?.hookPort,
-        };
-        return runCursor(this.cliPath, 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);
-            },
-            onError: (err) => {
-                const msg = typeof err === 'string' ? err : String(err);
-                const friendly = msg.includes('Authentication required') || msg.includes('agent login')
-                    ? 'Cursor 需要先登录。请在终端运行 agent login，或在 ~/.open-im/config.json 的 env 中添加 "CURSOR_API_KEY"。'
-                    : msg;
-                callbacks.onError(friendly);
-            },
-            onSessionId: callbacks.onSessionId,
-        }, opts);
-    }
-}

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

@@ -1,33 +0,0 @@
-/**
- * Cursor CLI Runner - 解析 Cursor Agent 的 stream-json 输出
- * 参考: https://cursor.com/docs/cli/reference/output-format
- */
-export interface CursorRunCallbacks {
-    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;
-}
-export interface CursorRunOptions {
-    skipPermissions?: boolean;
-    permissionMode?: 'default' | 'acceptEdits' | 'plan';
-    timeoutMs?: number;
-    model?: string;
-    chatId?: string;
-    hookPort?: number;
-}
-export interface CursorRunHandle {
-    abort: () => void;
-}
-export declare function runCursor(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: CursorRunCallbacks, options?: CursorRunOptions): CursorRunHandle;

package/dist/cursor/cli-runner.js

@@ -1,265 +0,0 @@
-/**
- * Cursor CLI Runner - 解析 Cursor Agent 的 stream-json 输出
- * 参考: https://cursor.com/docs/cli/reference/output-format
- */
-import { spawn } from 'node:child_process';
-import { createInterface } from 'node:readline';
-import { createLogger } from '../logger.js';
-const log = createLogger('CursorCli');
-/** 从 Cursor tool_call 事件提取工具名和参数 */
-function extractToolFromCursorEvent(event) {
-    const toolCall = event.tool_call;
-    if (!toolCall || typeof toolCall !== 'object')
-        return null;
-    const keys = Object.keys(toolCall).filter((k) => k !== 'result');
-    if (keys.length === 0)
-        return null;
-    const key = keys[0];
-    const val = toolCall[key];
-    if (!val)
-        return null;
-    let name = key;
-    if (key === 'readToolCall')
-        name = 'Read';
-    else if (key === 'writeToolCall')
-        name = 'Write';
-    else if (key === 'editToolCall')
-        name = 'Edit';
-    else if (key === 'bashToolCall')
-        name = 'Bash';
-    else if (key === 'grepToolCall')
-        name = 'Grep';
-    else if (key === 'globToolCall')
-        name = 'Glob';
-    else if (key === 'webSearchToolCall')
-        name = 'WebSearch';
-    else if (key === 'webFetchToolCall')
-        name = 'WebFetch';
-    else if (key === 'function') {
-        const fn = val;
-        name = fn.name ?? 'unknown';
-        try {
-            const input = fn.arguments ? JSON.parse(fn.arguments) : undefined;
-            return { name, input };
-        }
-        catch {
-            return { name };
-        }
-    }
-    const args = val.args;
-    return { name, input: args };
-}
-export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, options) {
-    const args = ['-p', '--output-format', 'stream-json', '--stream-partial-output'];
-    if (options?.skipPermissions) {
-        args.push('--force');
-    }
-    else if (options?.permissionMode === 'plan') {
-        args.push('--plan');
-    }
-    else if (options?.permissionMode === 'acceptEdits') {
-        args.push('--trust');
-    }
-    if (options?.model)
-        args.push('--model', options.model);
-    if (sessionId)
-        args.push('--resume', sessionId);
-    args.push('--workspace', workDir);
-    args.push('--', prompt);
-    const env = {};
-    for (const [k, v] of Object.entries(process.env)) {
-        if (v !== undefined)
-            env[k] = v;
-    }
-    if (options?.chatId)
-        env.CC_IM_CHAT_ID = options.chatId;
-    if (options?.hookPort)
-        env.CC_IM_HOOK_PORT = String(options.hookPort);
-    log.info(`Spawning Cursor CLI: path=${cliPath}, cwd=${workDir}, session=${sessionId ?? 'new'}`);
-    // Windows: .cmd 需通过 cmd.exe 执行，否则 spawn 报 ENOENT
-    const isCmd = process.platform === 'win32' && /\.cmd$/i.test(cliPath);
-    const spawnCmd = isCmd ? 'cmd.exe' : cliPath;
-    const spawnArgs = isCmd ? ['/c', cliPath, ...args] : args;
-    const child = spawn(spawnCmd, spawnArgs, {
-        cwd: workDir,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        env,
-        windowsHide: process.platform === 'win32',
-    });
-    let accumulated = '';
-    let completed = false;
-    let model = '';
-    const toolStats = {};
-    const MAX_TIMEOUT = 2_147_483_647;
-    const timeoutMs = options?.timeoutMs && options.timeoutMs > 0
-        ? Math.min(options.timeoutMs, MAX_TIMEOUT)
-        : 0;
-    let timeoutHandle = null;
-    if (timeoutMs > 0) {
-        timeoutHandle = setTimeout(() => {
-            if (!completed && !child.killed) {
-                completed = true;
-                log.warn(`Cursor CLI timeout after ${timeoutMs}ms, killing pid=${child.pid}`);
-                child.kill('SIGTERM');
-                callbacks.onError(`执行超时（${timeoutMs}ms），已终止进程`);
-            }
-        }, timeoutMs);
-    }
-    const MAX_STDERR_HEAD = 4 * 1024;
-    const MAX_STDERR_TAIL = 6 * 1024;
-    let stderrHead = '';
-    let stderrTail = '';
-    let stderrTotal = 0;
-    let stderrHeadFull = false;
-    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);
-        }
-    });
-    const rl = createInterface({ input: child.stdout });
-    rl.on('line', (line) => {
-        const trimmed = line.trim();
-        if (!trimmed)
-            return;
-        let event;
-        try {
-            event = JSON.parse(trimmed);
-        }
-        catch {
-            return;
-        }
-        const type = event.type;
-        if (type === 'system' && event.subtype === 'init') {
-            model = event.model ?? '';
-            const sid = event.session_id;
-            if (sid)
-                callbacks.onSessionId?.(sid);
-            return;
-        }
-        if (type === 'assistant') {
-            const msg = event.message;
-            const content = msg?.content;
-            if (Array.isArray(content)) {
-                for (const block of content) {
-                    if (block?.type === 'text' && block.text) {
-                        accumulated += block.text;
-                        callbacks.onText(accumulated);
-                    }
-                }
-            }
-            return;
-        }
-        if (type === 'tool_call') {
-            const subtype = event.subtype;
-            if (subtype === 'started') {
-                const tool = extractToolFromCursorEvent(event);
-                if (tool) {
-                    toolStats[tool.name] = (toolStats[tool.name] || 0) + 1;
-                    callbacks.onToolUse?.(tool.name, tool.input);
-                }
-            }
-            return;
-        }
-        if (type === 'result' && event.subtype === 'success') {
-            completed = true;
-            if (timeoutHandle)
-                clearTimeout(timeoutHandle);
-            const result = event.result ?? '';
-            if (!accumulated && result)
-                accumulated = result;
-            callbacks.onComplete({
-                success: true,
-                result,
-                accumulated,
-                cost: 0,
-                durationMs: event.duration_ms ?? 0,
-                model,
-                numTurns: 0,
-                toolStats,
-            });
-        }
-    });
-    let exitCode = null;
-    let rlClosed = false;
-    let childClosed = false;
-    const finalize = () => {
-        if (!rlClosed || !childClosed)
-            return;
-        if (timeoutHandle)
-            clearTimeout(timeoutHandle);
-        if (!completed) {
-            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... (省略 ${stderrTotal - MAX_STDERR_HEAD - MAX_STDERR_TAIL} 字节) ...\n\n` +
-                                stderrTail;
-                    }
-                }
-                callbacks.onError(errMsg || `Cursor CLI exited with code ${exitCode}`);
-            }
-            else {
-                callbacks.onComplete({
-                    success: true,
-                    result: accumulated,
-                    accumulated,
-                    cost: 0,
-                    durationMs: 0,
-                    model,
-                    numTurns: 0,
-                    toolStats,
-                });
-            }
-        }
-    };
-    child.on('close', (code) => {
-        log.info(`Cursor CLI closed: exitCode=${code}, pid=${child.pid}`);
-        exitCode = code;
-        childClosed = true;
-        finalize();
-    });
-    rl.on('close', () => {
-        rlClosed = true;
-        finalize();
-    });
-    child.on('error', (err) => {
-        const errorCode = err.code;
-        log.error(`Cursor CLI spawn error: ${err.message}, code=${errorCode}, path=${cliPath}`);
-        if (timeoutHandle)
-            clearTimeout(timeoutHandle);
-        if (!completed) {
-            completed = true;
-            callbacks.onError(`Failed to start Cursor CLI: ${err.message}`);
-        }
-        childClosed = true;
-        finalize();
-    });
-    return {
-        abort: () => {
-            if (timeoutHandle)
-                clearTimeout(timeoutHandle);
-            rl.close();
-            if (!child.killed)
-                child.kill('SIGTERM');
-        },
-    };
-}