chatccc 0.2.251 → 0.2.253
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/bin/cccagent.mjs +12 -3
- package/bin/chatccc.mjs +15 -6
- package/deepccc-agent/package.json +1 -1
- package/dist/deepccc-agent/src/cli.js +634 -0
- package/dist/deepccc-agent/src/config.js +76 -0
- package/dist/deepccc-agent/src/context.js +348 -0
- package/dist/deepccc-agent/src/file-log.js +34 -0
- package/dist/deepccc-agent/src/file-tools.js +1208 -0
- package/dist/deepccc-agent/src/index.js +571 -0
- package/dist/deepccc-agent/src/permissions.js +170 -0
- package/dist/deepccc-agent/src/privacy.js +124 -0
- package/dist/deepccc-agent/src/proc-tree-kill.js +60 -0
- package/dist/deepccc-agent/src/progress/cards-helpers.js +70 -0
- package/dist/deepccc-agent/src/progress/reducer.js +102 -0
- package/dist/deepccc-agent/src/progress/terminal-renderer.js +264 -0
- package/dist/deepccc-agent/src/progress/view.js +30 -0
- package/dist/deepccc-agent/src/raw-stream-log.js +106 -0
- package/dist/deepccc-agent/src/session-search.js +276 -0
- package/dist/deepccc-agent/src/session-select.js +23 -0
- package/dist/deepccc-agent/src/sigint.js +26 -0
- package/dist/deepccc-agent/src/skills.js +178 -0
- package/dist/deepccc-agent/src/web-tools.js +246 -0
- package/dist/src/adapters/adapter-interface.js +19 -0
- package/dist/src/adapters/ccc-adapter.js +112 -0
- package/dist/src/adapters/claude-adapter.js +497 -0
- package/dist/src/adapters/claude-session-meta-store.js +92 -0
- package/dist/src/adapters/codex-adapter.js +279 -0
- package/dist/src/adapters/codex-session-meta-store.js +94 -0
- package/dist/src/adapters/cursor-adapter.js +491 -0
- package/dist/src/adapters/cursor-session-meta-store.js +116 -0
- package/dist/src/adapters/jsonl-stream.js +104 -0
- package/{src/adapters/proc-tree-kill.ts → dist/src/adapters/proc-tree-kill.js} +94 -97
- package/dist/src/adapters/raw-stream-log.js +106 -0
- package/dist/src/adapters/resource-monitor.js +113 -0
- package/dist/src/agent-activity.js +133 -0
- package/dist/src/agent-delegate-task-rpc.js +129 -0
- package/dist/src/agent-delegate-task.js +48 -0
- package/dist/src/agent-file-rpc.js +152 -0
- package/dist/src/agent-image-rpc.js +148 -0
- package/dist/src/agent-platform-routing.js +13 -0
- package/dist/src/agent-reload-config-rpc.js +23 -0
- package/dist/src/agent-rpc-body.js +87 -0
- package/dist/src/agent-stop-stuck.js +110 -0
- package/dist/src/card-action-routing.js +7 -0
- package/dist/src/card-plain-text.js +101 -0
- package/dist/src/cardkit.js +158 -0
- package/dist/src/cards.js +573 -0
- package/dist/src/chatgpt-subscription-rpc.js +18 -0
- package/dist/src/chatgpt-subscription.js +199 -0
- package/dist/src/chrome-devtools-guard.js +238 -0
- package/dist/src/claude-sdk-installer.js +249 -0
- package/dist/src/codex-reset-actions.js +143 -0
- package/dist/src/config-utils.js +149 -0
- package/dist/src/config.js +804 -0
- package/dist/src/cursor-usage.js +77 -0
- package/dist/src/exit-banner.js +28 -0
- package/dist/src/feishu-api.js +1404 -0
- package/dist/src/feishu-message-ingress.js +137 -0
- package/dist/src/feishu-platform.js +97 -0
- package/dist/src/format-message.js +252 -0
- package/dist/src/git-command.js +155 -0
- package/dist/src/im-skills.js +121 -0
- package/dist/src/index.js +833 -0
- package/dist/src/litellm-proxy.js +300 -0
- package/dist/src/orchestrator.js +2078 -0
- package/dist/src/package-root.js +26 -0
- package/dist/src/platform-adapter.js +7 -0
- package/dist/src/platform-startup.js +6 -0
- package/dist/src/privacy.js +100 -0
- package/dist/src/progress/reducer.js +102 -0
- package/dist/src/progress/terminal-renderer.js +264 -0
- package/dist/src/progress/view.js +30 -0
- package/dist/src/response-stall.js +14 -0
- package/dist/src/runtime-entry.js +13 -0
- package/dist/src/runtime-reload.js +19 -0
- package/dist/src/session-chat-binding.js +183 -0
- package/dist/src/session-name.js +7 -0
- package/dist/src/session.js +2144 -0
- package/dist/src/shared-prefix.js +16 -0
- package/dist/src/shared.js +493 -0
- package/dist/src/sim-agent.js +105 -0
- package/dist/src/sim-platform.js +142 -0
- package/dist/src/sim-store.js +231 -0
- package/dist/src/simplify.js +99 -0
- package/dist/src/startup-lifecycle.js +209 -0
- package/dist/src/stream-state.js +141 -0
- package/dist/src/terminal-error.js +100 -0
- package/dist/src/trace.js +50 -0
- package/dist/src/turn-cards.js +92 -0
- package/dist/src/update-command-guard.js +114 -0
- package/{src/web-ui.ts → dist/src/web-ui.js} +749 -823
- package/dist/src/wechat-platform.js +545 -0
- package/package.json +7 -5
- package/deepccc-agent/LICENSE +0 -201
- package/deepccc-agent/bin/deepccc.mjs +0 -26
- package/deepccc-agent/docs/cache-hit-rate-1.jpg +0 -0
- package/deepccc-agent/docs/cache-hit-rate-2.jpg +0 -0
- package/deepccc-agent/package-lock.json +0 -2027
- package/deepccc-agent/src/__tests__/chat-session.test.ts +0 -852
- package/deepccc-agent/src/__tests__/cli-json.test.ts +0 -49
- package/deepccc-agent/src/__tests__/config.test.ts +0 -34
- package/deepccc-agent/src/__tests__/context.test.ts +0 -341
- package/deepccc-agent/src/__tests__/file-tools.test.ts +0 -240
- package/deepccc-agent/src/__tests__/permissions.test.ts +0 -199
- package/deepccc-agent/src/__tests__/privacy.test.ts +0 -318
- package/deepccc-agent/src/__tests__/progress-reducer.test.ts +0 -121
- package/deepccc-agent/src/__tests__/session-search.test.ts +0 -262
- package/deepccc-agent/src/__tests__/session-select.test.ts +0 -116
- package/deepccc-agent/src/__tests__/sigint.test.ts +0 -56
- package/deepccc-agent/src/__tests__/skills.test.ts +0 -284
- package/deepccc-agent/src/__tests__/terminal-renderer.test.ts +0 -247
- package/deepccc-agent/src/__tests__/web-tools.test.ts +0 -220
- package/deepccc-agent/src/cli.ts +0 -682
- package/deepccc-agent/src/config.ts +0 -101
- package/deepccc-agent/src/context.ts +0 -465
- package/deepccc-agent/src/file-log.ts +0 -38
- package/deepccc-agent/src/file-tools.ts +0 -1493
- package/deepccc-agent/src/index.ts +0 -676
- package/deepccc-agent/src/permissions.ts +0 -226
- package/deepccc-agent/src/privacy.ts +0 -141
- package/deepccc-agent/src/proc-tree-kill.ts +0 -61
- package/deepccc-agent/src/progress/cards-helpers.ts +0 -76
- package/deepccc-agent/src/progress/reducer.ts +0 -113
- package/deepccc-agent/src/progress/terminal-renderer.ts +0 -294
- package/deepccc-agent/src/progress/view.ts +0 -77
- package/deepccc-agent/src/raw-stream-log.ts +0 -124
- package/deepccc-agent/src/session-search.ts +0 -370
- package/deepccc-agent/src/session-select.ts +0 -48
- package/deepccc-agent/src/sigint.ts +0 -50
- package/deepccc-agent/src/skills.ts +0 -205
- package/deepccc-agent/src/web-tools.ts +0 -313
- package/deepccc-agent/tsconfig.build.json +0 -13
- package/deepccc-agent/tsconfig.json +0 -13
- package/deepccc-agent/vitest.config.ts +0 -7
- package/src/__tests__/adapter-interface.test.ts +0 -152
- package/src/__tests__/agent-activity.test.ts +0 -86
- package/src/__tests__/agent-delegate-task-rpc.test.ts +0 -165
- package/src/__tests__/agent-image-rpc.test.ts +0 -34
- package/src/__tests__/agent-platform-routing.test.ts +0 -26
- package/src/__tests__/agent-reload-config-rpc.test.ts +0 -99
- package/src/__tests__/agent-rpc-body.test.ts +0 -42
- package/src/__tests__/builtin-chat-session.test.ts +0 -532
- package/src/__tests__/builtin-cli-json.test.ts +0 -39
- package/src/__tests__/builtin-config.test.ts +0 -26
- package/src/__tests__/builtin-context.test.ts +0 -319
- package/src/__tests__/builtin-file-tools.test.ts +0 -240
- package/src/__tests__/builtin-permissions.test.ts +0 -219
- package/src/__tests__/builtin-session-search.test.ts +0 -262
- package/src/__tests__/builtin-session-select.test.ts +0 -116
- package/src/__tests__/builtin-sigint.test.ts +0 -56
- package/src/__tests__/builtin-skills.test.ts +0 -284
- package/src/__tests__/builtin-web-tools.test.ts +0 -220
- package/src/__tests__/card-action-routing.test.ts +0 -18
- package/src/__tests__/card-plain-text.test.ts +0 -45
- package/src/__tests__/cardkit.test.ts +0 -60
- package/src/__tests__/cards.test.ts +0 -607
- package/src/__tests__/ccc-adapter.test.ts +0 -194
- package/src/__tests__/chatgpt-subscription-rpc.test.ts +0 -89
- package/src/__tests__/chatgpt-subscription.test.ts +0 -135
- package/src/__tests__/chrome-devtools-guard.test.ts +0 -165
- package/src/__tests__/claude-adapter.test.ts +0 -614
- package/src/__tests__/claude-raw-stream-log.test.ts +0 -96
- package/src/__tests__/claude-sdk-installer.test.ts +0 -285
- package/src/__tests__/codex-adapter.test.ts +0 -331
- package/src/__tests__/codex-raw-stream-log.test.ts +0 -170
- package/src/__tests__/codex-reset-actions.test.ts +0 -146
- package/src/__tests__/config-reload.test.ts +0 -284
- package/src/__tests__/config-sample.test.ts +0 -97
- package/src/__tests__/config-utils.test.ts +0 -40
- package/src/__tests__/config.test.ts +0 -395
- package/src/__tests__/crash-logging.test.ts +0 -360
- package/src/__tests__/cursor-adapter.test.ts +0 -890
- package/src/__tests__/cursor-session-meta-store.test.ts +0 -212
- package/src/__tests__/feishu-api.test.ts +0 -60
- package/src/__tests__/feishu-avatar.test.ts +0 -504
- package/src/__tests__/feishu-message-ingress.test.ts +0 -138
- package/src/__tests__/feishu-platform.test.ts +0 -75
- package/src/__tests__/fixtures/codex_simple_text.jsonl +0 -4
- package/src/__tests__/fixtures/codex_with_tool.jsonl +0 -6
- package/src/__tests__/fixtures/cursor_partial_only.jsonl +0 -5
- package/src/__tests__/fixtures/cursor_partial_with_final.jsonl +0 -13
- package/src/__tests__/fixtures/cursor_with_tool_call.jsonl +0 -12
- package/src/__tests__/format-message.test.ts +0 -316
- package/src/__tests__/git-command.test.ts +0 -288
- package/src/__tests__/im-skills.test.ts +0 -125
- package/src/__tests__/jsonl-stream.test.ts +0 -79
- package/src/__tests__/orchestrator.test.ts +0 -1268
- package/src/__tests__/package-files.test.ts +0 -24
- package/src/__tests__/platform-startup.test.ts +0 -19
- package/src/__tests__/privacy.test.ts +0 -198
- package/src/__tests__/proc-tree-kill.test.ts +0 -108
- package/src/__tests__/progress-reducer.test.ts +0 -121
- package/src/__tests__/raw-stream-log.test.ts +0 -106
- package/src/__tests__/response-stall.test.ts +0 -49
- package/src/__tests__/restart.test.ts +0 -232
- package/src/__tests__/session-ccc-config.test.ts +0 -66
- package/src/__tests__/session.test.ts +0 -3004
- package/src/__tests__/shared-prefix.test.ts +0 -36
- package/src/__tests__/sim-agent.test.ts +0 -174
- package/src/__tests__/sim-platform.test.ts +0 -93
- package/src/__tests__/sim-store.test.ts +0 -214
- package/src/__tests__/simplify.test.ts +0 -283
- package/src/__tests__/startup-lifecycle.test.ts +0 -231
- package/src/__tests__/stop-session.test.ts +0 -162
- package/src/__tests__/stream-state.test.ts +0 -164
- package/src/__tests__/terminal-error.test.ts +0 -54
- package/src/__tests__/terminal-renderer.test.ts +0 -247
- package/src/__tests__/update-command-guard.test.ts +0 -144
- package/src/__tests__/web-ui.test.ts +0 -438
- package/src/__tests__/wechat-platform.test.ts +0 -111
- package/src/adapters/adapter-interface.ts +0 -217
- package/src/adapters/ccc-adapter.ts +0 -150
- package/src/adapters/claude-adapter.ts +0 -673
- package/src/adapters/claude-session-meta-store.ts +0 -120
- package/src/adapters/codex-adapter.ts +0 -426
- package/src/adapters/codex-session-meta-store.ts +0 -131
- package/src/adapters/cursor-adapter.ts +0 -681
- package/src/adapters/cursor-session-meta-store.ts +0 -154
- package/src/adapters/jsonl-stream.ts +0 -157
- package/src/adapters/raw-stream-log.ts +0 -124
- package/src/adapters/resource-monitor.ts +0 -141
- package/src/agent-activity.ts +0 -175
- package/src/agent-delegate-task-rpc.ts +0 -153
- package/src/agent-delegate-task.ts +0 -91
- package/src/agent-file-rpc.ts +0 -172
- package/src/agent-image-rpc.ts +0 -168
- package/src/agent-platform-routing.ts +0 -28
- package/src/agent-reload-config-rpc.ts +0 -34
- package/src/agent-rpc-body.ts +0 -92
- package/src/agent-stop-stuck.ts +0 -129
- package/src/card-action-routing.ts +0 -14
- package/src/card-plain-text.ts +0 -108
- package/src/cardkit.ts +0 -179
- package/src/cards.ts +0 -684
- package/src/chatgpt-subscription-rpc.ts +0 -27
- package/src/chatgpt-subscription.ts +0 -299
- package/src/chrome-devtools-guard.ts +0 -318
- package/src/claude-sdk-installer.ts +0 -324
- package/src/codex-reset-actions.ts +0 -184
- package/src/config-utils.ts +0 -211
- package/src/config.ts +0 -1063
- package/src/cursor-usage.ts +0 -128
- package/src/exit-banner.ts +0 -33
- package/src/feishu-api.ts +0 -1616
- package/src/feishu-message-ingress.ts +0 -195
- package/src/feishu-platform.ts +0 -159
- package/src/format-message.ts +0 -293
- package/src/git-command.ts +0 -202
- package/src/im-skills.ts +0 -149
- package/src/index.ts +0 -1089
- package/src/litellm-proxy.ts +0 -374
- package/src/orchestrator.ts +0 -2543
- package/src/platform-adapter.ts +0 -70
- package/src/platform-startup.ts +0 -16
- package/src/privacy.ts +0 -118
- package/src/progress/reducer.ts +0 -113
- package/src/progress/terminal-renderer.ts +0 -294
- package/src/progress/view.ts +0 -77
- package/src/response-stall.ts +0 -28
- package/src/runtime-reload.ts +0 -34
- package/src/session-chat-binding.ts +0 -292
- package/src/session-name.ts +0 -8
- package/src/session.ts +0 -2659
- package/src/shared-prefix.ts +0 -29
- package/src/shared.ts +0 -552
- package/src/sim-agent.ts +0 -167
- package/src/sim-platform.ts +0 -177
- package/src/sim-store.ts +0 -317
- package/src/simplify.ts +0 -120
- package/src/startup-lifecycle.ts +0 -250
- package/src/stream-state.ts +0 -177
- package/src/terminal-error.ts +0 -129
- package/src/trace.ts +0 -51
- package/src/turn-cards.ts +0 -118
- package/src/update-command-guard.ts +0 -165
- package/src/wechat-platform.ts +0 -680
|
@@ -1,681 +0,0 @@
|
|
|
1
|
-
// =============================================================================
|
|
2
|
-
// cursor-adapter.ts — Cursor Agent CLI 适配器
|
|
3
|
-
// =============================================================================
|
|
4
|
-
// 通过 agent -p --output-format stream-json 与 Cursor agent 交互。
|
|
5
|
-
// 命令行可通过 config.json cursor.path / cursor.model 自定义。
|
|
6
|
-
// =============================================================================
|
|
7
|
-
|
|
8
|
-
import { spawn, type ChildProcess } from "node:child_process";
|
|
9
|
-
import { existsSync, readFileSync } from "node:fs";
|
|
10
|
-
import { dirname, join } from "node:path";
|
|
11
|
-
import { fileURLToPath } from "node:url";
|
|
12
|
-
|
|
13
|
-
import type {
|
|
14
|
-
ToolAdapter,
|
|
15
|
-
ToolPromptOptions,
|
|
16
|
-
UnifiedBlock,
|
|
17
|
-
UnifiedStreamMessage,
|
|
18
|
-
CreateSessionResult,
|
|
19
|
-
SessionInfo,
|
|
20
|
-
} from "./adapter-interface.ts";
|
|
21
|
-
import { parseUserCommand } from "./adapter-interface.ts";
|
|
22
|
-
import { config, CURSOR_AGENT_COMMAND, CURSOR_AGENT_ARGS, RAW_STREAM_LOGS_DIR } from "../config.ts";
|
|
23
|
-
import {
|
|
24
|
-
defaultCursorSessionMetaStore,
|
|
25
|
-
type CursorSessionMetaStore,
|
|
26
|
-
} from "./cursor-session-meta-store.ts";
|
|
27
|
-
import { killProcessTree } from "./proc-tree-kill.ts";
|
|
28
|
-
import {
|
|
29
|
-
createRawStreamLog,
|
|
30
|
-
type RawStreamLogHandle,
|
|
31
|
-
} from "./raw-stream-log.ts";
|
|
32
|
-
import { readJsonLinesWithBadJsonIdleWatchdog } from "./jsonl-stream.ts";
|
|
33
|
-
|
|
34
|
-
// ---------------------------------------------------------------------------
|
|
35
|
-
// 特殊注入提示
|
|
36
|
-
// ---------------------------------------------------------------------------
|
|
37
|
-
|
|
38
|
-
const PROJECT_ROOT = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
|
|
39
|
-
const CURSOR_SPECIFIC_PROMPT_PATH = join(
|
|
40
|
-
PROJECT_ROOT,
|
|
41
|
-
"agent-prompts",
|
|
42
|
-
"cursor_specific.md",
|
|
43
|
-
);
|
|
44
|
-
|
|
45
|
-
function readCursorSpecificInjectionPrompt(): string | null {
|
|
46
|
-
try {
|
|
47
|
-
if (!existsSync(CURSOR_SPECIFIC_PROMPT_PATH)) return null;
|
|
48
|
-
const prompt = readFileSync(CURSOR_SPECIFIC_PROMPT_PATH, "utf-8").trim();
|
|
49
|
-
return prompt.length > 0 ? prompt : null;
|
|
50
|
-
} catch {
|
|
51
|
-
return null;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
function buildCursorPromptText(userText: string): string {
|
|
56
|
-
const prompt = readCursorSpecificInjectionPrompt();
|
|
57
|
-
if (!prompt) return userText;
|
|
58
|
-
|
|
59
|
-
return [
|
|
60
|
-
"[ChatCCC Cursor-specific injection prompt]",
|
|
61
|
-
prompt,
|
|
62
|
-
"[/ChatCCC Cursor-specific injection prompt]",
|
|
63
|
-
"",
|
|
64
|
-
userText,
|
|
65
|
-
].join("\n");
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
// ---------------------------------------------------------------------------
|
|
69
|
-
// 类型:Cursor JSONL 消息行
|
|
70
|
-
// ---------------------------------------------------------------------------
|
|
71
|
-
|
|
72
|
-
interface CursorMessageLine {
|
|
73
|
-
type?: string;
|
|
74
|
-
subtype?: string;
|
|
75
|
-
session_id?: string;
|
|
76
|
-
cwd?: string;
|
|
77
|
-
model?: string;
|
|
78
|
-
message?: {
|
|
79
|
-
role?: string;
|
|
80
|
-
content?: CursorContentBlock[];
|
|
81
|
-
};
|
|
82
|
-
result?: string;
|
|
83
|
-
duration_ms?: number;
|
|
84
|
-
usage?: {
|
|
85
|
-
inputTokens?: number;
|
|
86
|
-
outputTokens?: number;
|
|
87
|
-
};
|
|
88
|
-
/**
|
|
89
|
-
* 三类 assistant 事件的判定字段之一。详见 normalizeCursorMessage。
|
|
90
|
-
* 官方文档:cursor.com/docs/cli/reference/output-format
|
|
91
|
-
*/
|
|
92
|
-
timestamp_ms?: number;
|
|
93
|
-
/**
|
|
94
|
-
* 三类 assistant 事件的判定字段之一:
|
|
95
|
-
* - has timestamp_ms, no model_call_id → Streaming delta(真增量)
|
|
96
|
-
* - has timestamp_ms, has model_call_id → Buffered flush before tool call(重复快照)
|
|
97
|
-
* - no timestamp_ms → Final flush at end of turn(重复快照)
|
|
98
|
-
*/
|
|
99
|
-
model_call_id?: string;
|
|
100
|
-
/** thinking delta 消息的文本内容 */
|
|
101
|
-
text?: string;
|
|
102
|
-
/** tool_call 消息的 call_id */
|
|
103
|
-
call_id?: string;
|
|
104
|
-
/** tool_call 消息的 tool_call 载荷 */
|
|
105
|
-
tool_call?: Record<string, unknown>;
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
interface CursorContentBlock {
|
|
109
|
-
type?: string;
|
|
110
|
-
text?: string;
|
|
111
|
-
thinking?: string;
|
|
112
|
-
name?: string;
|
|
113
|
-
input?: unknown;
|
|
114
|
-
tool_use_id?: string;
|
|
115
|
-
content?: unknown;
|
|
116
|
-
is_error?: boolean;
|
|
117
|
-
query?: string;
|
|
118
|
-
[key: string]: unknown;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
interface CursorProcessCloseInfo {
|
|
122
|
-
code: number | null;
|
|
123
|
-
signal: NodeJS.Signals | null;
|
|
124
|
-
stderr: string;
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
interface CursorProcessHandle {
|
|
128
|
-
proc: ChildProcess;
|
|
129
|
-
getStderr(): string;
|
|
130
|
-
waitForClose(): Promise<CursorProcessCloseInfo>;
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
interface CursorStreamStats {
|
|
134
|
-
stdoutLength: number;
|
|
135
|
-
rawLineCount: number;
|
|
136
|
-
parsedLineCount: number;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
type CursorSpawn = typeof spawn;
|
|
140
|
-
|
|
141
|
-
function createCursorStreamStats(): CursorStreamStats {
|
|
142
|
-
return { stdoutLength: 0, rawLineCount: 0, parsedLineCount: 0 };
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
function isCursorAuthRelatedError(stderr: string): boolean {
|
|
146
|
-
const text = stderr.toLowerCase();
|
|
147
|
-
return (
|
|
148
|
-
text.includes("authentication required") ||
|
|
149
|
-
text.includes("not logged in") ||
|
|
150
|
-
text.includes("login") ||
|
|
151
|
-
text.includes("sign in") ||
|
|
152
|
-
text.includes("unauthorized") ||
|
|
153
|
-
text.includes("401") ||
|
|
154
|
-
text.includes("cursor_api_key") ||
|
|
155
|
-
text.includes("api key")
|
|
156
|
-
);
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
const CURSOR_VISIBLE_STDERR_MAX_CHARS = 1200;
|
|
160
|
-
|
|
161
|
-
function sanitizeCursorStderr(stderr: string): string {
|
|
162
|
-
return stderr
|
|
163
|
-
.replace(/\x1B\[[0-?]*[ -/]*[@-~]/g, "")
|
|
164
|
-
.replace(/\bBearer\s+[A-Za-z0-9._~+/=-]{12,}\b/gi, "Bearer <redacted>")
|
|
165
|
-
.replace(/\bsk-[A-Za-z0-9_-]{12,}\b/g, "<redacted-api-key>")
|
|
166
|
-
.replace(
|
|
167
|
-
/\b(api[_-]?key|token|authorization|password)\s*[:=]\s*["']?[^\s"']+/gi,
|
|
168
|
-
"$1=<redacted>",
|
|
169
|
-
)
|
|
170
|
-
.trim();
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
function formatCursorVisibleStderr(stderr: string): string {
|
|
174
|
-
const sanitized = sanitizeCursorStderr(stderr);
|
|
175
|
-
if (sanitized.length <= CURSOR_VISIBLE_STDERR_MAX_CHARS) return sanitized;
|
|
176
|
-
return `${sanitized.slice(0, CURSOR_VISIBLE_STDERR_MAX_CHARS)}\n...(stderr truncated)`;
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
export function formatCursorAgentEmptyOutputMessage(args: {
|
|
180
|
-
exitCode: number | null;
|
|
181
|
-
stdoutLength: number;
|
|
182
|
-
stderr: string;
|
|
183
|
-
}): string | null {
|
|
184
|
-
if (args.exitCode === 0) return null;
|
|
185
|
-
if (args.stdoutLength !== 0) return null;
|
|
186
|
-
if (args.stderr.trim().length === 0) return null;
|
|
187
|
-
|
|
188
|
-
const stderrBlock = `[Cursor stderr] exit=${args.exitCode ?? "unknown"}:\n${formatCursorVisibleStderr(args.stderr)}`;
|
|
189
|
-
if (isCursorAuthRelatedError(args.stderr)) {
|
|
190
|
-
return `Cursor Agent 没有返回内容。检测到认证相关错误,可能需要重新登录 Cursor Agent,或配置 CURSOR_API_KEY。请在本机运行 agent status 检查状态;如未登录,请运行 agent login 后重试。\n\n${stderrBlock}`;
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
return `Cursor Agent 没有返回内容。底层命令异常退出,错误信息如下:\n\n${stderrBlock}`;
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
function createCursorAgentFailureError(info: CursorProcessCloseInfo): Error {
|
|
197
|
-
const stderr = info.stderr.trim().slice(0, 500);
|
|
198
|
-
return new Error(
|
|
199
|
-
`Cursor Agent exited without stream-json output (exit=${info.code ?? "unknown"}, stderr=${stderr})`,
|
|
200
|
-
);
|
|
201
|
-
}
|
|
202
|
-
|
|
203
|
-
// ---------------------------------------------------------------------------
|
|
204
|
-
// normalizeCursorMessage — Cursor 消息 → UnifiedStreamMessage | null
|
|
205
|
-
// ---------------------------------------------------------------------------
|
|
206
|
-
|
|
207
|
-
/** Cursor tool_call 内部 key → 统一工具名 */
|
|
208
|
-
function mapToolCallKey(key: string): string {
|
|
209
|
-
const KEY_MAP: Record<string, string> = {
|
|
210
|
-
globToolCall: "Glob",
|
|
211
|
-
shellToolCall: "Bash",
|
|
212
|
-
readToolCall: "Read",
|
|
213
|
-
writeToolCall: "Write",
|
|
214
|
-
editToolCall: "Edit",
|
|
215
|
-
grepToolCall: "Grep",
|
|
216
|
-
webSearchToolCall: "WebSearch",
|
|
217
|
-
webFetchToolCall: "WebFetch",
|
|
218
|
-
taskToolCall: "Agent",
|
|
219
|
-
notebookEditToolCall: "NotebookEdit",
|
|
220
|
-
};
|
|
221
|
-
return KEY_MAP[key] ?? key;
|
|
222
|
-
}
|
|
223
|
-
|
|
224
|
-
export function normalizeCursorMessage(
|
|
225
|
-
msg: CursorMessageLine,
|
|
226
|
-
): UnifiedStreamMessage | null {
|
|
227
|
-
if (msg.type === "assistant" && msg.message?.content) {
|
|
228
|
-
// 按 cursor 官方 stream-json 规范区分三类 assistant 事件,避免 text 重复累加:
|
|
229
|
-
// ┌────────────────┬───────────────┬─────────────────┐
|
|
230
|
-
// │ 种类 │ timestamp_ms │ model_call_id │
|
|
231
|
-
// ├────────────────┼───────────────┼─────────────────┤
|
|
232
|
-
// │ Streaming delta│ 有 │ 无 │ → 唯一带新文本(text)
|
|
233
|
-
// │ Buffered flush │ 有 │ 有 │ → 工具调用前完整快照(text_final)
|
|
234
|
-
// │ Final flush │ 无 │ 无 │ → 回合末完整快照(text_final)
|
|
235
|
-
// └────────────────┴───────────────┴─────────────────┘
|
|
236
|
-
// 文档:cursor.com/docs/cli/reference/output-format
|
|
237
|
-
const isStreamingDelta =
|
|
238
|
-
msg.timestamp_ms !== undefined && msg.model_call_id === undefined;
|
|
239
|
-
const blocks: UnifiedBlock[] = [];
|
|
240
|
-
for (const block of msg.message.content) {
|
|
241
|
-
if (block.type === "thinking" && block.thinking) {
|
|
242
|
-
blocks.push({ type: "thinking", thinking: block.thinking });
|
|
243
|
-
} else if (block.type === "tool_use") {
|
|
244
|
-
blocks.push({
|
|
245
|
-
type: "tool_use",
|
|
246
|
-
id: block.tool_use_id,
|
|
247
|
-
name: block.name ?? "unknown",
|
|
248
|
-
input: block.input,
|
|
249
|
-
});
|
|
250
|
-
} else if (block.type === "tool_result") {
|
|
251
|
-
blocks.push({
|
|
252
|
-
type: "tool_result",
|
|
253
|
-
tool_use_id: block.tool_use_id ?? "",
|
|
254
|
-
content: block.content,
|
|
255
|
-
is_error: block.is_error,
|
|
256
|
-
});
|
|
257
|
-
} else if (block.type === "redacted_thinking") {
|
|
258
|
-
blocks.push({ type: "redacted_thinking" });
|
|
259
|
-
} else if (block.type === "search_result") {
|
|
260
|
-
blocks.push({
|
|
261
|
-
type: "search_result",
|
|
262
|
-
query: block.query ?? "",
|
|
263
|
-
});
|
|
264
|
-
} else if (block.type === "text" && block.text) {
|
|
265
|
-
blocks.push(
|
|
266
|
-
isStreamingDelta
|
|
267
|
-
? { type: "text", text: block.text }
|
|
268
|
-
: { type: "text_final", text: block.text },
|
|
269
|
-
);
|
|
270
|
-
}
|
|
271
|
-
}
|
|
272
|
-
return { type: "assistant", blocks };
|
|
273
|
-
}
|
|
274
|
-
|
|
275
|
-
// Cursor agent 发出的独立 thinking delta 消息
|
|
276
|
-
if (msg.type === "thinking" && msg.subtype === "delta" && msg.text) {
|
|
277
|
-
return {
|
|
278
|
-
type: "assistant",
|
|
279
|
-
blocks: [{ type: "thinking", thinking: msg.text }],
|
|
280
|
-
};
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
// Cursor agent 发出的独立 tool_call 消息(tool_call.started / tool_call.completed)
|
|
284
|
-
if (msg.type === "tool_call" && msg.call_id && msg.tool_call) {
|
|
285
|
-
const toolKey = Object.keys(msg.tool_call)[0];
|
|
286
|
-
if (!toolKey) return null;
|
|
287
|
-
const toolData = msg.tool_call[toolKey] as {
|
|
288
|
-
args?: Record<string, unknown>;
|
|
289
|
-
result?: Record<string, unknown>;
|
|
290
|
-
description?: string;
|
|
291
|
-
} | undefined;
|
|
292
|
-
if (!toolData) return null;
|
|
293
|
-
|
|
294
|
-
if (msg.subtype === "started") {
|
|
295
|
-
return {
|
|
296
|
-
type: "assistant",
|
|
297
|
-
blocks: [
|
|
298
|
-
{
|
|
299
|
-
type: "tool_use",
|
|
300
|
-
id: msg.call_id,
|
|
301
|
-
name: mapToolCallKey(toolKey),
|
|
302
|
-
input: toolData.args ?? {},
|
|
303
|
-
},
|
|
304
|
-
],
|
|
305
|
-
};
|
|
306
|
-
}
|
|
307
|
-
|
|
308
|
-
if (msg.subtype === "completed") {
|
|
309
|
-
const resultRaw = toolData.result as Record<string, unknown> | undefined;
|
|
310
|
-
const hasSuccess = resultRaw && "success" in resultRaw;
|
|
311
|
-
const hasError = resultRaw && "error" in resultRaw;
|
|
312
|
-
return {
|
|
313
|
-
type: "assistant",
|
|
314
|
-
blocks: [
|
|
315
|
-
{
|
|
316
|
-
type: "tool_result",
|
|
317
|
-
tool_use_id: msg.call_id,
|
|
318
|
-
content: hasSuccess
|
|
319
|
-
? (resultRaw!.success as Record<string, unknown>)?.stdout ??
|
|
320
|
-
resultRaw!.success
|
|
321
|
-
: hasError
|
|
322
|
-
? resultRaw!.error
|
|
323
|
-
: resultRaw ?? {},
|
|
324
|
-
is_error: hasError || undefined,
|
|
325
|
-
},
|
|
326
|
-
],
|
|
327
|
-
};
|
|
328
|
-
}
|
|
329
|
-
|
|
330
|
-
return null;
|
|
331
|
-
}
|
|
332
|
-
|
|
333
|
-
if (msg.type === "user" && msg.message?.content) {
|
|
334
|
-
// Cursor resume 模式会先 echo 一条用户输入消息(text 块就是用户原始输入),
|
|
335
|
-
// 不应混入 assistant 输出累加。这里只保留 tool_result(工具调用反馈)。
|
|
336
|
-
const blocks: UnifiedBlock[] = [];
|
|
337
|
-
for (const block of msg.message.content) {
|
|
338
|
-
if (block.type === "tool_result") {
|
|
339
|
-
blocks.push({
|
|
340
|
-
type: "tool_result",
|
|
341
|
-
tool_use_id: block.tool_use_id ?? "",
|
|
342
|
-
content: block.content,
|
|
343
|
-
is_error: block.is_error,
|
|
344
|
-
});
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
return { type: "user", blocks };
|
|
348
|
-
}
|
|
349
|
-
|
|
350
|
-
// result 消息:cursor 官方推荐的"权威最终文本"来源(流末发出,含完整一段文字)。
|
|
351
|
-
// 提取为 assistant 的 text_final 块,由 session.ts 累积到 finalCompleteText。
|
|
352
|
-
if (msg.type === "result" && typeof msg.result === "string" && msg.result.length > 0) {
|
|
353
|
-
return {
|
|
354
|
-
type: "assistant",
|
|
355
|
-
blocks: [{ type: "text_final", text: msg.result }],
|
|
356
|
-
isFinalResponse: true,
|
|
357
|
-
};
|
|
358
|
-
}
|
|
359
|
-
|
|
360
|
-
if (msg.type === "system" && msg.subtype === "compact_boundary") {
|
|
361
|
-
const meta = (msg as Record<string, unknown>).compact_metadata as
|
|
362
|
-
| { trigger?: "manual" | "auto"; pre_tokens?: number; post_tokens?: number }
|
|
363
|
-
| undefined;
|
|
364
|
-
if (!meta) return null;
|
|
365
|
-
return {
|
|
366
|
-
type: "system",
|
|
367
|
-
blocks: [
|
|
368
|
-
{
|
|
369
|
-
type: "compact_boundary",
|
|
370
|
-
trigger: meta.trigger ?? "auto",
|
|
371
|
-
pre_tokens: meta.pre_tokens ?? 0,
|
|
372
|
-
post_tokens: meta.post_tokens,
|
|
373
|
-
},
|
|
374
|
-
],
|
|
375
|
-
};
|
|
376
|
-
}
|
|
377
|
-
|
|
378
|
-
return null;
|
|
379
|
-
}
|
|
380
|
-
|
|
381
|
-
// ---------------------------------------------------------------------------
|
|
382
|
-
// 子进程辅助函数
|
|
383
|
-
// ---------------------------------------------------------------------------
|
|
384
|
-
|
|
385
|
-
function spawnAgent(
|
|
386
|
-
extraArgs: string[],
|
|
387
|
-
cwd?: string,
|
|
388
|
-
stdinText?: string,
|
|
389
|
-
modelOverride?: string,
|
|
390
|
-
mode?: "plan" | "ask",
|
|
391
|
-
spawnImpl: CursorSpawn = spawn,
|
|
392
|
-
): CursorProcessHandle {
|
|
393
|
-
let allArgs: string[];
|
|
394
|
-
if (mode) {
|
|
395
|
-
// plan/ask 模式:移除 --force/--yolo,添加 --mode plan/ask
|
|
396
|
-
allArgs = CURSOR_AGENT_ARGS.filter(a => a !== "--force" && a !== "--yolo");
|
|
397
|
-
allArgs.push("--mode", mode);
|
|
398
|
-
allArgs.push(...extraArgs);
|
|
399
|
-
} else {
|
|
400
|
-
allArgs = [...CURSOR_AGENT_ARGS, ...extraArgs];
|
|
401
|
-
}
|
|
402
|
-
if (modelOverride) {
|
|
403
|
-
// 替换全局 --model 为 per-session override
|
|
404
|
-
const modelIdx = allArgs.findIndex((a, i) => a === "--model" && i + 1 < allArgs.length);
|
|
405
|
-
if (modelIdx >= 0) {
|
|
406
|
-
allArgs[modelIdx + 1] = modelOverride;
|
|
407
|
-
} else {
|
|
408
|
-
allArgs.push("--model", modelOverride);
|
|
409
|
-
}
|
|
410
|
-
}
|
|
411
|
-
const proc = spawnImpl(CURSOR_AGENT_COMMAND, allArgs, {
|
|
412
|
-
cwd,
|
|
413
|
-
stdio: [stdinText !== undefined ? "pipe" : "ignore", "pipe", "pipe"],
|
|
414
|
-
windowsHide: true,
|
|
415
|
-
shell: true,
|
|
416
|
-
});
|
|
417
|
-
|
|
418
|
-
console.log(`[Cursor debug] spawn: cmd=${CURSOR_AGENT_COMMAND}, args=[${allArgs.join(", ")}], cwd=${cwd ?? "(none)"}, stdinLen=${stdinText?.length ?? 0}, pid=${proc.pid}`);
|
|
419
|
-
|
|
420
|
-
// 收集 stderr,子进程异常退出时输出到日志,方便排查静默失败
|
|
421
|
-
let stderr = "";
|
|
422
|
-
let closeInfo: CursorProcessCloseInfo | null = null;
|
|
423
|
-
let resolveClose: (info: CursorProcessCloseInfo) => void = () => {};
|
|
424
|
-
const closePromise = new Promise<CursorProcessCloseInfo>((resolve) => {
|
|
425
|
-
resolveClose = resolve;
|
|
426
|
-
});
|
|
427
|
-
const settleClose = (code: number | null, signal: NodeJS.Signals | null) => {
|
|
428
|
-
if (closeInfo) return;
|
|
429
|
-
closeInfo = { code, signal, stderr };
|
|
430
|
-
if (stderr.trim()) {
|
|
431
|
-
console.error(`[Cursor stderr] exit=${code}: ${stderr.trim().slice(0, 2000)}`);
|
|
432
|
-
}
|
|
433
|
-
resolveClose(closeInfo);
|
|
434
|
-
};
|
|
435
|
-
proc.stderr!.on("data", (chunk: Buffer) => { stderr += chunk.toString(); });
|
|
436
|
-
proc.once("error", (err) => {
|
|
437
|
-
stderr += `${stderr ? "\n" : ""}${(err as Error).message}`;
|
|
438
|
-
settleClose(null, null);
|
|
439
|
-
});
|
|
440
|
-
proc.once("close", (code, signal) => { settleClose(code, signal); });
|
|
441
|
-
|
|
442
|
-
if (stdinText !== undefined) {
|
|
443
|
-
proc.stdin!.write(stdinText);
|
|
444
|
-
proc.stdin!.end();
|
|
445
|
-
}
|
|
446
|
-
return {
|
|
447
|
-
proc,
|
|
448
|
-
getStderr: () => stderr,
|
|
449
|
-
waitForClose: async () => {
|
|
450
|
-
if (closeInfo) return { ...closeInfo, stderr };
|
|
451
|
-
const info = await closePromise;
|
|
452
|
-
return { ...info, stderr };
|
|
453
|
-
},
|
|
454
|
-
};
|
|
455
|
-
}
|
|
456
|
-
|
|
457
|
-
async function* readJsonLines(
|
|
458
|
-
proc: ChildProcess,
|
|
459
|
-
signal?: AbortSignal,
|
|
460
|
-
debugTag?: string,
|
|
461
|
-
rawLog?: RawStreamLogHandle | null,
|
|
462
|
-
stats?: CursorStreamStats,
|
|
463
|
-
idleTimeoutMs?: number,
|
|
464
|
-
): AsyncGenerator<CursorMessageLine> {
|
|
465
|
-
const tag = debugTag ?? "cursor";
|
|
466
|
-
yield* readJsonLinesWithBadJsonIdleWatchdog<CursorMessageLine>({
|
|
467
|
-
input: proc.stdout!,
|
|
468
|
-
tool: "cursor",
|
|
469
|
-
tag,
|
|
470
|
-
signal,
|
|
471
|
-
rawLog,
|
|
472
|
-
idleTimeoutMs,
|
|
473
|
-
parse: (line) => JSON.parse(line) as CursorMessageLine,
|
|
474
|
-
onRawLine: (line) => {
|
|
475
|
-
if (stats) {
|
|
476
|
-
stats.rawLineCount++;
|
|
477
|
-
stats.stdoutLength += Buffer.byteLength(line, "utf-8") + 1;
|
|
478
|
-
}
|
|
479
|
-
},
|
|
480
|
-
onParsedLine: () => {
|
|
481
|
-
if (stats) stats.parsedLineCount++;
|
|
482
|
-
},
|
|
483
|
-
onDone: (info) => {
|
|
484
|
-
console.log(`[Cursor debug] ${tag} readJsonLines done: ${info.lineCount} raw lines, signalAborted=${info.signalAborted}`);
|
|
485
|
-
},
|
|
486
|
-
});
|
|
487
|
-
}
|
|
488
|
-
|
|
489
|
-
// ---------------------------------------------------------------------------
|
|
490
|
-
// 适配器实现
|
|
491
|
-
// ---------------------------------------------------------------------------
|
|
492
|
-
|
|
493
|
-
class CursorAdapter implements ToolAdapter {
|
|
494
|
-
readonly displayName = "Cursor";
|
|
495
|
-
readonly sessionDescPrefix = "Cursor Session:";
|
|
496
|
-
private activeProcs = new Set<ChildProcess>();
|
|
497
|
-
private metaStore: CursorSessionMetaStore;
|
|
498
|
-
private modelOverride: string | undefined;
|
|
499
|
-
private spawnImpl: CursorSpawn;
|
|
500
|
-
private badJsonIdleTimeoutMs: number | undefined;
|
|
501
|
-
|
|
502
|
-
constructor(
|
|
503
|
-
metaStore: CursorSessionMetaStore,
|
|
504
|
-
modelOverride?: string,
|
|
505
|
-
spawnImpl: CursorSpawn = spawn,
|
|
506
|
-
badJsonIdleTimeoutMs?: number,
|
|
507
|
-
) {
|
|
508
|
-
this.metaStore = metaStore;
|
|
509
|
-
this.modelOverride = modelOverride;
|
|
510
|
-
this.spawnImpl = spawnImpl;
|
|
511
|
-
this.badJsonIdleTimeoutMs = badJsonIdleTimeoutMs;
|
|
512
|
-
}
|
|
513
|
-
|
|
514
|
-
async createSession(cwd: string, signal?: AbortSignal): Promise<CreateSessionResult> {
|
|
515
|
-
if (signal?.aborted) throw new Error("Cursor session creation aborted");
|
|
516
|
-
const handle = spawnAgent(["ok"], cwd, undefined, this.modelOverride, undefined, this.spawnImpl);
|
|
517
|
-
const proc = handle.proc;
|
|
518
|
-
const stats = createCursorStreamStats();
|
|
519
|
-
this.activeProcs.add(proc);
|
|
520
|
-
const onAbort = () => { void killProcessTree(proc.pid); };
|
|
521
|
-
signal?.addEventListener("abort", onAbort, { once: true });
|
|
522
|
-
|
|
523
|
-
try {
|
|
524
|
-
for await (const msg of readJsonLines(proc, signal, "createSession", null, stats, this.badJsonIdleTimeoutMs)) {
|
|
525
|
-
if (msg.type === "system" && msg.subtype === "init" && msg.session_id) {
|
|
526
|
-
const sessionId = msg.session_id;
|
|
527
|
-
await this.metaStore
|
|
528
|
-
.set(sessionId, { cwd: msg.cwd ?? cwd, model: msg.model })
|
|
529
|
-
.catch(() => {});
|
|
530
|
-
return { sessionId };
|
|
531
|
-
}
|
|
532
|
-
}
|
|
533
|
-
|
|
534
|
-
if (signal?.aborted) throw new Error("Cursor session creation aborted");
|
|
535
|
-
const closeInfo = await handle.waitForClose();
|
|
536
|
-
const visibleMessage = formatCursorAgentEmptyOutputMessage({
|
|
537
|
-
exitCode: closeInfo.code,
|
|
538
|
-
stdoutLength: stats.stdoutLength,
|
|
539
|
-
stderr: closeInfo.stderr,
|
|
540
|
-
});
|
|
541
|
-
if (visibleMessage) throw new Error(visibleMessage);
|
|
542
|
-
throw new Error("No session ID in Cursor init event");
|
|
543
|
-
} finally {
|
|
544
|
-
signal?.removeEventListener("abort", onAbort);
|
|
545
|
-
await killProcessTree(proc.pid);
|
|
546
|
-
this.activeProcs.delete(proc);
|
|
547
|
-
}
|
|
548
|
-
}
|
|
549
|
-
|
|
550
|
-
async *prompt(
|
|
551
|
-
sessionId: string,
|
|
552
|
-
userText: string,
|
|
553
|
-
cwd: string,
|
|
554
|
-
signal?: AbortSignal,
|
|
555
|
-
options?: ToolPromptOptions,
|
|
556
|
-
): AsyncIterable<UnifiedStreamMessage> {
|
|
557
|
-
console.log(`[Cursor debug] prompt start: sessionId=${sessionId}, cwd=${cwd}, userTextLen=${userText.length}`);
|
|
558
|
-
const cmd = parseUserCommand(userText);
|
|
559
|
-
const handle = spawnAgent(
|
|
560
|
-
["--resume", sessionId],
|
|
561
|
-
cwd,
|
|
562
|
-
buildCursorPromptText(userText),
|
|
563
|
-
this.modelOverride,
|
|
564
|
-
cmd.mode ?? undefined,
|
|
565
|
-
this.spawnImpl,
|
|
566
|
-
);
|
|
567
|
-
const proc = handle.proc;
|
|
568
|
-
this.activeProcs.add(proc);
|
|
569
|
-
if (proc.pid !== undefined) options?.onProcessStart?.({ pid: proc.pid });
|
|
570
|
-
|
|
571
|
-
const rawLogConfig = config.rawStreamLogs.cursor;
|
|
572
|
-
let rawLog: RawStreamLogHandle | null = null;
|
|
573
|
-
try {
|
|
574
|
-
rawLog = await createRawStreamLog({
|
|
575
|
-
enabled: rawLogConfig.enabled,
|
|
576
|
-
rootDir: RAW_STREAM_LOGS_DIR,
|
|
577
|
-
tool: "cursor",
|
|
578
|
-
sessionId,
|
|
579
|
-
label: "prompt",
|
|
580
|
-
maxBytesPerTurn: rawLogConfig.maxBytesPerTurn,
|
|
581
|
-
retentionDays: rawLogConfig.retentionDays,
|
|
582
|
-
});
|
|
583
|
-
} catch (err) {
|
|
584
|
-
console.error(`[Cursor raw stream log] create failed: ${(err as Error).message}`);
|
|
585
|
-
}
|
|
586
|
-
|
|
587
|
-
// 见 codex-adapter.ts 同位置注释:spawn 用了 shell:true,必须杀整棵树,
|
|
588
|
-
// 否则 abort 后真正在跑的孙进程 cursor-agent 还会继续输出 & 占用资源。
|
|
589
|
-
const onAbort = () => { void killProcessTree(proc.pid); };
|
|
590
|
-
signal?.addEventListener("abort", onAbort, { once: true });
|
|
591
|
-
let sawResult = false;
|
|
592
|
-
const stats = createCursorStreamStats();
|
|
593
|
-
|
|
594
|
-
try {
|
|
595
|
-
for await (const raw of readJsonLines(proc, signal, sessionId, rawLog, stats, this.badJsonIdleTimeoutMs)) {
|
|
596
|
-
if (signal?.aborted) break;
|
|
597
|
-
if (
|
|
598
|
-
raw.type === "system" &&
|
|
599
|
-
raw.subtype === "init" &&
|
|
600
|
-
raw.session_id &&
|
|
601
|
-
(raw.cwd || raw.model)
|
|
602
|
-
) {
|
|
603
|
-
this.metaStore
|
|
604
|
-
.set(raw.session_id, { cwd: raw.cwd, model: raw.model })
|
|
605
|
-
.catch(() => {});
|
|
606
|
-
}
|
|
607
|
-
const normalized = normalizeCursorMessage(raw);
|
|
608
|
-
if (normalized) yield normalized;
|
|
609
|
-
|
|
610
|
-
// result 是流末事件,收到后立即结束进程,防止 CLI 僵死导致 readline 挂起。
|
|
611
|
-
if (raw.type === "result") {
|
|
612
|
-
sawResult = true;
|
|
613
|
-
void killProcessTree(proc.pid);
|
|
614
|
-
break;
|
|
615
|
-
}
|
|
616
|
-
}
|
|
617
|
-
if (!signal?.aborted && !sawResult) {
|
|
618
|
-
const closeInfo = await handle.waitForClose();
|
|
619
|
-
const visibleMessage = formatCursorAgentEmptyOutputMessage({
|
|
620
|
-
exitCode: closeInfo.code,
|
|
621
|
-
stdoutLength: stats.stdoutLength,
|
|
622
|
-
stderr: closeInfo.stderr,
|
|
623
|
-
});
|
|
624
|
-
if (visibleMessage) {
|
|
625
|
-
yield {
|
|
626
|
-
type: "assistant",
|
|
627
|
-
blocks: [{ type: "text_final", text: visibleMessage }],
|
|
628
|
-
};
|
|
629
|
-
throw createCursorAgentFailureError(closeInfo);
|
|
630
|
-
}
|
|
631
|
-
}
|
|
632
|
-
} finally {
|
|
633
|
-
signal?.removeEventListener("abort", onAbort);
|
|
634
|
-
await killProcessTree(proc.pid);
|
|
635
|
-
await rawLog?.close({ keep: rawLogConfig.keepCompleted || signal?.aborted === true || !sawResult });
|
|
636
|
-
this.activeProcs.delete(proc);
|
|
637
|
-
if (proc.pid !== undefined) options?.onProcessExit?.({ pid: proc.pid });
|
|
638
|
-
console.log(`[Cursor debug] prompt end: sessionId=${sessionId}, signalAborted=${signal?.aborted ?? false}`);
|
|
639
|
-
}
|
|
640
|
-
}
|
|
641
|
-
|
|
642
|
-
async getSessionInfo(
|
|
643
|
-
sessionId: string,
|
|
644
|
-
): Promise<SessionInfo | undefined> {
|
|
645
|
-
const meta = await this.metaStore.get(sessionId);
|
|
646
|
-
if (!meta) return { sessionId };
|
|
647
|
-
return meta.model
|
|
648
|
-
? { sessionId, cwd: meta.cwd, model: meta.model }
|
|
649
|
-
: { sessionId, cwd: meta.cwd };
|
|
650
|
-
}
|
|
651
|
-
|
|
652
|
-
async closeSession(_sessionId: string): Promise<void> {
|
|
653
|
-
// 子进程由 prompt 的 finally 自动 kill
|
|
654
|
-
}
|
|
655
|
-
}
|
|
656
|
-
|
|
657
|
-
// ---------------------------------------------------------------------------
|
|
658
|
-
// 工厂函数
|
|
659
|
-
// ---------------------------------------------------------------------------
|
|
660
|
-
|
|
661
|
-
export interface CreateCursorAdapterOptions {
|
|
662
|
-
/** 注入自定义 meta 持久化 store(测试用);未提供时使用全局默认实例。 */
|
|
663
|
-
metaStore?: CursorSessionMetaStore;
|
|
664
|
-
/** per-session 模型覆盖(/model 命令);传了就用,不传走全局 cursor.model */
|
|
665
|
-
model?: string;
|
|
666
|
-
/** 注入自定义 spawn 实现(测试用)。 */
|
|
667
|
-
spawn?: CursorSpawn;
|
|
668
|
-
/** Test-only override for the bad JSON idle watchdog threshold. */
|
|
669
|
-
badJsonIdleTimeoutMs?: number;
|
|
670
|
-
}
|
|
671
|
-
|
|
672
|
-
export function createCursorAdapter(
|
|
673
|
-
options: CreateCursorAdapterOptions = {},
|
|
674
|
-
): ToolAdapter {
|
|
675
|
-
return new CursorAdapter(
|
|
676
|
-
options.metaStore ?? defaultCursorSessionMetaStore,
|
|
677
|
-
options.model,
|
|
678
|
-
options.spawn,
|
|
679
|
-
options.badJsonIdleTimeoutMs,
|
|
680
|
-
);
|
|
681
|
-
}
|