Skip to content

Commit 700eef8

Browse files
committed
fix(server): discovered Claude models keep their effort options
Claude Code reports supportsEffort and supportedEffortLevels for gateway-discovered models, but T3 gave them empty capabilities, so the picker hid the effort menu. Their descriptors now come from that report, and the driver feeds the last probe's models into the adapter catalog so the chosen effort reaches Claude Code at runtime.
1 parent 65817fa commit 700eef8

5 files changed

Lines changed: 178 additions & 57 deletions

File tree

‎apps/server/src/provider/ClaudeModelCatalog.test.ts‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
resolveClaudeModelsForVersion,
1313
resolveClaudeModelSlug,
1414
scopeClaudeModelCatalog,
15+
withClaudeReportedModels,
1516
} from "./ClaudeModelCatalog.ts";
1617

1718
/**
@@ -190,4 +191,48 @@ describe("Claude model catalog", () => {
190191
["claude-synthetic-next", "claude-custom-tuned"],
191192
);
192193
});
194+
195+
it("resolves effort for models Claude Code reports from its own capabilities", () => {
196+
const catalog = withClaudeReportedModels(
197+
resolveClaudeModelCatalog(manifest()),
198+
[],
199+
[
200+
{ value: "synthetic", displayName: "Synthetic", description: "", supportsEffort: true },
201+
{
202+
value: "anthropic/claude-gateway",
203+
displayName: "Gateway Claude",
204+
description: "From gateway",
205+
supportsEffort: true,
206+
supportedEffortLevels: ["low", "high", "max"],
207+
supportsFastMode: true,
208+
},
209+
{ value: "claude-gateway-plain", displayName: "Plain", description: "From gateway" },
210+
],
211+
);
212+
213+
assert.deepStrictEqual(
214+
resolveClaudeModelsForVersion(catalog, "3.2.0").map((model) => model.slug),
215+
["claude-synthetic-next", "anthropic/claude-gateway", "claude-gateway-plain"],
216+
);
217+
assert.strictEqual(
218+
resolveClaudeCatalogEffort(catalog, "anthropic/claude-gateway", "max"),
219+
"max",
220+
);
221+
assert.strictEqual(
222+
resolveClaudeCatalogEffort(catalog, "anthropic/claude-gateway", undefined),
223+
"high",
224+
);
225+
assert.strictEqual(
226+
resolveClaudeCatalogApiModelId(catalog, {
227+
instanceId: ProviderInstanceId.make("claudeAgent"),
228+
model: "anthropic/claude-gateway",
229+
options: [{ id: "effort", value: "max" }],
230+
}),
231+
"anthropic/claude-gateway",
232+
);
233+
assert.strictEqual(
234+
resolveClaudeCatalogEffort(catalog, "claude-gateway-plain", "max"),
235+
undefined,
236+
);
237+
});
193238
});

‎apps/server/src/provider/ClaudeModelCatalog.ts‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
ProviderDriverKind,
66
type ServerProviderModel,
77
} from "@t3tools/contracts";
8+
import type { ModelInfo as ClaudeModelInfo } from "@anthropic-ai/claude-agent-sdk";
89
import * as Option from "effect/Option";
910
import {
1011
getModelSelectionStringOptionValue,
@@ -118,6 +119,90 @@ export function scopeClaudeModelCatalog(
118119
return { models: [...builtInModels, ...customCatalogModels] };
119120
}
120121

122+
const CLAUDE_EFFORT_LABELS: Record<string, string> = {
123+
low: "Low",
124+
medium: "Medium",
125+
high: "High",
126+
xhigh: "Extra High",
127+
max: "Max",
128+
};
129+
130+
/** Strip Claude Code's context-window suffix, e.g. `opus[1m]` -> `opus`. */
131+
function stripClaudeModelSuffix(value: string): string {
132+
return value.replace(/\[[^\]]*\]$/, "").trim();
133+
}
134+
135+
/** Option descriptors for a model from what Claude Code reports it supports. */
136+
function claudeReportedModelCapabilities(info: ClaudeModelInfo): ModelCapabilities {
137+
const efforts = info.supportsEffort ? (info.supportedEffortLevels ?? []) : [];
138+
const defaultEffort = efforts.includes("high") ? "high" : undefined;
139+
return {
140+
optionDescriptors: [
141+
...(efforts.length
142+
? [
143+
{
144+
id: "effort",
145+
label: "Reasoning",
146+
type: "select" as const,
147+
options: efforts.map((id) => ({
148+
id,
149+
label: CLAUDE_EFFORT_LABELS[id] ?? id,
150+
...(id === defaultEffort ? { isDefault: true } : {}),
151+
})),
152+
},
153+
]
154+
: []),
155+
...(info.supportsFastMode
156+
? [{ id: "fastMode", label: "Fast Mode", type: "boolean" as const }]
157+
: []),
158+
],
159+
};
160+
}
161+
162+
/**
163+
* Append models Claude Code reports that the catalog does not know, such as
164+
* ids from an Anthropic-compatible gateway with model discovery on. Catalog
165+
* models, including ones the installed version cannot run, are never
166+
* duplicated and keep T3's descriptors. A custom model with the same slug keeps
167+
* its settings-owned row. Discovered models take their options from what
168+
* Claude Code reports and are passed to it verbatim at runtime.
169+
*/
170+
export function withClaudeReportedModels(
171+
catalog: ClaudeModelCatalog,
172+
customModels: ReadonlyArray<CustomModelSetting>,
173+
reportedModels: ReadonlyArray<ClaudeModelInfo> | undefined,
174+
): ClaudeModelCatalog {
175+
if (!reportedModels?.length) return catalog;
176+
const known = new Set<string>();
177+
for (const { model } of catalog.models) {
178+
known.add(model.slug.toLowerCase());
179+
for (const alias of model.aliases ?? []) known.add(alias.toLowerCase());
180+
}
181+
for (const entry of readCustomModelEntries(customModels)) known.add(entry.slug.toLowerCase());
182+
const discovered: Array<ClaudeCatalogModel> = [];
183+
for (const info of reportedModels) {
184+
const slug = info.value.trim();
185+
// `default` is Claude Code's pointer at its own default model, not a model.
186+
if (!slug || slug === "default") continue;
187+
const ids = [slug, info.resolvedModel ?? ""].map((id) =>
188+
stripClaudeModelSuffix(id).toLowerCase(),
189+
);
190+
if (ids.some((id) => id && known.has(id))) continue;
191+
known.add(slug.toLowerCase());
192+
discovered.push({
193+
model: {
194+
slug,
195+
name: info.displayName.trim() || slug,
196+
isCustom: false,
197+
capabilities: claudeReportedModelCapabilities(info),
198+
},
199+
runtime: {},
200+
compatibility: {},
201+
});
202+
}
203+
return discovered.length ? { models: [...catalog.models, ...discovered] } : catalog;
204+
}
205+
121206
function resolveClaudeCatalogModel(
122207
catalog: ClaudeModelCatalog,
123208
slugOrAlias: string | null | undefined,

‎apps/server/src/provider/Drivers/ClaudeDriver.ts‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
*
1313
* @module provider/Drivers/ClaudeDriver
1414
*/
15+
import type { ModelInfo as ClaudeModelInfo } from "@anthropic-ai/claude-agent-sdk";
1516
import { ClaudeSettings, ProviderDriverKind } from "@t3tools/contracts";
1617
import * as Cache from "effect/Cache";
1718
import * as Duration from "effect/Duration";
1819
import * as Crypto from "effect/Crypto";
1920
import * as Effect from "effect/Effect";
2021
import * as FileSystem from "effect/FileSystem";
2122
import * as Path from "effect/Path";
23+
import * as Ref from "effect/Ref";
2224
import * as Schema from "effect/Schema";
2325
import { HttpClient } from "effect/unstable/http";
2426
import { ChildProcessSpawner } from "effect/unstable/process";
@@ -39,7 +41,7 @@ import {
3941
probeClaudeCapabilities,
4042
} from "../Layers/ClaudeProvider.ts";
4143
import { ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
42-
import { resolveClaudeModelCatalog } from "../ClaudeModelCatalog.ts";
44+
import { resolveClaudeModelCatalog, withClaudeReportedModels } from "../ClaudeModelCatalog.ts";
4345
import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
4446
import * as ModelManifest from "../ModelManifest.ts";
4547
import {
@@ -122,7 +124,6 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
122124
const serverSettings = yield* ServerSettingsService;
123125
const eventLoggers = yield* ProviderEventLoggers;
124126
const modelManifest = yield* ModelManifest.ModelManifest;
125-
const modelCatalog = modelManifest.current.pipe(Effect.map(resolveClaudeModelCatalog));
126127
const processEnv = mergeProviderInstanceEnvironment(environment);
127128
const fallbackContinuationIdentity = defaultProviderContinuationIdentity({
128129
driverKind: DRIVER_KIND,
@@ -161,6 +162,19 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
161162
continuationGroupKey,
162163
});
163164

165+
// Models from the last successful capabilities probe, so sessions can
166+
// resolve options for gateway-discovered models the manifest lacks.
167+
const reportedModels = yield* Ref.make<ReadonlyArray<ClaudeModelInfo>>([]);
168+
const modelCatalog = Effect.all([modelManifest.current, Ref.get(reportedModels)]).pipe(
169+
Effect.map(([manifest, models]) =>
170+
withClaudeReportedModels(
171+
resolveClaudeModelCatalog(manifest),
172+
effectiveConfig.customModels,
173+
models,
174+
),
175+
),
176+
);
177+
164178
// One per instance: the status probe writes the model-scoped bucket
165179
// names it saw, the adapter reads them to place turn-driven events.
166180
const scopedLimitNames = yield* makeClaudeScopedLimitNames;
@@ -185,6 +199,9 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
185199
timeToLive: CAPABILITIES_PROBE_TTL,
186200
lookup: () =>
187201
probeClaudeCapabilities(effectiveConfig, processEnv, cwd).pipe(
202+
Effect.tap((probe) =>
203+
probe ? Ref.set(reportedModels, probe.models ?? []) : Effect.void,
204+
),
188205
Effect.provideService(Path.Path, path),
189206
),
190207
});

‎apps/server/src/provider/Layers/ClaudeProvider.ts‎

Lines changed: 5 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {
22
type ClaudeSettings,
33
type ModelCapabilities,
4-
type ServerProviderModel,
54
type ServerProviderSlashCommand,
65
type ServerProviderResetCredits,
76
} from "@t3tools/contracts";
@@ -13,7 +12,7 @@ import * as Path from "effect/Path";
1312
import * as Ref from "effect/Ref";
1413
import * as Result from "effect/Result";
1514
import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
16-
import { createModelCapabilities, readCustomModelEntries } from "@t3tools/shared/model";
15+
import { createModelCapabilities } from "@t3tools/shared/model";
1716
import { resolveSpawnCommand } from "@t3tools/shared/shell";
1817
import {
1918
query as claudeQuery,
@@ -49,6 +48,7 @@ import {
4948
type ClaudeModelCatalog,
5049
formatClaudeVersionUpgradeMessage,
5150
resolveClaudeModelsForVersion,
51+
withClaudeReportedModels,
5252
} from "../ClaudeModelCatalog.ts";
5353

5454
const DEFAULT_CLAUDE_MODEL_CAPABILITIES: ModelCapabilities = createModelCapabilities({
@@ -311,53 +311,6 @@ function dedupeSlashCommands(
311311
return [...commandsByName.values()];
312312
}
313313

314-
/** Strip Claude Code's context-window suffix, e.g. `opus[1m]` -> `opus`. */
315-
function stripClaudeModelSuffix(value: string): string {
316-
return value.replace(/\[[^\]]*\]$/, "").trim();
317-
}
318-
319-
/**
320-
* Append models Claude Code reports that the bundled catalog does not know,
321-
* such as ids from an Anthropic-compatible gateway with model discovery on.
322-
* Catalog models, including ones the installed version cannot run, are never
323-
* duplicated and keep T3's descriptors. A custom model with the same slug keeps
324-
* its settings-owned row. Discovered ids carry no capabilities
325-
* because the adapter resolves options from the catalog only, and are passed
326-
* through to Claude Code verbatim at runtime.
327-
*/
328-
function mergeClaudeReportedModels(
329-
models: ReadonlyArray<ServerProviderModel>,
330-
modelCatalog: ClaudeModelCatalog,
331-
customModels: ClaudeSettings["customModels"],
332-
reportedModels: ReadonlyArray<ClaudeModelInfo> | undefined,
333-
): ReadonlyArray<ServerProviderModel> {
334-
if (!reportedModels?.length) return models;
335-
const known = new Set<string>();
336-
for (const { model } of modelCatalog.models) {
337-
known.add(model.slug.toLowerCase());
338-
for (const alias of model.aliases ?? []) known.add(alias.toLowerCase());
339-
}
340-
for (const entry of readCustomModelEntries(customModels)) known.add(entry.slug.toLowerCase());
341-
const discovered: Array<ServerProviderModel> = [];
342-
for (const info of reportedModels) {
343-
const slug = info.value.trim();
344-
// `default` is Claude Code's pointer at its own default model, not a model.
345-
if (!slug || slug === "default") continue;
346-
const ids = [slug, info.resolvedModel ?? ""].map((id) =>
347-
stripClaudeModelSuffix(id).toLowerCase(),
348-
);
349-
if (ids.some((id) => id && known.has(id))) continue;
350-
known.add(slug.toLowerCase());
351-
discovered.push({
352-
slug,
353-
name: info.displayName.trim() || slug,
354-
isCustom: false,
355-
capabilities: DEFAULT_CLAUDE_MODEL_CAPABILITIES,
356-
});
357-
}
358-
return discovered.length ? [...models, ...discovered] : models;
359-
}
360-
361314
function waitForAbortSignal(signal: AbortSignal): Promise<void> {
362315
if (signal.aborted) {
363316
return Promise.resolve();
@@ -584,11 +537,9 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
584537
? yield* resolveCapabilities(claudeSettings).pipe(Effect.orElseSucceed(() => undefined))
585538
: undefined;
586539
const models = providerModelsFromSettings(
587-
mergeClaudeReportedModels(
588-
resolveClaudeModelsForVersion(modelCatalog, parsedVersion),
589-
modelCatalog,
590-
claudeSettings.customModels,
591-
capabilities?.models,
540+
resolveClaudeModelsForVersion(
541+
withClaudeReportedModels(modelCatalog, claudeSettings.customModels, capabilities?.models),
542+
parsedVersion,
592543
),
593544
claudeSettings.customModels,
594545
DEFAULT_CLAUDE_MODEL_CAPABILITIES,

‎apps/server/src/provider/Layers/ProviderRegistry.test.ts‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2760,6 +2760,13 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
27602760
},
27612761
{ value: "sonnet", displayName: "Sonnet", description: "" },
27622762
{ value: "gateway/glm-5", displayName: "GLM 5", description: "" },
2763+
{
2764+
value: "gateway/claude-relay",
2765+
displayName: "Claude Relay",
2766+
description: "",
2767+
supportsEffort: true,
2768+
supportedEffortLevels: ["low", "high"],
2769+
},
27632770
{ value: "gateway/kimi-3", displayName: "Kimi 3", description: "" },
27642771
],
27652772
}),
@@ -2769,9 +2776,25 @@ it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), Test
27692776
);
27702777
assert.deepStrictEqual(
27712778
reported.map((model) => [model.slug, model.name]),
2772-
[["gateway/glm-5", "GLM 5"]],
2779+
[
2780+
["gateway/glm-5", "GLM 5"],
2781+
["gateway/claude-relay", "Claude Relay"],
2782+
],
27732783
);
27742784
assert.deepStrictEqual(reported[0]?.capabilities, { optionDescriptors: [] });
2785+
assert.deepStrictEqual(reported[1]?.capabilities, {
2786+
optionDescriptors: [
2787+
{
2788+
id: "effort",
2789+
label: "Reasoning",
2790+
type: "select",
2791+
options: [
2792+
{ id: "low", label: "Low" },
2793+
{ id: "high", label: "High", isDefault: true },
2794+
],
2795+
},
2796+
],
2797+
});
27752798
assert.deepStrictEqual(
27762799
status.models.filter((model) => model.isCustom).map((model) => model.name),
27772800
["My Custom", "Kimi (mine)"],

0 commit comments

Comments
 (0)