Skip to content

Commit 8f8b437

Browse files
committed
fix(server): preserve answered requests when callbacks abort
1 parent 48a8114 commit 8f8b437

3 files changed

Lines changed: 143 additions & 62 deletions

File tree

‎apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,9 +1719,20 @@ describe("ClaudeAdapterV2 abandoned questions", () => {
17191719
const abortScope = yield* Scope.make();
17201720
const signal = yield* Effect.abortSignal.pipe(Scope.provide(abortScope));
17211721
const requestUpdates = yield* runtime.events.pipe(
1722-
Stream.filter((event) => event.type === "runtime_request.updated"),
1723-
Stream.tap(() => Scope.close(abortScope, Exit.void)),
1724-
Stream.take(2),
1722+
Stream.filter(
1723+
(event) =>
1724+
event.type === "runtime_request.updated" ||
1725+
event.type === "node.updated" ||
1726+
event.type === "turn_item.updated",
1727+
),
1728+
Stream.tap((event) =>
1729+
event.type === "runtime_request.updated"
1730+
? Scope.close(abortScope, Exit.void)
1731+
: Effect.void,
1732+
),
1733+
Stream.takeUntil(
1734+
(event) => event.type === "turn_item.updated" && event.turnItem.status === "cancelled",
1735+
),
17251736
Stream.runCollect,
17261737
Effect.forkScoped,
17271738
);
@@ -1750,10 +1761,21 @@ describe("ClaudeAdapterV2 abandoned questions", () => {
17501761
).pipe(Effect.forkScoped);
17511762

17521763
assert.equal((yield* Fiber.join(result))?.behavior, "deny");
1753-
const statuses = Array.from(yield* Fiber.join(requestUpdates), (event) =>
1754-
event.type === "runtime_request.updated" ? event.runtimeRequest.status : null,
1755-
);
1764+
const updates = Array.from(yield* Fiber.join(requestUpdates));
1765+
const statuses = updates
1766+
.filter((event) => event.type === "runtime_request.updated")
1767+
.map((event) =>
1768+
event.type === "runtime_request.updated" ? event.runtimeRequest.status : null,
1769+
);
17561770
assert.deepEqual(statuses, ["pending", "cancelled"]);
1771+
assert.equal(
1772+
updates.findLast((event) => event.type === "node.updated")?.node.status,
1773+
"cancelled",
1774+
);
1775+
assert.equal(
1776+
updates.findLast((event) => event.type === "turn_item.updated")?.turnItem.status,
1777+
"cancelled",
1778+
);
17571779
}).pipe(
17581780
Effect.provide(
17591781
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),

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

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -291,42 +291,60 @@ const layerBase: Layer.Layer<
291291
const staleRequests = new Set<RuntimeRequestId>();
292292
const staleNodes = new Set<NodeId>();
293293
for (const event of events) {
294-
if (
295-
event.type !== "runtime-request.updated" ||
296-
event.payload.kind !== "user_input" ||
297-
event.payload.status !== "cancelled"
298-
)
294+
if (event.type !== "runtime-request.updated" || event.payload.status !== "cancelled")
299295
continue;
300296
const current = yield* projectionStore.getRuntimeRequest(
301297
event.threadId,
302298
event.payload.id,
303299
);
304300
if (
305301
current?.status !== "pending" ||
306-
current.kind !== "user_input" ||
302+
current.kind !== event.payload.kind ||
307303
current.providerTurnId !== event.payload.providerTurnId ||
308304
current.responseCapability.type === "message"
309305
) {
310306
staleRequests.add(event.payload.id);
311307
staleNodes.add(event.payload.nodeId);
312308
}
313309
}
314-
return events.filter((event) => {
315-
switch (event.type) {
316-
case "runtime-request.updated":
317-
return event.payload.status !== "cancelled" || !staleRequests.has(event.payload.id);
318-
case "node.updated":
319-
return event.payload.status !== "cancelled" || !staleNodes.has(event.payload.id);
320-
case "turn-item.updated":
321-
return (
322-
event.payload.type !== "user_input_request" ||
323-
event.payload.status !== "cancelled" ||
324-
!staleRequests.has(event.payload.requestId)
325-
);
326-
default:
327-
return true;
328-
}
329-
});
310+
return yield* Effect.filter(
311+
events,
312+
Effect.fnUntraced(function* (event) {
313+
const requestId =
314+
event.type === "node.updated" &&
315+
(event.payload.kind === "user_input_request" ||
316+
event.payload.kind === "approval_request")
317+
? event.payload.runtimeRequestId
318+
: event.type === "turn-item.updated" &&
319+
(event.payload.type === "user_input_request" ||
320+
event.payload.type === "approval_request")
321+
? event.payload.requestId
322+
: null;
323+
if (
324+
requestId !== null &&
325+
(event.type === "node.updated" || event.type === "turn-item.updated") &&
326+
event.payload.status === "cancelled"
327+
) {
328+
const current = yield* projectionStore.getRuntimeRequest(event.threadId, requestId);
329+
if (current?.status === "resolved") return false;
330+
}
331+
switch (event.type) {
332+
case "runtime-request.updated":
333+
return event.payload.status !== "cancelled" || !staleRequests.has(event.payload.id);
334+
case "node.updated":
335+
return event.payload.status !== "cancelled" || !staleNodes.has(event.payload.id);
336+
case "turn-item.updated":
337+
return (
338+
(event.payload.type !== "user_input_request" &&
339+
event.payload.type !== "approval_request") ||
340+
event.payload.status !== "cancelled" ||
341+
!staleRequests.has(event.payload.requestId)
342+
);
343+
default:
344+
return true;
345+
}
346+
}),
347+
);
330348
});
331349

