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, 23:30 UTC
fix(server): text generation falls back to an enabled custom instance instead of a disabled default (#28918)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 11, 2026 at 11:55 UTC
9cb45ec0b7c95ae77a77deb1a72419e8164cdb74
4 files changed
+24
-49
apps/server/src/textGeneration/TextGeneration.ts
+15
-19
@@ -123,25 +123,21 @@ export const make = Effect.gen(function* () {
123
),
124
);
125
selection =
126
- fallbackTextGenerationModelSelection(
127
- settings.providerInstances,
128
- (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
- },
143
- { includeConfiguredInstances: true },
144
- ) ?? selection;
126
+ fallbackTextGenerationModelSelection(settings.providerInstances, (instanceId, driver) => {
127
+ const provider = snapshots.find((candidate) => candidate.instanceId === instanceId);
128
+ return (
129
+ instanceId !== selection.instanceId &&
130
+ provider?.enabled === true &&
131
+ resolveProjectProviderInstanceEnabled(settings, projectId ?? null, instanceId) &&
132
+ provider.installed &&
133
+ provider.auth.status !== "unauthenticated" &&
134
+ provider.status !== "error" &&
135
+ isProviderAvailable(provider) &&
136
+ isProviderTextGenerationCapable(provider) &&
137
+ (operation !== "generateReviewGuide" || INVESTIGATING_DRIVERS.has(driver)) &&
138
+ !exhaustedUsageWindow(provider, now, defaultTextGenerationModel(driver))
139
+ );
140
+ }) ?? selection;
141
}
142
if (textGeneratorCannotRun && selection.instanceId === textGeneratorId) {
143
return yield* new TextGenerationError({
packages/shared/src/projectSettings.ts
+1
-4
@@ -156,10 +156,7 @@ function resolveProjectOverrides(
156
const fallback = fallbackTextGenerationModelSelection(
157
settings.providerInstances,
158
(instanceId) => resolveProjectProviderInstanceEnabled(settings, projectId, instanceId),
159
- {
160
- includeConfiguredInstances: true,
161
- defaultModelSelection: effective.defaultModelSelection as ModelSelection | null,
162
- },
159
+ { defaultModelSelection: effective.defaultModelSelection as ModelSelection | null },
160
);
161
if (fallback !== null) effective.textGenerationModelSelection = fallback;
162
}
packages/shared/src/serverSettings.test.ts
+1
-14
@@ -58,7 +58,7 @@ describe("fallbackTextGenerationModelSelection", () => {
58
applyServerSettingsPatch(settings, { fallbackModelSelection: null }).fallbackModelSelection,
59
).toBeNull();
60
});
61
- it("ignores a configured non-default instance at machine scope, matching no fallback", () => {
61
+ it("falls back to a configured non-default instance", () => {
62
const configured = ProviderInstanceId.make("codex_work");
63
const providerInstances = {
64
[configured]: { driver: ProviderDriverKind.make("codex"), config: {} },
@@ -67,19 +67,6 @@ describe("fallbackTextGenerationModelSelection", () => {
67
providerInstances,
68
(instanceId) => instanceId === configured,
69
);
70
- expect(fallback).toBeNull();
71
- });
72
-
73
- it("considers a configured non-default instance only when asked to", () => {
74
- const configured = ProviderInstanceId.make("codex_work");
75
- const providerInstances = {
76
- [configured]: { driver: ProviderDriverKind.make("codex"), config: {} },
77
- };
78
- const fallback = fallbackTextGenerationModelSelection(
79
- providerInstances,
80
- (instanceId) => instanceId === configured,
81
- { includeConfiguredInstances: true },
82
- );
70
expect(fallback?.instanceId).toBe(configured);
71
});
72
});
packages/shared/src/serverSettings.ts
+7
-12
@@ -70,26 +70,21 @@ const TEXT_GENERATION_FALLBACK_DRIVERS = [
70
"antigravity",
71
].map((driver) => ProviderDriverKind.make(driver));
72
73
-/** Only project-scoped callers may include configured instances when falling back; machine-level callers leave it unset. */
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,
77
- options?: {
78
- readonly includeConfiguredInstances?: boolean;
79
- readonly defaultModelSelection?: ModelSelection | null;
80
- },
77
+ options?: { readonly defaultModelSelection?: ModelSelection | null },
78
): ModelSelection | null {
79
const candidates = [
80
...TEXT_GENERATION_FALLBACK_DRIVERS.map(
81
(driver) => [defaultInstanceIdForDriver(driver), driver] as const,
82
),
86
- ...(options?.includeConfiguredInstances === true
87
- ? Object.entries(providerInstances).flatMap(([instanceId, instance]) =>
88
- TEXT_GENERATION_FALLBACK_DRIVERS.includes(instance.driver)
89
- ? [[ProviderInstanceId.make(instanceId), instance.driver] as const]
90
- : [],
91
- )
92
- : []),
83
+ ...Object.entries(providerInstances).flatMap(([instanceId, instance]) =>
84
+ TEXT_GENERATION_FALLBACK_DRIVERS.includes(instance.driver)
85
+ ? [[ProviderInstanceId.make(instanceId), instance.driver] as const]
86
+ : [],
87
+ ),
88
];
89
const match = candidates.find(([instanceId, driver]) => isEnabled(instanceId, driver));
90
if (match === undefined) return null;