storyforge 0.4.17 → 0.4.19

package/dist/{cli-usage-LUATWFYP.js → cli-usage-NX33FYQ6.js}

@@ -4,22 +4,22 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
+import { loadSessionBlockData } from "ccusage/data-loader";
 var PRICES = {
-  // Anthropic — per claude.com/pricing (April 2026)
+  // Anthropic — claude.com/pricing
   "claude-opus-4-7": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
   "claude-opus-4-6": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
   "claude-opus-4-5": { input: 5, output: 25, cacheRead: 0.5, cacheWrite: 6.25 },
   "claude-sonnet-4-6": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
   "claude-sonnet-4-5": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
   "claude-haiku-4-5": { input: 1, output: 5, cacheRead: 0.1, cacheWrite: 1.25 },
-  // OpenAI — per platform.openai.com/pricing (April 2026)
+  // OpenAI — platform.openai.com/pricing
   "gpt-5.5": { input: 5, output: 30 },
   "gpt-5.4": { input: 2.5, output: 15 },
   "gpt-5.4-mini": { input: 0.75, output: 4.5 },
   "gpt-5.4-nano": { input: 0.2, output: 1.25 },
   "gpt-5": { input: 2.5, output: 15 },
   "gpt-5-codex": { input: 2.5, output: 15 },
-  // alias of gpt-5
   "gpt-4o": { input: 2.5, output: 10 }
 };
 function priceFor(model) {
@@ -30,24 +30,30 @@ function priceFor(model) {
   }
   return null;
 }
+function computeCost(model, u) {
+  const p = priceFor(model);
+  if (!p) return 0;
+  let cost = u.input / 1e6 * p.input + u.output / 1e6 * p.output;
+  if (p.cacheRead != null) cost += u.cacheRead / 1e6 * p.cacheRead;
+  if (p.cacheWrite != null) cost += u.cacheCreate / 1e6 * p.cacheWrite;
+  return cost;
+}
+var CLI_USAGE_PARSER_VERSION = 4;
 function emptyModelUsage(model) {
   return { model, inputTokens: 0, cachedReadTokens: 0, cacheCreateTokens: 0, outputTokens: 0, costUsd: 0 };
 }
