@@ -36,19 +36,19 @@ fn normalizeEffort(value: []const u8) []const u8 {
3636 return if (std.mem.eql(u8, value, "none")) "off" else value;
3737 }
3838
39-fn clampEffort(info: *const catalog.ModelInfo, desired: ?[]const u8) []const u8 {
39+fn clampEffort(reasoning: bool, effort: []const []const u8, desired: ?[]const u8) []const u8 {
4040 const want = desired orelse return "";
41- if (!info.reasoning) return "off";
42- if (info.effort.len == 0) return want;
43- for (info.effort) |accepted| {
41+ if (!reasoning) return "off";
42+ if (effort.len == 0) return want;
43+ for (effort) |accepted| {
4444 if (std.mem.eql(u8, normalizeEffort(accepted), want)) return normalizeEffort(accepted);
4545 }
4646 const want_rank = rank(want);
47- if (want_rank < 0) return normalizeEffort(info.effort[0]);
47+ if (want_rank < 0) return normalizeEffort(effort[0]);
4848
4949 var up: ?[]const u8 = null;
5050 var down: ?[]const u8 = null;
51- for (info.effort) |accepted| {
51+ for (effort) |accepted| {
5252 const r = rank(normalizeEffort(accepted));
5353 if (r < 0) continue;
5454 if (r >= want_rank) {
@@ -103,7 +103,7 @@ pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id
103103 .provider = provider_id,
104104 .base_url = info.base_url,
105105 .api_key = firstEnv(b.env_keys),
106- .effort = clampEffort(info, cfg.thinking_effort),
106+ .effort = clampEffort(info.reasoning, info.effort, cfg.thinking_effort),
107107 .supports_images = info.images,
108108 .context_window = info.context,
109109 .max_tokens = info.max_output,
@@ -115,31 +115,28 @@ pub fn resolveNamed(a: std.mem.Allocator, cfg: *const config.Config, provider_id
115115 }
116116
117117 if (custom(cfg, provider_id)) |p| {
118- var listed = false;
119- for (p.models) |id| {
120- if (std.mem.eql(u8, id, model_id)) listed = true;
118+ for (p.models) |m| {
119+ if (!std.mem.eql(u8, m.id, model_id)) continue;
120+ return types.Model{
121+ .id = m.id,
122+ .name = m.name orelse m.id,
123+ .api = @tagName(m.api),
124+ .provider = provider_id,
125+ .base_url = m.baseUrl,
126+ .api_key = firstEnv(p.envKeys),
127+ .effort = clampEffort(m.reasoning, m.effort, cfg.thinking_effort),
128+ .supports_images = m.images,
129+ .context_window = m.context,
130+ .max_tokens = m.maxOutput,
131+ .cost_input = m.cost[0],
132+ .cost_output = m.cost[1],
133+ .cost_cache_read = m.cost[2],
134+ .session_header = null,
135+ .headers = headerPairs(a, p.headers),
136+ };
121137 }
122- if (!listed) {
123- err.* = unknownModel(a, model_id, provider_id);
124- return null;
125- }
126- return types.Model{
127- .id = model_id,
128- .name = model_id,
129- .api = @tagName(p.api),
130- .provider = provider_id,
131- .base_url = p.baseUrl,
132- .api_key = firstEnv(p.envKeys),
133- .effort = cfg.thinking_effort orelse "",
134- .supports_images = true,
135- .context_window = 200_000,
136- .max_tokens = 32_768,
137- .cost_input = 0,
138- .cost_output = 0,
139- .cost_cache_read = 0,
140- .session_header = null,
141- .headers = headerPairs(a, p.headers),
142- };
138+ err.* = unknownModel(a, model_id, provider_id);
139+ return null;
143140 }
144141
145142 err.* = std.fmt.allocPrint(a, "unknown provider \"{s}\"", .{provider_id}) catch "unknown provider";
@@ -175,26 +172,43 @@ pub fn catalogModels(a: std.mem.Allocator, cfg: *const config.Config, provider_i
175172 if (resolveNamed(a, cfg, provider_id, entry.id, &err)) |m| try out.append(a, m);
176173 }
177174 if (custom(cfg, provider_id)) |p| {
178- for (p.models) |id| {
175+ for (p.models) |m| {
179176 var err: ?[]const u8 = null;
180- if (resolveNamed(a, cfg, provider_id, id, &err)) |m| try out.append(a, m);
177+ if (resolveNamed(a, cfg, provider_id, m.id, &err)) |resolved| try out.append(a, resolved);
181178 }
182179 }
183180 return out.toOwnedSlice(a);
184181 }
185182
186-pub fn supportedLevels(provider_id: []const u8, model_id: []const u8) []const []const u8 {
187- if (builtin(provider_id) == null) return &ladder;
183+pub fn supportedLevels(cfg: *const config.Config, provider_id: []const u8, model_id: []const u8) []const []const u8 {
184+ if (builtin(provider_id) == null) {
185+ if (custom(cfg, provider_id)) |p| {
186+ for (p.models) |m| {
187+ if (!std.mem.eql(u8, m.id, model_id)) continue;
188+ if (!m.reasoning) return &.{"off"};
189+ if (m.effort.len == 0) return &ladder;
190+ return m.effort;
191+ }
192+ }
193+ return &ladder;
194+ }
188195 const info = catalog.lookup(provider_id, model_id) orelse return &ladder;
189196 if (!info.reasoning) return &.{"off"};
190197 if (info.effort.len == 0) return &ladder;
191198 return info.effort;
192199 }
193200
194-pub fn clampNamed(provider_id: []const u8, model_id: []const u8, desired: []const u8) []const u8 {
195- if (builtin(provider_id) == null) return desired;
201+pub fn clampNamed(cfg: *const config.Config, provider_id: []const u8, model_id: []const u8, desired: []const u8) []const u8 {
202+ if (builtin(provider_id) == null) {
203+ if (custom(cfg, provider_id)) |p| {
204+ for (p.models) |m| {
205+ if (std.mem.eql(u8, m.id, model_id)) return clampEffort(m.reasoning, m.effort, desired);
206+ }
207+ }
208+ return desired;
209+ }
196210 const info = catalog.lookup(provider_id, model_id) orelse return desired;
197- return clampEffort(info, desired);
211+ return clampEffort(info.reasoning, info.effort, desired);
198212 }
199213
200214 fn unknownModel(a: std.mem.Allocator, model_id: []const u8, provider_id: []const u8) []const u8 {