Skip to content

Commit 589b34e

Browse files
fix(server): sync promoted follow-up state and result transfers
1 parent fc21bef commit 589b34e

2 files changed

Lines changed: 131 additions & 45 deletions

File tree

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

Lines changed: 120 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,10 @@ const layerSteeredTaskTest = OrchestratorMcpService.layer.pipe(
20852085
Layer.provideMerge(layerTest),
20862086
);
20872087

2088-
const seedSteeredTasks = Effect.fnUntraced(function* (name: string) {
2088+
const seedSteeredTasks = Effect.fnUntraced(function* (
2089+
name: string,
2090+
{ queueHeld = false, monitor = false } = {},
2091+
) {
20892092
const orchestrator = yield* Orchestrator.OrchestratorV2;
20902093
const sink = yield* EventSink.EventSinkV2;
20912094
const now = yield* DateTime.now;
@@ -2120,15 +2123,48 @@ const seedSteeredTasks = Effect.fnUntraced(function* (name: string) {
21202123
const steeredTaskId = NodeId.make(`${name}:steered`);
21212124
const promotedTaskId = NodeId.make(`${name}:promoted`);
21222125
const promotedMessageId = MessageId.make(`${name}:promoted`);
2123-
const steeredRun = {
2124-
...runEvent({
2126+
let monitorRun: OrchestrationV2Run | undefined;
2127+
if (monitor) {
2128+
const messageId = MessageId.make(`${name}:monitor`);
2129+
yield* orchestrator.dispatch({
2130+
type: "message.dispatch",
2131+
createdBy: "agent",
2132+
creationSource: "server",
2133+
commandId: CommandId.make(`${name}:monitor`),
21252134
threadId: child.childThreadId,
2126-
runId: RunId.make(`${name}:steered`),
2127-
ordinal: 2,
2128-
status: "running",
2129-
now,
2130-
}).payload,
2131-
delegatedTaskId: steeredTaskId,
2135+
messageId,
2136+
text: "A monitor reported new output.",
2137+
attachments: [],
2138+
notification: {
2139+
source: { kind: "monitor" },
2140+
outcome: "updated",
2141+
summary: "Monitor updated",
2142+
},
2143+
dispatchMode: { type: "queue_after_active" },
2144+
});
2145+
monitorRun = (yield* orchestrator.getThreadProjection(child.childThreadId)).runs.find(
2146+
(run) => run.userMessageId === messageId,
2147+
)!;
2148+
assert.isUndefined(monitorRun.delegatedTaskId);
2149+
assert.lengthOf(
2150+
(yield* orchestrator.getThreadProjection(parentThreadId)).subagents.filter(
2151+
(task) => task.childThreadId === child.childThreadId,
2152+
),
2153+
1,
2154+
);
2155+
}
2156+
const steeredRun: OrchestrationV2Run = {
2157+
...(monitorRun ?? {
2158+
...runEvent({
2159+
threadId: child.childThreadId,
2160+
runId: RunId.make(`${name}:steered`),
2161+
ordinal: 2,
2162+
status: "running",
2163+
now,
2164+
}).payload,
2165+
delegatedTaskId: steeredTaskId,
2166+
}),
2167+
status: "running",
21322168
};
21332169
const promotedRun = {
21342170
...runEvent({
@@ -2175,9 +2211,10 @@ const seedSteeredTasks = Effect.fnUntraced(function* (name: string) {
21752211
},
21762212
];
21772213
};
2214+
const beforePromotion = yield* sink.latestSequence();
21782215
yield* sink.write({
21792216
events: [
2180-
...[steeredTaskId, promotedTaskId].map((id) => ({
2217+
...(monitor ? [promotedTaskId] : [steeredTaskId, promotedTaskId]).map((id) => ({
21812218
id: EventId.make(`${id}:task-seed`),
21822219
type: "subagent.updated" as const,
21832220
threadId: parentThreadId,
@@ -2186,7 +2223,12 @@ const seedSteeredTasks = Effect.fnUntraced(function* (name: string) {
21862223
payload: {
21872224
...original,
21882225
id,
2189-
status: "running" as const,
2226+
status:
2227+
id === promotedTaskId
2228+
? queueHeld
2229+
? ("idle" as const)
2230+
: ("pending" as const)
2231+
: ("running" as const),
21902232
result: null,
21912233
completedAt: null,
21922234
completionDelivery: undefined,
@@ -2236,6 +2278,7 @@ const seedSteeredTasks = Effect.fnUntraced(function* (name: string) {
22362278
return {
22372279
...child,
22382280
parentThreadId,
2281+
beforePromotion,
22392282
steeredRun,
22402283
promotedRun,
22412284
promotedTaskId,
@@ -2253,8 +2296,27 @@ it.layer(layerSteeredTaskTest)("steered delegated follow-ups", (it) => {
22532296
Effect.gen(function* () {
22542297
const orchestrator = yield* Orchestrator.OrchestratorV2;
22552298
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2256-
const seeded = yield* seedSteeredTasks(`steered-${status}`);
2299+
const seeded = yield* seedSteeredTasks(`steered-${status}`, {
2300+
queueHeld: status === "failed",
2301+
});
22572302
yield* orchestrator.recoverDelegatedTask(seeded.childThreadId, seeded.promotedRun.id);
2303+
yield* (yield* EventSink.EventSinkV2)
2304+
.stream({ afterSequence: seeded.beforePromotion, eventType: "subagent.updated" })
2305+
.pipe(
2306+
Stream.filter(
2307+
(stored) =>
2308+
stored.event.type === "subagent.updated" &&
2309+
stored.event.payload.id === seeded.promotedTaskId &&
2310+
stored.event.payload.status === "running",
2311+
),
2312+
Stream.take(1),
2313+
Stream.runHead,
2314+
);
2315+
const activeParent = yield* orchestrator.getThreadProjection(seeded.parentThreadId);
2316+
assert.equal(
2317+
activeParent.subagents.find((task) => task.id === seeded.promotedTaskId)?.status,
2318+
"running",
2319+
);
22582320
const working = yield* service.taskStatus(seeded.scope, seeded.promotedTaskId);
22592321
assert.equal(working.status, "running");
22602322
assert.equal(working.workState, "working");
@@ -2397,35 +2459,53 @@ it.layer(layerSteeredTaskTest)("steered delegated follow-ups", (it) => {
23972459
}),
23982460
);
23992461

2400-
it.effect("acknowledges both tasks when a result page excludes the promoted user message", () =>
2401-
Effect.gen(function* () {
2402-
const orchestrator = yield* Orchestrator.OrchestratorV2;
2403-
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2404-
const seeded = yield* seedSteeredTasks("steered-page");
2405-
const itemId = yield* seeded.finish({ ...seeded.steeredRun, status: "completed" });
2406-
const page = yield* service.readThread(seeded.scope, {
2407-
threadId: seeded.childThreadId,
2408-
itemId,
2409-
limit: 1,
2410-
});
2411-
assert.lengthOf(page.items, 1);
2412-
assert.equal(page.items[0]?.type, "assistant_message");
2413-
const parent = yield* orchestrator.getThreadProjection(seeded.parentThreadId);
2414-
for (const id of [seeded.steeredTaskId, seeded.promotedTaskId]) {
2462+
it.effect.each(["delegated", "monitor"] as const)(
2463+
"acknowledges tasks when a result page excludes the promoted user message (%s)",
2464+
(owner) =>
2465+
Effect.gen(function* () {
2466+
const orchestrator = yield* Orchestrator.OrchestratorV2;
2467+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2468+
const seeded = yield* seedSteeredTasks(`steered-page-${owner}`, {
2469+
monitor: owner === "monitor",
2470+
});
2471+
const itemId = yield* seeded.finish({ ...seeded.steeredRun, status: "completed" });
2472+
const settled = yield* orchestrator.getThreadProjection(seeded.parentThreadId);
2473+
assert.lengthOf(
2474+
settled.contextTransfers.filter(
2475+
(transfer) => transfer.sourcePoint.runId === seeded.steeredRun.id,
2476+
),
2477+
1,
2478+
);
2479+
yield* orchestrator.recoverDelegatedTasks;
2480+
assert.deepEqual(
2481+
(yield* orchestrator.getThreadProjection(seeded.parentThreadId)).contextTransfers,
2482+
settled.contextTransfers,
2483+
);
2484+
const page = yield* service.readThread(seeded.scope, {
2485+
threadId: seeded.childThreadId,
2486+
itemId,
2487+
limit: 1,
2488+
});
2489+
assert.lengthOf(page.items, 1);
2490+
assert.equal(page.items[0]?.type, "assistant_message");
2491+
const parent = yield* orchestrator.getThreadProjection(seeded.parentThreadId);
2492+
for (const id of owner === "monitor"
2493+
? [seeded.promotedTaskId]
2494+
: [seeded.steeredTaskId, seeded.promotedTaskId]) {
2495+
assert.equal(
2496+
parent.subagents.find((task) => task.id === id)?.completionDelivery?.state,
2497+
"acknowledged",
2498+
id,
2499+
);
2500+
}
2501+
const result = yield* service.taskStatus(seeded.scope, seeded.promotedTaskId);
2502+
assert.equal(result.summary, "Shared result.");
24152503
assert.equal(
2416-
parent.subagents.find((task) => task.id === id)?.completionDelivery?.state,
2417-
"acknowledged",
2418-
id,
2504+
result.resultContextTransferId,
2505+
parent.contextTransfers.find(
2506+
(transfer) => transfer.sourcePoint.runId === seeded.steeredRun.id,
2507+
)?.id,
24192508
);
2420-
}
2421-
const result = yield* service.taskStatus(seeded.scope, seeded.promotedTaskId);
2422-
assert.equal(result.summary, "Shared result.");
2423-
assert.equal(
2424-
result.resultContextTransferId,
2425-
parent.contextTransfers.find(
2426-
(transfer) => transfer.sourcePoint.runId === seeded.steeredRun.id,
2427-
)?.id,
2428-
);
2429-
}),
2509+
}),
24302510
);
24312511
});

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10270,7 +10270,11 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
1027010270
const outcome = runOutcome(childRun);
1027110271
const terminalStatus = delegatedTaskTerminalStatus(outcome);
1027210272
if (terminalStatus === null) {
10273-
if (childRun.delegatedTaskId === undefined || childRun.id !== options.syncRunId) return;
10273+
if (
10274+
(childRun.delegatedTaskId === undefined || childRun.id !== options.syncRunId) &&
10275+
!(steered && taskRuns.some((run) => run.id === options.syncRunId))
10276+
)
10277+
return;
1027410278
const task = options.task;
1027510279
const status: OrchestrationV2Subagent["status"] =
1027610280
childRun.status === "queued"
@@ -10382,11 +10386,13 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
1038210386
(transfer.sourcePoint.runId === childRun.id ||
1038310387
(options.task.id === forkedFrom.nodeId && transfer.sourcePoint.runId === undefined)),
1038410388
);
10385-
// A steered task shares its run's result transfer, so only its own result marks it settled.
10389+
// A promoted task may share a transfer before its own result is settled.
1038610390
if (steered ? task.result !== null : existingResultTransfer !== undefined) {
1038710391
return;
1038810392
}
1038910393

10394+
const sharesResultTransfer =
10395+
steered && (childRun.delegatedTaskId !== undefined || existingResultTransfer !== undefined);
1039010396
const now = yield* DateTime.now;
1039110397
const result = subagentResultForRun(childProjection, { ...childRun, status: outcome });
1039210398
const parentRun =
@@ -10429,9 +10435,9 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
1042910435
: parentProjection.providerThreads.find(
1043010436
(candidate) => candidate.id === parentRun.providerThreadId,
1043110437
);
10432-
// The steered run's own task publishes that run's result to the parent's context.
10438+
// A joined run without a task needs its first promoted task to publish the result.
1043310439
const resultHandoff: OrchestrationV2ContextHandoff | null =
10434-
steered ||
10440+
sharesResultTransfer ||
1043510441
parentRun === undefined ||
1043610442
childProviderThread === undefined ||
1043710443
parentProviderThread === undefined
@@ -10581,7 +10587,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
1058110587
payload: resultHandoff,
1058210588
},
1058310589
]),
10584-
...(steered
10590+
...(sharesResultTransfer
1058510591
? []
1058610592
: [
1058710593
{

0 commit comments

Comments
 (0)