@devries-cameron20 / t3code Mirror · read-only / commits / c5f5efdbd2
Fork 0

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

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 19:45 UTC

fix(server): text-generation fallback keeps the thread default's custom model (#35391)

Julius Marminge committed Nov 12, 2026 at 09:19 UTC c5f5efdbd2ce025fd5f10fae01d6b97c44e42f3e
4 files changed +69 -39
apps/server/src/textGeneration/CodexTextGeneration.test.ts
+11 -7
@@ -1,5 +1,4 @@
1 import {
2 - DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER,
2 ProjectId,
3 ProviderDriverKind,
4 type ModelSelection,
@@ -559,6 +558,11 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
558 model: "chat-model",
559 options: [{ id: "effort", value: "high" }],
560 };
561 + const threadDefault = {
562 + instanceId: fallback,
563 + model: "z-ai/glm-5.3-flash",
564 + options: [{ id: "thinking", value: false }],
565 + };
566 const calls: ModelSelection[] = [];
567 const instances: ProviderInstance[] = [primary, fallback].map((instanceId) => {
568 const driver = ProviderDriverKind.make(instanceId === primary ? "codex" : "claudeAgent");
@@ -627,8 +631,12 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
631 }),
632 ServerSettings.layerTest({
633 providerInstances: {
630 - [fallback]: { driver: ProviderDriverKind.make("claudeAgent"), config: {} },
634 + [fallback]: {
635 + driver: ProviderDriverKind.make("claudeAgent"),
636 + config: { customModels: [threadDefault.model] },
637 + },
638 },
639 + defaultModelSelection: threadDefault,
640 ...(primaryState === "not installed, fallback disabled for project"
641 ? {
642 projectSettingsOverrides: {
@@ -660,11 +668,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
668 primaryState === "not installed, fallback disabled for project" ||
669 primaryState === "signed out, fallback failed"
670 ? selection
663 - : {
664 - instanceId: fallback,
665 - model:
666 - DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER[ProviderDriverKind.make("claudeAgent")],
667 - },
671 + : threadDefault,
672 ]);
673 }),
674 );
apps/server/src/textGeneration/TextGeneration.ts
+20 -19
@@ -9,10 +9,7 @@ import {
9 } from "@t3tools/contracts";
10 import * as DateTime from "effect/DateTime";
11 import { exhaustedUsageWindow } from "@t3tools/shared/usageLimits";
12 -import {
13 - defaultTextGenerationModel,
14 - fallbackTextGenerationModelSelection,
15 -} from "@t3tools/shared/serverSettings";
12 +import { fallbackTextGenerationModelSelection } from "@t3tools/shared/serverSettings";
13 import * as ServerSettings from "../serverSettings.ts";
14 import type { ProviderTextGeneration } from "@t3tools/provider-core/server/textGeneration";
15 import { TextGenerationError } from "@t3tools/contracts";
@@ -125,21 +122,25 @@ export const make = Effect.gen(function* () {
122 ),
123 );
124 selection =
128 - fallbackTextGenerationModelSelection(settings.providerInstances, (instanceId, driver) => {
129 - const provider = snapshots.find((candidate) => candidate.instanceId === instanceId);
130 - return (
131 - instanceId !== selection.instanceId &&
132 - provider?.enabled === true &&
133 - resolveProjectProviderInstanceEnabled(settings, projectId ?? null, instanceId) &&
134 - provider.installed &&
135 - provider.auth.status !== "unauthenticated" &&
136 - provider.status !== "error" &&
137 - isProviderAvailable(provider) &&
138 - isProviderTextGenerationCapable(provider) &&
139 - (operation !== "generateReviewGuide" || INVESTIGATING_DRIVERS.has(driver)) &&
140 - !exhaustedUsageWindow(provider, now, defaultTextGenerationModel(driver))
141 - );
142 - }) ?? selection;
125 + fallbackTextGenerationModelSelection(
126 + settings.providerInstances,
127 + (instanceId, driver, model) => {
128 + const provider = snapshots.find((candidate) => candidate.instanceId === instanceId);
129 + return (
130 + instanceId !== selection.instanceId &&
131 + provider?.enabled === true &&
132 + resolveProjectProviderInstanceEnabled(settings, projectId ?? null, instanceId) &&
133 + provider.installed &&
134 + provider.auth.status !== "unauthenticated" &&
135 + provider.status !== "error" &&
136 + isProviderAvailable(provider) &&
137 + isProviderTextGenerationCapable(provider) &&
138 + (operation !== "generateReviewGuide" || INVESTIGATING_DRIVERS.has(driver)) &&
139 + !exhaustedUsageWindow(provider, now, model)
140 + );
141 + },
142 + { defaultModelSelection: settings.defaultModelSelection },
143 + ) ?? selection;
144 }
145 if (textGeneratorCannotRun && selection.instanceId === textGeneratorId) {
146 return yield* new TextGenerationError({
packages/shared/src/serverSettings.test.ts
+19
@@ -38,6 +38,25 @@ describe("fallbackTextGenerationModelSelection", () => {
38 expect(
39 fallbackTextGenerationModelSelection({}, (instanceId) => instanceId === "opencode"),
40 ).toEqual({ instanceId: "opencode", model: "opencode/big-pickle" });
41 + const threadDefault = {
42 + instanceId: ProviderInstanceId.make("opencode"),
43 + model: "opencode-go/glm-5.3",
44 + };
45 + const providerInstances = {
46 + [threadDefault.instanceId]: {
47 + driver: ProviderDriverKind.make("opencode"),
48 + config: { customModels: [threadDefault.model] },
49 + },
50 + };
51 + // An exhausted Go quota leaves the custom model unusable but Big Pickle still works.
52 + expect(
53 + fallbackTextGenerationModelSelection(
54 + providerInstances,
55 + (instanceId, _driver, model) =>
56 + instanceId === "opencode" && !model.startsWith("opencode-go/"),
57 + { defaultModelSelection: threadDefault },
58 + ),
59 + ).toEqual({ instanceId: "opencode", model: "opencode/big-pickle" });
60 });
61
62 it("replaces and clears the fallback without carrying model options", () => {
packages/shared/src/serverSettings.ts
+19 -13
@@ -73,9 +73,21 @@ const TEXT_GENERATION_FALLBACK_DRIVERS = [
73 /** Configured instances come after every default instance, so they only win when no default qualifies. */
74 export function fallbackTextGenerationModelSelection(
75 providerInstances: ServerSettings["providerInstances"],
76 - isEnabled: (instanceId: ProviderInstanceId, driver: ProviderDriverKind) => boolean,
76 + isEnabled: (instanceId: ProviderInstanceId, driver: ProviderDriverKind, model: string) => boolean,
77 options?: { readonly defaultModelSelection?: ModelSelection | null },
78 ): ModelSelection | null {
79 + const threadDefault = options?.defaultModelSelection;
80 + // The thread default's custom model wins on its instance; the driver default still serves when that model is unusable.
81 + const selectionsFor = (instanceId: ProviderInstanceId, driver: ProviderDriverKind) => {
82 + const config = providerInstances[instanceId]?.config as { customModels?: unknown } | undefined;
83 + const driverDefault = { instanceId, model: defaultTextGenerationModel(driver) };
84 + return threadDefault?.instanceId === instanceId &&
85 + readCustomModelEntries(config?.customModels).some(
86 + (entry) => entry.slug === threadDefault.model,
87 + )
88 + ? [threadDefault, driverDefault]
89 + : [driverDefault];
90 + };
91 const candidates = [
92 ...TEXT_GENERATION_FALLBACK_DRIVERS.map(
93 (driver) => [defaultInstanceIdForDriver(driver), driver] as const,
@@ -86,21 +98,15 @@ export function fallbackTextGenerationModelSelection(
98 : [],
99 ),
100 ];
89 - const match = candidates.find(([instanceId, driver]) => isEnabled(instanceId, driver));
90 - if (match === undefined) return null;
91 - const [instanceId, driver] = match;
92 - const threadDefault = options?.defaultModelSelection;
93 - const config = providerInstances[instanceId]?.config as { customModels?: unknown } | undefined;
94 - if (
95 - threadDefault?.instanceId === instanceId &&
96 - readCustomModelEntries(config?.customModels).some((entry) => entry.slug === threadDefault.model)
97 - ) {
98 - return threadDefault;
101 + for (const [instanceId, driver] of candidates) {
102 + for (const selection of selectionsFor(instanceId, driver)) {
103 + if (isEnabled(instanceId, driver, selection.model)) return selection;
104 + }
105 }
100 - return { instanceId, model: defaultTextGenerationModel(driver) };
106 + return null;
107 }
108
103 -export function defaultTextGenerationModel(driver: ProviderDriverKind): string {
109 +function defaultTextGenerationModel(driver: ProviderDriverKind): string {
110 return (
111 DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER[driver] ??
112 DEFAULT_MODEL_BY_PROVIDER[driver] ??