ccc-notifier 0.4.0 → 0.6.0

package/dist/cli.js

@@ -1,29 +1,37 @@
 #!/usr/bin/env node
 import {
   fmtMuteUntil
-} from "./chunk-TUZVISLD.js";
+} from "./chunk-T6Z2ZAN4.js";
 import {
-  codexHooksFile,
-  matchesMarker
-} from "./chunk-5LHZOZZO.js";
+  CODEX_HOOK_EVENTS,
+  CODEX_HOOK_TIMEOUT_SECONDS,
+  matchesMarker,
+  parseConfiguredOwnedCodexHookCommand
+} from "./chunk-CH34OJ7Q.js";
 import {
   notifyOS,
   notifySlack,
   selectNotifyBackend
 } from "./chunk-NV5UOHJA.js";
 import {
-  isWSL
-} from "./chunk-DGXUSPS4.js";
+  findLatestCodexRollout
+} from "./chunk-HLJAJS2W.js";
 import {
   codexHome,
   detectCodex
 } from "./chunk-HTYUYKFW.js";
 import {
   aggregateNewTurn,
-  computeCost,
   getUsdJpy,
+  splitIntoCodexTurnDrafts
+} from "./chunk-D4D76RGQ.js";
+import {
+  computeCost,
   loadPriceTable
-} from "./chunk-LHKBGA5K.js";
+} from "./chunk-6HTETN26.js";
+import {
+  isWSL
+} from "./chunk-DGXUSPS4.js";
 import {
   formatJPY,
   formatTokens,
@@ -35,18 +43,191 @@ import {
   readConfig,
   readMuteState,
   readTurns
-} from "./chunk-26CISNOE.js";
+} from "./chunk-OOAC5ULQ.js";
 
 // src/cli.ts
-import { realpathSync } from "fs";
+import { realpathSync as realpathSync2 } from "fs";
 import { createRequire } from "module";
 import { fileURLToPath, pathToFileURL } from "url";
 
 // src/doctor.ts
-import { existsSync, readdirSync, statSync } from "fs";
+import { existsSync as existsSync2, readdirSync, statSync as statSync2 } from "fs";
 import { readFile } from "fs/promises";
 import { homedir } from "os";
