@devries-cameron20 / t3code-1 / commits / c0b1d32c97
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(server): MCP delegation accepts models from the project's own provider config (#39247)

Julius Marminge committed Nov 19, 2026 at 10:29 UTC c0b1d32c97ca4daf8363c180f8a43fa9a8387bfa
5 files changed +263 -47
apps/server/src/mcp/OrchestratorMcpService.test.ts
+131 -35
@@ -210,7 +210,7 @@ describe("OrchestratorMcpService", () => {
210 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
211 list: () => Effect.succeed([]),
212 }),
213 - Layer.mock(ProjectService.ProjectService)({}),
213 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
214 Layer.mock(SecretRequests.SecretRequests)({}),
215 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
216 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -327,7 +327,7 @@ describe("OrchestratorMcpService", () => {
327 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
328 list: () => Effect.succeed([]),
329 }),
330 - Layer.mock(ProjectService.ProjectService)({}),
330 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
331 Layer.mock(SecretRequests.SecretRequests)({}),
332 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
333 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -473,7 +473,7 @@ describe("OrchestratorMcpService", () => {
473 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
474 list: () => Effect.succeed([]),
475 }),
476 - Layer.mock(ProjectService.ProjectService)({}),
476 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
477 Layer.mock(SecretRequests.SecretRequests)({}),
478 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
479 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -572,7 +572,7 @@ describe("OrchestratorMcpService", () => {
572 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
573 list: () => Effect.succeed([]),
574 }),
575 - Layer.mock(ProjectService.ProjectService)({}),
575 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
576 Layer.mock(SecretRequests.SecretRequests)({}),
577 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
578 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -677,7 +677,7 @@ describe("OrchestratorMcpService", () => {
677 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
678 list: () => Effect.succeed([]),
679 }),
680 - Layer.mock(ProjectService.ProjectService)({}),
680 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
681 Layer.mock(SecretRequests.SecretRequests)({}),
682 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
683 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -773,7 +773,7 @@ describe("OrchestratorMcpService", () => {
773 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
774 list: () => Effect.succeed([]),
775 }),
776 - Layer.mock(ProjectService.ProjectService)({}),
776 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
777 Layer.mock(SecretRequests.SecretRequests)({}),
778 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
779 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -875,7 +875,7 @@ describe("OrchestratorMcpService", () => {
875 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
876 list: () => Effect.succeed([]),
877 }),
878 - Layer.mock(ProjectService.ProjectService)({}),
878 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
879 Layer.mock(SecretRequests.SecretRequests)({}),
880 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
881 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -984,7 +984,7 @@ describe("OrchestratorMcpService", () => {
984 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
985 list: () => Effect.succeed([]),
986 }),
987 - Layer.mock(ProjectService.ProjectService)({}),
987 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
988 Layer.mock(SecretRequests.SecretRequests)({}),
989 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
990 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1081,7 +1081,7 @@ describe("OrchestratorMcpService", () => {
1081 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
1082 list: () => Effect.succeed([]),
1083 }),
1084 - Layer.mock(ProjectService.ProjectService)({}),
1084 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1085 Layer.mock(SecretRequests.SecretRequests)({}),
1086 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1087 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1175,7 +1175,7 @@ describe("OrchestratorMcpService", () => {
1175 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
1176 list: () => Effect.succeed([]),
1177 }),
1178 - Layer.mock(ProjectService.ProjectService)({}),
1178 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1179 Layer.mock(SecretRequests.SecretRequests)({}),
1180 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1181 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1267,7 +1267,7 @@ describe("OrchestratorMcpService", () => {
1267 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
1268 list: () => Effect.succeed([]),
1269 }),
1270 - Layer.mock(ProjectService.ProjectService)({}),
1270 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1271 Layer.mock(SecretRequests.SecretRequests)({}),
1272 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1273 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1457,7 +1457,7 @@ describe("OrchestratorMcpService", () => {
1457 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
1458 list: () => Effect.succeed([]),
1459 }),
1460 - Layer.mock(ProjectService.ProjectService)({}),
1460 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1461 Layer.mock(SecretRequests.SecretRequests)({}),
1462 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1463 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1737,7 +1737,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1737 }),
1738 ]),
1739 adapterRegistryLayer([codexInstanceId]),
1740 - Layer.mock(ProjectService.ProjectService)({}),
1740 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1741 Layer.mock(SecretRequests.SecretRequests)({}),
1742 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1743 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1867,7 +1867,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1867 }),
1868 ]),
1869 adapterRegistryLayer([codexInstanceId]),
1870 - Layer.mock(ProjectService.ProjectService)({}),
1870 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1871 Layer.mock(SecretRequests.SecretRequests)({}),
1872 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1873 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -1922,7 +1922,7 @@ describe("OrchestratorMcpService provider resolution", () => {
1922 ServerSettings.layerTest(),
1923 providerRegistryLayer([]),
1924 adapterRegistryLayer([]),
1925 - Layer.mock(ProjectService.ProjectService)({}),
1925 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
1926 Layer.mock(SecretRequests.SecretRequests)({}),
1927 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
1928 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2049,7 +2049,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2049 antigravityInstanceId,
2050 disabledAntigravityInstanceId,
2051 ]),
2052 - Layer.mock(ProjectService.ProjectService)({}),
2052 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2053 Layer.mock(SecretRequests.SecretRequests)({}),
2054 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2055 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2233,7 +2233,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2233 }),
2234 providerRegistryLayer(catalog),
2235 adapterRegistryLayer([codexInstanceId, opencodeInstanceId]),
2236 - Layer.mock(ProjectService.ProjectService)({}),
2236 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2237 Layer.mock(SecretRequests.SecretRequests)({}),
2238 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2239 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2391,7 +2391,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2391 }),
2392 }),
2393 adapterRegistryLayer([museInstanceId]),
2394 - Layer.mock(ProjectService.ProjectService)({}),
2394 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2395 Layer.mock(SecretRequests.SecretRequests)({}),
2396 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2397 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2425,6 +2425,102 @@ describe("OrchestratorMcpService provider resolution", () => {
2425 }),
2426 );
2427
2428 + it.effect("delegates to a model only the parent project's folder config advertises", () =>
2429 + Effect.gen(function* () {
2430 + const opencodeInstanceId = ProviderInstanceId.make("opencode");
2431 + const workspaceRoot = "/work/uni";
2432 + const model = "uni/medium-local";
2433 + const machineModels = [
2434 + { slug: "opencode/big-pickle", name: "Big Pickle", isCustom: false, capabilities: null },
2435 + ];
2436 + const opencode: ServerProvider = {
2437 + ...providerSnapshot({
2438 + instanceId: opencodeInstanceId,
2439 + driver: ProviderDriverKind.make("opencode"),
2440 + }),
2441 + models: machineModels,
2442 + workspaceSnapshots: [
2443 + {
2444 + cwd: workspaceRoot,
2445 + checkedAt: "2026-09-13T00:00:00.000Z",
2446 + slashCommands: [],
2447 + skills: [],
2448 + models: [
2449 + ...machineModels,
2450 + { slug: model, name: "Medium Local", isCustom: false, capabilities: null },
2451 + ],
2452 + },
2453 + ],
2454 + };
2455 + const commands: Array<unknown> = [];
2456 + const task = {
2457 + id: taskId,
2458 + threadId: parentThreadId,
2459 + origin: "app_owned",
2460 + childThreadId,
2461 + providerInstanceId: opencodeInstanceId,
2462 + model,
2463 + status: "running",
2464 + result: null,
2465 + };
2466 + const dependencies = Layer.mergeAll(
2467 + NodeServices.layer,
2468 + NodeCrypto.layer,
2469 + Layer.mock(ThreadManagementService.ThreadManagementService)({
2470 + hasReceipt: () => Effect.succeed(false),
2471 + getThreadRecords: (threadId) =>
2472 + Effect.succeed(
2473 + threadId === parentThreadId
2474 + ? parentProjection(commands.length > 0 ? [task] : [])
2475 + : childProjection,
2476 + ),
2477 + dispatch: (command) =>
2478 + Effect.sync(() => {
2479 + commands.push(command);
2480 + return {
2481 + sequence: 1,
2482 + storedEvents: [{ event: { type: "subagent.updated", payload: task } }],
2483 + } as never;
2484 + }),
2485 + }),
2486 + ServerSettings.layerTest(),
2487 + Layer.mock(ProviderRegistry.ProviderRegistry)({
2488 + getProviders: Effect.succeed([opencode]),
2489 + refreshInstance: () => Effect.succeed([opencode]),
2490 + refreshWorkspaceSnapshot: () => Effect.succeed([opencode]),
2491 + }),
2492 + adapterRegistryLayer([opencodeInstanceId]),
2493 + Layer.mock(ProjectService.ProjectService)({
2494 + getById: () => Effect.succeedSome({ id: projectId, workspaceRoot } as never),
2495 + }),
2496 + Layer.mock(SecretRequests.SecretRequests)({}),
2497 + Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2498 + Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
2499 + );
2500 + yield* Effect.gen(function* () {
2501 + const service = yield* OrchestratorMcpService.OrchestratorMcpService;
2502 + const capabilities = yield* service.capabilities(scope, { search: "local" });
2503 + assert.deepEqual(
2504 + capabilities.providers
2505 + .find((provider) => provider.providerInstanceId === opencodeInstanceId)
2506 + ?.models.map((listed) => listed.id),
2507 + [model],
2508 + );
2509 + const result = yield* service.delegateTask(scope, {
2510 + task: "Review the change.",
2511 + target: { providerInstanceId: opencodeInstanceId, model },
2512 + mode: "async",
2513 + clientRequestId: "folder-scoped-model",
2514 + });
2515 + assert.equal(result.model, model);
2516 + assert.deepEqual((commands[0] as { modelSelection: unknown }).modelSelection, {
2517 + instanceId: opencodeInstanceId,
2518 + model,
2519 + });
2520 + }).pipe(Effect.provide(layerOrchestratorService.pipe(Layer.provide(dependencies))));
2521 + }),
2522 + );
2523 +
2524 it.effect("rejects delegation to a provider without a registered adapter", () =>
2525 Effect.gen(function* () {
2526 const forkOnlyInstanceId = ProviderInstanceId.make("forkOnly");
@@ -2451,7 +2547,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2547 forkShadow,
2548 ]),
2549 adapterRegistryLayer([codexInstanceId]),
2454 - Layer.mock(ProjectService.ProjectService)({}),
2550 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2551 Layer.mock(SecretRequests.SecretRequests)({}),
2552 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2553 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2512,7 +2608,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2608 }),
2609 ]),
2610 adapterRegistryLayer([codexInstanceId]),
2515 - Layer.mock(ProjectService.ProjectService)({}),
2611 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2612 Layer.mock(SecretRequests.SecretRequests)({}),
2613 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2614 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2580,7 +2676,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2676 }),
2677 ]),
2678 adapterRegistryLayer([codexInstanceId]),
2583 - Layer.mock(ProjectService.ProjectService)({}),
2679 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2680 Layer.mock(SecretRequests.SecretRequests)({}),
2681 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2682 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2627,7 +2723,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2723 },
2724 ]),
2725 adapterRegistryLayer([codexInstanceId]),
2630 - Layer.mock(ProjectService.ProjectService)({}),
2726 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2727 Layer.mock(SecretRequests.SecretRequests)({}),
2728 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2729 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2749,7 +2845,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2845 }),
2846 ]),
2847 adapterRegistryLayer([codexInstanceId, altInstanceId]),
2752 - Layer.mock(ProjectService.ProjectService)({}),
2848 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2849 Layer.mock(SecretRequests.SecretRequests)({}),
2850 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2851 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2859,7 +2955,7 @@ describe("OrchestratorMcpService provider resolution", () => {
2955 }),
2956 ]),
2957 adapterRegistryLayer([codexInstanceId, altInstanceId]),
2862 - Layer.mock(ProjectService.ProjectService)({}),
2958 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
2959 Layer.mock(SecretRequests.SecretRequests)({}),
2960 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
2961 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -2954,7 +3050,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3050 providerSnapshot({ instanceId: codexInstanceId, driver, model: "gpt-5.4" }),
3051 providerSnapshot({ instanceId: altInstanceId, driver, model: "gpt-5.5" }),
3052 ]),
2957 - Layer.mock(ProjectService.ProjectService)({}),
3053 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
3054 Layer.mock(SecretRequests.SecretRequests)({}),
3055 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
3056 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -3183,7 +3279,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3279 providerRegistryLayer([
3280 providerSnapshot({ instanceId: codexInstanceId, driver, model: "gpt-5.4" }),
3281 ]),
3186 - Layer.mock(ProjectService.ProjectService)({}),
3282 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
3283 Layer.mock(SecretRequests.SecretRequests)({}),
3284 layerRemoteDelegation,
3285 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -3397,7 +3493,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3493 ? [codexAltInstanceId]
3494 : [codexInstanceId, codexAltInstanceId],
3495 ),
3400 - Layer.mock(ProjectService.ProjectService)({}),
3496 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
3497 Layer.mock(SecretRequests.SecretRequests)({}),
3498 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
3499 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -3714,7 +3810,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3810 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
3811 list: () => Effect.succeed([]),
3812 }),
3717 - Layer.mock(ProjectService.ProjectService)({}),
3813 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
3814 Layer.mock(SecretRequests.SecretRequests)({}),
3815 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
3816 Layer.mock(ScheduledTaskService.ScheduledTaskService)({
@@ -4168,7 +4264,7 @@ describe("OrchestratorMcpService provider resolution", () => {
4264 ServerSettings.layerTest(),
4265 providerRegistryLayer([]),
4266 adapterRegistryLayer([]),
4171 - Layer.mock(ProjectService.ProjectService)({}),
4267 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4268 Layer.mock(SecretRequests.SecretRequests)({}),
4269 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4270 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -4331,7 +4427,7 @@ describe("OrchestratorMcpService provider resolution", () => {
4427 providerSnapshot({ instanceId: peerId, driver, model: inherited.model }),
4428 ]),
4429 adapterRegistryLayer([codexInstanceId, peerId]),
4334 - Layer.mock(ProjectService.ProjectService)({}),
4430 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4431 Layer.mock(SecretRequests.SecretRequests)({}),
4432 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4433 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -4426,7 +4522,7 @@ describe("OrchestratorMcpService provider resolution", () => {
4522 },
4523 ]),
4524 adapterRegistryLayer([codexInstanceId]),
4429 - Layer.mock(ProjectService.ProjectService)({}),
4525 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4526 Layer.mock(SecretRequests.SecretRequests)({}),
4527 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4528 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -4480,7 +4576,7 @@ describe("OrchestratorMcpService provider resolution", () => {
4576 },
4577 ]),
4578 adapterRegistryLayer([codexInstanceId]),
4483 - Layer.mock(ProjectService.ProjectService)({}),
4579 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4580 Layer.mock(SecretRequests.SecretRequests)({}),
4581 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4582 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -4523,7 +4619,7 @@ describe("OrchestratorMcpService provider resolution", () => {
4619 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
4620 list: () => Effect.succeed([]),
4621 }),
4526 - Layer.mock(ProjectService.ProjectService)({}),
4622 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4623 Layer.mock(SecretRequests.SecretRequests)({}),
4624 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4625 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -4604,7 +4700,7 @@ describe("OrchestratorMcpService thread lookup", () => {
4700 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
4701 list: () => Effect.succeed([]),
4702 }),
4607 - Layer.mock(ProjectService.ProjectService)({}),
4703 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
4704 Layer.mock(SecretRequests.SecretRequests)({}),
4705 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
4706 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
@@ -5163,7 +5259,7 @@ describe("OrchestratorMcpService thread stop", () => {
5259 layerAdapters,
5260 ServerSettings.layerTest(),
5261 Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
5166 - Layer.mock(ProjectService.ProjectService)({}),
5262 + Layer.mock(ProjectService.ProjectService)({ getById: () => Effect.succeedNone }),
5263 Layer.mock(SecretRequests.SecretRequests)({}),
5264 Layer.mock(RemoteDelegation.RemoteDelegation)({}),
5265 Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
apps/server/src/mcp/OrchestratorMcpService.ts
+74 -6
@@ -397,6 +397,20 @@ const advertisedModel = (provider: ServerProvider, model: string) =>
397 candidate.aliases?.some((alias) => alias.toLowerCase() === model.toLowerCase()),
398 );
399
400 +/** A folder's own provider config can add models that only its workspace snapshot lists. */
401 +export const withWorkspaceModels = (
402 + providers: ReadonlyArray<ServerProvider>,
403 + cwd: string | undefined,
404 +): ReadonlyArray<ServerProvider> =>
405 + cwd === undefined
406 + ? providers
407 + : providers.map((provider) => {
408 + const models = provider.workspaceSnapshots?.find(
409 + (snapshot) => snapshot.cwd === cwd,
410 + )?.models;
411 + return models === undefined ? provider : { ...provider, models };
412 + });
413 +
414 const withV = (version: string) => (version.startsWith("v") ? version : `v${version}`);
415
416 /** A provider that lists no models accepts any slug. */
@@ -1525,6 +1539,26 @@ const make = Effect.gen(function* () {
1539
1540 const loadProviders = providerRegistry.getProviders;
1541
1542 + /** The folder the composer's model picker scans for this thread. */
1543 + const parentWorkspaceCwd = (parent: Pick<OrchestrationV2ThreadProjection, "thread">) =>
1544 + parent.thread.worktreePath
1545 + ? Effect.succeed(parent.thread.worktreePath)
1546 + : projects.getById(parent.thread.projectId).pipe(
1547 + Effect.map((project) =>
1548 + Option.getOrUndefined(Option.map(project, ({ workspaceRoot }) => workspaceRoot)),
1549 + ),
1550 + Effect.orElseSucceed(() => undefined),
1551 + );
1552 +
1553 + const scanWorkspace = (instanceId: ServerProvider["instanceId"], cwd: string) =>
1554 + projects
1555 + .workspaceScanDirectory(cwd)
1556 + .pipe(
1557 + Effect.flatMap((scanCwd) =>
1558 + providerRegistry.refreshWorkspaceSnapshot({ instanceId, cwd, scanCwd }),
1559 + ),
1560 + );
1561 +
1562 const loadOrchestrationCapableInstanceIds = () =>
1563 providerAdapters.list().pipe(Effect.map((instanceIds) => new Set(instanceIds)));
1564
@@ -1542,21 +1576,33 @@ const make = Effect.gen(function* () {
1576 })
1577 .pipe(Effect.mapError(threadManagementFailure));
1578
1545 - const resolveTargetRechecking = (input: Parameters<typeof resolveTarget>[0]) => {
1579 + const resolveTargetRechecking = (
1580 + input: Parameters<typeof resolveTarget>[0] & { readonly cwd: string | undefined },
1581 + ) => {
1582 const instanceId =
1583 input.target?.providerInstanceId ??
1584 (input.target?.driverKind === undefined
1585 ? input.parent.thread.modelSelection.instanceId
1586 : undefined);
1551 - const resolved = resolveTarget(input);
1587 + const resolved = resolveTarget({
1588 + ...input,
1589 + providers: withWorkspaceModels(input.providers, input.cwd),
1590 + });
1591 if (instanceId === undefined) return resolved;
1592 return resolved.pipe(
1593 Effect.catchIf(
1594 (error) => error.code === "provider_unavailable" || error.code === "model_unavailable",
1595 () =>
1557 - providerRegistry
1558 - .refreshInstance(instanceId)
1559 - .pipe(Effect.flatMap((providers) => resolveTarget({ ...input, providers }))),
1596 + (input.cwd === undefined
1597 + ? providerRegistry.refreshInstance(instanceId)
1598 + : providerRegistry
1599 + .refreshInstance(instanceId)
1600 + .pipe(Effect.andThen(scanWorkspace(instanceId, input.cwd)))
1601 + ).pipe(
1602 + Effect.flatMap((providers) =>
1603 + resolveTarget({ ...input, providers: withWorkspaceModels(providers, input.cwd) }),
1604 + ),
1605 + ),
1606 ),
1607 );
1608 };
@@ -2594,7 +2640,26 @@ const make = Effect.gen(function* () {
2640
2641 capabilities: Effect.fn("OrchestratorMcpService.capabilities")(function* (scope, input = {}) {
2642 const { parent, limits } = yield* loadCaller(scope, []);
2597 - const providers = yield* loadProviders;
2643 + const cwd = parent === undefined ? undefined : yield* parentWorkspaceCwd(parent);
2644 + const machineProviders = yield* loadProviders;
2645 + const unscanned =
2646 + cwd === undefined
2647 + ? []
2648 + : machineProviders.filter(
2649 + (provider) =>
2650 + provider.enabled &&
2651 + !provider.workspaceSnapshots?.some((snapshot) => snapshot.cwd === cwd),
2652 + );
2653 + if (cwd !== undefined && unscanned.length > 0) {
2654 + yield* Effect.forEach(unscanned, (provider) => scanWorkspace(provider.instanceId, cwd), {
2655 + concurrency: "unbounded",
2656 + discard: true,
2657 + });
2658 + }
2659 + const providers = withWorkspaceModels(
2660 + unscanned.length > 0 ? yield* loadProviders : machineProviders,
2661 + cwd,
2662 + );
2663 const orchestrationCapableInstanceIds = yield* loadOrchestrationCapableInstanceIds();
2664 const settings = yield* serverSettings.getSettings.pipe(
2665 Effect.mapError(() => failure("orchestration_error", "Unable to read server settings.")),
@@ -2728,6 +2793,7 @@ const make = Effect.gen(function* () {
2793 parent,
2794 target: input.target,
2795 providers,
2796 + cwd: yield* parentWorkspaceCwd(parent),
2797 skipProjectEnablementFilter: isRetryOfAcceptedDelegation,
2798 });
2799 const runtimeMode = yield* resolveRuntimeMode(
@@ -3069,6 +3135,7 @@ const make = Effect.gen(function* () {
3135 }
3136 const parentNodeId = parentRun.rootNodeId;
3137 const providers = yield* loadProviders;
3138 + const cwd = yield* parentWorkspaceCwd(parent);
3139 const key = yield* requestKey(input.clientRequestId);
3140 const created = yield* Effect.forEach(
3141 input.threads,
@@ -3101,6 +3168,7 @@ const make = Effect.gen(function* () {
3168 providerInstanceId: committedThread.modelSelection.instanceId,
3169 },
3170 providers,
3171 + cwd,
3172 skipProjectEnablementFilter: isRetryOfAcceptedCreation,
3173 });
3174 const runtimeMode = yield* resolveRuntimeMode(
apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
+3 -1
@@ -271,7 +271,9 @@ describe("orchestrator MCP toolkit", () => {
271 Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
272 Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),
273 Layer.provide(Layer.mock(PeerLinks.PeerLinks)({})),
274 - Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
274 + Layer.provide(
275 + Layer.mock(ProjectService.ProjectService)({ workspaceScanDirectory: Effect.succeed }),
276 + ),
277 Layer.provideMerge(
278 SecretRequests.layer.pipe(
279 Layer.provide(layerMemorySecretStore),
apps/server/src/mcp/toolkits/project/handlers.test.ts
+22 -1
@@ -75,6 +75,7 @@ const clientLaunchHarness = (input: {
75 const layerDependencies = Layer.mergeAll(
76 Layer.mock(ProviderRegistry.ProviderRegistry)({
77 getProviders: Effect.succeed(input.providers ?? []),
78 + refreshWorkspaceSnapshot: () => Effect.succeed(input.providers ?? []),
79 }),
80 ServerSettings.layerTest({
81 fallbackModelSelection: input.fallbackModel ?? null,
@@ -172,6 +173,7 @@ const clientLaunchHarness = (input: {
173 } as unknown as ProjectRecord)
174 : Option.none(),
175 ),
176 + workspaceScanDirectory: Effect.succeed,
177 }),
178 Layer.mock(PeerForwarding.PeerForwarding)({}),
179 Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
@@ -375,6 +377,22 @@ it.effect("a launch with a model its provider does not advertise creates no thre
377 ],
378 slashCommands: [],
379 skills: [],
380 + // The project folder's own provider config adds a model the machine catalog lacks.
381 + workspaceSnapshots:
382 + driver === "codex"
383 + ? [
384 + {
385 + cwd: "/projects/client-target",
386 + checkedAt: "2026-01-01T00:00:00Z",
387 + slashCommands: [],
388 + skills: [],
389 + models: [
390 + { slug: "gpt-5.4", name: "GPT", isCustom: false, capabilities: null },
391 + { slug: "folder-local", name: "Local", isCustom: false, capabilities: null },
392 + ],
393 + },
394 + ]
395 + : [],
396 }));
397 const { projectId, dependencies } = clientLaunchHarness({
398 runtimeModeCeiling: "auto",
@@ -416,7 +434,10 @@ it.effect("a launch with a model its provider does not advertise creates no thre
434 expect(yield* launchWith("claudeAgent", "Opus")).toMatchObject({
435 modelSelection: { instanceId: "claudeAgent", model: "Opus" },
436 });
419 - expect(launched).toHaveLength(1);
437 + expect(yield* launchWith("codex", "folder-local")).toMatchObject({
438 + modelSelection: { instanceId: "codex", model: "folder-local" },
439 + });
440 + expect(launched).toHaveLength(2);
441 }),
442 );
443
apps/server/src/mcp/toolkits/project/handlers.ts
+33 -4
@@ -6,6 +6,7 @@ import {
6 type OrchestrationV2ThreadLaunchWorkspaceStrategy,
7 ProjectId,
8 type Project as ProjectRecord,
9 + type ServerProvider,
10 T3_PROJECT_FILE_NAME,
11 } from "@t3tools/contracts";
12 import * as Digest from "effect/crypto/Digest";
@@ -268,10 +269,38 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
269 yield* assertProjectWorktree(project.workspaceRoot, input.workspaceStrategy.worktreePath);
270 if (!replaying && input.modelSelection !== undefined) {
271 const { instanceId, model } = input.modelSelection;
271 - const providers = yield* (yield* ProviderRegistry.ProviderRegistry).getProviders;
272 - const provider = providers.find((candidate) => candidate.instanceId === instanceId);
273 - if (provider !== undefined)
274 - yield* OrchestrationMcp.requireAdvertisedModel(provider, model);
272 + const registry = yield* ProviderRegistry.ProviderRegistry;
273 + // The thread runs in this folder, whose own provider config can add models.
274 + const cwd =
275 + input.workspaceStrategy?.type === "existing_worktree"
276 + ? input.workspaceStrategy.worktreePath
277 + : project?.workspaceRoot;
278 + const requireModel = (
279 + providers: ReadonlyArray<ServerProvider>,
280 + ): Effect.Effect<void, OrchestratorMcpFailure> => {
281 + const provider = OrchestrationMcp.withWorkspaceModels(providers, cwd).find(
282 + (candidate) => candidate.instanceId === instanceId,
283 + );
284 + return provider === undefined
285 + ? Effect.void
286 + : OrchestrationMcp.requireAdvertisedModel(provider, model);
287 + };
288 + const checked = requireModel(yield* registry.getProviders);
289 + yield* cwd === undefined
290 + ? checked
291 + : checked.pipe(
292 + Effect.catchIf(
293 + (error) => error.code === "model_unavailable",
294 + () =>
295 + Project.ProjectService.pipe(
296 + Effect.flatMap((projects) => projects.workspaceScanDirectory(cwd)),
297 + Effect.flatMap((scanCwd) =>
298 + registry.refreshWorkspaceSnapshot({ instanceId, cwd, scanCwd }),
299 + ),
300 + Effect.flatMap(requireModel),
301 + ),
302 + ),
303 + );
304 }
305 const projectSettings =
306 replaying || project === undefined