Skip to content

Commit 538845a

Browse files
committed
feat(server,web,mobile): fall back when the default provider is out of usage
1 parent bbd9593 commit 538845a

24 files changed

Lines changed: 771 additions & 51 deletions

‎apps/mobile/src/features/settings/scheduledTaskDraft.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import {
2727
resolveNewTaskModelSelection,
2828
} from "../../lib/modelOptions";
2929

30+
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
31+
3032
export function scheduledTaskDefaultModel(
3133
config: ServerConfig | null,
3234
project: (LegacyProjectSettingsFields & { readonly id: ProjectId }) | null,
@@ -37,7 +39,7 @@ export function scheduledTaskDefaultModel(
3739
const projectDefaultSelection =
3840
resolveDefaultableModelSelection(config, configured, project?.id ?? null) ??
3941
resolveDefaultableModelSelection(config, settings.defaultModelSelection, project?.id ?? null);
40-
return resolveNewTaskModelSelection({
42+
const defaultSelection = resolveNewTaskModelSelection({
4143
draftSelection: null,
4244
projectDefaultSelection,
4345
stickySelection: null,
@@ -48,6 +50,14 @@ export function scheduledTaskDefaultModel(
4850
project?.id ?? null,
4951
),
5052
});
53+
return resolveNewThreadModelSelection({
54+
defaultSelection,
55+
fallbackSelection: settings.fallbackModelSelection,
56+
providers: config?.providers ?? [],
57+
settings,
58+
projectId: project?.id ?? null,
59+
now: Date.now(),
60+
}).selection;
5161
}
5262

5363
export type ScheduleDraft = {

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { ActiveNewTaskContext } from "../../state/active-new-task";
2+
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
3+
import { useNowMinuteMs } from "../../lib/clock";
24
import * as Dialog from "../../components/ui/Dialog";
35
import React, { useEffect, useRef, useState } from "react";
46

@@ -481,6 +483,7 @@ export function NewTaskFlowProvider(
481483
selectedProjectDraft.modelSelection ?? null,
482484
selectedProject?.id ?? null,
483485
);
486+
const modelSelectionNow = useNowMinuteMs();
484487
const projectDefaultModelSelection = resolveDefaultableModelSelection(
485488
selectedEnvironmentServerConfig,
486489
projectSettings.settings.defaultModelSelection,
@@ -499,12 +502,24 @@ export function NewTaskFlowProvider(
499502
selectedProject?.id ?? null,
500503
);
501504

502-
const selectedModel = resolveNewTaskModelSelection({
505+
const selectedDefaultModel = resolveNewTaskModelSelection({
503506
draftSelection: draftModelSelection,
504507
projectDefaultSelection: projectDefaultModelSelection,
505508
stickySelection: stickyModelSelection,
506509
modelOptions,
507510
});
511+
const selectedModel = resolveNewThreadModelSelection({
512+
defaultSelection: selectedDefaultModel,
513+
explicitSelection:
514+
draftModelSelection ?? (projectDefaultModelSelection ? null : stickyModelSelection),
515+
fallbackSelection: selectedEnvironmentServerConfig?.settings.fallbackModelSelection ?? null,
516+
providers: selectedEnvironmentServerConfig?.providers ?? [],
517+
...(selectedEnvironmentServerConfig
518+
? { settings: selectedEnvironmentServerConfig.settings }
519+
: {}),
520+
projectId: selectedProject?.id ?? null,
521+
now: modelSelectionNow,
522+
}).selection;
508523
const selectedModelKey = selectedModel
509524
? `${selectedModel.instanceId}:${selectedModel.model}`
510525
: null;

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
2+
import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
13
import {
24
CommandId,
35
type RunId,
@@ -979,17 +981,30 @@ const make = Effect.gen(function* () {
979981
),
980982
);
981983

982-
const projectDefaultModelSelection = (
983-
project: Effect.Success<ReturnType<typeof requireProject>>,
984-
) =>
985-
project.defaultModelSelection === null
984+
const projectDefaultModelSelection = Effect.fn(
985+
"OrchestratorMcpService.projectDefaultModelSelection",
986+
)(function* (project: Effect.Success<ReturnType<typeof requireProject>>) {
987+
const settings = yield* serverSettings.getSettings.pipe(
988+
Effect.mapError(() => failure("orchestration_error", "Unable to read server settings.")),
989+
);
990+
const selection = resolveNewThreadModelSelection({
991+
defaultSelection: resolveProjectSettings(settings, project.id, project).settings
992+
.defaultModelSelection,
993+
fallbackSelection: settings.fallbackModelSelection,
994+
providers: yield* providerRegistry.getProviders,
995+
settings,
996+
projectId: project.id,
997+
now: DateTime.toEpochMillis(yield* DateTime.now),
998+
}).selection;
999+
return yield* selection === null
9861000
? Effect.fail(
9871001
failure(
9881002
"invalid_request",
9891003
`Project ${project.id} has no default model, so this caller cannot pick one for it.`,
9901004
),
9911005
)
992-
: Effect.succeed(project.defaultModelSelection);
1006+
: Effect.succeed(selection);
1007+
});
9931008
const secretRequests = yield* SecretRequests.SecretRequests;
9941009

9951010
const requireCapability = (scope: McpInvocationScope) =>

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import * as ProviderRegistry from "../../../provider/ProviderRegistry.ts";
12
import { expect, it } from "@effect/vitest";
23
import {
34
EnvironmentId,
45
ProjectId,
56
ProviderInstanceId,
7+
ProviderDriverKind,
8+
type ServerProvider,
69
type Project as ProjectRecord,
710
type ModelSelection,
811
type RuntimeMode,
@@ -37,6 +40,8 @@ import { ProjectToolkit } from "./tools.ts";
3740
const clientLaunchHarness = (input: {
3841
readonly runtimeModeCeiling: RuntimeMode;
3942
readonly defaultRuntimeMode?: RuntimeMode;
43+
readonly fallbackModel?: ModelSelection;
44+
readonly providers?: readonly ServerProvider[];
4045
/** Where Settings saves a project's model; the legacy project field stays null. */
4146
readonly overrideModel?: ModelSelection;
4247
readonly launched: Array<ThreadLaunch.ThreadLaunchInput>;
@@ -53,7 +58,11 @@ const clientLaunchHarness = (input: {
5358
model: input.overrideModel === undefined ? modelSelection : null,
5459
};
5560
const layerDependencies = Layer.mergeAll(
61+
Layer.mock(ProviderRegistry.ProviderRegistry)({
62+
getProviders: Effect.succeed(input.providers ?? []),
63+
}),
5664
ServerSettings.layerTest({
65+
fallbackModelSelection: input.fallbackModel ?? null,
5766
...(input.defaultRuntimeMode === undefined
5867
? {}
5968
: { defaultRuntimeMode: input.defaultRuntimeMode }),
@@ -463,3 +472,57 @@ it.effect("a retried worktree launch replays after its base ref is gone", () =>
463472
]);
464473
}),
465474
);
475+
476+
it.effect.each([false, true])(
477+
"a client only replaces a limited default, preserving an explicit model (%s)",
478+
(explicit) =>
479+
Effect.gen(function* () {
480+
const launched: ThreadLaunch.ThreadLaunchInput[] = [];
481+
const fallbackModel = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-6.1-sol" };
482+
const providers: ServerProvider[] = ["claudeAgent", "codex"].map((driver) => ({
483+
instanceId: ProviderInstanceId.make(driver),
484+
driver: ProviderDriverKind.make(driver),
485+
enabled: true,
486+
installed: true,
487+
status: "ready",
488+
version: null,
489+
auth: { status: "authenticated" },
490+
checkedAt: "2026-01-01T00:00:00Z",
491+
models: [],
492+
slashCommands: [],
493+
skills: [],
494+
...(driver === "claudeAgent"
495+
? {
496+
usageLimits: {
497+
checkedAt: "2026-01-01T00:00:00Z",
498+
windows: [{ id: "session", kind: "session", label: "Session", usedPercent: 100 }],
499+
},
500+
}
501+
: {}),
502+
}));
503+
const { projectId, modelSelection, dependencies } = clientLaunchHarness({
504+
runtimeModeCeiling: "full-access",
505+
launched,
506+
fallbackModel,
507+
providers,
508+
});
509+
const toolkit = yield* ProjectToolkit.pipe(
510+
Effect.provide(
511+
McpToolAccess.HandlersLayer.layer(ProjectHandlers.layer).pipe(
512+
Layer.provide(dependencies),
513+
),
514+
),
515+
);
516+
const result = yield* toolkit
517+
.handle("t3_thread_launch", {
518+
projectId,
519+
title: "Fallback",
520+
...(explicit ? { modelSelection } : {}),
521+
})
522+
.pipe(Stream.unwrap, Stream.runCollect, Effect.provide(dependencies));
523+
expect(result.at(-1)?.result).toMatchObject({
524+
modelSelection: explicit ? modelSelection : fallbackModel,
525+
});
526+
expect(launched[0]?.modelSelection).toEqual(explicit ? modelSelection : fallbackModel);
527+
}),
528+
);

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ import * as ManagedProjectFolders from "../../../project/ManagedProjectFolders.t
1818
import * as Repositories from "../../../sourceControl/SourceControlRepositoryService.ts";
1919
import * as GitVcsDriver from "../../../vcs/GitVcsDriver.ts";
2020
import * as ServerSettings from "../../../serverSettings.ts";
21+
import * as ProviderRegistry from "../../../provider/ProviderRegistry.ts";
22+
import * as DateTime from "effect/DateTime";
23+
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
2124
import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
2225
import { formatThreadLink } from "@t3tools/shared/threadLinks";
2326
import { resolveRuntimeMode } from "../../delegatedTaskModes.ts";
@@ -181,7 +184,18 @@ export const layer = McpToolAccess.toLayer(ProjectToolkit, {
181184
input.modelSelection ??
182185
launchedModel ??
183186
caller?.modelSelection ??
184-
projectDefaults?.defaultModelSelection ??
187+
(projectDefaults
188+
? resolveNewThreadModelSelection({
189+
defaultSelection: projectDefaults.defaultModelSelection,
190+
fallbackSelection: projectDefaults.fallbackModelSelection,
191+
providers: yield* ProviderRegistry.ProviderRegistry.pipe(
192+
Effect.flatMap((registry) => registry.getProviders),
193+
),
194+
settings: projectDefaults,
195+
projectId,
196+
now: DateTime.toEpochMillis(yield* DateTime.now),
197+
}).selection
198+
: null) ??
185199
undefined;
186200
if (modelSelection === undefined)
187201
return yield* new OrchestratorMcpFailure({

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
import * as FileSystem from "effect/FileSystem";
2424
import * as DocumentText from "../../../provider/DocumentText.ts";
2525
import * as ServerConfig from "../../../config.ts";
26+
import * as ProviderRegistry from "../../../provider/ProviderRegistry.ts";
2627
import * as ServerSettings from "../../../serverSettings.ts";
2728
import * as ThreadLaunchService from "../../../orchestration-v2/ThreadLaunchService.ts";
2829
import * as Crypto from "effect/Crypto";
@@ -166,6 +167,7 @@ const ThreadLaunchTool = Tool.make("t3_thread_launch", {
166167
FileSystem.FileSystem,
167168
ServerConfig.ServerConfig,
168169
ServerSettings.ServerSettingsService,
170+
ProviderRegistry.ProviderRegistry,
169171
DocumentText.DocumentText,
170172
],
171173
})

‎apps/server/src/serverRuntimeStartup.autoPull.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import * as AgentAwarenessRelay from "./relay/AgentAwarenessRelay.ts";
3030
import { ServerActivation } from "./serverActivation.ts";
3131
import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
3232
import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
33+
import * as ProviderRegistry from "./provider/ProviderRegistry.ts";
3334
import * as ServerSettings from "./serverSettings.ts";
3435
import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
3536
import * as AnalyticsService from "./telemetry/AnalyticsService.ts";
@@ -72,6 +73,7 @@ it.effect("parks automatic pull until activation without delaying command readin
7273
const dependencies: Layer.Layer<
7374
Layer.Services<ReturnType<typeof ServerRuntimeStartup.layerWithOptions>>
7475
> = Layer.mergeAll(
76+
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
7577
Layer.mock(ServerConfig.ServerConfig)({
7678
...(yield* ServerConfig.deriveServerPaths(cwd, undefined).pipe(
7779
Effect.provide(Path.layer),

‎apps/server/src/serverRuntimeStartup.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import * as ProviderRegistry from "./provider/ProviderRegistry.ts";
12
import { assert, it } from "@effect/vitest";
23
import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
34
import {
@@ -69,6 +70,7 @@ it.effect.each([
6970
};
7071
const imports = { importedThreadCount: 0, importedMessageCount: 0 };
7172
const dependencies = Layer.mergeAll(
73+
Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
7274
NodeCrypto.layer,
7375
Path.layer,
7476
Layer.mock(ServerConfig.ServerConfig)({

‎apps/server/src/serverRuntimeStartup.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import {
1010
ThreadId,
1111
} from "@t3tools/contracts";
1212
import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
13+
import { resolveNewThreadModelSelection } from "@t3tools/shared/usageLimits";
14+
import * as ProviderRegistry from "./provider/ProviderRegistry.ts";
1315
import * as Cause from "effect/Cause";
1416
import * as Console from "effect/Console";
1517
import * as Context from "effect/Context";
@@ -293,8 +295,18 @@ const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
293295
projectId: project.id,
294296
title: "New thread",
295297
modelSelection:
296-
resolveProjectSettings(settings, project.id, project).settings.defaultModelSelection ??
297-
threadModelSelection,
298+
resolveNewThreadModelSelection({
299+
defaultSelection:
300+
resolveProjectSettings(settings, project.id, project).settings
301+
.defaultModelSelection ?? threadModelSelection,
302+
fallbackSelection: settings.fallbackModelSelection,
303+
providers: yield* ProviderRegistry.ProviderRegistry.pipe(
304+
Effect.flatMap((registry) => registry.getProviders),
305+
),
306+
settings,
307+
projectId: project.id,
308+
now: DateTime.toEpochMillis(yield* DateTime.now),
309+
}).selection ?? threadModelSelection,
298310
interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
299311
runtimeMode: resolveProjectSettings(settings, project.id, project).settings
300312
.defaultRuntimeMode,

‎apps/server/src/serverSettings.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@ const ATOMIC_SETTINGS_KEYS: ReadonlySet<string> = new Set([
435435
"sourceControlWriterModelSelection",
436436
"reviewGuideModelSelection",
437437
"textGenerationModelSelection",
438+
"fallbackModelSelection",
438439
"pullRequestMergeMethod",
439440
]);
440441

0 commit comments

Comments
 (0)