ccc-notifier 0.4.0 → 0.6.0

package/dist/{track-QT2U3E2R.js → track-H4AIT575.js}

@@ -4,30 +4,31 @@ import {
   notifySlack
 } from "./chunk-NV5UOHJA.js";
 import {
-  writeDashboardHtml
-} from "./chunk-2VPBBIDW.js";
-import "./chunk-DGXUSPS4.js";
-import {
-  aggregateCodexTurn,
   collectSubagentUsage
-} from "./chunk-CKVK3UCA.js";
+} from "./chunk-OYD6H3ZZ.js";
 import {
+  aggregateCodexTurn,
   aggregateNewTurn,
+  getUsdJpy
+} from "./chunk-D4D76RGQ.js";
+import {
   computeCost,
-  getUsdJpy,
   loadPriceTable
-} from "./chunk-LHKBGA5K.js";
+} from "./chunk-6HTETN26.js";
+import {
+  writeDashboardHtml
+} from "./chunk-4JSRGJCZ.js";
+import "./chunk-DGXUSPS4.js";
+import "./chunk-J5QAYTFE.js";
 import {
   isFullDashboardDue,
   makeFullDashboardState,
+  waitForDataLock,
   writeFullDashboardStateAtomic
-} from "./chunk-ZHIZZ6V5.js";
-import {
-  waitForDataLock
-} from "./chunk-J6Y3RMMC.js";
-import "./chunk-J5QAYTFE.js";
+} from "./chunk-27SJELD2.js";
 import {
   appendTurn,
+  closeCodexRootContext,
   isMuted,
   loadCursor,
   logError,
@@ -37,7 +38,7 @@ import {
   sanitizeCursor,
   saveCursor,
   todayTotalUSD
-} from "./chunk-26CISNOE.js";
+} from "./chunk-OOAC5ULQ.js";
 
 // src/track.ts
 function isRecord(v) {
@@ -83,14 +84,23 @@ async function runTrack(stdinText, opts) {
     }
     if (!isRecord(parsed)) return;
     const input = parsed;
+    const isCodex = opts?.codex === true;
+    let activityProjectionKey = null;
+    if (isCodex) {
+      try {
+        activityProjectionKey = closeCodexRootContext(parsed);
+      } catch {
+        logError("track:codex-subagent-projection", new Error("activity projection was not attached"));
+      }
+    }
     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;
+    let hasMainUsage = false;
     const commitLock = await waitForDataLock(1e3);
     if (commitLock === null) {
       logError("track:data-lock", new Error("data lock timeout; turn was not consumed"));
@@ -99,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 合算、丸めない)
@@ -133,10 +154,11 @@ async function runTrack(stdinText, opts) {
         // 丸めない(表示時に丸める)
         fxRate: fx.rate,
         fxSource: fx.source,
-        prompt: agg.prompt ?? ""
+        prompt: agg?.prompt ?? ""
       };
       if (isCodex) {
         record.source = "codex";
+        if (activityProjectionKey !== null) record.activityProjectionKey = activityProjectionKey;
       }
       if (breakdown.unknownModels.length > 0) {
         record.unknownModels = breakdown.unknownModels;
@@ -159,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);
@@ -169,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.4.0",
+  "version": "0.6.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",

package/dist/chunk-26CISNOE.js

@@ -1,324 +0,0 @@
-#!/usr/bin/env node
-
-// src/store.ts
-import {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  writeFileSync,
-  appendFileSync,
-  renameSync,
-  rmSync,
-  statSync
-} from "fs";
-import { join } from "path";
-import { homedir } from "os";
-
-// src/types.ts
-var DEFAULT_CONFIG = {
-  notify: { os: true, slack: null },
-  minNotifyUSD: 0,
-  costLabel: "api_equivalent",
-  fx: { fallbackRate: 150, cacheHours: 12 },
-  includeDailyTotal: true,
-  monthlyBudgetUSD: 0,
-  dashboard: { autoRegenerate: true, autoReloadSec: 30, days: 30 }
-};
-
-// src/store.ts
-var ERROR_LOG_MAX_BYTES = 1024 * 1024;
-function paths() {
-  const home = process.env.CCCN_HOME || join(homedir(), ".ccc-notifier");
-  const cacheDir = join(home, "cache");
-  mkdirSync(home, { recursive: true });
-  mkdirSync(cacheDir, { recursive: true });
-  return {
-    home,
-    configFile: join(home, "config.json"),
-    historyFile: join(home, "history.jsonl"),
-    cursorsFile: join(home, "cursors.json"),
-    cacheDir,
-    errorLog: join(home, "error.log"),
-    lastNotifyFile: join(home, "last-notify.json"),
-    muteFile: join(home, "muted.json"),
-    recentDashboardFile: join(home, "report.html"),
-    fullDashboardFile: join(home, "report-all.html"),
-    dashboardFullStateFile: join(cacheDir, "dashboard-full-state.json"),
-    dataLockDir: join(cacheDir, "data.lock"),
-    dataReclaimDir: join(cacheDir, "data.lock.reclaim")
-  };
-}
-function isPlainObject(v) {
-  return typeof v === "object" && v !== null && !Array.isArray(v);
-}
-function mergeConfig(partial) {
-  const result = structuredClone(DEFAULT_CONFIG);
-  if (!isPlainObject(partial)) return result;
-  if (isPlainObject(partial.notify)) {
-    if ("os" in partial.notify) {
-      result.notify.os = partial.notify.os;
-    }
-    if ("slack" in partial.notify) {
-      result.notify.slack = partial.notify.slack;
-    }
-  }
-  if ("minNotifyUSD" in partial) {
-    result.minNotifyUSD = partial.minNotifyUSD;
-  }
-  if ("costLabel" in partial) {
-    result.costLabel = partial.costLabel;
-  }
-  if (isPlainObject(partial.fx)) {
-    if ("fallbackRate" in partial.fx) {
-      result.fx.fallbackRate = partial.fx.fallbackRate;
-    }
-    if ("cacheHours" in partial.fx) {
-      result.fx.cacheHours = partial.fx.cacheHours;
-    }
-  }
-  if ("includeDailyTotal" in partial) {
-    result.includeDailyTotal = partial.includeDailyTotal;
-  }
-  if ("monthlyBudgetUSD" in partial) {
-    const b = partial.monthlyBudgetUSD;
-    if (typeof b === "number" && Number.isFinite(b) && b >= 0) {
-      result.monthlyBudgetUSD = b;
-    }
-  }
-  if (isPlainObject(partial.dashboard)) {
-    if ("autoRegenerate" in partial.dashboard) {
-      result.dashboard.autoRegenerate = partial.dashboard.autoRegenerate;
-    }
-    if ("autoReloadSec" in partial.dashboard) {
-      result.dashboard.autoReloadSec = partial.dashboard.autoReloadSec;
-    }
-    if ("days" in partial.dashboard) {
-      const days = partial.dashboard.days;
-      if (typeof days === "number" && Number.isFinite(days) && Number.isInteger(days) && days > 0) {
-        result.dashboard.days = days;
-      }
-    }
-  }
-  return result;
-}
-function readConfig() {
-  const p = paths();
-  if (!existsSync(p.configFile)) {
-    return structuredClone(DEFAULT_CONFIG);
-  }
-  let raw;
-  try {
-    raw = readFileSync(p.configFile, "utf8");
-  } catch (err) {
-    logError("readConfig", err);
-    return structuredClone(DEFAULT_CONFIG);
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    logError("readConfig", err);
-    return structuredClone(DEFAULT_CONFIG);
-  }
-  return mergeConfig(parsed);
-}
-function readMuteState() {
-  const p = paths();
-  if (!existsSync(p.muteFile)) return null;
-  try {
-    const parsed = JSON.parse(readFileSync(p.muteFile, "utf8"));
-    if (!isPlainObject(parsed) || !("until" in parsed)) return null;
-    const until = parsed.until;
-    if (until === null) return { until: null };
-    if (typeof until === "string" && !Number.isNaN(new Date(until).getTime())) {
-      return { until };
-    }
-    return null;
-  } catch (err) {
-    logError("readMuteState", err);
-    return null;
-  }
-}
-function isMuted(now = /* @__PURE__ */ new Date()) {
-  const state = readMuteState();
-  if (state === null) return false;
-  if (state.until === null) return true;
-  return new Date(state.until).getTime() > now.getTime();
-}
-function writeMuteState(state) {
-  writeFileSync(paths().muteFile, `${JSON.stringify(state)}
-`, "utf8");
-}
-function clearMuteState() {
-  rmSync(paths().muteFile, { force: true });
-}
-function loadCursor(transcriptPath) {
-  const p = paths();
-  if (!existsSync(p.cursorsFile)) return null;
-  let raw;
-  try {
-    raw = readFileSync(p.cursorsFile, "utf8");
-  } catch (err) {
-    logError("loadCursor", err);
-    return null;
-  }
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch (err) {
-    logError("loadCursor", err);
-    return null;
-  }
-  if (!isPlainObject(parsed)) {
-    logError("loadCursor", new Error("cursors.json root is not an object"));
-    return null;
-  }
-  const cursor = parsed[transcriptPath];
-  return cursor ?? null;
-}
-function sanitizeCursor(raw) {
-  if (!isPlainObject(raw)) return null;
-  const { offset, lastUuid, lastTs, seenMessageKeys, codexTotals } = raw;
-  if (typeof offset !== "number" || !Number.isFinite(offset)) return null;
-  if (lastUuid !== null && typeof lastUuid !== "string") return null;
-  if (lastTs !== null && typeof lastTs !== "string") return null;
-  if (!Array.isArray(seenMessageKeys)) return null;
-  const keys = [];
-  for (const key of seenMessageKeys) {
-    if (typeof key !== "string") return null;
-    keys.push(key);
-  }
-  const cursor = { offset, lastUuid, lastTs, seenMessageKeys: keys };
-  if (isPlainObject(codexTotals)) {
-    const { input, cached, output } = codexTotals;
-    if (typeof input === "number" && Number.isFinite(input) && input >= 0 && typeof cached === "number" && Number.isFinite(cached) && cached >= 0 && typeof output === "number" && Number.isFinite(output) && output >= 0) {
-      cursor.codexTotals = { input, cached, output };
-    }
-  }
-  return cursor;
-}
-function saveCursor(transcriptPath, c) {
-  const p = paths();
-  let dict = {};
-  if (existsSync(p.cursorsFile)) {
-    try {
-      const raw = readFileSync(p.cursorsFile, "utf8");
-      const parsed = JSON.parse(raw);
-      if (isPlainObject(parsed)) {
-        dict = parsed;
-      }
-    } catch (err) {
-      logError("saveCursor", err);
-    }
-  }
-  dict[transcriptPath] = c;
-  const tmpFile = `${p.cursorsFile}.tmp`;
-  writeFileSync(tmpFile, JSON.stringify(dict), "utf8");
-  renameSync(tmpFile, p.cursorsFile);
-}
-function appendTurn(record) {
-  const p = paths();
-  appendFileSync(p.historyFile, JSON.stringify(record) + "\n", "utf8");
-}
-function readTurns(days) {
-  const p = paths();
-  if (!existsSync(p.historyFile)) return [];
-  let raw;
-  try {
-    raw = readFileSync(p.historyFile, "utf8");
-  } catch {
-    return [];
-  }
-  const cutoff = typeof days === "number" ? Date.now() - days * 864e5 : null;
-  const result = [];
-  for (const line of raw.split("\n")) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    let rec;
-    try {
-      rec = JSON.parse(trimmed);
-    } catch {
-      continue;
-    }
-    if (cutoff !== null) {
-      const ts = Date.parse(rec.ts);
-      if (!Number.isFinite(ts) || ts < cutoff) continue;
-    }
-    result.push(rec);
-  }
-  return result;
-}
-function todayTotalUSD() {
-  const now = /* @__PURE__ */ new Date();
-  const y = now.getFullYear();
-  const m = now.getMonth();
-  const d = now.getDate();
-  let total = 0;
-  for (const rec of readTurns()) {
-    const ts = new Date(rec.ts);
-    if (Number.isNaN(ts.getTime())) continue;
-    if (ts.getFullYear() === y && ts.getMonth() === m && ts.getDate() === d) {
-      total += rec.costUSD;
-    }
-  }
-  return total;
-}
-function currentMonthTotals() {
-  const now = /* @__PURE__ */ new Date();
-  const y = now.getFullYear();
-  const m = now.getMonth();
-  let usd = 0;
-  let jpy = 0;
-  let turns = 0;
-  for (const rec of readTurns()) {
-    const ts = new Date(rec.ts);
-    if (Number.isNaN(ts.getTime())) continue;
-    if (ts.getFullYear() === y && ts.getMonth() === m) {
-      const sa = rec.subagents?.costUSD ?? 0;
-      usd += rec.costUSD + sa;
-      jpy += rec.costJPY + sa * rec.fxRate;
-      turns += 1;
-    }
-  }
-  return { usd, jpy, turns };
-}
-function logError(context, err) {
-  try {
-    const p = paths();
-    const iso = (/* @__PURE__ */ new Date()).toISOString();
-    const message = err instanceof Error ? err.message : String(err);
-    const stack = err instanceof Error ? err.stack : void 0;
-    let entry = `[${iso}] [${context}] ${message}
-`;
-    if (stack) {
-      entry += `${stack}
-`;
-    }
-    try {
-      const stat = statSync(p.errorLog);
-      if (stat.size > ERROR_LOG_MAX_BYTES) {
-        renameSync(p.errorLog, `${p.errorLog}.old`);
-      }
-    } catch {
-    }
-    appendFileSync(p.errorLog, entry, "utf8");
-  } catch {
-  }
-}
-
-export {
-  paths,
-  readConfig,
-  readMuteState,
-  isMuted,
-  writeMuteState,
-  clearMuteState,
-  loadCursor,
-  sanitizeCursor,
-  saveCursor,
-  appendTurn,
-  readTurns,
-  todayTotalUSD,
-  currentMonthTotals,
-  logError
-};