mirror of
https://github.com/wu736139669/hapi.git
synced 2026-08-08 07:17:39 +00:00
feat(cursor): migrate remote sessions to ACP with model/variant pickers (#799)
* feat(cli,web,hub): migrate Cursor remote sessions to ACP with model/effort pickers Move stream-json remote launcher to legacy path and add ACP launcher with set_config_option model/mode sync, optimistic keepalive on config changes, and shared catalog caching. Web gets dual base/effort Cursor pickers for session and new-session flows; hide composer status bar when Cursor sends no usage_update. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,web,shared): Cursor model picker — ACP wires + CLI sku variants Enrich the web/mobile picker with agent --list-models SKUs grouped under ACP wire bases, fix session-open base highlight, and keep catalog discovery safe while the ACP transport holds the CLI lock. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cursor-acp): apply ACP default model when web resets to Default Web sends model: null for Default; push session/set_config_option with the ACP default[] wire so Cursor backend matches hub state. Regression tests for setModel(null) and applyModelConfig(null). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(acp): clear stale agent-acp lock when owning process is gone Check lock pid with signal 0; remove orphaned lock dirs after SIGKILL or crash so listCursorModels can run cold probes again. Regression tests for guard and catalog discovery. Co-authored-by: Cursor <cursoragent@cursor.com> * test(cursor): use live pid for ACP lock handler tests Stale-lock cleanup clears dead pids; handler tests must simulate an active lock with the current process pid to avoid cold probes/timeouts. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(acp): scope agent CLI lock guard to Cursor agent command only Gemini/OpenCode/Kimi ACP sessions must not register agent-acp-active; that blocked listCursorModels while unrelated backends were running. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,web): reject Cursor model changes for local sessions Hub returns 409 when controlledByUser is set, matching Codex. Web hides model and variant pickers for local Cursor sessions so users do not hit a dead RPC path. Document pre-push-review in AGENTS.md. Verified: bun typecheck; bun run test (919 cli + 243 hub + 768 web + 46 shared). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(web): send stable ids for Cursor ask_question replies Parse and submit question.id and option.id so ACP receives keys like { approach: ['a'] } instead of index/label. Verified: bun typecheck && bun run test. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
SSU-WEI HUANG
@@ -0,0 +1,270 @@
|
||||
import React from 'react';
|
||||
import { spawn } from 'node:child_process';
|
||||
import { createInterface } from 'node:readline';
|
||||
import { logger } from '@/ui/logger';
|
||||
import { killProcessByChildProcess } from '@/utils/process';
|
||||
import { convertAgentMessage } from '@/agent/messageConverter';
|
||||
import { OpencodeDisplay } from '@/ui/ink/OpencodeDisplay';
|
||||
import {
|
||||
RemoteLauncherBase,
|
||||
type RemoteLauncherDisplayContext,
|
||||
type RemoteLauncherExitReason
|
||||
} from '@/modules/common/remote/RemoteLauncherBase';
|
||||
import type { CursorSession } from './session';
|
||||
// TODO(cursor-acp): remove legacy stream-json resume path after migration window.
|
||||
// New Cursor sessions use ACP only. This path exists because pre-ACP Cursor
|
||||
// session_id values are not loadable via ACP session/load.
|
||||
|
||||
import type { CursorStreamEvent } from './utils/cursorLegacyEventConverter';
|
||||
import { parseCursorEvent, convertCursorEventToAgentMessage } from './utils/cursorLegacyEventConverter';
|
||||
import { cursorPassThroughStatusMessage, parseCursorSpecialCommand } from './cursorSpecialCommands';
|
||||
|
||||
function buildAgentArgs(opts: {
|
||||
message: string;
|
||||
cwd: string;
|
||||
sessionId: string | null;
|
||||
mode?: string;
|
||||
model?: string;
|
||||
yolo?: boolean;
|
||||
}): string[] {
|
||||
const args = ['-p', opts.message, '--output-format', 'stream-json', '--trust', '--workspace', opts.cwd];
|
||||
|
||||
if (opts.sessionId) {
|
||||
args.push('--resume', opts.sessionId);
|
||||
}
|
||||
if (opts.mode && (opts.mode === 'plan' || opts.mode === 'ask' || opts.mode === 'debug')) {
|
||||
args.push('--mode', opts.mode);
|
||||
}
|
||||
if (opts.model) {
|
||||
args.push('--model', opts.model);
|
||||
}
|
||||
if (opts.yolo) {
|
||||
args.push('--yolo');
|
||||
}
|
||||
|
||||
return args;
|
||||
}
|
||||
|
||||
function permissionModeToAgentArgs(mode?: string): { mode?: string; yolo?: boolean } {
|
||||
if (mode === 'plan') return { mode: 'plan' };
|
||||
if (mode === 'ask') return { mode: 'ask' };
|
||||
if (mode === 'debug') return { mode: 'debug' };
|
||||
if (mode === 'yolo') return { yolo: true };
|
||||
return {};
|
||||
}
|
||||
|
||||
class CursorRemoteLauncher extends RemoteLauncherBase {
|
||||
private readonly session: CursorSession;
|
||||
private abortController = new AbortController();
|
||||
private displayPermissionMode: string | null = null;
|
||||
|
||||
constructor(session: CursorSession) {
|
||||
super(process.env.DEBUG ? session.logPath : undefined);
|
||||
this.session = session;
|
||||
}
|
||||
|
||||
public async launch(): Promise<RemoteLauncherExitReason> {
|
||||
return this.start({
|
||||
onExit: () => this.handleExitFromUi(),
|
||||
onSwitchToLocal: () => this.handleSwitchFromUi()
|
||||
});
|
||||
}
|
||||
|
||||
protected createDisplay(context: RemoteLauncherDisplayContext): React.ReactElement {
|
||||
return React.createElement(OpencodeDisplay, context);
|
||||
}
|
||||
|
||||
protected async runMainLoop(): Promise<void> {
|
||||
const session = this.session;
|
||||
const messageBuffer = this.messageBuffer;
|
||||
|
||||
this.setupAbortHandlers(session.client.rpcHandlerManager, {
|
||||
onAbort: () => this.handleAbort(),
|
||||
onSwitch: () => this.handleSwitchRequest()
|
||||
});
|
||||
|
||||
const sendReady = () => {
|
||||
session.sendSessionEvent({ type: 'ready' });
|
||||
};
|
||||
|
||||
let cursorSessionId: string | null = session.sessionId;
|
||||
if (cursorSessionId) {
|
||||
session.onSessionFoundWithProtocol(cursorSessionId, 'stream-json');
|
||||
}
|
||||
|
||||
while (!this.shouldExit) {
|
||||
const waitSignal = this.abortController.signal;
|
||||
const batch = await session.queue.waitForMessagesAndGetAsString(waitSignal);
|
||||
if (!batch) {
|
||||
if (waitSignal.aborted && !this.shouldExit) {
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
const { message, mode } = batch;
|
||||
const specialCommand = parseCursorSpecialCommand(message);
|
||||
|
||||
const { mode: agentMode, yolo } = permissionModeToAgentArgs(mode.permissionMode as string);
|
||||
this.applyDisplayMode(mode.permissionMode as string);
|
||||
messageBuffer.addMessage(message, 'user');
|
||||
|
||||
if (specialCommand.type === 'pass-through') {
|
||||
logger.debug(`[cursor-remote] /${specialCommand.command} — pass-through to agent -p`);
|
||||
messageBuffer.addMessage(cursorPassThroughStatusMessage(specialCommand.command), 'status');
|
||||
}
|
||||
|
||||
const args = buildAgentArgs({
|
||||
message,
|
||||
cwd: session.path,
|
||||
sessionId: cursorSessionId,
|
||||
mode: agentMode,
|
||||
model: mode.model,
|
||||
yolo
|
||||
});
|
||||
|
||||
logger.debug(`[cursor-remote] Spawning agent with args: ${args.join(' ')}`);
|
||||
|
||||
session.onThinkingChange(true);
|
||||
|
||||
try {
|
||||
const exitCode = await this.runAgentProcess(args, session.path, (event) => {
|
||||
if (event.type === 'system' && event.subtype === 'init' && event.session_id) {
|
||||
cursorSessionId = event.session_id;
|
||||
session.onSessionFoundWithProtocol(event.session_id, 'stream-json');
|
||||
} else if (event.type === 'thinking') {
|
||||
if (event.subtype === 'completed') {
|
||||
// keep thinking until we get assistant/result
|
||||
}
|
||||
} else if (event.type === 'assistant' || event.type === 'tool_call' || event.type === 'result') {
|
||||
const agentMsg = convertCursorEventToAgentMessage(event);
|
||||
if (agentMsg) {
|
||||
const codexMsg = convertAgentMessage(agentMsg);
|
||||
if (codexMsg) {
|
||||
session.sendAgentMessage(codexMsg);
|
||||
}
|
||||
switch (agentMsg.type) {
|
||||
case 'text':
|
||||
messageBuffer.addMessage(agentMsg.text, 'assistant');
|
||||
break;
|
||||
case 'tool_call':
|
||||
messageBuffer.addMessage(`Tool: ${agentMsg.name}`, 'tool');
|
||||
break;
|
||||
case 'tool_result':
|
||||
messageBuffer.addMessage('Tool result', 'result');
|
||||
break;
|
||||
case 'turn_complete':
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (exitCode !== 0 && exitCode !== null) {
|
||||
logger.debug(`[cursor-remote] Agent exited with code ${exitCode}`);
|
||||
messageBuffer.addMessage(`Agent exited with code ${exitCode}`, 'status');
|
||||
}
|
||||
} catch (error) {
|
||||
logger.warn('[cursor-remote] Agent run failed', error);
|
||||
const errMsg = error instanceof Error ? error.message : String(error);
|
||||
session.sendSessionEvent({ type: 'message', message: `Cursor Agent failed: ${errMsg}` });
|
||||
messageBuffer.addMessage(`Cursor Agent failed: ${errMsg}`, 'status');
|
||||
} finally {
|
||||
session.onThinkingChange(false);
|
||||
if (session.queue.size() === 0 && !this.shouldExit) {
|
||||
sendReady();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private runAgentProcess(
|
||||
args: string[],
|
||||
cwd: string,
|
||||
onEvent: (event: ReturnType<typeof parseCursorEvent> & object) => void
|
||||
): Promise<number | null> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const child = spawn('agent', args, {
|
||||
cwd,
|
||||
env: process.env,
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
shell: process.platform === 'win32',
|
||||
windowsHide: process.platform === 'win32'
|
||||
});
|
||||
|
||||
const abortHandler = () => {
|
||||
killProcessByChildProcess(child, false).catch(() => {});
|
||||
resolve(null);
|
||||
};
|
||||
this.abortController.signal.addEventListener('abort', abortHandler);
|
||||
|
||||
const cleanup = () => {
|
||||
this.abortController.signal.removeEventListener('abort', abortHandler);
|
||||
};
|
||||
|
||||
child.on('error', (err) => {
|
||||
cleanup();
|
||||
reject(err);
|
||||
});
|
||||
|
||||
child.on('exit', (code, signal) => {
|
||||
cleanup();
|
||||
resolve(code);
|
||||
});
|
||||
|
||||
const rl = createInterface({ input: child.stdout, crlfDelay: Infinity });
|
||||
rl.on('line', (line) => {
|
||||
const event = parseCursorEvent(line);
|
||||
if (event) {
|
||||
onEvent(event);
|
||||
}
|
||||
});
|
||||
|
||||
child.stderr?.on('data', (chunk) => {
|
||||
const text = chunk.toString();
|
||||
if (text.trim()) {
|
||||
logger.debug('[cursor-remote] agent stderr:', text.trim());
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private applyDisplayMode(permissionMode: string | undefined): void {
|
||||
if (permissionMode && permissionMode !== this.displayPermissionMode) {
|
||||
this.displayPermissionMode = permissionMode;
|
||||
this.messageBuffer.addMessage(`[MODE:${permissionMode}]`, 'system');
|
||||
}
|
||||
}
|
||||
|
||||
protected async cleanup(): Promise<void> {
|
||||
this.clearAbortHandlers(this.session.client.rpcHandlerManager);
|
||||
this.abortController.abort();
|
||||
}
|
||||
|
||||
private async handleAbort(): Promise<void> {
|
||||
this.session.queue.reset();
|
||||
this.session.onThinkingChange(false);
|
||||
this.abortController.abort();
|
||||
this.abortController = new AbortController();
|
||||
this.messageBuffer.addMessage('Turn aborted', 'status');
|
||||
}
|
||||
|
||||
private async handleExitFromUi(): Promise<void> {
|
||||
await this.requestExit('exit', () => this.handleAbort());
|
||||
}
|
||||
|
||||
private async handleSwitchFromUi(): Promise<void> {
|
||||
await this.requestExit('switch', () => this.handleAbort());
|
||||
}
|
||||
|
||||
private async handleSwitchRequest(): Promise<void> {
|
||||
await this.requestExit('switch', () => this.handleAbort());
|
||||
}
|
||||
}
|
||||
|
||||
export async function cursorLegacyRemoteLauncher(session: CursorSession): Promise<'switch' | 'exit'> {
|
||||
const launcher = new CursorRemoteLauncher(session);
|
||||
return launcher.launch();
|
||||
}
|
||||
Reference in New Issue
Block a user