@node9/proxy 2.13.0 → 2.13.1

package/dist/cli.mjs

@@ -1157,9 +1157,7 @@ function unwrapCommandHead(words) {
   while (i < words.length) {
     const head = (words[i] ?? "").toLowerCase().split("/").pop() ?? "";
     if (head === "find") {
-      const x = words.findIndex(
-        (w, k) => k > i && (w === "-exec" || w === "-execdir" || w === "-ok")
-      );
+      const x = words.findIndex((w, k) => k > i && w !== null && FIND_EXEC_FLAGS.has(w));
       if (x < 0) break;
       i = x + 1;
       continue;
@@ -1181,7 +1179,11 @@ function unwrapCommandHead(words) {
       if (t.startsWith("-")) {
         i++;
         const nxt = words[i];
-        if (nxt != null && !nxt.startsWith("-") && !INLINE_INTERPRETER.test(nxt.split("/").pop() ?? "") && !COMMAND_WRAPPERS.has(nxt.toLowerCase()) && !RUNNER_WRAPPERS.has(nxt.toLowerCase()))
+        if (nxt != null && !nxt.startsWith("-") && !INLINE_INTERPRETER.test(nxt.split("/").pop() ?? "") && !COMMAND_WRAPPERS.has(nxt.toLowerCase()) && !RUNNER_WRAPPERS.has(nxt.toLowerCase()) && // A reader is a command, never a flag's operand: `env - cat X`,
+        // `stdbuf -o0 cat X`, `ionice -c3 cat X`. Without this the head was
+        // swallowed and the jail needed a looser fallback whose cost was a
+        // false positive on `sudo echo cat X`.
+        !FS_READ_TOOLS.has(nxt.split("/").pop()?.toLowerCase() ?? ""))
           i++;
         continue;
       }
@@ -1302,34 +1304,18 @@ function isProtectedHomePath(rawPath) {
 }
 function extractLiteralArgs(callExpr) {
   const args = callExpr.Args || [];
-  if (args.length === 0) return { name: "", flags: [], paths: [] };
-  const litFromWord = (w) => {
-    const parts = w?.Parts || [];
-    let s = "";
-    for (const p of parts) {
-      const t = syntax.NodeType(p);
-      if (t === "Lit") s += (p.Value ?? "").replace(/\\(.)/g, "$1");
-      else if (t === "SglQuoted") s += p.Value ?? "";
-      else if (t === "DblQuoted") {
-        const inner = p.Parts || [];
-        if (!inner.every((ip) => syntax.NodeType(ip) === "Lit")) return null;
-        s += inner.map((ip) => ip.Value ?? "").join("");
-      } else {
-        return null;
-      }
-    }
-    return s;
-  };
-  const name = (litFromWord(args[0]) || "").toLowerCase();
+  if (args.length === 0) return { name: "", flags: [], paths: [], words: [] };
+  const words = args.map((a) => resolveWordLiteral(a));
+  const name = (words[0] ?? "").toLowerCase();
   const flags = [];
   const paths = [];
-  for (let i = 1; i < args.length; i++) {
-    const v = litFromWord(args[i]);
+  for (let i = 1; i < words.length; i++) {
+    const v = words[i];
     if (v === null) continue;
     if (v.startsWith("-")) flags.push(v);
     else paths.push(v);
   }
-  return { name, flags, paths };
+  return { name, flags, paths, words };
 }
 function resolveWordLiteral(w) {
   const parts = w?.Parts || [];
@@ -1587,16 +1573,21 @@ function isRmCreatedInCommandCleanup(command) {
   }
   return sawRm && ok2;
 }
-function analyzeFsOperationImpl(command) {
+function analyzeFsOperationImpl(command, depth = 0) {
   const f = parseShared(command);
   if (f === PARSE_FAIL) return null;
   let result = null;
   try {
     syntax.Walk(f, (node) => {
-      if (!node || result) return false;
+      if (!node || result?.verdict === "block") return false;
       const n = node;
-      if (syntax.NodeType(n) !== "CallExpr") return true;
-      const { name, flags, paths } = extractLiteralArgs(n);
+      const nodeType = syntax.NodeType(n);
+      if (nodeType === "Stmt") {
+        result = stricter(result, jailedRedirectRead(n));
+        return result?.verdict !== "block";
+      }
+      if (nodeType !== "CallExpr") return true;
+      const { name, flags, paths, words } = extractLiteralArgs(n);
       if (!name) return true;
       if (name === "rm") {
         const flagStr = flags.join("").toLowerCase();
@@ -1625,19 +1616,22 @@ function analyzeFsOperationImpl(command) {
           }
         }
       }
-      if (FS_READ_TOOLS.has(name)) {
-        for (const p of paths) {
-          for (const sp of SENSITIVE_PATH_RULES) {
-            if (sp.match(p)) {
-              result = {
-                ruleName: sp.rule,
-                verdict: sp.verdict ?? "block",
-                reason: sp.reason,
-                path: p
-              };
-              return false;
-            }
+      if (depth < 1) {
+        const payload = literalShellPayload(words, name);
+        if (payload !== null) {
+          const inner = analyzeFsOperationImpl(payload, depth + 1);
+          if (inner) {
+            result = inner;
+            return false;
           }
+          return true;
+        }
+      }
+      const readPaths = FS_READ_TOOLS.has(name) ? paths : wrappedReadPaths(words, name);
+      if (readPaths) {
+        for (const p of readPaths) {
+          result = stricter(result, matchSensitivePath2(p));
+          if (result?.verdict === "block") return false;
         }
       }
       return true;
@@ -1647,6 +1641,55 @@ function analyzeFsOperationImpl(command) {
     return null;
   }
 }
+function stricter(a, b) {
+  if (!a) return b;
+  if (!b) return a;
+  return b.verdict === "block" && a.verdict !== "block" ? b : a;
+}
+function matchSensitivePath2(p) {
+  for (const sp of SENSITIVE_PATH_RULES) {
+    if (sp.match(p))
+      return { ruleName: sp.rule, verdict: sp.verdict ?? "block", reason: sp.reason, path: p };
+  }
+  return null;
+}
+function wrappedReadPaths(words, name) {
+  if (name === "find") {
+    const k = words.findIndex((w) => w !== null && FIND_EXEC_FLAGS.has(w));
+    if (k < 1 || !isReaderWord(words[k + 1] ?? null)) return null;
+    const firstPredicate = words.findIndex((w, i) => i > 0 && w !== null && w.startsWith("-"));
+    return positionalAfter(words, 1, firstPredicate > 0 ? firstPredicate : k);
+  }
+  if (!COMMAND_WRAPPERS.has(name) && !RUNNER_WRAPPERS.has(name)) return null;
+  const h = unwrapCommandHead(words);
+  return h > 0 && isReaderWord(words[h] ?? null) ? positionalAfter(words, h + 1) : null;
+}
+function literalShellPayload(words, name) {
+  const h = COMMAND_WRAPPERS.has(name) || RUNNER_WRAPPERS.has(name) ? unwrapCommandHead(words) : 0;
+  const head = (words[h] ?? "").split("/").pop()?.toLowerCase() ?? "";
+  if (head === "eval") {
+    const rest = words.slice(h + 1);
+    if (rest.length === 0 || rest.some((w) => w === null)) return null;
+    return rest.join(" ");
+  }
+  if (SHELL_INTERPRETERS.has(head)) {
+    const c = words.findIndex((w, i) => i > h && w !== null && isInlineCodeFlag(head, w));
+    if (c < 0) return null;
+    return words[c + 1] ?? null;
+  }
+  return null;
+}
+function jailedRedirectRead(stmt) {
+  const redirs = stmt.Redirs || [];
+  for (const r of redirs) {
+    if (!r || !REDIR_FILE_IN_OPS.has(r.Op)) continue;
+    const p = resolveWordLiteral(r.Word);
+    if (p === null || p === "") continue;
+    const hit = matchSensitivePath2(p);
+    if (hit) return hit;
+  }
+  return null;
+}
 function analyzeShellCommand(command) {
   const actions = [];
   const paths = [];
@@ -1782,8 +1825,8 @@ function splitOnPipe(cmd) {
   if (current.trim()) segments2.push(current.trim());
   return segments2.filter(Boolean);
 }
-function positionalTokens(segment) {
-  return segment.split(/\s+/).slice(1).filter((t) => !t.startsWith("-") && !t.startsWith("@") && t.length > 0);
+function positionalTokens(tokens) {
+  return tokens.slice(1).filter((t) => !t.startsWith("-") && !t.startsWith("@") && t.length > 0);
 }
 function analyzePipeChain(command) {
   const segments2 = splitOnPipe(command);
@@ -1806,8 +1849,10 @@ function analyzePipeChain(command) {
   for (const segment of segments2) {
     const tokens = segment.split(/\s+/).filter(Boolean);
     if (tokens.length === 0) continue;
-    const binary = tokens[0].toLowerCase();
-    const args = positionalTokens(segment);
+    const h = unwrapCommandHead(tokens);
+    const head = h < tokens.length ? h : 0;
+    const binary = tokens[head].toLowerCase();
+    const args = positionalTokens(tokens.slice(head));
     if (SOURCE_COMMANDS.has(binary)) {
       sourceFiles.push(...args);
       if (args.some(isSensitivePath)) hasSensitiveSource = true;
@@ -3287,7 +3332,7 @@ function* stringValues(obj, depth = 0) {
   }
   for (const v of Object.values(obj)) yield* stringValues(v, depth + 1);
 }
-var IBAN_LENGTH, B58, B58_INDEX, XPRV_VERSIONS, MAX, UNTRUSTED_TOOLS, SIGNALS, ASSIGNMENT_CONTEXT_RE, DLP_STOPWORDS, DLP_PATTERNS, DLP_PATTERNS_GLOBAL, SENSITIVE_PATH_PATTERNS, MAX_DEPTH, MAX_STRING_BYTES, MAX_JSON_PARSE_BYTES, DLP_SCAN_LIMITS, MAX_REGEX_LENGTH, REGEX_CACHE_MAX, regexCache, FORBIDDEN_PATH_SEGMENTS, syntax, sharedParser, MESSAGE_FLAGS, SHELL_INTERPRETERS, DOWNLOAD_CMDS, NORMALIZE_CACHE_MAX, normalizeCache, AST_CACHE_MAX, astCache, PARSE_FAIL, FS_READ_TOOLS, FS_OP_PRESCREEN_RE, HOME_CACHE_ALLOWLIST, SENSITIVE_PATH_RULES, BASH_TOOL_NAMES, AST_FS_REGEX_RULES, SQL_DB_CLIS, SQL_DDL_RE, CHMOD_OPEN_PERM_TOKENS, COMMAND_WRAPPERS, INLINE_INTERPRETER, RUNNER_WRAPPERS, _redirStdinOps, _listOps, WRAPPER_TAKES_TARGET, INTERP_LEADING_TARGET, NET_BINARIES, VALUE_FLAGS, FS_OP_CACHE_MAX, fsOpCache, stripDotSlash, REDIR_TRUNCATE_OPS, REDIR_HEREDOC_OPS, DEFAULT_EGRESS_ALLOWLIST, SOURCE_COMMANDS, SINK_COMMANDS, OBFUSCATORS, SENSITIVE_PATTERNS, FLAGS_WITH_VALUES, SSRF_MAX_HOST, METADATA_ADDRESSES, STRICT_TIERS, METADATA_HOSTNAMES, v4Octets, TIER_REASON, DESTINATION_ARGS, VERDICT_RANK, SQL_DML_KEYWORDS, aws_default, bash_safe_default, docker_default, filesystem_default, github_default, k8s_default, mongodb_default, postgres_default, project_jail_default, redis_default, BUILTIN_SHIELDS, LOOP_MAX_RECORDS, FINDING_TO_SIGNAL, SCAN_SIGNAL_WEIGHTS, LOOP_THRESHOLD_FOR_WASTE, DESTRUCTIVE_OP_RE, SENSITIVE_PATH_RE, FILE_TOOLS, PII_EMAIL_RE, PII_SSN_RE, PII_PHONE_RE, PII_CC16_RE, PII_CC15_RE, PII_IBAN_RE, REALTIME_PII_PATTERNS, MAX_PII_SCAN_BYTES, CANARY_MIN_LENGTH, MAX_TEXT, MAX_DEPTH2, MAX_JSON_PARSE, URL_DEPTH, B64_DEPTH, MIN_SEGMENT, SEPARATORS, stripSeparators, looksText, CANARY_DECODERS, VIEWS, LONG_OUTPUT_THRESHOLD_BYTES, CANONICAL_EXTRACTOR_VERSION, DEDUPE_PREVIEW_LEN, TERMINAL_ESCAPE_RE, ENGINE_VERSION;
+var IBAN_LENGTH, B58, B58_INDEX, XPRV_VERSIONS, MAX, UNTRUSTED_TOOLS, SIGNALS, ASSIGNMENT_CONTEXT_RE, DLP_STOPWORDS, DLP_PATTERNS, DLP_PATTERNS_GLOBAL, SENSITIVE_PATH_PATTERNS, MAX_DEPTH, MAX_STRING_BYTES, MAX_JSON_PARSE_BYTES, DLP_SCAN_LIMITS, MAX_REGEX_LENGTH, REGEX_CACHE_MAX, regexCache, FORBIDDEN_PATH_SEGMENTS, syntax, sharedParser, MESSAGE_FLAGS, SHELL_INTERPRETERS, DOWNLOAD_CMDS, NORMALIZE_CACHE_MAX, normalizeCache, AST_CACHE_MAX, astCache, PARSE_FAIL, FS_READ_TOOLS, FS_OP_PRESCREEN_RE, HOME_CACHE_ALLOWLIST, SENSITIVE_PATH_RULES, BASH_TOOL_NAMES, AST_FS_REGEX_RULES, SQL_DB_CLIS, SQL_DDL_RE, CHMOD_OPEN_PERM_TOKENS, COMMAND_WRAPPERS, INLINE_INTERPRETER, RUNNER_WRAPPERS, _redirStdinOps, _listOps, WRAPPER_TAKES_TARGET, FIND_EXEC_FLAGS, INTERP_LEADING_TARGET, NET_BINARIES, VALUE_FLAGS, FS_OP_CACHE_MAX, fsOpCache, stripDotSlash, REDIR_TRUNCATE_OPS, REDIR_FILE_IN_OPS, REDIR_HEREDOC_OPS, isReaderWord, positionalAfter, DEFAULT_EGRESS_ALLOWLIST, SOURCE_COMMANDS, SINK_COMMANDS, OBFUSCATORS, SENSITIVE_PATTERNS, FLAGS_WITH_VALUES, SSRF_MAX_HOST, METADATA_ADDRESSES, STRICT_TIERS, METADATA_HOSTNAMES, v4Octets, TIER_REASON, DESTINATION_ARGS, VERDICT_RANK, SQL_DML_KEYWORDS, aws_default, bash_safe_default, docker_default, filesystem_default, github_default, k8s_default, mongodb_default, postgres_default, project_jail_default, redis_default, BUILTIN_SHIELDS, LOOP_MAX_RECORDS, FINDING_TO_SIGNAL, SCAN_SIGNAL_WEIGHTS, LOOP_THRESHOLD_FOR_WASTE, DESTRUCTIVE_OP_RE, SENSITIVE_PATH_RE, FILE_TOOLS, PII_EMAIL_RE, PII_SSN_RE, PII_PHONE_RE, PII_CC16_RE, PII_CC15_RE, PII_IBAN_RE, REALTIME_PII_PATTERNS, MAX_PII_SCAN_BYTES, CANARY_MIN_LENGTH, MAX_TEXT, MAX_DEPTH2, MAX_JSON_PARSE, URL_DEPTH, B64_DEPTH, MIN_SEGMENT, SEPARATORS, stripSeparators, looksText, CANARY_DECODERS, VIEWS, LONG_OUTPUT_THRESHOLD_BYTES, CANONICAL_EXTRACTOR_VERSION, DEDUPE_PREVIEW_LEN, TERMINAL_ESCAPE_RE, ENGINE_VERSION;
 var init_dist = __esm({
   "packages/policy-engine/dist/index.mjs"() {
     "use strict";
@@ -3905,13 +3950,32 @@ var init_dist = __esm({
       })
     );
     SENSITIVE_PATH_PATTERNS = [
-      /[/\\]\.ssh[/\\]/i,
-      /[/\\]\.aws[/\\]/i,
+      /[/\\]\.ssh([/\\]|$)/i,
+      /[/\\]\.aws([/\\]|$)/i,
       /[/\\]\.config[/\\]gcloud[/\\]/i,
       /[/\\]\.azure[/\\]/i,
       /[/\\]\.kube[/\\]config$/i,
-      /[/\\]\.env($|\.)/i,
-      // .env, .env.local, .env.production — not .envoy
+      // ⚠️ ONE SEMANTIC, FOUR COPIES. This is the AST tier's `.env` rule verbatim
+      // (shell/index.ts SENSITIVE_PATH_RULES), whose reasoning is documented there:
+      // structural suffix chain rather than a hand-written list, `example|sample|
+      // template` exempt because a fixture stays a fixture whatever follows, and
+      // `.test` anchored because `test` names an ENVIRONMENT -- `.env.test` is the
+      // committed template, `.env.test.local` is gitignored and holds real values.
+      //
+      // It was previously `[/\\]\.env($|\.)` with NO exemptions, so `Read .env.example`
+      // blocked while `cat .env.example` allowed: the same file, opposite verdicts,
+      // decided only by which tool asked. See src/__tests__/jail-both-doors.test.ts,
+      // which is the contract that now holds these copies in step, and stage 5 of
+      // doc/credential-jail-architecture.md, which replaces them with one generated
+      // source.
+      // ⚠️ The `.local` branch comes FIRST and takes no exemption. A fixture stays a
+      // fixture whatever follows it -- `.env.example.md` is documentation -- but
+      // `.env.example.local` is gitignored by the `.env*.local` convention and holds
+      // real values, exactly the reasoning that anchors `(?!\.test$)` rather than
+      // using `\b`. Without this branch the fixture exemption also bought a two-step
+      // bypass: `cp .env .env.sample`, then read the copy.
+      /[/\\]\.env(?![\w-])(?:[\w.-]*\.local$|(?!\.(?:example|sample|template)\b)(?!\.test$)[\w.-]*$)/i,
+      // .env + any suffix chain; fixtures exempt unless .local
       /[/\\]\.git-credentials$/i,
       /[/\\]\.npmrc$/i,
       /[/\\]\.docker[/\\]config\.json$/i,
@@ -3993,6 +4057,10 @@ var init_dist = __esm({
       "od",
       "xxd",
       "hexdump",
+      // Emits the file's bytes, re-encoded, so it is a read by the set's own test
+      // ("does it emit file contents"). Absent until 2026-09-10, which is why
+      // `base64 ~/.ssh/id_rsa` printed a private key with no verdict.
+      "base64",
       "strings",
       "sort",
       "uniq",
@@ -4001,7 +4069,11 @@ var init_dist = __esm({
       "dd"
     ]);
     FS_OP_PRESCREEN_RE = new RegExp(
-      `(?:^|[\\s|;&(\`\\n])(?:rm|${[...FS_READ_TOOLS].map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|")})\\b`
+      // A quote is a separator too: `eval "cat X"` and `sh -c 'cat X'` put the
+      // reader right after `"` / `'`, and without these two characters the
+      // prescreen rejected every string-wrapped read before the parser ran.
+      // Found 2026-09-11 by instrumenting the walk -- no CallExpr was ever visited.
+      `(?:^|[\\s|;&("'\`\\n])(?:rm|${[...FS_READ_TOOLS].map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|")})\\b|(?<!<)<(?!<)`
     );
     HOME_CACHE_ALLOWLIST = [
       ".cache",
@@ -4022,12 +4094,12 @@ var init_dist = __esm({
       {
         rule: "shield:project-jail:block-read-ssh",
         reason: "Reading SSH private keys is blocked by project-jail shield",
-        match: (p) => /(^|[\\/])\.ssh[\\/]/i.test(p)
+        match: (p) => /([\\/]\.ssh[\\/]|^\.ssh[\\/]|^(?:[~/]|[A-Za-z]:).*[\\/]\.ssh$)/i.test(p)
       },
       {
         rule: "shield:project-jail:block-read-aws",
         reason: "Reading AWS credentials is blocked by project-jail shield",
-        match: (p) => /(^|[\\/])\.aws[\\/]/i.test(p)
+        match: (p) => /([\\/]\.aws[\\/]|^\.aws[\\/]|^(?:[~/]|[A-Za-z]:).*[\\/]\.aws$)/i.test(p)
       },
       {
         // Mirrors the JSON shield's `.env` pattern (project-jail.json's
@@ -4071,7 +4143,9 @@ var init_dist = __esm({
         //     symmetry — silently exempts every `.env.test.*` file.
         //
         // shields.test.ts:983-995 is the canonical contract; keep both in step.
-        match: (p) => /(?:^|[\\/])\.env(?![\w-])(?!\.(?:example|sample|template)\b)(?!\.test$)[\w.-]*$/i.test(p)
+        match: (p) => /(?:^|[\\/])\.env(?![\w-])(?:[\w.-]*\.local$|(?!\.(?:example|sample|template)\b)(?!\.test$)[\w.-]*$)/i.test(
+          p
+        )
       },
       {
         // verdict: 'review' (not 'block') is a deliberate design choice
@@ -4182,8 +4256,18 @@ var init_dist = __esm({
     _redirStdinOps = null;
     _listOps = null;
     WRAPPER_TAKES_TARGET = /* @__PURE__ */ new Set(["chroot"]);
+    FIND_EXEC_FLAGS = /* @__PURE__ */ new Set(["-exec", "-execdir", "-ok", "-okdir"]);
     INTERP_LEADING_TARGET = /* @__PURE__ */ new Set(["su"]);
-    NET_BINARIES = /* @__PURE__ */ new Set(["curl", "wget", "scp", "ssh", "nc", "ncat", "netcat"]);
+    NET_BINARIES = /* @__PURE__ */ new Set([
+      "curl",
+      "wget",
+      "scp",
+      "ssh",
+      "nc",
+      "ncat",
+      "netcat",
+      "rsync"
+    ]);
     VALUE_FLAGS = {
       curl: /* @__PURE__ */ new Set([
         "-d",
@@ -4272,10 +4356,15 @@ var init_dist = __esm({
     fsOpCache = /* @__PURE__ */ new Map();
     stripDotSlash = (p) => p.replace(/^\.\//, "");
     REDIR_TRUNCATE_OPS = /* @__PURE__ */ new Set([deriveRedirOp(">_f")]);
+    REDIR_FILE_IN_OPS = new Set(
+      [deriveRedirOp("cat < f"), deriveRedirOp("cat <> f")].filter((op) => op >= 0)
+    );
     REDIR_HEREDOC_OPS = /* @__PURE__ */ new Set([
       deriveRedirOp("cat <<X\nX"),
       deriveRedirOp("cat <<-X\nX")
     ]);
+    isReaderWord = (w) => w !== null && FS_READ_TOOLS.has(w.split("/").pop()?.toLowerCase() ?? "");
+    positionalAfter = (words, from, to = words.length) => words.slice(from, to).filter((w) => w !== null && !w.startsWith("-"));
     DEFAULT_EGRESS_ALLOWLIST = [
       // node9's own control plane (api, app, dev-api, staging and the apex).
       // Without it, turning egress on asks the user to approve node9 itself.
@@ -4299,21 +4388,7 @@ var init_dist = __esm({
       "deb.debian.org",
       "*.ubuntu.com"
     ];
-    SOURCE_COMMANDS = /* @__PURE__ */ new Set([
-      "cat",
-      "head",
-      "tail",
-      "grep",
-      "awk",
-      "sed",
-      "cut",
-      "sort",
-      "tee",
-      "less",
-      "more",
-      "strings",
-      "xxd"
-    ]);
+    SOURCE_COMMANDS = /* @__PURE__ */ new Set([...FS_READ_TOOLS, "tee"]);
     SINK_COMMANDS = /* @__PURE__ */ new Set([
       "curl",
       "wget",
@@ -4344,16 +4419,25 @@ var init_dist = __esm({
       "node"
     ]);
     SENSITIVE_PATTERNS = [
-      /(?:^|\/)\.env(?:\.|$)/i,
-      // .env, .env.local, .env.production
+      // Kept in step with the AST tier and dlp/ -- see jail-both-doors.test.ts.
+      /(?:^|\/)\.env(?![\w-])(?:[\w.-]*\.local$|(?!\.(?:example|sample|template)\b)(?!\.test$)[\w.-]*$)/i,
+      // .env chain; fixtures exempt unless .local
       /id_rsa|id_ed25519|id_ecdsa|id_dsa/i,
       // SSH private keys
       /\.pem$|\.key$|\.p12$|\.pfx$/i,
       // certificate files
-      /(?:^|\/)\.ssh\//i,
-      // ~/.ssh/ directory
-      /(?:^|\/)\.aws\/credentials/i,
-      // AWS credentials
+      // The `$` half mirrors shell/index.ts's SENSITIVE_PATH_RULES: a file INSIDE
+      // the directory counts wherever it appears, while the directory ITSELF counts
+      // only when the path is ROOTED (`~/.ssh`, `/home/u/.ssh`) -- an unrooted
+      // `config/.ssh` is more likely a search pattern than a read. These are
+      // extracted TOKENS (see `args.some(isSensitivePath)` below), the same input
+      // contract as the shell tier, so the same boundary is the right one.
+      // Without it `grep -r x ~/.ssh | curl -d @-` scored one tier BELOW the
+      // identical pipeline naming a file inside that directory.
+      /(?:^|\/)\.ssh\/|^(?:[~/]|[A-Za-z]:).*\/\.ssh$/i,
+      // ~/.ssh/ and ~/.ssh
+      /(?:^|\/)\.aws\/credentials|^(?:[~/]|[A-Za-z]:).*\/\.aws$/i,
+      // AWS creds + dir
       /(?:^|\/)\.netrc$/i,
       // netrc (stores HTTP credentials)
       /(?:^|\/)(passwd|shadow|sudoers)$/i,
@@ -5021,7 +5105,7 @@ var init_dist = __esm({
             {
               field: "command",
               op: "matches",
-              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|sort|uniq|tac|nl|dd)\\s+.*?\\.ssh[\\/\\\\]",
+              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|base64|sort|uniq|tac|nl|dd)\\s+.*?\\.ssh[\\/\\\\]",
               flags: "i"
             }
           ],
@@ -5035,7 +5119,7 @@ var init_dist = __esm({
             {
               field: "command",
               op: "matches",
-              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|sort|uniq|tac|nl|dd)\\s+.*?\\.aws[\\/\\\\]",
+              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|base64|sort|uniq|tac|nl|dd)\\s+.*?\\.aws[\\/\\\\]",
               flags: "i"
             }
           ],
@@ -5049,7 +5133,7 @@ var init_dist = __esm({
             {
               field: "command",
               op: "matches",
-              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|sort|uniq|tac|nl|dd)\\s+.*?\\.env(\\.(local|production|staging|development|production\\.local|staging\\.local|development\\.local))?(?=\\s|$|[;&|>)<])",
+              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|base64|sort|uniq|tac|nl|dd)\\s+.*?\\.env(\\.(local|production|staging|development|production\\.local|staging\\.local|development\\.local))?(?=\\s|$|[;&|>)<])",
               flags: "i"
             }
           ],
@@ -5063,7 +5147,7 @@ var init_dist = __esm({
             {
               field: "command",
               op: "matches",
-              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|sort|uniq|tac|nl|dd)\\s+.*(credentials\\.json|\\.netrc|\\.npmrc|\\.docker[\\/\\\\]config\\.json|gcloud[\\/\\\\]credentials)",
+              value: "(cat|less|head|tail|bat|more|open|print|nano|vim|vi|emacs|code|type|grep|egrep|fgrep|rg|ag|ack|awk|gawk|sed|cut|tr|jq|yq|od|xxd|hexdump|strings|base64|sort|uniq|tac|nl|dd)\\s+.*(credentials\\.json|\\.netrc|\\.npmrc|\\.docker[\\/\\\\]config\\.json|gcloud[\\/\\\\]credentials)",
               flags: "i"
             }
           ],
@@ -5077,7 +5161,7 @@ var init_dist = __esm({
             {
               field: "file_path",
               op: "matches",
-              value: "(^|[\\/\\\\])\\.ssh[\\/\\\\]",
+              value: "([\\/\\\\]\\.ssh([\\/\\\\]|$)|^\\.ssh[\\/\\\\])",
               flags: "i"
             }
           ],
@@ -5091,7 +5175,7 @@ var init_dist = __esm({
             {
               field: "file_path",
               op: "matches",
-              value: "(^|[\\/\\\\])\\.aws[\\/\\\\]",
+              value: "([\\/\\\\]\\.aws([\\/\\\\]|$)|^\\.aws[\\/\\\\])",
               flags: "i"
             }
           ],
@@ -5105,7 +5189,7 @@ var init_dist = __esm({
             {
               field: "file_path",
               op: "matches",
-              value: "(^|[\\/\\\\])\\.env(\\.(local|production|staging|development|production\\.local|staging\\.local|development\\.local))?$",
+              value: "(^|[\\/\\\\])\\.env(?![\\w-])(?:[\\w.-]*\\.local$|(?!\\.(example|sample|template)\\b)(?!\\.test$)[\\w.-]*$)",
               flags: "i"
             }
           ],
@@ -5248,7 +5332,7 @@ var init_dist = __esm({
     };
     LOOP_THRESHOLD_FOR_WASTE = 3;
     DESTRUCTIVE_OP_RE = /\brm\s+-[rRf]+\b|\bDROP\s+(TABLE|DATABASE|COLLECTION|SCHEMA)\b|\bTRUNCATE\s+TABLE\b|\bgit\s+push\s+(--force|-f)\b|\bFLUSHALL\b|\bFLUSHDB\b|\bkubectl\s+delete\b|\bhelm\s+uninstall\b/i;
-    SENSITIVE_PATH_RE = /\.aws\/(credentials|config)\b|\.ssh\/(id_rsa|id_ed25519|id_ecdsa|id_dsa)\b|\.env(\.|$|\b)|\.config\/gcloud\/credentials\.db\b|\.docker\/config\.json\b|\.netrc\b|\.npmrc\b|\.node9\/credentials\.json\b/i;
+    SENSITIVE_PATH_RE = /[\\/]\.aws(?:[\\/]|$)|^\.aws[\\/]|[\\/]\.ssh(?:[\\/]|$)|^\.ssh[\\/]|(?:^|[\\/])\.env(?![\w-])(?:[\w.-]*\.local$|(?!\.(?:example|sample|template)\b)(?!\.test$)[\w.-]*$)|\.config\/gcloud\/credentials\.db\b|\.docker\/config\.json\b|\.netrc\b|\.npmrc\b|\.node9\/credentials\.json\b/i;
     FILE_TOOLS = /* @__PURE__ */ new Set([
       "read",
       "read_file",
@@ -5325,7 +5409,7 @@ var init_dist = __esm({
       { view: "separators-stripped", decoder: "separators", stripped: true }
     ];
     LONG_OUTPUT_THRESHOLD_BYTES = 100 * 1024;
-    CANONICAL_EXTRACTOR_VERSION = "canonical-v10";
+    CANONICAL_EXTRACTOR_VERSION = "canonical-v13";
     DEDUPE_PREVIEW_LEN = 120;
     TERMINAL_ESCAPE_RE = // eslint-disable-next-line no-control-regex
     /\x1b\[[0-9;?]*[A-Za-z]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|\x1b[@-_]|[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g;
@@ -8643,7 +8727,7 @@ function isNetworkTool(toolName, args) {
   if (t === "bash" || t === "shell" || t === "run_shell_command" || t === "terminal.execute") {
     const a = args;
     const cmd = typeof a?.command === "string" ? a.command : typeof a?.cmd === "string" ? a.cmd : "";
-    return /\b(curl|wget|scp|rsync|nc|ncat|netcat|ssh)\b/.test(cmd);
+    return NETWORK_COMMAND_RE.test(cmd);
   }
   return false;
 }
@@ -9518,7 +9602,7 @@ function canaryRecordById(id) {
     return null;
   }
 }
-var WRITE_TOOLS;
+var WRITE_TOOLS, NETWORK_COMMAND_RE;
 var init_orchestrator = __esm({
   "src/auth/orchestrator.ts"() {
     "use strict";
@@ -9548,6 +9632,7 @@ var init_orchestrator = __esm({
       "notebook_edit",
       "notebookedit"
     ]);
+    NETWORK_COMMAND_RE = new RegExp(`(?<![.\\w-])(${[...NET_BINARIES].join("|")})\\b`);
   }
 });
 
@@ -12613,9 +12698,10 @@ async function ensurePricingLoaded() {
   memCacheAt = Date.now();
   lookupCache.clear();
 }
-function pricingFor(model) {
+function pricingFor(model, options = {}) {
   const norm = normalizeModel(model);
-  const cached = lookupCache.get(norm);
+  const lookupKey = options.exact ? `exact:${norm}` : norm;
+  const cached = lookupCache.get(lookupKey);
   if (cached !== void 0) return cached;
   if (memCache === null && !diskChecked) {
     diskChecked = true;
@@ -12635,6 +12721,7 @@ function pricingFor(model) {
       resolved = exact;
       break;
     }
+    if (options.exact) continue;
     let best = null;
     for (const key of Object.keys(source)) {
       if (norm.startsWith(key.toLowerCase()) && (best === null || key.length > best.length)) {
@@ -12646,7 +12733,7 @@ function pricingFor(model) {
       break;
     }
   }
-  lookupCache.set(norm, resolved);
+  lookupCache.set(lookupKey, resolved);
   return resolved;
 }
 var LITELLM_URL, BUNDLED_PRICING, CACHE_FILE, TTL_MS, memCache, memCacheAt, diskChecked, lookupCache;
@@ -12680,6 +12767,18 @@ var init_litellm = __esm({
       "gpt-5": [125e-8, 1e-5, 0, 125e-9],
       "gpt-5-codex": [125e-8, 1e-5, 0, 125e-9],
       "gpt-5-mini": [25e-8, 2e-6, 0, 25e-9],
+      // Codex offline rates checked against official OpenAI model pages, 2026-09-11.
+      "gpt-5.1-codex": [125e-8, 1e-5, 0, 125e-9],
+      "gpt-5.1-codex-max": [125e-8, 1e-5, 0, 125e-9],
+      "gpt-5.1-codex-mini": [25e-8, 2e-6, 0, 25e-9],
+      "gpt-5.2-codex": [175e-8, 14e-6, 0, 175e-9],
+      "gpt-5.3-codex": [175e-8, 14e-6, 0, 175e-9],
+      "gpt-5.4": [25e-7, 15e-6, 0, 25e-8],
+      "gpt-5.4-mini": [75e-8, 45e-7, 0, 75e-9],
+      "gpt-5.5": [5e-6, 3e-5, 0, 5e-7],
+      "gpt-5.6-sol": [4e-6, 2e-5, 5e-6, 4e-7],
+      "gpt-5.6-terra": [2e-6, 12e-6, 25e-7, 2e-7],
+      "gpt-6-astra": [1e-5, 5e-5, 125e-7, 1e-6],
       o3: [2e-6, 8e-6, 0, 5e-7],
       "o4-mini": [11e-7, 44e-7, 0, 275e-9],
       // Google. Values copied from the live LiteLLM table (verified 2026-06-14)
@@ -12851,103 +12950,237 @@ import fs21 from "fs";
 import os20 from "os";
 import path23 from "path";
 function codexSessionsDir() {
-  return path23.join(os20.homedir(), ".codex", "sessions");
+  return path23.join(process.env.CODEX_HOME?.trim() || path23.join(os20.homedir(), ".codex"), "sessions");
 }
 function codexPriceFor(model) {
-  return pricingFor(model) ?? CODEX_FALLBACK;
+  return pricingFor(codexModel(model), { exact: true }) ?? CODEX_FALLBACK;
 }
-function codexSessionCost(model, tokens) {
-  const nonCached = Math.max(0, tokens.input - tokens.cached);
-  const [pin, pout, , pcr] = codexPriceFor(model || "gpt-5");
-  return nonCached * pin + tokens.cached * pcr + tokens.output * pout;
+function codexModel(model) {
+  return normalizeModel(model.replace(/^openai\//i, "").replace(/-\d{4}-\d{2}-\d{2}$/, ""));
 }
-function listCodexSessionFiles(base) {
-  const out = [];
-  for (const y of safeReaddir2(base)) {
-    const yp = path23.join(base, y);
-    if (!isDir2(yp)) continue;
-    for (const m of safeReaddir2(yp)) {
-      const mp = path23.join(yp, m);
-      if (!isDir2(mp)) continue;
-      for (const d of safeReaddir2(mp)) {
-        const dp = path23.join(mp, d);
-        if (!isDir2(dp)) continue;
-        for (const f of safeReaddir2(dp)) {
-          if (f.endsWith(".jsonl")) out.push(path23.join(dp, f));
-        }
+function addTokens(previous, delta) {
+  return {
+    input: (previous?.input ?? 0) + delta.input,
+    cached: (previous?.cached ?? 0) + delta.cached,
+    output: (previous?.output ?? 0) + delta.output,
+    cacheWrite: (previous?.cacheWrite ?? 0) + delta.cacheWrite
+  };
+}
+function codexSessionCost(model, tokens, request2) {
+  const input = tokenNumber(tokens.input);
+  const cached = Math.min(input, tokenNumber(tokens.cached));
+  const written = Math.min(input - cached, tokenNumber(tokens.cacheWrite));
+  const [pin, pout, pcw, pcr] = codexPriceFor(model || "gpt-5");
+  const longContext = request2 && request2.inputTokens > 272e3 && ["gpt-5.4", "gpt-5.5", "gpt-5.6-sol", "gpt-5.6-terra", "gpt-6-astra"].includes(
+    codexModel(model)
+  );
+  const inputMultiplier = longContext ? 2 : 1;
+  const outputMultiplier = longContext ? 1.5 : 1;
+  const tierMultiplier = request2?.serviceTier === "flex" ? 0.5 : codexModel(model) === "gpt-6-astra" && (request2?.serviceTier === "fast" || request2?.serviceTier === "priority") ? 2 : 1;
+  return (((input - cached - written) * pin + cached * pcr + written * (pcw || pin)) * inputMultiplier + tokenNumber(tokens.output) * pout * outputMultiplier) * tierMultiplier;
+}
+function listCodexSessionFiles(base = codexSessionsDir()) {
+  const files = [];
+  const walk = (dir) => {
+    try {
+      for (const entry of fs21.readdirSync(dir, { withFileTypes: true })) {
+        const file = path23.join(dir, entry.name);
+        if (entry.isDirectory()) walk(file);
+        else if (entry.isFile() && entry.name.endsWith(".jsonl")) files.push(file);
       }
+    } catch {
+    }
+  };
+  walk(base);
+  if (path23.basename(base) === "sessions") walk(path23.join(path23.dirname(base), "archived_sessions"));
+  const sessions = /* @__PURE__ */ new Map();
+  for (const file of files.sort()) {
+    try {
+      const stat = fs21.statSync(file);
+      let id = "";
+      try {
+        const first = JSON.parse(fs21.readFileSync(file, "utf8").split("\n", 1)[0]);
+        if (first?.type === "session_meta" && typeof first.payload?.id === "string")
+          id = first.payload.id;
+      } catch {
+      }
+      const key = id ? `session:${id}` : `file:${file}`;
+      const prior = sessions.get(key);
+      if (!prior || stat.mtimeMs > prior.mtime || stat.mtimeMs === prior.mtime && stat.size > prior.size) {
+        sessions.set(key, { file, mtime: stat.mtimeMs, size: stat.size });
+      }
+    } catch {
     }
   }
-  return out;
+  return [...sessions.values()].map((s) => s.file);
 }
-function safeReaddir2(dir) {
-  try {
-    return fs21.readdirSync(dir);
-  } catch {
-    return [];
-  }
+function record(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
 }
-function isDir2(p) {
-  try {
-    return fs21.statSync(p).isDirectory();
-  } catch {
-    return false;
+function tokenNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
+}
+function usage(value, fallback) {
+  const u = record(value);
+  if (!["input_tokens", "output_tokens"].some((k) => typeof u[k] === "number")) return null;
+  for (const key of [
+    "input_tokens",
+    "cached_input_tokens",
+    "cache_read_input_tokens",
+    "output_tokens",
+    "cache_write_input_tokens"
+  ]) {
+    if (u[key] !== void 0 && (typeof u[key] !== "number" || !Number.isFinite(u[key]) || u[key] < 0))
+      return null;
   }
+  return {
+    input: tokenNumber(u.input_tokens ?? fallback?.input),
+    cached: tokenNumber(u.cached_input_tokens ?? u.cache_read_input_tokens ?? fallback?.cached),
+    output: tokenNumber(u.output_tokens ?? fallback?.output),
+    cacheWrite: tokenNumber(u.cache_write_input_tokens ?? fallback?.cacheWrite)
+  };
 }
-function parseCodexSession(lines) {
-  let sessionStart = "";
-  let runId = "";
-  let cwd = "";
-  let model = "";
-  let input = 0;
-  let cached = 0;
-  let output = 0;
-  let sawUsage = false;
+function timestamp(value) {
+  return typeof value === "string" && Number.isFinite(Date.parse(value)) ? new Date(value).toISOString() : "";
+}
+function parseCodexUsage(lines) {
+  const result = {
+    events: [],
+    sessionStart: "",
+    runId: "",
+    workingDir: "",
+    legacyModels: []
+  };
+  let model = "gpt-5";
+  let serviceTier;
+  let previous = null;
+  const legacyModels = /* @__PURE__ */ new Set();
+  const seenStandalone = /* @__PURE__ */ new Set();
   for (const raw of lines) {
-    if (!raw.trim()) continue;
     let entry;
     try {
-      entry = JSON.parse(raw);
+      entry = record(JSON.parse(raw));
     } catch {
       continue;
     }
-    const p = entry.payload ?? {};
+    const p = record(entry.payload);
     if (entry.type === "session_meta") {
-      if (!sessionStart && typeof p["timestamp"] === "string") sessionStart = p["timestamp"];
-      if (!runId && typeof p["id"] === "string") runId = p["id"];
-      if (!cwd && typeof p["cwd"] === "string") cwd = p["cwd"];
+      result.sessionStart ||= timestamp(p.timestamp ?? entry.timestamp);
+      if (!result.runId && typeof p.id === "string") result.runId = p.id;
+      if (!result.workingDir && typeof p.cwd === "string") result.workingDir = p.cwd;
       continue;
     }
     if (entry.type === "turn_context") {
-      if (typeof p["model"] === "string") model = p["model"];
-      if (!cwd && typeof p["cwd"] === "string") cwd = p["cwd"];
+      if (typeof p.model === "string" && p.model) {
+        model = p.model;
+        legacyModels.add(normalizeModel(model));
+      }
+      if (!result.workingDir && typeof p.cwd === "string") result.workingDir = p.cwd;
+      serviceTier = typeof p.service_tier === "string" ? p.service_tier : void 0;
       continue;
     }
-    if (entry.type === "event_msg" && p["type"] === "token_count") {
-      const info = p["info"] ?? {};
-      const usage = info["total_token_usage"] ?? {};
-      if (typeof usage["input_tokens"] === "number") input = usage["input_tokens"];
-      if (typeof usage["cached_input_tokens"] === "number") cached = usage["cached_input_tokens"];
-      if (typeof usage["output_tokens"] === "number") output = usage["output_tokens"];
-      sawUsage = true;
+    if (entry.type !== "event_msg" || p.type !== "token_count") continue;
+    const info = record(p.info);
+    const total = usage(info.total_token_usage, previous);
+    const last = usage(info.last_token_usage);
+    if (!total && !last) continue;
+    const eventModel = [info.model, info.model_name, p.model].find(
+      (v) => typeof v === "string" && v
+    );
+    if (typeof eventModel === "string") model = eventModel;
+    let delta;
+    if (total) {
+      if (previous && Object.keys(total).every(
+        (k) => total[k] === previous[k]
+      ))
+        continue;
+      const reset = previous && (total.input < previous.input || total.output < previous.output);
+      delta = reset ? last ?? total : {
+        input: Math.max(0, total.input - (previous?.input ?? 0)),
+        cached: Math.max(0, total.cached - (previous?.cached ?? 0)),
+        output: Math.max(0, total.output - (previous?.output ?? 0)),
+        cacheWrite: Math.max(0, total.cacheWrite - (previous?.cacheWrite ?? 0))
+      };
+      previous = total;
+    } else {
+      delta = last;
+      const key = JSON.stringify([entry.timestamp, model, delta]);
+      if (entry.timestamp && seenStandalone.has(key)) continue;
+      if (entry.timestamp) seenStandalone.add(key);
+      previous = addTokens(previous, delta);
+    }
+    if (delta.input === 0 && delta.output === 0) continue;
+    const ts = timestamp(entry.timestamp) || result.sessionStart;
+    if (!ts) continue;
+    const cached = Math.min(delta.input, delta.cached);
+    const written = Math.min(delta.input - cached, delta.cacheWrite);
+    result.events.push({
+      timestamp: ts,
+      date: ts.slice(0, 10),
+      model: normalizeModel(model),
+      workingDir: result.workingDir,
+      runId: result.runId,
+      costUSD: codexSessionCost(model, delta, {
+        inputTokens: last?.input ?? delta.input,
+        serviceTier: typeof info.service_tier === "string" ? info.service_tier : serviceTier
+      }),
+      inputTokens: delta.input - cached - written,
+      outputTokens: delta.output,
+      cacheReadTokens: cached,
+      cacheWriteTokens: written
+    });
+  }
+  result.legacyModels = [...legacyModels.size ? legacyModels : ["gpt-5"]];
+  return result;
+}
+function codexUsageInWindow(usage2, start, end) {
+  return usage2.events.filter(
+    (e) => (!start || Date.parse(e.timestamp) >= start.getTime()) && (!end || Date.parse(e.timestamp) <= end.getTime())
+  );
+}
+function parseCodexSession(lines) {
+  const parsed = parseCodexUsage(lines);
+  if (!parsed.events.length) return [];
+  const rows = /* @__PURE__ */ new Map();
+  if (parsed.sessionStart) {
+    for (const model of parsed.legacyModels) {
+      rows.set(`${parsed.sessionStart.slice(0, 10)}::${model}`, {
+        date: parsed.sessionStart.slice(0, 10),
+        model,
+        workingDir: parsed.workingDir,
+        runId: parsed.runId,
+        costUSD: 0,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheWriteTokens: 0
+      });
     }
   }
-  if (!sessionStart || !sawUsage) return null;
-  const nonCached = Math.max(0, input - cached);
-  if (nonCached === 0 && output === 0 && cached === 0) return null;
-  const norm = normalizeModel(model || "gpt-5");
-  const costUSD = codexSessionCost(model, { input, cached, output });
-  return {
-    date: sessionStart.slice(0, 10),
-    model: norm,
-    workingDir: cwd,
-    runId,
-    costUSD,
-    inputTokens: nonCached,
-    outputTokens: output,
-    cacheReadTokens: cached,
-    cacheWriteTokens: 0
-  };
+  for (const event of parsed.events) {
+    const e = {
+      date: event.date,
+      model: event.model,
+      workingDir: event.workingDir,
+      runId: event.runId,
+      costUSD: event.costUSD,
+      inputTokens: event.inputTokens,
+      outputTokens: event.outputTokens,
+      cacheReadTokens: event.cacheReadTokens,
+      cacheWriteTokens: event.cacheWriteTokens
+    };
+    const key = `${e.date}::${e.model}`;
+    const prev = rows.get(key);
+    if (!prev) rows.set(key, { ...e });
+    else {
+      prev.costUSD += e.costUSD;
+      prev.inputTokens += e.inputTokens;
+      prev.outputTokens += e.outputTokens;
+      prev.cacheReadTokens += e.cacheReadTokens;
+      prev.cacheWriteTokens += e.cacheWriteTokens;
+    }
+  }
+  return [...rows.values()];
 }
 var CODEX_FALLBACK, codexSource;
 var init_cost_codex = __esm({
@@ -12957,43 +13190,17 @@ var init_cost_codex = __esm({
     CODEX_FALLBACK = [5e-6, 15e-6, 0, 25e-7];
     codexSource = {
       id: "codex",
-      available() {
-        try {
-          return fs21.existsSync(codexSessionsDir());
-        } catch {
-          return false;
-        }
-      },
+      available: () => fs21.existsSync(codexSessionsDir()) || fs21.existsSync(path23.join(path23.dirname(codexSessionsDir()), "archived_sessions")),
       collect(sinceMs) {
-        const base = codexSessionsDir();
-        const combined = /* @__PURE__ */ new Map();
-        for (const file of listCodexSessionFiles(base)) {
+        const entries = [];
+        for (const file of listCodexSessionFiles()) {
           try {
             if (sinceMs !== void 0 && fs21.statSync(file).mtimeMs < sinceMs) continue;
+            entries.push(...parseCodexSession(fs21.readFileSync(file, "utf8").split("\n")));
           } catch {
-            continue;
-          }
-          let content;
-          try {
-            content = fs21.readFileSync(file, "utf8");
-          } catch {
-            continue;
-          }
-          const e = parseCodexSession(content.split("\n"));
-          if (!e) continue;
-          const key = `${e.date}::${e.model}::${e.workingDir ?? ""}::${e.runId ?? ""}`;
-          const prev = combined.get(key);
-          if (prev) {
-            prev.costUSD += e.costUSD;
-            prev.inputTokens += e.inputTokens;
-            prev.outputTokens += e.outputTokens;
-            prev.cacheReadTokens += e.cacheReadTokens;
-            prev.cacheWriteTokens += e.cacheWriteTokens;
-          } else {
-            combined.set(key, { ...e });
           }
         }
-        return [...combined.values()];
+        return entries;
       }
     };
   }
@@ -13006,7 +13213,7 @@ import path24 from "path";
 function copilotSessionsDir() {
   return path24.join(os21.homedir(), ".copilot", "session-state");
 }
-function safeReaddir3(dir) {
+function safeReaddir2(dir) {
   try {
     return fs22.readdirSync(dir);
   } catch {
@@ -13092,7 +13299,7 @@ var init_cost_copilot = __esm({
       collect(sinceMs) {
         const base = copilotSessionsDir();
         const combined = /* @__PURE__ */ new Map();
-        for (const sid of safeReaddir3(base)) {
+        for (const sid of safeReaddir2(base)) {
           const file = path24.join(base, sid, "events.jsonl");
           try {
             if (sinceMs !== void 0 && fs22.statSync(file).mtimeMs < sinceMs) continue;
@@ -13707,8 +13914,8 @@ function originForRule(ruleName, sections, enabled) {
   }
   return "";
 }
-function relativeDate(timestamp, now = /* @__PURE__ */ new Date()) {
-  const t = new Date(timestamp).getTime();
+function relativeDate(timestamp2, now = /* @__PURE__ */ new Date()) {
+  const t = new Date(timestamp2).getTime();
   if (Number.isNaN(t)) return "?";
   const days = Math.floor((now.getTime() - t) / 864e5);
   if (days < 1) return "today";
@@ -13819,7 +14026,7 @@ function readPreviousScan(opts = {}) {
     return null;
   }
 }
-function appendScanHistory(record, opts = {}) {
+function appendScanHistory(record2, opts = {}) {
   const filePath = opts.path ?? defaultHistoryPath();
   const cap = opts.cap ?? SCAN_HISTORY_CAP;
   try {
@@ -13834,7 +14041,7 @@ function appendScanHistory(record, opts = {}) {
       } catch {
       }
     }
-    history.push(record);
+    history.push(record2);
     if (history.length > cap) {
       history = history.slice(history.length - cap);
     }
@@ -13895,17 +14102,17 @@ function parseJSONLFile(filePath, fallbackWorkingDir) {
     if (row["type"] !== "assistant") continue;
     const msg = row["message"];
     if (!msg?.["usage"] || typeof msg["model"] !== "string") continue;
-    const usage = msg["usage"];
+    const usage2 = msg["usage"];
     const model = msg["model"];
-    const timestamp = row["timestamp"];
-    if (typeof timestamp !== "string" || timestamp.length < 10) continue;
-    const date = timestamp.slice(0, 10);
+    const timestamp2 = row["timestamp"];
+    if (typeof timestamp2 !== "string" || timestamp2.length < 10) continue;
+    const date = timestamp2.slice(0, 10);
     const p = pricingFor(model);
     if (!p) continue;
-    const inp = Number(usage["input_tokens"] ?? 0);
-    const out = Number(usage["output_tokens"] ?? 0);
-    const cw = Number(usage["cache_creation_input_tokens"] ?? 0);
-    const cr = Number(usage["cache_read_input_tokens"] ?? 0);
+    const inp = Number(usage2["input_tokens"] ?? 0);
+    const out = Number(usage2["output_tokens"] ?? 0);
+    const cw = Number(usage2["cache_creation_input_tokens"] ?? 0);
+    const cr = Number(usage2["cache_read_input_tokens"] ?? 0);
     const cost = inp * p[0] + out * p[1] + cw * p[2] + cr * p[3];
     const rowCwd = typeof row["cwd"] === "string" ? row["cwd"] : null;
     const workingDir = rowCwd && rowCwd.startsWith("/") ? rowCwd : fallbackWorkingDir;
@@ -14935,7 +15142,7 @@ function safeCanaryScanValues() {
     return [];
   }
 }
-function recordCanaries(scanned, toolName, timestamp, projLabel, sessionId, agent, result, dedup, values) {
+function recordCanaries(scanned, toolName, timestamp2, projLabel, sessionId, agent, result, dedup, values) {
   if (values.length === 0) return [];
   let pool = [...values];
   const matched = [];
@@ -14949,8 +15156,8 @@ function recordCanaries(scanned, toolName, timestamp, projLabel, sessionId, agen
     const existing = dedup.canaryIndex.get(key);
     if (existing) {
       existing.count++;
-      if (timestamp && (!existing.timestamp || timestamp < existing.timestamp)) {
-        existing.timestamp = timestamp;
+      if (timestamp2 && (!existing.timestamp || timestamp2 < existing.timestamp)) {
+        existing.timestamp = timestamp2;
       }
       continue;
     }
@@ -14963,7 +15170,7 @@ function recordCanaries(scanned, toolName, timestamp, projLabel, sessionId, agen
       view: hit.view,
       retired: hit.retired,
       toolName,
-      timestamp,
+      timestamp: timestamp2,
       project: projLabel,
       sessionId,
       agent,
@@ -14995,7 +15202,7 @@ function scrubDecoys(subject, values) {
   };
   return walk(subject, 0);
 }
-function pushFsOpAstFinding(command, toolName, input, timestamp, projLabel, sessionId, agent, result, dedup) {
+function pushFsOpAstFinding(command, toolName, input, timestamp2, projLabel, sessionId, agent, result, dedup) {
   const fsVerdict = analyzeFsOperation(command);
   if (!fsVerdict) return false;
   const synthRule = {
@@ -15025,7 +15232,7 @@ function pushFsOpAstFinding(command, toolName, input, timestamp, projLabel, sess
       source: synthSource,
       toolName,
       input,
-      timestamp,
+      timestamp: timestamp2,
       project: projLabel,
       sessionId,
       agent
@@ -15033,9 +15240,9 @@ function pushFsOpAstFinding(command, toolName, input, timestamp, projLabel, sess
   }
   return true;
 }
-function isStaleFinding(timestamp, now = Date.now()) {
-  if (!timestamp) return false;
-  const t = Date.parse(timestamp);
+function isStaleFinding(timestamp2, now = Date.now()) {
+  if (!timestamp2) return false;
+  const t = Date.parse(timestamp2);
   if (Number.isNaN(t)) return false;
   const ageDays = (now - t) / 864e5;
   return ageDays > STALE_AGE_DAYS;
@@ -15183,37 +15390,7 @@ function countScanFiles() {
     } catch {
     }
   }
-  const codexDir = path31.join(os27.homedir(), ".codex", "sessions");
-  if (fs29.existsSync(codexDir)) {
-    try {
-      for (const year of fs29.readdirSync(codexDir)) {
-        const yp = path31.join(codexDir, year);
-        try {
-          if (!fs29.statSync(yp).isDirectory()) continue;
-          for (const month of fs29.readdirSync(yp)) {
-            const mp = path31.join(yp, month);
-            try {
-              if (!fs29.statSync(mp).isDirectory()) continue;
-              for (const day of fs29.readdirSync(mp)) {
-                const dp = path31.join(mp, day);
-                try {
-                  if (!fs29.statSync(dp).isDirectory()) continue;
-                  total += listSessionFiles(dp).length;
-                } catch {
-                  continue;
-                }
-              }
-            } catch {
-              continue;
-            }
-          }
-        } catch {
-          continue;
-        }
-      }
-    } catch {
-    }
-  }
+  total += listCodexSessionFiles().length;
   return total;
 }
 function renderProgressBar(done, total, lines) {
@@ -15336,12 +15513,12 @@ function processClaudeFile(file, projPath, projLabel, ruleSources, startDate, re
       }
       continue;
     }
-    const usage = entry.message?.usage;
+    const usage2 = entry.message?.usage;
     const model = entry.message?.model;
-    if (usage && model) {
+    if (usage2 && model) {
       const p = claudeModelPrice(model);
       if (p) {
-        const rowCost = (usage.input_tokens ?? 0) * p.i + (usage.output_tokens ?? 0) * p.o + (usage.cache_creation_input_tokens ?? 0) * p.cw + (usage.cache_read_input_tokens ?? 0) * p.cr;
+        const rowCost = (usage2.input_tokens ?? 0) * p.i + (usage2.output_tokens ?? 0) * p.o + (usage2.cache_creation_input_tokens ?? 0) * p.cw + (usage2.cache_read_input_tokens ?? 0) * p.cr;
         result.totalCostUSD += rowCost;
         session.costUSD += rowCost;
       }
@@ -15875,15 +16052,15 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
         } catch {
           continue;
         }
-        const timestamp = step.created_at ?? "";
-        if (startDate && timestamp && new Date(timestamp) < startDate) continue;
+        const timestamp2 = step.created_at ?? "";
+        if (startDate && timestamp2 && new Date(timestamp2) < startDate) continue;
         if (step.type === "USER_INPUT") {
           const text = typeof step.content === "string" ? step.content : "";
           if (text) {
             const decoysHere5 = recordCanaries(
               { text },
               "user-prompt",
-              timestamp,
+              timestamp2,
               projLabel,
               sessionId,
               "antigravity",
@@ -15900,7 +16077,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
                   patternName: dlpMatch.patternName,
                   redactedSample: dlpMatch.redactedSample,
                   toolName: "user-prompt",
-                  timestamp,
+                  timestamp: timestamp2,
                   project: projLabel,
                   sessionId,
                   agent: "antigravity"
@@ -15911,16 +16088,16 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
           continue;
         }
         if (!Array.isArray(step.tool_calls) || step.tool_calls.length === 0) continue;
-        if (timestamp) {
-          if (!result.firstDate || timestamp < result.firstDate) result.firstDate = timestamp;
-          if (!result.lastDate || timestamp > result.lastDate) result.lastDate = timestamp;
+        if (timestamp2) {
+          if (!result.firstDate || timestamp2 < result.firstDate) result.firstDate = timestamp2;
+          if (!result.lastDate || timestamp2 > result.lastDate) result.lastDate = timestamp2;
         }
         for (const tc of step.tool_calls) {
           result.totalToolCalls++;
           const toolName = tc.name ?? "";
           const toolNameLower = toolName.toLowerCase();
           const input = canonicalToolInput(toolName, tc.args ?? {});
-          sessionCalls.push({ toolName, input, timestamp });
+          sessionCalls.push({ toolName, input, timestamp: timestamp2 });
           const isShellTool = toolNameLower === "run_command";
           if (isShellTool) {
             result.bashCalls++;
@@ -15935,7 +16112,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
           const decoysHere6 = recordCanaries(
             input,
             toolName,
-            timestamp,
+            timestamp2,
             projLabel,
             sessionId,
             "antigravity",
@@ -15952,7 +16129,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
                 patternName: dlpMatch.patternName,
                 redactedSample: dlpMatch.redactedSample,
                 toolName,
-                timestamp,
+                timestamp: timestamp2,
                 project: projLabel,
                 sessionId,
                 agent: "antigravity"
@@ -15965,7 +16142,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
               String(input.command ?? ""),
               toolName,
               input,
-              timestamp,
+              timestamp2,
               projLabel,
               sessionId,
               "antigravity",
@@ -15989,7 +16166,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
                 source,
                 toolName,
                 input,
-                timestamp,
+                timestamp: timestamp2,
                 project: projLabel,
                 sessionId,
                 agent: "antigravity"
@@ -16021,7 +16198,7 @@ function scanAntigravityHistory(startDate, onProgress, onLine) {
                   },
                   toolName,
                   input,
-                  timestamp,
+                  timestamp: timestamp2,
                   project: projLabel,
                   sessionId,
                   agent: "antigravity"
@@ -16091,7 +16268,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
       } catch {
         continue;
       }
-      const timestamp = ev.timestamp ?? "";
+      const timestamp2 = ev.timestamp ?? "";
       if (ev.type === "session.start") {
         const cwd = ev.data?.context?.cwd;
         if (typeof cwd === "string" && cwd) {
@@ -16099,14 +16276,14 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
         }
         continue;
       }
-      if (startDate && timestamp && new Date(timestamp) < startDate) continue;
+      if (startDate && timestamp2 && new Date(timestamp2) < startDate) continue;
       if (ev.type === "user.message") {
         const text = ev.data?.content ?? ev.data?.text ?? "";
         if (typeof text === "string" && text) {
           const decoysHere7 = recordCanaries(
             { text },
             "user-prompt",
-            timestamp,
+            timestamp2,
             projLabel,
             sessionId,
             "copilot",
@@ -16123,7 +16300,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
                 patternName: dlpMatch2.patternName,
                 redactedSample: dlpMatch2.redactedSample,
                 toolName: "user-prompt",
-                timestamp,
+                timestamp: timestamp2,
                 project: projLabel,
                 sessionId,
                 agent: "copilot"
@@ -16138,19 +16315,19 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
       const toolNameLower = toolName.toLowerCase();
       const input = ev.data?.arguments ?? {};
       result.totalToolCalls++;
-      sessionCalls.push({ toolName, input, timestamp });
+      sessionCalls.push({ toolName, input, timestamp: timestamp2 });
       const isShellTool = isShellShapedTool(toolNameLower, toolInspectionMap);
       if (isShellTool) result.bashCalls++;
-      if (timestamp) {
-        if (!result.firstDate || timestamp < result.firstDate) result.firstDate = timestamp;
-        if (!result.lastDate || timestamp > result.lastDate) result.lastDate = timestamp;
+      if (timestamp2) {
+        if (!result.firstDate || timestamp2 < result.firstDate) result.firstDate = timestamp2;
+        if (!result.lastDate || timestamp2 > result.lastDate) result.lastDate = timestamp2;
       }
       const rawCmd = String(input.command ?? "").trimStart();
       if (/^node9\s+(scan|explain|report|tail|dlp|status|sessions|audit)\b/.test(rawCmd)) continue;
       const decoysHere8 = recordCanaries(
         input,
         toolName,
-        timestamp,
+        timestamp2,
         projLabel,
         sessionId,
         "copilot",
@@ -16167,7 +16344,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
             patternName: dlpMatch.patternName,
             redactedSample: dlpMatch.redactedSample,
             toolName,
-            timestamp,
+            timestamp: timestamp2,
             project: projLabel,
             sessionId,
             agent: "copilot"
@@ -16180,7 +16357,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
           String(input.command ?? ""),
           toolName,
           input,
-          timestamp,
+          timestamp2,
           projLabel,
           sessionId,
           "copilot",
@@ -16203,7 +16380,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
             source,
             toolName,
             input,
-            timestamp,
+            timestamp: timestamp2,
             project: projLabel,
             sessionId,
             agent: "copilot"
@@ -16235,7 +16412,7 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
               },
               toolName,
               input,
-              timestamp,
+              timestamp: timestamp2,
               project: projLabel,
               sessionId,
               agent: "copilot"
@@ -16250,7 +16427,6 @@ function scanCopilotHistory(startDate, onProgress, onLine) {
 }
 function scanCodexHistory(startDate, onProgress, onLine) {
   const canaryVals = safeCanaryScanValues();
-  const sessionsBase = path31.join(os27.homedir(), ".codex", "sessions");
   const result = {
     filesScanned: 0,
     sessions: 0,
@@ -16267,39 +16443,7 @@ function scanCodexHistory(startDate, onProgress, onLine) {
     perSession: []
   };
   const dedup = emptyScanDedup();
-  if (!fs29.existsSync(sessionsBase)) return result;
-  const jsonlFiles = [];
-  try {
-    for (const year of fs29.readdirSync(sessionsBase)) {
-      const yearPath = path31.join(sessionsBase, year);
-      try {
-        if (!fs29.statSync(yearPath).isDirectory()) continue;
-      } catch {
-        continue;
-      }
-      for (const month of fs29.readdirSync(yearPath)) {
-        const monthPath = path31.join(yearPath, month);
-        try {
-          if (!fs29.statSync(monthPath).isDirectory()) continue;
-        } catch {
-          continue;
-        }
-        for (const day of fs29.readdirSync(monthPath)) {
-          const dayPath = path31.join(monthPath, day);
-          try {
-            if (!fs29.statSync(dayPath).isDirectory()) continue;
-          } catch {
-            continue;
-          }
-          for (const file of fs29.readdirSync(dayPath)) {
-            if (file.endsWith(".jsonl")) jsonlFiles.push(path31.join(dayPath, file));
-          }
-        }
-      }
-    }
-  } catch {
-    return result;
-  }
+  const jsonlFiles = listCodexSessionFiles();
   const ruleSources = buildRuleSources();
   for (const filePath of jsonlFiles) {
     result.filesScanned++;
@@ -16315,10 +16459,6 @@ function scanCodexHistory(startDate, onProgress, onLine) {
     let projLabel = "";
     result.sessions++;
     const sessionCalls = [];
-    let lastTotalInput = 0;
-    let lastTotalCached = 0;
-    let lastTotalOutput = 0;
-    let model = "";
     for (const line of lines) {
       if (!line.trim()) continue;
       onLine?.();
@@ -16336,18 +16476,6 @@ function scanCodexHistory(startDate, onProgress, onLine) {
         projLabel = stripTerminalEscapes(cwd.replace(os27.homedir(), "~")).slice(0, 40);
         continue;
       }
-      if (entry.type === "turn_context" && typeof payload["model"] === "string") {
-        model = payload["model"];
-        continue;
-      }
-      if (entry.type === "event_msg" && payload["type"] === "token_count") {
-        const info = payload["info"];
-        const usage = info?.["total_token_usage"] ?? {};
-        lastTotalInput = usage["input_tokens"] ?? lastTotalInput;
-        lastTotalCached = usage["cached_input_tokens"] ?? lastTotalCached;
-        lastTotalOutput = usage["output_tokens"] ?? lastTotalOutput;
-        continue;
-      }
       if (entry.type === "event_msg" && payload["type"] === "user_message") {
         const text = String(payload["message"] ?? "");
         if (text) {
@@ -16504,13 +16632,8 @@ function scanCodexHistory(startDate, onProgress, onLine) {
         }
       }
     }
-    const withinWindow = !startDate || startTime !== "" && new Date(startTime) >= startDate;
-    if (withinWindow) {
-      result.totalCostUSD += codexSessionCost(model, {
-        input: lastTotalInput,
-        cached: lastTotalCached,
-        output: lastTotalOutput
-      });
+    for (const event of codexUsageInWindow(parseCodexUsage(lines), startDate)) {
+      result.totalCostUSD += event.costUSD;
     }
     result.loopFindings.push(...detectLoops(sessionCalls, projLabel, sessionId, "codex"));
   }
@@ -17942,13 +18065,13 @@ var init_taint_store = __esm({
        */
       check(filePath) {
         const resolved = this._resolve(filePath);
-        const record = this.records.get(resolved);
-        if (!record) return null;
-        if (Date.now() > record.expiresAt) {
+        const record2 = this.records.get(resolved);
+        if (!record2) return null;
+        if (Date.now() > record2.expiresAt) {
           this.records.delete(resolved);
           return null;
         }
-        return record;
+        return record2;
       }
       /**
        * Propagate taint from sourcePath to destPath (e.g. cp, mv).
@@ -17969,8 +18092,8 @@ var init_taint_store = __esm({
       /** Remove all expired records. Called periodically by the daemon. */
       prune() {
         const now = Date.now();
-        for (const [key, record] of this.records) {
-          if (now > record.expiresAt) this.records.delete(key);
+        for (const [key, record2] of this.records) {
+          if (now > record2.expiresAt) this.records.delete(key);
         }
       }
       /** Return all non-expired taint records (for audit/debug). */
@@ -18009,13 +18132,13 @@ var init_taint_store = __esm({
        *  Expired records are pruned on access. */
       check(sessionId) {
         if (!sessionId) return null;
-        const record = this.records.get(sessionId);
-        if (!record) return null;
-        if (Date.now() > record.expiresAt) {
+        const record2 = this.records.get(sessionId);
+        if (!record2) return null;
+        if (Date.now() > record2.expiresAt) {
           this.records.delete(sessionId);
           return null;
         }
-        return record;
+        return record2;
       }
       /** Clear a session's taint (e.g. the user resolved it). Returns true if a
        *  record was actually removed (false if the session wasn't tainted). */
@@ -18030,8 +18153,8 @@ var init_taint_store = __esm({
       /** Remove all expired records. Called periodically by the daemon. */
       prune() {
         const now = Date.now();
-        for (const [key, record] of this.records) {
-          if (now > record.expiresAt) this.records.delete(key);
+        for (const [key, record2] of this.records) {
+          if (now > record2.expiresAt) this.records.delete(key);
         }
       }
       /** Remove all records. Used by tests to reset state between runs. */
@@ -22765,10 +22888,10 @@ data: ${JSON.stringify(item.data)}
           return res.end(JSON.stringify({ error: "all paths must be strings" }));
         }
         for (const p of body.paths) {
-          const record = taintStore.check(p);
-          if (record) {
+          const record2 = taintStore.check(p);
+          if (record2) {
             res.writeHead(200, { "Content-Type": "application/json" });
-            return res.end(JSON.stringify({ tainted: true, record }));
+            return res.end(JSON.stringify({ tainted: true, record: record2 }));
           }
         }
         res.writeHead(200, { "Content-Type": "application/json" });
@@ -22817,9 +22940,9 @@ data: ${JSON.stringify(item.data)}
           res.writeHead(400, { "Content-Type": "application/json" });
           return res.end(JSON.stringify({ error: "sessionId must be a string" }));
         }
-        const record = sessionTaintStore.check(body.sessionId);
+        const record2 = sessionTaintStore.check(body.sessionId);
         res.writeHead(200, { "Content-Type": "application/json" });
-        return res.end(JSON.stringify(record ? { tainted: true, record } : { tainted: false }));
+        return res.end(JSON.stringify(record2 ? { tainted: true, record: record2 } : { tainted: false }));
       } catch {
         res.writeHead(400).end();
         return;
@@ -28765,8 +28888,8 @@ var require_util2 = __commonJS({
         request2.headersList.append("origin", serializedOrigin, true);
       }
     }
-    function coarsenTime(timestamp, crossOriginIsolatedCapability) {
-      return timestamp;
+    function coarsenTime(timestamp2, crossOriginIsolatedCapability) {
+      return timestamp2;
     }
     function clampAndCoarsenConnectionTimingInfo(connectionTimingInfo, defaultStartTime, crossOriginIsolatedCapability) {
       if (!connectionTimingInfo?.startTime || connectionTimingInfo.startTime < defaultStartTime) {
@@ -38847,20 +38970,20 @@ var require_dns = __commonJS({
         return ip;
       }
       setRecords(origin, addresses) {
-        const timestamp = Date.now();
+        const timestamp2 = Date.now();
         const records = { records: { 4: null, 6: null } };
         let minTTL = this.#maxTTL;
-        for (const record of addresses) {
-          record.timestamp = timestamp;
-          if (typeof record.ttl === "number") {
-            record.ttl = Math.min(record.ttl, this.#maxTTL);
-            minTTL = Math.min(minTTL, record.ttl);
+        for (const record2 of addresses) {
+          record2.timestamp = timestamp2;
+          if (typeof record2.ttl === "number") {
+            record2.ttl = Math.min(record2.ttl, this.#maxTTL);
+            minTTL = Math.min(minTTL, record2.ttl);
           } else {
-            record.ttl = this.#maxTTL;
+            record2.ttl = this.#maxTTL;
           }
-          const familyRecords = records.records[record.family] ?? { ips: [] };
-          familyRecords.ips.push(record);
-          records.records[record.family] = familyRecords;
+          const familyRecords = records.records[record2.family] ?? { ips: [] };
+          familyRecords.ips.push(record2);
+          records.records[record2.family] = familyRecords;
         }
         this.storage.set(origin.hostname, records, { ttl: minTTL });
       }
@@ -53524,15 +53647,15 @@ import chalk16 from "chalk";
 import fs59 from "fs";
 import path57 from "path";
 import os53 from "os";
-function formatRelativeTime(timestamp) {
-  const diff = Date.now() - new Date(timestamp).getTime();
+function formatRelativeTime(timestamp2) {
+  const diff = Date.now() - new Date(timestamp2).getTime();
   const sec = Math.floor(diff / 1e3);
   if (sec < 60) return `${sec}s ago`;
   const min = Math.floor(sec / 60);
   if (min < 60) return `${min}m ago`;
   const hrs = Math.floor(min / 60);
   if (hrs < 24) return `${hrs}h ago`;
-  return new Date(timestamp).toLocaleDateString();
+  return new Date(timestamp2).toLocaleDateString();
 }
 function registerAuditCommand(program2) {
   program2.command("audit").description("View local execution audit log").option("--tail <n>", "Number of entries to show", "20").option("--tool <pattern>", "Filter by tool name (substring match)").option("--deny", "Show only denied actions").option("--json", "Output raw JSON").action((options) => {
@@ -53778,15 +53901,15 @@ function processClaudeCostProject(proj, projectsDir, start, end, acc) {
         if (!entry.timestamp) continue;
         const ts = new Date(entry.timestamp);
         if (ts < start || ts > end) continue;
-        const usage = entry.message?.usage;
+        const usage2 = entry.message?.usage;
         const model = entry.message?.model;
-        if (!usage || !model) continue;
+        if (!usage2 || !model) continue;
         const p = claudeModelPrice2(model);
         if (!p) continue;
-        const inp = usage.input_tokens ?? 0;
-        const out = usage.output_tokens ?? 0;
-        const cw = usage.cache_creation_input_tokens ?? 0;
-        const cr = usage.cache_read_input_tokens ?? 0;
+        const inp = usage2.input_tokens ?? 0;
+        const out = usage2.output_tokens ?? 0;
+        const cw = usage2.cache_creation_input_tokens ?? 0;
+        const cr = usage2.cache_read_input_tokens ?? 0;
         const cost = inp * p.i + out * p.o + cw * p.cw + cr * p.cr;
         acc.total += cost;
         acc.inputTokens += inp;
@@ -53834,90 +53957,21 @@ function processCodexCostFile(filePath, start, end, acc) {
   } catch {
     return;
   }
-  let sessionStart = "";
-  let model = "";
-  let lastTotalInput = 0;
-  let lastTotalCached = 0;
-  let lastTotalOutput = 0;
-  let sessionToolCalls = 0;
+  const parsed = parseCodexUsage(lines);
+  for (const event of codexUsageInWindow(parsed, start, end)) {
+    acc.total += event.costUSD;
+    acc.byDay.set(event.date, (acc.byDay.get(event.date) ?? 0) + event.costUSD);
+    acc.byModel.set(event.model, (acc.byModel.get(event.model) ?? 0) + event.costUSD);
+  }
   for (const line of lines) {
-    if (!line.trim()) continue;
-    let entry;
     try {
-      entry = JSON.parse(line);
+      const entry = JSON.parse(line);
+      if (entry?.type !== "response_item" || entry.payload?.type !== "function_call") continue;
+      const ts = new Date(entry.timestamp ?? parsed.sessionStart);
+      if (ts >= start && ts <= end) acc.toolCalls++;
     } catch {
-      continue;
-    }
-    const p = entry.payload ?? {};
-    if (entry.type === "session_meta") {
-      sessionStart = String(p["timestamp"] ?? "");
-      continue;
-    }
-    if (entry.type === "turn_context" && typeof p["model"] === "string") {
-      model = p["model"];
-      continue;
-    }
-    if (entry.type === "event_msg" && p["type"] === "token_count") {
-      const info = p["info"] ?? {};
-      const usage = info["total_token_usage"] ?? {};
-      lastTotalInput = usage["input_tokens"] ?? lastTotalInput;
-      lastTotalCached = usage["cached_input_tokens"] ?? lastTotalCached;
-      lastTotalOutput = usage["output_tokens"] ?? lastTotalOutput;
-    }
-    if (entry.type === "response_item" && p["type"] === "function_call") {
-      sessionToolCalls++;
     }
   }
-  if (!sessionStart) return;
-  const ts = new Date(sessionStart);
-  if (ts < start || ts > end) return;
-  const cost = codexSessionCost(model, {
-    input: lastTotalInput,
-    cached: lastTotalCached,
-    output: lastTotalOutput
-  });
-  acc.total += cost;
-  acc.toolCalls += sessionToolCalls;
-  const dateKey = sessionStart.slice(0, 10);
-  acc.byDay.set(dateKey, (acc.byDay.get(dateKey) ?? 0) + cost);
-  const normModel = normalizeModel(model || "gpt-5");
-  acc.byModel.set(normModel, (acc.byModel.get(normModel) ?? 0) + cost);
-}
-function listCodexSessionFiles2(sessionsBase) {
-  const jsonlFiles = [];
-  if (!fs60.existsSync(sessionsBase)) return jsonlFiles;
-  try {
-    for (const year of fs60.readdirSync(sessionsBase)) {
-      const yearPath = path58.join(sessionsBase, year);
-      try {
-        if (!fs60.statSync(yearPath).isDirectory()) continue;
-      } catch {
-        continue;
-      }
-      for (const month of fs60.readdirSync(yearPath)) {
-        const monthPath = path58.join(yearPath, month);
-        try {
-          if (!fs60.statSync(monthPath).isDirectory()) continue;
-        } catch {
-          continue;
-        }
-        for (const day of fs60.readdirSync(monthPath)) {
-          const dayPath = path58.join(monthPath, day);
-          try {
-            if (!fs60.statSync(dayPath).isDirectory()) continue;
-          } catch {
-            continue;
-          }
-          for (const file of fs60.readdirSync(dayPath)) {
-            if (file.endsWith(".jsonl")) jsonlFiles.push(path58.join(dayPath, file));
-          }
-        }
-      }
-    }
-  } catch {
-    return [];
-  }
-  return jsonlFiles;
 }
 function mergeByModel(...maps) {
   const out = /* @__PURE__ */ new Map();
@@ -53933,7 +53987,7 @@ function loadCodexCost(start, end, sessionsBase) {
     byDay: /* @__PURE__ */ new Map(),
     byModel: /* @__PURE__ */ new Map()
   };
-  const files = listCodexSessionFiles2(sessionsBase);
+  const files = listCodexSessionFiles(sessionsBase);
   for (const filePath of files) {
     processCodexCostFile(filePath, start, end, acc);
   }
@@ -54073,7 +54127,7 @@ function aggregateReportFromAudit(period, opts = {}) {
   const now = opts.now ?? /* @__PURE__ */ new Date();
   const auditLogPath = opts.auditLogPath ?? path58.join(os54.homedir(), ".node9", "audit.log");
   const claudeProjectsDir = opts.claudeProjectsDir ?? path58.join(os54.homedir(), ".claude", "projects");
-  const codexSessionsDir2 = opts.codexSessionsDir ?? path58.join(os54.homedir(), ".codex", "sessions");
+  const codexSessionsDir2 = opts.codexSessionsDir ?? codexSessionsDir();
   const geminiTmpDir2 = opts.geminiTmpDir ?? path58.join(os54.homedir(), ".gemini", "tmp");
   const hasAuditFile = fs60.existsSync(auditLogPath);
   const allEntries = opts.preloadedAuditEntries ?? parseAuditLog(auditLogPath);
@@ -60272,12 +60326,12 @@ function parseSessionLines(lines) {
       continue;
     }
     if (entry.type !== "assistant") continue;
-    const usage = entry.message?.usage;
+    const usage2 = entry.message?.usage;
     const model = entry.message?.model;
-    if (usage && model) {
+    if (usage2 && model) {
       const p = modelPrice(model);
       if (p) {
-        costUSD += (usage.input_tokens ?? 0) * p.i + (usage.output_tokens ?? 0) * p.o + (usage.cache_creation_input_tokens ?? 0) * p.cw + (usage.cache_read_input_tokens ?? 0) * p.cr;
+        costUSD += (usage2.input_tokens ?? 0) * p.i + (usage2.output_tokens ?? 0) * p.o + (usage2.cache_creation_input_tokens ?? 0) * p.cw + (usage2.cache_read_input_tokens ?? 0) * p.cr;
       }
     }
     const content = entry.message?.content;
@@ -60457,46 +60511,13 @@ function buildGeminiSessions(days, allAuditEntries) {
   return summaries;
 }
 function buildCodexSessions(days, allAuditEntries) {
-  const sessionsBase = path69.join(os61.homedir(), ".codex", "sessions");
-  if (!fs74.existsSync(sessionsBase)) return [];
   const cutoff = days !== null ? (() => {
     const d = /* @__PURE__ */ new Date();
     d.setDate(d.getDate() - days);
     d.setHours(0, 0, 0, 0);
     return d;
   })() : null;
-  const jsonlFiles = [];
-  try {
-    for (const year of fs74.readdirSync(sessionsBase)) {
-      const yearPath = path69.join(sessionsBase, year);
-      try {
-        if (!fs74.statSync(yearPath).isDirectory()) continue;
-      } catch {
-        continue;
-      }
-      for (const month of fs74.readdirSync(yearPath)) {
-        const monthPath = path69.join(yearPath, month);
-        try {
-          if (!fs74.statSync(monthPath).isDirectory()) continue;
-        } catch {
-          continue;
-        }
-        for (const day of fs74.readdirSync(monthPath)) {
-          const dayPath = path69.join(monthPath, day);
-          try {
-            if (!fs74.statSync(dayPath).isDirectory()) continue;
-          } catch {
-            continue;
-          }
-          for (const file of fs74.readdirSync(dayPath)) {
-            if (file.endsWith(".jsonl")) jsonlFiles.push(path69.join(dayPath, file));
-          }
-        }
-      }
-    }
-  } catch {
-    return [];
-  }
+  const jsonlFiles = listCodexSessionFiles();
   const summaries = [];
   for (const filePath of jsonlFiles) {
     let lines;
@@ -60511,10 +60532,6 @@ function buildCodexSessions(days, allAuditEntries) {
     let firstPrompt = "";
     const toolCalls = [];
     let lastToolTs = "";
-    let lastTotalInput = 0;
-    let lastTotalCached = 0;
-    let lastTotalOutput = 0;
-    let model = "";
     for (const line of lines) {
       if (!line.trim()) continue;
       let entry;
@@ -60530,22 +60547,10 @@ function buildCodexSessions(days, allAuditEntries) {
         cwd = String(p["cwd"] ?? "");
         continue;
       }
-      if (entry.type === "turn_context" && typeof p["model"] === "string") {
-        model = p["model"];
-        continue;
-      }
       if (entry.type === "event_msg" && p["type"] === "user_message" && !firstPrompt) {
         firstPrompt = String(p["message"] ?? "");
         continue;
       }
-      if (entry.type === "event_msg" && p["type"] === "token_count") {
-        const info = p["info"] ?? {};
-        const usage = info["total_token_usage"] ?? {};
-        lastTotalInput = usage["input_tokens"] ?? lastTotalInput;
-        lastTotalCached = usage["cached_input_tokens"] ?? lastTotalCached;
-        lastTotalOutput = usage["output_tokens"] ?? lastTotalOutput;
-        continue;
-      }
       if (entry.type === "response_item" && p["type"] === "function_call") {
         const tool = String(p["name"] ?? "");
         let input = {};
@@ -60559,12 +60564,13 @@ function buildCodexSessions(days, allAuditEntries) {
       }
     }
     if (!sessionId || !startTime) continue;
-    if (cutoff && new Date(startTime) < cutoff) continue;
-    const costUSD = codexSessionCost(model, {
-      input: lastTotalInput,
-      cached: lastTotalCached,
-      output: lastTotalOutput
-    });
+    const parsedUsage = parseCodexUsage(lines);
+    const usageEvents = codexUsageInWindow(parsedUsage, cutoff);
+    if (cutoff && new Date(startTime) < cutoff && usageEvents.length === 0 && !toolCalls.some((call) => new Date(call.timestamp) >= cutoff))
+      continue;
+    const costUSD = usageEvents.reduce((sum, event) => sum + event.costUSD, 0);
+    const lastUsageTs = parsedUsage.events.at(-1)?.timestamp ?? "";
+    if (lastUsageTs > lastToolTs) lastToolTs = lastUsageTs;
     const windowEnd = new Date(
       Math.max(new Date(startTime).getTime(), lastToolTs ? new Date(lastToolTs).getTime() : 0) + 5 * 60 * 1e3
     ).toISOString();