mirror of
https://github.com/wu736139669/hapi.git
synced 2026-11-08 01:43:07 +00:00
* feat(shared): steer capability gates and live steered signal schemas - STEERING_SUPPORTED_FLAVORS / isSteeringSupportedForSession gate which agents can deliver queued messages into the active turn (pi, codex, cursor ACP; legacy stream-json cursor excluded) - AgentState.steeringActive, DecryptedMessage.steered and messages-consumed live signal (never persisted by the hub) * feat(cli): queue reservations and steered messages-consumed option - MessageQueue2 gains takeByLocalId/restoreReservation/ beginReservationDispatch/commitReservation so an async steer can reserve a queued row without racing the main loop's turn/start drain - emitMessagesConsumed accepts steered: true to mark mid-turn delivery * feat(codex): mid-turn steer via app-server turn/steer (#888) - CodexAppServerClient.steerTurn + TurnSteerParams/Response types - CodexRemoteLauncher registers the steer-queued-message RPC handler: reserves the queued row, validates it against the active turn (no control commands, matching mode hash), injects via turn/steer with an epoch guard that invalidates in-flight steers on abort/cleanup - steeringActive agent state tracks the active-turn window - hub syncEngine gate opens to codex; messages-consumed relays steered * feat(web): Steered badge and steer gating for codex sessions - HappyUserMessage shows a ↳ Steered badge fed by the live messages-consumed steered signal, preserved across server echoes and refetches (mergeMessages carries the optimistic marker) - SessionChat gates canSteer via isSteeringSupportedForSession instead of the pi-only check - clearStaleQueuedStatus normalizes a queued status on an invoked message - fix(web): drop duplicate showSessionSummaryInChat in markdown test (upstream typecheck breakage) * feat(acp): split request dispatch from completion and add soft steer - AcpStdioTransport.sendRequestWithDispatch separates stdin-accepted dispatch from the JSON-RPC response, keeping sendRequest behavior unchanged - AcpSdkBackend tracks concurrent session/prompt requests with an activePromptRequests counter (main prompt + soft steers); response completion stays pending until every concurrent prompt settles - beginSoftSteerPrompt kicks off a concurrent session/prompt (Cursor GUI Send semantics — no cancel, no handler swap) returning {dispatched, completed}; softSteerPrompt awaits the full response for direct callers * feat(cursor): mid-turn soft steer via concurrent session/prompt (#888) - CursorAcpRemoteLauncher registers the steer-queued-message RPC handler: reserves the queued row, rejects control commands and mode mismatches, then soft-injects via beginSoftSteerPrompt without canceling the in-flight turn - Acks the hub once stdin accepts the inject (not on turn completion) to stay inside the 30s RPC window; the launcher stays busy until the concurrent prompt settles so handlers are not swapped mid-inject - steeringActive agent state mirrors the active-turn window; abort and cleanup reset it and invalidate pending steers - Legacy stream-json Cursor sessions register a steer handler that reports unsupported * fix(codex,shared): address bot findings on steer gate and ambiguous turn/steer - STEERING_SUPPORTED_FLAVORS / isSteeringSupportedForSession advertise codex and pi only; cursor joins when its soft-steer handler lands (#1609) - turn/steer now splits dispatch (stdin accepted) from completion (turn finished): the hub RPC acks once dispatch succeeds — never on the concurrent turn's completion, which can exceed the 30s RPC window - queue row commits only after the turn settles; a rejected/aborted steer restores the row so the message still delivers via turn/start, and a dispatched steer is never restored (no duplicate delivery) - steer carries clientUserMessageId (echoed as userMessage.clientId) so ambiguous transport failures can reconcile the thread later - client tests cover dispatch/complete split and stdin-write failure * feat(shared): advertise cursor in the steer gate now that its handler lands Cursor ACP sessions pass the web and hub steer gates; legacy stream-json cursor sessions stay excluded. * fix(codex): reconcile dispatched steers before restoring; align error copy - A dispatched turn/steer whose completion fails (disconnect / protocol error) is now reconciled via thread/read by clientUserMessageId before the queued row is restored — the instruction is only re-delivered by turn/start when the thread never received it - Reconcile targets the pinned steer thread, not whichever turn is current when completion fails - syncEngine unsupported-flavor error now matches the capability gate (Pi and Codex only until the cursor handler lands) - launcher tests cover steer success (ack on dispatch), reconcile-accepted and reconcile-rejected outcomes * fix(codex): consume the row at dispatch; drop background reconcile - The hub RPC acks and the queue row is consumed as soon as stdin accepts turn/steer; completion is background-only logging. A dispatched steer is never restored, so the same localId cannot be re-delivered via turn/start after the caller was told the steer succeeded - Dispatch failure (stdin write error) still restores the row and reports failure - steer.completed rejection is always handled (no unhandled rejection on the dispatch-failure path) - tests updated: completion failure after dispatch keeps the row consumed; dispatch failure restores it * fix(cursor): consume the row at dispatch; keep waiters for prompt gating - The hub RPC acks and the queue row is consumed as soon as stdin accepts the concurrent session/prompt; completion is background-only. A dispatched steer is never restored (no duplicate via the next prompt) - softSteerWaiters are registered before awaiting dispatch so the main loop's finally cannot start the next prompt mid-inject; they still gate prompt handover on completion - tests updated: post-dispatch ACP rejection keeps the row consumed * fix(cursor,hub): never hang teardown on unresolved soft steer; align diagnostics - Prompt-finally waits for soft-steer completion only when not exiting; the outer finally no longer waits at all — cleanup() disconnects the ACP transport, which rejects pending requests and settles the waiters - syncEngine gate diagnostics and JSDoc name all supported flavors (Pi, Codex, Cursor ACP) - regression test: Switch with an unresolved soft-steer completion still reaches teardown * fix(codex): distinguish definite rejection from indeterminate completion - Transport-level failures (timeout, abort, disconnect, spawn, protocol) carry an indeterminate marker; explicit JSON-RPC error responses do not - After a dispatched steer, turn completion resolves → commit + consumed; a definite app-server rejection restores the row (instruction was never accepted, so turn/start cannot duplicate it); an indeterminate outcome leaves the row reserved so it can never be delivered twice - Completion handling registers before awaiting dispatch so the dispatch-failure path cannot leak an unhandled rejection - client/launcher tests cover explicit rejection (restore), indeterminate outcome (row stays reserved) and dispatch failure * fix(codex): reconcile indeterminate steers instead of a permanent reservation - After an indeterminate completion (disconnect/protocol), reconcile the thread by clientUserMessageId immediately: accepted → commit + consumed, provably rejected → restore, still unreadable → keep the reservation and retry from the main-loop top on later passes (post-reconnect) - A row never sits in dispatching forever: the hub cannot stamp it invoked while the instruction may never have been accepted - tests: indeterminate keeps reserved while thread unreadable; accepted reconciliation consumes; rejected path restores * fix(cursor): abort drops soft-steer waiters so the next prompt never blocks - Ordinary Abort (shouldExit false) now clears softSteerWaiters: the prompt finally cannot wait forever on a soft steer whose completion is unbounded; the ACP cancel rejects in-flight requests, and cleanup() settles leftovers on session end - regression test: unresolved soft-steer completion after Abort no longer blocks the next prompt * fix(codex): accept all thread item shapes; retry reconcile; ack through abort - Reconcile matcher accepts userMessage/user_message with clientId/ client_id, matching the shapes the thread parser supports — an accepted steer can no longer be misclassified as rejected - A pending reconciliation schedules a wakeLoop retry, so a temporary app-server outage cannot strand the reservation behind waitForTurnOrRecovery - The success-path ACK no longer checks the steer epoch: the hub already reported steered on dispatch, so commit + messages-consumed must reach it even when an abort resets the queue in between * fix(cursor,acp): abort force-settles soft-steer bookkeeping - AcpSdkBackend.abortSoftSteers() drops the concurrent-prompt counter and notifies response-complete so the next turn's waitForResponseComplete() cannot block on a soft steer that will never settle after abort - handleAbort calls it before clearing the waiters; the main prompt's own finishPromptRequest stays guarded by Math.max(0, ...) - unit tests cover counter release and no-op when idle * fix(codex): reinit reconnected app-server; keep reconcile retries alive - thread/read after a disconnect auto-connects a fresh app-server, which must be initialized before any request — reconcile now ensures connect + initialize (isConnected getter added to the client) - every still-unknown loop-top reconciliation schedules the next retry, so recovery without external traffic is eventually observed - launcher mock gains isConnected * test(acp): match finishPromptRequest epoch signature in whitebox test * fix(codex): timer-driven reconciliation; init tracking; abort-safe ACK - Reconciliation runs on a self-rescheduling 1s timer independent of the main loop (wakes it too), so idle loops and waitForTurnOrRecovery still observe app-server recovery; abort clears nothing implicitly — the ACK path commits and consumes even when the reservation was cancelled - Absence of a durable client id is ambiguous: unmatched reads stay 'unknown' and keep retrying instead of restoring the row - CodexAppServerClient tracks initialized state (reset on disconnect/exit) so ensureAppServerInitialized re-initializes a fresh process before thread/read; initialize failures leave the flag false for the next retry - tests: accepted reconciliation via scheduled timer, indeterminate keeps reserved, explicit rejection restores * fix(codex): bind reconciliation to the launcher lifecycle - runSteerReconciliation clears any armed retry timer on entry and never installs a second one, so loop-top and timer-driven passes cannot multiply - shuttingDown is set when the main loop ends: timers are cleared and the pending map is dropped, so an unresolved steer can never respawn an app-server after cleanup (remote-to-local switch included) * fix(cursor): abort releases an in-progress soft-steer wait - The prompt-finally wait races Promise.allSettled against the abort signal: an Abort that clears the waiters now also releases a wait that already started, so the launcher always reaches the next queued prompt * fix(codex): report steered only after app-server acceptance - The handler now awaits steer.completed (the inject-acceptance response): an explicit JSON-RPC rejection surfaces as failed and restores the row for the normal turn/start path instead of a false steered - Transport failure after dispatch reports 'Steer outcome is being reconciled' and keeps the row reserved while the timer-driven thread reconciliation runs - dispatch-failure path also swallows the paired completion rejection * fix(cursor,acp): commit on ACP acceptance; distinguish transport failures - AcpStdioTransport marks transport-level failures (timeout, closed, stdin write) as indeterminate; explicit JSON-RPC error responses are not - The steer handler commits + consumes on completion (ACP acceptance) and restores the row on an explicit rejection; an indeterminate transport failure keeps the row reserved so a delivered instruction is never re-sent, and the ACK reaches the hub even when abort reset the queue - launcher/transport tests updated for the three outcomes * fix(steer): tri-state cancel, clear-safe reservations, bounded acceptance wait - MessageQueue2.cancelByLocalId returns 'in-flight' for a dispatching steer reservation: the hub neither deletes the row nor stamps invoked_at (new CancelMessageResponse 'busy' status; web restores the optimistic row); pushIsolateAndClear and reset/close share cancelReservations so /clear-style commands cannot have a rejected steer resurrect a discarded prompt - turn/steer acceptance wait bounded at 25s (< hub 30s RPC timeout): a lost response is indeterminate and funnels into thread reconciliation instead of stranding the reservation - tests updated for the tri-state cancel contract * test(cursor): match tri-state cancel contract for dispatching steers * fix(cursor): drop duplicate promptInFlight declaration after upstream merge * fix(codex,web): busy-aware edit flow; bound reconciliation reads - QueuedMessagesBar edit flow treats a 'busy' cancel as unsuccessful: it never prefills the composer when the row is inside an async steer, so a second client cannot send a duplicate - reconcileSteerByClientId bounds thread/read with a 5s timeout so a connected-but-silent app-server cannot hold the reservation in-flight indefinitely * fix(steer): inFlight-dominated cancel acks; bounded reconciliation - hub cancel-queued-message acks check inFlight before removed: a stale duplicate socket reporting removed can no longer delete the durable row while another socket is dispatching the steer - reconciliation entries expire after 60s and mark delivered: after the rejection window, a dispatched steer that the app-server never proved (client ids dropped on restart) is committed instead of polling thread/read forever - pre-dispatch failures (abort before write included) never enter reconciliation — they restore the row and report failure * fix(cursor,acp,web): indeterminate close marks, steer gating precision - AcpStdioTransport.rejectAllPending marks close/protocol failures indeterminate, so an accepted-but-close-interrupted soft steer restores nothing (no duplicate delivery) - the abort race in the soft-steer wait removes its listener in finally (no accumulation across repeated waits) - SessionChat gates the Steer button on agentState.steeringActive for codex/cursor instead of the queued-grace thinking flag, so Steer is not exposed before the launcher can accept it - codex pre-dispatch abort never enters reconciliation (merged from #1606) * fix(steer): persist indeterminate outcomes without replay * fix(cursor): hold ambiguous steers for explicit resolution * fix(steer): make ambiguous delivery restart-safe * fix(cursor): make ambiguous delivery restart-safe * fix(steer): recover crash-held rows and preserve retry dedup * fix(steer): ack retries and bound stdin dispatch * fix(cursor): reject steers when prompt generation changes * fix(steer): reconcile indeterminate dispatches and serialize retries * fix(cursor): preserve soft-steer reservations across abort * fix(codex): classify stdin callback failures as indeterminate * fix(steer): recheck indeterminate cancels after ACK * fix(steer): close retry and abort races * fix(cursor): hold ambiguous dispatch failures * fix(steer): serialize live retries and abort admission * fix(steer): distinguish live dispatching from unknown * fix(cursor): bound ACP dispatch acknowledgements * fix(steer): keep ACK failures held and reconcile busy cancel * fix(cursor): preserve state when dispatch ACK is uncertain * fix(steer): distinguish held cancel from removal * fix(store): combine schema v24 migrations * fix(cursor): distinguish held cancel from removal * fix(store): reserve schema v25 for steer delivery state * fix(cursor): suppress late ACP updates after abort * fix(steer): keep held cancel state and notify requeue * fix(cursor): isolate late updates after abort * fix(steer): release explicitly cancelled unknown reservations * test(cursor): cover explicit held cancellation * fix(codex): reject cancelled reservations before native steer * fix(cursor): reject cancelled reservations before ACP steer * fix(codex): make reservation restore atomic with state * fix(cursor): make reservation restore atomic with state * fix(codex): terminate abandoned transport writes * fix(cursor): hard-stop abandoned writes and update native queue state * fix(steer): own abandoned app-server lifecycle and consume races * fix(cursor): isolate aborts and add native retry resolution * fix(codex): confirm dispatch and recover abandoned turns * test(codex): mock abandoned transport callback * fix(native): reconcile retry responses * fix(codex): clear visible turn state on transport loss * fix(steer): claim retries and cover native delivery state * fix(native): resync busy cancel outcomes * fix(native): preserve indeterminate state on Android hydration * fix(steer): make retry claims single-winner * fix(cursor): hold restore failures for explicit resolution * fix(steer): serialize concurrent retry claims * fix(socket): tolerate missing steer-state ACK callbacks * fix(native): serialize retry operations * docs(web): document unknown steer delivery and retry controls * fix(steer): handle retry failures and abort-before-connect * fix(cursor): drain foreground prompt after soft-steer abort * fix(steer): reinitialize after transport loss and finish iOS retry errors * fix(steer): preserve indeterminate rows across reconnect gaps * test(web): mock indeterminate queued recovery state * fix(steer): recover consumed ACK tombstones * fix(steer): expose consumed cancel tombstones * fix(cursor): drain soft steers before handler replacement * fix(cursor): preserve buffered output on abort
439 lines
18 KiB
TypeScript
439 lines
18 KiB
TypeScript
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';
|
|
import type { EnhancedMode } from './loop';
|
|
import { RPC_METHODS } from '@hapi/protocol/rpcMethods';
|
|
// 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';
|
|
|
|
// Transient `agent` failures (auth expiry, rate limits, transient network) come back
|
|
// as exit code 1 with a recognisable stderr signature. We requeue and retry instead
|
|
// of silently swallowing the user message.
|
|
const TRANSIENT_STDERR_PATTERN = /authentication required|please run ['"]?agent login['"]?|rate limit|ETIMEDOUT|ECONNRESET|EAI_AGAIN/i;
|
|
const AUTH_STDERR_PATTERN = /authentication required|please run ['"]?agent login['"]?/i;
|
|
const RATE_LIMIT_STDERR_PATTERN = /rate limit/i;
|
|
const DEFAULT_TRANSIENT_BACKOFF_MS = 2_000;
|
|
const MAX_CONSECUTIVE_TRANSIENT_FAILURES = 5;
|
|
const STDERR_DISPLAY_LIMIT = 400;
|
|
// In-memory stderr cap. Display only uses STDERR_DISPLAY_LIMIT chars; this is a
|
|
// safety bound so a chatty `agent` failure cannot balloon CLI process memory.
|
|
const STDERR_CAPTURE_LIMIT = 8_192;
|
|
|
|
function getTransientBackoffMs(): number {
|
|
const raw = process.env.CURSOR_LEGACY_TRANSIENT_BACKOFF_MS;
|
|
if (raw === undefined) return DEFAULT_TRANSIENT_BACKOFF_MS;
|
|
const parsed = Number.parseInt(raw, 10);
|
|
if (Number.isNaN(parsed) || parsed < 0) return DEFAULT_TRANSIENT_BACKOFF_MS;
|
|
return parsed;
|
|
}
|
|
|
|
function isTransientAgentError(exitCode: number, stderr: string): boolean {
|
|
// Known transient failures (auth expiry, rate limit, transient network)
|
|
// all come back as exit code 1. Keep the retry path narrow to that contract;
|
|
// signal-kills (137 SIGKILL, 143 SIGTERM) and crashes (134 SIGABRT, etc.)
|
|
// should never auto-retry even if their stderr happens to contain a matching
|
|
// keyword.
|
|
return exitCode === 1 && TRANSIENT_STDERR_PATTERN.test(stderr);
|
|
}
|
|
|
|
function truncateStderrForDisplay(stderr: string): string {
|
|
const trimmed = stderr.trim();
|
|
if (!trimmed) return '(no stderr)';
|
|
return trimmed.length > STDERR_DISPLAY_LIMIT
|
|
? `${trimmed.slice(0, STDERR_DISPLAY_LIMIT)}...`
|
|
: trimmed;
|
|
}
|
|
|
|
function friendlyTransientMessage(exitCode: number, stderr: string): string {
|
|
if (AUTH_STDERR_PATTERN.test(stderr)) {
|
|
return "Cursor authentication expired. Re-run 'agent login' or set CURSOR_API_KEY. Your message is queued and will retry automatically.";
|
|
}
|
|
if (RATE_LIMIT_STDERR_PATTERN.test(stderr)) {
|
|
return 'Cursor rate limit hit. Your message is queued and will retry automatically.';
|
|
}
|
|
return `Cursor agent failed transiently (exit ${exitCode}). Your message is queued and will retry automatically.`;
|
|
}
|
|
|
|
function buildAgentArgs(opts: {
|
|
message: string;
|
|
cwd: string;
|
|
sessionId: string | null;
|
|
mode?: string;
|
|
model?: string;
|
|
yolo?: boolean;
|
|
autoReview?: 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');
|
|
}
|
|
if (opts.autoReview) {
|
|
args.push('--auto-review');
|
|
}
|
|
|
|
return args;
|
|
}
|
|
|
|
function permissionModeToAgentArgs(mode?: string): { mode?: string; yolo?: boolean; autoReview?: 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 };
|
|
if (mode === 'autoReview') return { autoReview: true };
|
|
return {};
|
|
}
|
|
|
|
class CursorRemoteLauncher extends RemoteLauncherBase {
|
|
private readonly session: CursorSession;
|
|
private abortController = new AbortController();
|
|
private displayPermissionMode: string | null = null;
|
|
private consecutiveTransientFailures = 0;
|
|
|
|
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()
|
|
});
|
|
|
|
session.client.rpcHandlerManager.registerHandler(
|
|
RPC_METHODS.SteerQueuedMessage,
|
|
async () => ({
|
|
steered: false,
|
|
error: 'Mid-turn steering requires a Cursor ACP session'
|
|
})
|
|
);
|
|
|
|
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, isolate: batchIsolated } = batch;
|
|
const specialCommand = parseCursorSpecialCommand(message);
|
|
|
|
const { mode: agentMode, yolo, autoReview } = 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,
|
|
autoReview
|
|
});
|
|
|
|
logger.debug(`[cursor-remote] Spawning agent with args: ${args.join(' ')}`);
|
|
|
|
session.onThinkingChange(true);
|
|
|
|
try {
|
|
const { exitCode, stderr } = 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, session.model);
|
|
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) {
|
|
this.consecutiveTransientFailures = 0;
|
|
} else if (isTransientAgentError(exitCode, stderr)) {
|
|
await this.handleTransientAgentFailure(exitCode, stderr, message, mode, batchIsolated);
|
|
} else {
|
|
this.consecutiveTransientFailures = 0;
|
|
const errMsg = `Agent exited (${exitCode}): ${truncateStderrForDisplay(stderr)}`;
|
|
logger.warn(`[cursor-remote] ${errMsg}`);
|
|
const converted = convertAgentMessage({ type: 'error', message: errMsg });
|
|
if (converted) {
|
|
session.sendAgentMessage(converted);
|
|
}
|
|
messageBuffer.addMessage(errMsg, 'status');
|
|
}
|
|
} catch (error) {
|
|
this.consecutiveTransientFailures = 0;
|
|
logger.warn('[cursor-remote] Agent run failed', error);
|
|
const errMsg = error instanceof Error ? error.message : String(error);
|
|
const message = `Cursor Agent failed: ${errMsg}`;
|
|
const converted = convertAgentMessage({ type: 'error', message });
|
|
if (converted) {
|
|
session.sendAgentMessage(converted);
|
|
}
|
|
messageBuffer.addMessage(message, '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<{ exitCode: number | null; stderr: string }> {
|
|
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'
|
|
});
|
|
|
|
let stderrCapture = '';
|
|
|
|
const abortHandler = () => {
|
|
killProcessByChildProcess(child, false).catch(() => {});
|
|
resolve({ exitCode: null, stderr: stderrCapture });
|
|
};
|
|
this.abortController.signal.addEventListener('abort', abortHandler);
|
|
|
|
const cleanup = () => {
|
|
this.abortController.signal.removeEventListener('abort', abortHandler);
|
|
};
|
|
|
|
child.on('error', (err) => {
|
|
cleanup();
|
|
reject(err);
|
|
});
|
|
|
|
// `close` (not `exit`) waits for the stdio streams to flush before
|
|
// firing. Otherwise stderr from an agent that prints + exits quickly
|
|
// (e.g. "Authentication required" → exit 1) can arrive after we
|
|
// already classified the failure, turning a transient error into a
|
|
// dropped message.
|
|
child.on('close', (code, signal) => {
|
|
cleanup();
|
|
resolve({ exitCode: code, stderr: stderrCapture });
|
|
});
|
|
|
|
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 (stderrCapture.length < STDERR_CAPTURE_LIMIT) {
|
|
stderrCapture += text.slice(0, STDERR_CAPTURE_LIMIT - stderrCapture.length);
|
|
}
|
|
if (text.trim()) {
|
|
logger.debug('[cursor-remote] agent stderr:', text.trim());
|
|
}
|
|
});
|
|
});
|
|
}
|
|
|
|
private async handleTransientAgentFailure(
|
|
exitCode: number,
|
|
stderr: string,
|
|
message: string,
|
|
mode: EnhancedMode,
|
|
batchIsolated: boolean
|
|
): Promise<void> {
|
|
const session = this.session;
|
|
const messageBuffer = this.messageBuffer;
|
|
this.consecutiveTransientFailures += 1;
|
|
|
|
if (this.consecutiveTransientFailures >= MAX_CONSECUTIVE_TRANSIENT_FAILURES) {
|
|
const summary = truncateStderrForDisplay(stderr);
|
|
const dropMsg = `Cursor agent failed ${MAX_CONSECUTIVE_TRANSIENT_FAILURES} times in a row (${summary}). Dropping the queued message; resolve the issue ('agent login', wait out rate limit, etc.) and resend.`;
|
|
logger.warn(
|
|
`[cursor-remote] transient agent failures hit cap (${MAX_CONSECUTIVE_TRANSIENT_FAILURES}); dropping message`,
|
|
{ exitCode, stderr: stderr.slice(0, STDERR_DISPLAY_LIMIT) }
|
|
);
|
|
const converted = convertAgentMessage({ type: 'error', message: dropMsg });
|
|
if (converted) {
|
|
session.sendAgentMessage(converted);
|
|
}
|
|
messageBuffer.addMessage(dropMsg, 'status');
|
|
this.consecutiveTransientFailures = 0;
|
|
return;
|
|
}
|
|
|
|
logger.warn(
|
|
'[cursor-remote] transient agent failure, requeueing user message',
|
|
{
|
|
exitCode,
|
|
attempt: this.consecutiveTransientFailures,
|
|
stderr: stderr.slice(0, STDERR_DISPLAY_LIMIT)
|
|
}
|
|
);
|
|
// Preserve isolation when the original batch was isolated (e.g. a
|
|
// pass-through slash command queued via pushIsolated). Without this the
|
|
// requeued command could be batched with a sibling prompt on retry and
|
|
// change semantics. parseCursorSpecialCommand is the same gate
|
|
// enqueueCursorUserMessage uses to decide isolation in the first place.
|
|
const requeueIsolated = batchIsolated || parseCursorSpecialCommand(message).type !== null;
|
|
if (requeueIsolated) {
|
|
session.queue.unshiftIsolated(message, mode);
|
|
} else {
|
|
session.queue.unshift(message, mode);
|
|
}
|
|
const friendly = friendlyTransientMessage(exitCode, stderr);
|
|
const converted = convertAgentMessage({ type: 'error', message: friendly });
|
|
if (converted) {
|
|
session.sendAgentMessage(converted);
|
|
}
|
|
messageBuffer.addMessage(friendly, 'status');
|
|
await this.transientBackoff(getTransientBackoffMs());
|
|
}
|
|
|
|
private async transientBackoff(ms: number): Promise<void> {
|
|
if (ms <= 0) return;
|
|
const signal = this.abortController.signal;
|
|
if (signal.aborted) return;
|
|
await new Promise<void>((resolve) => {
|
|
let timer: ReturnType<typeof setTimeout> | null = null;
|
|
// Single completion path so the abort listener is always removed,
|
|
// whether the timer or the abort wins. Without this, repeated
|
|
// transient retries on the same AbortController accumulate stale
|
|
// listeners until the next abort fires them in bulk.
|
|
const finish = () => {
|
|
if (timer !== null) {
|
|
clearTimeout(timer);
|
|
timer = null;
|
|
}
|
|
signal.removeEventListener('abort', finish);
|
|
resolve();
|
|
};
|
|
timer = setTimeout(finish, ms);
|
|
signal.addEventListener('abort', finish, { once: true });
|
|
});
|
|
}
|
|
|
|
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();
|
|
}
|