@ponbac/token-ledger 0.6.0 → 0.7.0

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.
Files changed (3) hide show
  1. package/README.md +10 -2
  2. package/dist/main.js +85 -26
  3. package/package.json +1 -1
package/README.md CHANGED
@@ -455,6 +455,8 @@ Copilot requests routed through a ChatGPT OAuth proxy can use
455
455
  [local billing hints](docs/billing-hints.md). On Windows the proxy appends metadata to
456
456
  `%LOCALAPPDATA%\token-ledger\billing-hints\chatgpt-proxy.jsonl`; no path configuration
457
457
  is needed. Usage stays attributed to Copilot, with ChatGPT/Codex as its subscription payer.
458
+ A hint can also name the request's repository, for custom endpoints whose Copilot
459
+ telemetry has none.
458
460
 
459
461
  `sync` uploads this machine's usage to a [toki2](https://github.com/ponbac/toki2)
460
462
  server, which combines every developer's machines for team reporting and billing.
@@ -716,9 +718,15 @@ Claude Code deletes transcripts after 30 days by default, so keep `--since` with
716
718
  the last 30 days; `sync` warns when it is not. Once uploaded, the server keeps the
717
719
  long-term record.
718
720
 
721
+ Each upload carries the time its scan began, and the server refuses one older than the
722
+ last it stored from this machine, so a slow sync cannot overwrite a newer one. The newer
723
+ upload may cover another window or tools, so `sync` then scans the same window again and
724
+ sends it once more; if that is refused too, it says so and exits `7`.
725
+
719
726
  Exit codes: `0` synced, `1` invalid input or settings, `2` refused by `--strict`,
720
727
  `3` server unreachable or temporarily failing (retry later), `4` token or machine
721
- refused, `5` unsupported payload version (upgrade token-ledger), `6` payload rejected.
728
+ refused, `5` unsupported payload version (upgrade token-ledger), `6` payload rejected,
729
+ `7` superseded twice by newer syncs from this machine (run it again).
722
730
 
723
731
  ## Accuracy and limitations
724
732
 
@@ -767,7 +775,7 @@ For manual publication:
767
775
  1. Log in with `npm login` using an account with publish access to `@ponbac/token-ledger`.
768
776
  2. Run `bun run check`. The CLI test packs the package, installs it offline outside
