Skip to content

Commit 32779bd

Browse files
feat: update ingestion, registry, and server layers for V2 events + Cursor adapter
- ProviderRuntimeIngestion: consume V2 event types (content.delta, item.started/completed, request.opened/resolved) - ProviderAdapterRegistry: register CursorAdapter alongside Codex and ClaudeCode - serverLayers: wire CursorAdapterLive into provider layer composition - Update integration test fixtures for V2 event format Co-authored-by: Julius Marminge <[email protected]>
1 parent 0c86d66 commit 32779bd

6 files changed

Lines changed: 312 additions & 226 deletions

File tree

‎apps/server/integration/TestProviderAdapter.integration.ts‎

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import {
1010
ProviderThreadId,
1111
ProviderTurnId,
1212
ProviderTurnStartResult,
13+
RuntimeSessionId,
14+
ThreadId,
15+
TurnId,
1316
} from "@t3tools/contracts";
1417
import { Effect, Queue, Stream } from "effect";
1518

@@ -167,24 +170,28 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter
167170

168171
const assistantDeltas: string[] = [];
169172
const deferredTurnCompletedEvents: ProviderRuntimeEvent[] = [];
173+
const runtimeSessionId = RuntimeSessionId.makeUnsafe(input.sessionId);
174+
const runtimeThreadId = ThreadId.makeUnsafe(state.snapshot.threadId);
175+
const runtimeTurnId = TurnId.makeUnsafe(turnId);
176+
170177
for (const fixtureEvent of response.events) {
171178
const rawEvent: Record<string, unknown> = {
172179
...(fixtureEvent as Record<string, unknown>),
173180
eventId: randomUUID(),
174181
provider,
175-
sessionId: input.sessionId,
182+
sessionId: runtimeSessionId,
176183
createdAt: nowIso(),
177184
};
178185
if (Object.hasOwn(rawEvent, "threadId")) {
179-
rawEvent.threadId = state.snapshot.threadId;
186+
rawEvent.threadId = runtimeThreadId;
180187
}
181188
if (Object.hasOwn(rawEvent, "turnId")) {
182-
rawEvent.turnId = turnId;
189+
rawEvent.turnId = runtimeTurnId;
183190
}
184191

185192
const runtimeEvent = rawEvent as ProviderRuntimeEvent;
186-
if (runtimeEvent.type === "message.delta") {
187-
assistantDeltas.push(runtimeEvent.delta);
193+
if (runtimeEvent.type === "content.delta") {
194+
assistantDeltas.push(runtimeEvent.payload.delta);
188195
}
189196
if (runtimeEvent.type === "turn.completed") {
190197
deferredTurnCompletedEvents.push(runtimeEvent);
@@ -223,15 +230,21 @@ export const makeTestProviderAdapterHarness = (options?: MakeTestProviderAdapter
223230
type: "turn.completed",
224231
eventId: EventId.makeUnsafe(randomUUID()),
225232
provider,
226-
sessionId: input.sessionId,
233+
sessionId: runtimeSessionId,
227234
createdAt: nowIso(),
228-
threadId: state.snapshot.threadId,
229-
turnId,
230-
status: "completed",
235+
threadId: runtimeThreadId,
236+
turnId: runtimeTurnId,
237+
payload: { state: "completed" },
231238
});
232239
} else {
233240
for (const completedEvent of deferredTurnCompletedEvents) {
234-
yield* emit(completedEvent);
241+
yield* emit({
242+
...completedEvent,
243+
eventId: EventId.makeUnsafe(randomUUID()),
244+
sessionId: runtimeSessionId,
245+
threadId: runtimeThreadId,
246+
turnId: runtimeTurnId,
247+
});
235248
}
236249
}
237250

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import {
2-
ApprovalRequestId,
32
EventId,
4-
ProviderSessionId,
5-
ProviderThreadId,
6-
ProviderTurnId,
3+
RuntimeRequestId,
4+
RuntimeSessionId,
5+
ThreadId,
6+
TurnId,
7+
RuntimeItemId,
78
type ProviderRuntimeEvent,
89
} from "@t3tools/contracts";
910

1011
const PROVIDER = "codex" as const;
11-
const SESSION_ID = ProviderSessionId.makeUnsafe("fixture-session");
12-
const THREAD_ID = ProviderThreadId.makeUnsafe("fixture-thread");
13-
const TURN_ID = ProviderTurnId.makeUnsafe("fixture-turn");
14-
const REQUEST_ID = ApprovalRequestId.makeUnsafe("req-1");
12+
const SESSION_ID = RuntimeSessionId.makeUnsafe("fixture-session");
13+
const THREAD_ID = ThreadId.makeUnsafe("fixture-thread");
14+
const TURN_ID = TurnId.makeUnsafe("fixture-turn");
15+
const ITEM_ID = RuntimeItemId.makeUnsafe("fixture-item");
16+
const REQUEST_ID = RuntimeRequestId.makeUnsafe("req-1");
1517

1618
function baseEvent(
1719
eventId: string,
@@ -31,108 +33,133 @@ export const codexTurnTextFixture = [
3133
...baseEvent("evt-1", "2026-02-23T00:00:00.000Z"),
3234
threadId: THREAD_ID,
3335
turnId: TURN_ID,
36+
payload: {},
3437
},
3538
{
36-
type: "message.delta",
39+
type: "content.delta",
3740
...baseEvent("evt-2", "2026-02-23T00:00:00.100Z"),
3841
threadId: THREAD_ID,
3942
turnId: TURN_ID,
40-
delta: "I will make a small update.\n",
43+
payload: {
44+
streamKind: "assistant_text",
45+
delta: "I will make a small update.\n",
46+
},
4147
},
4248
{
43-
type: "message.delta",
49+
type: "content.delta",
4450
...baseEvent("evt-3", "2026-02-23T00:00:00.200Z"),
4551
threadId: THREAD_ID,
4652
turnId: TURN_ID,
47-
delta: "Done.\n",
53+
payload: {
54+
streamKind: "assistant_text",
55+
delta: "Done.\n",
56+
},
4857
},
4958
{
5059
type: "turn.completed",
5160
...baseEvent("evt-4", "2026-02-23T00:00:00.300Z"),
5261
threadId: THREAD_ID,
5362
turnId: TURN_ID,
54-
status: "completed",
63+
payload: { state: "completed" },
5564
},
56-
] satisfies ReadonlyArray<ProviderRuntimeEvent>;
65+
] as ReadonlyArray<ProviderRuntimeEvent>;
5766

