Skip to content

Commit 1de5fee

Browse files
fix(server): price OpenCode Go usage from opencode_go rates (pingdotgg#30683)
1 parent fe565c8 commit 1de5fee

4 files changed

Lines changed: 76 additions & 5 deletions

File tree

‎apps/server/src/usage/usagePricing.test.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,14 @@ describe("usage pricing", () => {
7575
});
7676
});
7777

78+
it("falls back to the display model when the rate model is unlisted", () => {
79+
const table = parseRateTable({ "example-model": rate(1e-6, 0.1e-6) });
80+
const unlisted = { ...record("example-model"), rateModel: "reseller/example-model" };
81+
82+
expect(priceUsage(table, unlisted)).toEqual(priceUsage(table, record("example-model")));
83+
expect(cacheSavingsUsd(table, unlisted)).toBeCloseTo(0.9);
84+
});
85+
7886
it("prices unknown models offline and uses input prices for omitted cache rates", () => {
7987
const table = parseRateTable({});
8088
const overrides = createOverrideRateTable({

‎apps/server/src/usage/usagePricing.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,11 @@ export type PricedRecord = Pick<
304304
"model" | "rateModel" | "totals" | "speed" | "reportedCostUsd"
305305
>;
306306

307+
function recordRate(table: RateTable, record: PricedRecord): ModelRate | null {
308+
const rate = record.rateModel === undefined ? null : lookupRate(table, record.rateModel);
309+
return rate ?? lookupRate(table, record.model);
310+
}
311+
307312
export interface PricedUsage {
308313
readonly costUsd: number;
309314
readonly costSource: UsageCostSource;
@@ -342,7 +347,7 @@ export function priceUsage(
342347
categoryCostUsd: null,
343348
speedPremiumUsd: 0,
344349
});
345-
const rate = override ?? lookupRate(table, record.rateModel ?? model);
350+
const rate = override ?? recordRate(table, record);
346351
if (rate === null) {
347352
return reported === null ? unsplit(0, "unpriced") : unsplit(reported, "providerReported");
348353
}
@@ -373,8 +378,7 @@ export function cacheSavingsUsd(
373378
record: PricedRecord,
374379
overrides?: RateTable,
375380
): number {
376-
const rate =
377-
overrides?.get(record.model.trim()) ?? lookupRate(table, record.rateModel ?? record.model);
381+
const rate = overrides?.get(record.model.trim()) ?? recordRate(table, record);
378382
if (rate === null) return 0;
379383
const rates = ratesAt(rate, record.speed, record.totals);
380384
return record.totals.cachedInputTokens * (rates.inputCostPerToken - rates.cacheReadCostPerToken);

‎packages/provider-opencode/src/server/usage.test.ts‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,52 @@ describe("readOpenCodeUsage", () => {
314314
}).pipe(Effect.provide(NodeServices.layer)),
315315
);
316316

317+
it.effect("keys OpenCode Go to opencode_go rates and keeps free gateway models at zero", () =>
318+
Effect.gen(function* () {
319+
const fileSystem = yield* FileSystem.FileSystem;
320+
const path = yield* Path.Path;
321+
const dir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "usage-reader-test-" });
322+
const base = {
323+
sessionID: "session-1",
324+
role: "assistant",
325+
time: { created: 1780000000000 },
326+
cost: 0,
327+
tokens: { input: 100, output: 20 },
328+
};
329+
const db = yield* openDatabase(path.join(dir, "opencode.db"));
330+
yield* db.unsafe("CREATE TABLE message (id TEXT, session_id TEXT, data TEXT)");
331+
yield* db.unsafe("INSERT INTO message VALUES ('msg-top', 'session-1', ?)", [
332+
JSON.stringify({ ...base, providerID: "opencode-go", modelID: "deepseek-v4.1-flash" }),
333+
]);
334+
const legacy = path.join(dir, "storage", "message", "session-1");
335+
yield* fileSystem.makeDirectory(legacy, { recursive: true });
336+
yield* fileSystem.writeFileString(
337+
path.join(legacy, "msg-nested.json"),
338+
JSON.stringify({ ...base, model: { providerID: "opencode-go", id: "glm-5.3" } }),
339+
);
340+
yield* fileSystem.writeFileString(
341+
path.join(legacy, "msg-free.json"),
342+
JSON.stringify({ ...base, providerID: "opencode", modelID: "deepseek-v4.1-flash-free" }),
343+
);
344+
const result = yield* readOpenCodeUsage(dir, 0);
345+
assert.deepStrictEqual(
346+
result.files
347+
.flatMap((file) => file.records)
348+
.map(({ model, rateModel, reportedCostUsd }) => ({ model, rateModel, reportedCostUsd }))
349+
.sort((a, b) => a.model.localeCompare(b.model)),
350+
[
351+
{
352+
model: "deepseek-v4.1-flash",
353+
rateModel: "opencode_go/deepseek-v4.1-flash",
354+
reportedCostUsd: null,
355+
},
356+
{ model: "deepseek-v4.1-flash-free", rateModel: undefined, reportedCostUsd: 0 },
357+
{ model: "glm-5.3", rateModel: "opencode_go/glm-5.3", reportedCostUsd: null },
358+
],
359+
);
360+
}).pipe(Effect.provide(NodeServices.layer)),
361+
);
362+
317363
it.effect("never follows symlinks in the legacy OpenCode store", () =>
318364
Effect.gen(function* () {
319365
const fileSystem = yield* FileSystem.FileSystem;

‎packages/provider-opencode/src/server/usage.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ function text(value: unknown): string {
2929
return typeof value === "string" ? value : "";
3030
}
3131

32+
// OpenCode provider IDs whose bare model IDs LiteLLM prices under its own prefix.
33+
const LITELLM_PREFIXES = new Map([["opencode-go", "opencode_go"]]);
34+
const OPENCODE_GATEWAYS = new Set(["opencode", "opencode-go"]);
35+
3236
function parseOpenCodeMessage(
3337
source: string,
3438
fallback: {
@@ -49,6 +53,7 @@ function parseOpenCodeMessage(
4953
const cache = object(usage.cache);
5054
const modelReference = object(message.model);
5155
const model = text(modelReference.id) || text(modelReference.modelID) || text(message.modelID);
56+
const providerId = text(modelReference.providerID) || text(message.providerID);
5257
const timestampMs = object(message.time).created ?? fallback.timestampMs;
5358
if (!model || typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return null;
5459
const reasoningTokens = tokens(usage.reasoning);
@@ -62,14 +67,21 @@ function parseOpenCodeMessage(
6267
if (totalTokens(totals) === 0) return null;
6368
const id = fallback.id || text(message.id);
6469
const cost = message.cost;
70+
const prefix = LITELLM_PREFIXES.get(providerId);
71+
const free = OPENCODE_GATEWAYS.has(providerId) && model.endsWith("-free");
6572
return {
6673
provider: "opencode",
6774
timestampMs,
6875
model,
76+
...(prefix !== undefined && !model.includes("/") ? { rateModel: `${prefix}/${model}` } : {}),
6977
sessionId: fallback.sessionId || text(message.sessionID),
7078
totals,
71-
// OpenCode uses zero for unknown rates, including paid subscriptions; let shared pricing estimate.
72-
reportedCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost > 0 ? cost : null,
79+
// OpenCode records zero for unknown rates and paid subscriptions alike, so only its own
80+
// gateways' free models report zero; shared pricing estimates every other zero.
81+
reportedCostUsd:
82+
typeof cost === "number" && Number.isFinite(cost) && (cost > 0 || (free && cost === 0))
83+
? cost
84+
: null,
7385
speed: "standard",
7486
dedupeKey: id ? `opencode:${id}` : null,
7587
};
@@ -196,6 +208,7 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
196208
`SELECT id, session_id, ${timestamp} AS created, json_object(
197209
'tokens', data -> '$.tokens', 'cost', data -> '$.cost',
198210
'model', data -> '$.model', 'modelID', data -> '$.modelID',
211+
'providerID', data -> '$.providerID',
199212
'time', data -> '$.time', 'id', data -> '$.id', 'sessionID', data -> '$.sessionID'
200213
) AS data
201214
FROM ${table}

0 commit comments

Comments
 (0)