ccc-notifier 0.2.0 → 0.3.0

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

@@ -1,19 +1,24 @@
 #!/usr/bin/env node
 import {
-  collectSubagentUsage
-} from "./chunk-TB5A7U7G.js";
+  codexHome,
+  detectCodex
+} from "./chunk-HTYUYKFW.js";
+import {
+  collectSubagentUsage,
+  splitIntoCodexTurnDrafts
+} from "./chunk-DSV75EF7.js";
 import {
   computeCost,
   extractBucket,
   getUsdJpy,
   loadPriceTable,
   promptCandidate
-} from "./chunk-OEG3AVU6.js";
+} from "./chunk-LHKBGA5K.js";
 import {
   formatJPY,
   formatUSD,
   modelDisplayName
-} from "./chunk-TBFKGFZX.js";
+} from "./chunk-J5QAYTFE.js";
 import {
   appendTurn,
   loadCursor,
@@ -22,7 +27,7 @@ import {
   readConfig,
   sanitizeCursor,
   saveCursor
-} from "./chunk-IIYMGLV4.js";
+} from "./chunk-ECADO26T.js";
 
 // src/sweep.ts
 import { readFile } from "fs/promises";
@@ -329,6 +334,102 @@ async function processTranscript(mainPath, table, fx, daysCutoff, dryRun, summar
     }
   }
 }
+var CODEX_MAX_DEPTH = 4;
+async function listCodexRollouts(sessionsRoot) {
+  const found = [];
+  const walk = async (dir, depth) => {
+    const entries = await fsp.readdir(dir, { withFileTypes: true }).catch(() => null);
+    if (entries === null) return;
+    for (const e of entries) {
+      const full = join(dir, e.name);
+      if (e.isFile()) {
+        if (e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")) found.push(full);
+      } else if (e.isDirectory() && depth < CODEX_MAX_DEPTH) {
+        await walk(full, depth + 1);
+      }
+    }
+  };
+  await walk(sessionsRoot, 1);
+  return found;
+}
+function codexDraftToRecord(draft, ts, table, fx) {
+  const main = draft.agg.main;
+  const breakdown = computeCost(main, {}, table);
+  const rec = {
+    schemaVersion: 1,
+    ts,
+    sessionId: draft.agg.sessionId,
+    project: draft.agg.cwd ?? "",
+    gitBranch: null,
+    // rollout に git 情報は無い
+    models: collectModels(main, {}),
+    tokens: sumBuckets(main),
+    sidechainTokens: null,
+    apiCalls: draft.agg.apiCalls,
+    costUSD: breakdown.usd,
+    costByModel: breakdown.byModel,
+    costJPY: breakdown.usd * fx.rate,
+    // 円換算は sweep 実行時レート(Claude 側と同じ)
+    fxRate: fx.rate,
+    fxSource: fx.source,
+    prompt: draft.agg.prompt ?? "",
+    ingest: "sweep",
+    source: "codex"
+  };
+  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));
+  }
+  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);
+  }
+}
+async function codexSessionsRoot() {
+  if (!detectCodex()) return null;
+  const sessionsRoot = join(codexHome(), "sessions");
+  const isDir = await fsp.stat(sessionsRoot).then((st) => st.isDirectory()).catch(() => false);
+  return isDir ? sessionsRoot : null;
+}
+async function sweepCodex(summary, table, fx, daysCutoff, flags) {
+  const sessionsRoot = await codexSessionsRoot();
+  if (sessionsRoot === null) return;
+  const rollouts = await listCodexRollouts(sessionsRoot);
+  for (const rolloutPath of rollouts) {
+    if (!flags.includeActive && await isRecentlyModified(rolloutPath)) {
+      summary.skippedActive += 1;
+      continue;
+    }
+    try {
+      await processCodexRollout(rolloutPath, table, fx, daysCutoff, flags.dryRun, summary);
+    } catch (err) {
+      logError("sweep:codex", err);
+    }
+  }
+}
 function projectsRoot(override) {
   if (override) return override;
   return process.env.CCCN_CLAUDE_PROJECTS || join(homedir(), ".claude", "projects");
@@ -399,6 +500,11 @@ function printSweepSummary(summary, fx) {
         `  \u3046\u3061\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8: ${formatUSD(summary.subagentsUSD)}(${formatJPY(summary.subagentsUSD * fx.rate)})`
       );
     }
