storyforge 0.4.18 → 0.4.20

package/dist/{cli-usage-EC5NOILQ.js → cli-usage-7QODAG26.js}

@@ -5,7 +5,15 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import { loadSessionBlockData } from "ccusage/data-loader";
-var CODEX_PRICES = {
+var PRICES = {
+  // 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 — 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 },
@@ -14,15 +22,23 @@ var CODEX_PRICES = {
   "gpt-5-codex": { input: 2.5, output: 15 },
   "gpt-4o": { input: 2.5, output: 10 }
 };
-function codexPriceFor(model) {
+function priceFor(model) {
   const lower = model.toLowerCase();
-  if (CODEX_PRICES[lower]) return CODEX_PRICES[lower];
-  for (const key of Object.keys(CODEX_PRICES)) {
-    if (lower.startsWith(key)) return CODEX_PRICES[key];
+  if (PRICES[lower]) return PRICES[lower];
+  for (const key of Object.keys(PRICES)) {
+    if (lower.startsWith(key)) return PRICES[key];
   }
   return null;
 }
-var CLI_USAGE_PARSER_VERSION = 3;
+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 };
 }
@@ -32,7 +48,7 @@ function addToBucket(bucket, model, u) {
   row.cachedReadTokens += u.cacheRead;
   row.cacheCreateTokens += u.cacheCreate;
   row.outputTokens += u.output;
-  if (typeof u.costUSD === "number") row.costUsd += u.costUSD;
+  row.costUsd += computeCost(model, u);
 }
 function startOfTodayMs(now = Date.now()) {
   const d = new Date(now);
@@ -94,15 +110,14 @@ function parseCodexFile(file) {
     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;
-    const price = codexPriceFor(model);
-    const costUSD = price ? dInput / 1e6 * price.input + dOutput / 1e6 * price.output : void 0;
-    out.push({ ts, model, usage: { input: dInput, cacheRead: dCacheRead, cacheCreate: 0, output: dOutput, costUSD } });
+    out.push({ ts, model, usage: { input: dInput, cacheRead: dCacheRead, cacheCreate: 0, output: dOutput } });
   }
   return out;
 }
 async function gatherCliUsage() {
   const claudeEntries = [];
   let claudeFileCount = 0;
+  let claudeError;
   try {
     const blocks = await loadSessionBlockData();
     for (const block of blocks) {
@@ -120,15 +135,15 @@ async function gatherCliUsage() {
             input: u.inputTokens ?? 0,
             cacheRead: u.cacheReadInputTokens ?? 0,
             cacheCreate: u.cacheCreationInputTokens ?? 0,
-            output: u.outputTokens ?? 0,
-            costUSD: e.costUSD
+            output: u.outputTokens ?? 0
           }
         });
       }
     }
     claudeFileCount = listJsonlFiles(path.join(os.homedir(), ".claude", "projects")).length;
   } catch (err) {
-    void err;
+    claudeError = err.message ?? String(err);
+    console.error("[cli-usage] ccusage loader failed:", claudeError);
   }
   const codexDir = path.join(os.homedir(), ".codex", "sessions");
   const codexFiles = listJsonlFiles(codexDir);
@@ -198,7 +213,8 @@ async function gatherCliUsage() {
     sources: {
       claudeFiles: claudeFileCount,
       codexFiles: codexFiles.length,
-      skipped: 0
+      skipped: 0,
+      claudeError
     }
   };
 }

package/dist/index.js

@@ -839,6 +839,17 @@ async function devCommand(options) {
   if (env.loaded.length > 0) {
     log.info(`Loaded env: ${env.loaded.join(", ")} from ${env.sources.join(", ")}`);
   }
+  void (async () => {
+    try {
+      const { gatherCliUsage, CLI_USAGE_PARSER_VERSION } = await import("./cli-usage-7QODAG26.js");
+      const report = await gatherCliUsage();
+      const g = global;
+      g.__forgeCliUsageCache = { at: Date.now(), ver: CLI_USAGE_PARSER_VERSION, data: report };
+      log.info(`[cli-usage] warmed cache \xB7 ${report.sources.claudeFiles} claude, ${report.sources.codexFiles} codex sessions${report.sources.claudeError ? ` (claude error: ${report.sources.claudeError.slice(0, 80)})` : ""}`);
+    } catch (err) {
+      log.warn(`[cli-usage] warm-up failed: ${err.message}`);
+    }
+  })();
   const counts = scanAssets(dir);
   const total = Object.values(counts).reduce((a, b) => a + b, 0);
   if (total > 0) {
@@ -866,7 +877,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-EC5NOILQ.js");
+        const { gatherCliUsage, CLI_USAGE_PARSER_VERSION } = await import("./cli-usage-7QODAG26.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.18",
+  "version": "0.4.20",
   "description": "StoryForge — local bridge for the Forge video production web app. Zero runtime dependencies.",
   "type": "module",
   "bin": {