getaimeter 0.11.2 → 0.11.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "getaimeter",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Track AI coding costs across Claude, Cursor, Codex, Copilot, and Gemini. MCP server, billing blocks, optimization recommendations.",
   "bin": {
     "aimeter": "cli.js",

package/watcher.js

@@ -207,6 +207,11 @@ function getConversationMeta(filePath) {
           projectPath = obj.payload.cwd;
           break;
         }
+        // Copilot: session.start stores cwd at data.context.cwd
+        if (obj.type === 'session.start' && obj.data?.context?.cwd) {
+          projectPath = obj.data.context.cwd;
+          break;
+        }
       } catch {}
     }
   } catch {}
@@ -343,30 +348,6 @@ function extractNewUsage(filePath) {
         continue;
       }
 
-      // ── Copilot VS Code agent: real-time per-turn output tracking ──
-      // assistant.message fires after every AI response with data.outputTokens.
-      // Input tokens are not available per-turn — they come from session.shutdown.
-      if (obj.type === 'assistant.message' && obj.data?.outputTokens > 0) {
-        const msgId = obj.data.messageId;
-        const hashKey = `${filePath}:copilot-msg:${msgId}`;
-        const hash = crypto.createHash('md5').update(hashKey).digest('hex');
-        if (isDuplicate(hash)) continue;
-
-        usageEvents.push({
-          provider:         'github',
-          model:            'copilot',
-          source:           detectSource(filePath),
-          inputTokens:      0,
-          outputTokens:     obj.data.outputTokens,
-          thinkingTokens:   0,
-          cacheReadTokens:  0,
-          cacheWriteTokens: 0,
-          conversationId:   convMeta.conversationId,
-          projectPath:      convMeta.projectPath,
-        });
-        continue;
-      }
-
       // ── Copilot format (old: token_usage, new: session.shutdown with modelMetrics) ──
       if (obj.type === 'token_usage' && (obj.input_tokens !== undefined || obj.output_tokens !== undefined)) {
         const copilotModel = obj.model || 'copilot';
@@ -390,18 +371,20 @@ function extractNewUsage(filePath) {
       }
 
       // GitHub Copilot agent: session.shutdown reports the per-model session totals.
-      // Output tokens were already reported turn-by-turn via assistant.message above,
-      // so here we only emit input tokens (+ cache) to avoid double-counting output.
+      // We report full tokens (input + output) here with real model names.
+      // assistant.message per-turn events are intentionally skipped — they don't
+      // include a model field, which would cause all output to be misattributed
+      // to a generic "copilot" entry instead of the actual model used.
       if (obj.type === 'session.shutdown' && obj.data?.modelMetrics) {
         for (const [model, metrics] of Object.entries(obj.data.modelMetrics)) {
           const u = metrics.usage || {};
-          const inputTokens    = u.inputTokens    || 0;
+          const inputTokens      = u.inputTokens      || 0;
+          const outputTokens     = u.outputTokens     || 0;
           const cacheReadTokens  = u.cacheReadTokens  || 0;
           const cacheWriteTokens = u.cacheWriteTokens || 0;
-          // Skip if no input data (output was already handled per-turn)
-          if (inputTokens === 0 && cacheReadTokens === 0) continue;
+          if (inputTokens === 0 && outputTokens === 0 && cacheReadTokens === 0) continue;
 
-          const hashKey = `${filePath}:copilot-shutdown-input:${model}:${inputTokens}`;
+          const hashKey = `${filePath}:copilot-shutdown:${model}:${inputTokens}:${outputTokens}`;
           const hash = crypto.createHash('md5').update(hashKey).digest('hex');
           if (isDuplicate(hash)) continue;
 
@@ -416,7 +399,7 @@ function extractNewUsage(filePath) {
             model,
             source:           detectSource(filePath),
             inputTokens,
-            outputTokens:     0, // already reported per assistant.message turn
+            outputTokens,
             thinkingTokens:   0,
             cacheReadTokens,
             cacheWriteTokens,