storyforge 0.4.19 → 0.4.21

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

@@ -75,6 +75,47 @@ function listJsonlFiles(rootDir) {
   }
   return out;
 }
+function parseClaudeFileDirect(file, seen) {
+  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 (seen.has(messageId)) continue;
+      seen.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,
+      usage: {
+        input: usage.input_tokens ?? 0,
+        cacheRead: usage.cache_read_input_tokens ?? 0,
+        cacheCreate: usage.cache_creation_input_tokens ?? 0,
+        output: usage.output_tokens ?? 0
+      }
+    });
+  }
+  return out;
+}
 function parseCodexFile(file) {
   let content;
   try {
@@ -115,13 +156,17 @@ function parseCodexFile(file) {
   return out;
 }
 async function gatherCliUsage() {
+  const CCUSAGE_TIMEOUT_MS = 8e3;
   const claudeEntries = [];
   let claudeFileCount = 0;
+  let claudeError;
   try {
-    const blocks = await loadSessionBlockData(
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      { offline: true }
-    );
+    const blocks = await Promise.race([
+      loadSessionBlockData(),
+      new Promise(
+        (_, reject) => setTimeout(() => reject(new Error(`ccusage timed out after ${CCUSAGE_TIMEOUT_MS}ms (LiteLLM pricing fetch likely blocked)`)), CCUSAGE_TIMEOUT_MS)
+      )
+    ]);
     for (const block of blocks) {
       const entries = block.entries ?? [];
       for (const e of entries) {
@@ -144,7 +189,15 @@ async function gatherCliUsage() {
     }
     claudeFileCount = listJsonlFiles(path.join(os.homedir(), ".claude", "projects")).length;
   } catch (err) {
-    void err;
+    claudeError = `ccusage unavailable, using fallback parser (${err.message?.slice(0, 80) ?? "unknown"})`;
+    console.error("[cli-usage] ccusage loader failed, falling back:", claudeError);
+    const claudeDir = path.join(os.homedir(), ".claude", "projects");
+    const claudeFiles = listJsonlFiles(claudeDir);
+    claudeFileCount = claudeFiles.length;
+    const seen = /* @__PURE__ */ new Set();
+    for (const f of claudeFiles) {
+      claudeEntries.push(...parseClaudeFileDirect(f, seen));
+    }
   }
   const codexDir = path.join(os.homedir(), ".codex", "sessions");
   const codexFiles = listJsonlFiles(codexDir);
@@ -214,7 +267,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-P3LK7WEE.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-NX33FYQ6.js");
+        const { gatherCliUsage, CLI_USAGE_PARSER_VERSION } = await import("./cli-usage-P3LK7WEE.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.19",
+  "version": "0.4.21",
   "description": "StoryForge — local bridge for the Forge video production web app. Zero runtime dependencies.",
   "type": "module",
   "bin": {