codetime-cli 0.6.0 → 0.7.0

package/bin/codetime.mjs

@@ -160,7 +160,7 @@ import { fileURLToPath } from "node:url";
 // ../shared/src/index.ts
 import { createHash } from "node:crypto";
 var AGENT_TIME_SCHEMA_VERSION = "2026-04-29";
-var AGENT_ROLLUP_SCHEMA_VERSION = 2;
+var AGENT_ROLLUP_SCHEMA_VERSION = 3;
 var TELEMETRY_EVENT_TYPES = [
   "session.started",
   "session.ended",
@@ -974,7 +974,7 @@ import { readFile as readFile2, stat as stat2 } from "node:fs/promises";
 import path2 from "node:path";
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.6.0" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.7.0" : "0.1.1";
 var DEFAULT_API_URL = "https://codetime.dev";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -1932,16 +1932,29 @@ function claudeUsageFromMessage(message) {
   const outputTokens = numberField(usage, "output_tokens") || 0;
   const cachedInputTokens = cacheCreationInputTokens + cacheReadInputTokens;
   const totalInputTokens = inputTokens + cachedInputTokens;
+  const cacheCreationSplit = claudeCacheCreationSplit(usage);
   return {
     tokensInput: totalInputTokens || void 0,
     tokensCachedInput: cachedInputTokens || void 0,
     tokensCacheCreationInput: cacheCreationInputTokens || void 0,
+    tokensCacheCreation5mInput: cacheCreationSplit?.fiveMinute,
+    tokensCacheCreation1hInput: cacheCreationSplit?.oneHour,
     tokensCacheReadInput: cacheReadInputTokens || void 0,
     tokensOutput: outputTokens || void 0,
     tokensTotal: totalInputTokens + outputTokens || void 0,
     modelCalls: 1
   };
 }
+function claudeCacheCreationSplit(usage) {
+  const breakdown = usage.cache_creation;
+  if (!isPlainObject(breakdown)) {
+    return void 0;
+  }
+  return {
+    fiveMinute: numberField(breakdown, "ephemeral_5m_input_tokens") || 0,
+    oneHour: numberField(breakdown, "ephemeral_1h_input_tokens") || 0
+  };
+}
 function claudeSubagentMetrics(toolResult, fallbackDurationMs) {
   const usage = objectField(toolResult, "usage");
   const inputTokens = numberField(usage, "input_tokens") || 0;
@@ -1950,6 +1963,7 @@ function claudeSubagentMetrics(toolResult, fallbackDurationMs) {
   const outputTokens = numberField(usage, "output_tokens") || 0;
   const cachedInputTokens = cacheCreationInputTokens + cacheReadInputTokens;
   const totalInputTokens = inputTokens + cachedInputTokens;
+  const cacheCreationSplit = claudeCacheCreationSplit(usage);
   const durationMs = numberField(toolResult, "totalDurationMs") || fallbackDurationMs;
   return {
     durationMs,
@@ -1958,6 +1972,8 @@ function claudeSubagentMetrics(toolResult, fallbackDurationMs) {
     tokensInput: totalInputTokens || void 0,
     tokensCachedInput: cachedInputTokens || void 0,
     tokensCacheCreationInput: cacheCreationInputTokens || void 0,
+    tokensCacheCreation5mInput: cacheCreationSplit?.fiveMinute,
+    tokensCacheCreation1hInput: cacheCreationSplit?.oneHour,
     tokensCacheReadInput: cacheReadInputTokens || void 0,
     tokensOutput: outputTokens || void 0,
     tokensTotal: numberField(toolResult, "totalTokens") || totalInputTokens + outputTokens || void 0
@@ -4137,6 +4153,7 @@ function buildSessionRollup(rollupKey, events) {
   const lastEventAt = ordered.at(-1)?.ts || startedAt;
   const timeBuckets = /* @__PURE__ */ new Map();
   const modelRollups = /* @__PURE__ */ new Map();
+  const modelBuckets = /* @__PURE__ */ new Map();
   const toolRollups = /* @__PURE__ */ new Map();
   const fileRollups = /* @__PURE__ */ new Map();
   const turnRollups = /* @__PURE__ */ new Map();
@@ -4158,6 +4175,8 @@ function buildSessionRollup(rollupKey, events) {
     const eventInputTokens = Math.max(0, event.metrics?.tokensInput || 0);
     const eventCachedInputTokens = Math.max(0, event.metrics?.tokensCachedInput || 0);
     const eventCacheCreationInputTokens = Math.max(0, event.metrics?.tokensCacheCreationInput || 0);
+    const eventCacheCreation5mInputTokens = Math.max(0, event.metrics?.tokensCacheCreation5mInput || 0);
+    const eventCacheCreation1hInputTokens = Math.max(0, event.metrics?.tokensCacheCreation1hInput || 0);
     const eventCacheReadInputTokens = Math.max(0, event.metrics?.tokensCacheReadInput || 0);
     const eventOutputTokens = Math.max(0, event.metrics?.tokensOutput || 0);
     const eventReasoningOutputTokens = Math.max(0, event.metrics?.tokensReasoningOutput || 0);
@@ -4278,6 +4297,8 @@ function buildSessionRollup(rollupKey, events) {
         inputTokens: 0,
         cachedInputTokens: 0,
         cacheCreationInputTokens: 0,
+        cacheCreation5mInputTokens: 0,
+        cacheCreation1hInputTokens: 0,
         cacheReadInputTokens: 0,
         outputTokens: 0,
         reasoningOutputTokens: 0,
@@ -4288,12 +4309,40 @@ function buildSessionRollup(rollupKey, events) {
       modelRollup.inputTokens += eventInputTokens;
       modelRollup.cachedInputTokens += eventCachedInputTokens;
       modelRollup.cacheCreationInputTokens += eventCacheCreationInputTokens;
+      modelRollup.cacheCreation5mInputTokens += eventCacheCreation5mInputTokens;
+      modelRollup.cacheCreation1hInputTokens += eventCacheCreation1hInputTokens;
       modelRollup.cacheReadInputTokens += eventCacheReadInputTokens;
       modelRollup.outputTokens += eventOutputTokens;
       modelRollup.reasoningOutputTokens += eventReasoningOutputTokens;
       modelRollup.totalTokens += eventTotalTokens;
       modelRollup.estimatedCostUsd += eventCostUsd;
       modelRollups.set(modelKey, modelRollup);
+      const modelBucketKey = `${bucketTs}\0${modelKey}`;
+      const modelBucket = modelBuckets.get(modelBucketKey) || {
+        ts: bucketTs,
+        model: modelKey,
+        callCount: 0,
+        inputTokens: 0,
+        cachedInputTokens: 0,
+        cacheCreationInputTokens: 0,
+        cacheCreation5mInputTokens: 0,
+        cacheCreation1hInputTokens: 0,
+        cacheReadInputTokens: 0,
+        outputTokens: 0,
+        reasoningOutputTokens: 0,
+        totalTokens: 0
+      };
+      modelBucket.callCount += 1;
+      modelBucket.inputTokens += eventInputTokens;
+      modelBucket.cachedInputTokens += eventCachedInputTokens;
+      modelBucket.cacheCreationInputTokens += eventCacheCreationInputTokens;
+      modelBucket.cacheCreation5mInputTokens += eventCacheCreation5mInputTokens;
+      modelBucket.cacheCreation1hInputTokens += eventCacheCreation1hInputTokens;
+      modelBucket.cacheReadInputTokens += eventCacheReadInputTokens;
+      modelBucket.outputTokens += eventOutputTokens;
+      modelBucket.reasoningOutputTokens += eventReasoningOutputTokens;
+      modelBucket.totalTokens += eventTotalTokens;
+      modelBuckets.set(modelBucketKey, modelBucket);
     }
     if (event.type === "tool.started") {
       bucket.toolCalls += 1;
@@ -4361,11 +4410,12 @@ function buildSessionRollup(rollupKey, events) {
   const baseRollup = {
     rollupKey,
     payloadHash: "",
-    // v2 schema: trustworthy gap-clamped turn durations + billable-output token
-    // convention. Set on baseRollup (not after) so it participates in payloadHash:
-    // every historical rollup's hash changes, and a re-backfill (uploaded with
-    // replace=true by default) cleanly refreshes all data onto the new convention.
-    // This full-refresh churn is intentional.
+    // v3 schema: v2 (gap-clamped turn durations + billable-output token
+    // convention) plus per-model cache-creation TTL split and modelBuckets. Set on
+    // baseRollup (not after) so it participates in payloadHash: every historical
+    // rollup's hash changes, and a re-backfill (uploaded with replace=true by
+    // default) cleanly refreshes all data onto the new convention. This
+    // full-refresh churn is intentional.
     schemaVersion: AGENT_ROLLUP_SCHEMA_VERSION,
     source: first.source,
     project,
@@ -4390,6 +4440,8 @@ function buildSessionRollup(rollupKey, events) {
     durationMs: Math.max(0, Date.parse(lastEventAt) - Date.parse(startedAt)),
     timeBuckets: [...timeBuckets.values()].sort((a, b) => a.ts.localeCompare(b.ts)),
     modelRollups: [...modelRollups.values()].sort((a, b) => b.callCount - a.callCount || a.model.localeCompare(b.model)),
+    // Sorted ts ascending, then model lexicographically (wire contract).
+    modelBuckets: [...modelBuckets.values()].sort((a, b) => a.ts.localeCompare(b.ts) || a.model.localeCompare(b.model)),
     toolRollups: [...toolRollups.values()].sort((a, b) => b.callCount - a.callCount || a.tool.localeCompare(b.tool)),
     fileRollups: [...fileRollups.values()].sort((a, b) => b.writes - a.writes || b.reads - a.reads || a.displayPath.localeCompare(b.displayPath)),
     turnRollups: [...turnRollups.values()].map((rollup) => ({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "codetime-cli",
   "type": "module",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "codetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to codetime.dev.",
   "license": "MIT",
   "publishConfig": {