332350
const normalizeEvents = (events: ReadonlyArray<OrchestrationV2DomainEvent>) => {

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

Lines changed: 75 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1309,9 +1309,13 @@ layer("ProviderEventIngestorV2", (it) => {
13091309
}),
13101310
);
13111311

1312-
it.effect(
1313-
"preserves an answer committed after terminal normalization reads a pending question",
1314-
() =>
1312+
it.effect.each([
1313+
{ kind: "user_input", source: "terminal" },
1314+
{ kind: "user_input", source: "callback" },
1315+
{ kind: "command", source: "callback" },
1316+
] as const)(
1317+
"preserves a $kind response committed before a $source cancellation",
1318+
({ kind, source }) =>
13151319
Effect.scoped(
13161320
Effect.gen(function* () {
13171321
const eventSink = yield* EventSink.EventSinkV2;
@@ -1339,7 +1343,7 @@ layer("ProviderEventIngestorV2", (it) => {
13391343
nodeId,
13401344
providerTurnId,
13411345
nativeRequestRef: null,
1342-
kind: "user_input",
1346+
kind,
13431347
status: "pending",
13441348
responseCapability: { type: "live", providerSessionId },
13451349
createdAt: now,
@@ -1351,7 +1355,7 @@ layer("ProviderEventIngestorV2", (it) => {
13511355
runId: null,
13521356
parentNodeId: null,
13531357
rootNodeId: nodeId,
1354-
kind: "user_input_request",
1358+
kind: kind === "command" ? "approval_request" : "user_input_request",
13551359
status: "waiting",
13561360
countsForRun: false,
13571361
providerThreadId,
@@ -1377,9 +1381,9 @@ layer("ProviderEventIngestorV2", (it) => {
13771381
startedAt: now,
13781382
completedAt: null,
13791383
updatedAt: now,
1380-
type: "user_input_request",
1381-
requestId: request.id,
1382-
questions: [],
1384+
...(kind === "command"
1385+
? { type: "approval_request", requestId: request.id, requestKind: "command" }
1386+
: { type: "user_input_request", requestId: request.id, questions: [] }),
13831387
};
13841388
const seedEvents: Array<OrchestrationV2DomainEvent> = [threadEvent];
13851389
for (const payload of [
@@ -1408,35 +1412,71 @@ layer("ProviderEventIngestorV2", (it) => {
14081412
Effect.provide(Layer.fresh(ProviderEventIngestor.layer)),
14091413
Effect.provideService(EventSink.EventSinkV2, gatedSink),
14101414
);
1411-
const terminal = yield* ingestor
1412-
.ingestNormalized({
1413-
providerSessionId,
1414-
providerInstanceId: modelSelection.instanceId,
1415-
threadId,
1416-
event: {
1417-
type: "provider_turn.updated",
1418-
driver: CODEX_DRIVER,
1419-
providerTurn: {
1420-
id: providerTurnId,
1421-
providerThreadId,
1422-
nodeId,
1423-
runAttemptId: null,
1424-
nativeTurnRef: null,
1425-
ordinal: 1,
1426-
status: "completed",
1427-
startedAt: now,
1428-
completedAt: now,
1429-
},
1430-
},
1431-
})
1432-
.pipe(Effect.forkScoped);
1415+
const terminal = yield* (
1416+
source === "terminal"
1417+
? ingestor.ingestNormalized({
1418+
providerSessionId,
1419+
providerInstanceId: modelSelection.instanceId,
1420+
threadId,
1421+
event: {
1422+
type: "provider_turn.updated",
1423+
driver: CODEX_DRIVER,
1424+
providerTurn: {
1425+
id: providerTurnId,
1426+
providerThreadId,
1427+
nodeId,
1428+
runAttemptId: null,
1429+
nativeTurnRef: null,
1430+
ordinal: 1,
1431+
status: "completed",
1432+
startedAt: now,
1433+
completedAt: now,
1434+
},
1435+
},
1436+
})
1437+
: Effect.forEach(
1438+
[
1439+
{
1440+
type: "runtime_request.updated" as const,
1441+
driver: CODEX_DRIVER,
1442+
runtimeRequest: { ...request, status: "cancelled" as const, resolvedAt: now },
1443+
},
1444+
{
1445+
type: "node.updated" as const,
1446+
driver: CODEX_DRIVER,
1447+
node: { ...node, status: "cancelled" as const, completedAt: now },
1448+
},
1449+
{
1450+
type: "turn_item.updated" as const,
1451+
driver: CODEX_DRIVER,
1452+
turnItem: {
1453+
...item,
1454+
status: "cancelled" as const,
1455+
completedAt: now,
1456+
updatedAt: now,
1457+
},
1458+
},
1459+
],
1460+
(event) =>
1461+
ingestor.ingestNormalized({
1462+
providerSessionId,
1463+
providerInstanceId: modelSelection.instanceId,
1464+
threadId,
1465+
event,
1466+
}),
1467+
{ concurrency: 1 },
1468+
).pipe(Effect.map((batches) => batches.flat()))
1469+
).pipe(Effect.forkScoped);
14331470
yield* Deferred.await(normalized);
1434-
const answers = { decision: "Use the existing workspace" };
1471+
const response =
1472+
kind === "command"
1473+
? { decision: "accept" as const }
1474+
: { answers: { decision: "Use the existing workspace" } };
14351475
const responseEvents: Array<OrchestrationV2DomainEvent> = [];
14361476
for (const payload of [
14371477
{
14381478
type: "runtime-request.updated" as const,
1439-
payload: { ...request, status: "resolved" as const, answers, resolvedAt: now },
1479+
payload: { ...request, status: "resolved" as const, ...response, resolvedAt: now },
14401480
},
14411481
{
14421482
type: "node.updated" as const,
@@ -1458,12 +1498,13 @@ layer("ProviderEventIngestorV2", (it) => {
14581498
const committedTerminal = yield* Fiber.join(terminal);
14591499
assert.deepEqual(
14601500
committedTerminal.map((stored) => stored.event.type),
1461-
["provider-turn.updated"],
1501+
source === "terminal" ? ["provider-turn.updated"] : [],
14621502
);
14631503
const projection = yield* projections.getThreadProjection(threadId);
14641504
const answered = projection.runtimeRequests.find((entry) => entry.id === request.id)!;
14651505
assert.equal(answered.status, "resolved");
1466-
assert.deepEqual(answered.answers, answers);
1506+
assert.deepEqual(answered.answers, "answers" in response ? response.answers : undefined);
1507+
assert.equal(answered.decision, "decision" in response ? response.decision : undefined);
14671508
assert.equal(projection.nodes.find((entry) => entry.id === nodeId)!.status, "completed");
14681509
assert.equal(
14691510
projection.turnItems.find((entry) => entry.id === item.id)!.status,

0 commit comments

Comments
 (0)