Skip to content

Commit 44b395b

Browse files
committed
fix(server): a retried thread creation replays after the project turns its provider off
Signed-off-by: Yordis Prieto <[email protected]>
1 parent 81dbc87 commit 44b395b

2 files changed

Lines changed: 106 additions & 11 deletions

File tree

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

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,6 +1605,97 @@ describe("OrchestratorMcpService provider resolution", () => {
16051605
}),
16061606
);
16071607

1608+
it.effect(
1609+
"retrying an accepted thread creation replays even after the project disables every candidate",
1610+
() =>
1611+
Effect.gen(function* () {
1612+
const altInstanceId = ProviderInstanceId.make("codex-alt");
1613+
const dispatched = yield* Ref.make<ReadonlyArray<unknown>>([]);
1614+
const accepted = yield* Ref.make(false);
1615+
const everyCandidateDisabled = yield* Ref.make(false);
1616+
const layerDependencies = Layer.mergeAll(
1617+
NodeServices.layer,
1618+
Layer.mock(ThreadManagementService.ThreadManagementService)({
1619+
getThreadRecords: (threadId) =>
1620+
Effect.succeed(threadId === parentThreadId ? parentProjection([]) : childProjection),
1621+
// A command id already accepted once, even if the project later
1622+
// disables every candidate: its retry must replay, not re-resolve.
1623+
hasReceipt: () => Ref.get(accepted),
1624+
// Effective settings once the project turns every instance off,
1625+
// ignoring the already-accepted command's replay exemption.
1626+
isProviderInstanceEnabledForProject: () =>
1627+
Ref.get(everyCandidateDisabled).pipe(Effect.map((disabled) => !disabled)),
1628+
assertProviderInstanceEnabled: ({ projectId, instanceId }) =>
1629+
Effect.all([Ref.get(accepted), Ref.get(everyCandidateDisabled)]).pipe(
1630+
Effect.flatMap(([isAccepted, disabled]) =>
1631+
isAccepted || !disabled
1632+
? Effect.void
1633+
: Effect.fail(
1634+
new ThreadManagementService.ThreadManagementProviderInstanceDisabledError({
1635+
projectId,
1636+
instanceId,
1637+
}),
1638+
),
1639+
),
1640+
),
1641+
dispatch: (command) =>
1642+
Ref.update(dispatched, (commands) => [...commands, command]).pipe(
1643+
Effect.andThen(
1644+
command.type === "thread.create" ? Ref.set(accepted, true) : Effect.void,
1645+
),
1646+
Effect.as({ sequence: 1, storedEvents: [] } as never),
1647+
),
1648+
}),
1649+
providerRegistryLayer([
1650+
providerSnapshot({
1651+
instanceId: codexInstanceId,
1652+
driver: ProviderDriverKind.make("codex"),
1653+
model: "gpt-5.4",
1654+
}),
1655+
providerSnapshot({
1656+
instanceId: altInstanceId,
1657+
driver: ProviderDriverKind.make("codex"),
1658+
model: "gpt-5.4",
1659+
}),
1660+
]),
1661+
adapterRegistryLayer([codexInstanceId, altInstanceId]),
1662+
Layer.mock(ProjectService.ProjectService)({}),
1663+
Layer.mock(SecretRequests.SecretRequests)({}),
1664+
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
1665+
ServerSettings.layerTest(),
1666+
);
1667+
1668+
yield* Effect.gen(function* () {
1669+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
1670+
const first = yield* service.createThreads(scope, {
1671+
threads: [{ target: { driverKind: ProviderDriverKind.make("codex") } }],
1672+
clientRequestId: "create-thread-retry-after-disable-1",
1673+
});
1674+
assert.equal(first.threads.length, 1);
1675+
1676+
// The project turns off every instance of this driver only after
1677+
// the thread creation above was already accepted.
1678+
yield* Ref.set(everyCandidateDisabled, true);
1679+
1680+
const retry = yield* service.createThreads(scope, {
1681+
threads: [{ target: { driverKind: ProviderDriverKind.make("codex") } }],
1682+
clientRequestId: "create-thread-retry-after-disable-1",
1683+
});
1684+
assert.equal(retry.threads.length, 1);
1685+
1686+
const commands = yield* Ref.get(dispatched);
1687+
const createCommands = commands.filter(
1688+
(command): command is { type: string; modelSelection: { instanceId: string } } =>
1689+
(command as { type: string }).type === "thread.create",
1690+
);
1691+
assert.equal(createCommands.length, 2);
1692+
assert.equal(createCommands[1]?.modelSelection.instanceId, codexInstanceId);
1693+
}).pipe(
1694+
Effect.provide(OrchestratorMcpService.layer.pipe(Layer.provide(layerDependencies))),
1695+
);
1696+
}),
1697+
);
1698+
16081699
it.effect("re-probes an unavailable target once before refusing it", () =>
16091700
Effect.gen(function* () {
16101701
const claudeInstanceId = ProviderInstanceId.make("claudeAgent");

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,10 +2264,23 @@ const make = Effect.gen(function* () {
22642264
input.threads,
22652265
(request, index) =>
22662266
Effect.gen(function* () {
2267+
// Computed before resolving the target so a retry of an
2268+
// already accepted thread creation can be recognized:
2269+
// dispatching under the same command id only replays the
2270+
// recorded result, so candidate selection must not refuse it
2271+
// over the project's current settings.
2272+
const commandId = stableCommandId({
2273+
scope,
2274+
requestKey: key,
2275+
operation: "create-thread",
2276+
index,
2277+
});
2278+
const isRetryOfAcceptedCreation = yield* threadManagement.hasReceipt(commandId);
22672279
const target = yield* resolveTargetRechecking({
22682280
parent,
22692281
target: request.target,
22702282
providers,
2283+
skipProjectEnablementFilter: isRetryOfAcceptedCreation,
22712284
});
22722285
const runtimeMode = yield* resolveRuntimeMode(
22732286
parent.thread.runtimeMode,
@@ -2283,11 +2296,7 @@ const make = Effect.gen(function* () {
22832296
requestKey: key,
22842297
index,
22852298
});
2286-
yield* assertTargetEnabledForProject(
2287-
parent,
2288-
stableCommandId({ scope, requestKey: key, operation: "create-thread", index }),
2289-
target,
2290-
);
2299+
yield* assertTargetEnabledForProject(parent, commandId, target);
22912300
const title = threadTitle({
22922301
parentTitle: parent.thread.title,
22932302
prompt: request.prompt,
@@ -2299,12 +2308,7 @@ const make = Effect.gen(function* () {
22992308
type: "thread.create",
23002309
createdBy: "agent",
23012310
creationSource: "mcp",
2302-
commandId: stableCommandId({
2303-
scope,
2304-
requestKey: key,
2305-
operation: "create-thread",
2306-
index,
2307-
}),
2311+
commandId,
23082312
threadId,
23092313
projectId: parent.thread.projectId,
23102314
title,

0 commit comments

Comments
 (0)