@devries-cameron20 / t3code-1 / commits / 21fe33c8d7
Fork 0

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

fix(server): schedule_task uses the project's effective default model (#37299)

Julius Marminge committed Nov 15, 2026 at 09:25 UTC 21fe33c8d7f7b3f740febfa49fb4c66bed7a7f93
2 files changed +52 -13
apps/server/src/mcp/OrchestratorMcpService.test.ts
+36 -2
@@ -3655,6 +3655,10 @@ describe("OrchestratorMcpService provider resolution", () => {
3655 saved: Ref.Ref<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>,
3656 task: ScheduledTask = existing,
3657 inputs?: Ref.Ref<ReadonlyArray<ScheduledTaskUpsertInput>>,
3658 + defaults: {
3659 + readonly project: ScheduledTask["modelSelection"] | null;
3660 + readonly environment?: ScheduledTask["modelSelection"];
3661 + } = { project: existing.modelSelection },
3662 ) =>
3663 OrchestratorMcpService.layer.pipe(
3664 Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
@@ -3666,7 +3670,11 @@ describe("OrchestratorMcpService provider resolution", () => {
3670 Layer.mock(ThreadManagementService.ThreadManagementService)({
3671 getThreadShell: () => Effect.succeed(null),
3672 }),
3669 - ServerSettings.layerTest(),
3673 + ServerSettings.layerTest(
3674 + defaults.environment === undefined
3675 + ? {}
3676 + : { defaultModelSelection: defaults.environment },
3677 + ),
3678 Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
3679 Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
3680 list: () => Effect.succeed([]),
@@ -3676,7 +3684,7 @@ describe("OrchestratorMcpService provider resolution", () => {
3684 Effect.succeedSome({
3685 id: projectId,
3686 workspaceRoot,
3679 - defaultModelSelection: existing.modelSelection,
3687 + defaultModelSelection: defaults.project,
3688 } as never),
3689 }),
3690 Layer.mock(SecretRequests.SecretRequests)({}),
@@ -3717,6 +3725,32 @@ describe("OrchestratorMcpService provider resolution", () => {
3725 }),
3726 );
3727
3728 + it.effect("uses the environment's default model when the project inherits it", () =>
3729 + Effect.gen(function* () {
3730 + const environmentDefault = {
3731 + instanceId: ProviderInstanceId.make("claudeAgent"),
3732 + model: "claude-opus-5-5",
3733 + };
3734 + const inputs = yield* Ref.make<ReadonlyArray<ScheduledTaskUpsertInput>>([]);
3735 + const mcp = yield* OrchestratorMcpService.OrchestratorMcpService.pipe(
3736 + Effect.provide(
3737 + service(
3738 + masterRepository,
3739 + yield* Ref.make<ReadonlyArray<ScheduledTask["workspaceStrategy"]>>([]),
3740 + existing,
3741 + inputs,
3742 + { project: null, environment: environmentDefault },
3743 + ),
3744 + ),
3745 + );
3746 + yield* mcp.scheduleTask(client, { projectId, prompt: "Check the build", schedule });
3747 + assert.deepEqual(
3748 + (yield* Ref.get(inputs)).map((input) => input.modelSelection),
3749 + [environmentDefault],
3750 + );
3751 + }),
3752 + );
3753 +
3754 it.effect.each([
3755 {
3756 name: "drops an emoji the limit splits",
apps/server/src/mcp/OrchestratorMcpService.ts
+16 -11
@@ -69,6 +69,7 @@ import {
69 import { getProviderOptionCurrentValue, withLegacyUltracodeEffort } from "@t3tools/shared/model";
70 import { backgroundWorkHoldsCompletion } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
71 import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";
72 +import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
73 import { formatThreadLink } from "@t3tools/shared/threadLinks";
74 import { threadPullRequestUpdatedAtMs } from "@t3tools/shared/threadPullRequests";
75 import {
@@ -1281,17 +1282,21 @@ const make = Effect.gen(function* () {
1282 ),
1283 );
1284
1284 - const projectDefaultModelSelection = (
1285 - project: Effect.Success<ReturnType<typeof requireProject>>,
1286 - ) =>
1287 - project.defaultModelSelection === null
1288 - ? Effect.fail(
1289 - failure(
1290 - "invalid_request",
1291 - `Project ${project.id} has no default model, so this caller cannot pick one for it.`,
1292 - ),
1293 - )
1294 - : Effect.succeed(project.defaultModelSelection);
1285 + const projectDefaultModelSelection = Effect.fn(
1286 + "OrchestratorMcpService.projectDefaultModelSelection",
1287 + )(function* (project: Effect.Success<ReturnType<typeof requireProject>>) {
1288 + const settings = yield* serverSettings.getSettings.pipe(
1289 + Effect.mapError(() => failure("orchestration_error", "Unable to read server settings.")),
1290 + );
1291 + const selection = resolveProjectSettings(settings, project.id, project).settings
1292 + .defaultModelSelection;
1293 + if (selection === null)
1294 + return yield* failure(
1295 + "invalid_request",
1296 + `Project ${project.id} has no default model, so this caller cannot pick one for it.`,
1297 + );
1298 + return selection;
1299 + });
1300 const secretRequests = yield* SecretRequests.SecretRequests;
1301
1302 const requireCapability = (scope: McpInvocationScope) =>