@node9/proxy 1.21.1 → 1.21.2

package/dist/cli.js

@@ -16834,6 +16834,35 @@ function isTestEntry(entry, testTs) {
   }
   return false;
 }
+var SUPERSEDE_WINDOW_MS = 6e4;
+function buildSupersededSet(entries) {
+  const superseded = /* @__PURE__ */ new Set();
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    if (e.decision !== "deny") continue;
+    if (e.checkedBy !== "smart-rule-block-override") continue;
+    if (!e.argsHash || !e.sessionId) continue;
+    const eTs = Date.parse(e.ts);
+    if (Number.isNaN(eTs)) continue;
+    for (let j = i + 1; j < entries.length; j++) {
+      const next = entries[j];
+      const nextTs = Date.parse(next.ts);
+      if (Number.isNaN(nextTs)) continue;
+      if (nextTs - eTs > SUPERSEDE_WINDOW_MS) break;
+      if (next.argsHash !== e.argsHash) continue;
+      if (next.sessionId !== e.sessionId) continue;
+      if (next.tool !== e.tool) continue;
+      if (next.decision === "allow" && next.checkedBy === "daemon") {
+        superseded.add(`${e.ts}|${e.argsHash}`);
+        break;
+      }
+    }
+  }
+  return superseded;
+}
+function supersedeKey(e) {
+  return `${e.ts}|${e.argsHash ?? ""}`;
+}
 function getDateRange(period, now) {
   const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
   const end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
@@ -17285,6 +17314,7 @@ function aggregateReportFromAudit(period, opts = {}) {
     }
     return true;
   });
+  const superseded = buildSupersededSet(entries);
   let userApproved = 0;
   let userDenied = 0;
   let timedOut = 0;
