Skip to content

Commit fb4b22f

Browse files
committed
fix(server): a promoted follow-up reports the steered turn's result transfer
1 parent d884dbc commit fb4b22f

2 files changed

Lines changed: 101 additions & 2 deletions

File tree

‎apps/server/src/mcp/OrchestratorMcpService.test.ts‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,97 @@ describe("OrchestratorMcpService", () => {
278278
}),
279279
);
280280

281+
it.effect("reports the steered turn's result transfer for a follow-up promoted to Steer", () =>
282+
Effect.gen(function* () {
283+
const parentThreadId = ThreadId.make("thread:mcp-steer-parent");
284+
const childThreadId = ThreadId.make("thread:mcp-steer-child");
285+
const steeredTaskId = NodeId.make("node:mcp-steer-steered");
286+
const promotedTaskId = NodeId.make("node:mcp-steer-promoted");
287+
const steeredRunId = RunId.make("run:mcp-steer-steered");
288+
const promotedMessageId = "message:mcp-steer-promoted";
289+
const task = (id: NodeId) => ({
290+
id,
291+
threadId: parentThreadId,
292+
origin: "app_owned",
293+
childThreadId,
294+
driver: "codex",
295+
model: "gpt-5.6-terra",
296+
status: "completed",
297+
result: "Merged both branches.",
298+
completionDelivery: { state: "delivered" },
299+
});
300+
const parentProjection = {
301+
thread: { id: parentThreadId },
302+
runs: [],
303+
contextTransfers: [
304+
{
305+
id: "context-transfer:mcp-steer-result",
306+
type: "subagent_result",
307+
sourceThreadId: childThreadId,
308+
targetThreadId: parentThreadId,
309+
sourcePoint: { runId: steeredRunId },
310+
},
311+
],
312+
subagents: [task(steeredTaskId), task(promotedTaskId)],
313+
} as unknown as OrchestrationV2ThreadProjection;
314+
const childProjection = {
315+
thread: { id: childThreadId },
316+
runs: [
317+
{ id: steeredRunId, ordinal: 1, status: "completed", delegatedTaskId: steeredTaskId },
318+
{
319+
id: RunId.make("run:mcp-steer-promoted"),
320+
ordinal: 2,
321+
status: "cancelled",
322+
delegatedTaskId: promotedTaskId,
323+
userMessageId: promotedMessageId,
324+
},
325+
],
326+
contextTransfers: [],
327+
// Promoting the follow-up moved its message into the steered run.
328+
messages: [{ id: promotedMessageId, role: "user", runId: steeredRunId }],
329+
subagents: [],
330+
providerThreads: [],
331+
turnItems: [],
332+
} as unknown as OrchestrationV2ThreadProjection;
333+
const layerDependencies = Layer.mergeAll(
334+
NodeServices.layer,
335+
Layer.mock(ThreadManagementService.ThreadManagementService)({
336+
getThreadRecords: (threadId) =>
337+
Effect.succeed(threadId === parentThreadId ? parentProjection : childProjection),
338+
delegatedTaskResultPending: () => Effect.succeed(false),
339+
dispatch: () => Effect.succeed({} as never),
340+
}),
341+
ServerSettings.layerTest(),
342+
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
343+
Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
344+
list: () => Effect.succeed([]),
345+
}),
346+
Layer.mock(ProjectService.ProjectService)({}),
347+
Layer.mock(SecretRequests.SecretRequests)({}),
348+
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
349+
);
350+
const scope: McpInvocationScope = {
351+
environmentId: EnvironmentId.make("environment:mcp-steer"),
352+
requestNamespace: "provider-session:mcp-steer",
353+
thread: {
354+
threadId: parentThreadId,
355+
providerSessionId: "provider-session:mcp-steer",
356+
providerInstanceId: ProviderInstanceId.make("codex"),
357+
},
358+
client: undefined,
359+
capabilities: new Set(["orchestration"]),
360+
issuedAt: 1,
361+
};
362+
363+
yield* Effect.gen(function* () {
364+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
365+
const promoted = yield* service.taskStatus(scope, promotedTaskId);
366+
assert.equal(promoted.status, "completed");
367+
assert.equal(promoted.resultContextTransferId, "context-transfer:mcp-steer-result");
368+
}).pipe(Effect.provide(layerOrchestratorService.pipe(Layer.provide(layerDependencies))));
369+
}),
370+
);
371+
281372
it.effect("does not dispose delivery when a nonterminal task has no active child run", () =>
282373
Effect.gen(function* () {
283374
const parentThreadId = ThreadId.make("thread:mcp-cancel-parent");

‎apps/server/src/mcp/OrchestratorMcpService.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,12 @@ function directAppOwnedChildTasks(
435435

436436
function taskResultTransfer(
437437
parent: Pick<OrchestrationV2ThreadProjection, "thread" | "contextTransfers">,
438-
child: Pick<OrchestrationV2ThreadProjection, "runs" | "contextTransfers">,
438+
child: Pick<OrchestrationV2ThreadProjection, "runs" | "messages" | "contextTransfers">,
439439
task: OrchestrationV2Subagent,
440440
) {
441441
const originalRun = delegatedTaskRun(child, task);
442+
// A follow-up promoted to Steer shares the transfer of the run it joined.
443+
const resultRun = delegatedTaskResultRun(child, task.id);
442444
const resultRunIds = new Set(
443445
child.runs
444446
.filter(
@@ -449,6 +451,7 @@ function taskResultTransfer(
449451
.map((run) => run.id),
450452
);
451453
if (originalRun !== undefined) resultRunIds.add(originalRun.id);
454+
if (resultRun !== undefined) resultRunIds.add(resultRun.id);
452455
return parent.contextTransfers.find(
453456
(transfer) =>
454457
transfer.type === "subagent_result" &&
@@ -2524,8 +2527,13 @@ const make = Effect.gen(function* () {
25242527
tasks.length > 0 &&
25252528
(input.textOffset ?? 0) === 0
25262529
) {
2530+
const targetMessages = messagesByThreadId.get(target.thread.id) ?? [];
25272531
for (const task of tasks) {
2528-
const transfer = taskResultTransfer(parent, target, task);
2532+
const transfer = taskResultTransfer(
2533+
parent,
2534+
{ ...target, messages: targetMessages },
2535+
task,
2536+
);
25292537
const resultRunId = transfer?.sourcePoint.runId ?? delegatedTaskRun(target, task)?.id;
25302538
const resultRunIds = resultRunId === undefined ? [] : [resultRunId];
25312539
const resultRecords = yield* threadManagement

0 commit comments

Comments
 (0)