@shpitdev/convex-cliproxy-observability 0.2.2 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +36 -1
- package/dist/client.d.ts +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +5 -1
- package/dist/client.js.map +1 -1
- package/dist/component/queries.d.ts +1 -1
- package/dist/component/queries.d.ts.map +1 -1
- package/dist/component/queries.js +13 -0
- package/dist/component/queries.js.map +1 -1
- package/dist/model-call/index.d.ts +45 -7
- package/dist/model-call/index.d.ts.map +1 -1
- package/dist/model-call/index.js +65 -17
- package/dist/model-call/index.js.map +1 -1
- package/dist/protocols/checkpoint.d.ts +1 -1
- package/dist/protocols/checkpoint.d.ts.map +1 -1
- package/dist/protocols/checkpoint.js +7 -7
- package/dist/protocols/checkpoint.js.map +1 -1
- package/dist/protocols/types.d.ts +1 -0
- package/dist/protocols/types.d.ts.map +1 -1
- package/dist/protocols/usage.d.ts +18 -0
- package/dist/protocols/usage.d.ts.map +1 -1
- package/dist/protocols/usage.js +87 -23
- package/dist/protocols/usage.js.map +1 -1
- package/package.json +1 -1
- package/src/client.ts +9 -2
- package/src/component/queries.ts +24 -1
- package/src/model-call/index.ts +100 -21
- package/src/protocols/checkpoint.ts +12 -12
- package/src/protocols/types.ts +1 -0
- package/src/protocols/usage.ts +91 -32
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.3.1
|
|
4
|
+
|
|
5
|
+
- `fromOpenRouterSpan` adds a BYOK call's `byokInferenceUsageCost` to OpenRouter's charge, so `cost.total` is the call's inference cost instead of OpenRouter's fee alone. A BYOK span without that cost now has `cost.kind: "unknown"`. The structural `OpenRouterSpanInput` accepts `isByok` and `byokInferenceUsageCost`.
|
|
6
|
+
- Native plugin/exporter source, native reported version (0.2.0), capture schema and ABI are unchanged. Updating the npm package does not require a native host upgrade.
|
|
7
|
+
|
|
8
|
+
## 0.3.0
|
|
9
|
+
|
|
10
|
+
- `ModelCallV1` contract change: native CLIProxy calls now carry a derived `providerName`, which was always absent for them before. New optional fields are `providerProvenance` (`observed`, `derived_from_wire_format`, `derived_from_model` or `unavailable`), `costProvenance` (mirrors `cost.kind`) and `cacheCreationInputTokens`. Anthropic Messages `inputTokens` now counts an absent cache read or write as 0 instead of leaving input unknown, and usage measurements name `client_protocol_usage_v2`. Code that constructs `ModelCallV1` needs no new fields.
|
|
11
|
+
- `providerIdentity` uses the first rule that applies: a provider the recording names; the after-auth wire format through the exported `PROVIDER_BY_WIRE_FORMAT` table, which names an API family rather than a vendor account; then a guess from the requested model through `PROVIDER_BY_MODEL_PREFIX`, which also covers an absent or unmapped wire format. `fromOpenRouterSpan` marks OpenRouter's provider `observed`.
|
|
12
|
+
- Cost is never estimated: native calls stay `unknown`, and the OpenRouter adapter keeps `proxy_reported`.
|
|
13
|
+
- `cacheCreationInputTokens` comes from Anthropic `cache_creation_input_tokens` and the Responses and Chat cache-write details, which are also kept as raw usage measurements. One table states the normalization rule; `totalTokens` stays reported-only. The structural `OpenRouterSpanInput` accepts `cacheCreationInputTokens`.
|
|
14
|
+
- For summaries projected before 0.3.0, reads derive provider identity and cost provenance, keep any stored provider name as `observed`, and apply the current token rule to their final native counts. Stored rows are not rewritten.
|
|
15
|
+
- Native plugin/exporter source, native reported version (0.2.0), capture schema and ABI are unchanged. Updating the npm package does not require a native host upgrade.
|
|
16
|
+
|
|
3
17
|
## 0.2.2
|
|
4
18
|
|
|
5
19
|
- Recognize valid Responses keepalive control frames without downgrading otherwise complete capture projection and terminal usage. Malformed sequence numbers and unrelated unknown or malformed events remain diagnostic.
|
package/README.md
CHANGED
|
@@ -27,12 +27,47 @@ The receiver accepts `CaptureSegmentV1` from the `/capture` export: immutable ND
|
|
|
27
27
|
- `getCall` reads one bounded record; `pageEventSegments` pages private references. `resolveCallBlob` requires membership in the host-authorized call manifest and checks size/hash while streaming.
|
|
28
28
|
- Raw admission and projection have separate sequence watermarks. Missing segments stop projection; invalid protocol data and missing usage remain explicit. Boot health retains loss counters and labels incomplete prior-boot calls unknown.
|
|
29
29
|
- `ModelCallV1` is the common read contract. `fromOpenRouterSpan` is a structural adapter with no runtime dependency on the OpenRouter component. `fromLegacyCliproxySpan` labels historical rows distinctly.
|
|
30
|
-
- Gateway identity is known.
|
|
30
|
+
- Gateway identity is known. Provider identity is derived with explicit provenance (see below), attempt detail is unavailable, and cost is never estimated. Pre-hook capture is unavailable; previews are not enrolled.
|
|
31
31
|
|
|
32
32
|
For `capturePolicy: hook-body-v1`, decode each observation body from base64 and verify `contentBytes`/`contentSha256` before presenting it. Keep callbacks separate for raw evidence; their bytes may be partial JSON or UTF-8. `request_after_auth` is executed-request evidence, not the original client request. `executionModel`, `executionProtocol`, `selectedAuthId` and `selectedAuthIndex` are exact stock fields, not inferred provider or attempt identities. Header collections and opaque auth metadata are excluded. Model payload content is unredacted and must remain private.
|
|
33
33
|
|
|
34
34
|
`projectCapturedPayloads` reconstructs selected-call content from bounded pages. Pass `stockHookChunks: true` only for the new hook-body policy; historical observations already contain canonical framing. Its 16 MiB replay limit is a read-operation bound, not a retention limit. Larger calls remain available through raw event pages. Summary checkpoints retain scalar state and private references for large unfinished frames; immutable segments retain text, reasoning, tools and native usage snapshots.
|
|
35
35
|
|
|
36
|
+
## Provider, tokens and cost
|
|
37
|
+
|
|
38
|
+
`providerIdentity` derives `providerName` and `providerProvenance` from one call's recorded facts, never from time or call order. The first rule that applies wins:
|
|
39
|
+
|
|
40
|
+
1. `observed`: the recording itself names the provider. Only the OpenRouter adapter sets this today, and reads keep any provider name an older summary stored. For CLIProxy calls, the only exact source would be the native plugin recording the selected auth's provider on `request.intercept_after`; that is a follow-up.
|
|
41
|
+
2. `derived_from_wire_format`: `executionProtocol`, the upstream wire format CLIProxy recorded after auth (its ToFormat), is in `PROVIDER_BY_WIRE_FORMAT`. `claude` maps to `anthropic`; `openai`, `openai-response` and `codex` to `openai`; `gemini`, `gemini-cli` and `antigravity` to `google`. This names the API family, not the vendor account: `claude` also reaches other Anthropic-compatible hosts, and CLIProxy uses `codex` for xAI and Meta as well.
|
|
42
|
+
3. `derived_from_model`: `PROVIDER_BY_MODEL_PREFIX` matches the requested model, including when the wire format is absent or unmapped (such as `interactions`). `claude-` maps to `anthropic`; `gpt-`, `o` plus a digit, and `codex` to `openai`; `gemini-` to `google`. CLIProxy can route any alias to any upstream, so this is only a guess.
|
|
43
|
+
4. `unavailable` when no rule applies.
|
|
44
|
+
|
|
45
|
+
The recordings in `fixtures/real` have no after-auth frames, so they derive `openai` from `gpt-5.6-luna` although their recorded upstream was a gateway.
|
|
46
|
+
|
|
47
|
+
Token fields use the OpenRouter names and unit (tokens per call): `inputTokens`, `outputTokens`, `totalTokens`, `reasoningTokens`, `cachedInputTokens` (cache reads) and `cacheCreationInputTokens` (cache writes). They come only from terminal client-protocol usage and are set only when that usage is final. The rule is one table in `src/protocols/usage.ts`:
|
|
48
|
+
|
|
49
|
+
- Input includes cache reads and writes. Anthropic reports `cache_read_input_tokens` and `cache_creation_input_tokens` apart from `input_tokens`, so its input is their sum. Anthropic and CLIProxy's translators omit a cache count when no cache is used, so an absent one counts as 0; `input_tokens` itself is required.
|
|
50
|
+
- `totalTokens` is the reported `total_tokens`. Anthropic Messages reports none, and this package never sums one.
|
|
51
|
+
- Cache reads: Anthropic `cache_read_input_tokens`, Responses `input_tokens_details.cached_tokens`, Chat `prompt_tokens_details.cached_tokens`.
|
|
52
|
+
- Cache writes: Anthropic `cache_creation_input_tokens` (its `cache_creation.ephemeral_*` split stays raw), Responses `input_tokens_details.cache_write_tokens` or `cache_creation_tokens`, Chat `prompt_tokens_details.cache_write_tokens`, `cached_creation_tokens` or `cache_creation_tokens`. The first reported alias wins.
|
|
53
|
+
- Reasoning: Anthropic `output_tokens_details.thinking_tokens`, Responses `output_tokens_details.reasoning_tokens`, Chat `completion_tokens_details.reasoning_tokens`.
|
|
54
|
+
|
|
55
|
+
Every reported native count also stays in `usage` as a `UsageMeasurement` with its `nativeField`, `finality` and `semanticsVersion: "client_protocol_usage_v2"`.
|
|
56
|
+
|
|
57
|
+
Cost is never estimated. Native calls keep `cost: { kind: "unknown" }` with `costProvenance: "unknown"`, because CLIProxy's client protocols report no price. `fromOpenRouterSpan` keeps OpenRouter's charge as a `proxy_reported` USD cost. On a BYOK call that charge is only OpenRouter's fee, so the adapter adds `byokInferenceUsageCost`, the inference billed to the caller's own provider key; a BYOK span without it has an `unknown` cost.
|
|
58
|
+
|
|
59
|
+
`providerProvenance` and `costProvenance` are optional in `ModelCallV1`. Summaries projected by 0.3.0 or later store them. For older summaries, `getCall` and `pageRecentSummaries` derive them from the facts those summaries recorded. The same reads apply the current token rule to an older summary's final native counts, which adds `cacheCreationInputTokens` and counts absent Messages cache counts as 0. Stored rows are not rewritten.
|
|
60
|
+
|
|
61
|
+
Projected summaries of the real recordings measure 1,783 to 2,934 bytes. A streamed Opus call with an after-auth frame, all ten correlations and every Anthropic usage count measures 3,771 bytes, under the 8 KiB summary cap. With every bounded string at its validator maximum a summary still reaches 9,583 bytes (10,253 before 0.3.0), so the cap is not a guarantee for adversarial metadata.
|
|
62
|
+
|
|
63
|
+
### Differences from the OpenRouter component
|
|
64
|
+
|
|
65
|
+
- The OpenRouter component stores costs as bare numbers with no currency; `fromOpenRouterSpan` labels them USD. CLIProxy records no cost.
|
|
66
|
+
- Provenance exists only in `ModelCallV1`. The OpenRouter component's own summaries carry neither provider nor cost provenance.
|
|
67
|
+
- OpenRouter's `providerName` is the upstream it routed to, as OpenRouter names it (for example `OpenAI`). CLIProxy's is a lowercase API family or model-name guess. It is not authoritative until the native plugin records the selected auth's provider.
|
|
68
|
+
- OpenRouter component summaries from 0.4.2 carry `cacheCreationInputTokens`, `isByok`, and `byokInferenceUsageCost`; the structural `OpenRouterSpanInput` accepts all three. Older summaries lack them, so their cache writes stay unset and a BYOK call's cost is its fee alone.
|
|
69
|
+
- OpenRouter summaries expose input, output and total tokens; its cached and reasoning counts are only on full spans (`exportFullSpan`).
|
|
70
|
+
|
|
36
71
|
## Parser provenance
|
|
37
72
|
|
|
38
73
|
The client-protocol assemblers and Responses regressions were adapted from Meshix commit `737ea929919f82921accaa4171d6abed5c85a1cb` (the reviewed #1371 stack). Synthetic log fixtures are extracted only in tests; this package does not ingest legacy text logs. Sanitized real recordings and their provenance live in `fixtures/real`.
|
package/dist/client.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx, FunctionArgs } from "convex/server";
|
|
2
2
|
import type { ComponentApi } from "./component/_generated/component.js";
|
|
3
3
|
import type { CaptureObservationV1 } from "./capture/index.js";
|
|
4
|
-
import type
|
|
4
|
+
import { type ModelCallV1 } from "./model-call/index.js";
|
|
5
5
|
import type { PrivateCaptureStorage } from "./content/index.js";
|
|
6
6
|
export * from "./model-call/index.js";
|
|
7
7
|
export { resolveCallBlob, type PrivateCaptureStorage } from "./content/index.js";
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EACf,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
package/dist/client.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MAX_ENVELOPE_BYTES, validateSegment, sha256 } from "./capture/index.js";
|
|
2
|
+
import { providerIdentity, } from "./model-call/index.js";
|
|
2
3
|
import { nanoTime, protocolForRoute, PARSER_VERSION } from "./protocols/index.js";
|
|
3
4
|
export * from "./model-call/index.js";
|
|
4
5
|
export { resolveCallBlob } from "./content/index.js";
|
|
@@ -27,6 +28,7 @@ export class CliproxyObservability {
|
|
|
27
28
|
}
|
|
28
29
|
}
|
|
29
30
|
export function initialCall(o, callId, receivedAt) {
|
|
31
|
+
const requestModel = o.requestedModel?.slice(0, 256);
|
|
30
32
|
return {
|
|
31
33
|
schemaVersion: 1,
|
|
32
34
|
source: "cliproxy",
|
|
@@ -42,7 +44,8 @@ export function initialCall(o, callId, receivedAt) {
|
|
|
42
44
|
executionId: o.requestId,
|
|
43
45
|
sourceTraceId: o.sourceTraceId,
|
|
44
46
|
traceId: o.correlation?.traceId,
|
|
45
|
-
requestModel
|
|
47
|
+
requestModel,
|
|
48
|
+
...providerIdentity({ requestModel }),
|
|
46
49
|
operation: o.route === "GET /v1/models"
|
|
47
50
|
? "discovery"
|
|
48
51
|
: o.route === "POST /v1/messages/count_tokens"
|
|
@@ -56,6 +59,7 @@ export function initialCall(o, callId, receivedAt) {
|
|
|
56
59
|
correlationConflicts: o.correlationConflicts ?? [],
|
|
57
60
|
usage: [],
|
|
58
61
|
cost: { kind: "unknown" },
|
|
62
|
+
costProvenance: "unknown",
|
|
59
63
|
attemptDetail: "unavailable",
|
|
60
64
|
capture: {
|
|
61
65
|
raw: "partial",
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/component/queries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../../src/component/queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAuD5E,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;UAgBlB,CAAC;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;UAS7B,CAAC;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;GAqB5B,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;GAsI9B,CAAC;AACH,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;GAgB7B,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;UAYxB,CAAC"}
|
|
@@ -1,7 +1,20 @@
|
|
|
1
|
+
import { providerIdentity } from "../model-call/index.js";
|
|
2
|
+
import { normalizeUsage } from "../protocols/usage.js";
|
|
1
3
|
import { v } from "convex/values";
|
|
2
4
|
import { query } from "./_generated/server.js";
|
|
3
5
|
async function summaryView(ctx, row) {
|
|
4
6
|
const summary = JSON.parse(row.summaryJson);
|
|
7
|
+
// Summaries projected before 0.3.0 lack these. Derive them from the facts they recorded,
|
|
8
|
+
// keeping any stored provider name as observed and applying the current token rule to
|
|
9
|
+
// their final native counts.
|
|
10
|
+
if (summary.providerProvenance === undefined) {
|
|
11
|
+
Object.assign(summary, providerIdentity({ ...summary, observedProvider: summary.providerName }));
|
|
12
|
+
summary.costProvenance = summary.cost.kind;
|
|
13
|
+
if (summary.capture.usage === "complete" &&
|
|
14
|
+
summary.clientProtocol !== undefined &&
|
|
15
|
+
summary.clientProtocol !== "unknown")
|
|
16
|
+
Object.assign(summary, normalizeUsage(summary.clientProtocol, new Map(summary.usage.map((measurement) => [measurement.nativeField, measurement.value]))));
|
|
17
|
+
}
|
|
5
18
|
if (summary.state === "in_progress" && row.terminalSequence === undefined) {
|
|
6
19
|
const source = await ctx.db
|
|
7
20
|
.query("sourceStatus")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/component/queries.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../src/component/queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,23 @@ export type PrivateContentReference = {
|
|
|
18
18
|
byteLength: number;
|
|
19
19
|
contentType: string;
|
|
20
20
|
};
|
|
21
|
+
/**
|
|
22
|
+
* Where `providerName` came from. Only `observed` is recorded identity. A wire format
|
|
23
|
+
* names an API family, not a vendor account; a model name is a guess.
|
|
24
|
+
*/
|
|
25
|
+
export type ProviderProvenance = "observed" | "derived_from_wire_format" | "derived_from_model" | "unavailable";
|
|
26
|
+
export type ModelCallCost = {
|
|
27
|
+
kind: "unknown";
|
|
28
|
+
} | {
|
|
29
|
+
kind: "provider_billed" | "proxy_reported";
|
|
30
|
+
currency: string;
|
|
31
|
+
total: string;
|
|
32
|
+
};
|
|
33
|
+
/** Who reported `cost`. Nothing estimates cost, so native CLIProxy calls stay `unknown`. */
|
|
34
|
+
export type CostProvenance = ModelCallCost["kind"];
|
|
35
|
+
/** Per-call token counts, named and counted as the OpenRouter component names them. */
|
|
36
|
+
export declare const TOKEN_FIELDS: readonly ["inputTokens", "outputTokens", "totalTokens", "reasoningTokens", "cachedInputTokens", "cacheCreationInputTokens"];
|
|
37
|
+
export type TokenField = (typeof TOKEN_FIELDS)[number];
|
|
21
38
|
export type ModelCallV1 = {
|
|
22
39
|
schemaVersion: 1;
|
|
23
40
|
source: ModelCallSource;
|
|
@@ -43,8 +60,11 @@ export type ModelCallV1 = {
|
|
|
43
60
|
executionModel?: string;
|
|
44
61
|
selectedAuthId?: string;
|
|
45
62
|
selectedAuthIndex?: string;
|
|
63
|
+
/** CLIProxy's upstream wire format (ToFormat) from the last after-auth event. */
|
|
46
64
|
executionProtocol?: string;
|
|
47
65
|
providerName?: string;
|
|
66
|
+
/** Stored from 0.3.0; reads derive it for older summaries. */
|
|
67
|
+
providerProvenance?: ProviderProvenance;
|
|
48
68
|
streamed?: boolean;
|
|
49
69
|
operation: "generation" | "token_count" | "discovery" | "unknown";
|
|
50
70
|
tokenCount?: number;
|
|
@@ -67,14 +87,11 @@ export type ModelCallV1 = {
|
|
|
67
87
|
totalTokens?: number;
|
|
68
88
|
reasoningTokens?: number;
|
|
69
89
|
cachedInputTokens?: number;
|
|
90
|
+
cacheCreationInputTokens?: number;
|
|
70
91
|
usage: UsageMeasurement[];
|
|
71
|
-
cost:
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
kind: "provider_billed" | "proxy_reported";
|
|
75
|
-
currency: string;
|
|
76
|
-
total: string;
|
|
77
|
-
};
|
|
92
|
+
cost: ModelCallCost;
|
|
93
|
+
/** Mirrors `cost.kind`. Stored from 0.3.0; reads derive it for older summaries. */
|
|
94
|
+
costProvenance?: CostProvenance;
|
|
78
95
|
attemptDetail: "unavailable";
|
|
79
96
|
capture: {
|
|
80
97
|
raw: EvidenceState;
|
|
@@ -95,12 +112,32 @@ export type ModelCallV1 = {
|
|
|
95
112
|
receivedAt: number;
|
|
96
113
|
};
|
|
97
114
|
export type ModelCallSummaryV1 = ModelCallV1;
|
|
115
|
+
/**
|
|
116
|
+
* CLIProxy upstream wire formats (the after-auth ToFormat), by API family. A format names
|
|
117
|
+
* the protocol CLIProxy speaks upstream, not the vendor account behind it: `claude` also
|
|
118
|
+
* reaches other Anthropic-compatible hosts, and CLIProxy uses `codex` for xAI and Meta too.
|
|
119
|
+
*/
|
|
120
|
+
export declare const PROVIDER_BY_WIRE_FORMAT: Readonly<Record<string, string>>;
|
|
121
|
+
/** Requested-model prefixes: a guess from the model name. */
|
|
122
|
+
export declare const PROVIDER_BY_MODEL_PREFIX: ReadonlyArray<readonly [RegExp, string]>;
|
|
123
|
+
/**
|
|
124
|
+
* Provider identity from one call's recorded facts, never from time or call order: an
|
|
125
|
+
* observed provider, else the wire format's API family, else a guess from the requested
|
|
126
|
+
* model. An absent or unmapped wire format falls back to the model rule.
|
|
127
|
+
*/
|
|
128
|
+
export declare function providerIdentity(facts: Pick<ModelCallV1, "requestModel" | "executionProtocol"> & {
|
|
129
|
+
/** A provider named by the recording itself, such as an OpenRouter span. */
|
|
130
|
+
observedProvider?: string;
|
|
131
|
+
}): Pick<ModelCallV1, "providerName" | "providerProvenance">;
|
|
98
132
|
/** Structural input: there is no runtime dependency on the OpenRouter component. */
|
|
99
133
|
export type OpenRouterSpanInput = {
|
|
100
134
|
_id: string;
|
|
101
135
|
receivedAt: number;
|
|
102
136
|
totalCost?: number;
|
|
103
137
|
openrouterUsageCost?: number;
|
|
138
|
+
isByok?: boolean;
|
|
139
|
+
/** What a BYOK call's inference cost on the caller's own provider key, as OpenRouter reports it. */
|
|
140
|
+
byokInferenceUsageCost?: number;
|
|
104
141
|
traceId?: string;
|
|
105
142
|
spanId?: string;
|
|
106
143
|
parentSpanId?: string;
|
|
@@ -126,6 +163,7 @@ export type OpenRouterSpanInput = {
|
|
|
126
163
|
totalTokens?: number;
|
|
127
164
|
reasoningTokens?: number;
|
|
128
165
|
cachedInputTokens?: number;
|
|
166
|
+
cacheCreationInputTokens?: number;
|
|
129
167
|
};
|
|
130
168
|
export declare function fromOpenRouterSpan(span: OpenRouterSpanInput): ModelCallV1;
|
|
131
169
|
export declare function fromLegacyCliproxySpan(span: OpenRouterSpanInput): ModelCallV1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model-call/index.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,YAAY,GAAG,iBAAiB,CAAC;AAC5E,MAAM,MAAM,cAAc,GACxB,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,UAAU,GAAG,aAAa,GAAG,SAAS,CAAC;AAC9F,MAAM,MAAM,aAAa,GAAG,UAAU,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,GAAG,aAAa,CAAC;AAC/F,MAAM,MAAM,gBAAgB,GAAG,OAAO,CACpC,MAAM,CACF,WAAW,GACX,OAAO,GACP,OAAO,GACP,SAAS,GACT,iBAAiB,GACjB,mBAAmB,GACnB,aAAa,GACb,QAAQ,GACR,QAAQ,GACR,WAAW,EACb,MAAM,CACP,CACF,CAAC;AACF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,iBAAiB,GAAG,iBAAiB,CAAC;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;IAC1C,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG;IACxB,aAAa,EAAE,CAAC,CAAC;IACjB,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,UAAU,GAAG,YAAY,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,YAAY,GAAG,aAAa,GAAG,WAAW,GAAG,SAAS,CAAC;IAClE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,oBAAoB,GAAG,WAAW,GAAG,kBAAkB,GAAG,SAAS,CAAC;IACrF,KAAK,EAAE,cAAc,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,EAAE,iBAAiB,GAAG,iBAAiB,GAAG,aAAa,CAAC;IACpE,WAAW,EAAE,gBAAgB,CAAC;IAC9B,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/model-call/index.ts"],"names":[],"mappings":"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"}
|
package/dist/model-call/index.js
CHANGED
|
@@ -1,3 +1,53 @@
|
|
|
1
|
+
/** Per-call token counts, named and counted as the OpenRouter component names them. */
|
|
2
|
+
export const TOKEN_FIELDS = [
|
|
3
|
+
"inputTokens",
|
|
4
|
+
"outputTokens",
|
|
5
|
+
"totalTokens",
|
|
6
|
+
"reasoningTokens",
|
|
7
|
+
"cachedInputTokens",
|
|
8
|
+
"cacheCreationInputTokens",
|
|
9
|
+
];
|
|
10
|
+
/**
|
|
11
|
+
* CLIProxy upstream wire formats (the after-auth ToFormat), by API family. A format names
|
|
12
|
+
* the protocol CLIProxy speaks upstream, not the vendor account behind it: `claude` also
|
|
13
|
+
* reaches other Anthropic-compatible hosts, and CLIProxy uses `codex` for xAI and Meta too.
|
|
14
|
+
*/
|
|
15
|
+
export const PROVIDER_BY_WIRE_FORMAT = {
|
|
16
|
+
claude: "anthropic",
|
|
17
|
+
openai: "openai",
|
|
18
|
+
"openai-response": "openai",
|
|
19
|
+
codex: "openai",
|
|
20
|
+
gemini: "google",
|
|
21
|
+
"gemini-cli": "google",
|
|
22
|
+
antigravity: "google",
|
|
23
|
+
};
|
|
24
|
+
/** Requested-model prefixes: a guess from the model name. */
|
|
25
|
+
export const PROVIDER_BY_MODEL_PREFIX = [
|
|
26
|
+
[/^claude-/, "anthropic"],
|
|
27
|
+
[/^gpt-/, "openai"],
|
|
28
|
+
[/^o\d/, "openai"],
|
|
29
|
+
[/^codex/, "openai"],
|
|
30
|
+
[/^gemini-/, "google"],
|
|
31
|
+
];
|
|
32
|
+
/**
|
|
33
|
+
* Provider identity from one call's recorded facts, never from time or call order: an
|
|
34
|
+
* observed provider, else the wire format's API family, else a guess from the requested
|
|
35
|
+
* model. An absent or unmapped wire format falls back to the model rule.
|
|
36
|
+
*/
|
|
37
|
+
export function providerIdentity(facts) {
|
|
38
|
+
if (facts.observedProvider)
|
|
39
|
+
return { providerName: facts.observedProvider, providerProvenance: "observed" };
|
|
40
|
+
if (facts.executionProtocol !== undefined &&
|
|
41
|
+
Object.hasOwn(PROVIDER_BY_WIRE_FORMAT, facts.executionProtocol))
|
|
42
|
+
return {
|
|
43
|
+
providerName: PROVIDER_BY_WIRE_FORMAT[facts.executionProtocol],
|
|
44
|
+
providerProvenance: "derived_from_wire_format",
|
|
45
|
+
};
|
|
46
|
+
const providerName = PROVIDER_BY_MODEL_PREFIX.find(([prefix]) => prefix.test(facts.requestModel ?? ""))?.[1];
|
|
47
|
+
return providerName
|
|
48
|
+
? { providerName, providerProvenance: "derived_from_model" }
|
|
49
|
+
: { providerName: undefined, providerProvenance: "unavailable" };
|
|
50
|
+
}
|
|
1
51
|
export function fromOpenRouterSpan(span) {
|
|
2
52
|
const correlation = {};
|
|
3
53
|
for (const field of [
|
|
@@ -11,13 +61,7 @@ export function fromOpenRouterSpan(span) {
|
|
|
11
61
|
correlation[field] = span[field];
|
|
12
62
|
}
|
|
13
63
|
const usage = [];
|
|
14
|
-
for (const field of
|
|
15
|
-
"inputTokens",
|
|
16
|
-
"outputTokens",
|
|
17
|
-
"totalTokens",
|
|
18
|
-
"reasoningTokens",
|
|
19
|
-
"cachedInputTokens",
|
|
20
|
-
]) {
|
|
64
|
+
for (const field of TOKEN_FIELDS) {
|
|
21
65
|
const value = span[field];
|
|
22
66
|
if (value !== undefined && Number.isSafeInteger(value) && value >= 0)
|
|
23
67
|
usage.push({
|
|
@@ -30,6 +74,14 @@ export function fromOpenRouterSpan(span) {
|
|
|
30
74
|
semanticsVersion: "stored_openrouter_span_v1",
|
|
31
75
|
});
|
|
32
76
|
}
|
|
77
|
+
const isCost = (value) => typeof value === "number" && Number.isFinite(value) && value >= 0;
|
|
78
|
+
const reported = span.totalCost ?? span.openrouterUsageCost;
|
|
79
|
+
// A BYOK charge is only OpenRouter's fee: the provider bills the inference to the caller's own
|
|
80
|
+
// key. Without that inference cost the call's cost is unknown, not the fee alone.
|
|
81
|
+
const inference = span.isByok === true ? span.byokInferenceUsageCost : 0;
|
|
82
|
+
const cost = isCost(reported) && isCost(inference)
|
|
83
|
+
? { kind: "proxy_reported", currency: "USD", total: String(reported + inference) }
|
|
84
|
+
: { kind: "unknown" };
|
|
33
85
|
return {
|
|
34
86
|
schemaVersion: 1,
|
|
35
87
|
source: "openrouter",
|
|
@@ -42,7 +94,7 @@ export function fromOpenRouterSpan(span) {
|
|
|
42
94
|
parentSpanId: span.parentSpanId,
|
|
43
95
|
requestModel: span.requestModel,
|
|
44
96
|
responseModel: span.responseModel,
|
|
45
|
-
|
|
97
|
+
...providerIdentity({ observedProvider: span.providerName }),
|
|
46
98
|
streamed: span.streamed,
|
|
47
99
|
operation: "generation",
|
|
48
100
|
state: "unknown",
|
|
@@ -57,16 +109,10 @@ export function fromOpenRouterSpan(span) {
|
|
|
57
109
|
totalTokens: span.totalTokens,
|
|
58
110
|
reasoningTokens: span.reasoningTokens,
|
|
59
111
|
cachedInputTokens: span.cachedInputTokens,
|
|
112
|
+
cacheCreationInputTokens: span.cacheCreationInputTokens,
|
|
60
113
|
usage,
|
|
61
|
-
cost
|
|
62
|
-
|
|
63
|
-
(span.totalCost ?? span.openrouterUsageCost) >= 0
|
|
64
|
-
? {
|
|
65
|
-
kind: "proxy_reported",
|
|
66
|
-
currency: "USD",
|
|
67
|
-
total: String(span.totalCost ?? span.openrouterUsageCost),
|
|
68
|
-
}
|
|
69
|
-
: { kind: "unknown" },
|
|
114
|
+
cost,
|
|
115
|
+
costProvenance: cost.kind,
|
|
70
116
|
attemptDetail: "unavailable",
|
|
71
117
|
capture: {
|
|
72
118
|
raw: "unavailable",
|
|
@@ -89,8 +135,10 @@ export function fromLegacyCliproxySpan(span) {
|
|
|
89
135
|
callId: `cliproxy_legacy:${span._id}`,
|
|
90
136
|
gateway: "cliproxy",
|
|
91
137
|
providerName: undefined,
|
|
138
|
+
providerProvenance: "unavailable",
|
|
92
139
|
timingSource: "unavailable",
|
|
93
140
|
cost: { kind: "unknown" },
|
|
141
|
+
costProvenance: "unknown",
|
|
94
142
|
};
|
|
95
143
|
}
|
|
96
144
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model-call/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/model-call/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ModelCallV1, type PrivateContentReference } from "../model-call/index.js";
|
|
2
2
|
import type { CaptureObservationV1 } from "../capture/index.js";
|
|
3
3
|
import { type SSECheckpoint } from "./framing.js";
|
|
4
4
|
import type { RecordValue } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../src/protocols/checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../src/protocols/checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,WAAW,EAEhB,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,EAAa,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7D,OAAO,KAAK,EAAsB,WAAW,EAAE,MAAM,YAAY,CAAC;AAClE,qFAAqF;AACrF,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,OAAO,CAAC,EAAE,uBAAuB,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AA8JF,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,KAAK,EAAE,oBAAoB,EAC3B,CAAC,EAAE,oBAAoB,GACtB,IAAI,CAyLN"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { providerIdentity, TOKEN_FIELDS, } from "../model-call/index.js";
|
|
1
2
|
import { decodeBody } from "../capture/index.js";
|
|
2
3
|
import { assembleResponsesStream } from "./responses.js";
|
|
3
4
|
import { SSEReader } from "./framing.js";
|
|
@@ -30,6 +31,9 @@ function boundedUsage(value) {
|
|
|
30
31
|
const safe = {};
|
|
31
32
|
for (const name of [
|
|
32
33
|
"cached_tokens",
|
|
34
|
+
"cache_write_tokens",
|
|
35
|
+
"cached_creation_tokens",
|
|
36
|
+
"cache_creation_tokens",
|
|
33
37
|
"reasoning_tokens",
|
|
34
38
|
"thinking_tokens",
|
|
35
39
|
"ephemeral_5m_input_tokens",
|
|
@@ -190,6 +194,8 @@ export function applyObservation(call, state, o) {
|
|
|
190
194
|
state.invalid = true;
|
|
191
195
|
}
|
|
192
196
|
}
|
|
197
|
+
// Derived read fields: reads fill them only for summaries projected before 0.3.0.
|
|
198
|
+
Object.assign(call, providerIdentity(call), { costProvenance: call.cost.kind });
|
|
193
199
|
if (o.kind === "response" || o.kind === "stream_chunk" || o.kind === "completion") {
|
|
194
200
|
if (call.timeToFirstByteMs === undefined && (o.observedBodyBytes ?? body.length) > 0)
|
|
195
201
|
call.timeToFirstByteMs = o.offsetNs / 1e6;
|
|
@@ -313,13 +319,7 @@ export function applyObservation(call, state, o) {
|
|
|
313
319
|
}
|
|
314
320
|
}
|
|
315
321
|
call.usage = measurements;
|
|
316
|
-
for (const field of
|
|
317
|
-
"inputTokens",
|
|
318
|
-
"outputTokens",
|
|
319
|
-
"totalTokens",
|
|
320
|
-
"reasoningTokens",
|
|
321
|
-
"cachedInputTokens",
|
|
322
|
-
])
|
|
322
|
+
for (const field of TOKEN_FIELDS)
|
|
323
323
|
call[field] = final ? projection.scalars[field] : undefined;
|
|
324
324
|
}
|
|
325
325
|
call.capture.lastObservedAt = o.observedAt;
|