Skip to content

Commit d5b9759

Browse files
fix(usage): retain usage model evidence when pairing copies
1 parent 696edc2 commit d5b9759

2 files changed

Lines changed: 35 additions & 5 deletions

File tree

‎apps/server/src/provider/Drivers/antigravityUsageReader.test.ts‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,17 +380,46 @@ describe("readAntigravityUsage", () => {
380380
}).pipe(Effect.provide(NodeServices.layer)),
381381
);
382382

383-
it.effect("retains differing source model labels despite a shared usage model enum", () =>
383+
it.effect.each([
384+
{
385+
name: "retains differing source model labels despite a shared usage model enum",
386+
stepModel: "claude-opus-4-6",
387+
generationModel: "claude-sonnet-4-6",
388+
stepEnum: 1016,
389+
generationEnum: 1016,
390+
expectedModels: ["gemini-3.1-pro", "gemini-3.1-pro"],
391+
},
392+
{
393+
name: "retains differing usage model enums despite a shared source model label",
394+
stepModel: "claude-opus-4-6",
395+
generationModel: "claude-opus-4-6",
396+
stepEnum: 1016,
397+
generationEnum: 1026,
398+
expectedModels: ["gemini-3.1-pro", "claude-opus-4-6"],
399+
},
400+
])("$name", ({ stepModel, generationModel, stepEnum, generationEnum, expectedModels }) =>
384401
Effect.gen(function* () {
385-
const usage = attemptUsage(1, protoNumber(1, 1016));
386402
const read = yield* readUsageRows(
387-
[usageRow("step", usage, [], "claude-opus-4-6")],
388-
[usageRow("generation", usage, [], "claude-sonnet-4-6", 1780000010)],
403+
[usageRow("step", attemptUsage(1, protoNumber(1, stepEnum)), [], stepModel)],
404+
[
405+
usageRow(
406+
"generation",
407+
attemptUsage(1, protoNumber(1, generationEnum)),
408+
[],
409+
generationModel,
410+
1780000010,
411+
),
412+
],
389413
);
414+
assert.strictEqual(read.length, 2);
390415
assert.deepStrictEqual(
391416
read.map((record) => record.totals),
392417
[attemptTotals(1), attemptTotals(1)],
393418
);
419+
assert.deepStrictEqual(
420+
read.map((record) => record.model),
421+
expectedModels,
422+
);
394423
}).pipe(Effect.provide(NodeServices.layer)),
395424
);
396425

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ function usageCandidates(
376376
};
377377
records.push(candidate);
378378
// Display fallbacks (including a generation at the same idx) cannot establish identity.
379-
// Prefer the row's model over the usage enum, which can hide differing model labels.
379+
// Either the row model or the usage enum can distinguish otherwise identical calls.
380380
let copyModel = entry.model || MODEL_IDS[numberAt(usage, 1)] || "";
381381
if (
382382
keys.length > 0 ||
@@ -391,6 +391,7 @@ function usageCandidates(
391391
}
392392
const identity = JSON.stringify([
393393
copyModel,
394+
modelName("", numberAt(usage, 1)),
394395
...USAGE_COUNTER_FIELDS.map((key) => numberAt(usage, key)),
395396
]);
396397
const group = copies.get(identity) ?? [[], []];

0 commit comments

Comments
 (0)