@vibe-cafe/vibe-usage 0.6.1 → 0.6.3

package/README.md

@@ -5,7 +5,7 @@ Track your AI coding tool token usage and sync to [vibecafe.ai](https://vibecafe
 ## Quick Start
 
 ```bash
-npx vibe-usage
+npx @vibe-cafe/vibe-usage
 ```
 
 This will:
@@ -16,13 +16,13 @@ This will:
 ## Commands
 
 ```bash
-npx vibe-usage              # Init (first run) or sync (subsequent runs)
-npx vibe-usage init         # Re-run setup
-npx vibe-usage sync         # Manual sync
-npx vibe-usage daemon       # Continuous sync (every 5 minutes)
-npx vibe-usage reset        # Delete all data and re-upload from local logs
-npx vibe-usage reset --local  # Delete this host's data only and re-upload
-npx vibe-usage status       # Show config & detected tools
+npx @vibe-cafe/vibe-usage              # Init (first run) or sync (subsequent runs)
+npx @vibe-cafe/vibe-usage init         # Re-run setup
+npx @vibe-cafe/vibe-usage sync         # Manual sync
+npx @vibe-cafe/vibe-usage daemon       # Continuous sync (every 5 minutes)
+npx @vibe-cafe/vibe-usage reset        # Delete all data and re-upload from local logs
+npx @vibe-cafe/vibe-usage reset --local  # Delete this host's data only and re-upload
+npx @vibe-cafe/vibe-usage status       # Show config & detected tools
 ```
 
 ## Supported Tools
@@ -31,6 +31,7 @@ npx vibe-usage status       # Show config & detected tools
 |------|---------------|
 | Claude Code | `~/.claude/projects/` (tokens + sessions), `~/.claude/transcripts/` (sessions only) |
 | Codex CLI | `~/.codex/sessions/` |
+| GitHub Copilot CLI | `~/.copilot/session-state/*/events.jsonl` |
 | Gemini CLI | `~/.gemini/tmp/` |
 | OpenCode | `~/.local/share/opencode/opencode.db` (SQLite, `json_extract` query) |
 | OpenClaw | `~/.openclaw/agents/` |
@@ -41,18 +42,18 @@ npx vibe-usage status       # Show config & detected tools
 
 - Parses local session logs from each AI coding tool
 - Aggregates token usage into 30-minute buckets
-- Extracts session metadata from all 7 parsers: active time (sum of turn durations), total duration, message counts
+- Extracts session metadata from all 8 parsers: active time (AI generation time, excluding queue/TTFT wait), total duration, message counts
 - Uploads buckets + sessions to your vibecafe.ai dashboard
 - Stateless: computes full totals from local logs each sync (idempotent, no state files)
-- For continuous syncing, use `npx vibe-usage daemon` or the [Vibe Usage Mac app](https://github.com/vibe-cafe/vibe-usage-app)
+- For continuous syncing, use `npx @vibe-cafe/vibe-usage daemon` or the [Vibe Usage Mac app](https://github.com/vibe-cafe/vibe-usage-app)
 
 ## Development
 
 Test against a local vibe-cafe dev server without publishing:
 
 ```bash
-VIBE_USAGE_DEV=1 VIBE_USAGE_API_URL=http://localhost:3000 npx vibe-usage init
-VIBE_USAGE_DEV=1 npx vibe-usage sync
+VIBE_USAGE_DEV=1 VIBE_USAGE_API_URL=http://localhost:3000 npx @vibe-cafe/vibe-usage init
+VIBE_USAGE_DEV=1 npx @vibe-cafe/vibe-usage sync
 ```
 
 `VIBE_USAGE_DEV=1` uses a separate config file (`~/.vibe-usage/config.dev.json`).
@@ -66,10 +67,10 @@ Config stored at `~/.vibe-usage/config.json` (dev: `config.dev.json`). Contains
 Run continuous syncing in the foreground (every 5 minutes):
 
 ```bash
-npx vibe-usage daemon
+npx @vibe-cafe/vibe-usage daemon
 ```
 
-Press Ctrl+C to stop. For background use: `nohup npx vibe-usage daemon &`
+Press Ctrl+C to stop. For background use: `nohup npx @vibe-cafe/vibe-usage daemon &`
 
 ## License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibe-cafe/vibe-usage",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Track your AI coding tool token usage and sync to vibecafe.ai",
   "type": "module",
   "bin": {

package/src/index.js

@@ -8,7 +8,7 @@ async function showStatus() {
 
   if (!config?.apiKey) {
     console.log('  Config: not configured');
-    console.log(`  Run \`npx vibe-usage init\` to set up.\n`);
+    console.log(`  Run \`npx @vibe-cafe/vibe-usage init\` to set up.\n`);
   } else {
     console.log(`  Config: ${getConfigPath()}`);
     console.log(`  API key: ${config.apiKey.slice(0, 8)}...`);
@@ -128,17 +128,17 @@ export async function run(args) {
   vibe-usage - Vibe Usage Tracker by VibeCafé
 
   Usage:
-    npx vibe-usage              Init (first run) or sync
-    npx vibe-usage init         Set up API key
-    npx vibe-usage sync         Manually sync usage data
-    npx vibe-usage daemon       Continuous sync (every 5m)
-    npx vibe-usage reset        Delete all data and re-upload
-    npx vibe-usage reset --local  Delete data for this host only and re-upload
-    npx vibe-usage status       Show config and detected tools
-    npx vibe-usage config show  Show full config as JSON
-    npx vibe-usage config get <key>   Get a config value
-    npx vibe-usage config set <key> <value>  Set a config value
-    npx vibe-usage help         Show this help
+    npx @vibe-cafe/vibe-usage              Init (first run) or sync
+    npx @vibe-cafe/vibe-usage init         Set up API key
+    npx @vibe-cafe/vibe-usage sync         Manually sync usage data
+    npx @vibe-cafe/vibe-usage daemon       Continuous sync (every 5m)
+    npx @vibe-cafe/vibe-usage reset        Delete all data and re-upload
+    npx @vibe-cafe/vibe-usage reset --local  Delete data for this host only and re-upload
+    npx @vibe-cafe/vibe-usage status       Show config and detected tools
+    npx @vibe-cafe/vibe-usage config show  Show full config as JSON
+    npx @vibe-cafe/vibe-usage config get <key>   Get a config value
+    npx @vibe-cafe/vibe-usage config set <key> <value>  Set a config value
+    npx @vibe-cafe/vibe-usage help         Show this help
 `);
       break;
     }

package/src/parsers/copilot-cli.js

@@ -0,0 +1,128 @@
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { basename, join } from 'node:path';
+import { homedir } from 'node:os';
+import { aggregateToBuckets, extractSessions } from './index.js';
+
+const SESSION_STATE_DIR = join(homedir(), '.copilot', 'session-state');
+
+function findEventFiles(baseDir) {
+  const results = [];
+  if (!existsSync(baseDir)) return results;
+
+  try {
+    for (const entry of readdirSync(baseDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) continue;
+
+      const eventsFile = join(baseDir, entry.name, 'events.jsonl');
+      if (existsSync(eventsFile)) {
+        results.push({ filePath: eventsFile, sessionId: entry.name });
+      }
+    }
+  } catch {
+    return results;
+  }
+
+  return results;
+}
+
+function getProjectFromContext(context) {
+  const projectPath = context?.gitRoot || context?.cwd;
+  if (!projectPath) return 'unknown';
+
+  return basename(projectPath) || 'unknown';
+}
+
+/**
+ * Parse GitHub Copilot CLI session logs from ~/.copilot/session-state.
+ * Returns usage buckets from session shutdown summaries and session metadata
+ * from user/assistant message timings.
+ */
+export async function parse() {
+  const eventFiles = findEventFiles(SESSION_STATE_DIR);
+  if (eventFiles.length === 0) return { buckets: [], sessions: [] };
+
+  const entries = [];
+  const sessionEvents = [];
+
+  for (const { filePath, sessionId } of eventFiles) {
+    let content;
+    try {
+      content = readFileSync(filePath, 'utf-8');
+    } catch {
+      continue;
+    }
+
+    let currentProject = 'unknown';
+
+    for (const line of content.split('\n')) {
+      if (!line.trim()) continue;
+
+      try {
+        const obj = JSON.parse(line);
+        const timestamp = obj.timestamp ? new Date(obj.timestamp) : null;
+        const hasTimestamp = timestamp && !isNaN(timestamp.getTime());
+
+        if (obj.type === 'session.start' || obj.type === 'session.resume') {
+          currentProject = getProjectFromContext(obj.data?.context);
+        }
+
+        if (hasTimestamp && obj.type === 'user.message') {
+          sessionEvents.push({
+            sessionId,
+            source: 'copilot-cli',
+            project: currentProject,
+            timestamp,
+            role: 'user',
+          });
+        }
+
+        if (hasTimestamp && obj.type === 'assistant.message') {
+          sessionEvents.push({
+            sessionId,
+            source: 'copilot-cli',
+            project: currentProject,
+            timestamp,
+            role: 'assistant',
+          });
+        }
+
+        if (obj.type !== 'session.shutdown' || !hasTimestamp) continue;
+
+        const modelMetrics = obj.data?.modelMetrics || {};
+        for (const [model, metrics] of Object.entries(modelMetrics)) {
+          const usage = metrics?.usage;
+          if (!usage) continue;
+
+          const totalInput = usage.inputTokens || 0;
+          const cachedRead = usage.cacheReadTokens || 0;
+          const cacheWrite = usage.cacheWriteTokens || 0;
+          const output = usage.outputTokens || 0;
+
+          if (totalInput === 0 && cachedRead === 0 && cacheWrite === 0 && output === 0) {
+            continue;
+          }
+
+          entries.push({
+            source: 'copilot-cli',
+            model,
+            project: currentProject,
+            timestamp,
+            // Copilot reports cache reads separately, but cache writes are part of
+            // regular input for this schema because buckets don't have a dedicated field.
+            inputTokens: Math.max(0, totalInput - cachedRead),
+            outputTokens: output,
+            cachedInputTokens: cachedRead,
+            reasoningOutputTokens: 0,
+          });
+        }
+      } catch {
+        continue;
+      }
+    }
+  }
+
+  return {
+    buckets: aggregateToBuckets(entries),
+    sessions: extractSessions(sessionEvents),
+  };
+}

package/src/parsers/index.js

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto';
 import { parse as parseClaudeCode } from './claude-code.js';
 import { parse as parseCodex } from './codex.js';
+import { parse as parseCopilotCli } from './copilot-cli.js';
 import { parse as parseGeminiCli } from './gemini-cli.js';
 import { parse as parseOpencode } from './opencode.js';
 import { parse as parseOpenclaw } from './openclaw.js';
@@ -10,6 +11,7 @@ import { parse as parseKimiCode } from './kimi-code.js';
 export const parsers = {
   'claude-code': parseClaudeCode,
   'codex': parseCodex,
+  'copilot-cli': parseCopilotCli,
   'gemini-cli': parseGeminiCli,
   'opencode': parseOpencode,
   'openclaw': parseOpenclaw,
@@ -60,8 +62,9 @@ export function aggregateToBuckets(entries) {
  * Extract session metadata from timing events.
  * Each event: { sessionId, source, project, timestamp: Date, role: 'user'|'assistant' }
  *
- * Turn = user prompt → last agent message before next user prompt.
- * activeSeconds = sum(turn durations). durationSeconds = wall clock.
+ * Turn = first AI response → last AI response before next user prompt.
+ * activeSeconds = sum(generation durations), excluding queue/TTFT wait.
+ * durationSeconds = wall clock from first to last message.
  */
 export function extractSessions(events) {
   const groups = new Map();
@@ -81,14 +84,20 @@ export function extractSessions(events) {
     let activeSeconds = 0;
     let turnStart = null;
     let turnEnd = null;
+    let waitingForFirstResponse = false;
 
     for (const event of sessionEvents) {
       if (event.role === 'user') {
         if (turnStart !== null && turnEnd !== null && turnEnd > turnStart) {
           activeSeconds += Math.round((turnEnd - turnStart) / 1000);
         }
+        turnStart = null;
+        turnEnd = null;
+        waitingForFirstResponse = true;
+      } else if (waitingForFirstResponse) {
         turnStart = event.timestamp;
         turnEnd = event.timestamp;
+        waitingForFirstResponse = false;
       } else if (turnStart !== null) {
         turnEnd = event.timestamp;
       }

package/src/tools.js

@@ -13,6 +13,11 @@ export const TOOLS = [
     id: 'codex',
     dataDir: join(homedir(), '.codex', 'sessions'),
   },
+  {
+    name: 'GitHub Copilot CLI',
+    id: 'copilot-cli',
+    dataDir: join(homedir(), '.copilot', 'session-state'),
+  },
   {
     name: 'Gemini CLI',
     id: 'gemini-cli',