Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions apps/server/src/mcp/OrchestratorMcpService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ describe("OrchestratorMcpService", () => {
const childThreadId = ThreadId.make("thread:mcp-next-child");
const taskId = NodeId.make("node:mcp-next-task");
let finished = false;
let pendingRequest = false;
let pendingRequest: "live" | "message" | null = null;
const parentProjection = () =>
({
thread: { id: parentThreadId },
Expand Down Expand Up @@ -652,7 +652,16 @@ describe("OrchestratorMcpService", () => {
subagents: [],
providerThreads: [],
providerTurns: [],
runtimeRequests: pendingRequest ? [{ status: "pending" }] : [],
runtimeRequests:
pendingRequest === null
? []
: [
{
kind: "user_input",
status: "pending",
responseCapability: { type: pendingRequest },
},
],
nodes: [],
turnItems: [],
}) as unknown as OrchestrationV2ThreadProjection;
Expand Down Expand Up @@ -705,11 +714,16 @@ describe("OrchestratorMcpService", () => {
assert.equal(waiting.next, ORCHESTRATOR_MCP_RUNNING_TASK_NEXT);

// A child waiting on a question or approval needs an answer, not a wake.
pendingRequest = true;
pendingRequest = "live";
const asking = yield* service.waitForThread(scope, { threadId: childThreadId });
assert.isTrue(asking.timedOut);
assert.notProperty(asking, "next");
pendingRequest = false;

// A question answered by message does not stop the child.
pendingRequest = "message";
const working = yield* service.waitForThread(scope, { threadId: childThreadId });
assert.equal(working.next, ORCHESTRATOR_MCP_RUNNING_TASK_NEXT);
pendingRequest = null;

finished = true;
const completed = yield* service.taskStatus(scope, taskId);
Expand Down
5 changes: 4 additions & 1 deletion apps/server/src/mcp/OrchestratorMcpService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3734,7 +3734,10 @@ const make = Effect.gen(function* () {
.pipe(Effect.mapError(threadManagementFailure))).runtimeRequests
: [];
const wakesCaller =
ownedTask && !childRequests.some((request) => request.status === "pending");
ownedTask &&
!childRequests.some(
(request) => request.status === "pending" && request.responseCapability.type === "live",
);
return {
threadId: input.threadId,
runId: result.run?.id ?? null,
Expand Down
Loading