-import { join } from "path";
+import { join as join2 } from "path";
+
+// src/codex/hook-diagnostics.ts
+import { existsSync, realpathSync, statSync, readFileSync } from "fs";
+import { delimiter, dirname, extname, isAbsolute, join, normalize, resolve } from "path";
+var MAX_JSON_BYTES = 1024 * 1024;
+function isObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizedAbsolute(path) {
+  return normalize(isAbsolute(path) ? path : resolve(path));
+}
+function normalizedCommandPath(path) {
+  return path.replace(/\\/g, "/");
+}
+function identityPath(path) {
+  const absolute = normalizedAbsolute(path);
+  try {
+    return realpathSync(absolute);
+  } catch {
+    return absolute;
+  }
+}
+function existing(path) {
+  try {
+    statSync(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function findRepoRootCandidate(cwd) {
+  const fallback = normalizedAbsolute(cwd);
+  let current = fallback;
+  for (; ; ) {
+    if (existsSync(join(current, ".git"))) return current;
+    const parent = dirname(current);
+    if (parent === current) return fallback;
+    current = parent;
+  }
+}
+function formatFor(path) {
+  const extension = extname(path).toLowerCase();
+  if (extension === ".json") return "json";
+  if (extension === ".toml") return "toml";
+  return "opaque";
+}
+function discoverCodexHookSources(options) {
+  const repoRoot = findRepoRootCandidate(options.cwd);
+  const candidates = [
+    { path: join(options.codexHome, "hooks.json"), scope: "user", format: "json", discovery: "standard", activeState: "unknown" },
+    { path: join(options.codexHome, "config.toml"), scope: "user", format: "toml", discovery: "standard", activeState: "unknown" },
+    { path: join(repoRoot, ".codex", "hooks.json"), scope: "project", format: "json", discovery: "standard", activeState: "unknown" },
+    { path: join(repoRoot, ".codex", "config.toml"), scope: "project", format: "toml", discovery: "standard", activeState: "unknown" }
+  ];
+  for (const path of (options.envSources ?? "").split(delimiter).filter(Boolean)) {
+    candidates.push({
+      path: normalizedAbsolute(path),
+      scope: "env-extra",
+      format: formatFor(path),
+      discovery: "supplemental",
+      activeState: "unknown"
+    });
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const candidate of candidates) {
+    const path = normalizedAbsolute(candidate.path);
+    if (!existing(path)) continue;
+    const identity = identityPath(path);
+    if (seen.has(identity)) continue;
+    seen.add(identity);
+    result.push({ ...candidate, path });
+  }
+  return result;
+}
+function inspectJson(source, expectedNodePath, expectedCliPath) {
+  let stat;
+  try {
+    stat = statSync(source.path);
+  } catch {
+    return { handlers: [], warning: { sourcePath: source.path, kind: "read-failed" }, nonstandardFeature: false };
+  }
+  if (!stat.isFile()) return { handlers: [], warning: { sourcePath: source.path, kind: "not-regular" }, nonstandardFeature: false };
+  if (stat.size > MAX_JSON_BYTES) return { handlers: [], warning: { sourcePath: source.path, kind: "too-large" }, nonstandardFeature: false };
+  let parsed;
+  try {
+    parsed = JSON.parse(readFileSync(source.path, "utf8"));
+  } catch {
+    return { handlers: [], warning: { sourcePath: source.path, kind: "invalid-json" }, nonstandardFeature: false };
+  }
+  if (!isObject(parsed)) return { handlers: [], warning: { sourcePath: source.path, kind: "invalid-shape" }, nonstandardFeature: false };
+  if (parsed.hooks !== void 0 && !isObject(parsed.hooks)) {
+    return { handlers: [], warning: { sourcePath: source.path, kind: "invalid-shape" }, nonstandardFeature: false };
+  }
+  const hooks = isObject(parsed.hooks) ? parsed.hooks : {};
+  for (const event of CODEX_HOOK_EVENTS) {
+    const groups = hooks[event];
+    if (groups === void 0) continue;
+    if (!Array.isArray(groups) || groups.some((group) => !isObject(group) || !Array.isArray(group.hooks))) {
+      return { handlers: [], warning: { sourcePath: source.path, kind: "invalid-shape" }, nonstandardFeature: false };
+    }
+  }
+  const handlers = [];
+  for (const event of CODEX_HOOK_EVENTS) {
+    const groups = hooks[event];
+    if (!Array.isArray(groups)) continue;
+    for (const group of groups) {
+      if (!isObject(group) || !Array.isArray(group.hooks)) continue;
+      for (const handler of group.hooks) {
+        if (!isObject(handler) || handler.type !== "command") continue;
+        const command = parseConfiguredOwnedCodexHookCommand(handler.command, event);
+        if (command === null) continue;
+        handlers.push({
+          sourcePath: source.path,
+          scope: source.scope,
+          event,
+          nodePath: command.nodePath,
+          cliPath: command.cliPath,
+          timeout: handler.timeout,
+          pathMatches: command.nodePath === normalizedCommandPath(expectedNodePath) && command.cliPath === normalizedCommandPath(expectedCliPath),
+          timeoutMatches: handler.timeout === CODEX_HOOK_TIMEOUT_SECONDS
+        });
+      }
+    }
+  }
+  return {
+    handlers,
+    nonstandardFeature: isObject(parsed.features) && "hooks" in parsed.features
+  };
+}
+function diagnoseCodexHookSources(options) {
+  const candidates = discoverCodexHookSources(options);
+  const handlers = [];
+  const inspectedJsonSources = [];
+  const opaqueSources = [];
+  const warnings = [];
+  for (const source of candidates) {
+    if (source.format !== "json") {
+      opaqueSources.push(source.path);
+      continue;
+    }
+    const inspected = inspectJson(source, options.expectedNodePath, options.expectedCliPath);
+    if (inspected.warning) warnings.push(inspected.warning);
+    else inspectedJsonSources.push(source.path);
+    if (inspected.nonstandardFeature) warnings.push({ sourcePath: source.path, kind: "nonstandard-feature-field" });
+    handlers.push(...inspected.handlers);
+  }
+  const exactDuplicates = [];
+  for (const event of CODEX_HOOK_EVENTS) {
+    const matches = handlers.filter((handler) => handler.event === event);
+    if (matches.length > 1) {
+      exactDuplicates.push({ event, count: matches.length, sources: [...new Set(matches.map((handler) => handler.sourcePath))] });
+    }
+  }
+  const sameLayerMixedRepresentation = [];
+  for (const scope of ["user", "project"]) {
+    const json = candidates.find((source) => source.scope === scope && source.format === "json");
+    const toml = candidates.find((source) => source.scope === scope && source.format === "toml");
+    if (json && toml) sameLayerMixedRepresentation.push({ scope, json: json.path, toml: toml.path });
+  }
+  return {
+    candidates,
+    inspectedJsonSources,
+    opaqueSources,
+    handlers,
+    exactDuplicates,
+    sameLayerMixedRepresentation,
+    effectiveState: "unknown",
+    warnings
+  };
+}
+
+// src/doctor.ts
 function icon(status) {
   if (status === "ok") return "\u2705";
   if (status === "warn") return "\u26A0\uFE0F";
@@ -62,10 +243,10 @@ function isRecord(v) {
   return typeof v === "object" && v !== null && !Array.isArray(v);
 }
 function settingsPath() {
-  return process.env.CCCN_CLAUDE_SETTINGS || join(homedir(), ".claude", "settings.json");
+  return process.env.CCCN_CLAUDE_SETTINGS || join2(homedir(), ".claude", "settings.json");
 }
 function projectsDir() {
-  return process.env.CCCN_CLAUDE_PROJECTS || join(homedir(), ".claude", "projects");
+  return process.env.CCCN_CLAUDE_PROJECTS || join2(homedir(), ".claude", "projects");
 }
 function tokenizeCommand(command) {
   const tokens = [];
@@ -95,7 +276,7 @@ async function safeRun(name, fn) {
 }
 async function checkHookRegistration() {
   const file = settingsPath();
-  if (!existsSync(file)) {
+  if (!existsSync2(file)) {
     log("fail", `settings.json \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${file}(init \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044)`);
     return false;
   }
@@ -137,7 +318,7 @@ async function checkHookRegistration() {
   let allScriptsExist = true;
   for (const command of matchedCommands) {
     const scriptPath = extractScriptPath(command);
-    if (scriptPath === null || !existsSync(scriptPath)) {
+    if (scriptPath === null || !existsSync2(scriptPath)) {
       allScriptsExist = false;
     }
   }
@@ -152,7 +333,7 @@ async function checkHookRegistration() {
     if (first === void 0) continue;
     const looksAbsolute = first.includes("/") || first.includes(":\\");
     if (!looksAbsolute) continue;
-    if (!existsSync(first)) {
+    if (!existsSync2(first)) {
       log(
         "warn",
         `hook \u306E Node \u5B9F\u884C\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093(mise \u7B49\u3067\u306E\u66F4\u65B0\u304C\u539F\u56E0\u306E\u53EF\u80FD\u6027)\u3002init \u3092\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044: ${first}`
@@ -162,48 +343,64 @@ async function checkHookRegistration() {
   return true;
 }
 async function checkCodex() {
-  if (!detectCodex()) {
+  const expectedCli = process.env.CCCN_CLI_PATH ?? process.argv[1] ?? "";
+  const diagnostics = diagnoseCodexHookSources({
+    codexHome: codexHome(),
+    cwd: process.cwd(),
+    expectedNodePath: process.execPath,
+    expectedCliPath: expectedCli,
+    envSources: process.env.CCCN_CODEX_HOOK_SOURCES
+  });
+  if (!detectCodex() && diagnostics.candidates.length === 0) {
     log("ok", "Codex CLI \u306F\u672A\u691C\u51FA\u3067\u3059(\u672A\u4F7F\u7528\u306A\u3089\u554F\u984C\u3042\u308A\u307E\u305B\u3093)");
-    return true;
+    return { ok: true, stopConfigured: false };
   }
-  const hooksFile = codexHooksFile();
-  const matchedCommands = [];
-  if (existsSync(hooksFile)) {
-    try {
-      const raw = await readFile(hooksFile, "utf8");
-      const parsed = JSON.parse(raw);
-      if (isRecord(parsed)) {
-        const hooks = parsed.hooks;
-        const stopEntries = isRecord(hooks) ? hooks.Stop : void 0;
-        if (Array.isArray(stopEntries)) {
-          for (const entry of stopEntries) {
-            if (!isRecord(entry)) continue;
-            const innerHooks = entry.hooks;
-            if (!Array.isArray(innerHooks)) continue;
-            for (const h of innerHooks) {
-              if (isRecord(h) && typeof h.command === "string" && matchesMarker(h.command)) {
-                matchedCommands.push(h.command);
-              }
-            }
-          }
-        }
-      }
-    } catch {
+  for (const source of diagnostics.candidates) {
+    if (source.format === "toml") {
+      log("warn", `Codex inline hook\u5019\u88DC\u3092\u691C\u51FA\u3057\u307E\u3057\u305F(${source.scope}, ${source.discovery}): ${source.path}`);
+      log("warn", "config.toml\u306F\u89E3\u91C8\u3057\u306A\u3044\u305F\u3081handler\u30FBfeatures.hooks\u30FBtrust\u306E\u5B9F\u52B9\u72B6\u614B\u306F\u672A\u78BA\u8A8D\u3067\u3059\u3002Codex\u3067 /hooks \u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044");
+    } else if (source.format === "opaque") {
+      log("warn", `Codex opaque env-extra source\u3092\u691C\u51FA\u3057\u307E\u3057\u305F(\u5185\u5BB9\u672A\u78BA\u8A8D): ${source.path}`);
     }
   }
-  if (matchedCommands.length > 0) {
-    log("ok", `Codex \u306E Stop hook \u304C\u767B\u9332\u3055\u308C\u3066\u3044\u307E\u3059: ${matchedCommands.join(" / ")}`);
-    log("ok", "codex \u5074\u3067 hook \u3092\u627F\u8A8D\u6E08\u307F\u304B\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044(\u672A\u627F\u8A8D\u3060\u3068\u901A\u77E5\u3055\u308C\u307E\u305B\u3093)");
-  } else {
-    log("warn", "Codex \u3092\u691C\u51FA\u3057\u307E\u3057\u305F\u304C hook \u304C\u672A\u767B\u9332\u3067\u3059\u3002init --codex \u3067\u767B\u9332\u3067\u304D\u307E\u3059");
+  for (const warning of diagnostics.warnings) {
+    if (warning.kind === "nonstandard-feature-field") {
+      log("warn", `Codex JSON source\u306B\u975E\u6A19\u6E96features.hooks field\u304C\u3042\u308A\u307E\u3059\u3002global disabled\u306E\u6839\u62E0\u306B\u306F\u3057\u307E\u305B\u3093: ${warning.sourcePath}`);
+    } else {
+      log("warn", `Codex JSON source\u3092\u5B89\u5168\u306B\u691C\u67FB\u3067\u304D\u307E\u305B\u3093(${warning.kind}): ${warning.sourcePath}`);
+    }
+  }
+  for (const handler of diagnostics.handlers) {
+    log(
+      handler.pathMatches && handler.timeoutMatches ? "ok" : "warn",
+      `Codex ${handler.event} hook\u3092\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u4E0A\u3067\u78BA\u8A8D(${handler.scope}): ${handler.sourcePath}; actual nodePath=${handler.nodePath}, actual cliPath=${handler.cliPath}, expected nodePath=${process.execPath.replace(/\\/g, "/")}, expected cliPath=${expectedCli.replace(/\\/g, "/")}, \u5B9F\u4F53path=${handler.pathMatches ? "\u4E00\u81F4" : "\u4E0D\u4E00\u81F4(stale/wrong)"}, timeout=${String(handler.timeout)}`
+    );
+  }
+  for (const event of CODEX_HOOK_EVENTS) {
+    if (!diagnostics.handlers.some((handler) => handler.event === event)) {
+      log("warn", `Codex ${event} hook\u306F\u691C\u67FB\u3067\u304D\u305FJSON source\u3067\u306F\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3002inline/plugin/managed source\u306F\u672A\u78BA\u8A8D\u3067\u3059\u3002\u5FC5\u8981\u306A\u3089 init --codex\u3001\u5B9F\u52B9\u72B6\u614B\u306FCodex\u306E /hooks\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044`);
+    }
+  }
+  for (const duplicate of diagnostics.exactDuplicates) {
+    log("warn", `Codex ${duplicate.event} hook\u306Eexact duplicate\u3092\u691C\u67FB\u6E08\u307FJSON\u3067\u78BA\u8A8D(${duplicate.count}\u4EF6): ${duplicate.sources.join(" / ")}\u3002matching hooks\u306F\u8907\u6570source\u304B\u3089\u3059\u3079\u3066\u5B9F\u884C\u3055\u308C\u5F97\u307E\u3059`);
   }
-  const sessionsDir = join(codexHome(), "sessions");
-  if (existsSync(sessionsDir)) {
+  for (const mixed of diagnostics.sameLayerMixedRepresentation) {
+    log("warn", `Codex ${mixed.scope} layer\u306Bhooks.json\u3068config.toml\u304C\u4F75\u5B58\u3057\u3066\u3044\u307E\u3059(potential duplicate\u3001TOML\u5185\u5BB9\u672A\u78BA\u8A8D): ${mixed.json} / ${mixed.toml}`);
+  }
+  log("warn", "Codex hook\u306Eglobal/individual disabled\u3001project/hook trust\u306F\u9759\u7684\u8A3A\u65AD\u3067\u306F\u672A\u78BA\u8A8D\u3067\u3059\u3002Codex\u3067 /hooks\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044");
+  log("warn", "plugin/managed/session source\u3092\u542B\u3080\u5B9F\u52B9\u72B6\u614B\u306F\u9759\u7684\u8A3A\u65AD\u3060\u3051\u3067\u306F\u5B8C\u5168\u5217\u6319\u3067\u304D\u307E\u305B\u3093\u3002Codex\u3067 /hooks\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044");
+  const sessionsDir = join2(codexHome(), "sessions");
+  if (existsSync2(sessionsDir)) {
     log("ok", `Codex \u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u78BA\u8A8D\u3057\u307E\u3057\u305F: ${sessionsDir}`);
   } else {
     log("ok", `Codex \u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306F\u307E\u3060\u3042\u308A\u307E\u305B\u3093: ${sessionsDir}(\u30BB\u30C3\u30B7\u30E7\u30F3\u672A\u4F5C\u6210\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059)`);
   }
-  return true;
+  return {
+    ok: true,
+    stopConfigured: diagnostics.handlers.some(
+      (handler) => handler.event === "Stop" && handler.scope !== "env-extra"
+    )
+  };
 }
 function readDirSafe(dir) {
   try {
@@ -219,12 +416,12 @@ function findLatestTranscript(dir) {
     const entries = readDirSafe(current);
     if (entries === null) return;
     for (const entry of entries) {
-      const full = join(current, entry.name);
+      const full = join2(current, entry.name);
       if (entry.isDirectory()) {
         walk(full);
       } else if (entry.isFile() && entry.name.endsWith(".jsonl")) {
         try {
-          const mtime = statSync(full).mtimeMs;
+          const mtime = statSync2(full).mtimeMs;
           if (mtime > latestMtime) {
             latestMtime = mtime;
             latestPath = full;
@@ -362,33 +559,99 @@ async function checkNotification(cfg) {
     return true;
   }
 }
-async function checkRecentSessionTotal(latestTranscript) {
+async function checkClaudeRecentSessionTotal(latestTranscript) {
   if (latestTranscript === null) {
-    log("warn", "\u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: transcript \u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u8A08\u7B97\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3057\u305F");
+    log("warn", "Claude Code \u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: transcript \u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u8A08\u7B97\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3057\u305F");
     return true;
   }
   try {
     const aggregate2 = await aggregateNewTurn(latestTranscript, null);
     if (aggregate2 === null) {
-      log("warn", "\u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: \u65B0\u898F usage \u304C\u7121\u3044\u305F\u3081\u8A08\u7B97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F");
+      log("warn", "Claude Code \u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: \u65B0\u898F usage \u304C\u7121\u3044\u305F\u3081\u8A08\u7B97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F");
       return true;
     }
     const table = await loadPriceTable(paths().cacheDir, { offline: true });
     const breakdown = computeCost(aggregate2.main, aggregate2.sidechain, table);
     log(
       "ok",
-      `\u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: ${formatUSD(breakdown.usd)}(Claude Code \u306E /cost \u306E Total cost \u3068\u898B\u6BD4\u3079\u3066\u304F\u3060\u3055\u3044)`
+      `Claude Code \u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08: ${formatUSD(breakdown.usd)}(Claude Code \u306E /cost \u306E Total cost \u3068\u898B\u6BD4\u3079\u3066\u304F\u3060\u3055\u3044)`
     );
     return true;
   } catch (err) {
-    log("warn", `\u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08\u306E\u8A08\u7B97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: ${errMessage(err)}`);
+    log("warn", `Claude Code \u76F4\u8FD1\u30BB\u30C3\u30B7\u30E7\u30F3\u5408\u8A08\u306E\u8A08\u7B97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F: ${errMessage(err)}`);
+    return true;
+  }
+}
+function emptyBuckets() {
+  return { input: 0, output: 0, cacheWrite5m: 0, cacheWrite1h: 0, cacheRead: 0 };
+}
+function mergeUsage(target, incoming) {
+  for (const [model, bucket] of Object.entries(incoming)) {
+    const merged = Object.hasOwn(target, model) ? target[model] : emptyBuckets();
+    merged.input += bucket.input;
+    merged.output += bucket.output;
+    merged.cacheWrite5m += bucket.cacheWrite5m;
+    merged.cacheWrite1h += bucket.cacheWrite1h;
+    merged.cacheRead += bucket.cacheRead;
+    target[model] = merged;
+  }
+}
+function safeUnknownModels(models) {
+  const safe = [...new Set(models.map(
+    (model) => model.replace(/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/gu, "").trim().slice(0, 64) || "unknown"
+  ))].sort();
+  const shown = safe.slice(0, 5);
+  return `${shown.join(", ")}${safe.length > shown.length ? `, ...(+${safe.length - shown.length})` : ""}`;
+}
+async function checkCodexRecentSessionTotal(configured) {
+  if (!configured) return true;
+  try {
+    const sessionsRoot = join2(codexHome(), "sessions");
+    if (!existsSync2(sessionsRoot)) {
+      log("warn", "Codex \u6700\u65B0rollout\u5408\u8A08: \u30BB\u30C3\u30B7\u30E7\u30F3\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u306A\u3044\u305F\u3081\u30B9\u30AD\u30C3\u30D7");
+      return true;
+    }
+    const discovery = await findLatestCodexRollout(sessionsRoot);
+    if (discovery.unreadableDirs > 0 || discovery.unreadableFiles > 0) {
+      log("warn", "Codex \u6700\u65B0rollout\u5408\u8A08: rollout\u63A2\u7D22\u3092\u5B8C\u5168\u306B\u691C\u8A3C\u3067\u304D\u305A\u6700\u65B0\u3092\u78BA\u5B9A\u3067\u304D\u306A\u3044\u305F\u3081\u30B9\u30AD\u30C3\u30D7");
+      return true;
+    }
+    if (discovery.latest === null) {
+      log("warn", "Codex \u6700\u65B0rollout\u5408\u8A08: rollout\u304C\u898B\u3064\u304B\u3089\u306A\u3044\u305F\u3081\u30B9\u30AD\u30C3\u30D7");
+      return true;
+    }
+    const drafts = await splitIntoCodexTurnDrafts(discovery.latest, null);
+    if (drafts === null || drafts.length === 0) {
+      log("warn", "Codex \u6700\u65B0rollout\u5408\u8A08: usage\u304C\u306A\u3044\u3001\u307E\u305F\u306F\u6709\u52B9\u306Atoken_count\u3092\u89E3\u6790\u3067\u304D\u307E\u305B\u3093");
+      return true;
+    }
+    const usage = /* @__PURE__ */ Object.create(null);
+    for (const draft of drafts) mergeUsage(usage, draft.agg.main);
+    const table = await loadPriceTable(paths().cacheDir, { offline: true });
+    const breakdown = computeCost(usage, {}, table);
+    if (breakdown.unknownModels.length > 0) {
+      log(
+        "warn",
+        `Codex \u6700\u65B0rollout\u5408\u8A08: ${formatUSD(breakdown.usd)}(API\u63DB\u7B97\u30FB\u5358\u4E00rollout\u306E\u307F\u30FB\u89AA/\u5B50\u672A\u5206\u985E/\u975E\u5408\u7B97\u30FBClaude Code\u5206\u3068\u306F\u5225\u96C6\u8A08\u3002\u305F\u3060\u3057\u5358\u4FA1\u4E0D\u660E\u30E2\u30C7\u30EB\u3092\u542B\u3080\u305F\u3081\u904E\u5C11\u8A08\u4E0A\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059: ${safeUnknownModels(breakdown.unknownModels)})`
+      );
+    } else {
+      log("ok", `Codex \u6700\u65B0rollout\u5408\u8A08: ${formatUSD(breakdown.usd)}(API\u63DB\u7B97\u30FB\u5358\u4E00rollout\u306E\u307F\u30FB\u89AA/\u5B50\u672A\u5206\u985E/\u975E\u5408\u7B97\u30FBClaude Code\u5206\u3068\u306F\u5225\u96C6\u8A08)`);
+    }
+    return true;
+  } catch {
+    log("warn", "Codex \u6700\u65B0rollout\u5408\u8A08\u306E\u8A08\u7B97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u305F\u305F\u3081\u30B9\u30AD\u30C3\u30D7");
     return true;
   }
 }
 async function runDoctor() {
   const results = [];
   results.push(await safeRun("settings.json", () => checkHookRegistration()));
-  results.push(await safeRun("codex", () => checkCodex()));
+  let codexStopConfigured = false;
+  results.push(await safeRun("codex", async () => {
+    const result = await checkCodex();
+    codexStopConfigured = result.stopConfigured;
+    return result.ok;
+  }));
   let latestTranscript = null;
   results.push(
     await safeRun("projects", async () => {
@@ -402,7 +665,8 @@ async function runDoctor() {
   results.push(await safeRun("pricing", () => checkPricing()));
   results.push(await safeRun("fx", () => checkFx(cfg)));
   results.push(await safeRun("notify", () => checkNotification(cfg)));
-  results.push(await safeRun("recent-session", () => checkRecentSessionTotal(latestTranscript)));
+  results.push(await safeRun("claude-recent-session", () => checkClaudeRecentSessionTotal(latestTranscript)));
+  results.push(await safeRun("codex-recent-session", () => checkCodexRecentSessionTotal(codexStopConfigured)));
   const hasFailure = results.some((ok) => ok === false);
   return hasFailure ? 1 : 0;
 }
@@ -519,6 +783,18 @@ function aggregate(turns) {
     total.costUSD += totalUsd;
     total.costJPY += totalJpy;
     total.subagentsUSD += saUsd;
+    if (rec.source === "codex" && rec.subagentActivity) {
+      const activity = total.codexSubagentActivity ?? {
+        turns: 0,
+        started: 0,
+        stopped: 0,
+        usageStatus: "unavailable"
+      };
+      activity.turns += 1;
+      activity.started += rec.subagentActivity.started;
+      activity.stopped += rec.subagentActivity.stopped;
+      total.codexSubagentActivity = activity;
+    }
   }
   const daily = [...dailyMap.values()].sort((a, b) => a.date.localeCompare(b.date));
   const byModel = {};
@@ -543,6 +819,12 @@ function printTable(result, days) {
   if (result.total.subagentsUSD > 0) {
     console.log(`(\u3046\u3061\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8 ${formatUSD(result.total.subagentsUSD)})`);
   }
+  if (result.total.codexSubagentActivity) {
+    const activity = result.total.codexSubagentActivity;
+    console.log(
+      `(Codex\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u5229\u7528\u3042\u308A\u30FB\u6599\u91D1\u672A\u96C6\u8A08: ${activity.turns}\u30BF\u30FC\u30F3 / \u958B\u59CB${activity.started}\u30FB\u7D42\u4E86${activity.stopped})`
+    );
+  }
   console.log("");
   console.log("\u30E2\u30C7\u30EB\u5225 (By model):");
   console.log("\u30E2\u30C7\u30EB".padEnd(28) + "\u30BF\u30FC\u30F3".padStart(8) + "USD".padStart(10) + "JPY".padStart(12));
@@ -591,9 +873,9 @@ var COMMANDS = [
     en: "Generate and open the HTML dashboard"
   },
   {
-    cmd: "sweep [--dry-run] [--days N] [--include-active]",
-    ja: "\u904E\u53BB\u306E\u672A\u8A08\u4E0A\u5206\u3092\u4E00\u62EC\u3067\u5C65\u6B74\u306B\u53D6\u308A\u8FBC\u3080(\u9032\u884C\u4E2D\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u81EA\u52D5\u30B9\u30AD\u30C3\u30D7)",
-    en: "Backfill uncounted history (active sessions are skipped)"
+    cmd: "sweep [--dry-run] [--days N]",
+    ja: "\u5C65\u6B74\u3068\u53D6\u308A\u8FBC\u307F\u4F4D\u7F6E\u3092\u6368\u3066\u3001\u5143JSONL\u304B\u3089\u6982\u7B97\u3092\u518D\u751F\u6210(--dry-run\u306Fpreview)",
+    en: "Reset and rebuild estimates from source JSONL (--dry-run previews)"
   },
   {
     cmd: "history <clear|redact> [--days N] [--yes]",
@@ -619,6 +901,26 @@ var COMMANDS = [
   { cmd: "--version, -v", ja: "\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u8868\u793A", en: "Show the version" },
   { cmd: "--help, -h", ja: "\u3053\u306E\u30D8\u30EB\u30D7\u3092\u8868\u793A", en: "Show this help" }
 ];
+var CODEX_PASSIVE_EVENTS = ["Stop", "UserPromptSubmit", "SubagentStart", "SubagentStop"];
+function isCodexPassiveEvent(value) {
+  return CODEX_PASSIVE_EVENTS.includes(value);
+}
+async function runCodexPassiveHook(event, text) {
+  try {
+    if (event === "Stop") {
+      const trackMod = await import("./track-H4AIT575.js");
+      await trackMod.runTrack(text, { codex: true });
+    } else if (event === "UserPromptSubmit") {
+      const activity = await import("./subagent-store-US4TJJQR.js");
+      activity.handleCodexUserPromptSubmitHook(text);
+    } else {
+      const activity = await import("./subagent-store-US4TJJQR.js");
+      activity.handleCodexSubagentHook(text, event === "SubagentStart" ? "start" : "stop");
+    }
+  } catch {
+  }
+  return event === "SubagentStart" || event === "UserPromptSubmit" ? Buffer.alloc(0) : Buffer.from("{}\n", "utf8");
+}
 var CMD_COLUMN_WIDTH = Math.max(...COMMANDS.map((c) => c.cmd.length)) + 2;
 var HELP_TEXT = [
   "ccc-notifier(Claude Code Cost notifier)\u2014 Claude Code \u306E\u30D7\u30ED\u30F3\u30D7\u30C8\u3054\u3068\u306E\u30B3\u30B9\u30C8\u901A\u77E5 / per-prompt cost notifier for Claude Code",
@@ -640,9 +942,9 @@ function readVersion() {
   }
 }
 function readStdin(timeoutMs = 500) {
-  return new Promise((resolve) => {
+  return new Promise((resolve2) => {
     if (process.stdin.isTTY) {
-      resolve("");
+      resolve2("");
       return;
     }
     let data = "";
@@ -662,7 +964,7 @@ function readStdin(timeoutMs = 500) {
         process.stdin.unref();
       } catch {
       }
-      resolve(result);
+      resolve2(result);
     };
     const onData = (chunk) => {
       data += typeof chunk === "string" ? chunk : chunk.toString("utf8");
@@ -679,22 +981,30 @@ async function main(argv) {
   const [cmd, ...rest] = argv;
   try {
     switch (cmd) {
+      case "__ccc-notifier-codex-hook": {
+        const event = rest[0];
+        if (!isCodexPassiveEvent(event) || rest.length !== 1) return 0;
+        const text = await readStdin();
+        const response = await runCodexPassiveHook(event, text);
+        if (response.length > 0) process.stdout.write(response);
+        return 0;
+      }
       case "track": {
         const text = await readStdin();
         const codex = rest.includes("--codex");
         try {
-          const trackMod = await import("./track-QT2U3E2R.js");
+          const trackMod = await import("./track-H4AIT575.js");
           await trackMod.runTrack(text, { codex });
         } catch {
         }
         return 0;
       }
       case "init": {
-        const { runInit } = await import("./setup-W3CSTHJC.js");
+        const { runInit } = await import("./setup-3SRNQ5PG.js");
         return await runInit(rest);
       }
       case "uninstall": {
-        const { runUninstall } = await import("./setup-W3CSTHJC.js");
+        const { runUninstall } = await import("./setup-3SRNQ5PG.js");
         return await runUninstall(rest);
       }
       case "doctor":
@@ -702,27 +1012,27 @@ async function main(argv) {
       case "report":
         return await runReport(rest);
       case "dashboard": {
-        const { runDashboard } = await import("./dashboard-GYKABTTN.js");
+        const { runDashboard } = await import("./dashboard-NORNHUPT.js");
         return await runDashboard(rest);
       }
       case "sweep": {
-        const { runSweep } = await import("./sweep-IBSV4LRD.js");
+        const { runSweep } = await import("./sweep-RUPPGAWJ.js");
         return await runSweep(rest);
       }
       case "history": {
-        const { runHistory } = await import("./history-6OUJLXJT.js");
+        const { runHistory } = await import("./history-DL4SG3PG.js");
         return await runHistory(rest);
       }
       case "budget": {
-        const { runBudget } = await import("./budget-EHWPEYXY.js");
+        const { runBudget } = await import("./budget-V7CCMJHF.js");
         return runBudget(rest);
       }
       case "mute": {
-        const { runMute } = await import("./mute-GBDNN5PB.js");
+        const { runMute } = await import("./mute-UIR5P5N5.js");
         return runMute(rest);
       }
       case "unmute": {
-        const { runUnmute } = await import("./mute-GBDNN5PB.js");
+        const { runUnmute } = await import("./mute-UIR5P5N5.js");
         return runUnmute();
       }
       case "--version":
@@ -749,8 +1059,8 @@ function isEntryPoint() {
   const invoked = process.argv[1];
   if (!invoked) return false;
   try {
-    const invokedUrl = pathToFileURL(realpathSync(invoked)).href;
-    const selfUrl = pathToFileURL(realpathSync(fileURLToPath(import.meta.url))).href;
+    const invokedUrl = pathToFileURL(realpathSync2(invoked)).href;
+    const selfUrl = pathToFileURL(realpathSync2(fileURLToPath(import.meta.url))).href;
     return invokedUrl === selfUrl;
   } catch {
     try {
@@ -766,5 +1076,6 @@ if (isEntryPoint()) {
   });
 }
 export {
-  main
+  main,
+  runCodexPassiveHook
 };