@@ -17302,6 +17332,7 @@ function aggregateReportFromAudit(period, opts = {}) {
   const dailyMap = /* @__PURE__ */ new Map();
   const hourMap = /* @__PURE__ */ new Map();
   for (const e of entries) {
+    if (superseded.has(supersedeKey(e))) continue;
     const allow = isAllow(e.decision);
     const dateKey = e.ts.slice(0, 10);
     const userInteracted = e.source === "daemon";
@@ -17312,6 +17343,7 @@ function aggregateReportFromAudit(period, opts = {}) {
       if (e.checkedBy === "timeout") timedOut++;
       else if (e.checkedBy === "observe-mode-dlp-would-block") observeDlp++;
       else if (isDlp(e.checkedBy)) dlpBlocked++;
+      else if (e.checkedBy === "local-decision") userDenied++;
       else if (e.checkedBy !== "loop-detected") hardBlocked++;
     }
     if (e.checkedBy === "loop-detected") loopHits++;
@@ -17319,8 +17351,11 @@ function aggregateReportFromAudit(period, opts = {}) {
     t.calls++;
     if (!allow) t.blocked++;
     toolMap.set(e.tool, t);
-    if (!allow && e.checkedBy) {
-      blockMap.set(e.checkedBy, (blockMap.get(e.checkedBy) ?? 0) + 1);
+    if (!allow) {
+      const key = e.checkedBy ?? (e.source === "daemon" ? "local-decision" : null);
+      if (key) {
+        blockMap.set(key, (blockMap.get(key) ?? 0) + 1);
+      }
     }
     if (!allow && e.ruleName) {
       ruleMap.set(e.ruleName, (ruleMap.get(e.ruleName) ?? 0) + 1);
@@ -17349,7 +17384,9 @@ function aggregateReportFromAudit(period, opts = {}) {
     start,
     end,
     excludedTests,
-    total: entries.length,
+    // Subtract superseded rows so the headline event count agrees with
+    // the bucket counters (which skip them in the loop above).
+    total: entries.length - superseded.size,
     userApproved,
     userDenied,
     timedOut,

package/dist/cli.mjs

@@ -16807,6 +16807,35 @@ function isTestEntry(entry, testTs) {
   }
   return false;
 }
+var SUPERSEDE_WINDOW_MS = 6e4;
+function buildSupersededSet(entries) {
+  const superseded = /* @__PURE__ */ new Set();
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    if (e.decision !== "deny") continue;
+    if (e.checkedBy !== "smart-rule-block-override") continue;
+    if (!e.argsHash || !e.sessionId) continue;
+    const eTs = Date.parse(e.ts);
+    if (Number.isNaN(eTs)) continue;
+    for (let j = i + 1; j < entries.length; j++) {
+      const next = entries[j];
+      const nextTs = Date.parse(next.ts);
+      if (Number.isNaN(nextTs)) continue;
+      if (nextTs - eTs > SUPERSEDE_WINDOW_MS) break;
+      if (next.argsHash !== e.argsHash) continue;
+      if (next.sessionId !== e.sessionId) continue;
+      if (next.tool !== e.tool) continue;
+      if (next.decision === "allow" && next.checkedBy === "daemon") {
+        superseded.add(`${e.ts}|${e.argsHash}`);
+        break;
+      }
+    }
+  }
+  return superseded;
+}
+function supersedeKey(e) {
+  return `${e.ts}|${e.argsHash ?? ""}`;
+}
 function getDateRange(period, now) {
   const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
   const end = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
@@ -17258,6 +17287,7 @@ function aggregateReportFromAudit(period, opts = {}) {
     }
     return true;
   });
+  const superseded = buildSupersededSet(entries);
   let userApproved = 0;
   let userDenied = 0;
   let timedOut = 0;
@@ -17275,6 +17305,7 @@ function aggregateReportFromAudit(period, opts = {}) {
   const dailyMap = /* @__PURE__ */ new Map();
   const hourMap = /* @__PURE__ */ new Map();
   for (const e of entries) {
+    if (superseded.has(supersedeKey(e))) continue;
     const allow = isAllow(e.decision);
     const dateKey = e.ts.slice(0, 10);
     const userInteracted = e.source === "daemon";
@@ -17285,6 +17316,7 @@ function aggregateReportFromAudit(period, opts = {}) {
       if (e.checkedBy === "timeout") timedOut++;
       else if (e.checkedBy === "observe-mode-dlp-would-block") observeDlp++;
       else if (isDlp(e.checkedBy)) dlpBlocked++;
+      else if (e.checkedBy === "local-decision") userDenied++;
       else if (e.checkedBy !== "loop-detected") hardBlocked++;
     }
     if (e.checkedBy === "loop-detected") loopHits++;
@@ -17292,8 +17324,11 @@ function aggregateReportFromAudit(period, opts = {}) {
     t.calls++;
     if (!allow) t.blocked++;
     toolMap.set(e.tool, t);
-    if (!allow && e.checkedBy) {
-      blockMap.set(e.checkedBy, (blockMap.get(e.checkedBy) ?? 0) + 1);
+    if (!allow) {
+      const key = e.checkedBy ?? (e.source === "daemon" ? "local-decision" : null);
+      if (key) {
+        blockMap.set(key, (blockMap.get(key) ?? 0) + 1);
+      }
     }
     if (!allow && e.ruleName) {
       ruleMap.set(e.ruleName, (ruleMap.get(e.ruleName) ?? 0) + 1);
@@ -17322,7 +17357,9 @@ function aggregateReportFromAudit(period, opts = {}) {
     start,
     end,
     excludedTests,
-    total: entries.length,
+    // Subtract superseded rows so the headline event count agrees with
+    // the bucket counters (which skip them in the loop above).
+    total: entries.length - superseded.size,
     userApproved,
     userDenied,
     timedOut,

package/dist/dashboard.mjs

@@ -2645,6 +2645,34 @@ function isTestEntry(entry, testTs) {
   }
   return false;
 }
+function buildSupersededSet(entries) {
+  const superseded = /* @__PURE__ */ new Set();
+  for (let i = 0; i < entries.length; i++) {
+    const e = entries[i];
+    if (e.decision !== "deny") continue;
+    if (e.checkedBy !== "smart-rule-block-override") continue;
+    if (!e.argsHash || !e.sessionId) continue;
+    const eTs = Date.parse(e.ts);
+    if (Number.isNaN(eTs)) continue;
+    for (let j = i + 1; j < entries.length; j++) {
+      const next = entries[j];
+      const nextTs = Date.parse(next.ts);
+      if (Number.isNaN(nextTs)) continue;
+      if (nextTs - eTs > SUPERSEDE_WINDOW_MS) break;
+      if (next.argsHash !== e.argsHash) continue;
+      if (next.sessionId !== e.sessionId) continue;
+      if (next.tool !== e.tool) continue;
+      if (next.decision === "allow" && next.checkedBy === "daemon") {
+        superseded.add(`${e.ts}|${e.argsHash}`);
+        break;
+      }
+    }
+  }
+  return superseded;
+}
+function supersedeKey(e) {
+  return `${e.ts}|${e.argsHash ?? ""}`;
+}
 function getReportDateRange(period, now = /* @__PURE__ */ new Date()) {
   return getDateRange(period, now);
 }
@@ -3126,6 +3154,7 @@ function aggregateReportFromAudit(period, opts = {}) {
     }
     return true;
   });
+  const superseded = buildSupersededSet(entries);
   let userApproved = 0;
   let userDenied = 0;
   let timedOut = 0;
@@ -3143,6 +3172,7 @@ function aggregateReportFromAudit(period, opts = {}) {
   const dailyMap = /* @__PURE__ */ new Map();
   const hourMap = /* @__PURE__ */ new Map();
   for (const e of entries) {
+    if (superseded.has(supersedeKey(e))) continue;
     const allow = isAllow(e.decision);
     const dateKey = e.ts.slice(0, 10);
     const userInteracted = e.source === "daemon";
@@ -3153,6 +3183,7 @@ function aggregateReportFromAudit(period, opts = {}) {
       if (e.checkedBy === "timeout") timedOut++;
       else if (e.checkedBy === "observe-mode-dlp-would-block") observeDlp++;
       else if (isDlp(e.checkedBy)) dlpBlocked++;
+      else if (e.checkedBy === "local-decision") userDenied++;
       else if (e.checkedBy !== "loop-detected") hardBlocked++;
     }
     if (e.checkedBy === "loop-detected") loopHits++;
@@ -3160,8 +3191,11 @@ function aggregateReportFromAudit(period, opts = {}) {
     t.calls++;
     if (!allow) t.blocked++;
     toolMap.set(e.tool, t);
-    if (!allow && e.checkedBy) {
-      blockMap.set(e.checkedBy, (blockMap.get(e.checkedBy) ?? 0) + 1);
+    if (!allow) {
+      const key = e.checkedBy ?? (e.source === "daemon" ? "local-decision" : null);
+      if (key) {
+        blockMap.set(key, (blockMap.get(key) ?? 0) + 1);
+      }
     }
     if (!allow && e.ruleName) {
       ruleMap.set(e.ruleName, (ruleMap.get(e.ruleName) ?? 0) + 1);
@@ -3190,7 +3224,9 @@ function aggregateReportFromAudit(period, opts = {}) {
     start,
     end,
     excludedTests,
-    total: entries.length,
+    // Subtract superseded rows so the headline event count agrees with
+    // the bucket counters (which skip them in the loop above).
+    total: entries.length - superseded.size,
     userApproved,
     userDenied,
     timedOut,
@@ -3225,13 +3261,14 @@ function aggregateReportFromAudit(period, opts = {}) {
   };
   return { data, hasAuditFile, responseDlpEntries };
 }
-var TEST_COMMAND_RE, CLAUDE_PRICING, GEMINI_FALLBACK_MODELS;
+var TEST_COMMAND_RE, SUPERSEDE_WINDOW_MS, CLAUDE_PRICING, GEMINI_FALLBACK_MODELS;
 var init_report_audit = __esm({
   "src/cli/aggregate/report-audit.ts"() {
     "use strict";
     init_costSync();
     init_litellm();
     TEST_COMMAND_RE = /(?:^|\s)(npm\s+(?:run\s+)?test|npx\s+(?:vitest|jest|mocha)|yarn\s+(?:run\s+)?test|pnpm\s+(?:run\s+)?test|vitest|jest|mocha|pytest|py\.test|cargo\s+test|go\s+test|bundle\s+exec\s+rspec|rspec|phpunit|dotnet\s+test)\b/i;
+    SUPERSEDE_WINDOW_MS = 6e4;
     CLAUDE_PRICING = {
       "claude-opus-4-6": { i: 5e-6, o: 25e-6, cw: 625e-8, cr: 5e-7 },
       "claude-opus-4-5": { i: 5e-6, o: 25e-6, cw: 625e-8, cr: 5e-7 },
@@ -5588,14 +5625,15 @@ function TopToolsProjects({ audit }) {
         /* @__PURE__ */ jsx4(Text4, { bold: true, children: "TOP TOOLS / PROJECTS" }),
         audit === null ? /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "loading\u2026" }) : tools.length === 0 && projects.length === 0 ? /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "\u2014" }) : /* @__PURE__ */ jsxs4(Fragment3, { children: [
           /* @__PURE__ */ jsxs4(Box4, { children: [
-            /* @__PURE__ */ jsx4(Box4, { width: TOOL_LABEL_W + TOOL_COUNT_W + COL_GUTTER, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "TOOLS" }) }),
+            /* @__PURE__ */ jsx4(Box4, { width: TOOL_LABEL_W, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "TOOLS" }) }),
+            /* @__PURE__ */ jsx4(Box4, { width: TOOL_COUNT_W }),
+            /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: COL_GUTTER }),
             /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: "PROJECTS" })
           ] }),
           rows.map((r, i) => /* @__PURE__ */ jsxs4(Box4, { height: 1, children: [
-            /* @__PURE__ */ jsx4(Box4, { width: TOOL_LABEL_W + TOOL_COUNT_W + COL_GUTTER, children: r.tool ? /* @__PURE__ */ jsxs4(Fragment3, { children: [
-              /* @__PURE__ */ jsx4(Box4, { width: TOOL_LABEL_W, children: /* @__PURE__ */ jsx4(Text4, { children: fit(r.tool[0], TOOL_LABEL_W) }) }),
-              /* @__PURE__ */ jsx4(Box4, { width: TOOL_COUNT_W, justifyContent: "flex-end", children: /* @__PURE__ */ jsx4(Text4, { bold: true, children: num(r.tool[1].calls) }) })
-            ] }) : null }),
+            /* @__PURE__ */ jsx4(Box4, { width: TOOL_LABEL_W, children: /* @__PURE__ */ jsx4(Text4, { children: r.tool ? fit(r.tool[0], TOOL_LABEL_W) : "" }) }),
+            /* @__PURE__ */ jsx4(Box4, { width: TOOL_COUNT_W, justifyContent: "flex-end", children: /* @__PURE__ */ jsx4(Text4, { bold: true, children: r.tool ? num(r.tool[1].calls) : "" }) }),
+            /* @__PURE__ */ jsx4(Text4, { children: COL_GUTTER }),
             r.project ? /* @__PURE__ */ jsxs4(Fragment3, { children: [
               /* @__PURE__ */ jsx4(Box4, { width: PROJECT_LABEL_W, children: /* @__PURE__ */ jsx4(Text4, { children: fit(r.project.name, PROJECT_LABEL_W) }) }),
               /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: `${formatTokens(r.project.tokens)} ` }),
@@ -5625,7 +5663,7 @@ var init_TopToolsProjects = __esm({
     ROW_LIMIT = 4;
     TOOL_LABEL_W = 10;
     TOOL_COUNT_W = 6;
-    COL_GUTTER = 3;
+    COL_GUTTER = "   ";
     PROJECT_LABEL_W = 14;
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@node9/proxy",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "description": "The Sudo Command for AI Agents. Execution Security for Claude Code & MCP.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",