-function addUsage(target, model, delta) {
-  const row = target[model] ??= emptyModelUsage(model);
-  if (delta.inputTokens) row.inputTokens += delta.inputTokens;
-  if (delta.cachedReadTokens) row.cachedReadTokens += delta.cachedReadTokens;
-  if (delta.cacheCreateTokens) row.cacheCreateTokens += delta.cacheCreateTokens;
-  if (delta.outputTokens) row.outputTokens += delta.outputTokens;
+function addToBucket(bucket, model, u) {
+  const row = bucket[model] ??= emptyModelUsage(model);
+  row.inputTokens += u.input;
+  row.cachedReadTokens += u.cacheRead;
+  row.cacheCreateTokens += u.cacheCreate;
+  row.outputTokens += u.output;
+  row.costUsd += computeCost(model, u);
 }
-function recompute(usage) {
-  const price = priceFor(usage.model);
-  if (!price) return { ...usage, costUsd: 0 };
-  const inputCost = usage.inputTokens / 1e6 * price.input;
-  const cacheReadCost = price.cacheRead != null ? usage.cachedReadTokens / 1e6 * price.cacheRead : 0;
-  const cacheWriteCost = price.cacheWrite != null ? usage.cacheCreateTokens / 1e6 * price.cacheWrite : 0;
-  const outputCost = usage.outputTokens / 1e6 * price.output;
-  return { ...usage, costUsd: inputCost + cacheReadCost + cacheWriteCost + outputCost };
+function startOfTodayMs(now = Date.now()) {
+  const d = new Date(now);
+  d.setHours(0, 0, 0, 0);
+  return d.getTime();
 }
 function listJsonlFiles(rootDir) {
   const out = [];
@@ -69,47 +75,6 @@ function listJsonlFiles(rootDir) {
   }
   return out;
 }
-function parseClaudeFile(file, seenMessageIds) {
-  let content;
-  try {
-    content = fs.readFileSync(file, "utf-8");
-  } catch {
-    return [];
-  }
-  const out = [];
-  for (const raw of content.split(/\r?\n/)) {
-    if (!raw.trim()) continue;
-    let obj;
-    try {
-      obj = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    const usage = obj?.message?.usage;
-    if (!usage) continue;
-    const messageId = obj?.message?.id;
-    if (messageId) {
-      if (seenMessageIds.has(messageId)) continue;
-      seenMessageIds.add(messageId);
-    }
-    const model = String(obj?.message?.model ?? "").toLowerCase();
-    if (!model) continue;
-    const tsRaw = obj?.timestamp ?? obj?.ts;
-    const ts = tsRaw ? new Date(tsRaw).getTime() : Date.now();
-    if (!Number.isFinite(ts)) continue;
-    out.push({
-      ts,
-      model,
-      delta: {
-        inputTokens: usage.input_tokens ?? 0,
-        cachedReadTokens: usage.cache_read_input_tokens ?? 0,
-        cacheCreateTokens: usage.cache_creation_input_tokens ?? 0,
-        outputTokens: usage.output_tokens ?? 0
-      }
-    });
-  }
-  return out;
-}
 function parseCodexFile(file) {
   let content;
   try {
@@ -118,7 +83,7 @@ function parseCodexFile(file) {
     return [];
   }
   const out = [];
-  let prev = { input: 0, cachedInput: 0, output: 0, total: 0 };
+  let prev = { input: 0, cachedInput: 0, output: 0 };
   let model = "gpt-5";
   for (const raw of content.split(/\r?\n/)) {
     if (!raw.trim()) continue;
@@ -131,53 +96,63 @@ function parseCodexFile(file) {
     const modelHint = obj?.event_msg?.payload?.turn_context?.model ?? obj?.payload?.turn_context?.model ?? obj?.message?.model;
     if (typeof modelHint === "string" && modelHint) model = modelHint.toLowerCase();
     const payload = obj?.event_msg?.payload ?? obj?.payload;
-    if (!payload) continue;
-    if (payload.type !== "token_count") continue;
+    if (!payload || payload.type !== "token_count") continue;
     const t = payload;
     const cur = {
       input: t.input_tokens ?? 0,
       cachedInput: t.cached_input_tokens ?? 0,
-      output: t.output_tokens ?? 0,
-      total: t.total_tokens ?? 0
-    };
-    const delta = {
-      inputTokens: Math.max(0, cur.input - prev.input),
-      cachedReadTokens: Math.max(0, cur.cachedInput - prev.cachedInput),
-      outputTokens: Math.max(0, cur.output - prev.output)
+      output: t.output_tokens ?? 0
     };
+    const dInput = Math.max(0, cur.input - prev.input);
+    const dCacheRead = Math.max(0, cur.cachedInput - prev.cachedInput);
+    const dOutput = Math.max(0, cur.output - prev.output);
     prev = cur;
     const tsRaw = obj?.timestamp ?? obj?.event_msg?.timestamp ?? obj?.event_msg?.event_ts;
     const ts = tsRaw ? new Date(tsRaw).getTime() : Date.now();
     if (!Number.isFinite(ts)) continue;
-    out.push({ ts, model, delta });
+    out.push({ ts, model, usage: { input: dInput, cacheRead: dCacheRead, cacheCreate: 0, output: dOutput } });
   }
   return out;
 }
-function startOfTodayMs(now = Date.now()) {
-  const d = new Date(now);
-  d.setHours(0, 0, 0, 0);
-  return d.getTime();
-}
-var CLI_USAGE_PARSER_VERSION = 2;
 async function gatherCliUsage() {
-  const home = os.homedir();
-  const claudeDir = path.join(home, ".claude", "projects");
-  const codexDir = path.join(home, ".codex", "sessions");
-  const claudeFiles = listJsonlFiles(claudeDir);
-  const codexFiles = listJsonlFiles(codexDir);
-  let skipped = 0;
-  const lines = [];
-  const seenMessageIds = /* @__PURE__ */ new Set();
-  for (const f of claudeFiles) {
-    const parsed = parseClaudeFile(f, seenMessageIds);
-    if (parsed.length === 0) skipped++;
-    else lines.push(...parsed);
+  const claudeEntries = [];
+  let claudeFileCount = 0;
+  try {
+    const blocks = await loadSessionBlockData(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      { offline: true }
+    );
+    for (const block of blocks) {
+      const entries = block.entries ?? [];
+      for (const e of entries) {
+        const ts = e.timestamp ? new Date(e.timestamp).getTime() : NaN;
+        if (!Number.isFinite(ts)) continue;
+        const model = (e.model ?? "").toLowerCase();
+        if (!model) continue;
+        const u = e.usage ?? {};
+        claudeEntries.push({
+          ts,
+          model,
+          usage: {
+            input: u.inputTokens ?? 0,
+            cacheRead: u.cacheReadInputTokens ?? 0,
+            cacheCreate: u.cacheCreationInputTokens ?? 0,
+            output: u.outputTokens ?? 0
+          }
+        });
+      }
+    }
+    claudeFileCount = listJsonlFiles(path.join(os.homedir(), ".claude", "projects")).length;
+  } catch (err) {
+    void err;
   }
+  const codexDir = path.join(os.homedir(), ".codex", "sessions");
+  const codexFiles = listJsonlFiles(codexDir);
+  const codexEntries = [];
   for (const f of codexFiles) {
-    const parsed = parseCodexFile(f);
-    if (parsed.length === 0) skipped++;
-    else lines.push(...parsed);
+    codexEntries.push(...parseCodexFile(f));
   }
+  const all = [...claudeEntries, ...codexEntries];
   const now = Date.now();
   const cutoff5h = now - 5 * 60 * 60 * 1e3;
   const cutoff24h = now - 24 * 60 * 60 * 1e3;
@@ -191,34 +166,29 @@ async function gatherCliUsage() {
     today: {},
     lifetime: {}
   };
-  for (const ln of lines) {
-    addUsage(buckets.lifetime, ln.model, ln.delta);
+  for (const e of all) {
+    addToBucket(buckets.lifetime, e.model, e.usage);
     messageCounts.lifetime++;
-    if (ln.ts >= cutoff7d) {
-      addUsage(buckets.last7d, ln.model, ln.delta);
+    if (e.ts >= cutoff7d) {
+      addToBucket(buckets.last7d, e.model, e.usage);
       messageCounts.last7d++;
     }
-    if (ln.ts >= cutoff24h) {
-      addUsage(buckets.last24h, ln.model, ln.delta);
+    if (e.ts >= cutoff24h) {
+      addToBucket(buckets.last24h, e.model, e.usage);
       messageCounts.last24h++;
     }
-    if (ln.ts >= cutoff5h) {
-      addUsage(buckets.last5h, ln.model, ln.delta);
+    if (e.ts >= cutoff5h) {
+      addToBucket(buckets.last5h, e.model, e.usage);
       messageCounts.last5h++;
     }
-    if (ln.ts >= startToday) {
-      addUsage(buckets.today, ln.model, ln.delta);
+    if (e.ts >= startToday) {
+      addToBucket(buckets.today, e.model, e.usage);
       messageCounts.today++;
     }
   }
   function finalise(rec) {
-    return Object.values(rec).map(recompute).sort((a, b) => b.costUsd - a.costUsd);
+    return Object.values(rec).sort((a, b) => b.costUsd - a.costUsd);
   }
-  const last5h = finalise(buckets.last5h);
-  const last24h = finalise(buckets.last24h);
-  const last7d = finalise(buckets.last7d);
-  const today = finalise(buckets.today);
-  const lifetime = finalise(buckets.lifetime);
   function sum(rows, messages) {
     return {
       tokens: rows.reduce((s, r) => s + r.inputTokens + r.cachedReadTokens + r.cacheCreateTokens + r.outputTokens, 0),
@@ -226,6 +196,11 @@ async function gatherCliUsage() {
       messages
     };
   }
+  const last5h = finalise(buckets.last5h);
+  const last24h = finalise(buckets.last24h);
+  const last7d = finalise(buckets.last7d);
+  const today = finalise(buckets.today);
+  const lifetime = finalise(buckets.lifetime);
   return {
     generatedAt: new Date(now).toISOString(),
     windows: { last5h, last24h, last7d, today, lifetime },
@@ -236,7 +211,11 @@ async function gatherCliUsage() {
       today: sum(today, messageCounts.today),
       lifetime: sum(lifetime, messageCounts.lifetime)
     },
-    sources: { claudeFiles: claudeFiles.length, codexFiles: codexFiles.length, skipped }
+    sources: {
+      claudeFiles: claudeFileCount,
+      codexFiles: codexFiles.length,
+      skipped: 0
+    }
   };
 }
 export {

package/dist/index.js

@@ -866,7 +866,7 @@ async function devCommand(options) {
     const pathname = url.pathname;
     if (pathname === "/api/cli-usage") {
       try {
-        const { gatherCliUsage, CLI_USAGE_PARSER_VERSION } = await import("./cli-usage-LUATWFYP.js");
+        const { gatherCliUsage, CLI_USAGE_PARSER_VERSION } = await import("./cli-usage-NX33FYQ6.js");
         const g = global;
         const now = Date.now();
         if (g.__forgeCliUsageCache && g.__forgeCliUsageCache.ver === CLI_USAGE_PARSER_VERSION && now - g.__forgeCliUsageCache.at < 3e4) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storyforge",
-  "version": "0.4.17",
+  "version": "0.4.19",
   "description": "StoryForge — local bridge for the Forge video production web app. Zero runtime dependencies.",
   "type": "module",
   "bin": {
@@ -15,7 +15,10 @@
     "lint": "tsc --noEmit",
     "prepublishOnly": "npm run build"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@ccusage/codex": "18.0.11",
+    "ccusage": "18.0.11"
+  },
   "devDependencies": {
     "tsup": "8.5.0",
     "typescript": "5.8.3"