ccc-notifier 0.6.2 → 0.7.0

package/dist/{chunk-6UZXXO5J.js → chunk-O2E4VTDR.js}

@@ -1,4 +1,15 @@
 #!/usr/bin/env node
+import {
+  makeFullDashboardState,
+  writeFullDashboardStateAtomic
+} from "./chunk-3M5UQK76.js";
+import {
+  waitForDataLock
+} from "./chunk-PXMXEFM7.js";
+import {
+  effectiveSurface,
+  surfaceLabel
+} from "./chunk-6IVSZ3S4.js";
 import {
   isWSL
 } from "./chunk-DGXUSPS4.js";
@@ -7,17 +18,12 @@ import {
   formatTokens,
   formatUSD,
   modelDisplayName
-} from "./chunk-J5QAYTFE.js";
-import {
-  makeFullDashboardState,
-  waitForDataLock,
-  writeFullDashboardStateAtomic
-} from "./chunk-27SJELD2.js";
+} from "./chunk-XG73C6CC.js";
 import {
   paths,
   readConfig,
   readTurns
-} from "./chunk-OOAC5ULQ.js";
+} from "./chunk-WONMZ466.js";
 
 // src/dashboard.ts
 import { spawn, spawnSync } from "child_process";
@@ -1070,6 +1076,27 @@ var APP_JS = `<script>
 function statCard(label, sub, totals) {
   return `<div class="stat"><div class="stat-label">${esc(label)}<span class="stat-sub">${esc(sub)}</span></div><div class="stat-value">${esc(formatUSD(totals.usd))}</div><div class="stat-meta">${esc(formatJPY(totals.jpy))} \xB7 ${totals.turns} \u30BF\u30FC\u30F3</div></div>`;
 }
+function computeSurfaceBreakdown(turns) {
+  const map = /* @__PURE__ */ new Map();
+  for (const rec of turns) {
+    const surface = effectiveSurface(rec);
+    const agg = map.get(surface) ?? { surface, turns: 0, usd: 0, jpy: 0 };
+    agg.turns += 1;
+    agg.usd += turnTotalUSD(rec);
+    agg.jpy += turnTotalJPY(rec);
+    map.set(surface, agg);
+  }
+  return [...map.values()].sort((a, b) => b.usd - a.usd);
+}
+function surfaceSection(turns) {
+  const rows = computeSurfaceBreakdown(turns);
+  if (rows.length === 0) return "";
+  if (rows.length === 1 && rows[0].surface === "cli") return "";
+  const trs = rows.map(
+    (r) => `<tr><td>${esc(surfaceLabel(r.surface))}</td><td class="c-num">${r.turns}</td><td class="c-num">${esc(formatUSD(r.usd))}</td><td class="c-num">${esc(formatJPY(r.jpy))}</td></tr>`
+  ).join("");
+  return `<section class="card"><h2>\u30B5\u30FC\u30D5\u30A7\u30B9\u5225\u5185\u8A33 / By surface</h2><p class="note">CLI \u4EE5\u5916(\u30C7\u30B9\u30AF\u30C8\u30C3\u30D7\u30A2\u30D7\u30EA\u7B49)\u304B\u3089\u306E\u5229\u7528\u5206\u306E\u5185\u8A33(\u57CB\u3081\u8FBC\u307F\u5BFE\u8C61\u671F\u9593\u30FBSA \u8FBC\u307F\u7DCF\u984D)\u3002</p><div class="table-wrap"><table class="turns"><thead><tr><th>\u30B5\u30FC\u30D5\u30A7\u30B9</th><th class="c-num">\u30BF\u30FC\u30F3</th><th class="c-num">$</th><th class="c-num">\xA5</th></tr></thead><tbody>${trs}</tbody></table></div></section>`;
+}
 function renderLegend(slots) {
   if (slots.length < 2) return "";
   const items = slots.map((m) => `<span class="legend-item"><span class="swatch k${m.slot}"></span>${esc(m.name)}</span>`).join("");
@@ -1143,7 +1170,7 @@ function renderDashboard(turns, opts, fullHistory) {
   const refreshMeta = reloadSec > 0 ? `<meta http-equiv="refresh" content="${reloadSec}">` : "";
   const updateTrigger = anyCodex ? "Claude Code / Codex \u306E\u5FDC\u7B54\u5B8C\u4E86\u6642" : "Claude Code \u306E\u5FDC\u7B54\u5B8C\u4E86\u6642";
   const autoUpdateFoot = reloadSec > 0 ? variant === "full" ? `<div class="foot">\u7D04 ${reloadSec} \u79D2\u3054\u3068\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u518D\u8AAD\u8FBC(\u5168\u5C65\u6B74\u7248\u306E\u751F\u6210\u306F\u6B63\u5E38\u306A sweep \u5B8C\u4E86\u6642\u3001\u30ED\u30FC\u30AB\u30EB\u65E5\u3054\u3068\u3001\u307E\u305F\u306F\u624B\u52D5 dashboard --all)</div>` : `<div class="foot">\u7D04 ${reloadSec} \u79D2\u3054\u3068\u306B\u81EA\u52D5\u66F4\u65B0(\u6700\u65B0\u5316\u306F ${updateTrigger}\u3001\u307E\u305F\u306F\u6B63\u5E38\u306A sweep \u5B8C\u4E86\u6642)</div>` : "";
-  const variantNav = variant === "recent" ? `<div class="sub"><strong>${recentVariantLabel}</strong> \xB7 ${opts.peerAvailable ? `<a href="report-all.html">\u5168\u5C65\u6B74\u7248\u3078 / Full history</a>` : `<span aria-disabled="true">\u5168\u5C65\u6B74\u7248\u306F\u672A\u751F\u6210\u3067\u3059\uFF08dashboard --all \u3067\u751F\u6210\uFF09 / Full history not generated</span>`}</div>` : variant === "full" ? `<div class="sub"><strong>\u5168\u5C65\u6B74\u7248 / Full history</strong> \xB7 ${opts.peerAvailable ? `<a href="report.html">\u76F4\u8FD1\u7248\u3078 / Recent</a>` : `<span aria-disabled="true">\u76F4\u8FD1\u7248\u306F\u672A\u751F\u6210\u3067\u3059\uFF08dashboard \u3067\u751F\u6210\uFF09 / Recent not generated</span>`}</div><div class="sub muted">\u6700\u7D42\u751F\u6210 ${esc(generatedAt)}\u3002\u6B63\u5E38\u306A sweep \u5B8C\u4E86\u6642\u3001\u30ED\u30FC\u30AB\u30EB\u65E5\u306E\u6700\u521D\u306E\u6B63\u5E38\u306A\u30BF\u30FC\u30F3\u6642\u3001\u307E\u305F\u306F\u624B\u52D5\u306E dashboard --all \u3067\u66F4\u65B0\u3055\u308C\u307E\u3059\u3002</div>` : "";
+  const variantNav = variant === "recent" ? `<div class="sub"><strong>${recentVariantLabel}</strong> \xB7 ${opts.peerAvailable ? `<a href="report-all.html">\u5168\u5C65\u6B74\u7248\u3078 / Full history</a>` : `<span aria-disabled="true">\u5168\u5C65\u6B74\u7248\u306F\u672A\u751F\u6210\u3067\u3059\uFF08dashboard --all \u3067\u751F\u6210\uFF09 / Full history not generated</span>`}</div>` : variant === "full" ? `<div class="sub"><strong>\u5168\u5C65\u6B74\u7248 / Full history</strong> \xB7 ${opts.peerAvailable ? `<a href="report.html">\u76F4\u8FD1\u7248\u3078 / Recent</a>` : `<span aria-disabled="true">\u76F4\u8FD1\u7248\u306F\u672A\u751F\u6210\u3067\u3059\uFF08dashboard \u3067\u751F\u6210\uFF09 / Recent not generated</span>`}</div><div class="sub muted">\u6700\u7D42\u751F\u6210 ${esc(generatedAt)}</div>` : "";
   const head = `<!doctype html><html lang="ja"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="color-scheme" content="light dark">` + refreshMeta + `<title>ccc-notifier \u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9</title>` + STYLE + `</head><body><div class="wrap">`;
   const foot = autoUpdateFoot + `<div class="foot">ccc-notifier v${esc(version)} \xB7 \u30C7\u30FC\u30BF\u306F\u30ED\u30FC\u30AB\u30EB\u306E\u307F / all data stays local</div></div><div id="cccn-tip" class="cccn-tip" hidden></div><script id="cccn-data" type="application/json">${dataJson}</script>` + APP_JS + `</body></html>`;
   const budgetSection = budgetCard(budgetUSD, budgetMonth, cfg.fx.fallbackRate, anyCodex, limited);
@@ -1161,7 +1188,7 @@ function renderDashboard(turns, opts, fullHistory) {
   const capNote = "\u4EF6\u6570\u304C\u591A\u3044\u5834\u5408\u306F\u65B0\u3057\u3044\u9806\u306B\u5148\u982D200\u4EF6\u306E\u307F\u63CF\u753B\u3057\u307E\u3059(\u691C\u7D22\u3084\u3001\u4E0A\u306E\u30B0\u30E9\u30D5\u3067\u671F\u9593\u3092\u9078\u3076\u3068\u7D5E\u308A\u8FBC\u3081\u307E\u3059)\u3002";
   const truncNote = anyTruncated ? `<p class="note">\u9078\u629E\u4E2D\u306E\u671F\u9593\u306E\u30BF\u30FC\u30F3\u3092\u65B0\u3057\u3044\u9806\u306B\u8868\u793A\u3057\u307E\u3059\u3002${capNote}\u30D7\u30ED\u30F3\u30D7\u30C8\u306F1\u4EF6\u3042\u305F\u308A\u6700\u5927 ${PROMPT_MAX.toLocaleString("en-US")} \u5B57\u307E\u3067(\u8D85\u904E\u5206\u306F\u300C${esc(PROMPT_TRUNC_MARK)}\u300D)\u3002\u884C\u30AF\u30EA\u30C3\u30AF\u3067\u5168\u6587\u5C55\u958B\u3002</p>` : `<p class="note">\u9078\u629E\u4E2D\u306E\u671F\u9593\u306E\u30BF\u30FC\u30F3\u3092\u65B0\u3057\u3044\u9806\u306B\u8868\u793A\u3057\u307E\u3059\u3002${capNote}\u884C\u30AF\u30EA\u30C3\u30AF\u3067\u30D7\u30ED\u30F3\u30D7\u30C8\u5168\u6587\u3092\u5C55\u958B\u3057\u307E\u3059\u3002</p>`;
   const historySection = `<section class="card"><h2>\u30BF\u30FC\u30F3\u5C65\u6B74 / History</h2>` + truncNote + `<div class="toolbar"><input id="turn-search" class="search" type="search" placeholder="\u30D7\u30ED\u30F3\u30D7\u30C8\u30FB\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30FB\u30E2\u30C7\u30EB\u3067\u691C\u7D22 / search\u2026" autocomplete="off"><span class="count"><span id="turn-count">0</span></span></div><div class="table-wrap"><table class="turns"><thead><tr><th>\u6642\u523B</th><th>\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8</th><th>\u30E2\u30C7\u30EB</th><th class="c-num">in</th><th class="c-num">out</th><th class="c-num">$</th><th class="c-num">\xA5</th><th>\u30D7\u30ED\u30F3\u30D7\u30C8</th></tr></thead><tbody id="turn-body"></tbody></table></div></section>`;
-  return head + header + kpiSection + budgetSection + chartSection + breakdownSection + historySection + foot;
+  return head + header + kpiSection + budgetSection + chartSection + breakdownSection + surfaceSection(turns) + historySection + foot;
 }
 function toWindowsPath(path) {
   try {

package/dist/{chunk-D4D76RGQ.js → chunk-OCKZZVOG.js}

@@ -82,6 +82,205 @@ async function getUsdJpy(cfg, cacheDir) {
   return { rate: cfg.fx.fallbackRate, source: "fixed", fetchedAt: (/* @__PURE__ */ new Date()).toISOString() };
 }
 
+// src/claude-roots.ts
+import { promises as fsp } from "fs";
+import { homedir } from "os";
+import * as nodePath from "path";
+import { delimiter, join as join2 } from "path";
+var DESKTOP_DISCOVERY_MAX_DEPTH = 8;
+function defaultClaudeProjectsRoot(override) {
+  if (override) return override;
+  return process.env.CCCN_CLAUDE_PROJECTS || join2(homedir(), ".claude", "projects");
+}
+function defaultClaudeDesktopSessionsRoot() {
+  return join2(homedir(), "Library", "Application Support", "Claude", "local-agent-mode-sessions");
+}
+async function isDirectory(path) {
+  try {
+    return (await fsp.stat(path)).isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function discoverDesktopProjectRoots(sessionsRoot) {
+  const found = [];
+  const walk = async (dir, depth) => {
+    if (depth > DESKTOP_DISCOVERY_MAX_DEPTH) return;
+    let entries;
+    try {
+      entries = await fsp.readdir(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const full = join2(dir, entry.name);
+      if (entry.name === ".claude") {
+        const projects = join2(full, "projects");
+        if (await isDirectory(projects)) found.push(projects);
+        continue;
+      }
+      await walk(full, depth + 1);
+    }
+  };
+  await walk(sessionsRoot, 0);
+  return found;
+}
+async function claudeTranscriptRoots(opts = {}) {
+  const roots = [
+    { path: defaultClaudeProjectsRoot(opts.projectsOverride), surface: "cli" }
+  ];
+  const override = process.env.CCCN_CLAUDE_DESKTOP_ROOTS;
+  if (typeof override === "string" && override.length > 0) {
+    for (const raw of override.split(delimiter)) {
+      const p = raw.trim();
+      if (p.length > 0) roots.push({ path: p, surface: "desktop" });
+    }
+    return roots;
+  }
+  const explicitSessionsRoot = opts.desktopSessionsRoot;
+  const sessionsRoot = explicitSessionsRoot ?? (process.platform === "darwin" ? defaultClaudeDesktopSessionsRoot() : null);
+  if (sessionsRoot !== null && await isDirectory(sessionsRoot)) {
+    for (const p of await discoverDesktopProjectRoots(sessionsRoot)) {
+      roots.push({ path: p, surface: "desktop" });
+    }
+  }
+  return roots;
+}
+function surfaceForClaudePath(transcriptPath, roots) {
+  return rootForClaudePath(transcriptPath, roots)?.surface ?? "cli";
+}
+function rootForClaudePath(transcriptPath, roots) {
+  let best = null;
+  for (const root of roots) {
+    if (!isUnderRoot(transcriptPath, root.path)) continue;
+    if (best === null || root.path.length > best.path.length) best = root;
+  }
+  return best;
+}
+function isUnderRoot(target, root, flavor = nodePath) {
+  let rel;
+  try {
+    rel = flavor.relative(root, target);
+  } catch {
+    return false;
+  }
+  if (rel.length === 0) return true;
+  if (flavor.isAbsolute(rel)) return false;
+  return rel !== ".." && !rel.startsWith(`..${flavor.sep}`);
+}
+async function determineClaudeSurface(transcriptPath) {
+  if (process.env.CCCN_CLAUDE_DESKTOP_ROOTS === void 0) {
+    if (process.platform !== "darwin") return "cli";
+    const sessionsRoot = defaultClaudeDesktopSessionsRoot();
+    const withSep = sessionsRoot.endsWith("/") ? sessionsRoot : `${sessionsRoot}/`;
+    if (transcriptPath !== sessionsRoot && !transcriptPath.startsWith(withSep)) return "cli";
+  }
+  const roots = await claudeTranscriptRoots();
+  return surfaceForClaudePath(transcriptPath, roots);
+}
+
+// src/codex/sessions.ts
+import { promises as fsp2 } from "fs";
+import { join as join3, resolve } from "path";
+var CODEX_MAX_DEPTH = 4;
+async function listCodexRollouts(sessionsRoot) {
+  const rollouts = [];
+  let unreadableDirs = 0;
+  const root = resolve(sessionsRoot);
+  const rootStat = await fsp2.lstat(root).catch(() => null);
+  if (rootStat === null || !rootStat.isDirectory()) {
+    return { rollouts, unreadableDirs: 1 };
+  }
+  const walk = async (dir, depth) => {
+    const entries = await fsp2.readdir(dir, { withFileTypes: true }).catch(() => null);
+    if (entries === null) {
+      unreadableDirs += 1;
+      return;
+    }
+    for (const entry of entries) {
+      const full = resolve(join3(dir, entry.name));
+      if (entry.isFile()) {
+        if (entry.name.startsWith("rollout-") && entry.name.endsWith(".jsonl")) rollouts.push(full);
+      } else if (entry.isDirectory() && depth < CODEX_MAX_DEPTH) {
+        await walk(full, depth + 1);
+      }
+    }
+  };
+  await walk(root, 1);
+  return { rollouts, unreadableDirs };
+}
+async function findLatestCodexRollout(sessionsRoot) {
+  const discovery = await listCodexRollouts(sessionsRoot);
+  let latest = null;
+  let latestMtime = -Infinity;
+  let unreadableFiles = 0;
+  for (const path of discovery.rollouts) {
+    const stat = await fsp2.lstat(path).catch(() => null);
+    if (stat === null || !stat.isFile()) {
+      unreadableFiles += 1;
+      continue;
+    }
+    if (stat.mtimeMs > latestMtime || stat.mtimeMs === latestMtime && (latest === null || path < latest)) {
+      latest = path;
+      latestMtime = stat.mtimeMs;
+    }
+  }
+  return { latest, unreadableDirs: discovery.unreadableDirs, unreadableFiles };
+}
+
+// src/counted-calls.ts
+import { createHash } from "crypto";
+var FINGERPRINT_HEX = 16;
+function sha256Hex(material) {
+  return createHash("sha256").update(material).digest("hex");
+}
+function callFingerprint(messageKey) {
+  return sha256Hex(`claude-call|${messageKey}`).slice(0, FINGERPRINT_HEX);
+}
+function callFingerprints(messageKeys) {
+  const out = [];
+  for (const key of messageKeys) out.push(callFingerprint(key));
+  return out;
+}
+function codexEventFingerprint(rolloutFile, sessionId, byteOffset, totals) {
+  const material = [
+    "codex-event",
+    rolloutFile,
+    sessionId,
+    byteOffset,
+    totals.input,
+    totals.cached,
+    totals.output
+  ].join("|");
+  return sha256Hex(material).slice(0, FINGERPRINT_HEX);
+}
+function ingestKeyOf(fingerprints) {
+  if (fingerprints.length === 0) return void 0;
+  return sha256Hex([...fingerprints].sort().join(","));
+}
+function setCountedCalls(rec, fingerprints) {
+  const unique = [...new Set(fingerprints)].sort();
+  if (unique.length === 0) {
+    delete rec.countedCalls;
+    delete rec.ingestKey;
+    return rec;
+  }
+  rec.countedCalls = unique;
+  rec.ingestKey = ingestKeyOf(unique);
+  return rec;
+}
+function addCountedCalls(rec, fingerprints) {
+  return setCountedCalls(rec, [...rec.countedCalls ?? [], ...fingerprints]);
+}
+function messageKeyFilterOf(counted) {
+  return { has: (messageKey) => counted.has(callFingerprint(messageKey)) };
+}
+function anyOf(filters) {
+  const active = filters.filter((f) => f !== void 0);
+  return { has: (messageKey) => active.some((f) => f.has(messageKey)) };
+}
+
 // src/codex/transcript.ts
 import { readFile as readFile2 } from "fs/promises";
 import { basename } from "path";
@@ -108,11 +307,14 @@ function addTotals(target, d) {
 }
 function readTotals(v) {
   if (!isRecord(v)) return null;
-  return {
-    input: numOf(v.input_tokens),
-    cached: numOf(v.cached_input_tokens),
-    output: numOf(v.output_tokens)
-  };
+  const input = numOf(v.input_tokens);
+  const cached = numOf(v.cached_input_tokens);
+  const output = numOf(v.output_tokens);
+  if (input === 0 && cached === 0 && output === 0) {
+    const total = numOf(v.total_tokens);
+    if (total > 0) return { input: total, cached: total, output: 0 };
+  }
+  return { input, cached, output };
 }
 function totalsToBuckets(acc) {
   return {
@@ -136,6 +338,27 @@ async function readAll(path) {
     return null;
   }
 }
+function readSessionMetaSeed(buffer) {
+  const nl = buffer.indexOf(NEWLINE);
+  if (nl <= 0) return null;
+  let obj;
+  try {
+    obj = JSON.parse(buffer.toString("utf8", 0, nl));
+  } catch {
+    return null;
+  }
+  if (!isRecord(obj) || obj.type !== "session_meta") return null;
+  const payload = isRecord(obj.payload) ? obj.payload : null;
+  if (payload === null) return null;
+  const source = payload.source;
+  return {
+    // session_meta.payload のキーは id。将来 session_id へ戻る可能性に備えて両方見る。
+    sessionId: strOrNull(payload.id) ?? strOrNull(payload.session_id),
+    cwd: strOrNull(payload.cwd),
+    originator: strOrNull(payload.originator),
+    isSubagentRollout: isRecord(source) && Object.hasOwn(source, "subagent")
+  };
+}
 function newSegmentBuf() {
   return {
     acc: zeroTotals(),
@@ -144,10 +367,11 @@ function newSegmentBuf() {
     turnCtxCwd: null,
     firstTs: null,
     endTs: null,
-    hasLines: false
+    hasLines: false,
+    eventKeys: []
   };
 }
-async function scanWindow(rolloutPath, cursor) {
+async function scanWindow(rolloutPath, cursor, opts = {}) {
   const buffer = await readAll(rolloutPath);
   if (buffer === null) return null;
   const fileSize = buffer.length;
@@ -165,16 +389,30 @@ async function scanWindow(rolloutPath, cursor) {
   let prev = initTotals !== void 0 ? { ...initTotals } : zeroTotals();
   const acc = zeroTotals();
   let apiCalls = 0;
-  let lastModel = null;
+  let lastModel = cursor?.codexModel ?? null;
   let windowPrompt = null;
   let windowTurnCtxCwd = null;
   let sessionMetaCwd = null;
   let sessionMetaSid = null;
   let isSubagentRollout = false;
+  let originator = cursor?.codexOriginator ?? null;
+  if (startOffset > 0) {
+    const seed = readSessionMetaSeed(buffer);
+    if (seed !== null) {
+      sessionMetaSid = seed.sessionId;
+      sessionMetaCwd = seed.cwd;
+      if (seed.originator !== null) originator = seed.originator;
+      isSubagentRollout = seed.isSubagentRollout;
+    }
+  }
   let firstTs = null;
   let lastTs = null;
   const segments = [];
+  const windowEventKeys = [];
   let seg = newSegmentBuf();
+  const rolloutFile = basename(rolloutPath);
+  const filenameId = sessionIdFromFilename(rolloutPath);
+  const rolloutId = () => sessionMetaSid ?? filenameId;
   const snapshotSegment = (endOffset) => ({
     acc: seg.acc,
     apiCalls: seg.apiCalls,
@@ -185,9 +423,10 @@ async function scanWindow(rolloutPath, cursor) {
     endTs: seg.endTs,
     endOffset,
     prevAtEnd: { ...prev },
-    lastTsAtEnd: lastTs
+    lastTsAtEnd: lastTs,
+    eventKeys: seg.eventKeys
   });
-  const handleLine = (raw, endOffset) => {
+  const handleLine = (raw, lineOffset, endOffset) => {
     if (raw.trim().length === 0) return;
     let obj;
     try {
@@ -209,12 +448,14 @@ async function scanWindow(rolloutPath, cursor) {
     if (payload === null) return;
     const type = obj.type;
     if (type === "session_meta") {
-      const sid = strOrNull(payload.session_id);
+      const sid = strOrNull(payload.id) ?? strOrNull(payload.session_id);
       if (sid !== null) sessionMetaSid = sid;
       const c = strOrNull(payload.cwd);
       if (c !== null) sessionMetaCwd = c;
       const source = payload.source;
       if (isRecord(source) && Object.hasOwn(source, "subagent")) isSubagentRollout = true;
+      const orig = strOrNull(payload.originator);
+      if (orig !== null) originator = orig;
       return;
     }
     if (type === "turn_context") {
@@ -242,6 +483,11 @@ async function scanWindow(rolloutPath, cursor) {
       if (info === null) return;
       const total = readTotals(info.total_token_usage);
       if (total === null) return;
+      const eventKey = codexEventFingerprint(rolloutFile, rolloutId(), lineOffset, total);
+      if (opts.excludeEvents?.has(eventKey) === true) {
+        prev = total;
+        return;
+      }
       let step = {
         input: total.input - prev.input,
         cached: total.cached - prev.cached,
@@ -252,6 +498,8 @@ async function scanWindow(rolloutPath, cursor) {
       }
       addTotals(acc, step);
       addTotals(seg.acc, step);
+      seg.eventKeys.push(eventKey);
+      windowEventKeys.push(eventKey);
       prev = total;
       if (!isZeroTotals(step)) {
         apiCalls++;
@@ -267,7 +515,7 @@ async function scanWindow(rolloutPath, cursor) {
   let lineStart = startOffset;
   for (let pos = startOffset; pos < fileSize; pos++) {
     if (buffer[pos] !== NEWLINE) continue;
-    handleLine(buffer.toString("utf8", lineStart, pos), pos + 1);
+    handleLine(buffer.toString("utf8", lineStart, pos), lineStart, pos + 1);
     lineStart = pos + 1;
   }
   const newOffset = lineStart;
@@ -281,8 +529,10 @@ async function scanWindow(rolloutPath, cursor) {
     model: lastModel,
     prompt: windowPrompt,
     cwd: windowTurnCtxCwd ?? sessionMetaCwd,
-    sessionId: sessionMetaSid ?? sessionIdFromFilename(rolloutPath),
+    sessionId: rolloutId(),
+    eventKeys: windowEventKeys,
     isSubagentRollout,
+    originator,
     firstTs,
     lastTs,
     newOffset
@@ -296,11 +546,13 @@ function windowCursor(scan) {
     lastTs: scan.lastTs,
     seenMessageKeys: [],
     // 去重は codexTotals の差分方式が担う
-    codexTotals: { ...scan.prev }
+    codexTotals: { ...scan.prev },
+    codexOriginator: scan.originator,
+    codexModel: scan.model
   };
 }
-async function aggregateCodexTurn(rolloutPath, cursor) {
-  const scan = await scanWindow(rolloutPath, cursor);
+async function aggregateCodexTurn(rolloutPath, cursor, opts = {}) {
+  const scan = await scanWindow(rolloutPath, cursor, opts);
   if (scan === null || isZeroTotals(scan.acc)) return null;
   return {
     sessionId: scan.sessionId,
@@ -314,12 +566,73 @@ async function aggregateCodexTurn(rolloutPath, cursor) {
     // rollout に無い
     firstTs: scan.firstTs,
     lastTs: scan.lastTs,
-    newCursor: windowCursor(scan)
+    newCursor: windowCursor(scan),
+    originator: scan.originator,
+    isSubagentRollout: scan.isSubagentRollout,
+    codexEventKeys: scan.eventKeys
+  };
+}
+async function codexConsumedCursor(rolloutPath, cursor, opts = {}) {
+  const scan = await scanWindow(rolloutPath, cursor, opts);
+  return scan === null ? null : windowCursor(scan);
+}
+async function scanCodexTurns(rolloutPath, cursor, opts = {}) {
+  const scan = await scanWindow(rolloutPath, cursor, opts);
+  if (scan === null) return null;
+  const newCursor = windowCursor(scan);
+  if (isZeroTotals(scan.acc)) return { drafts: [], newCursor };
+  return { drafts: draftsFromScan(scan), newCursor };
+}
+async function codexResumePointAtTs(rolloutPath, floorTs) {
+  const buffer = await readAll(rolloutPath);
+  if (buffer === null) return null;
+  const seed = readSessionMetaSeed(buffer);
+  let prev = zeroTotals();
+  let lastModel = null;
+  let consumedEnd = 0;
+  let lineStart = 0;
+  for (let pos = 0; pos < buffer.length; pos++) {
+    if (buffer[pos] !== NEWLINE) continue;
+    const raw = buffer.toString("utf8", lineStart, pos);
+    let obj = null;
+    try {
+      obj = JSON.parse(raw);
+    } catch {
+      obj = null;
+    }
+    if (isRecord(obj)) {
+      const ts = strOrNull(obj.timestamp);
+      if (ts !== null && ts > floorTs) break;
+      const payload = isRecord(obj.payload) ? obj.payload : null;
+      if (obj.type === "turn_context" && payload !== null) {
+        const m = strOrNull(payload.model);
+        if (m !== null) lastModel = m;
+      }
+      if (obj.type === "event_msg" && payload !== null && payload.type === "token_count") {
+        const info = isRecord(payload.info) ? payload.info : null;
+        const total = info === null ? null : readTotals(info.total_token_usage);
+        if (total !== null) prev = total;
+      }
+    }
+    consumedEnd = pos + 1;
+    lineStart = pos + 1;
+  }
+  return {
+    offset: consumedEnd,
+    lastUuid: null,
+    lastTs: floorTs,
+    seenMessageKeys: [],
+    codexTotals: prev,
+    codexOriginator: seed?.originator ?? null,
+    codexModel: lastModel
   };
 }
-async function splitIntoCodexTurnDrafts(rolloutPath, cursor) {
-  const scan = await scanWindow(rolloutPath, cursor);
+async function splitIntoCodexTurnDrafts(rolloutPath, cursor, opts = {}) {
+  const scan = await scanWindow(rolloutPath, cursor, opts);
   if (scan === null || isZeroTotals(scan.acc)) return null;
+  return draftsFromScan(scan);
+}
+function draftsFromScan(scan) {
   const picked = scan.segments.filter((s) => !isZeroTotals(s.acc));
   if (scan.open !== null && !isZeroTotals(scan.open.acc)) {
     picked.push(scan.open);
@@ -336,6 +649,10 @@ async function splitIntoCodexTurnDrafts(rolloutPath, cursor) {
       prompt: s.prompt,
       cwd: s.cwd,
       gitBranch: null,
+      originator: scan.originator,
+      // session_meta はファイル先頭にしか無いので全ドラフト共通
+      isSubagentRollout: scan.isSubagentRollout,
+      codexEventKeys: s.eventKeys,
       firstTs: s.firstTs,
       lastTs: s.endTs,
       // 最後のドラフトはウィンドウ全体を消費した状態(= aggregateCodexTurn の newCursor と同一。
@@ -346,7 +663,9 @@ async function splitIntoCodexTurnDrafts(rolloutPath, cursor) {
         lastUuid: null,
         lastTs: s.lastTsAtEnd,
         seenMessageKeys: [],
-        codexTotals: { ...s.prevAtEnd }
+        codexTotals: { ...s.prevAtEnd },
+        codexOriginator: scan.originator,
+        codexModel: s.model
       }
     },
     endTs: s.endTs
@@ -539,7 +858,21 @@ async function aggregateNewTurn(transcriptPath, cursor, opts = {}) {
 
 export {
   getUsdJpy,
+  claudeTranscriptRoots,
+  surfaceForClaudePath,
+  rootForClaudePath,
+  determineClaudeSurface,
+  listCodexRollouts,
+  findLatestCodexRollout,
+  callFingerprints,
+  setCountedCalls,
+  addCountedCalls,
+  messageKeyFilterOf,
+  anyOf,
   aggregateCodexTurn,
+  codexConsumedCursor,
+  scanCodexTurns,
+  codexResumePointAtTs,
   splitIntoCodexTurnDrafts,
   extractBucket,
   promptCandidate,