@jagit/hook-copilot 0.0.5 → 0.0.7

package/dist/index.d.ts

@@ -80,6 +80,31 @@ interface CopilotDebugUsage {
     sourcePath: string;
     modelUsage: Record<string, ModelUsageBucket>;
 }
+/** Resolves the root workspaceStorage directory for the current platform. */
+export interface WorkspaceStorageResolver {
+    resolve(): string;
+}
+/** Linux: ~/.config/Code/User/workspaceStorage */
+export declare class LinuxWorkspaceStorageResolver implements WorkspaceStorageResolver {
+    resolve(): string;
+}
+/** macOS: ~/Library/Application Support/Code/User/workspaceStorage */
+export declare class MacOSWorkspaceStorageResolver implements WorkspaceStorageResolver {
+    resolve(): string;
+}
+/**
+ * Windows: %APPDATA%\Code\User\workspaceStorage
+ * Falls back to %USERPROFILE%\AppData\Roaming when APPDATA is unset.
+ */
+export declare class WindowsWorkspaceStorageResolver implements WorkspaceStorageResolver {
+    resolve(): string;
+}
+/**
+ * Returns the appropriate WorkspaceStorageResolver for the current OS.
+ * Override in tests by passing a custom resolver directly to the functions
+ * that accept a `baseDir` parameter.
+ */
+export declare function platformWorkspaceStorageResolver(): WorkspaceStorageResolver;
 export declare function inferWorkspaceIdBySession(sessionId: string, hookTimestamp?: string, baseDir?: string): WorkspaceCandidate | undefined;
 interface TranscriptPathLocation {
     workspaceId: string;

package/dist/index.js

@@ -1,10 +1,48 @@
 #!/usr/bin/env node
 import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
-import { homedir } from "node:os";
+import { homedir, platform } from "node:os";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { resolveGitUsername, reportSession } from "@jagit/agent-reporter";
-const WORKSPACE_STORAGE_DIR = join(homedir(), ".config", "Code", "User", "workspaceStorage");
+/** Linux: ~/.config/Code/User/workspaceStorage */
+export class LinuxWorkspaceStorageResolver {
+    resolve() {
+        return join(homedir(), ".config", "Code", "User", "workspaceStorage");
+    }
+}
+/** macOS: ~/Library/Application Support/Code/User/workspaceStorage */
+export class MacOSWorkspaceStorageResolver {
+    resolve() {
+        return join(homedir(), "Library", "Application Support", "Code", "User", "workspaceStorage");
+    }
+}
+/**
+ * Windows: %APPDATA%\Code\User\workspaceStorage
+ * Falls back to %USERPROFILE%\AppData\Roaming when APPDATA is unset.
+ */
+export class WindowsWorkspaceStorageResolver {
+    resolve() {
+        const appData = process.env["APPDATA"] ??
+            join(homedir(), "AppData", "Roaming");
+        return join(appData, "Code", "User", "workspaceStorage");
+    }
+}
+/**
+ * Returns the appropriate WorkspaceStorageResolver for the current OS.
+ * Override in tests by passing a custom resolver directly to the functions
+ * that accept a `baseDir` parameter.
+ */
+export function platformWorkspaceStorageResolver() {
+    switch (platform()) {
+        case "darwin":
+            return new MacOSWorkspaceStorageResolver();
+        case "win32":
+            return new WindowsWorkspaceStorageResolver();
+        default:
+            return new LinuxWorkspaceStorageResolver();
+    }
+}
+const WORKSPACE_STORAGE_DIR = platformWorkspaceStorageResolver().resolve();
 // ─── Helpers ─────────────────────────────────────────────────────────────────
 function readTranscript(path) {
     return readFileSync(path, "utf-8")
@@ -127,6 +165,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 +177,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 +211,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 +348,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.7",
   "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.7"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",
@@ -18,6 +18,7 @@
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest run"
+    "test": "vitest run",
+    "test:live": "tsx scripts/test-live.ts"
   }
 }