feat(cline): expose the cline-free/* tier and price it at zero (#4334)
This commit is contained in:
@@ -2,8 +2,28 @@
|
||||
//
|
||||
// Fallback order (first match wins):
|
||||
// 1. PROVIDER_PRICING[provider][model] — provider-specific override
|
||||
// 2. MODEL_PRICING[model] — canonical model price (provider-agnostic)
|
||||
// 3. PATTERN_PRICING — glob pattern match (e.g. "codex-*")
|
||||
// 2. FREE_MODEL_NAMESPACES — upstream bills these at $0
|
||||
// 3. MODEL_PRICING[model] — canonical model price (provider-agnostic)
|
||||
// 4. PATTERN_PRICING — glob pattern match (e.g. "codex-*")
|
||||
|
||||
/**
|
||||
* Namespaces upstream meters at $0. A free model must never inherit a paid
|
||||
* rate: the vendor-prefix strip in getPricingForModel() would turn
|
||||
* "cline-free/deepseek-v4.1-flash" into "deepseek-v4.1-flash" and match
|
||||
* MODEL_PRICING, so the namespace is checked before both fallbacks.
|
||||
*/
|
||||
export const FREE_MODEL_NAMESPACES = ["cline-free/"];
|
||||
|
||||
export const ZERO_PRICING = {
|
||||
input: 0, output: 0, cached: 0, reasoning: 0, cache_creation: 0,
|
||||
};
|
||||
|
||||
/** True when the model id sits in a namespace upstream bills at $0. */
|
||||
export function isFreeModel(model) {
|
||||
if (!model) return false;
|
||||
const lower = String(model).toLowerCase();
|
||||
return FREE_MODEL_NAMESPACES.some((ns) => lower.startsWith(ns));
|
||||
}
|
||||
|
||||
/**
|
||||
* Canonical model pricing — provider-agnostic.
|
||||
@@ -361,10 +381,11 @@ export function matchPattern(pattern, model) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve pricing for a model using the 3-step fallback chain:
|
||||
* Resolve pricing for a model using the 4-step fallback chain:
|
||||
* 1. PROVIDER_PRICING[provider][model]
|
||||
* 2. MODEL_PRICING[model]
|
||||
* 3. PATTERN_PRICING (glob match)
|
||||
* 2. free namespace (upstream bills $0)
|
||||
* 3. MODEL_PRICING[model]
|
||||
* 4. PATTERN_PRICING (glob match)
|
||||
*
|
||||
* @param {string} provider
|
||||
* @param {string} model
|
||||
@@ -378,12 +399,15 @@ export function getPricingForModel(provider, model) {
|
||||
return PROVIDER_PRICING[provider][model];
|
||||
}
|
||||
|
||||
// 2. Canonical model pricing (strip vendor prefix if needed: "deepseek/deepseek-chat" → "deepseek-chat")
|
||||
// 2. Free namespaces bill $0 regardless of the model name behind them.
|
||||
if (isFreeModel(model)) return ZERO_PRICING;
|
||||
|
||||
// 3. Canonical model pricing (strip vendor prefix if needed: "deepseek/deepseek-chat" → "deepseek-chat")
|
||||
const baseModel = model.includes("/") ? model.split("/").pop() : model;
|
||||
if (MODEL_PRICING[baseModel]) return MODEL_PRICING[baseModel];
|
||||
if (MODEL_PRICING[model]) return MODEL_PRICING[model];
|
||||
|
||||
// 3. Pattern match
|
||||
// 4. Pattern match
|
||||
for (const { pattern, pricing } of PATTERN_PRICING) {
|
||||
if (matchPattern(pattern, baseModel) || matchPattern(pattern, model)) {
|
||||
return pricing;
|
||||
|
||||
@@ -1,6 +1,12 @@
|
||||
import { buildClineHeaders } from "../shared/clineAuth.js";
|
||||
|
||||
const CLINEPASS_MODELS_ENDPOINT = "https://api.cline.bot/api/v1/models";
|
||||
// Cline's free tier is published here, not in /api/v1/models: the catalog
|
||||
// endpoint carries no `cline-free/*` ids at all. Cline's own SDK calls this
|
||||
// feed unauthenticated (sdk/packages/core/src/services/llms/cline-recommended-models.ts),
|
||||
// so no Authorization header is sent — adding one would only make the request
|
||||
// fail on a header the endpoint ignores.
|
||||
const CLINE_RECOMMENDED_MODELS_ENDPOINT = "https://api.cline.bot/api/v1/ai/cline/recommended-models";
|
||||
const FETCH_TIMEOUT_MS = 5000;
|
||||
|
||||
/**
|
||||
@@ -72,6 +78,40 @@ export async function resolveClinepassModels(credentials) {
|
||||
return models.length ? { models } : null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch Cline's recommended-models feed and return only its `free[]` tier.
|
||||
* Returns null on any failure — the free tier is additive, so a dead feed must
|
||||
* never take the /api/v1/models catalog down with it.
|
||||
* @param {{accessToken?: string, apiKey?: string}} credentials
|
||||
* @returns {Promise<{id: string, name: string}[] | null>}
|
||||
*/
|
||||
async function fetchClineFreeTierModels() {
|
||||
const controller = new AbortController();
|
||||
const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
|
||||
|
||||
try {
|
||||
const response = await fetch(CLINE_RECOMMENDED_MODELS_ENDPOINT, {
|
||||
method: "GET",
|
||||
headers: { Accept: "application/json" },
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
if (!response.ok) return null;
|
||||
|
||||
const json = await response.json();
|
||||
const free = Array.isArray(json?.free) ? json.free : [];
|
||||
if (!free.length) return null;
|
||||
|
||||
return free
|
||||
.filter((m) => typeof m?.id === "string" && m.id.trim() !== "")
|
||||
.map((m) => ({ id: m.id, name: m.name || m.id }));
|
||||
} catch {
|
||||
return null;
|
||||
} finally {
|
||||
clearTimeout(timer);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetch Cline live model catalog from Cline's /models endpoint.
|
||||
* Unlike resolveClinepassModels, this returns ALL models (including
|
||||
@@ -91,5 +131,15 @@ export async function resolveClineModels(credentials) {
|
||||
name: m.name || m.id,
|
||||
}));
|
||||
|
||||
return models.length ? { models } : null;
|
||||
// Free tier: /api/v1/models lists no `cline-free/*` ids, so merge the feed's
|
||||
// free[] in. First writer wins on a shared id, keeping the catalog's entry
|
||||
// for anything the two sources agree on.
|
||||
const freeTier = await fetchClineFreeTierModels();
|
||||
const byId = new Map(models.map((m) => [m.id, m]));
|
||||
for (const m of freeTier || []) {
|
||||
if (!byId.has(m.id)) byId.set(m.id, m);
|
||||
}
|
||||
const merged = Array.from(byId.values());
|
||||
|
||||
return merged.length ? { models: merged } : null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user