@wu529778790/open-im 1.6.6 → 1.6.7

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

@@ -1,5 +1,5 @@
 /**
- * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
+ * Cursor Adapter - 通过 Cursor CLI 执行任务
  * 需要预先安装: curl https://cursor.com/install -fsSL | bash
  */
 import type { ToolAdapter, RunCallbacks, RunOptions, RunHandle } from './tool-adapter.interface.js';

package/dist/adapters/cursor-adapter.js

@@ -1,5 +1,5 @@
 /**
- * Cursor Adapter - 通过 Cursor Agent CLI 执行任务
+ * Cursor Adapter - 通过 Cursor CLI 执行任务
  * 需要预先安装: curl https://cursor.com/install -fsSL | bash
  */
 import { runCursor } from '../cursor/cli-runner.js';
@@ -19,11 +19,13 @@ export class CursorAdapter {
             model: options?.model,
             chatId: options?.chatId,
             hookPort: options?.hookPort,
+            proxy: options?.proxy,
         };
         return runCursor(this.cliPath, prompt, sessionId, workDir, {
             onText: callbacks.onText,
             onThinking: callbacks.onThinking,
             onToolUse: callbacks.onToolUse,
+            onSessionInvalid: callbacks.onSessionInvalid,
             onComplete: (raw) => {
                 const result = {
                     success: raw.success,
@@ -39,9 +41,17 @@ export class CursorAdapter {
             },
             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;
+                const friendly = msg.includes('Electron') || msg.includes('Chromium') || msg.includes('not in the list of known options')
+                    ? '当前使用的是 Cursor IDE 的 cursor.cmd，不支持 CLI 模式。请安装独立的 Cursor Agent CLI：在 PowerShell 运行 irm \'https://cursor.com/install?win32=true\' | iex，安装后把 tools.cursor.cliPath 改为 agent。'
+                    : msg.includes('Authentication required') || msg.includes('agent login') || msg.includes('cursor agent login')
+                        ? 'Cursor 需要先登录。请在终端运行 agent login，或在 ~/.open-im/config.json 的 env 中添加 "CURSOR_API_KEY"。'
+                        : msg.includes('No session found') || msg.includes('No conversation found') || msg.includes('Unable to find session') || msg.includes('session not found') || msg.includes('invalid session')
+                            ? 'Cursor 会话已失效，旧 session 已清理。请直接重试当前请求。'
+                            : msg.includes('stream disconnected') || msg.includes('error sending request') || msg.includes('Connection refused') || msg.includes('ENOTFOUND') || msg.includes('ETIMEDOUT')
+                                ? 'Cursor 网络请求失败。如无法访问 Cursor API，可在 tools.cursor.proxy 或 CURSOR_PROXY 中配置代理。'
+                                : msg.includes('usage limit') || msg.includes('You\'ve hit your usage limit')
+                                    ? 'Cursor 模型用量已超限（如 Opus）。请在 config.json 的 tools.cursor.model 中改为 claude-4-sonnet 或其他非 Opus 模型，或运行 agent --list-models 查看可用模型。'
+                                    : msg;
                 callbacks.onError(friendly);
             },
             onSessionId: callbacks.onSessionId,

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

@@ -96,6 +96,8 @@ export declare const PAGE_TEXTS: {
         readonly claudeModel: "ANTHROPIC_MODEL";
         readonly claudeProxy: "Proxy (optional)";
         readonly codexTimeout: "Codex timeout (ms)";
+        readonly cursorTimeout: "Cursor timeout (ms)";
+        readonly cursorModel: "Model (e.g. auto)";
         readonly codebuddyTimeout: "CodeBuddy timeout (ms)";
         readonly cursorProxy: "Proxy (optional)";
         readonly hookPort: "Hook port";
@@ -215,6 +217,8 @@ export declare const PAGE_TEXTS: {
         readonly claudeModel: "ANTHROPIC_MODEL";
         readonly claudeProxy: "代理（可选）";
         readonly codexTimeout: "Codex 超时（毫秒）";
+        readonly cursorTimeout: "Cursor 超时（毫秒）";
+        readonly cursorModel: "模型（如 auto）";
         readonly codebuddyTimeout: "CodeBuddy 超时（毫秒）";
         readonly cursorProxy: "代理（可选）";
         readonly hookPort: "Hook 端口";

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

@@ -96,6 +96,8 @@ export const PAGE_TEXTS = {
         claudeModel: "ANTHROPIC_MODEL",
         claudeProxy: "Proxy (optional)",
         codexTimeout: "Codex timeout (ms)",
+        cursorTimeout: "Cursor timeout (ms)",
+        cursorModel: "Model (e.g. auto)",
         codebuddyTimeout: "CodeBuddy timeout (ms)",
         cursorProxy: "Proxy (optional)",
         hookPort: "Hook port",
@@ -215,6 +217,8 @@ export const PAGE_TEXTS = {
         claudeModel: "ANTHROPIC_MODEL",
         claudeProxy: "\u4ee3\u7406\uff08\u53ef\u9009\uff09",
         codexTimeout: "Codex \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
+        cursorTimeout: "Cursor \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
+        cursorModel: "模型（如 auto）",
         codebuddyTimeout: "CodeBuddy \u8d85\u65f6\uff08\u6beb\u79d2\uff09",
         cursorProxy: "\u4ee3\u7406\uff08\u53ef\u9009\uff09",
         hookPort: "Hook \u7aef\u53e3",

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

@@ -210,6 +210,8 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
           { id: "ai-codexTimeoutMs-label", key: "codexTimeout" },
           { id: "ai-codexProxy-label", key: "codexProxy" },
           { id: "ai-cursorCliPath-label", key: "cursorCli" },
+          { id: "ai-cursorModel-label", key: "cursorModel" },
+          { id: "ai-cursorTimeoutMs-label", key: "cursorTimeout" },
           { id: "ai-cursorProxy-label", key: "cursorProxy" },
           { id: "ai-codebuddyCliPath-label", key: "codebuddyCli" },
           { id: "ai-codebuddyTimeoutMs-label", key: "codebuddyTimeout" },
@@ -423,6 +425,8 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
         { id: "ai-codexTimeoutMs", key: "codexTimeoutMs" },
         { id: "ai-codexProxy", key: "codexProxy" },
         { id: "ai-cursorCliPath", key: "cursorCliPath" },
+        { id: "ai-cursorModel", key: "cursorModel" },
+        { id: "ai-cursorTimeoutMs", key: "cursorTimeoutMs" },
         { id: "ai-cursorProxy", key: "cursorProxy" },
         { id: "ai-codebuddyCliPath", key: "codebuddyCliPath" },
         { id: "ai-codebuddyTimeoutMs", key: "codebuddyTimeoutMs" },
@@ -669,6 +673,8 @@ export const PAGE_SCRIPT = String.raw `      const platformDefinitions = [
           codexCliPath: getValue("ai-codexCliPath"),
           codexProxy: getValue("ai-codexProxy"),
           cursorCliPath: getValue("ai-cursorCliPath"),
+          cursorModel: getValue("ai-cursorModel"),
+          cursorTimeoutMs: getNumber("ai-cursorTimeoutMs"),
           cursorProxy: getValue("ai-cursorProxy"),
           codebuddyCliPath: getValue("ai-codebuddyCliPath"),
           hookPort: getNumber("ai-hookPort"),

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

@@ -1175,6 +1175,15 @@ export const PAGE_HTML_PREFIX = String.raw `<!doctype html>
                       <label class="form-label" id="ai-cursorCliPath-label">CLI Path</label>
                       <input id="ai-cursorCliPath" class="form-input mono" type="text" />
                     </div>
+                    <div class="form-group">
+                      <label class="form-label" id="ai-cursorModel-label">Model</label>
+                      <input id="ai-cursorModel" class="form-input mono" type="text" placeholder="auto" />
+                      <div class="form-hint" id="ai-cursorModel-hint">如 auto、Claude 4 Sonnet 等，agent --list-models 查看</div>
+                    </div>
+                    <div class="form-group">
+                      <label class="form-label" id="ai-cursorTimeoutMs-label">Timeout (ms)</label>
+                      <input id="ai-cursorTimeoutMs" class="form-input" type="number" min="1" />
+                    </div>
                     <div class="form-group">
                       <label class="form-label" id="ai-cursorProxy-label">Proxy (optional)</label>
                       <input id="ai-cursorProxy" class="form-input mono" type="text" />

package/dist/config-web.js

@@ -143,8 +143,10 @@ function buildInitialPayload(file) {
             claudeModel: file.tools?.claude?.model ?? claudeEnv.ANTHROPIC_MODEL ?? "",
             claudeProxy: file.tools?.claude?.proxy ?? "",
             codexTimeoutMs: file.tools?.codex?.timeoutMs ?? 600000,
+            cursorTimeoutMs: file.tools?.cursor?.timeoutMs ?? 600000,
             codebuddyTimeoutMs: file.tools?.codebuddy?.timeoutMs ?? 600000,
-            cursorCliPath: file.tools?.cursor?.cliPath ?? "agent",
+            cursorCliPath: file.tools?.cursor?.cliPath ?? "cursor",
+            cursorModel: file.tools?.cursor?.model ?? "auto",
             codexCliPath: file.tools?.codex?.cliPath ?? "codex",
             codebuddyCliPath: file.tools?.codebuddy?.cliPath ?? "codebuddy",
             codexProxy: file.tools?.codex?.proxy ?? "",
@@ -186,6 +188,8 @@ function validatePayload(payload) {
         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.cursorTimeoutMs) || payload.ai.cursorTimeoutMs <= 0)
+        errors.push("Cursor timeout must be positive.");
     if (!Number.isFinite(payload.ai.codebuddyTimeoutMs) || payload.ai.codebuddyTimeoutMs <= 0)
         errors.push("CodeBuddy timeout must be positive.");
     if (!Number.isFinite(payload.ai.hookPort) || payload.ai.hookPort <= 0)
@@ -267,13 +271,14 @@ function createProbeConfig(values) {
         dingtalkAllowedUserIds: [],
         aiCommand: "claude",
         claudeCliPath: "claude",
-        cursorCliPath: "agent",
+        cursorCliPath: "cursor",
         codexCliPath: "codex",
         claudeWorkDir: process.cwd(),
         claudeSkipPermissions: true,
         defaultPermissionMode: "ask",
         claudeTimeoutMs: 600000,
         codexTimeoutMs: 600000,
+        cursorTimeoutMs: 600000,
         codebuddyTimeoutMs: 600000,
         hookPort: 35801,
         logDir: "",
@@ -419,9 +424,11 @@ function toFileConfig(payload, existing) {
             },
             cursor: {
                 ...existing.tools?.cursor,
-                cliPath: clean(payload.ai.cursorCliPath) ?? "agent",
+                cliPath: clean(payload.ai.cursorCliPath) ?? "cursor",
                 skipPermissions: existing.tools?.cursor?.skipPermissions ?? payload.ai.claudeSkipPermissions,
                 proxy: clean(payload.ai.cursorProxy),
+                timeoutMs: payload.ai.cursorTimeoutMs,
+                model: clean(payload.ai.cursorModel),
             },
             codex: {
                 ...existing.tools?.codex,

package/dist/config-web.test.js

@@ -55,3 +55,33 @@ describe("getHealthPlatformSnapshot", () => {
         expect(snapshot.qq.message).toContain("configured");
     });
 });
+describe("Cursor web config defaults", () => {
+    it("surfaces cursor as the default CLI path in initial config", async () => {
+        vi.resetModules();
+        const { startWebConfigServer } = await import("./config-web.js");
+        const server = await startWebConfigServer({ mode: "init", cwd: process.cwd(), persistent: true });
+        if (!server.url) {
+            await server.close();
+            throw new Error("Web config server failed to bind (url empty)");
+        }
+        // 使用原生 fetch（可能被 testPlatformConfig 的 vi.fn 覆盖），改用 http.get
+        const { get } = await import("node:http");
+        const body = await new Promise((resolve, reject) => {
+            get(`${server.url}/api/config`, (res) => {
+                let data = "";
+                res.on("data", (chunk) => { data += chunk; });
+                res.on("end", () => {
+                    try {
+                        resolve(JSON.parse(data));
+                    }
+                    catch (e) {
+                        reject(e);
+                    }
+                });
+            }).on("error", reject);
+        });
+        await server.close();
+        // 无显式配置时为 cursor；Windows 下可能解析为安装路径
+        expect(body?.payload?.ai?.cursorCliPath === "cursor" || body?.payload?.ai?.cursorCliPath?.endsWith("cursor.cmd")).toBe(true);
+    });
+});

package/dist/config.d.ts

@@ -36,13 +36,18 @@ export interface Config {
     codebuddyCliPath: string;
     /** Codex 访问 chatgpt.com 的代理（如 http://127.0.0.1:7890） */
     codexProxy?: string;
-    claudeWorkDir: string;
-    claudeSkipPermissions: boolean;
-    defaultPermissionMode: 'ask' | 'accept-edits' | 'plan' | 'yolo';
+    /** Cursor 访问 API 的代理（如 http://127.0.0.1:7890，CLI 非官方支持） */
+    cursorProxy?: string;
     claudeTimeoutMs: number;
     codexTimeoutMs: number;
+    cursorTimeoutMs: number;
     codebuddyTimeoutMs: number;
+    claudeWorkDir: string;
+    claudeSkipPermissions: boolean;
+    defaultPermissionMode: 'ask' | 'accept-edits' | 'plan' | 'yolo';
     claudeModel?: string;
+    /** Cursor 专用模型，如 auto（自动选择）、Claude 4 Sonnet 等 */
+    cursorModel?: string;
     hookPort: number;
     logDir: string;
     logLevel: LogLevel;
@@ -151,7 +156,11 @@ export interface FileToolCursor {
     cliPath?: string;
     /** 是否跳过权限确认（默认 true，与 tools.claude 共用权限服务器） */
     skipPermissions?: boolean;
+    /** HTTP/HTTPS 代理（CLI 非官方支持，部分环境可能生效） */
     proxy?: string;
+    timeoutMs?: number;
+    /** 模型名，如 auto、Claude 4 Sonnet、gpt-5.2 等，见 agent --list-models */
+    model?: string;
 }
 export interface FileToolCodex {
     cliPath?: string;

package/dist/config.js

@@ -6,7 +6,7 @@ catch {
 }
 import { readFileSync, writeFileSync, accessSync, constants, existsSync, mkdirSync } from 'node:fs';
 import { execFileSync } from 'node:child_process';
-import { join, dirname, isAbsolute } from 'node:path';
+import { join, dirname, isAbsolute, basename } from 'node:path';
 import { homedir } from 'node:os';
 import { APP_HOME } from './constants.js';
 const AI_COMMANDS = ['claude', 'codex', 'cursor', 'codebuddy'];
@@ -60,8 +60,11 @@ function migrateToNewConfigFormat(raw) {
         },
         cursor: {
             ...tcur,
-            cliPath: tcur.cliPath ?? raw.cursorCliPath ?? 'agent',
+            cliPath: tcur.cliPath ?? raw.cursorCliPath ?? 'cursor',
             skipPermissions: tcur.skipPermissions ?? raw.claudeSkipPermissions ?? true,
+            proxy: tcur.proxy,
+            timeoutMs: tcur.timeoutMs ?? raw.claudeTimeoutMs ?? 600000,
+            model: tcur.model ?? raw.cursorModel ?? 'auto',
         },
         codex: {
             ...tcod,
@@ -380,6 +383,7 @@ export function loadConfig() {
     const tcb = file.tools?.codebuddy ?? {};
     const claudeCliPath = process.env.CLAUDE_CLI_PATH ?? tc.cliPath ?? 'claude';
     const codexProxy = process.env.CODEX_PROXY ?? tcod.proxy;
+    const cursorProxy = process.env.CURSOR_PROXY ?? tcur.proxy;
     let codexCliPath = process.env.CODEX_CLI_PATH ?? tcod.cliPath ?? 'codex';
     if (process.platform === 'win32' && codexCliPath === 'codex') {
         const npmPaths = [
@@ -397,15 +401,68 @@ export function loadConfig() {
             }
         }
     }
-    let cursorCliPath = process.env.CURSOR_CLI_PATH ?? tcur.cliPath ?? 'agent';
-    if (process.platform === 'win32' && cursorCliPath === 'agent') {
-        const winAgentPath = join(process.env.LOCALAPPDATA || '', 'cursor-agent', 'agent.cmd');
-        try {
-            accessSync(winAgentPath, constants.F_OK);
-            cursorCliPath = winAgentPath;
+    let cursorCliPath = process.env.CURSOR_CLI_PATH ?? tcur.cliPath ?? 'cursor';
+    const agentPaths = [
+        join(process.env.APPDATA || '', 'npm', 'agent.cmd'),
+        join(process.env.LOCALAPPDATA || '', 'npm', 'agent.cmd'),
+        join(process.env.LOCALAPPDATA || '', 'cursor-agent', 'agent.cmd'),
+        join(process.env.LOCALAPPDATA || '', 'Programs', 'cursor-agent', 'agent.cmd'),
+        join(process.env.USERPROFILE || '', '.cursor', 'bin', 'agent.cmd'),
+    ];
+    if (process.platform === 'win32') {
+        // agent 需解析为完整路径，否则 spawn 报 ENOENT（Node 子进程 PATH 可能不包含 npm）
+        if (cursorCliPath === 'agent' || basename(cursorCliPath).toLowerCase() === 'agent') {
+            for (const p of agentPaths) {
+                try {
+                    accessSync(p, constants.F_OK);
+                    cursorCliPath = p;
+                    break;
+                }
+                catch {
+                    /* 尝试下一个路径 */
+                }
+            }
+            // 若已知路径均未找到，尝试 where agent 解析（用户 PATH 中的 agent）
+            if (cursorCliPath === 'agent') {
+                try {
+                    const out = execFileSync('where', ['agent'], { encoding: 'utf-8', windowsHide: true });
+                    const first = out.split(/\r?\n/)[0]?.trim();
+                    if (first && existsSync(first))
+                        cursorCliPath = first;
+                }
+                catch {
+                    /* where 失败则保持 agent，后续校验会提示安装 */
+                }
+            }
         }
-        catch {
-            /* 使用默认 agent */
+        if (cursorCliPath === 'cursor') {
+            for (const p of agentPaths) {
+                try {
+                    accessSync(p, constants.F_OK);
+                    cursorCliPath = p;
+                    break;
+                }
+                catch {
+                    /* 尝试下一个路径 */
+                }
+            }
+        }
+        if (cursorCliPath === 'cursor') {
+            const cursorIdePaths = [
+                join(process.env.APPDATA || '', 'npm', 'cursor.cmd'),
+                join(process.env.LOCALAPPDATA || '', 'npm', 'cursor.cmd'),
+                join(process.env.ProgramFiles || 'C:\\Program Files', 'cursor', 'resources', 'app', 'bin', 'cursor.cmd'),
+            ];
+            for (const p of cursorIdePaths) {
+                try {
+                    accessSync(p, constants.F_OK);
+                    cursorCliPath = p;
+                    break;
+                }
+                catch {
+                    /* 尝试下一个路径 */
+                }
+            }
         }
     }
     let codebuddyCliPath = process.env.CODEBUDDY_CLI_PATH ?? tcb.cliPath ?? 'codebuddy';
@@ -449,6 +506,9 @@ export function loadConfig() {
     const codexTimeoutMs = process.env.CODEX_TIMEOUT_MS !== undefined
         ? parseInt(process.env.CODEX_TIMEOUT_MS, 10) || 600000
         : tcod.timeoutMs ?? 600000;
+    const cursorTimeoutMs = process.env.CURSOR_TIMEOUT_MS !== undefined
+        ? parseInt(process.env.CURSOR_TIMEOUT_MS, 10) || 600000
+        : tcur.timeoutMs ?? 600000;
     const codebuddyTimeoutMs = process.env.CODEBUDDY_TIMEOUT_MS !== undefined
         ? parseInt(process.env.CODEBUDDY_TIMEOUT_MS, 10) || 600000
         : tcb.timeoutMs ?? 600000;
@@ -590,24 +650,23 @@ export function loadConfig() {
             catch {
                 const installGuide = [
                     '',
-                    '━━━ Cursor CLI 未安装 ━━━',
+                    '━━━ Cursor Agent CLI 未安装 ━━━',
                     '',
-                    '使用 Cursor 需要先安装 Cursor Agent CLI。',
+                    'open-im 需要独立的 Cursor Agent CLI（agent 命令），不是 Cursor IDE 自带的 cursor.cmd。',
                     '',
-                    '安装方法：',
+                    '安装方法（在 PowerShell 中执行）：',
                     '',
-                    '  macOS/Linux: curl https://cursor.com/install -fsSL | bash',
-                    '  Windows: irm \'https://cursor.com/install?win32=true\' | iex',
+                    '  irm \'https://cursor.com/install?win32=true\' | iex',
                     '',
-                    '安装后运行 agent --version 验证。',
+                    '安装后运行 agent -p "hello" 验证。',
                     '',
                 ].join('\n');
                 throw new Error(installGuide);
             }
         }
-        // 提示 Cursor 认证：需 agent login 或 CURSOR_API_KEY
+        // 提示 Cursor 认证：需 cursor agent login 或 CURSOR_API_KEY
         if (!process.env.CURSOR_API_KEY) {
-            console.warn('\n⚠ Cursor 模式：未检测到 CURSOR_API_KEY。首次使用请先运行 agent login，\n' +
+            console.warn('\n⚠ Cursor 模式：未检测到 CURSOR_API_KEY。首次使用请先运行 cursor agent login，\n' +
                 '  或在 ~/.open-im/config.json 的 env 中添加 "CURSOR_API_KEY": "你的 API Key"。\n');
         }
     }
@@ -775,13 +834,16 @@ export function loadConfig() {
         codexCliPath,
         codebuddyCliPath,
         codexProxy,
+        cursorProxy,
         claudeWorkDir,
         claudeSkipPermissions,
         defaultPermissionMode,
         claudeTimeoutMs,
         codexTimeoutMs,
+        cursorTimeoutMs,
         codebuddyTimeoutMs,
         claudeModel: process.env.CLAUDE_MODEL ?? tc.model,
+        cursorModel: process.env.CURSOR_MODEL ?? tcur.model ?? 'auto',
         hookPort,
         logDir,
         logLevel,

package/dist/config.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/config.test.js

@@ -0,0 +1,70 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const { accessSyncMock, existsSyncMock, mkdirSyncMock, readFileSyncMock, writeFileSyncMock, execFileSyncMock, } = vi.hoisted(() => ({
+    accessSyncMock: vi.fn(),
+    existsSyncMock: vi.fn(),
+    mkdirSyncMock: vi.fn(),
+    readFileSyncMock: vi.fn(),
+    writeFileSyncMock: vi.fn(),
+    execFileSyncMock: vi.fn(),
+}));
+vi.mock('node:fs', async () => {
+    const actual = await vi.importActual('node:fs');
+    return {
+        ...actual,
+        accessSync: accessSyncMock,
+        existsSync: existsSyncMock,
+        mkdirSync: mkdirSyncMock,
+        readFileSync: readFileSyncMock,
+        writeFileSync: writeFileSyncMock,
+    };
+});
+vi.mock('node:child_process', () => ({
+    execFileSync: execFileSyncMock,
+}));
+import { loadConfig, loadFileConfig } from './config.js';
+describe('Cursor config defaults', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        readFileSyncMock.mockImplementation(() => {
+            throw new Error('missing');
+        });
+        existsSyncMock.mockReturnValue(true);
+        accessSyncMock.mockImplementation(() => undefined);
+        execFileSyncMock.mockImplementation(() => Buffer.from('cursor'));
+        delete process.env.CURSOR_CLI_PATH;
+        delete process.env.AI_COMMAND;
+    });
+    it('defaults Cursor CLI path to cursor for runtime config', () => {
+        process.env.AI_COMMAND = 'cursor';
+        process.env.TELEGRAM_BOT_TOKEN = 'test-token';
+        const config = loadConfig();
+        // 无显式配置时使用 cursor；Windows 下可能解析为 npm 或安装路径
+        expect(config.cursorCliPath === 'cursor' || config.cursorCliPath.endsWith('cursor.cmd')).toBe(true);
+    });
+    it('migrates old cursorCliPath-less configs to cursor', () => {
+        readFileSyncMock.mockReturnValue(JSON.stringify({
+            aiCommand: 'cursor',
+            claudeCliPath: 'claude',
+            claudeWorkDir: 'D:/coding/open-im',
+            claudeSkipPermissions: true,
+        }));
+        const file = loadFileConfig();
+        expect(file.tools?.cursor?.cliPath).toBe('cursor');
+        expect(writeFileSyncMock).toHaveBeenCalled();
+    });
+    it('preserves explicit legacy agent cursor configs', () => {
+        readFileSyncMock.mockReturnValue(JSON.stringify({
+            aiCommand: 'cursor',
+            platforms: { telegram: { enabled: true } },
+            telegramBotToken: 'test-token',
+            tools: {
+                cursor: {
+                    cliPath: 'agent',
+                    skipPermissions: true,
+                },
+            },
+        }));
+        const config = loadConfig();
+        expect(config.cursorCliPath).toBe('agent');
+    });
+});

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

@@ -6,6 +6,7 @@ export interface CursorRunCallbacks {
     onText: (accumulated: string) => void;
     onThinking?: (accumulated: string) => void;
     onToolUse?: (toolName: string, toolInput?: Record<string, unknown>) => void;
+    onSessionInvalid?: () => void;
     onComplete: (result: {
         success: boolean;
         result: string;
@@ -26,6 +27,8 @@ export interface CursorRunOptions {
     model?: string;
     chatId?: string;
     hookPort?: number;
+    /** HTTP/HTTPS 代理（CLI 非官方支持，部分环境可能生效） */
+    proxy?: string;
 }
 export interface CursorRunHandle {
     abort: () => void;

package/dist/cursor/cli-runner.js

@@ -3,6 +3,7 @@
  * 参考: https://cursor.com/docs/cli/reference/output-format
  */
 import { spawn } from 'node:child_process';
+import { basename } from 'node:path';
 import { createInterface } from 'node:readline';
 import { createLogger } from '../logger.js';
 const log = createLogger('CursorCli');
@@ -49,8 +50,16 @@ function extractToolFromCursorEvent(event) {
     const args = val.args;
     return { name, input: args };
 }
+function shouldPrependAgentSubcommand(cliPath) {
+    const command = basename(cliPath).toLowerCase();
+    return command === 'cursor' || command === 'cursor.cmd' || command === 'cursor.exe';
+}
 export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, options) {
-    const args = ['-p', '--output-format', 'stream-json', '--stream-partial-output',
+    // 使用 json 格式：输出单行 JSON，stream-json 在 Windows 管道下可能无输出（lines=0）
+    const args = [
+        ...(shouldPrependAgentSubcommand(cliPath) ? ['agent'] : []),
+        '-p', '--output-format', 'json',
+        '--trust', // headless 模式必须，否则会卡在 "Workspace Trust Required" 提示
         '--sandbox', 'disabled', // 禁用 sandbox，避免 Windows 下 shell 命令极慢或卡死
     ];
     // Cursor CLI 运行于 stream-json 非交互模式，stdin 设为 ignore。
@@ -78,6 +87,14 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
         env.CC_IM_CHAT_ID = options.chatId;
     if (options?.hookPort)
         env.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;
+    }
     const argsForLog = args.filter(a => a !== prompt).join(' ');
     log.info(`Spawning Cursor CLI: path=${cliPath}, cwd=${workDir}, session=${sessionId ?? 'new'}, args=${argsForLog}`);
     // Windows: .cmd 需通过 cmd.exe 执行，否则 spawn 报 ENOENT
@@ -94,6 +111,8 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
     let completed = false;
     let model = '';
     const toolStats = {};
+    let lineCount = 0;
+    let stdoutBytes = 0;
     const MAX_TIMEOUT = 2_147_483_647;
     const timeoutMs = options?.timeoutMs && options.timeoutMs > 0
         ? Math.min(options.timeoutMs, MAX_TIMEOUT)
@@ -133,25 +152,31 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
         // 实时打印 stderr，方便诊断 Cursor CLI 问题
         log.debug(`[stderr] ${text.trimEnd()}`);
     });
+    child.stdout?.on('data', (chunk) => {
+        stdoutBytes += chunk.length;
+    });
     const rl = createInterface({ input: child.stdout });
     rl.on('line', (line) => {
         const trimmed = line.trim();
         if (!trimmed)
             return;
+        lineCount++;
         let event;
         try {
             event = JSON.parse(trimmed);
         }
         catch {
+            log.warn(`[Cursor] Failed to parse line ${lineCount}: ${trimmed.slice(0, 80)}...`);
             return;
         }
-        log.debug(`[Cursor event] type=${event.type} subtype=${event.subtype}`);
         const type = event.type;
+        log.debug(`[Cursor event] type=${type} subtype=${event.subtype}`);
         if (type === 'system' && event.subtype === 'init') {
             model = event.model ?? '';
             const sid = event.session_id;
             if (sid)
                 callbacks.onSessionId?.(sid);
+            log.info(`[Cursor] Session init: model=${model}, sessionId=${sid ?? 'none'}`);
             return;
         }
         if (type === 'assistant') {
@@ -165,6 +190,15 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
                     }
                 }
             }
+            // 兼容 content 为字符串或结构不同的情况
+            const rawContent = msg?.content;
+            if (!Array.isArray(content) && typeof rawContent === 'string') {
+                accumulated += rawContent;
+                callbacks.onText(accumulated);
+            }
+            if (accumulated.length > 0) {
+                log.info(`[Cursor] Assistant text received: ${accumulated.length} chars total`);
+            }
             return;
         }
         if (type === 'tool_call') {
@@ -190,8 +224,12 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
             if (timeoutHandle)
                 clearTimeout(timeoutHandle);
             const result = event.result ?? '';
+            const sid = event.session_id;
+            if (sid)
+                callbacks.onSessionId?.(sid);
             if (!accumulated && result)
                 accumulated = result;
+            log.info(`[Cursor] Result event: resultLen=${result.length}, accumulatedLen=${accumulated.length}, lines=${lineCount}`);
             callbacks.onComplete({
                 success: true,
                 result,
@@ -229,9 +267,20 @@ export function runCursor(cliPath, prompt, sessionId, workDir, callbacks, option
                                 stderrTail;
                     }
                 }
-                callbacks.onError(errMsg || `Cursor CLI exited with code ${exitCode}`);
+                const fullErr = errMsg || `Cursor CLI exited with code ${exitCode}`;
+                const isSessionErr = /no session found|no conversation found|unable to find session|session not found|invalid session/i.test(fullErr);
+                if (isSessionErr)
+                    callbacks.onSessionInvalid?.();
+                callbacks.onError(fullErr);
             }
             else {
+                const stderrPreview = stderrTotal > 0 ? stderrHead.slice(0, 500) : '(无)';
+                log.warn(`[Cursor] Process exited 0 without result event: accumulated=${accumulated.length} chars, lines=${lineCount}, stdoutBytes=${stdoutBytes}. stderr(${stderrTotal} chars): ${stderrPreview}`);
+                // 检测到 Cursor IDE（非 Agent CLI）时给出明确指引
+                if (stderrHead.includes('Electron') || stderrHead.includes('Chromium') || stderrHead.includes('not in the list of known options')) {
+                    callbacks.onError('当前使用的是 Cursor IDE 的 cursor.cmd，不支持 CLI 模式。请安装独立的 Cursor Agent CLI：在 PowerShell 运行 irm \'https://cursor.com/install?win32=true\' | iex，安装后在配置中把 CLI Path 改为 agent。');
+                    return;
+                }
                 callbacks.onComplete({
                     success: true,
                     result: accumulated,

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

@@ -0,0 +1 @@
+export {};

package/dist/cursor/cli-runner.test.js

@@ -0,0 +1,94 @@
+import { EventEmitter } from 'node:events';
+import { PassThrough } from 'node:stream';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+const { spawnMock } = vi.hoisted(() => ({
+    spawnMock: vi.fn(),
+}));
+vi.mock('node:child_process', () => ({
+    spawn: spawnMock,
+}));
+import { runCursor } from './cli-runner.js';
+class MockChildProcess extends EventEmitter {
+    stdout = new PassThrough();
+    stderr = new PassThrough();
+    pid = 1234;
+    killed = false;
+    kill() {
+        this.killed = true;
+    }
+}
+describe('runCursor', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        spawnMock.mockImplementation(() => new MockChildProcess());
+    });
+    it('prepends the agent subcommand for the top-level cursor CLI', () => {
+        runCursor('cursor', 'hello', undefined, 'D:\\coding\\open-im', {
+            onText: vi.fn(),
+            onComplete: vi.fn(),
+            onError: vi.fn(),
+        });
+        expect(spawnMock).toHaveBeenCalledWith('cursor', [
+            'agent',
+            '-p',
+            '--output-format',
+            'json',
+            '--trust',
+            '--sandbox',
+            'disabled',
+            '--force',
+            '--workspace',
+            'D:\\coding\\open-im',
+            '--',
+            'hello',
+        ], expect.objectContaining({ cwd: 'D:\\coding\\open-im' }));
+    });
+    it('uses cmd.exe for cursor.cmd and still prepends the agent subcommand', () => {
+        vi.stubGlobal('process', {
+            ...process,
+            platform: 'win32',
+            env: process.env,
+        });
+        runCursor('D:\\Program Files\\cursor\\resources\\app\\bin\\cursor.cmd', 'hello', undefined, 'D:\\coding\\open-im', {
+            onText: vi.fn(),
+            onComplete: vi.fn(),
+            onError: vi.fn(),
+        });
+        expect(spawnMock).toHaveBeenCalledWith('cmd.exe', [
+            '/c',
+            'D:\\Program Files\\cursor\\resources\\app\\bin\\cursor.cmd',
+            'agent',
+            '-p',
+            '--output-format',
+            'json',
+            '--trust',
+            '--sandbox',
+            'disabled',
+            '--force',
+            '--workspace',
+            'D:\\coding\\open-im',
+            '--',
+            'hello',
+        ], expect.objectContaining({ cwd: 'D:\\coding\\open-im', windowsHide: true }));
+    });
+    it('does not duplicate the agent subcommand for legacy agent executables', () => {
+        runCursor('agent', 'hello', undefined, 'D:\\coding\\open-im', {
+            onText: vi.fn(),
+            onComplete: vi.fn(),
+            onError: vi.fn(),
+        });
+        expect(spawnMock).toHaveBeenCalledWith('agent', [
+            '-p',
+            '--output-format',
+            'json',
+            '--trust',
+            '--sandbox',
+            'disabled',
+            '--force',
+            '--workspace',
+            'D:\\coding\\open-im',
+            '--',
+            'hello',
+        ], expect.any(Object));
+    });
+});

package/dist/setup.js

@@ -80,7 +80,7 @@ function printManualInstructions(configPath) {
       "skipPermissions": true,
       "timeoutMs": 600000
     },
-    "cursor": { "cliPath": "agent", "skipPermissions": true },
+    "cursor": { "cliPath": "cursor", "skipPermissions": true, "model": "auto" },
     "codex": { "cliPath": "codex", "workDir": "${process.cwd().replace(/\\/g, "/")}", "skipPermissions": true, "proxy": "http://127.0.0.1:7890" },
     "codebuddy": { "cliPath": "codebuddy", "skipPermissions": true, "timeoutMs": 600000 }
   },
@@ -797,7 +797,7 @@ export async function runInteractiveSetup() {
             },
             cursor: {
                 ...baseTools.cursor,
-                cliPath: baseTools.cursor?.cliPath ?? "agent",
+                cliPath: baseTools.cursor?.cliPath ?? "cursor",
                 skipPermissions: baseTools.cursor?.skipPermissions ?? baseTools.claude?.skipPermissions ?? true,
             },
             codex: {

package/dist/shared/ai-task.js

@@ -100,23 +100,26 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                         : undefined)
                 : undefined;
         }
-        const timeoutMs = config.aiCommand === 'codex'
+        const toolId = toolAdapter.toolId;
+        const timeoutMs = toolId === 'codex'
             ? config.codexTimeoutMs
-            : config.aiCommand === 'codebuddy'
-                ? config.codebuddyTimeoutMs
-                : config.claudeTimeoutMs;
+            : toolId === 'cursor'
+                ? config.cursorTimeoutMs
+                : toolId === 'codebuddy'
+                    ? config.codebuddyTimeoutMs
+                    : config.claudeTimeoutMs;
         const startRun = () => {
             activeHandle = toolAdapter.run(prompt, currentSessionId, ctx.workDir, {
                 onSessionId: (id) => {
                     currentSessionId = id;
                     if (ctx.threadId)
-                        sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, config.aiCommand, id);
+                        sessionManager.setSessionIdForThread(ctx.userId, ctx.threadId, toolId, id);
                     else if (ctx.convId)
-                        sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, config.aiCommand, id);
+                        sessionManager.setSessionIdForConv(ctx.userId, ctx.convId, toolId, id);
                 },
                 onSessionInvalid: () => {
                     if (ctx.convId)
-                        sessionManager.clearSessionForConv(ctx.userId, ctx.convId, config.aiCommand);
+                        sessionManager.clearSessionForConv(ctx.userId, ctx.convId, toolId);
                 },
                 onThinking: (t) => {
                     if (!firstContentLogged) {
@@ -125,7 +128,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     }
                     wasThinking = true;
                     thinkingText = t;
-                    throttledUpdate(`💭 **${getAIToolDisplayName(config.aiCommand)} 思考中...**\n\n${t}`);
+                    throttledUpdate(`💭 **${getAIToolDisplayName(toolId)} 思考中...**\n\n${t}`);
                 },
                 onText: (accumulated) => {
                     if (!firstContentLogged) {
@@ -190,14 +193,14 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                     }
                     settled = true;
                     log.error(`Task error for user ${ctx.userId}: ${error}`);
-                    if (config.aiCommand !== 'claude' && !isUsageLimitError(error)) {
+                    if (toolId !== 'claude' && !isUsageLimitError(error)) {
                         if (ctx.convId)
-                            sessionManager.clearSessionForConv(ctx.userId, ctx.convId, config.aiCommand);
+                            sessionManager.clearSessionForConv(ctx.userId, ctx.convId, toolId);
                         else
-                            sessionManager.clearActiveToolSession(ctx.userId, config.aiCommand);
-                        log.info(`Session reset for user ${ctx.userId} due to ${config.aiCommand} task error`);
+                            sessionManager.clearActiveToolSession(ctx.userId, toolId);
+                        log.info(`Session reset for user ${ctx.userId} due to ${toolId} task error`);
                     }
-                    else if (config.aiCommand === 'codex' && isUsageLimitError(error)) {
+                    else if (toolId === 'codex' && isUsageLimitError(error)) {
                         log.info(`Keeping codex session for user ${ctx.userId} after usage limit error`);
                     }
                     try {
@@ -213,10 +216,12 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
                 skipPermissions,
                 permissionMode,
                 timeoutMs,
-                model: sessionManager.getModel(ctx.userId, ctx.threadId) ?? config.claudeModel,
+                model: sessionManager.getModel(ctx.userId, ctx.threadId)
+                    ?? (toolId === 'cursor' ? config.cursorModel : config.claudeModel),
                 chatId: ctx.chatId,
-                ...(config.useSdkMode ? {} : { hookPort: config.hookPort }),
-                ...(config.aiCommand === 'codex' && config.codexProxy ? { proxy: config.codexProxy } : {}),
+                ...(toolId === 'claude' && config.useSdkMode ? {} : { hookPort: config.hookPort }),
+                ...(toolId === 'codex' && config.codexProxy ? { proxy: config.codexProxy } : {}),
+                ...(toolId === 'cursor' && config.cursorProxy ? { proxy: config.cursorProxy } : {}),
             });
             return activeHandle;
         };
@@ -231,7 +236,7 @@ export function runAITask(deps, ctx, prompt, toolAdapter, platformAdapter) {
             latestContent: '',
             settle,
             startedAt: Date.now(),
-            toolId: config.aiCommand,
+            toolId,
         };
         startRun();
         platformAdapter.onTaskReady(taskState);

package/package.json

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