Skip to content

Commit 5138a3e

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-29338
2 parents 5e8f567 + 22b5252 commit 5138a3e

3 files changed

Lines changed: 52 additions & 3 deletions

File tree

‎apps/server/src/telemetry/ProviderUsageAnalytics.test.ts‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ const context = (
7777
modelSelection: {
7878
instanceId: ProviderInstanceId.make("codex"),
7979
model,
80-
options: [{ id: "reasoningEffort", value: "xhigh" }],
80+
options: [
81+
{ id: "reasoningEffort", value: "xhigh" },
82+
{ id: "serviceTier", value: "priority" },
83+
],
8184
},
8285
runtimeMode: "full-access",
8386
interactionMode: "default",
@@ -154,6 +157,7 @@ describe("provider usage reporting", () => {
154157
lifecycleObserved: true,
155158
model: "gpt-6-sol",
156159
effort: "xhigh",
160+
serviceTier: "fast",
157161
runtimeMode: "full-access",
158162
interactionMode: "default",
159163
createdBy: "user",
@@ -320,4 +324,27 @@ describe("provider usage reporting", () => {
320324
}
321325
expect(routed("ollama/acme-internal", "secret-variant")).not.toHaveProperty("effort");
322326
});
327+
328+
it("reports closed service tiers from a tier option or a fast mode toggle", () => {
329+
const tier = (option: { id: string; value: string | boolean }) =>
330+
providerTurnProperties(
331+
{
332+
driver: "codex",
333+
context: {
334+
modelSelection: {
335+
instanceId: ProviderInstanceId.make("codex"),
336+
model: "gpt-6-sol",
337+
options: [option],
338+
},
339+
},
340+
providerTurn: turn("t", complete(1, 1)),
341+
},
342+
label,
343+
).serviceTier;
344+
expect(tier({ id: "serviceTier", value: "ultrafast" })).toBe("ultrafast");
345+
expect(tier({ id: "serviceTier", value: "default" })).toBe("standard");
346+
expect(tier({ id: "serviceTier", value: "/home/me/secret" })).toBeUndefined();
347+
expect(tier({ id: "fastMode", value: true })).toBe("fast");
348+
expect(tier({ id: "fastMode", value: false })).toBe("standard");
349+
});
323350
});

‎apps/server/src/telemetry/ProviderUsageAnalytics.ts‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import * as DateTime from "effect/DateTime";
2020
import * as Effect from "effect/Effect";
2121
import * as Layer from "effect/Layer";
2222

23-
import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
23+
import {
24+
getModelSelectionBooleanOptionValue,
25+
getModelSelectionStringOptionValue,
26+
} from "@t3tools/shared/model";
2427
import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
2528
import * as AnalyticsService from "./AnalyticsService.ts";
2629
import { catalogModelLabel } from "./ProviderDimensions.ts";
@@ -106,6 +109,22 @@ function selectedEffort(selection: ModelSelection): string | undefined {
106109
return effort !== undefined && REPORTED_EFFORTS.has(effort) ? effort : undefined;
107110
}
108111

112+
// Codex sends a tier id (its "fast" config shows up as "priority"); Claude has a fastMode toggle.
113+
const REPORTED_SERVICE_TIERS: ReadonlyMap<string, string> = new Map([
114+
["default", "standard"],
115+
["flex", "flex"],
116+
["fast", "fast"],
117+
["priority", "fast"],
118+
["ultrafast", "ultrafast"],
119+
]);
120+
121+
function selectedServiceTier(selection: ModelSelection): string | undefined {
122+
const tier = getModelSelectionStringOptionValue(selection, "serviceTier");
123+
if (tier !== undefined) return REPORTED_SERVICE_TIERS.get(tier);
124+
const fastMode = getModelSelectionBooleanOptionValue(selection, "fastMode");
125+
return fastMode === undefined ? undefined : fastMode ? "fast" : "standard";
126+
}
127+
109128
/**
110129
* Confirmed models across counted work. Unknown when any piece of work has no
111130
* reported model, unless two distinct models were already seen.
@@ -130,6 +149,7 @@ function selectionProperties(
130149
return defined({
131150
model: selection === undefined ? undefined : label(selection.model),
132151
effort: selection === undefined ? undefined : selectedEffort(selection),
152+
serviceTier: selection === undefined ? undefined : selectedServiceTier(selection),
133153
runtimeMode: context?.runtimeMode,
134154
interactionMode: context?.interactionMode,
135155
...context?.origin,

‎docs/internals/product-analytics.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ is unknown or the ledger goes backwards, and background work that ends between
8484
turns lands in the next one. Claude subagents have no turns of their own, so
8585
this never overlaps child turns.
8686

87-
`model` and `effort` are what the run selected. `observedModel` and
87+
`model`, `effort`, and `serviceTier` are what the run selected. `serviceTier`
88+
is `standard`, `flex`, `fast`, or `ultrafast`, from Codex's tier option or
89+
Claude's fast mode, and is absent when the selection does not set one. `observedModel` and
8890
`mixedModels` appear only when the provider reported the models for the counted
8991
work (Codex thread settings and reroutes, Claude root messages, OpenCode steps).
9092
`mixedModels: false` without `reportVersion` was never checked. Model labels

0 commit comments

Comments
 (0)