Skip to content

Commit af563b3

Browse files
EtanHeyclaude
andcommitted
fix(server): delegate_task accepts the inherited options orchestrator_capabilities reports
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 79f1fad commit af563b3

2 files changed

Lines changed: 112 additions & 4 deletions

File tree

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

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,6 +2615,96 @@ describe("OrchestratorMcpService provider resolution", () => {
26152615
}),
26162616
);
26172617

2618+
it.effect("accepts the inherited options it reports back as a delegate target", () =>
2619+
Effect.gen(function* () {
2620+
// t3_thread_launch keeps a model selection as given, so a thread can hold an option its model lacks.
2621+
const inherited = {
2622+
instanceId: codexInstanceId,
2623+
model: "gpt-5.4",
2624+
options: [
2625+
{ id: "reasoningEffort", value: "low" },
2626+
{ id: "fastMode", value: false },
2627+
],
2628+
} as const;
2629+
const commands: Array<{ readonly modelSelection?: unknown }> = [];
2630+
const task = {
2631+
id: taskId,
2632+
threadId: parentThreadId,
2633+
origin: "app_owned",
2634+
childThreadId,
2635+
providerInstanceId: codexInstanceId,
2636+
model: inherited.model,
2637+
status: "running",
2638+
result: null,
2639+
};
2640+
const dependencies = Layer.mergeAll(
2641+
NodeServices.layer,
2642+
Layer.mock(ThreadManagementService.ThreadManagementService)({
2643+
hasReceipt: () => Effect.succeed(false),
2644+
assertProviderInstanceEnabled: () => Effect.void,
2645+
getThreadRecords: (threadId) =>
2646+
Effect.succeed(
2647+
threadId === parentThreadId
2648+
? parentProjection(commands.length > 0 ? [task] : [], inherited)
2649+
: childProjection,
2650+
),
2651+
dispatch: (command) =>
2652+
Effect.sync(() => {
2653+
commands.push(command as { readonly modelSelection?: unknown });
2654+
return {
2655+
sequence: 1,
2656+
storedEvents: [{ event: { type: "subagent.updated", payload: task } }],
2657+
} as never;
2658+
}),
2659+
}),
2660+
ServerSettings.layerTest(),
2661+
providerRegistryLayer([
2662+
{
2663+
...providerSnapshot({
2664+
instanceId: codexInstanceId,
2665+
driver: ProviderDriverKind.make("codex"),
2666+
}),
2667+
models: [
2668+
{
2669+
slug: inherited.model,
2670+
name: inherited.model,
2671+
isCustom: false,
2672+
capabilities: {
2673+
optionDescriptors: [
2674+
{
2675+
id: "reasoningEffort",
2676+
label: "Reasoning",
2677+
type: "select",
2678+
options: [{ id: "low", label: "Low" }],
2679+
},
2680+
],
2681+
},
2682+
},
2683+
],
2684+
},
2685+
]),
2686+
adapterRegistryLayer([codexInstanceId]),
2687+
Layer.mock(ProjectService.ProjectService)({}),
2688+
Layer.mock(SecretRequests.SecretRequests)({}),
2689+
Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2690+
Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
2691+
);
2692+
yield* Effect.gen(function* () {
2693+
const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2694+
const { inheritedOptions } = yield* service.capabilities(scope);
2695+
yield* service.delegateTask(scope, {
2696+
task: "Review the change.",
2697+
target: yield* decodeTarget({ options: inheritedOptions }),
2698+
mode: "async",
2699+
});
2700+
assert.deepEqual(commands[0]?.modelSelection, {
2701+
...inherited,
2702+
options: [inherited.options[0]],
2703+
});
2704+
}).pipe(Effect.provide(layerOrchestratorService.pipe(Layer.provide(dependencies))));
2705+
}),
2706+
);
2707+
26182708
describe("resolveRuntimeMode", () => {
26192709
const muse = {
26202710
modelSelection: { instanceId: ProviderInstanceId.make("muse"), model: "muse-model" },

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

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,15 @@ function providerConstraints(
373373
return constraints;
374374
}
375375

376+
/** t3_thread_launch keeps a selection as given, so it can hold options its model does not have. */
377+
function knownOptions(
378+
options: ReadonlyArray<ProviderOptionSelection> | undefined,
379+
descriptors: ReadonlyArray<ProviderOptionDescriptor> | undefined,
380+
): ReadonlyArray<ProviderOptionSelection> | undefined {
381+
if (options === undefined || descriptors === undefined) return options;
382+
return options.filter((option) => descriptors.some((descriptor) => descriptor.id === option.id));
383+
}
384+
376385
/** Skip checks without descriptors; reject duplicate IDs because consumers disagree on precedence. */
377386
function invalidOptionSelections(
378387
selections: ReadonlyArray<ProviderOptionSelection>,
@@ -1395,10 +1404,10 @@ const make = Effect.gen(function* () {
13951404
);
13961405
}
13971406

1407+
const descriptors = provider.models.find((candidate) => candidate.slug === model)?.capabilities
1408+
?.optionDescriptors;
13981409
const requestedOptions = input.target?.options;
13991410
if (requestedOptions !== undefined) {
1400-
const descriptors = provider.models.find((candidate) => candidate.slug === model)
1401-
?.capabilities?.optionDescriptors;
14021411
const invalid = invalidOptionSelections(requestedOptions, descriptors);
14031412
if (invalid.length > 0) {
14041413
return yield* failure(
@@ -1410,7 +1419,9 @@ const make = Effect.gen(function* () {
14101419

14111420
const inheritsOptions =
14121421
instanceId === inheritedSelection.instanceId && model === inheritedSelection.model;
1413-
let options = inheritsOptions ? inheritedSelection.options : undefined;
1422+
let options = inheritsOptions
1423+
? knownOptions(inheritedSelection.options, descriptors)
1424+
: undefined;
14141425
if (requestedOptions !== undefined) {
14151426
const selections = new Map(
14161427
(requestedOptions.length === 0 ? [] : (options ?? [])).map((selection) => [
@@ -2161,7 +2172,14 @@ const make = Effect.gen(function* () {
21612172
parentThreadId: parent?.thread.id ?? null,
21622173
inheritedProviderInstanceId: inherited?.instanceId ?? null,
21632174
inheritedModel: inherited?.model ?? null,
2164-
inheritedOptions: inherited?.options ?? [],
2175+
inheritedOptions:
2176+
knownOptions(
2177+
inherited?.options,
2178+
providers
2179+
.find((provider) => provider.instanceId === inherited?.instanceId)
2180+
?.models.find((model) => model.slug === inherited?.model)?.capabilities
2181+
?.optionDescriptors,
2182+
) ?? [],
21652183
runtimeMode: limits.runtimeMode,
21662184
interactionMode: limits.interactionMode,
21672185
providers: providers.map((provider) => {

0 commit comments

Comments
 (0)