V2 event provider adapters

[juliusmarminge]

Update Codex and Claude Code adapters to use the v2 canonical event structure and add a new Cursor agent provider with v2 event support.

---

  

Note

Migrate provider adapters to emit V2 canonical runtime events and add Cursor adapter in serverLayers.ts

Adapters and tests switch to V2 event names, payloads, and Runtime* ID wrappers, unify message/tool events under item.*, replace approvals with request.*, and add a new cursor provider with ACP schemas and registry integration.

📍Where to Start

Start with the event mapping pipeline in events.mapToRuntimeEvents in CodexAdapter.ts, then review makeClaudeCodeAdapter in ClaudeCodeAdapter.ts, and the Cursor layer in CursorAdapter.ts.

📊 Macroscope summarized 32779bd. 10 files reviewed, 28 issues evaluated, 2 issues filtered, 4 comments posted

🗂️ Filtered Issues

apps/server/src/provider/Layers/CursorAdapter.ts — 3 comments posted, 13 evaluated, 2 filtered

• line 360: Data inconsistency in item.completed events due to state loss. The CursorTurnState definition (Code Object 2) only tracks seenToolCallIds and fails to persist the CanonicalItemType determined for each tool call. Consequently, when processing a tool_call_update at line 360, the code invokes classifyToolItemType (Code Object 0) with undefined arguments, forcing the return value to "dynamic_tool_call". This overwrites any specific type (e.g., "command_execution") established at the start of the item, resulting in an item.completed event payload that conflicts with the item.started event type. [ Out of scope ]
• line 879: Race condition causing duplicate turn.completed events. The sendTurn method initializes turnState (Code Object 2) and manages the turn lifecycle. If interruptTurn is called, it emits a turn.completed event (state: interrupted) and kills the child process. However, the concurrent sendTurn fiber catches the resulting process termination error (lines 838-853) and blindly emits a second turn.completed event (state: failed) at line 879. The sendTurn error handler fails to check context.stopped or turnState validity, leading to a protocol violation where the client receives two contradictory completion events for the same turn. [ Out of scope ]

[cursor]

Cursor Agent can help with this pull request. Just @cursor in comments and I'll start working on changes in this branch.
_{Learn more about Cursor Agents}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment
• Commit unit tests in branch cursor/v2-event-provider-adapters-a783

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[macroscopeapp]

🟠 High Layers/CursorAdapter.ts:49

Missing child 'error' handling: if the agent binary is invalid or not on PATH, spawn emits an 'error' that crashes the process. Suggest adding an 'error' listener immediately after spawn and converting it into a provider error with clean session cleanup.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file apps/server/src/provider/Layers/CursorAdapter.ts around line 49:

Missing `child` `'error'` handling: if the `agent` binary is invalid or not on `PATH`, `spawn` emits an `'error'` that crashes the process. Suggest adding an `'error'` listener immediately after `spawn` and converting it into a provider error with clean session cleanup.

Evidence trail:
apps/server/src/provider/Layers/CursorAdapter.ts:507-513 (spawnAcpProcess function), apps/server/src/provider/Layers/CursorAdapter.ts:698 (child = spawnAcpProcess call), apps/server/src/provider/Layers/CursorAdapter.ts:722-737 (only exit event handled, no error event), git_grep for `child.(on|once).*'error'` returns no results confirming no error listener exists

[macroscopeapp]

🟢 Low Layers/CursorAdapter.ts:63

When cause is an Error with an empty message, the first check correctly skips it, but the object check on line 63 re-matches and returns the empty string anyway. Consider adding a length check to the object branch as well.

Suggested change

	if (cause && typeof cause === "object" && "message" in cause) {
	return String((cause as { message: unknown }).message);
	}
	if (cause && typeof cause === "object" && "message" in cause) {
	const msg = String((cause as { message: unknown }).message);
	if (msg.length > 0) return msg;
	}

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file apps/server/src/provider/Layers/CursorAdapter.ts around lines 63-65:

When `cause` is an `Error` with an empty message, the first check correctly skips it, but the object check on line 63 re-matches and returns the empty string anyway. Consider adding a length check to the object branch as well.

Evidence trail:
apps/server/src/provider/Layers/CursorAdapter.ts lines 58-68 at REVIEWED_COMMIT. The function `toMessage` has the first check `if (cause instanceof Error && cause.message.length > 0)` at line 59, and the object check `if (cause && typeof cause === "object" && "message" in cause)` at line 63. An Error object satisfies all three conditions in the object check (truthy, typeof object, has message property), so an Error with empty message bypasses the length check but gets caught by line 63 and returns the empty string instead of the fallback.

[macroscopeapp]

🟡 Medium Layers/CursorAdapter.ts:911

interruptTurn should reuse the shared cleanup. Calling stopSessionInternal (or a shared interrupt helper) instead of setting context.stopped and child.kill() ensures pending RPCs/timers are cleared and the session is removed, avoiding hangs.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file apps/server/src/provider/Layers/CursorAdapter.ts around line 911:

`interruptTurn` should reuse the shared cleanup. Calling `stopSessionInternal` (or a shared interrupt helper) instead of setting `context.stopped` and `child.kill()` ensures pending RPCs/timers are cleared and the session is removed, avoiding hangs.

Evidence trail:
apps/server/src/provider/Layers/CursorAdapter.ts lines 908-935 (interruptTurn implementation), lines 581-661 (stopSessionInternal implementation), lines 620-631 (pendingRpc cleanup in stopSessionInternal), line 661 (sessions.delete in stopSessionInternal), line 51 (DEFAULT_REQUEST_TIMEOUT_MS = 120_000)

[macroscopeapp]

🟡 Medium Layers/ProviderRuntimeIngestion.ts:119

Suggestion: Normalize event.payload.requestType to a simplified requestKind (command/file-change/other) via a shared helper and use it for both request.opened and request.resolved. Derive summary from this (use "Approval requested" for other) to fix the mismatch and incorrect "File-change..." text.

🚀 Reply "fix it for me" or copy this AI Prompt for your agent:

In file apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts around line 119:

Suggestion: Normalize `event.payload.requestType` to a simplified `requestKind` (`command`/`file-change`/`other`) via a shared helper and use it for both `request.opened` and `request.resolved`. Derive `summary` from this (use "Approval requested" for `other`) to fix the mismatch and incorrect "File-change..." text.

Evidence trail:
apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts lines 106-147 at REVIEWED_COMMIT. Lines 106-110 show normalization to `requestKind` (`command`/`file-change`/`other`). Lines 119-121 show summary only handles two cases, defaulting to "File-change approval requested" for both `file-change` AND `other`. Lines 140-141 show `request.resolved` passes raw `event.payload.requestType` directly as `requestKind` without normalization.