@ponbac/token-ledger 0.6.0 → 0.6.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/README.md +8 -2
- package/dist/main.js +63 -18
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -716,9 +716,15 @@ Claude Code deletes transcripts after 30 days by default, so keep `--since` with
|
|
|
716
716
|
the last 30 days; `sync` warns when it is not. Once uploaded, the server keeps the
|
|
717
717
|
long-term record.
|
|
718
718
|
|
|
719
|
+
Each upload carries the time its scan began, and the server refuses one older than the
|
|
720
|
+
last it stored from this machine, so a slow sync cannot overwrite a newer one. The newer
|
|
721
|
+
upload may cover another window or tools, so `sync` then scans the same window again and
|
|
722
|
+
sends it once more; if that is refused too, it says so and exits `7`.
|
|
723
|
+
|
|
719
724
|
Exit codes: `0` synced, `1` invalid input or settings, `2` refused by `--strict`,
|
|
720
725
|
`3` server unreachable or temporarily failing (retry later), `4` token or machine
|
|
721
|
-
refused, `5` unsupported payload version (upgrade token-ledger), `6` payload rejected
|
|
726
|
+
refused, `5` unsupported payload version (upgrade token-ledger), `6` payload rejected,
|
|
727
|
+
`7` superseded twice by newer syncs from this machine (run it again).
|
|
722
728
|
|
|
723
729
|
## Accuracy and limitations
|
|
724
730
|
|
|
@@ -767,7 +773,7 @@ For manual publication:
|
|
|
767
773
|
1. Log in with `npm login` using an account with publish access to `@ponbac/token-ledger`.
|
|
768
774
|
2. Run `bun run check`. The CLI test packs the package, installs it offline outside
|
|
769
775
|
the repository with lifecycle scripts disabled, and exercises the installed CLI.
|
|
770
|
-
3. Run `bun run pack` to create `dist/ponbac-token-ledger-0.6.
|
|
776
|
+
3. Run `bun run pack` to create `dist/ponbac-token-ledger-0.6.1.tgz` (filename follows version).
|
|
771
777
|
4. Inspect `npm publish ./dist/npm --dry-run`.
|
|
772
778
|
5. Publish with `npm publish ./dist/npm --access public`; complete npm's authentication
|
|
773
779
|
prompt if requested.
|
package/dist/main.js
CHANGED
|
@@ -34774,9 +34774,9 @@ function copilotParser(file2, chatgptRequests = new Set) {
|
|
|
34774
34774
|
const ms = span2.endTime[0] * 1000 + Math.floor(span2.endTime[1] / 1e6);
|
|
34775
34775
|
if (!Number.isFinite(new Date(ms).getTime()))
|
|
34776
34776
|
return skipped;
|
|
34777
|
-
const
|
|
34777
|
+
const record3 = {
|
|
34778
34778
|
provider: "copilot",
|
|
34779
|
-
id:
|
|
34779
|
+
id: `${span2.traceId}:${span2.spanId}`,
|
|
34780
34780
|
session: a["gen_ai.conversation.id"] ?? a["session.id"] ?? file2,
|
|
34781
34781
|
timestamp: ms,
|
|
34782
34782
|
model: a["gen_ai.response.model"] ?? a["gen_ai.request.model"] ?? "unknown",
|
|
@@ -34784,14 +34784,33 @@ function copilotParser(file2, chatgptRequests = new Set) {
|
|
|
34784
34784
|
repository: repositoryReference(a),
|
|
34785
34785
|
tokens: { input: input - cacheRead - cacheWrite, output, cacheRead, cacheWrite }
|
|
34786
34786
|
};
|
|
34787
|
-
|
|
34788
|
-
|
|
34789
|
-
|
|
34787
|
+
candidates.push({
|
|
34788
|
+
record: record3,
|
|
34789
|
+
spanKey,
|
|
34790
|
+
responseId: a["gen_ai.response.id"],
|
|
34791
|
+
isSpan: exportedSpan !== null
|
|
34792
|
+
});
|
|
34790
34793
|
return empty14;
|
|
34791
34794
|
},
|
|
34792
34795
|
finish() {
|
|
34796
|
+
const eventResponses = new Map;
|
|
34797
|
+
for (const { spanKey, responseId, isSpan } of candidates)
|
|
34798
|
+
if (!isSpan && spanKey !== undefined && responseId !== undefined)
|
|
34799
|
+
eventResponses.set(spanKey, (eventResponses.get(spanKey) ?? new Set).add(responseId));
|
|
34800
|
+
const identified = candidates.map((candidate) => {
|
|
34801
|
+
const shared = candidate.isSpan && candidate.responseId === undefined && candidate.spanKey !== undefined ? eventResponses.get(candidate.spanKey) : undefined;
|
|
34802
|
+
const responseId = shared?.size === 1 ? [...shared][0] : candidate.responseId;
|
|
34803
|
+
if (responseId === undefined)
|
|
34804
|
+
return candidate;
|
|
34805
|
+
const record3 = { ...candidate.record, id: `response:${responseId}` };
|
|
34806
|
+
return {
|
|
34807
|
+
...candidate,
|
|
34808
|
+
responseId,
|
|
34809
|
+
record: chatgptRequests.has(responseId) ? { ...record3, billingProvider: "codex" } : record3
|
|
34810
|
+
};
|
|
34811
|
+
});
|
|
34793
34812
|
const preferred = new Map;
|
|
34794
|
-
for (const candidate of
|
|
34813
|
+
for (const candidate of identified) {
|
|
34795
34814
|
let repository = candidate.record.repository;
|
|
34796
34815
|
let key = candidate.spanKey;
|
|
34797
34816
|
const visited = new Set;
|
|
@@ -34816,7 +34835,7 @@ function copilotParser(file2, chatgptRequests = new Set) {
|
|
|
34816
34835
|
});
|
|
34817
34836
|
}
|
|
34818
34837
|
}
|
|
34819
|
-
const records =
|
|
34838
|
+
const records = identified.map((candidate) => preferred.get(candidate.record.id)?.record ?? candidate.record);
|
|
34820
34839
|
candidates.length = 0;
|
|
34821
34840
|
spans.clear();
|
|
34822
34841
|
return { ...empty14, records, warnings: records.length > 0 ? [warning] : [] };
|
|
@@ -35077,7 +35096,7 @@ var SyncBucket = exports_Schema.Struct({
|
|
|
35077
35096
|
records: exports_Schema.Int.check(exports_Schema.isGreaterThan(0)),
|
|
35078
35097
|
estimatedCostUsd: exports_Schema.NullOr(Cost),
|
|
35079
35098
|
unpricedRecords: exports_Schema.Natural
|
|
35080
|
-
}).check(exports_Schema.makeFilter((bucket) => bucket.billingProvider !== bucket.provider && bucket.unpricedRecords <= bucket.records && bucket.estimatedCostUsd === null === bucket.unpricedRecords
|
|
35099
|
+
}).check(exports_Schema.makeFilter((bucket) => bucket.billingProvider !== bucket.provider && bucket.unpricedRecords <= bucket.records && bucket.estimatedCostUsd === null === (bucket.unpricedRecords === bucket.records)));
|
|
35081
35100
|
var SyncCoverage = exports_Schema.Struct({
|
|
35082
35101
|
provider: Provider,
|
|
35083
35102
|
status: Coverage.fields.status,
|
|
@@ -35096,8 +35115,16 @@ var ProviderHint = exports_Schema.Struct({
|
|
|
35096
35115
|
hourStart: UtcHour,
|
|
35097
35116
|
plan: NonEmptyText
|
|
35098
35117
|
});
|
|
35118
|
+
function partlyPriced(bucket) {
|
|
35119
|
+
return bucket.unpricedRecords > 0 && bucket.unpricedRecords < bucket.records;
|
|
35120
|
+
}
|
|
35121
|
+
function payloadVersion(buckets) {
|
|
35122
|
+
if (buckets.some(partlyPriced))
|
|
35123
|
+
return 3;
|
|
35124
|
+
return buckets.some((bucket) => bucket.billingProvider !== undefined) ? 2 : 1;
|
|
35125
|
+
}
|
|
35099
35126
|
var SyncPayload = exports_Schema.Struct({
|
|
35100
|
-
version: exports_Schema.Literals([1, 2]),
|
|
35127
|
+
version: exports_Schema.Literals([1, 2, 3]),
|
|
35101
35128
|
machine: SyncMachine,
|
|
35102
35129
|
clientVersion: NonEmptyText,
|
|
35103
35130
|
timeZone: NonEmptyText,
|
|
@@ -35111,15 +35138,18 @@ var SyncPayload = exports_Schema.Struct({
|
|
|
35111
35138
|
}),
|
|
35112
35139
|
buckets: exports_Schema.Array(SyncBucket),
|
|
35113
35140
|
coverage: exports_Schema.Array(SyncCoverage),
|
|
35114
|
-
providerHints: exports_Schema.optionalKey(exports_Schema.Array(ProviderHint))
|
|
35115
|
-
|
|
35141
|
+
providerHints: exports_Schema.optionalKey(exports_Schema.Array(ProviderHint)),
|
|
35142
|
+
snapshotAt: exports_Schema.optionalKey(UtcInstant)
|
|
35143
|
+
}).check(exports_Schema.makeFilter((payload) => (payload.version >= 2 || payload.buckets.every((bucket) => bucket.billingProvider === undefined)) && (payload.version >= 3 || !payload.buckets.some(partlyPriced)) && distinct(payload.buckets, (bucket) => JSON.stringify([
|
|
35116
35144
|
bucket.hourStart,
|
|
35117
35145
|
bucket.sessionKey,
|
|
35118
35146
|
bucket.project,
|
|
35119
35147
|
bucket.provider,
|
|
35120
35148
|
bucket.billingProvider ?? null,
|
|
35121
35149
|
bucket.model
|
|
35122
|
-
])) && distinct(payload.coverage, (entry) => entry.provider) && distinct(payload.providerHints ?? [], (hint) => JSON.stringify([hint.provider, hint.hourStart, hint.plan])), {
|
|
35150
|
+
])) && distinct(payload.coverage, (entry) => entry.provider) && distinct(payload.providerHints ?? [], (hint) => JSON.stringify([hint.provider, hint.hourStart, hint.plan])), {
|
|
35151
|
+
expected: "unique bucket keys, coverage providers, and plan hints, and a version carrying every bucket"
|
|
35152
|
+
}), exports_Schema.makeFilter((payload) => {
|
|
35123
35153
|
const replaced = replacedProviders(payload.coverage);
|
|
35124
35154
|
return [...payload.buckets, ...payload.providerHints ?? []].every((entry) => replaced.has(entry.provider) && entry.hourStart >= payload.window.start && entry.hourStart < payload.window.end);
|
|
35125
35155
|
}));
|
|
@@ -35171,7 +35201,7 @@ function sessionBuckets(pricing) {
|
|
|
35171
35201
|
model,
|
|
35172
35202
|
tokens: usage.tokens,
|
|
35173
35203
|
records: usage.records,
|
|
35174
|
-
estimatedCostUsd: usage.
|
|
35204
|
+
estimatedCostUsd: usage.unpricedRecords === usage.records ? null : usage.pricedCostUsd,
|
|
35175
35205
|
unpricedRecords: usage.unpricedRecords
|
|
35176
35206
|
};
|
|
35177
35207
|
return record3.billingProvider === undefined ? bucket : { ...bucket, billingProvider: record3.billingProvider };
|
|
@@ -35409,6 +35439,7 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
|
|
|
35409
35439
|
const buckets = sessionBuckets(request3.pricing);
|
|
35410
35440
|
const hints = planHints();
|
|
35411
35441
|
let earliest = requested.start;
|
|
35442
|
+
const snapshotAt = yield* exports_Clock.currentTimeMillis;
|
|
35412
35443
|
const coverage = yield* scan2(request3, from, (timestamp2) => timestamp2 >= from && timestamp2 < requested.end ? timestamp2 : undefined, (record3, attribution, timestamp2) => {
|
|
35413
35444
|
earliest = Math.min(earliest, timestamp2);
|
|
35414
35445
|
buckets.add(record3, attribution.shareable ? attribution.project : unattributed);
|
|
@@ -35422,7 +35453,7 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
|
|
|
35422
35453
|
const replaced = replacedProviders(summary);
|
|
35423
35454
|
const uploadedBuckets = buckets.finish().filter((bucket) => replaced.has(bucket.provider));
|
|
35424
35455
|
const payload = yield* SyncPayload.makeEffect({
|
|
35425
|
-
version: uploadedBuckets
|
|
35456
|
+
version: payloadVersion(uploadedBuckets),
|
|
35426
35457
|
machine: client.machine,
|
|
35427
35458
|
clientVersion: client.version,
|
|
35428
35459
|
timeZone: request3.timeZone.id,
|
|
@@ -35439,7 +35470,8 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
|
|
|
35439
35470
|
},
|
|
35440
35471
|
buckets: uploadedBuckets,
|
|
35441
35472
|
coverage: summary,
|
|
35442
|
-
providerHints: hints.finish().filter((hint) => replaced.has(hint.provider))
|
|
35473
|
+
providerHints: hints.finish().filter((hint) => replaced.has(hint.provider)),
|
|
35474
|
+
snapshotAt: new Date(snapshotAt).toISOString()
|
|
35443
35475
|
}).pipe(exports_Effect.mapError(() => new InvalidRequest({
|
|
35444
35476
|
message: "Report data must satisfy the sync payload contract."
|
|
35445
35477
|
})));
|
|
@@ -42763,7 +42795,7 @@ var runWith2 = (command, config) => {
|
|
|
42763
42795
|
// packages/cli/package.json
|
|
42764
42796
|
var package_default = {
|
|
42765
42797
|
name: "@ponbac/token-ledger",
|
|
42766
|
-
version: "0.6.
|
|
42798
|
+
version: "0.6.1",
|
|
42767
42799
|
private: true,
|
|
42768
42800
|
type: "module",
|
|
42769
42801
|
bin: {
|
|
@@ -45665,7 +45697,7 @@ function syncSummary(payload, request3, storedBuckets) {
|
|
|
45665
45697
|
const dollars = new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" });
|
|
45666
45698
|
const sessions = new Set(payload.buckets.map((bucket) => bucket.sessionKey)).size;
|
|
45667
45699
|
const cost = payload.buckets.reduce((sum3, bucket) => sum3 + (bucket.estimatedCostUsd ?? 0), 0);
|
|
45668
|
-
const unknown2 = payload.buckets.some((bucket) => bucket.
|
|
45700
|
+
const unknown2 = payload.buckets.some((bucket) => bucket.unpricedRecords > 0);
|
|
45669
45701
|
return [
|
|
45670
45702
|
`Synced ${terminalText(payload.machine.label)} · ${request3.since} through ${request3.until} (${payload.timeZone})`,
|
|
45671
45703
|
[
|
|
@@ -45696,6 +45728,11 @@ class SyncUnauthorized extends exports_Schema.TaggedError()("SyncUnauthorized",
|
|
|
45696
45728
|
class SyncUnsupportedVersion extends exports_Schema.TaggedError()("SyncUnsupportedVersion", { message: exports_Schema.String }) {
|
|
45697
45729
|
}
|
|
45698
45730
|
|
|
45731
|
+
class SyncSuperseded extends exports_Schema.TaggedError()("SyncSuperseded", {
|
|
45732
|
+
message: exports_Schema.String
|
|
45733
|
+
}) {
|
|
45734
|
+
}
|
|
45735
|
+
|
|
45699
45736
|
class SyncRejected extends exports_Schema.TaggedError()("SyncRejected", {
|
|
45700
45737
|
status: exports_Schema.Number,
|
|
45701
45738
|
message: exports_Schema.String
|
|
@@ -45728,6 +45765,8 @@ var readResponse = exports_Effect.fn("Sync.readResponse")(function* (response, v
|
|
|
45728
45765
|
}))), exports_Match.when(403, () => exports_Effect.fail(new SyncUnauthorized({
|
|
45729
45766
|
status,
|
|
45730
45767
|
message: "This API token may not upload for this machine ID."
|
|
45768
|
+
}))), exports_Match.when(409, () => exports_Effect.fail(new SyncSuperseded({
|
|
45769
|
+
message: "Not stored: superseded by a newer sync from this machine. Run sync again to send this window; if every sync says this, check this machine's clock."
|
|
45731
45770
|
}))), exports_Match.when(422, () => exports_HttpClientResponse.schemaBodyJson(VersionRejection)(response).pipe(exports_Effect.mapError(() => new SyncRejected({ status, message: `The server rejected the upload (${status}).` })), exports_Effect.flatMap((rejection) => exports_Effect.fail(rejection.supportedVersions.includes(version) ? new SyncRejected({ status, message: `The server rejected the upload (${status}).` }) : new SyncUnsupportedVersion({
|
|
45732
45771
|
message: `The server accepts payload versions ${rejection.supportedVersions.join(", ") || "none"}, not ${version}; update Toki or use a compatible token-ledger version.`
|
|
45733
45772
|
}))))), exports_Match.orElse(() => exports_Effect.fail(new SyncRejected({ status, message: `The server rejected the upload (${status}).` }))));
|
|
@@ -45947,12 +45986,18 @@ var sync6 = exports_Command.make("sync", {
|
|
|
45947
45986
|
let result6 = still ? exports_Option.some({ sent: first, outcome: yield* send(first.payload) }) : yield* usual("This machine has uploaded since it was asked about.");
|
|
45948
45987
|
if (whole && exports_Option.isSome(result6) && exports_Result.isFailure(result6.value.outcome) && exports_Match.value(result6.value.outcome.failure).pipe(exports_Match.tag("SyncRejected", () => still), exports_Match.orElse(() => false)))
|
|
45949
45988
|
result6 = yield* usual(result6.value.outcome.failure.message);
|
|
45989
|
+
if (exports_Option.isSome(result6) && exports_Result.isFailure(result6.value.outcome) && exports_Predicate.isTagged(result6.value.outcome.failure, "SyncSuperseded")) {
|
|
45990
|
+
const { since } = result6.value.sent;
|
|
45991
|
+
yield* exports_Console.error(`A newer sync from this machine reached the server first; scanning ${since} through ${request3.until} again.`);
|
|
45992
|
+
const payload = yield* ledger.syncPayload({ ...request3, since }, client, exports_Console.error);
|
|
45993
|
+
result6 = (yield* examine(payload)) && flags.strict ? exports_Option.none() : exports_Option.some({ sent: { payload, since }, outcome: yield* send(payload) });
|
|
45994
|
+
}
|
|
45950
45995
|
if (exports_Option.isNone(result6))
|
|
45951
45996
|
return yield* refused;
|
|
45952
45997
|
const { sent, outcome } = result6.value;
|
|
45953
45998
|
if (exports_Result.isFailure(outcome)) {
|
|
45954
45999
|
yield* exports_Console.error(outcome.failure.message);
|
|
45955
|
-
process.exitCode = exports_Match.value(outcome.failure).pipe(exports_Match.tag("SyncUnreachable", () => 3), exports_Match.tag("SyncUnauthorized", () => 4), exports_Match.tag("SyncUnsupportedVersion", () => 5), exports_Match.tag("SyncRejected", () => 6), exports_Match.exhaustive);
|
|
46000
|
+
process.exitCode = exports_Match.value(outcome.failure).pipe(exports_Match.tag("SyncUnreachable", () => 3), exports_Match.tag("SyncUnauthorized", () => 4), exports_Match.tag("SyncUnsupportedVersion", () => 5), exports_Match.tag("SyncRejected", () => 6), exports_Match.tag("SyncSuperseded", () => 7), exports_Match.exhaustive);
|
|
45956
46001
|
return;
|
|
45957
46002
|
}
|
|
45958
46003
|
yield* exports_Console.log(syncSummary(sent.payload, { ...request3, since: sent.since }, outcome.success));
|