769
777
  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.0.tgz` (filename follows version).
778
+ 3. Run `bun run pack` to create `dist/ponbac-token-ledger-0.7.0.tgz` (filename follows version).
771
779
  4. Inspect `npm publish ./dist/npm --dry-run`.
772
780
  5. Publish with `npm publish ./dist/npm --access public`; complete npm's authentication
773
781
  prompt if requested.
package/dist/main.js CHANGED
@@ -32694,7 +32694,8 @@ class BillingHintsError extends exports_Schema.TaggedError()("BillingHintsError"
32694
32694
  var Hint = exports_Schema.fromJsonString(exports_Schema.Struct({
32695
32695
  requestId: exports_Schema.NonEmptyString,
32696
32696
  billingProvider: exports_Schema.Literal("codex"),
32697
- authMode: exports_Schema.Literal("chatgpt")
32697
+ authMode: exports_Schema.Literal("chatgpt"),
32698
+ repository: exports_Schema.optionalKey(exports_Schema.NonEmptyString)
32698
32699
  }));
32699
32700
  var readBillingHints = exports_Effect.fn("BillingHints.read")(function* (location2) {
32700
32701
  const fs = yield* exports_FileSystem.FileSystem;
@@ -32702,10 +32703,10 @@ var readBillingHints = exports_Effect.fn("BillingHints.read")(function* (locatio
32702
32703
  const entries3 = yield* fs.readDirectory(location2.directory).pipe(exports_Effect.result);
32703
32704
  if (exports_Result.isFailure(entries3)) {
32704
32705
  if (!location2.required && exports_Predicate.isTagged(entries3.failure.reason, "NotFound"))
32705
- return new Set;
32706
+ return new Map;
32706
32707
  return yield* new BillingHintsError({ message: "Cannot read the billing hints directory." });
32707
32708
  }
32708
- const requests = new Set;
32709
+ const repositories = new Map;
32709
32710
  for (const entry of entries3.success.toSorted()) {
32710
32711
  if (!entry.endsWith(".jsonl"))
32711
32712
  continue;
@@ -32719,10 +32720,16 @@ var readBillingHints = exports_Effect.fn("BillingHints.read")(function* (locatio
32719
32720
  const hint = yield* exports_Schema.decodeUnknownEffect(Hint)(line).pipe(exports_Effect.mapError(() => new BillingHintsError({
32720
32721
  message: `Invalid row in ${JSON.stringify(entry)} at line ${lineNumber}.`
32721
32722
  })));
32722
- requests.add(hint.requestId);
32723
+ const named = repositories.get(hint.requestId) ?? new Set;
32724
+ if (hint.repository !== undefined)
32725
+ named.add(hint.repository);
32726
+ repositories.set(hint.requestId, named);
32723
32727
  }
32724
32728
  }
32725
- return requests;
32729
+ return new Map([...repositories].map(([requestId, named]) => [
32730
+ requestId,
32731
+ { repository: named.size === 1 ? [...named][0] ?? null : null }
32732
+ ]));
32726
32733
  });
32727
32734
 
32728
32735
  // packages/core/src/model.ts
@@ -34731,7 +34738,7 @@ function repositoryReference(attributes) {
34731
34738
  const remote = attributes["copilot_chat.repo.remote_url"];
34732
34739
  return remote === undefined ? null : RepositoryReference.Remote({ value: remote });
34733
34740
  }
34734
- function copilotParser(file2, chatgptRequests = new Set) {
34741
+ function copilotParser(file2, chatgptRequests = new Map) {
34735
34742
  const spans = new Map;
34736
34743
  const candidates = [];
34737
34744
  const warning = "Copilot coverage starts when telemetry was enabled; only inference requests are counted.";
@@ -34774,9 +34781,9 @@ function copilotParser(file2, chatgptRequests = new Set) {
34774
34781
  const ms = span2.endTime[0] * 1000 + Math.floor(span2.endTime[1] / 1e6);
34775
34782
  if (!Number.isFinite(new Date(ms).getTime()))
34776
34783
  return skipped;
34777
- const base = {
34784
+ const record3 = {
34778
34785
  provider: "copilot",
34779
- id: a["gen_ai.response.id"] === undefined ? `${span2.traceId}:${span2.spanId}` : `response:${a["gen_ai.response.id"]}`,
34786
+ id: `${span2.traceId}:${span2.spanId}`,
34780
34787
  session: a["gen_ai.conversation.id"] ?? a["session.id"] ?? file2,
34781
34788
  timestamp: ms,
34782
34789
  model: a["gen_ai.response.model"] ?? a["gen_ai.request.model"] ?? "unknown",
@@ -34784,14 +34791,37 @@ function copilotParser(file2, chatgptRequests = new Set) {
34784
34791
  repository: repositoryReference(a),
34785
34792
  tokens: { input: input - cacheRead - cacheWrite, output, cacheRead, cacheWrite }
34786
34793
  };
34787
- const responseId = a["gen_ai.response.id"];
34788
- const record3 = responseId !== undefined && chatgptRequests.has(responseId) ? { ...base, billingProvider: "codex" } : base;
34789
- candidates.push({ record: record3, spanKey, isSpan: exportedSpan !== null });
34794
+ candidates.push({
34795
+ record: record3,
34796
+ spanKey,
34797
+ responseId: a["gen_ai.response.id"],
34798
+ isSpan: exportedSpan !== null
34799
+ });
34790
34800
  return empty14;
34791
34801
  },
34792
34802
  finish() {
34803
+ const eventResponses = new Map;
34804
+ for (const { spanKey, responseId, isSpan } of candidates)
34805
+ if (!isSpan && spanKey !== undefined && responseId !== undefined)
34806
+ eventResponses.set(spanKey, (eventResponses.get(spanKey) ?? new Set).add(responseId));
34807
+ const identified = candidates.map((candidate) => {
34808
+ const shared = candidate.isSpan && candidate.responseId === undefined && candidate.spanKey !== undefined ? eventResponses.get(candidate.spanKey) : undefined;
34809
+ const responseId = shared?.size === 1 ? [...shared][0] : candidate.responseId;
34810
+ if (responseId === undefined)
34811
+ return candidate;
34812
+ const record3 = { ...candidate.record, id: `response:${responseId}` };
34813
+ const routed = chatgptRequests.get(responseId);
34814
+ if (routed === undefined)
34815
+ return { ...candidate, responseId, record: record3 };
34816
+ return {
34817
+ ...candidate,
34818
+ responseId,
34819
+ record: { ...record3, billingProvider: "codex" },
34820
+ hinted: routed.repository === null ? null : RepositoryReference.Remote({ value: routed.repository })
34821
+ };
34822
+ });
34793
34823
  const preferred = new Map;
34794
- for (const candidate of candidates) {
34824
+ for (const candidate of identified) {
34795
34825
  let repository = candidate.record.repository;
34796
34826
  let key = candidate.spanKey;
34797
34827
  const visited = new Set;
@@ -34816,7 +34846,10 @@ function copilotParser(file2, chatgptRequests = new Set) {
34816
34846
  });
34817
34847
  }
34818
34848
  }
34819
- const records = candidates.map((candidate) => preferred.get(candidate.record.id)?.record ?? candidate.record);
34849
+ for (const [id2, merged] of preferred)
34850
+ if (merged.record.repository === null && merged.hinted)
34851
+ preferred.set(id2, { ...merged, record: { ...merged.record, repository: merged.hinted } });
34852
+ const records = identified.map((candidate) => preferred.get(candidate.record.id)?.record ?? candidate.record);
34820
34853
  candidates.length = 0;
34821
34854
  spans.clear();
34822
34855
  return { ...empty14, records, warnings: records.length > 0 ? [warning] : [] };
@@ -35077,7 +35110,7 @@ var SyncBucket = exports_Schema.Struct({
35077
35110
  records: exports_Schema.Int.check(exports_Schema.isGreaterThan(0)),
35078
35111
  estimatedCostUsd: exports_Schema.NullOr(Cost),
35079
35112
  unpricedRecords: exports_Schema.Natural
35080
- }).check(exports_Schema.makeFilter((bucket) => bucket.billingProvider !== bucket.provider && bucket.unpricedRecords <= bucket.records && bucket.estimatedCostUsd === null === bucket.unpricedRecords > 0));
35113
+ }).check(exports_Schema.makeFilter((bucket) => bucket.billingProvider !== bucket.provider && bucket.unpricedRecords <= bucket.records && bucket.estimatedCostUsd === null === (bucket.unpricedRecords === bucket.records)));
35081
35114
  var SyncCoverage = exports_Schema.Struct({
35082
35115
  provider: Provider,
35083
35116
  status: Coverage.fields.status,
@@ -35096,8 +35129,16 @@ var ProviderHint = exports_Schema.Struct({
35096
35129
  hourStart: UtcHour,
35097
35130
  plan: NonEmptyText
35098
35131
  });
35132
+ function partlyPriced(bucket) {
35133
+ return bucket.unpricedRecords > 0 && bucket.unpricedRecords < bucket.records;
35134
+ }
35135
+ function payloadVersion(buckets) {
35136
+ if (buckets.some(partlyPriced))
35137
+ return 3;
35138
+ return buckets.some((bucket) => bucket.billingProvider !== undefined) ? 2 : 1;
35139
+ }
35099
35140
  var SyncPayload = exports_Schema.Struct({
35100
- version: exports_Schema.Literals([1, 2]),
35141
+ version: exports_Schema.Literals([1, 2, 3]),
35101
35142
  machine: SyncMachine,
35102
35143
  clientVersion: NonEmptyText,
35103
35144
  timeZone: NonEmptyText,
@@ -35111,15 +35152,18 @@ var SyncPayload = exports_Schema.Struct({
35111
35152
  }),
35112
35153
  buckets: exports_Schema.Array(SyncBucket),
35113
35154
  coverage: exports_Schema.Array(SyncCoverage),
35114
- providerHints: exports_Schema.optionalKey(exports_Schema.Array(ProviderHint))
35115
- }).check(exports_Schema.makeFilter((payload) => (payload.version === 2 || payload.buckets.every((bucket) => bucket.billingProvider === undefined)) && distinct(payload.buckets, (bucket) => JSON.stringify([
35155
+ providerHints: exports_Schema.optionalKey(exports_Schema.Array(ProviderHint)),
35156
+ snapshotAt: exports_Schema.optionalKey(UtcInstant)
35157
+ }).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
35158
  bucket.hourStart,
35117
35159
  bucket.sessionKey,
35118
35160
  bucket.project,
35119
35161
  bucket.provider,
35120
35162
  bucket.billingProvider ?? null,
35121
35163
  bucket.model
35122
- ])) && distinct(payload.coverage, (entry) => entry.provider) && distinct(payload.providerHints ?? [], (hint) => JSON.stringify([hint.provider, hint.hourStart, hint.plan])), { expected: "unique bucket keys, coverage providers, and plan hints" }), exports_Schema.makeFilter((payload) => {
35164
+ ])) && distinct(payload.coverage, (entry) => entry.provider) && distinct(payload.providerHints ?? [], (hint) => JSON.stringify([hint.provider, hint.hourStart, hint.plan])), {
35165
+ expected: "unique bucket keys, coverage providers, and plan hints, and a version carrying every bucket"
35166
+ }), exports_Schema.makeFilter((payload) => {
35123
35167
  const replaced = replacedProviders(payload.coverage);
35124
35168
  return [...payload.buckets, ...payload.providerHints ?? []].every((entry) => replaced.has(entry.provider) && entry.hourStart >= payload.window.start && entry.hourStart < payload.window.end);
35125
35169
  }));
@@ -35171,7 +35215,7 @@ function sessionBuckets(pricing) {
35171
35215
  model,
35172
35216
  tokens: usage.tokens,
35173
35217
  records: usage.records,
35174
- estimatedCostUsd: usage.estimatedCostUsd,
35218
+ estimatedCostUsd: usage.unpricedRecords === usage.records ? null : usage.pricedCostUsd,
35175
35219
  unpricedRecords: usage.unpricedRecords
35176
35220
  };
35177
35221
  return record3.billingProvider === undefined ? bucket : { ...bucket, billingProvider: record3.billingProvider };
@@ -35241,8 +35285,8 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
35241
35285
  return request3;
35242
35286
  });
35243
35287
  const scan2 = exports_Effect.fn("Ledger.scan")(function* (request3, start, locate, collect2, notice, onWarning) {
35244
- const hints = yield* (notice !== undefined && request3.billingHints !== undefined && request3.sources.some((source) => source.provider === "copilot") ? readBillingHints(request3.billingHints).pipe(exports_Effect.provideService(exports_FileSystem.FileSystem, fs), exports_Effect.provideService(exports_Path.Path, path)) : exports_Effect.succeed(new Set)).pipe(exports_Effect.result);
35245
- const chatgptRequests = exports_Result.isSuccess(hints) ? hints.success : new Set;
35288
+ const hints = yield* (notice !== undefined && request3.billingHints !== undefined && request3.sources.some((source) => source.provider === "copilot") ? readBillingHints(request3.billingHints).pipe(exports_Effect.provideService(exports_FileSystem.FileSystem, fs), exports_Effect.provideService(exports_Path.Path, path)) : exports_Effect.succeed(new Map)).pipe(exports_Effect.result);
35289
+ const chatgptRequests = exports_Result.isSuccess(hints) ? hints.success : new Map;
35246
35290
  if (exports_Result.isFailure(hints))
35247
35291
  yield* onWarning?.(`Billing hints: ${hints.failure.message} Copilot will not be uploaded. Repair the hints and rerun sync with --since <first missed day>.`) ?? exports_Effect.void;
35248
35292
  const resolveProject = yield* projectResolver(request3.projects).pipe(exports_Effect.provideService(exports_FileSystem.FileSystem, fs), exports_Effect.provideService(exports_Path.Path, path));
@@ -35409,6 +35453,7 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
35409
35453
  const buckets = sessionBuckets(request3.pricing);
35410
35454
  const hints = planHints();
35411
35455
  let earliest = requested.start;
35456
+ const snapshotAt = yield* exports_Clock.currentTimeMillis;
35412
35457
  const coverage = yield* scan2(request3, from, (timestamp2) => timestamp2 >= from && timestamp2 < requested.end ? timestamp2 : undefined, (record3, attribution, timestamp2) => {
35413
35458
  earliest = Math.min(earliest, timestamp2);
35414
35459
  buckets.add(record3, attribution.shareable ? attribution.project : unattributed);
@@ -35422,7 +35467,7 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
35422
35467
  const replaced = replacedProviders(summary);
35423
35468
  const uploadedBuckets = buckets.finish().filter((bucket) => replaced.has(bucket.provider));
35424
35469
  const payload = yield* SyncPayload.makeEffect({
35425
- version: uploadedBuckets.some((bucket) => bucket.billingProvider !== undefined) ? 2 : 1,
35470
+ version: payloadVersion(uploadedBuckets),
35426
35471
  machine: client.machine,
35427
35472
  clientVersion: client.version,
35428
35473
  timeZone: request3.timeZone.id,
@@ -35439,7 +35484,8 @@ class Ledger extends exports_Context.Service()("token-ledger/Ledger") {
35439
35484
  },
35440
35485
  buckets: uploadedBuckets,
35441
35486
  coverage: summary,
35442
- providerHints: hints.finish().filter((hint) => replaced.has(hint.provider))
35487
+ providerHints: hints.finish().filter((hint) => replaced.has(hint.provider)),
35488
+ snapshotAt: new Date(snapshotAt).toISOString()
35443
35489
  }).pipe(exports_Effect.mapError(() => new InvalidRequest({
35444
35490
  message: "Report data must satisfy the sync payload contract."
35445
35491
  })));
@@ -42763,7 +42809,7 @@ var runWith2 = (command, config) => {
42763
42809
  // packages/cli/package.json
42764
42810
  var package_default = {
42765
42811
  name: "@ponbac/token-ledger",
42766
- version: "0.6.0",
42812
+ version: "0.7.0",
42767
42813
  private: true,
42768
42814
  type: "module",
42769
42815
  bin: {
@@ -45665,7 +45711,7 @@ function syncSummary(payload, request3, storedBuckets) {
45665
45711
  const dollars = new Intl.NumberFormat("en-US", { style: "currency", currency: "USD" });
45666
45712
  const sessions = new Set(payload.buckets.map((bucket) => bucket.sessionKey)).size;
45667
45713
  const cost = payload.buckets.reduce((sum3, bucket) => sum3 + (bucket.estimatedCostUsd ?? 0), 0);
45668
- const unknown2 = payload.buckets.some((bucket) => bucket.estimatedCostUsd === null);
45714
+ const unknown2 = payload.buckets.some((bucket) => bucket.unpricedRecords > 0);
45669
45715
  return [
45670
45716
  `Synced ${terminalText(payload.machine.label)} · ${request3.since} through ${request3.until} (${payload.timeZone})`,
45671
45717
  [
@@ -45696,6 +45742,11 @@ class SyncUnauthorized extends exports_Schema.TaggedError()("SyncUnauthorized",
45696
45742
  class SyncUnsupportedVersion extends exports_Schema.TaggedError()("SyncUnsupportedVersion", { message: exports_Schema.String }) {
45697
45743
  }
45698
45744
 
45745
+ class SyncSuperseded extends exports_Schema.TaggedError()("SyncSuperseded", {
45746
+ message: exports_Schema.String
45747
+ }) {
45748
+ }
45749
+
45699
45750
  class SyncRejected extends exports_Schema.TaggedError()("SyncRejected", {
45700
45751
  status: exports_Schema.Number,
45701
45752
  message: exports_Schema.String
@@ -45728,6 +45779,8 @@ var readResponse = exports_Effect.fn("Sync.readResponse")(function* (response, v
45728
45779
  }))), exports_Match.when(403, () => exports_Effect.fail(new SyncUnauthorized({
45729
45780
  status,
45730
45781
  message: "This API token may not upload for this machine ID."
45782
+ }))), exports_Match.when(409, () => exports_Effect.fail(new SyncSuperseded({
45783
+ 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
45784
  }))), 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
45785
  message: `The server accepts payload versions ${rejection.supportedVersions.join(", ") || "none"}, not ${version}; update Toki or use a compatible token-ledger version.`
45733
45786
  }))))), exports_Match.orElse(() => exports_Effect.fail(new SyncRejected({ status, message: `The server rejected the upload (${status}).` }))));
@@ -45947,12 +46000,18 @@ var sync6 = exports_Command.make("sync", {
45947
46000
  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
46001
  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
46002
  result6 = yield* usual(result6.value.outcome.failure.message);
46003
+ if (exports_Option.isSome(result6) && exports_Result.isFailure(result6.value.outcome) && exports_Predicate.isTagged(result6.value.outcome.failure, "SyncSuperseded")) {
46004
+ const { since } = result6.value.sent;
46005
+ yield* exports_Console.error(`A newer sync from this machine reached the server first; scanning ${since} through ${request3.until} again.`);
46006
+ const payload = yield* ledger.syncPayload({ ...request3, since }, client, exports_Console.error);
46007
+ result6 = (yield* examine(payload)) && flags.strict ? exports_Option.none() : exports_Option.some({ sent: { payload, since }, outcome: yield* send(payload) });
46008
+ }
45950
46009
  if (exports_Option.isNone(result6))
45951
46010
  return yield* refused;
45952
46011
  const { sent, outcome } = result6.value;
45953
46012
  if (exports_Result.isFailure(outcome)) {
45954
46013
  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);
46014
+ 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
46015
  return;
45957
46016
  }
45958
46017
  yield* exports_Console.log(syncSummary(sent.payload, { ...request3, since: sent.since }, outcome.success));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ponbac/token-ledger",
3
- "version": "0.6.0",
3
+ "version": "0.7.0",
4
4
  "description": "Local AI token usage and API-equivalent cost reports by project",
5
5
  "license": "MIT",
6
6
  "engines": {