5867
export const codexTurnToolFixture = [
5968
{
6069
type: "turn.started",
6170
...baseEvent("evt-11", "2026-02-23T00:01:00.000Z"),
6271
threadId: THREAD_ID,
6372
turnId: TURN_ID,
73+
payload: {},
6474
},
6575
{
66-
type: "tool.started",
76+
type: "item.started",
6777
...baseEvent("evt-12", "2026-02-23T00:01:00.100Z"),
6878
threadId: THREAD_ID,
6979
turnId: TURN_ID,
70-
toolKind: "command",
71-
title: "Command run",
72-
detail: "echo integration",
80+
itemId: ITEM_ID,
81+
payload: {
82+
itemType: "command_execution",
83+
title: "Command run",
84+
detail: "echo integration",
85+
},
7386
},
7487
{
75-
type: "tool.completed",
88+
type: "item.completed",
7689
...baseEvent("evt-13", "2026-02-23T00:01:00.200Z"),
7790
threadId: THREAD_ID,
7891
turnId: TURN_ID,
79-
toolKind: "command",
80-
title: "Command run",
81-
detail: "echo integration",
92+
itemId: ITEM_ID,
93+
payload: {
94+
itemType: "command_execution",
95+
title: "Command run",
96+
detail: "echo integration",
97+
},
8298
},
8399
{
84-
type: "message.delta",
100+
type: "content.delta",
85101
...baseEvent("evt-14", "2026-02-23T00:01:00.300Z"),
86102
threadId: THREAD_ID,
87103
turnId: TURN_ID,
88-
delta: "Applied the requested edit.\n",
104+
payload: {
105+
streamKind: "assistant_text",
106+
delta: "Applied the requested edit.\n",
107+
},
89108
},
90109
{
91110
type: "turn.completed",
92111
...baseEvent("evt-15", "2026-02-23T00:01:00.400Z"),
93112
threadId: THREAD_ID,
94113
turnId: TURN_ID,
95-
status: "completed",
114+
payload: { state: "completed" },
96115
},
97-
] satisfies ReadonlyArray<ProviderRuntimeEvent>;
116+
] as ReadonlyArray<ProviderRuntimeEvent>;
98117

99118
export const codexTurnApprovalFixture = [
100119
{
101120
type: "turn.started",
102121
...baseEvent("evt-21", "2026-02-23T00:02:00.000Z"),
103122
threadId: THREAD_ID,
104123
turnId: TURN_ID,
124+
payload: {},
105125
},
106126
{
107-
type: "approval.requested",
127+
type: "request.opened",
108128
...baseEvent("evt-22", "2026-02-23T00:02:00.100Z"),
109129
threadId: THREAD_ID,
110130
turnId: TURN_ID,
111131
requestId: REQUEST_ID,
112-
requestKind: "command",
113-
detail: "Please approve command",
132+
payload: {
133+
requestType: "command_execution_approval",
134+
detail: "Please approve command",
135+
},
114136
},
115137
{
116-
type: "approval.resolved",
138+
type: "request.resolved",
117139
...baseEvent("evt-23", "2026-02-23T00:02:00.200Z"),
118140
threadId: THREAD_ID,
119141
turnId: TURN_ID,
120142
requestId: REQUEST_ID,
121-
requestKind: "command",
122-
decision: "accept",
143+
payload: {
144+
requestType: "command_execution_approval",
145+
decision: "accept",
146+
},
123147
},
124148
{
125-
type: "message.delta",
149+
type: "content.delta",
126150
...baseEvent("evt-24", "2026-02-23T00:02:00.300Z"),
127151
threadId: THREAD_ID,
128152
turnId: TURN_ID,
129-
delta: "Approval received and command executed.\n",
153+
payload: {
154+
streamKind: "assistant_text",
155+
delta: "Approval received and command executed.\n",
156+
},
130157
},
131158
{
132159
type: "turn.completed",
133160
...baseEvent("evt-25", "2026-02-23T00:02:00.400Z"),
134161
threadId: THREAD_ID,
135162
turnId: TURN_ID,
136-
status: "completed",
163+
payload: { state: "completed" },
137164
},
138-
] satisfies ReadonlyArray<ProviderRuntimeEvent>;
165+
] as ReadonlyArray<ProviderRuntimeEvent>;

0 commit comments

Comments
 (0)