Skip to content

Commit 65965f7

Browse files
henrychu04claudemaria-rcks
authored
fix(server): launched threads step down to a runtime mode their provider offers (#26682)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]>
1 parent 6557665 commit 65965f7

5 files changed

Lines changed: 75 additions & 4 deletions

File tree

‎apps/server/src/mcp/toolkits/project/handlers.test.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,62 @@ it.effect(
244244
}),
245245
);
246246

247+
it.effect("a launch steps an inherited mode down to the provider's, and refuses one it lacks", () =>
248+
Effect.gen(function* () {
249+
// Pi offers no Auto; a mode a provider lacks would run as Supervised.
250+
const pi = ProviderInstanceId.make("pi");
251+
const launchPi = Effect.fn("test.launchPi")(function* (runtimeMode?: RuntimeMode) {
252+
const launched: Array<ThreadLaunch.ThreadLaunchInput> = [];
253+
const { projectId, dependencies } = clientLaunchHarness({
254+
runtimeModeCeiling: "auto",
255+
launched,
256+
providers: [
257+
{
258+
instanceId: pi,
259+
driver: ProviderDriverKind.make("pi"),
260+
enabled: true,
261+
installed: true,
262+
status: "ready",
263+
version: null,
264+
auth: { status: "authenticated" },
265+
checkedAt: "2026-01-01T00:00:00Z",
266+
models: [],
267+
slashCommands: [],
268+
skills: [],
269+
supportedRuntimeModes: ["approval-required", "auto-accept-edits", "full-access"],
270+
},
271+
],
272+
});
273+
const toolkit = yield* ProjectToolkit.pipe(
274+
Effect.provide(
275+
McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(
276+
Layer.provide(dependencies),
277+
),
278+
),
279+
);
280+
const result = yield* toolkit
281+
.handle("t3_thread_launch", {
282+
projectId,
283+
title: "Fix",
284+
modelSelection: { instanceId: pi, model: "pi-model" },
285+
...(runtimeMode === undefined ? {} : { runtimeMode }),
286+
})
287+
.pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies));
288+
return { result: result.at(-1)?.result, launched };
289+
});
290+
291+
const inherited = yield* launchPi();
292+
expect(inherited.launched[0]?.runtimeMode).toBe("auto-accept-edits");
293+
294+
const requested = yield* launchPi("auto");
295+
expect(requested.result).toMatchObject({ code: "invalid_request" });
296+
expect(requested.launched).toHaveLength(0);
297+
298+
const offered = yield* launchPi("approval-required");
299+
expect(offered.launched[0]?.runtimeMode).toBe("approval-required");
300+
}),
301+
);
302+
247303
it.effect("a launch retried with the same clientRequestId replays the first one", () =>
248304
Effect.gen(function* () {
249305
const launched: Array<ThreadLaunch.ThreadLaunchInput> = [];

‎apps/server/src/mcp/toolkits/project/handlers.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,21 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
204204
message:
205205
"Pass modelSelection: the project has no default model. orchestrator_capabilities lists providers and models.",
206206
});
207-
const startedRuntimeMode =
207+
let startedRuntimeMode =
208208
projectDefaults !== undefined && input.runtimeMode === undefined
209209
? yield* resolveRuntimeMode(runtimeMode, projectDefaults.defaultRuntimeMode).pipe(
210210
Effect.orElseSucceed(() => runtimeMode),
211211
)
212212
: runtimeMode;
213+
if (!replaying) {
214+
const providers = yield* (yield* ProviderRegistry.ProviderRegistry).getProviders;
215+
startedRuntimeMode = yield* resolveRuntimeMode(startedRuntimeMode, input.runtimeMode, {
216+
modelSelection,
217+
supportedRuntimeModes: providers.find(
218+
(provider) => provider.instanceId === modelSelection.instanceId,
219+
)?.supportedRuntimeModes,
220+
});
221+
}
213222
const result = yield* ThreadMessageIntake.launchThread({
214223
commandId,
215224
threadId,

‎apps/server/src/peer/PeerForwarding.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ const serveBox = (seen: Ref.Ref<Seen>, linkSession: Ref.Ref<string>) =>
225225
),
226226
),
227227
Layer.provide(NodeServices.layer),
228-
Layer.provide(Layer.mock(ProviderRegistry.ProviderRegistry)({})),
228+
Layer.provide(
229+
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
230+
),
229231
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
230232
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
231233
Layer.provide(Layer.mock(ProjectCloneTracker.ProjectCloneTracker)({})),

‎apps/server/src/peer/RemoteDelegation.test.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,9 @@ const boxToolkitLayer = (thread: BoxThread) => {
482482
Layer.provide(NodeServices.layer),
483483
),
484484
),
485-
Layer.provide(Layer.mock(ProviderRegistry.ProviderRegistry)({})),
485+
Layer.provide(
486+
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
487+
),
486488
Layer.provide(Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({})),
487489
Layer.provide(Layer.mock(ScheduledTaskService.ScheduledTaskService)({})),
488490
Layer.provide(

‎docs/orchestration-v2/orchestrator-mcp-server.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,9 @@ Pass the task in `message`. Project, model, and modes inherit when omitted;
364364
workspace does not. `scratch: true` launches without a project, in a folder of
365365
its own under the environment's Scratch project. For stacked PRs, use the parent branch as `baseRef` with
366366
`startFromOrigin: false`. The new thread may not run with broader runtime or
367-
interaction modes than the caller. Launch has no retry key, so inspect existing threads after a failed or lost response before
367+
interaction modes than the caller. As for `delegate_task`, a runtime mode the
368+
provider does not offer is refused, and an inherited or default one steps down
369+
to the broadest mode it offers. Launch has no retry key, so inspect existing threads after a failed or lost response before
368370
launching again. `create_threads` remains the batch option for a shared checkout.
369371

370372
### `t3_thread_list`

0 commit comments

Comments
 (0)