ccc-notifier 0.3.0 → 0.4.0

package/dist/{sweep-25EZAOGC.js → sweep-IBSV4LRD.js}

@@ -6,7 +6,7 @@ import {
 import {
   collectSubagentUsage,
   splitIntoCodexTurnDrafts
-} from "./chunk-DSV75EF7.js";
+} from "./chunk-CKVK3UCA.js";
 import {
   computeCost,
   extractBucket,
@@ -14,6 +14,9 @@ import {
   loadPriceTable,
   promptCandidate
 } from "./chunk-LHKBGA5K.js";
+import {
+  waitForDataLock
+} from "./chunk-J6Y3RMMC.js";
 import {
   formatJPY,
   formatUSD,
@@ -27,7 +30,7 @@ import {
   readConfig,
   sanitizeCursor,
   saveCursor
-} from "./chunk-ECADO26T.js";
+} from "./chunk-26CISNOE.js";
 
 // src/sweep.ts
 import { readFile } from "fs/promises";
@@ -258,80 +261,90 @@ function mergeUnknownModels(rec, extra) {
   for (const m of extra) if (!merged.includes(m)) merged.push(m);
   rec.unknownModels = merged;
 }
-async function processTranscript(mainPath, table, fx, daysCutoff, dryRun, summary) {
-  const cursor = sanitizeCursor(loadCursor(mainPath));
-  const { drafts, newCursor } = await splitIntoTurnDrafts(mainPath, cursor);
-  const records = [];
-  for (const draft of drafts) {
-    const ts = draft.lastTs ?? (/* @__PURE__ */ new Date()).toISOString();
-    if (daysCutoff !== null) {
-      const tsMs = Date.parse(ts);
-      if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
-    }
-    records.push(draftToRecord(draft, ts, table, fx));
+async function processTranscript(mainPath, table, fx, daysCutoff, dryRun, summary, lockProvider) {
+  const lock = dryRun ? null : await lockProvider();
+  if (!dryRun && lock === null) {
+    logError("sweep:data-lock", new Error(`data lock timeout: ${mainPath}`));
+    summary.lockTimeouts += 1;
+    return;
   }
-  let sa = null;
   try {
-    sa = await collectSubagentUsage(mainPath);
-  } catch (err) {
-    logError("sweep:subagents", err);
-    sa = null;
-  }
-  const saHasUsage = sa !== null && sa.apiCalls > 0;
-  if (saHasUsage) {
-    const saBreakdown = computeCost(sa.perModel, {}, table);
-    summary.subagentsUSD += saBreakdown.usd;
-    const saBlock = {
-      costUSD: saBreakdown.usd,
-      costByModel: saBreakdown.byModel,
-      tokens: sumBuckets(sa.perModel),
-      apiCalls: sa.apiCalls,
-      agentFiles: sa.agentFiles
-    };
-    if (records.length > 0) {
-      const last = records[records.length - 1];
-      last.subagents = saBlock;
-      mergeUnknownModels(last, saBreakdown.unknownModels);
-    } else {
-      const rec = {
-        schemaVersion: 1,
-        ts: maxCursorTs(sa.newCursors) ?? (/* @__PURE__ */ new Date()).toISOString(),
-        sessionId: "",
-        project: "",
-        gitBranch: null,
-        models: collectModels(sa.perModel, {}),
-        tokens: emptyBuckets(),
-        sidechainTokens: null,
-        apiCalls: 0,
-        costUSD: 0,
-        costByModel: {},
-        costJPY: 0,
-        fxRate: fx.rate,
-        fxSource: fx.source,
-        prompt: "",
-        subagents: saBlock,
-        ingest: "sweep"
+    const cursor = sanitizeCursor(loadCursor(mainPath));
+    const { drafts, newCursor } = await splitIntoTurnDrafts(mainPath, cursor);
+    const records = [];
+    for (const draft of drafts) {
+      const ts = draft.lastTs ?? (/* @__PURE__ */ new Date()).toISOString();
+      if (daysCutoff !== null) {
+        const tsMs = Date.parse(ts);
+        if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
+      }
+      records.push(draftToRecord(draft, ts, table, fx));
+    }
+    let sa = null;
+    try {
+      sa = await collectSubagentUsage(mainPath);
+    } catch (err) {
+      logError("sweep:subagents", err);
+      sa = null;
+    }
+    const saHasUsage = sa !== null && sa.apiCalls > 0;
+    if (saHasUsage) {
+      const saBreakdown = computeCost(sa.perModel, {}, table);
+      summary.subagentsUSD += saBreakdown.usd;
+      const saBlock = {
+        costUSD: saBreakdown.usd,
+        costByModel: saBreakdown.byModel,
+        tokens: sumBuckets(sa.perModel),
+        apiCalls: sa.apiCalls,
+        agentFiles: sa.agentFiles
       };
-      mergeUnknownModels(rec, saBreakdown.unknownModels);
-      records.push(rec);
+      if (records.length > 0) {
+        const last = records[records.length - 1];
+        last.subagents = saBlock;
+        mergeUnknownModels(last, saBreakdown.unknownModels);
+      } else {
+        const rec = {
+          schemaVersion: 1,
+          ts: maxCursorTs(sa.newCursors) ?? (/* @__PURE__ */ new Date()).toISOString(),
+          sessionId: "",
+          project: "",
+          gitBranch: null,
+          models: collectModels(sa.perModel, {}),
+          tokens: emptyBuckets(),
+          sidechainTokens: null,
+          apiCalls: 0,
+          costUSD: 0,
+          costByModel: {},
+          costJPY: 0,
+          fxRate: fx.rate,
+          fxSource: fx.source,
+          prompt: "",
+          subagents: saBlock,
+          ingest: "sweep"
+        };
+        mergeUnknownModels(rec, saBreakdown.unknownModels);
+        records.push(rec);
+      }
+      summary.agentFiles += sa.agentFiles;
     }
-    summary.agentFiles += sa.agentFiles;
-  }
-  for (const rec of records) {
-    summary.newRecords += 1;
-    summary.totalUSD += rec.costUSD;
-    if (rec.costByModel) {
-      for (const [m, c] of Object.entries(rec.costByModel)) {
-        summary.byModel[m] = (summary.byModel[m] ?? 0) + c;
+    for (const rec of records) {
+      summary.newRecords += 1;
+      summary.totalUSD += rec.costUSD;
+      if (rec.costByModel) {
+        for (const [m, c] of Object.entries(rec.costByModel)) {
+          summary.byModel[m] = (summary.byModel[m] ?? 0) + c;
+        }
       }
     }
-  }
-  if (!dryRun) {
-    for (const rec of records) appendTurn(rec);
-    if (drafts.length > 0) saveCursor(mainPath, newCursor);
-    if (saHasUsage) {
-      for (const nc of sa.newCursors) saveCursor(nc.path, nc.cursor);
+    if (!dryRun) {
+      for (const rec of records) appendTurn(rec);
+      if (drafts.length > 0) saveCursor(mainPath, newCursor);
+      if (saHasUsage) {
+        for (const nc of sa.newCursors) saveCursor(nc.path, nc.cursor);
+      }
     }
+  } finally {
+    lock?.release();
   }
 }
 var CODEX_MAX_DEPTH = 4;
@@ -379,33 +392,43 @@ function codexDraftToRecord(draft, ts, table, fx) {
   if (breakdown.unknownModels.length > 0) rec.unknownModels = breakdown.unknownModels;
   return rec;
 }
-async function processCodexRollout(rolloutPath, table, fx, daysCutoff, dryRun, summary) {
-  const cursor = sanitizeCursor(loadCursor(rolloutPath));
-  const drafts = await splitIntoCodexTurnDrafts(rolloutPath, cursor);
-  if (drafts === null || drafts.length === 0) return;
-  const records = [];
-  for (const draft of drafts) {
-    const ts = draft.endTs ?? (/* @__PURE__ */ new Date()).toISOString();
-    if (daysCutoff !== null) {
-      const tsMs = Date.parse(ts);
-      if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
-    }
-    records.push(codexDraftToRecord(draft, ts, table, fx));
+async function processCodexRollout(rolloutPath, table, fx, daysCutoff, dryRun, summary, lockProvider) {
+  const lock = dryRun ? null : await lockProvider();
+  if (!dryRun && lock === null) {
+    logError("sweep:data-lock", new Error(`data lock timeout: ${rolloutPath}`));
+    summary.lockTimeouts += 1;
+    return;
   }
-  for (const rec of records) {
-    summary.newRecords += 1;
-    summary.totalUSD += rec.costUSD;
-    summary.codexRecords += 1;
-    summary.codexUSD += rec.costUSD;
-    if (rec.costByModel) {
-      for (const [m, c] of Object.entries(rec.costByModel)) {
-        summary.byModel[m] = (summary.byModel[m] ?? 0) + c;
+  try {
+    const cursor = sanitizeCursor(loadCursor(rolloutPath));
+    const drafts = await splitIntoCodexTurnDrafts(rolloutPath, cursor);
+    if (drafts === null || drafts.length === 0) return;
+    const records = [];
+    for (const draft of drafts) {
+      const ts = draft.endTs ?? (/* @__PURE__ */ new Date()).toISOString();
+      if (daysCutoff !== null) {
+        const tsMs = Date.parse(ts);
+        if (!Number.isFinite(tsMs) || tsMs < daysCutoff) continue;
       }
+      records.push(codexDraftToRecord(draft, ts, table, fx));
     }
-  }
-  if (!dryRun) {
-    for (const rec of records) appendTurn(rec);
-    saveCursor(rolloutPath, drafts[drafts.length - 1].agg.newCursor);
+    for (const rec of records) {
+      summary.newRecords += 1;
+      summary.totalUSD += rec.costUSD;
+      summary.codexRecords += 1;
+      summary.codexUSD += rec.costUSD;
+      if (rec.costByModel) {
+        for (const [m, c] of Object.entries(rec.costByModel)) {
+          summary.byModel[m] = (summary.byModel[m] ?? 0) + c;
+        }
+      }
+    }
+    if (!dryRun) {
+      for (const rec of records) appendTurn(rec);
+      saveCursor(rolloutPath, drafts[drafts.length - 1].agg.newCursor);
+    }
+  } finally {
+    lock?.release();
   }
 }
 async function codexSessionsRoot() {
@@ -414,7 +437,7 @@ async function codexSessionsRoot() {
   const isDir = await fsp.stat(sessionsRoot).then((st) => st.isDirectory()).catch(() => false);
   return isDir ? sessionsRoot : null;
 }
-async function sweepCodex(summary, table, fx, daysCutoff, flags) {
+async function sweepCodex(summary, table, fx, daysCutoff, flags, lockProvider) {
   const sessionsRoot = await codexSessionsRoot();
   if (sessionsRoot === null) return;
   const rollouts = await listCodexRollouts(sessionsRoot);
@@ -424,7 +447,7 @@ async function sweepCodex(summary, table, fx, daysCutoff, flags) {
       continue;
     }
     try {
-      await processCodexRollout(rolloutPath, table, fx, daysCutoff, flags.dryRun, summary);
+      await processCodexRollout(rolloutPath, table, fx, daysCutoff, flags.dryRun, summary, lockProvider);
     } catch (err) {
       logError("sweep:codex", err);
     }
@@ -489,7 +512,12 @@ function printSweepSummary(summary, fx) {
       `\u30B9\u30AD\u30C3\u30D7: ${summary.skippedActive} transcript(\u76F4\u8FD1${ACTIVE_GUARD_MIN}\u5206\u4EE5\u5185\u306B\u66F4\u65B0 = \u9032\u884C\u4E2D\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u53EF\u80FD\u6027)\u3002\u30BB\u30C3\u30B7\u30E7\u30F3\u5B8C\u4E86\u5F8C\u306B\u518D\u5B9F\u884C\u3059\u308B\u304B\u3001\u5B8C\u4E86\u6E08\u307F\u3068\u5206\u304B\u3063\u3066\u3044\u308B\u5834\u5408\u306F --include-active \u3067\u53D6\u308A\u8FBC\u3081\u307E\u3059`
     );
   }
-  if (summary.newRecords === 0) {
+  if (summary.lockTimeouts > 0) {
+    console.log(
+      `\u672A\u5B8C\u4E86: ${summary.lockTimeouts} \u4EF6\u306Fdata lock\u3092\u53D6\u5F97\u3067\u304D\u305A\u672A\u51E6\u7406\u3067\u3059\u3002\u30AB\u30FC\u30BD\u30EB\u306F\u9032\u3081\u3066\u3044\u306A\u3044\u305F\u3081\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044`
+    );
+  }
+  if (summary.newRecords === 0 && summary.lockTimeouts === 0) {
     console.log("\u65B0\u898F\u306F\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F");
   } else {
     console.log(
@@ -513,10 +541,12 @@ function printSweepSummary(summary, fx) {
       }
     }
   }
-  console.log("\u65E2\u306B\u8A08\u4E0A\u6E08\u307F\u306E\u5206\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F(\u4E8C\u91CD\u8A08\u4E0A\u306A\u3057)");
+  if (summary.lockTimeouts === 0) {
+    console.log("\u65E2\u306B\u8A08\u4E0A\u6E08\u307F\u306E\u5206\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F(\u4E8C\u91CD\u8A08\u4E0A\u306A\u3057)");
+  }
   console.log(`\u5186\u63DB\u7B97\u30EC\u30FC\u30C8: 1USD = ${fx.rate}JPY(source=${fx.source})`);
 }
-async function runSweep(argv) {
+async function runSweep(argv, deps = {}) {
   const flags = parseSweepFlags(argv);
   const root = projectsRoot(flags.projects);
   const projectDirs = await listProjectDirs(root);
@@ -543,9 +573,11 @@ async function runSweep(argv) {
     skippedActive: 0,
     codexRecords: 0,
     codexUSD: 0,
-    dryRun: flags.dryRun
+    dryRun: flags.dryRun,
+    lockTimeouts: 0
   };
   const daysCutoff = flags.days !== null ? Date.now() - flags.days * DAY_MS : null;
+  const lockProvider = deps.lockProvider ?? (() => waitForDataLock());
   for (const projectDir of projectDirs ?? []) {
     const transcripts = await listTranscripts(projectDir);
     for (const mainPath of transcripts) {
@@ -555,16 +587,16 @@ async function runSweep(argv) {
         continue;
       }
       try {
-        await processTranscript(mainPath, table, fx, daysCutoff, flags.dryRun, summary);
+        await processTranscript(mainPath, table, fx, daysCutoff, flags.dryRun, summary, lockProvider);
       } catch (err) {
         logError("sweep:transcript", err);
       }
     }
   }
-  await sweepCodex(summary, table, fx, daysCutoff, flags);
+  await sweepCodex(summary, table, fx, daysCutoff, flags, lockProvider);
   summary.totalJPY = summary.totalUSD * fx.rate;
   printSweepSummary(summary, fx);
-  return 0;
+  return summary.lockTimeouts > 0 ? 1 : 0;
 }
 export {
   runSweep,

package/dist/track-QT2U3E2R.js

@@ -0,0 +1,235 @@
+#!/usr/bin/env node
+import {
+  notifyOS,
+  notifySlack
+} from "./chunk-NV5UOHJA.js";
+import {
+  writeDashboardHtml
+} from "./chunk-2VPBBIDW.js";
+import "./chunk-DGXUSPS4.js";
+import {
+  aggregateCodexTurn,
+  collectSubagentUsage
+} from "./chunk-CKVK3UCA.js";
+import {
+  aggregateNewTurn,
+  computeCost,
+  getUsdJpy,
+  loadPriceTable
+} from "./chunk-LHKBGA5K.js";
+import {
+  isFullDashboardDue,
+  makeFullDashboardState,
+  writeFullDashboardStateAtomic
+} from "./chunk-ZHIZZ6V5.js";
+import {
+  waitForDataLock
+} from "./chunk-J6Y3RMMC.js";
+import "./chunk-J5QAYTFE.js";
+import {
+  appendTurn,
+  isMuted,
+  loadCursor,
+  logError,
+  paths,
+  readConfig,
+  readTurns,
+  sanitizeCursor,
+  saveCursor,
+  todayTotalUSD
+} from "./chunk-26CISNOE.js";
+
+// src/track.ts
+function isRecord(v) {
+  return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+function emptyBuckets() {
+  return { input: 0, output: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheRead: 0 };
+}
+function sumBuckets(usage) {
+  const total = emptyBuckets();
+  for (const b of Object.values(usage)) {
+    total.input += b.input;
+    total.output += b.output;
+    total.cacheWrite5m += b.cacheWrite5m;
+    total.cacheWrite1h += b.cacheWrite1h;
+    total.cacheRead += b.cacheRead;
+  }
+  return total;
+}
+function collectModels(main, sidechain) {
+  const models = [];
+  for (const m of Object.keys(main)) {
+    if (!models.includes(m)) models.push(m);
+  }
+  for (const m of Object.keys(sidechain)) {
+    if (!models.includes(m)) models.push(m);
+  }
+  return models;
+}
+function withCodexModel(agg, payloadModel) {
+  const model = typeof payloadModel === "string" && payloadModel.length > 0 ? payloadModel : null;
+  if (model === null) return agg;
+  const buckets = Object.values(agg.main)[0] ?? emptyBuckets();
+  return { ...agg, main: { [model]: buckets } };
+}
+async function runTrack(stdinText, opts) {
+  try {
+    let parsed;
+    try {
+      parsed = JSON.parse(stdinText);
+    } catch {
+      return;
+    }
+    if (!isRecord(parsed)) return;
+    const input = parsed;
+    const transcriptPath = input.transcript_path;
+    if (typeof transcriptPath !== "string") return;
+    const cfg = readConfig();
+    const cacheDir = paths().cacheDir;
+    const table = await loadPriceTable(cacheDir, { offline: true });
+    const fx = await getUsdJpy(cfg, cacheDir);
+    const isCodex = opts?.codex === true;
+    let record;
+    const commitLock = await waitForDataLock(1e3);
+    if (commitLock === null) {
+      logError("track:data-lock", new Error("data lock timeout; turn was not consumed"));
+      return;
+    }
+    try {
+      const cursor = sanitizeCursor(loadCursor(transcriptPath));
+      let agg = isCodex ? await aggregateCodexTurn(transcriptPath, cursor) : await aggregateNewTurn(transcriptPath, cursor);
+      if (agg === null) return;
+      if (isCodex) {
+        agg = withCodexModel(agg, input.model);
+      }
+      let sa = null;
+      if (!isCodex) {
+        try {
+          sa = await collectSubagentUsage(transcriptPath);
+        } catch (err) {
+          logError("track:subagents", err);
+          sa = null;
+        }
+      }
+      const breakdown = computeCost(agg.main, agg.sidechain, table);
+      const sessionId = agg.sessionId || (typeof input.session_id === "string" ? input.session_id : "") || "";
+      const project = agg.cwd ?? (typeof input.cwd === "string" ? input.cwd : void 0) ?? "";
+      const sidechainHasModels = Object.keys(agg.sidechain).length > 0;
+      record = {
+        schemaVersion: 1,
+        ts: agg.lastTs ?? (/* @__PURE__ */ new Date()).toISOString(),
+        sessionId,
+        project,
+        gitBranch: agg.gitBranch,
+        models: collectModels(agg.main, agg.sidechain),
+        tokens: sumBuckets(agg.main),
+        sidechainTokens: sidechainHasModels ? sumBuckets(agg.sidechain) : null,
+        apiCalls: agg.apiCalls,
+        costUSD: breakdown.usd,
+        costByModel: breakdown.byModel,
+        // モデル別 USD(main+sidechain 合算、丸めない)
+        costJPY: breakdown.usd * fx.rate,
+        // 丸めない(表示時に丸める)
+        fxRate: fx.rate,
+        fxSource: fx.source,
+        prompt: agg.prompt ?? ""
+      };
+      if (isCodex) {
+        record.source = "codex";
+      }
+      if (breakdown.unknownModels.length > 0) {
+        record.unknownModels = breakdown.unknownModels;
+      }
+      if (sa !== null && sa.apiCalls > 0) {
+        const saBreakdown = computeCost(sa.perModel, {}, table);
+        record.subagents = {
+          costUSD: saBreakdown.usd,
+          costByModel: saBreakdown.byModel,
+          tokens: sumBuckets(sa.perModel),
+          apiCalls: sa.apiCalls,
+          agentFiles: sa.agentFiles
+        };
+        if (saBreakdown.unknownModels.length > 0) {
+          const merged = record.unknownModels ? [...record.unknownModels] : [];
+          for (const m of saBreakdown.unknownModels) {
+            if (!merged.includes(m)) merged.push(m);
+          }
+          record.unknownModels = merged;
+        }
+      }
+      appendTurn(record);
+      saveCursor(transcriptPath, agg.newCursor);
+      if (sa !== null) {
+        for (const nc of sa.newCursors) {
+          saveCursor(nc.path, nc.cursor);
+        }
+      }
+    } finally {
+      commitLock.release();
+    }
+    const tasks = [];
+    if ((cfg.notify.os || cfg.notify.slack !== null) && record.costUSD >= cfg.minNotifyUSD && !isMuted()) {
+      const todayUSD = cfg.includeDailyTotal ? todayTotalUSD() : void 0;
+      tasks.push(notifyOS(record, cfg, todayUSD));
+      tasks.push(notifySlack(record, cfg, todayUSD));
+    }
+    if (cfg.dashboard.autoRegenerate) {
+      tasks.push(
+        (async () => {
+          const now = /* @__PURE__ */ new Date();
+          const dashboardLock = await waitForDataLock(1e3);
+          if (dashboardLock === null) {
+            logError("track:dashboard-lock", new Error("data lock timeout; dashboard skipped"));
+            return;
+          }
+          try {
+            let allTurns;
+            try {
+              allTurns = readTurns();
+            } catch (err) {
+              logError("track:dashboard-read", err);
+              return;
+            }
+            try {
+              writeDashboardHtml({
+                days: cfg.dashboard.days,
+                outPath: paths().recentDashboardFile,
+                autoReloadSec: cfg.dashboard.autoReloadSec,
+                allTurns,
+                variant: "recent"
+              });
+            } catch (err) {
+              logError("track:dashboard-recent", err);
+            }
+            if (isFullDashboardDue(now)) {
+              try {
+                writeDashboardHtml({
+                  days: null,
+                  outPath: paths().fullDashboardFile,
+                  autoReloadSec: cfg.dashboard.autoReloadSec,
+                  allTurns,
+                  variant: "full",
+                  generatedAt: now.toISOString()
+                });
+                writeFullDashboardStateAtomic(makeFullDashboardState(now));
+              } catch (err) {
+                logError("track:dashboard-full", err);
+              }
+            }
+          } finally {
+            dashboardLock.release();
+          }
+        })()
+      );
+    }
+    if (tasks.length > 0) {
+      await Promise.allSettled(tasks);
+    }
+  } catch (err) {
+    logError("track", err);
+  }
+}
+export {
+  runTrack
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccc-notifier",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Claude Code Cost notifier (now also covers Codex CLI): per-prompt cost notifications (USD/JPY) with local history and HTML dashboard",
   "keywords": [
     "claude",