@jagit/hook-copilot 0.0.4 → 0.0.6

package/dist/index.d.ts

@@ -65,6 +65,7 @@ interface ModelUsageBucket {
     cachedInputTokens: number;
     outputTokens: number;
     totalTokens: number;
+    costUsd: number;
     observations: number;
 }
 interface CopilotDebugUsage {
@@ -75,11 +76,17 @@ interface CopilotDebugUsage {
     cachedInputTokens: number;
     outputTokens: number;
     totalTokens: number;
+    costUsd: number | null;
     sourcePath: string;
     modelUsage: Record<string, ModelUsageBucket>;
 }
 export declare function inferWorkspaceIdBySession(sessionId: string, hookTimestamp?: string, baseDir?: string): WorkspaceCandidate | undefined;
-export declare function resolveDebugUsageBySession(sessionId: string | undefined, hookTimestamp?: string, baseDir?: string): CopilotDebugUsage | undefined;
+interface TranscriptPathLocation {
+    workspaceId: string;
+    sessionId: string;
+}
+export declare function parseTranscriptPathLocation(transcriptPath: string | undefined): TranscriptPathLocation | undefined;
+export declare function resolveDebugUsageBySession(sessionId: string | undefined, hookTimestamp?: string, baseDir?: string, workspaceIdFromTranscript?: string): CopilotDebugUsage | undefined;
 /**
  * Build payload from a real VS Code Copilot agent Stop-hook stdin.
  *
@@ -88,7 +95,7 @@ export declare function resolveDebugUsageBySession(sessionId: string | undefined
  * VS Code Copilot transcript — Copilot uses seat-based billing and does not
  * expose per-call telemetry. These fields are reported as 0/null/"copilot".
  */
-export declare function buildPayloadFromStdin(stdin: CopilotStopStdin, read?: (path: string) => CopilotTranscriptEntry[], resolveUsage?: (sessionId: string | undefined, hookTimestamp?: string) => CopilotDebugUsage | undefined): AgentSessionPayload;
+export declare function buildPayloadFromStdin(stdin: CopilotStopStdin, read?: (path: string) => CopilotTranscriptEntry[], resolveUsage?: (sessionId: string | undefined, hookTimestamp?: string, baseDir?: string, workspaceIdFromTranscript?: string) => CopilotDebugUsage | undefined): AgentSessionPayload;
 /**
  * Build payload in legacy mode (no stdin) — used when hook-copilot is invoked
  * via the old shell-wrapper pattern around the Copilot CLI. Token counts are

package/dist/index.js

@@ -93,6 +93,23 @@ export function inferWorkspaceIdBySession(sessionId, hookTimestamp, baseDir = WO
     }
     return candidates[0];
 }
+export function parseTranscriptPathLocation(transcriptPath) {
+    if (!transcriptPath) {
+        return undefined;
+    }
+    const normalized = transcriptPath.replace(/\\/g, "/");
+    const match = normalized.match(/\/workspaceStorage\/([^/]+)\/GitHub\.copilot-chat\/transcripts\/([^/]+)\.jsonl$/);
+    if (!match) {
+        return undefined;
+    }
+    return {
+        workspaceId: match[1],
+        sessionId: match[2],
+    };
+}
+function buildMainLogPath(baseDir, workspaceId, sessionId) {
+    return join(baseDir, workspaceId, "GitHub.copilot-chat", "debug-logs", sessionId, "main.jsonl");
+}
 function resolveModelFromObject(obj, fallbackModel) {
     const keys = ["model", "modelName", "model_name", "resolvedModel", "deployment", "engine"];
     for (const key of keys) {
@@ -108,7 +125,11 @@ function extractTokensFromObject(obj) {
     let cachedInputTokens = 0;
     let outputTokens = 0;
     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);
@@ -118,11 +139,19 @@ function extractTokensFromObject(obj) {
         if (["inputtokens", "prompttokens", "requesttokens"].includes(key)) {
             inputTokens += value;
             foundAny = true;
+            sawInputKey = true;
+            continue;
+        }
+        if (["cachedinputtokens", "cachereadinputtokens"].includes(key)) {
+            cachedInputTokens += value;
+            foundAny = true;
+            sawCacheReadStyleKey = true;
             continue;
         }
-        if (["cachedinputtokens", "cachedtokens", "cachereadinputtokens", "promptcachehitstokens"].includes(key)) {
+        if (["cachedtokens", "promptcachehitstokens"].includes(key)) {
             cachedInputTokens += value;
             foundAny = true;
+            sawCachedSubsetKey = true;
             continue;
         }
         if (["outputtokens", "completiontokens", "responsetokens"].includes(key)) {
@@ -135,14 +164,25 @@ function extractTokensFromObject(obj) {
             foundAny = true;
             continue;
         }
+        if (["costusd", "cost", "usd", "usdcost"].includes(key)) {
+            costUsd += value;
+            foundAny = true;
+            continue;
+        }
     }
     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 };
+    return { inputTokens, cachedInputTokens, outputTokens, totalTokens, costUsd };
 }
 function collectModelUsage(value, usageByModel, currentModel = "copilot") {
     if (Array.isArray(value)) {
@@ -162,12 +202,14 @@ function collectModelUsage(value, usageByModel, currentModel = "copilot") {
             cachedInputTokens: 0,
             outputTokens: 0,
             totalTokens: 0,
+            costUsd: 0,
             observations: 0,
         };
         existing.inputTokens += tokens.inputTokens;
         existing.cachedInputTokens += tokens.cachedInputTokens;
         existing.outputTokens += tokens.outputTokens;
         existing.totalTokens += tokens.totalTokens;
+        existing.costUsd += tokens.costUsd;
         existing.observations += 1;
         usageByModel.set(resolvedModel, existing);
     }
@@ -175,17 +217,29 @@ function collectModelUsage(value, usageByModel, currentModel = "copilot") {
         collectModelUsage(child, usageByModel, resolvedModel);
     }
 }
-export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = WORKSPACE_STORAGE_DIR) {
+export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = WORKSPACE_STORAGE_DIR, workspaceIdFromTranscript) {
     if (!sessionId) {
         return undefined;
     }
-    const workspace = inferWorkspaceIdBySession(sessionId, hookTimestamp, baseDir);
-    if (!workspace) {
-        return undefined;
+    let workspaceId = workspaceIdFromTranscript;
+    let mainJsonlPath;
+    if (workspaceId) {
+        const pathFromTranscript = buildMainLogPath(baseDir, workspaceId, sessionId);
+        if (existsSync(pathFromTranscript)) {
+            mainJsonlPath = pathFromTranscript;
+        }
     }
-    const mainJsonlPath = join(workspace.debugLogsDir, sessionId, "main.jsonl");
-    if (!existsSync(mainJsonlPath)) {
-        return undefined;
+    if (!mainJsonlPath) {
+        const workspace = inferWorkspaceIdBySession(sessionId, hookTimestamp, baseDir);
+        if (!workspace) {
+            return undefined;
+        }
+        workspaceId = workspace.workspaceId;
+        const fallbackPath = buildMainLogPath(baseDir, workspace.workspaceId, sessionId);
+        if (!existsSync(fallbackPath)) {
+            return undefined;
+        }
+        mainJsonlPath = fallbackPath;
     }
     const usageByModel = new Map();
     const lines = readFileSync(mainJsonlPath, "utf-8").split("\n");
@@ -205,12 +259,13 @@ export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = W
     if (usageByModel.size === 0) {
         return {
             sessionId,
-            workspaceId: workspace.workspaceId,
+            workspaceId: workspaceId ?? "unknown",
             model: "copilot",
             inputTokens: 0,
             cachedInputTokens: 0,
             outputTokens: 0,
             totalTokens: 0,
+            costUsd: null,
             sourcePath: mainJsonlPath,
             modelUsage: {},
         };
@@ -222,11 +277,13 @@ export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = W
     let cachedInputTokens = 0;
     let outputTokens = 0;
     let totalTokens = 0;
+    let totalCostUsd = 0;
     for (const [model, usage] of usageByModel.entries()) {
         inputTokens += usage.inputTokens;
         cachedInputTokens += usage.cachedInputTokens;
         outputTokens += usage.outputTokens;
         totalTokens += usage.totalTokens;
+        totalCostUsd += usage.costUsd;
         if (usage.totalTokens > dominantTotal || (usage.totalTokens === dominantTotal && usage.observations > dominantObs)) {
             dominantModel = model;
             dominantTotal = usage.totalTokens;
@@ -236,12 +293,13 @@ export function resolveDebugUsageBySession(sessionId, hookTimestamp, baseDir = W
     const modelUsage = Object.fromEntries(usageByModel.entries());
     return {
         sessionId,
-        workspaceId: workspace.workspaceId,
+        workspaceId: workspaceId ?? "unknown",
         model: dominantModel,
         inputTokens,
         cachedInputTokens,
         outputTokens,
         totalTokens,
+        costUsd: totalCostUsd > 0 ? totalCostUsd : null,
         sourcePath: mainJsonlPath,
         modelUsage,
     };
@@ -252,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.
@@ -296,11 +373,13 @@ export function buildPayloadFromStdin(stdin, read = readTranscript, resolveUsage
     })() : [];
     const toolCallCount = countToolCalls(entries);
     const startedAt = extractStartTime(entries) ?? stdin.timestamp ?? new Date().toISOString();
-    const usage = resolveUsage(stdin.session_id, stdin.timestamp);
+    const parsedLocation = parseTranscriptPathLocation(stdin.transcript_path);
+    const sessionId = parsedLocation?.sessionId ?? stdin.session_id;
+    const usage = resolveUsage(sessionId, stdin.timestamp, WORKSPACE_STORAGE_DIR, parsedLocation?.workspaceId);
     return {
         tool: "copilot",
         // session_id is optional per VS Code spec; synthesize a fallback if absent
-        sessionId: stdin.session_id ?? `copilot-${Date.now()}-${process.pid}`,
+        sessionId: sessionId ?? `copilot-${Date.now()}-${process.pid}`,
         gitUsername: resolveGitUsername(stdin.cwd),
         // Model/tokens are inferred from debug logs by session_id; falls back safely.
         model: usage?.model ?? "copilot",
@@ -308,7 +387,7 @@ export function buildPayloadFromStdin(stdin, read = readTranscript, resolveUsage
         cachedInputTokens: usage?.cachedInputTokens ?? 0,
         cacheCreationInputTokens: 0,
         outputTokens: usage?.outputTokens ?? 0,
-        costUsd: null,
+        costUsd: usage?.costUsd ?? null,
         toolCallCount,
         startedAt,
         rawPayload: usage ? {

package/package.json

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