+    if (summary.codexRecords > 0) {
+      console.log(
+        `  Codex: ${summary.codexRecords} \u30BF\u30FC\u30F3 ${formatUSD(summary.codexUSD)}(${formatJPY(summary.codexUSD * fx.rate)})`
+      );
+    }
     const top = Object.entries(summary.byModel).filter(([, c]) => c > 0).sort((a, b) => b[1] - a[1]).slice(0, 5);
     if (top.length > 0) {
       console.log("  \u30E2\u30C7\u30EB\u5225(\u4E0A\u4F4D):");
@@ -415,15 +521,18 @@ async function runSweep(argv) {
   const root = projectsRoot(flags.projects);
   const projectDirs = await listProjectDirs(root);
   if (projectDirs === null) {
-    console.log(`\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${root}`);
-    return 1;
+    if (await codexSessionsRoot() === null) {
+      console.log(`\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${root}`);
+      return 1;
+    }
+    console.log(`Claude \u306E\u8D70\u67FB\u30EB\u30FC\u30C8\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${root}(Codex \u306E\u307F\u8D70\u67FB\u3057\u307E\u3059)`);
   }
   const cfg = readConfig();
   const cacheDir = paths().cacheDir;
   const table = await loadPriceTable(cacheDir, { offline: false });
   const fx = await getUsdJpy(cfg, cacheDir);
   const summary = {
-    projects: projectDirs.length,
+    projects: projectDirs === null ? 0 : projectDirs.length,
     transcripts: 0,
     agentFiles: 0,
     newRecords: 0,
@@ -432,10 +541,12 @@ async function runSweep(argv) {
     subagentsUSD: 0,
     byModel: {},
     skippedActive: 0,
+    codexRecords: 0,
+    codexUSD: 0,
     dryRun: flags.dryRun
   };
   const daysCutoff = flags.days !== null ? Date.now() - flags.days * DAY_MS : null;
-  for (const projectDir of projectDirs) {
+  for (const projectDir of projectDirs ?? []) {
     const transcripts = await listTranscripts(projectDir);
     for (const mainPath of transcripts) {
       summary.transcripts += 1;
@@ -450,6 +561,7 @@ async function runSweep(argv) {
       }
     }
   }
+  await sweepCodex(summary, table, fx, daysCutoff, flags);
   summary.totalJPY = summary.totalUSD * fx.rate;
   printSweepSummary(summary, fx);
   return 0;

package/dist/{track-76Q5CZM5.js → track-PXFSGMGL.js}

@@ -2,21 +2,22 @@
 import {
   notifyOS,
   notifySlack
-} from "./chunk-4JNZ7BHO.js";
+} from "./chunk-NV5UOHJA.js";
 import {
   writeDashboardHtml
-} from "./chunk-64N5SGTT.js";
+} from "./chunk-QX5KIRSU.js";
 import "./chunk-DGXUSPS4.js";
 import {
+  aggregateCodexTurn,
   collectSubagentUsage
-} from "./chunk-TB5A7U7G.js";
+} from "./chunk-DSV75EF7.js";
 import {
   aggregateNewTurn,
   computeCost,
   getUsdJpy,
   loadPriceTable
-} from "./chunk-OEG3AVU6.js";
-import "./chunk-TBFKGFZX.js";
+} from "./chunk-LHKBGA5K.js";
+import "./chunk-J5QAYTFE.js";
 import {
   appendTurn,
   isMuted,
@@ -27,7 +28,7 @@ import {
   sanitizeCursor,
   saveCursor,
   todayTotalUSD
-} from "./chunk-IIYMGLV4.js";
+} from "./chunk-ECADO26T.js";
 
 // src/track.ts
 import { join } from "path";
@@ -58,7 +59,13 @@ function collectModels(main, sidechain) {
   }
   return models;
 }
-async function runTrack(stdinText) {
+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 {
@@ -72,14 +79,20 @@ async function runTrack(stdinText) {
     if (typeof transcriptPath !== "string") return;
     const cfg = readConfig();
     const cursor = sanitizeCursor(loadCursor(transcriptPath));
-    const agg = await aggregateNewTurn(transcriptPath, cursor);
+    const isCodex = opts?.codex === true;
+    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;
-    try {
-      sa = await collectSubagentUsage(transcriptPath);
-    } catch (err) {
-      logError("track:subagents", err);
-      sa = null;
+    if (!isCodex) {
+      try {
+        sa = await collectSubagentUsage(transcriptPath);
+      } catch (err) {
+        logError("track:subagents", err);
+        sa = null;
+      }
     }
     const cacheDir = paths().cacheDir;
     const table = await loadPriceTable(cacheDir, { offline: true });
@@ -107,6 +120,9 @@ async function runTrack(stdinText) {
       fxSource: fx.source,
       prompt: agg.prompt ?? ""
     };
+    if (isCodex) {
+      record.source = "codex";
+    }
     if (breakdown.unknownModels.length > 0) {
       record.unknownModels = breakdown.unknownModels;
     }

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "ccc-notifier",
-  "version": "0.2.0",
-  "description": "Claude Code Cost notifier: per-prompt cost notifications (USD/JPY) with local history and HTML dashboard",
+  "version": "0.3.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",
     "claude-code",
     "anthropic",
+    "codex",
+    "codex-cli",
+    "openai",
     "cost",
     "usage",
     "notifier",

package/dist/chunk-TB5A7U7G.js

@@ -1,82 +0,0 @@
-#!/usr/bin/env node
-import {
-  aggregateNewTurn
-} from "./chunk-OEG3AVU6.js";
-import {
-  loadCursor,
-  logError,
-  sanitizeCursor
-} from "./chunk-IIYMGLV4.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
-};