Skip to content

Commit 41d8b12

Browse files
t3dotggclaude
andcommitted
fix(server): text generation fallback uses the custom thread model on that provider
When no usable text generation model is set, the fallback picked a hard-coded slug (claude-haiku-5-5 for Claude). A backend that only serves custom models refuses it, so commit, PR, branch, and title generation fail. Now the fallback uses the thread default when it is one of that instance's custom models. Refs #12651 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent f5b5f9d commit 41d8b12

4 files changed

Lines changed: 61 additions & 3 deletions

File tree

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,44 @@ it.layer(NodeServices.layer)("server settings", (it) => {
813813
}).pipe(Effect.provide(layerServerSettings())),
814814
);
815815

816+
// A backend behind a custom model may refuse the built-in default (#12651).
817+
it.effect("falls back to the thread default when it is a custom model on that instance", () =>
818+
Effect.gen(function* () {
819+
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
820+
const claude = ProviderInstanceId.make("claudeAgent");
821+
const providerInstances = {
822+
[ProviderInstanceId.make("codex")]: {
823+
driver: ProviderDriverKind.make("codex"),
824+
enabled: false,
825+
config: {},
826+
},
827+
[claude]: {
828+
driver: ProviderDriverKind.make("claudeAgent"),
829+
config: { customModels: ["z-ai/glm-5.3-flash"] },
830+
},
831+
};
832+
833+
const custom = yield* serverSettings.updateSettings({
834+
providerInstances,
835+
defaultModelSelection: {
836+
instanceId: claude,
837+
model: "z-ai/glm-5.3-flash",
838+
options: [{ id: "thinking", value: false }],
839+
},
840+
});
841+
assert.deepEqual(custom.textGenerationModelSelection, {
842+
instanceId: claude,
843+
model: "z-ai/glm-5.3-flash",
844+
options: [{ id: "thinking", value: false }],
845+
});
846+
847+
const builtIn = yield* serverSettings.updateSettings({
848+
defaultModelSelection: { instanceId: claude, model: "claude-fable-5-1" },
849+
});
850+
assert.equal(builtIn.textGenerationModelSelection.model, "claude-haiku-5-5");
851+
}).pipe(Effect.provide(layerServerSettings())),
852+
);
853+
816854
it.effect("preserves enabled text generation selections for non-built-in drivers", () =>
817855
Effect.gen(function* () {
818856
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;

‎apps/server/src/serverSettings.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,7 @@ function fallbackTextGenerationProvider(settings: ServerSettings): ServerSetting
484484
resolveProviderInstanceEnabled(
485485
settings.providerInstances[instanceId] ?? { driver, config: {} },
486486
),
487+
{ defaultModelSelection: settings.defaultModelSelection },
487488
);
488489
return fallback === null ? settings : { ...settings, textGenerationModelSelection: fallback };
489490
}

‎packages/shared/src/projectSettings.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,10 @@ function resolveProjectOverrides(
199199
const fallback = fallbackTextGenerationModelSelection(
200200
settings.providerInstances,
201201
(instanceId) => resolveProjectProviderInstanceEnabled(settings, projectId, instanceId),
202-
{ includeConfiguredInstances: true },
202+
{
203+
includeConfiguredInstances: true,
204+
defaultModelSelection: effective.defaultModelSelection as ModelSelection | null,
205+
},
203206
);
204207
if (fallback !== null) effective.textGenerationModelSelection = fallback;
205208
}

‎packages/shared/src/serverSettings.ts‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import * as Option from "effect/Option";
2323
import * as Schema from "effect/Schema";
2424
import { deepMerge } from "./Struct.ts";
2525
import { fromLenientJson } from "./schemaJson.ts";
26-
import { createModelSelection } from "./model.ts";
26+
import { createModelSelection, readCustomModelEntries } from "./model.ts";
2727
import {
2828
getBackgroundActivityBaseProfile,
2929
normalizeBackgroundActivitySettings,
@@ -95,6 +95,11 @@ const TEXT_GENERATION_FALLBACK_DRIVERS = [
9595
* `includeConfiguredInstances` is set, configured instances of those
9696
* drivers. `null` when none is.
9797
*
98+
* The model is the driver's cheap default, unless `defaultModelSelection`
99+
* (the thread default) is one of that instance's custom models. A custom
100+
* model usually means a backend that may refuse the built-in default, and
101+
* the thread default, with its options, is known to work there.
102+
*
98103
* `includeConfiguredInstances` is for the project-scoped caller only: a
99104
* project that disabled every built-in instance should still be able to
100105
* fall back to one it configured itself. The machine-level caller leaves it
@@ -104,7 +109,10 @@ const TEXT_GENERATION_FALLBACK_DRIVERS = [
104109
export function fallbackTextGenerationModelSelection(
105110
providerInstances: ServerSettings["providerInstances"],
106111
isEnabled: (instanceId: ProviderInstanceId, driver: ProviderDriverKind) => boolean,
107-
options?: { readonly includeConfiguredInstances?: boolean },
112+
options?: {
113+
readonly includeConfiguredInstances?: boolean;
114+
readonly defaultModelSelection?: ModelSelection | null;
115+
},
108116
): ModelSelection | null {
109117
const candidates = [
110118
...TEXT_GENERATION_FALLBACK_DRIVERS.map(
@@ -121,6 +129,14 @@ export function fallbackTextGenerationModelSelection(
121129
const match = candidates.find(([instanceId, driver]) => isEnabled(instanceId, driver));
122130
if (match === undefined) return null;
123131
const [instanceId, driver] = match;
132+
const threadDefault = options?.defaultModelSelection;
133+
const config = providerInstances[instanceId]?.config as { customModels?: unknown } | undefined;
134+
if (
135+
threadDefault?.instanceId === instanceId &&
136+
readCustomModelEntries(config?.customModels).some((entry) => entry.slug === threadDefault.model)
137+
) {
138+
return threadDefault;
139+
}
124140
return {
125141
instanceId,
126142
model:

0 commit comments

Comments
 (0)