Skip to content

Commit 239f8d9

Browse files
committed
fix(server): preserve native approval snapshot ingestion
1 parent eb97111 commit 239f8d9

2 files changed

Lines changed: 58 additions & 6 deletions

File tree

‎apps/server/src/orchestration-v2/EventSink.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,14 +263,19 @@ const baseLayer: Layer.Layer<
263263

264264
// A user can answer after cleanup reads the pending request.
265265
// Recheck inside the write transaction so stale cleanup cannot erase answers.
266-
const guardRuntimeRequestRetirements = (events: ReadonlyArray<OrchestrationV2DomainEvent>) =>
266+
const guardRuntimeRequestRetirements = (
267+
events: ReadonlyArray<OrchestrationV2DomainEvent>,
268+
includeAllRetirements = false,
269+
) =>
267270
Effect.gen(function* () {
268271
const staleRequests = new Set<RuntimeRequestId>();
269272
const staleNodes = new Set<NodeId>();
270273
for (const event of events) {
271274
if (
272275
event.type !== "runtime-request.updated" ||
273-
(event.payload.status !== "cancelled" && event.payload.status !== "expired")
276+
(includeAllRetirements
277+
? event.payload.status !== "cancelled" && event.payload.status !== "expired"
278+
: event.payload.kind !== "user_input" || event.payload.status !== "cancelled")
274279
)
275280
continue;
276281
const current = yield* projectionStore.getRuntimeRequest(
@@ -280,7 +285,7 @@ const baseLayer: Layer.Layer<
280285
if (
281286
current?.status !== "pending" ||
282287
current.kind !== event.payload.kind ||
283-
current.nodeId !== event.payload.nodeId ||
288+
(includeAllRetirements && current.nodeId !== event.payload.nodeId) ||
284289
current.providerTurnId !== event.payload.providerTurnId ||
285290
current.responseCapability.type === "message"
286291
) {
@@ -292,15 +297,16 @@ const baseLayer: Layer.Layer<
292297
switch (event.type) {
293298
case "runtime-request.updated":
294299
return (
295-
(event.payload.status !== "cancelled" && event.payload.status !== "expired") ||
300+
(event.payload.status !== "cancelled" &&
301+
(!includeAllRetirements || event.payload.status !== "expired")) ||
296302
!staleRequests.has(event.payload.id)
297303
);
298304
case "node.updated":
299305
return event.payload.status !== "cancelled" || !staleNodes.has(event.payload.id);
300306
case "turn-item.updated":
301307
return (
302308
(event.payload.type !== "user_input_request" &&
303-
event.payload.type !== "approval_request") ||
309+
(!includeAllRetirements || event.payload.type !== "approval_request")) ||
304310
event.payload.status !== "cancelled" ||
305311
!staleRequests.has(event.payload.requestId)
306312
);
@@ -541,7 +547,7 @@ const baseLayer: Layer.Layer<
541547

542548
const normalized = yield* normalizeEvents(
543549
input.guardPendingRuntimeRequestRetirements === true
544-
? yield* guardRuntimeRequestRetirements(input.events)
550+
? yield* guardRuntimeRequestRetirements(input.events, true)
545551
: input.events,
546552
);
547553
const storedEvents = yield* eventStore.append({

‎apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,3 +1339,49 @@ layer("ProviderEventIngestorV2", (it) => {
13391339
}),
13401340
);
13411341
});
1342+
1343+
it.effect.each(["cancelled", "expired"] as const)(
1344+
"preserves an adapter's initial %s approval snapshot",
1345+
(status) =>
1346+
Effect.gen(function* () {
1347+
const now = yield* DateTime.now;
1348+
const sink = yield* EventSink.EventSinkV2;
1349+
const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
1350+
const projections = yield* ProjectionStore.ProjectionStoreV2;
1351+
const ids = yield* IdAllocator.IdAllocatorV2;
1352+
const threadEvent = yield* threadCreatedEvent(now);
1353+
const threadId = threadEvent.threadId;
1354+
yield* sink.write({ events: [threadEvent] });
1355+
const providerSessionId = yield* ids.allocate.providerSession({
1356+
providerInstanceId: modelSelection.instanceId,
1357+
threadId,
1358+
});
1359+
const requestId = RuntimeRequestId.make(`initial-approval:${status}`);
1360+
const stored = yield* ingestor.ingestNormalized({
1361+
providerSessionId,
1362+
providerInstanceId: modelSelection.instanceId,
1363+
threadId,
1364+
event: {
1365+
type: "runtime_request.updated",
1366+
driver: CODEX_DRIVER,
1367+
threadId,
1368+
runtimeRequest: {
1369+
id: requestId,
1370+
nodeId: NodeId.make(`initial-approval-node:${status}`),
1371+
providerTurnId: null,
1372+
nativeRequestRef: null,
1373+
kind: "command",
1374+
status,
1375+
responseCapability: {
1376+
type: "not_resumable",
1377+
reason: "Native request already retired.",
1378+
},
1379+
createdAt: now,
1380+
resolvedAt: now,
1381+
},
1382+
},
1383+
});
1384+
assert.lengthOf(stored, 1);
1385+
assert.equal((yield* projections.getRuntimeRequest(threadId, requestId))?.status, status);
1386+
}).pipe(Effect.provide(TestLayer)),
1387+
);

0 commit comments

Comments
 (0)