llm-usage-metrics 0.12.0 → 0.12.1

package/dist/index.js

@@ -73,7 +73,13 @@ function compareByCodePoint(left, right) {
 // packages/core/src/domain/provider-normalization.ts
 var billingProviderAliases = /* @__PURE__ */ new Map([
   ["openai-codex", "openai"],
-  ["github-copilot", "github"]
+  ["github-copilot", "github"],
+  // Built-in pi providers that bill through another vendor's API.
+  ["claude-bridge", "anthropic"],
+  ["google-gemini-cli", "google"],
+  ["google-antigravity", "google"],
+  ["deepseek-official", "deepseek"],
+  ["kimi-coding", "moonshot"]
 ]);
 var billingProviderPrefixAliases = [
   ["openai-", "openai"],
@@ -230,7 +236,7 @@ function normalizeTimestamp(value) {
 }
 
 // packages/core/src/domain/usage-event.ts
-var USAGE_EVENT_NORMALIZATION_VERSION = 3;
+var USAGE_EVENT_NORMALIZATION_VERSION = 4;
 function normalizeSourceId(value) {
   if (typeof value !== "string") {
     return void 0;
@@ -1993,6 +1999,29 @@ function computeActiveMs(timestampsMs) {
   }
   return activeMs;
 }
+function computeUnionActiveMs(timestampLists) {
+  const intervals = [];
+  for (const timestamps of timestampLists) {
+    const sorted = [...timestamps].sort((left, right) => left - right);
+    for (let index = 1; index < sorted.length; index += 1) {
+      const start = sorted[index - 1];
+      const end = Math.min(sorted[index], start + IDLE_GAP_CAP_MS);
+      if (end > start) {
+        intervals.push([start, end]);
+      }
+    }
+  }
+  intervals.sort((left, right) => left[0] - right[0]);
+  let activeMs = 0;
+  let coveredUntil = Number.NEGATIVE_INFINITY;
+  for (const [start, end] of intervals) {
+    if (end > coveredUntil) {
+      activeMs += end - Math.max(start, coveredUntil);
+      coveredUntil = end;
+    }
+  }
+  return activeMs;
+}
 
 // packages/core/src/sources/source-context.ts
 import os from "os";
@@ -3043,7 +3072,11 @@ function readSchemaVersion(database) {
     return void 0;
   }
   const schemaVersionRow = database.prepare("SELECT value FROM meta WHERE key = 'schemaVersion'").get();
-  return toText(schemaVersionRow?.value);
+  const schemaVersion = toText(schemaVersionRow?.value);
+  return schemaVersion === "5" && tableNames.has("events") && !hasEventsFileIdColumn(database) ? "4" : schemaVersion;
+}
+function hasEventsFileIdColumn(database) {
+  return database.prepare("SELECT name FROM pragma_table_info(?)").all("events").some((row) => row.name === "file_id");
 }
 function createFreshSchema(database) {
   database.exec(createSchemaSql());
@@ -3144,6 +3177,8 @@ function migrateSchemaV4ToV5(database) {
 ALTER TABLE files RENAME TO v4_files;
 ALTER TABLE events RENAME TO v4_events;
 DROP INDEX IF EXISTS events_content_hash;
+DROP TABLE IF EXISTS tool_calls;
+DROP TABLE IF EXISTS messages;
 ${createFileTablesSql()}
 INSERT INTO files (source, file_path, fingerprint, skipped_rows, skipped_row_reasons, ingested_at)
 SELECT source, file_path, fingerprint, skipped_rows, skipped_row_reasons, ingested_at
@@ -3566,8 +3601,7 @@ async function readEventStoreSummary(filePath = getDefaultEventStorePath(), load
     timeout: EVENT_STORE_OPEN_TIMEOUT_MS
   });
   try {
-    const schemaVersionRow = database.prepare("SELECT value FROM meta WHERE key = 'schemaVersion'").get();
-    const schemaVersion = toText(schemaVersionRow?.value);
+    const schemaVersion = readSchemaVersion(database);
     const countRows = (tableName) => toNonNegativeInteger(
       database.prepare(`SELECT COUNT(*) AS count FROM ${tableName}`).get()?.count
     ) ?? 0;
@@ -3713,11 +3747,12 @@ async function readEventStoreEvents(filePath, window = {}, loadSqliteModule = lo
   try {
     assertSupportedSchemaVersion(database);
     const meta = readMetaValues(database);
+    const schemaVersion = readSchemaVersion(database);
     const fromTimestamp = window.fromTimestamp ?? "";
     const toTimestamp = window.toTimestamp ?? "\uFFFF";
     const wideWindow = isWideWindow(database, fromTimestamp, toTimestamp);
     const statement = database.prepare(
-      hasSchemaVersion(meta.get("schemaVersion"), 5) ? selectWindowEventsSql(wideWindow) : selectPreV5WindowEventsSql(meta.get("schemaVersion"), wideWindow)
+      hasSchemaVersion(schemaVersion, 5) ? selectWindowEventsSql(wideWindow) : selectPreV5WindowEventsSql(schemaVersion, wideWindow)
     );
     statement.setReturnArrays(true);
     const rows = statement.all(fromTimestamp, toTimestamp);
@@ -3744,7 +3779,7 @@ async function readStoredSessionEvents(filePath, files, kinds, loadSqliteModule
     timeout: EVENT_STORE_OPEN_TIMEOUT_MS
   });
   try {
-    const schemaVersion = readMetaValues(database).get("schemaVersion");
+    const schemaVersion = readSchemaVersion(database);
     if (!hasSchemaVersion(schemaVersion, 5)) {
       throw new EventStoreSchemaVersionError(schemaVersion);
     }
@@ -6183,8 +6218,22 @@ function stripTrailingSeparators(value) {
   }
   return value.slice(0, end);
 }
+function stripDependencyPath(value) {
+  let cut = value.length;
+  for (const separator of ["/", "\\"]) {
+    const needle = `${separator}node_modules`;
+    for (let index = value.indexOf(needle); index >= 0; index = value.indexOf(needle, index + 1)) {
+      const end = index + needle.length;
+      if (end === value.length || isSeparator(value[end])) {
+        cut = Math.min(cut, index);
+        break;
+      }
+    }
+  }
+  return cut < value.length && isBareRoot(value.slice(0, cut + 1)) ? value.slice(0, cut + 1) : value.slice(0, cut);
+}
 function toProjectKey(repoRoot) {
-  return repoRoot === void 0 ? void 0 : stripTrailingSeparators(repoRoot);
+  return repoRoot === void 0 ? void 0 : stripDependencyPath(stripTrailingSeparators(repoRoot));
 }
 function toProjectLabel(repoRoot, labels) {
   return labels.get(toProjectKey(repoRoot)) ?? UNATTRIBUTED_PROJECT_LABEL;
@@ -42892,13 +42941,15 @@ async function buildUsageEventDataset(options, deps = {}, request = {}) {
           (failure.stale ? machineWarnings : machineNotes).push(failure.text);
         }
       }
-      machineNotes.push(
-        formatMachinesNote(
-          machineUsage.machines,
-          nowMs(),
-          loadPackageMetadataFromRuntime().packageVersion
-        )
-      );
+      if (machineUsage.machines.length > 0) {
+        machineNotes.push(
+          formatMachinesNote(
+            machineUsage.machines,
+            nowMs(),
+            loadPackageMetadataFromRuntime().packageVersion
+          )
+        );
+      }
     }
     const sessionCopyingSources = getSessionCopyingSourceIds(adaptersToParse);
     parseResultsForFiltering = measureRuntimeProfileStageSync(
@@ -44337,7 +44388,7 @@ function formatBurnRate(active, options) {
 }
 function buildFooterLines(data, options) {
   const lines = [
-    `Blocks are estimated: each starts at the UTC hour of a source's first event after the previous block and lasts ${String(data.blockHours)} hours (times in ${data.timezone}), across machines.`
+    `Blocks are estimated: each starts on the whole UTC hour at or before a source's first event after the previous block and lasts ${String(data.blockHours)} hours, across machines. Times are in ${data.timezone}.`
   ];
   if (data.blocks.some((row) => row.startUncertain)) {
     lines.push(
@@ -46716,7 +46767,7 @@ function formatDeltaUsd(value, options = {}) {
   }
   const sign = options.signed && value !== 0 ? value > 0 ? "+" : "-" : "";
   const formatted = formatUsd(Math.abs(value));
-  return `${options.approximate ? "~" : ""}${sign}${formatted}`;
+  return `${sign}${options.approximate ? "~" : ""}${formatted}`;
 }
 function formatPercent(value) {
   if (value === void 0) {
@@ -47901,7 +47952,7 @@ function toPressureCells(row) {
   ];
 }
 function formatOptionalInteger(value) {
-  return value === void 0 ? "" : formatInteger(value);
+  return value === void 0 ? "-" : formatInteger(value);
 }
 function buildModelTable(rows) {
   return {
@@ -48835,12 +48886,19 @@ async function isGitRepository(repoDir, runCommand) {
       throw error;
     }
   );
-  return gitRepoResult.exitCode === 0;
+  return gitRepoResult.exitCode === 0 && gitRepoResult.lines[0]?.trim() === "true";
 }
 function notGitRepositoryMessage(repoDir, repoDirOption) {
   const hint = repoDirOption === void 0 ? "<path>" : "<path to a git repository>";
   return `${repoDir} is not a git repository; pass --repo-dir ${hint}`;
 }
+async function assertGitRepositoryDir(repoDirOption) {
+  const repoDir = resolveRepoDir(repoDirOption);
+  await assertRepoDirReadable(repoDir);
+  if (!await isGitRepository(repoDir, runGitCommand)) {
+    throw new Error(notGitRepositoryMessage(repoDir, repoDirOption));
+  }
+}
 function isNoCommitHistoryFailure(result) {
   if (result.exitCode !== 128) {
     return false;
@@ -49111,21 +49169,11 @@ async function collectGitOutcomes(options, deps = {}) {
   const repoDir = resolveRepoDir(options.repoDir);
   const includeMergeCommits = options.includeMergeCommits ?? false;
   const runCommand = deps.runGitCommand ?? runGitCommand;
-  if (options.activeUsageDays?.size === 0) {
-    const emptyCollection = createEmptyOutcomeCollection(repoDir, includeMergeCommits);
-    if (!deps.runGitCommand) {
-      await assertRepoDirReadable(repoDir);
-      if (!await isGitRepository(repoDir, runCommand)) {
-        emptyCollection.warning = notGitRepositoryMessage(repoDir, options.repoDir);
-      }
-    }
-    return emptyCollection;
-  }
   if (!deps.runGitCommand) {
-    await assertRepoDirReadable(repoDir);
-    if (!await isGitRepository(repoDir, runCommand)) {
-      throw new Error(notGitRepositoryMessage(repoDir, options.repoDir));
-    }
+    await assertGitRepositoryDir(options.repoDir);
+  }
+  if (options.activeUsageDays?.size === 0) {
+    return createEmptyOutcomeCollection(repoDir, includeMergeCommits);
   }
   let authorEmail;
   try {
@@ -49293,6 +49341,9 @@ async function buildEfficiencyData(granularity, options, deps = {}) {
   if (options.repoDir !== void 0 && !repoDir) {
     throw new Error("--repo-dir must be a non-empty path");
   }
+  if (!deps.collectGitOutcomes) {
+    await assertGitRepositoryDir(repoDir);
+  }
   const dataset = await measureRuntimeProfileStage(
     deps.runtimeProfile,
     "efficiency.dataset.total",
@@ -49351,7 +49402,7 @@ async function buildEfficiencyData(granularity, options, deps = {}) {
     sourceFailures: dataset.sourceFailures,
     pricingOrigin,
     pricingWarning,
-    warnings: gitOutcomes.warning ? [...dataset.warnings, gitOutcomes.warning] : dataset.warnings,
+    warnings: dataset.warnings,
     // The pricing stats are keyed by the priced events, not attribution's copies.
     notes: withPricingNotes(
       dataset.notes,
@@ -49438,7 +49489,7 @@ function emitEfficiencyReportDiagnostics(diagnostics) {
     `Git outcomes (${mergeModeLabel}): ${pluralize(diagnostics.gitCommitCount, "commit")}, +${diagnostics.gitLinesAdded}/-${diagnostics.gitLinesDeleted} lines (${diagnostics.repoDir})`
   );
   logger.info(
-    `Repo-attributed usage events: ${diagnostics.repoMatchedUsageEvents} matched, ${diagnostics.repoExcludedUsageEvents} excluded, ${diagnostics.repoUnattributedUsageEvents} unattributed`
+    `Repo-attributed usage events: ${formatInteger(diagnostics.repoMatchedUsageEvents)} matched, ${formatInteger(diagnostics.repoExcludedUsageEvents)} excluded, ${formatInteger(diagnostics.repoUnattributedUsageEvents)} unattributed`
   );
   if (diagnostics.scopeNote) {
     logger.warn(diagnostics.scopeNote);
@@ -51371,6 +51422,15 @@ function toCounts(accumulator) {
     sessions: accumulator.sessions.size
   };
 }
+function findDisplayName(callsByName) {
+  let top;
+  for (const entry of callsByName) {
+    if (top === void 0 || entry[1] > top[1] || entry[1] === top[1] && compareByCodePoint(entry[0], top[0]) < 0) {
+      top = entry;
+    }
+  }
+  return top?.[0] ?? "";
+}
 function findTopRepoRoot(callsByRepoRoot) {
   let top;
   for (const entry of callsByRepoRoot) {
@@ -51398,12 +51458,13 @@ function aggregateTools(calls, options) {
     const repoRoot = toProjectKey(options.sessionRepoRoots.get(sessionKey)) ?? null;
     const source = options.bySource ? call.source : void 0;
     const rowRepoRoot = options.byRepo ? repoRoot : void 0;
-    const key = [call.name, source ?? "", rowRepoRoot ?? ""].join("\0");
+    const foldedName = call.name.toLowerCase();
+    const key = [foldedName, source ?? "", rowRepoRoot ?? ""].join("\0");
     let row = rows.get(key);
     if (!row) {
       row = {
         ...createCountAccumulator(),
-        name: call.name,
+        callsByName: /* @__PURE__ */ new Map(),
         ...source === void 0 ? {} : { source },
         ...rowRepoRoot === void 0 ? {} : { repoRoot: rowRepoRoot },
         callsByRepoRoot: /* @__PURE__ */ new Map()
@@ -51411,12 +51472,13 @@ function aggregateTools(calls, options) {
       rows.set(key, row);
     }
     addCall(row, call, sessionKey);
+    row.callsByName.set(call.name, (row.callsByName.get(call.name) ?? 0) + 1);
     row.callsByRepoRoot.set(repoRoot, (row.callsByRepoRoot.get(repoRoot) ?? 0) + 1);
     addCall(totals, call, sessionKey);
-    names.add(call.name);
+    names.add(foldedName);
   }
   const toolRows = [...rows.values()].map((row) => ({
-    name: row.name,
+    name: findDisplayName(row.callsByName),
     ...row.source === void 0 ? {} : { source: row.source },
     ...row.repoRoot === void 0 ? {} : { repoRoot: row.repoRoot },
     ...toCounts(row),
@@ -53310,38 +53372,49 @@ function sumActiveMsByDay(events, timezone, groupOf) {
     sessionsByDate.set(dateKey, sessions);
   }
   const rows = [];
+  const combinedByDay = /* @__PURE__ */ new Map();
   for (const [periodKey, sessions] of sessionsByDate) {
-    const activeMsByGroup = /* @__PURE__ */ new Map();
+    const runsByGroup = /* @__PURE__ */ new Map();
+    const sessionTimestamps = [];
     for (const sessionEvents of sessions.values()) {
       sessionEvents.sort((left, right) => left.timestampMs - right.timestampMs);
+      sessionTimestamps.push(sessionEvents.map((entry) => entry.timestampMs));
       let runStart = 0;
       for (let index = 1; index <= sessionEvents.length; index += 1) {
         const group = sessionEvents[runStart].group;
         if (index < sessionEvents.length && sessionEvents[index].group === group) {
           continue;
         }
-        const runMs = computeActiveMs(
-          sessionEvents.slice(runStart, index).map((entry) => entry.timestampMs)
-        );
-        activeMsByGroup.set(group, (activeMsByGroup.get(group) ?? 0) + runMs);
+        const runs = runsByGroup.get(group) ?? [];
+        runs.push(sessionEvents.slice(runStart, index).map((entry) => entry.timestampMs));
+        runsByGroup.set(group, runs);
         runStart = index;
       }
     }
-    for (const [group, value] of activeMsByGroup) {
-      rows.push({ periodKey, group, value });
+    for (const [group, runs] of runsByGroup) {
+      rows.push({ periodKey, group, value: computeUnionActiveMs(runs) });
     }
+    combinedByDay.set(periodKey, computeUnionActiveMs(sessionTimestamps));
   }
-  return rows;
+  return { rows, combinedByDay };
 }
 function toActiveTimeValueRows(events, timezone) {
-  return sumActiveMsByDay(events, timezone, (event) => event.source).map((row) => ({
+  const { rows, combinedByDay } = sumActiveMsByDay(events, timezone, (event) => event.source);
+  const sourceRows = rows.map((row) => ({
     periodKey: row.periodKey,
     source: row.group,
     value: row.value
   }));
+  const combinedRows = [...combinedByDay].map(([periodKey, value]) => ({
+    periodKey,
+    source: "combined",
+    value
+  }));
+  return [...sourceRows, ...combinedRows];
 }
 function toActiveTimeProjectValueRows(events, timezone, projectLabels) {
-  return sumActiveMsByDay(events, timezone, (event) => toProjectKey(event.repoRoot)).map((row) => {
+  const { rows } = sumActiveMsByDay(events, timezone, (event) => toProjectKey(event.repoRoot));
+  return rows.map((row) => {
     const project = projectLabels.get(row.group);
     if (project === void 0) {
       throw new Error(`No project label for ${row.group ?? "unattributed usage"}`);
@@ -55118,9 +55191,10 @@ function toCsvLine(event) {
     event.cacheWrite1hTokens
   ].map(toCsvField).join(",");
 }
-async function runEventsReport(options, deps = {}) {
-  const format = resolveEventsFormat(options);
-  const pushTarget = resolveOtlpPushTarget(options);
+async function runEventsReport(commandOptions, commandDeps = {}) {
+  const format = resolveEventsFormat(commandOptions);
+  const pushTarget = resolveOtlpPushTarget(commandOptions);
+  const { options, deps } = commandOptions.last === void 0 ? { options: commandOptions, deps: commandDeps } : await resolveUsageDataRequest("daily", commandOptions, commandDeps);
   const dataset = await buildUsageEventDataset(options, deps);
   const { pricedEvents, pricingOrigin, pricingWarning } = await applyPricingToUsageEventDataset(
     dataset,
@@ -55156,16 +55230,16 @@ async function runEventsReport(options, deps = {}) {
       timezone: dataset.normalizedInputs.timezone,
       nowMs: (deps.now?.() ?? /* @__PURE__ */ new Date()).getTime()
     });
-    await writeOtlp({ kind: "metrics", lines }, pushTarget, deps);
+    await writeOtlp({ kind: "metrics", lines }, pushTarget, commandDeps);
     return;
   }
   if (toolCalls) {
     const lines = buildOtlpTraces({
       usageEvents: sortedEvents,
       toolCalls: dedupeToolCalls(toolCalls.events),
-      includePaths: options.otelIncludePaths
+      includePaths: commandOptions.otelIncludePaths
     });
-    await writeOtlp({ kind: "traces", lines }, pushTarget, deps);
+    await writeOtlp({ kind: "traces", lines }, pushTarget, commandDeps);
     return;
   }
   if (format === "csv") {
@@ -55609,10 +55683,7 @@ function aggregateWrapped(events, options) {
     }
   }
   const sortedDateKeys = [...activeDateKeys].sort(compareByCodePoint);
-  let activeMs = 0;
-  for (const timestamps of sessionTimestamps.values()) {
-    activeMs += computeActiveMs(timestamps);
-  }
+  const activeMs = computeUnionActiveMs(sessionTimestamps.values());
   let peakHour;
   for (let hour = 0; hour < hourTokens.length; hour += 1) {
     if (hourTokens[hour] > 0 && (peakHour === void 0 || hourTokens[hour] > peakHour.totalTokens)) {
@@ -57040,7 +57111,7 @@ var eventsReportDefinition = {
     ).option(
       "--otlp-endpoint <url>",
       "With an OTLP format: POST to <url>/v1/traces or /v1/metrics (unless <url> already ends with it) instead of printing; headers from OTEL_EXPORTER_OTLP_HEADERS"
-    );
+    ).option("--last <n>", "Export the last N days, counting today");
     addFullHistoryOption(command);
     addRepoFilterOption(command).action(
       (options) => runEventsReport(options)
@@ -58177,6 +58248,7 @@ async function runMachineList(deps = {}) {
 }
 async function runSync(names, options, deps = {}) {
   const print = deps.print ?? console.log;
+  const printError = deps.printError ?? console.error;
   const machines = await loadConfiguredMachines();
   const unknownNames = names.filter((name) => !Object.hasOwn(machines, name));
   if (unknownNames.length > 0) {
@@ -58203,7 +58275,7 @@ async function runSync(names, options, deps = {}) {
         now: deps.now
       });
       for (const line of renderSyncOutcome(outcome, (deps.now ?? Date.now)())) {
-        print(line);
+        (outcome.ok ? print : printError)(line);
       }
       return outcome;
     })
@@ -63125,23 +63197,23 @@ var schemaDocuments = {
 // src/cli/create-schema-command.ts
 var schemaNames = Object.keys(schemaDocuments).sort();
 function createSchemaCommand() {
-  return new Command5("schema").description("Print a bundled report JSON Schema").argument("[name]", `Schema name: ${schemaNames.join(", ")}`).option("--list", "List available schema names").addHelpText(
+  return new Command5("schema").description("Print a bundled report JSON Schema").argument("[name]", `Schema name: ${schemaNames.join(", ")}`).option("--list", "List available schema names (the default without a name)").addHelpText(
     "after",
     formatHelpExamples([
       "llm-usage schema --list",
       "llm-usage schema summary > summary.schema.json"
     ])
   ).action((name, options) => {
-    if (options.list) {
+    if (options.list || name === void 0) {
       for (const schemaName of schemaNames) {
         console.log(schemaName);
       }
       return;
     }
-    const schema = name === void 0 ? void 0 : schemaDocuments[name];
+    const schema = schemaDocuments[name];
     if (schema === void 0) {
       throw new Error(
-        `Unknown schema "${name ?? ""}"; valid names: ${schemaNames.join(", ")} (or --list)`
+        `Unknown schema "${name}"; valid names: ${schemaNames.join(", ")} (or --list)`
       );
     }
     console.log(JSON.stringify(schema, null, 2));
@@ -63314,7 +63386,7 @@ var currentWorkerData = workerData;
 var mainPromise = !isMainThread && isParseWorkerRequest(currentWorkerData) ? runParseWorker() : runCli();
 mainPromise.catch((error) => {
   const message = error instanceof Error ? error.message : String(error);
-  console.error(message);
+  console.error(`error: ${message}`);
   process.exitCode = 1;
 });
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llm-usage-metrics",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "CLI for aggregating local LLM usage metrics from pi, codex, gemini, droid, opencode, openclaw, claude, copilot, goose, amp, qwen, kimi, cline, roocode, kilocode, antigravity, and deepseek harness sessions",
   "type": "module",
   "packageManager": "pnpm@12.9.1",