@jagit/hook-copilot 0.0.5 → 0.0.6

package/dist/index.js

@@ -127,6 +127,9 @@ function extractTokensFromObject(obj) {
     let totalTokens = 0;
     let costUsd = 0;
     let foundAny = false;
+    let sawInputKey = false;
+    let sawCacheReadStyleKey = false;
+    let sawCachedSubsetKey = false;
     for (const [rawKey, rawValue] of Object.entries(obj)) {
         const key = normalizeKey(rawKey);
         const value = toFiniteNumber(rawValue);
@@ -136,11 +139,19 @@ function extractTokensFromObject(obj) {
         if (["inputtokens", "prompttokens", "requesttokens"].includes(key)) {
             inputTokens += value;
             foundAny = true;
+            sawInputKey = true;
             continue;
         }
-        if (["cachedinputtokens", "cachedtokens", "cachereadinputtokens", "promptcachehitstokens"].includes(key)) {
+        if (["cachedinputtokens", "cachereadinputtokens"].includes(key)) {
             cachedInputTokens += value;
             foundAny = true;
+            sawCacheReadStyleKey = true;
+            continue;
+        }
+        if (["cachedtokens", "promptcachehitstokens"].includes(key)) {
+            cachedInputTokens += value;
+            foundAny = true;
+            sawCachedSubsetKey = true;
             continue;
         }
         if (["outputtokens", "completiontokens", "responsetokens"].includes(key)) {
@@ -162,8 +173,14 @@ function extractTokensFromObject(obj) {
     if (!foundAny) {
         return null;
     }
+    // Some providers report inputTokens as total prompt tokens and expose cached
+    // tokens as a subset. Convert to non-cached input tokens to match JaGit's
+    // input/cached split and avoid double-counting in aggregates.
+    if (sawInputKey && sawCachedSubsetKey && !sawCacheReadStyleKey) {
+        inputTokens = Math.max(0, inputTokens - cachedInputTokens);
+    }
     if (totalTokens === 0) {
-        totalTokens = inputTokens + outputTokens;
+        totalTokens = inputTokens + cachedInputTokens + outputTokens;
     }
     return { inputTokens, cachedInputTokens, outputTokens, totalTokens, costUsd };
 }
@@ -293,14 +310,33 @@ export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = W
  * we sum the total number of individual tool requests across all turns.
  */
 function countToolCalls(entries) {
-    let count = 0;
+    const toolCallIds = new Set();
+    let anonymousCalls = 0;
     for (const e of entries) {
-        if (e.type !== "assistant.message")
+        if (e.type === "assistant.message") {
+            const msg = e;
+            for (const req of msg.data?.toolRequests ?? []) {
+                if (typeof req.toolCallId === "string" && req.toolCallId.length > 0) {
+                    toolCallIds.add(req.toolCallId);
+                }
+                else {
+                    anonymousCalls += 1;
+                }
+            }
             continue;
-        const msg = e;
-        count += msg.data?.toolRequests?.length ?? 0;
+        }
+        if (e.type === "tool.execution_start" || e.type === "tool.execution_complete") {
+            const data = isRecord(e.data) ? e.data : undefined;
+            const toolCallId = data?.toolCallId;
+            if (typeof toolCallId === "string" && toolCallId.length > 0) {
+                toolCallIds.add(toolCallId);
+            }
+            else {
+                anonymousCalls += 1;
+            }
+        }
     }
-    return count;
+    return toolCallIds.size + anonymousCalls;
 }
 /**
  * Extract the earliest timestamp from the transcript.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jagit/hook-copilot",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "bin": {
     "jagit-hook-copilot": "dist/index.js"
@@ -9,7 +9,7 @@
     "dist"
   ],
   "dependencies": {
-    "@jagit/agent-reporter": "0.0.5"
+    "@jagit/agent-reporter": "0.0.6"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",