ccc-notifier 0.5.0 → 0.6.1

package/dist/{track-KEZON6KI.js → track-WCP7446C.js}

@@ -3,29 +3,29 @@ import {
   notifyOS,
   notifySlack
 } from "./chunk-NV5UOHJA.js";
-import {
-  writeDashboardHtml
-} from "./chunk-QWBQN4XY.js";
-import "./chunk-DGXUSPS4.js";
 import {
   collectSubagentUsage
-} from "./chunk-O2AR4PXU.js";
+} from "./chunk-OYD6H3ZZ.js";
 import {
   aggregateCodexTurn,
   aggregateNewTurn,
+  getUsdJpy
+} from "./chunk-D4D76RGQ.js";
+import {
   computeCost,
-  getUsdJpy,
   loadPriceTable
-} from "./chunk-LVMKY6JB.js";
+} from "./chunk-6HTETN26.js";
+import {
+  writeDashboardHtml
+} from "./chunk-6UZXXO5J.js";
+import "./chunk-DGXUSPS4.js";
 import "./chunk-J5QAYTFE.js";
 import {
   isFullDashboardDue,
   makeFullDashboardState,
+  waitForDataLock,
   writeFullDashboardStateAtomic
-} from "./chunk-ENGUOLTD.js";
-import {
-  waitForDataLock
-} from "./chunk-O34L3NSI.js";
+} from "./chunk-27SJELD2.js";
 import {
   appendTurn,
   closeCodexRootContext,
@@ -38,7 +38,7 @@ import {
   sanitizeCursor,
   saveCursor,
   todayTotalUSD
-} from "./chunk-5PH7PPD6.js";
+} from "./chunk-OOAC5ULQ.js";
 
 // src/track.ts
 function isRecord(v) {
@@ -100,6 +100,7 @@ async function runTrack(stdinText, opts) {
     const table = await loadPriceTable(cacheDir, { offline: true });
     const fx = await getUsdJpy(cfg, cacheDir);
     let record;
+    let hasMainUsage = false;
     const commitLock = await waitForDataLock(1e3);
     if (commitLock === null) {
       logError("track:data-lock", new Error("data lock timeout; turn was not consumed"));
@@ -108,33 +109,44 @@ async function runTrack(stdinText, opts) {
     try {
       const cursor = sanitizeCursor(loadCursor(transcriptPath));
       let agg = isCodex ? await aggregateCodexTurn(transcriptPath, cursor) : await aggregateNewTurn(transcriptPath, cursor);
-      if (agg === null) return;
-      if (isCodex) {
+      if (isCodex && agg === null) return;
+      hasMainUsage = agg !== null;
+      if (isCodex && agg !== null) {
         agg = withCodexModel(agg, input.model);
       }
       let sa = null;
       if (!isCodex) {
         try {
-          sa = await collectSubagentUsage(transcriptPath);
+          const excluded = new Set(cursor?.seenMessageKeys ?? []);
+          if (agg !== null && "messageKeys" in agg) {
+            for (const key of agg.messageKeys) excluded.add(key);
+          }
+          sa = await collectSubagentUsage(transcriptPath, { excludeMessageKeys: excluded });
         } 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;
+      if (agg === null && (sa === null || sa.apiCalls === 0)) {
+        for (const nc of sa?.newCursors ?? []) saveCursor(nc.path, nc.cursor);
+        return;
+      }
+      const main = agg?.main ?? {};
+      const sidechain = agg?.sidechain ?? {};
+      const breakdown = computeCost(main, sidechain, table);
+      const sessionId = agg?.sessionId || sa?.sessionId || (typeof input.session_id === "string" ? input.session_id : "") || "";
+      const project = agg?.cwd ?? sa?.cwd ?? (typeof input.cwd === "string" ? input.cwd : void 0) ?? "";
+      const sidechainHasModels = Object.keys(sidechain).length > 0;
       record = {
         schemaVersion: 1,
-        ts: agg.lastTs ?? (/* @__PURE__ */ new Date()).toISOString(),
+        ts: agg?.lastTs ?? sa?.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,
+        gitBranch: agg?.gitBranch ?? sa?.gitBranch ?? null,
+        models: hasMainUsage ? collectModels(main, sidechain) : collectModels(sa?.perModel ?? {}, {}),
+        tokens: sumBuckets(main),
+        sidechainTokens: sidechainHasModels ? sumBuckets(sidechain) : null,
+        apiCalls: agg?.apiCalls ?? 0,
         costUSD: breakdown.usd,
         costByModel: breakdown.byModel,
         // モデル別 USD(main+sidechain 合算、丸めない)
@@ -142,7 +154,7 @@ async function runTrack(stdinText, opts) {
         // 丸めない(表示時に丸める)
         fxRate: fx.rate,
         fxSource: fx.source,
-        prompt: agg.prompt ?? ""
+        prompt: agg?.prompt ?? ""
       };
       if (isCodex) {
         record.source = "codex";
@@ -169,7 +181,7 @@ async function runTrack(stdinText, opts) {
         }
       }
       appendTurn(record);
-      saveCursor(transcriptPath, agg.newCursor);
+      if (agg !== null) saveCursor(transcriptPath, agg.newCursor);
       if (sa !== null) {
         for (const nc of sa.newCursors) {
           saveCursor(nc.path, nc.cursor);
@@ -179,7 +191,7 @@ async function runTrack(stdinText, opts) {
       commitLock.release();
     }
     const tasks = [];
-    if ((cfg.notify.os || cfg.notify.slack !== null) && record.costUSD >= cfg.minNotifyUSD && !isMuted()) {
+    if (hasMainUsage && (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));

package/package.json

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

package/dist/chunk-ENGUOLTD.js

@@ -1,92 +0,0 @@
-#!/usr/bin/env node
-import {
-  paths
-} from "./chunk-5PH7PPD6.js";
-
-// src/dashboard-state.ts
-import {
-  closeSync,
-  existsSync,
-  openSync,
-  readFileSync,
-  readSync,
-  renameSync,
-  rmSync,
-  writeFileSync
-} from "fs";
-import { randomUUID } from "crypto";
-function localDate(now) {
-  const y = now.getFullYear();
-  const m = String(now.getMonth() + 1).padStart(2, "0");
-  const d = String(now.getDate()).padStart(2, "0");
-  return `${y}-${m}-${d}`;
-}
-function timeZone() {
-  return Intl.DateTimeFormat().resolvedOptions().timeZone || "unknown";
-}
-function makeFullDashboardState(now = /* @__PURE__ */ new Date()) {
-  return { localDate: localDate(now), timeZone: timeZone(), generatedAt: now.toISOString() };
-}
-function readState() {
-  const file = paths().dashboardFullStateFile;
-  if (!existsSync(file)) return null;
-  try {
-    const value = JSON.parse(readFileSync(file, "utf8"));
-    if (typeof value !== "object" || value === null || Array.isArray(value)) return null;
-    const v = value;
-    if (typeof v.localDate !== "string" || !/^\d{4}-\d{2}-\d{2}$/.test(v.localDate) || typeof v.timeZone !== "string" || v.timeZone.length === 0 || typeof v.generatedAt !== "string" || !Number.isFinite(Date.parse(v.generatedAt))) {
-      return null;
-    }
-    return v;
-  } catch {
-    return null;
-  }
-}
-function isFullDashboardDue(now = /* @__PURE__ */ new Date()) {
-  const p = paths();
-  if (!existsSync(p.fullDashboardFile)) return true;
-  try {
-    const fd = openSync(p.fullDashboardFile, "r");
-    try {
-      const head = Buffer.alloc(512);
-      const n = readSync(fd, head, 0, head.length, 0);
-      if (head.toString("utf8", 0, n).includes('name="cccn-placeholder"')) return true;
-    } finally {
-      closeSync(fd);
-    }
-  } catch {
-    return true;
-  }
-  const state = readState();
-  if (state === null) return true;
-  const expected = makeFullDashboardState(now);
-  if (state.timeZone !== expected.timeZone) return true;
-  if (state.localDate !== expected.localDate) return true;
-  if (state.localDate > expected.localDate) return true;
-  if (Date.parse(state.generatedAt) > now.getTime()) return true;
-  return false;
-}
-function writeFullDashboardStateAtomic(state) {
-  const file = paths().dashboardFullStateFile;
-  const tmp = `${file}.${process.pid}.${randomUUID()}.tmp`;
-  try {
-    writeFileSync(tmp, `${JSON.stringify(state)}
-`, "utf8");
-    renameSync(tmp, file);
-  } finally {
-    rmSync(tmp, { force: true });
-  }
-}
-function invalidateCanonicalDashboards() {
-  const p = paths();
-  for (const file of [p.recentDashboardFile, p.fullDashboardFile, p.dashboardFullStateFile]) {
-    rmSync(file, { force: true });
-  }
-}
-
-export {
-  makeFullDashboardState,
-  isFullDashboardDue,
-  writeFullDashboardStateAtomic,
-  invalidateCanonicalDashboards
-};

package/dist/chunk-O2AR4PXU.js

@@ -1,82 +0,0 @@
-#!/usr/bin/env node
-import {
-  aggregateNewTurn
-} from "./chunk-LVMKY6JB.js";
-import {
-  loadCursor,
-  logError,
-  sanitizeCursor
-} from "./chunk-5PH7PPD6.js";
-
-// src/subagents.ts
-import { promises as fs } from "fs";
-import { join } from "path";
-var MAX_AGENT_FILES = 200;
-function emptyBuckets() {
-  return { input: 0, output: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheRead: 0 };
-}
-function addToModel(target, model, b) {
-  const cur = target[model] ?? emptyBuckets();
-  cur.input += b.input;
-  cur.output += b.output;
-  cur.cacheWrite5m += b.cacheWrite5m;
-  cur.cacheWrite1h += b.cacheWrite1h;
-  cur.cacheRead += b.cacheRead;
-  target[model] = cur;
-}
-function mergeUsage(target, src) {
-  for (const [model, b] of Object.entries(src)) addToModel(target, model, b);
-}
-function subagentsDirOf(mainTranscriptPath) {
-  const base = mainTranscriptPath.endsWith(".jsonl") ? mainTranscriptPath.slice(0, -".jsonl".length) : mainTranscriptPath;
-  return join(base, "subagents");
-}
-async function listAgentFiles(dir, entries) {
-  const files = entries.filter((e) => e.isFile() && e.name.startsWith("agent-") && e.name.endsWith(".jsonl")).map((e) => join(dir, e.name));
-  if (files.length <= MAX_AGENT_FILES) return files;
-  const withMtime = [];
-  for (const p of files) {
-    let mtime = 0;
-    try {
-      mtime = (await fs.stat(p)).mtimeMs;
-    } catch {
-      mtime = 0;
-    }
-    withMtime.push({ path: p, mtime });
-  }
-  withMtime.sort((a, b) => b.mtime - a.mtime);
-  return withMtime.slice(0, MAX_AGENT_FILES).map((x) => x.path);
-}
-async function collectSubagentUsage(mainTranscriptPath) {
-  const dir = subagentsDirOf(mainTranscriptPath);
-  let entries;
-  try {
-    entries = await fs.readdir(dir, { withFileTypes: true });
-  } catch {
-    return null;
-  }
-  const files = await listAgentFiles(dir, entries);
-  const perModel = {};
-  let apiCalls = 0;
-  let agentFiles = 0;
-  const newCursors = [];
-  for (const filePath of files) {
-    try {
-      const cursor = sanitizeCursor(loadCursor(filePath));
-      const agg = await aggregateNewTurn(filePath, cursor);
-      if (agg === null) continue;
-      mergeUsage(perModel, agg.main);
-      mergeUsage(perModel, agg.sidechain);
-      apiCalls += agg.apiCalls;
-      agentFiles += 1;
-      newCursors.push({ path: filePath, cursor: agg.newCursor });
-    } catch (err) {
-      logError("subagents:file", err);
-    }
-  }
-  return { perModel, apiCalls, agentFiles, newCursors };
-}
-
-export {
-  collectSubagentUsage
-};