vibestats 1.0.23 → 1.2.0

package/dist/index.js

@@ -6,10 +6,17 @@ import { defineCommand, runMain } from "citty";
 // src/usage/loader.ts
 import { promises as fs } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { join, basename } from "path";
 
 // src/pricing.ts
 var MODEL_PRICING = {
+  // Opus 4.6 (same pricing as Opus 4.5)
+  "claude-opus-4-6-20260101": {
+    input: 5,
+    output: 25,
+    cacheWrite: 6.25,
+    cacheRead: 0.5
+  },
   // Opus 4.5 (cheaper than Opus 4.1)
   "claude-opus-4-5-20251101": {
     input: 5,
@@ -63,6 +70,9 @@ function getModelPricing(modelName) {
   if (MODEL_PRICING[modelName]) {
     return MODEL_PRICING[modelName];
   }
+  if (modelName.includes("opus-4-6") || modelName.includes("opus-4.6")) {
+    return MODEL_PRICING["claude-opus-4-6-20260101"];
+  }
   if (modelName.includes("opus-4-5") || modelName.includes("opus-4.5")) {
     return MODEL_PRICING["claude-opus-4-5-20251101"];
   }
@@ -84,6 +94,7 @@ function getModelPricing(modelName) {
   return MODEL_PRICING["claude-sonnet-4-5-20250929"];
 }
 function getModelDisplayName(modelName) {
+  if (modelName.includes("opus-4-6") || modelName.includes("opus-4.6")) return "Opus 4.6";
   if (modelName.includes("opus-4-5") || modelName.includes("opus-4.5")) return "Opus 4.5";
   if (modelName.includes("opus-4-1") || modelName.includes("opus-4.1")) return "Opus 4.1";
   if (modelName.includes("opus")) return "Opus";
@@ -98,7 +109,18 @@ function getModelDisplayName(modelName) {
 
 // src/codex-pricing.ts
 var CODEX_MODEL_PRICING = {
-  // GPT-5.2 (latest flagship)
+  // GPT-5.3 (latest flagship, assumed same pricing as GPT-5.2)
+  "gpt-5.3": {
+    input: 1.75,
+    output: 14,
+    cachedInput: 0.175
+  },
+  "gpt-5.3-codex": {
+    input: 1.75,
+    output: 14,
+    cachedInput: 0.175
+  },
+  // GPT-5.2
   // Cached input is ~10% of input price (prompt caching discount)
   "gpt-5.2": {
     input: 1.75,
@@ -177,6 +199,9 @@ function getCodexModelPricing(modelName) {
     return CODEX_MODEL_PRICING[modelName];
   }
   const normalized = modelName.toLowerCase();
+  if (normalized.includes("5.3")) {
+    return CODEX_MODEL_PRICING["gpt-5.3"];
+  }
   if (normalized.includes("5.2")) {
     return CODEX_MODEL_PRICING["gpt-5.2"];
   }
@@ -208,6 +233,8 @@ function getCodexModelPricing(modelName) {
 }
 function getCodexModelDisplayName(modelName) {
   const normalized = modelName.toLowerCase();
+  if (normalized.includes("5.3") && normalized.includes("pro")) return "GPT-5.3 Pro";
+  if (normalized.includes("5.3")) return "GPT-5.3";
   if (normalized.includes("5.2") && normalized.includes("pro")) return "GPT-5.2 Pro";
   if (normalized.includes("5.2")) return "GPT-5.2";
   if (normalized.includes("5.1") && normalized.includes("max")) return "GPT-5.1 Max";
@@ -289,16 +316,38 @@ async function findJsonlFiles(dir, visited = /* @__PURE__ */ new Set(), depth =
   }
   return result;
 }
-async function parseClaudeJsonl() {
+async function resolveProjectDir(projectsDir, cwd) {
+  let current = cwd;
+  while (current && current !== "/") {
+    const encoded = current.replace(/\//g, "-");
+    const candidate = join(projectsDir, encoded);
+    if (await pathExists(candidate)) return candidate;
+    const parent = join(current, "..");
+    if (parent === current) break;
+    current = parent;
+  }
+  return null;
+}
+async function parseClaudeJsonl(projectFilter) {
   const entries = [];
   const seenMessageIds = /* @__PURE__ */ new Set();
   const claudeDir = getClaudeDir();
   const projectsDir = join(claudeDir, "projects");
   if (!await pathExists(projectsDir)) return entries;
-  const jsonlFiles = await findJsonlFiles(projectsDir);
+  let searchDir;
+  if (projectFilter) {
+    const resolved = await resolveProjectDir(projectsDir, projectFilter);
+    if (!resolved) return entries;
+    searchDir = resolved;
+  } else {
+    searchDir = projectsDir;
+  }
+  const jsonlFiles = await findJsonlFiles(searchDir);
   for (const filePath of jsonlFiles) {
+    const sessionId = basename(filePath, ".jsonl");
     try {
       const content = await fs.readFile(filePath, "utf-8");
+      if (!content.trim()) continue;
       const lines = content.split("\n");
       for (const line of lines) {
         if (!line.trim()) continue;
@@ -329,7 +378,9 @@ async function parseClaudeJsonl() {
             cacheWriteTokens,
             cacheReadTokens,
             cost,
-            source: "claude"
+            source: "claude",
+            sessionId,
+            timestamp
           });
         } catch {
         }
@@ -403,6 +454,7 @@ function filterByDateRange(entries, since, until) {
 }
 function sortModelsByTier(models) {
   const tierPriority = {
+    "Opus 4.6": 101,
     "Opus 4.5": 100,
     "Opus 4.1": 99,
     "Opus": 98,
@@ -412,6 +464,7 @@ function sortModelsByTier(models) {
     "Haiku 4.5": 80,
     "Haiku 3.5": 79,
     "Haiku": 78,
+    "GPT-5.3": 71,
     "GPT-5.2": 70,
     "GPT-5.1 Max": 69,
     "GPT-5.1": 68,
@@ -513,6 +566,50 @@ function aggregateByModel(entries) {
   }
   return Array.from(modelMap.values()).sort((a, b) => b.totalTokens - a.totalTokens);
 }
+function aggregateBySession(entries) {
+  const sessionMap = /* @__PURE__ */ new Map();
+  for (const e of entries) {
+    const sid = e.sessionId || "unknown";
+    const existing = sessionMap.get(sid);
+    if (existing) {
+      existing.inputTokens += e.inputTokens;
+      existing.outputTokens += e.outputTokens;
+      existing.cacheWriteTokens += e.cacheWriteTokens;
+      existing.cacheReadTokens += e.cacheReadTokens;
+      existing.totalTokens += e.inputTokens + e.outputTokens + e.cacheWriteTokens + e.cacheReadTokens;
+      existing.cost += e.cost;
+      existing.modelsSet.add(e.model);
+      if (e.timestamp && e.timestamp < existing.firstTimestamp) {
+        existing.firstTimestamp = e.timestamp;
+      }
+    } else {
+      sessionMap.set(sid, {
+        modelsSet: /* @__PURE__ */ new Set([e.model]),
+        inputTokens: e.inputTokens,
+        outputTokens: e.outputTokens,
+        cacheWriteTokens: e.cacheWriteTokens,
+        cacheReadTokens: e.cacheReadTokens,
+        totalTokens: e.inputTokens + e.outputTokens + e.cacheWriteTokens + e.cacheReadTokens,
+        cost: e.cost,
+        firstTimestamp: e.timestamp || ""
+      });
+    }
+  }
+  return Array.from(sessionMap.entries()).filter(([, data]) => data.totalTokens > 0).map(([sessionId, data]) => {
+    const date = data.firstTimestamp ? toLocalDateString(data.firstTimestamp) : "unknown";
+    const shortId = sessionId.slice(0, 12);
+    return {
+      key: `${date} ${shortId}`,
+      inputTokens: data.inputTokens,
+      outputTokens: data.outputTokens,
+      cacheWriteTokens: data.cacheWriteTokens,
+      cacheReadTokens: data.cacheReadTokens,
+      totalTokens: data.totalTokens,
+      cost: data.cost,
+      models: sortModelsByTier(Array.from(data.modelsSet))
+    };
+  }).sort((a, b) => a.key.localeCompare(b.key));
+}
 function computeTotals(rows) {
   return rows.reduce(
     (acc, row) => ({
@@ -547,10 +644,10 @@ function computeModelBreakdown(entries) {
   })).sort((a, b) => b.tokens - a.tokens);
 }
 async function loadUsageStats(options) {
-  const { aggregation, since, until, codexOnly, combined } = options;
+  const { aggregation, since, until, codexOnly, combined, projectFilter } = options;
   let entries = [];
   if (!codexOnly) {
-    entries = entries.concat(await parseClaudeJsonl());
+    entries = entries.concat(await parseClaudeJsonl(projectFilter));
   }
   if (codexOnly || combined) {
     entries = entries.concat(await parseCodexJsonl());
@@ -576,6 +673,9 @@ async function loadUsageStats(options) {
     case "model":
       rows = aggregateByModel(entries);
       break;
+    case "session":
+      rows = aggregateBySession(entries);
+      break;
     case "total":
       rows = [];
       break;
@@ -644,13 +744,16 @@ function displayUsageTable(stats, options = {}) {
   let title = "Claude Code Usage";
   if (stats.source === "codex") title = "Codex CLI Usage";
   else if (stats.source === "combined") title = "AI Coding Usage (Claude + Codex)";
-  const aggLabel = stats.aggregation === "daily" ? "Daily" : stats.aggregation === "monthly" ? "Monthly" : stats.aggregation === "model" ? "By Model" : "Total";
+  const aggLabel = stats.aggregation === "daily" ? "Daily" : stats.aggregation === "monthly" ? "Monthly" : stats.aggregation === "model" ? "By Model" : stats.aggregation === "session" ? "By Session" : "Total";
   console.log(`${c.orange}${c.bold}${title} - ${aggLabel} Report${c.reset}`);
   console.log(`${c.gray}Date range: ${stats.dateRange.start} to ${stats.dateRange.end}${c.reset}`);
   console.log(`${c.gray}${"\u2500".repeat(Math.min(termWidth - 2, 120))}${c.reset}`);
   console.log();
-  const headers = useCompact ? ["Date", "Input", "Output", "Total", ...hideCost ? [] : ["Cost"]] : ["Date", "", "Input", "Output", "Cache W", "Cache R", "Total", ...hideCost ? [] : ["Cost"]];
-  const widths = useCompact ? [12, 14, 12, 16, ...hideCost ? [] : [12]] : [12, 16, 14, 12, 14, 14, 16, ...hideCost ? [] : [12]];
+  const isSession = stats.aggregation === "session";
+  const firstCol = isSession ? "Session" : "Date";
+  const firstWidth = isSession ? 24 : 12;
+  const headers = useCompact ? [firstCol, "Input", "Output", "Total", ...hideCost ? [] : ["Cost"]] : [firstCol, "", "Input", "Output", "Cache W", "Cache R", "Total", ...hideCost ? [] : ["Cost"]];
+  const widths = useCompact ? [firstWidth, 14, 12, 16, ...hideCost ? [] : [12]] : [firstWidth, 16, 14, 12, 14, 14, 16, ...hideCost ? [] : [12]];
   const headerRow = headers.map((h, i) => padLeft(h, widths[i])).join(" ");
   console.log(`${c.bold}${headerRow}${c.reset}`);
   for (const row of stats.rows) {
@@ -659,7 +762,7 @@ function displayUsageTable(stats, options = {}) {
     const remainingModels = models.slice(1);
     if (useCompact) {
       const cols = [
-        padRight(row.key.slice(0, 12), widths[0]),
+        padRight(row.key.slice(0, firstWidth), widths[0]),
         padLeft(formatNumber(row.inputTokens), widths[1]),
         padLeft(formatNumber(row.outputTokens), widths[2]),
         padLeft(formatNumber(row.totalTokens), widths[3]),
@@ -669,7 +772,7 @@ function displayUsageTable(stats, options = {}) {
     } else {
       const modelDisplay = firstModel ? `- ${firstModel}` : "";
       const cols = [
-        padRight(row.key.slice(0, 12), widths[0]),
+        padRight(row.key.slice(0, firstWidth), widths[0]),
         padRight(modelDisplay.slice(0, 16), widths[1]),
         padLeft(formatNumber(row.inputTokens), widths[2]),
         padLeft(formatNumber(row.outputTokens), widths[3]),
@@ -1957,6 +2060,18 @@ var main = defineCommand({
       description: "Generate a shareable URL (usage mode)",
       default: false
     },
+    // Project and session filtering
+    project: {
+      type: "boolean",
+      alias: "p",
+      description: "Show stats for the current project only",
+      default: false
+    },
+    sessions: {
+      type: "boolean",
+      description: "Show per-session breakdown",
+      default: false
+    },
     // Wrapped-specific options
     url: {
       type: "string",
@@ -1999,7 +2114,8 @@ var main = defineCommand({
 });
 async function runUsage(args, config) {
   let aggregation = "daily";
-  if (args.monthly) aggregation = "monthly";
+  if (args.sessions) aggregation = "session";
+  else if (args.monthly) aggregation = "monthly";
   else if (args.model) aggregation = "model";
   else if (args.total) aggregation = "total";
   const spinner = createSpinner("Loading vibestats...");
@@ -2009,7 +2125,8 @@ async function runUsage(args, config) {
       since: args.since,
       until: args.until,
       codexOnly: args.codex,
-      combined: args.combined
+      combined: args.combined,
+      projectFilter: args.project ? process.cwd() : void 0
     })
   );
   if (!stats) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vibestats",
-  "version": "1.0.23",
+  "version": "1.2.0",
   "description": "AI coding stats - usage tracking and annual wrapped for Claude Code & Codex",
   "type": "module",
   "main": "./dist/index.js",