@vyuhlabs/dxkit 2.4.6 → 2.4.8

package/dist/analyzers/quality/shallow.js

@@ -1,8 +1,161 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toQualityScoreInput = toQualityScoreInput;
+exports.scoreQualityFromScoreInput = scoreQualityFromScoreInput;
 exports.scoreQualityDimension = scoreQualityDimension;
-const scoring_1 = require("../scoring");
+/**
+ * Code Quality dimension — health-side adapter over the canonical
+ * quality scorer.
+ *
+ * Translates `ScoreInput { metrics, capabilities }` into the
+ * `QualityScoreInput` partition consumed by `scoreQualityFromInput`,
+ * then wraps the resulting score in a full `DimensionScore` (status +
+ * details + metrics envelope) for the health audit rollup.
+ *
+ * D123 closure: this file used to delegate to a separate
+ * `scoreQuality` in `analyzers/scoring.ts` while the standalone
+ * quality report computed `computeSlopScore` from a different signal
+ * set. Same repo could surface as health.CodeQuality 22/100 and
+ * quality-review.SlopScore 45/100 — customer-visible contradiction.
+ * The canonical formula now lives in `quality/scoring.ts`; both
+ * surfaces compute the same number from the same partitioned inputs.
+ */
+const scoring_1 = require("../../scoring");
+/**
+ * Build the canonical `QualityScoreInput` from the health-side
+ * `ScoreInput`. Each field maps to its data source:
+ *
+ *   - Lint counts ← `capabilities.lint.counts`
+ *     (critical + high → errors). Availability is "did any pack
+ *     produce a `LintResult`" — i.e. `c.lint !== undefined`.
+ *   - Hygiene markers + stale files + mixed-language flag +
+ *     comment ratio ← `metrics.*`. Plumbed into HealthMetrics by
+ *     the cache builder so both consumer paths land on the same
+ *     values (the standalone Quality report reads them off the
+ *     same cached envelope).
+ *   - File-size + filesystem-walked + density-source metrics
+ *     ← `metrics.*`.
+ *   - Duplication, structural ← `capabilities.{duplication,
+ *     structural}`. Availability is "did the capability dispatch
+ *     return an envelope" — same shape as lint.
+ */
+function toQualityScoreInput(input) {
+    const m = input.metrics;
+    const c = input.capabilities;
+    const lintErrors = (c.lint?.counts.critical ?? 0) + (c.lint?.counts.high ?? 0);
+    return {
+        sourceFiles: m.sourceFiles,
+        lintErrors,
+        lintAvailable: c.lint !== undefined,
+        consoleLogCount: m.consoleLogCount,
+        todoCount: m.todoCount,
+        fixmeCount: m.fixmeCount,
+        hackCount: m.hackCount,
+        staleFiles: m.staleFiles,
+        mixedLanguages: m.mixedLanguages,
+        filesOver500Lines: m.filesOver500Lines,
+        largestFileLines: m.largestFileLines,
+        anyTypeCount: m.anyTypeCount,
+        typeErrors: m.typeErrors,
+        duplicationPercentage: c.duplication?.percentage ?? null,
+        duplicationAvailable: c.duplication !== undefined,
+        maxFunctionsInFile: c.structural?.maxFunctionsInFile ?? null,
+        deadImportCount: c.structural?.deadImportCount ?? null,
+        orphanModuleCount: c.structural?.orphanModuleCount ?? null,
+        structuralAvailable: c.structural !== undefined,
+        commentRatio: m.commentRatio,
+    };
+}
+/**
+ * Score-only adapter for action ranking. The health remediation
+ * planner builds `RemediationAction<ScoreInput>` patches and calls
+ * `rank()` with a per-dimension scorer that maps `ScoreInput` to
+ * `{ score }`. Mirrors the `scoreSecurityFromScoreInput` shim so
+ * `health/actions.ts` stays symmetric across dimensions.
+ */
+function scoreQualityFromScoreInput(input) {
+    return (0, scoring_1.evaluateSpec)(scoring_1.QUALITY_SCORING_SPEC, toQualityScoreInput(input));
+}
+/**
+ * Health audit's Code Quality dimension entry point. Produces the
+ * `DimensionScore` consumed by `health.ts:analyzeHealthInternal` for
+ * the dimension rollup, the dashboard summary, and the agent report.
+ */
 function scoreQualityDimension(input) {
-    return (0, scoring_1.scoreQuality)(input);
+    const m = input.metrics;
+    const c = input.capabilities;
+    const scoreInput = toQualityScoreInput(input);
+    const result = (0, scoring_1.evaluateSpec)(scoring_1.QUALITY_SCORING_SPEC, scoreInput);
+    const score = result.score;
+    const lintToolFromCache = c.lint?.tool ?? null;
+    const lintWarnings = (c.lint?.counts.medium ?? 0) + (c.lint?.counts.low ?? 0);
+    // When the cache says lint was attempted but every provider
+    // returned null, surface the honesty notice in the prose so the
+    // health-dim row reads consistently with the standalone Quality
+    // table. Same shape both consumers see.
+    const lintTool = lintToolFromCache ??
+        (c.lintAvailability && !c.lintAvailability.available
+            ? `not run — ${c.lintAvailability.unavailableReason}`
+            : null);
+    return {
+        score,
+        maxScore: 100,
+        rating: (0, scoring_1.ratingFromScore)(score),
+        rawScore: result.rawScore,
+        rawPenalty: result.rawPenalty,
+        methodology: result.methodology,
+        deductions: result.deductions,
+        capsApplied: result.capsApplied,
+        topActions: result.topActions,
+        // Schema v11: `metrics` surfaces only the non-capability signals.
+        // Lint counts + tool live in `report.capabilities.lint`; god-file +
+        // dead-import stats live in `report.capabilities.structural`.
+        metrics: {
+            filesOver500Lines: m.filesOver500Lines,
+            largestFileLines: m.largestFileLines,
+            largestFilePath: m.largestFilePath,
+            consoleLogCount: m.consoleLogCount,
+            anyTypeCount: m.anyTypeCount,
+            typeErrors: m.typeErrors,
+        },
+        details: 
+        // Split the lint label into its successful-run name plus a separate
+        // "Linter coverage gap" sentence when packs were attempted but
+        // returned null silently. The parenthetical "(ruff (not run: ts))"
+        // shape was easy to miss in the rendered prose.
+        (() => {
+            if (!lintTool)
+                return `${scoreInput.lintErrors} lint errors, ${lintWarnings} warnings`;
+            const notRunMatch = /\(not run: ([^)]+)\)/.exec(lintTool);
+            if (!notRunMatch) {
+                return `${scoreInput.lintErrors} lint errors, ${lintWarnings} warnings (${lintTool})`;
+            }
+            const cleanTool = lintTool.replace(/\s*\(not run: [^)]+\)/, '').trim();
+            // Per-pack annotation shape: `typescript — reason` (em-dash
+            // separator added by `health.ts` when `gatherOutcome` supplied a
+            // reason). Re-render in grammatical form: "typescript not run
+            // (reason)" instead of awkward "typescript — reason not run".
+            const annotated = notRunMatch[1]
+                .split(',')
+                .map((entry) => {
+                const trimmed = entry.trim();
+                const reasonMatch = /^(.+?)\s+—\s+(.+)$/.exec(trimmed);
+                return reasonMatch
+                    ? `${reasonMatch[1]} not run (${reasonMatch[2]})`
+                    : `${trimmed} not run`;
+            })
+                .join('; ');
+            return (`${scoreInput.lintErrors} lint errors, ${lintWarnings} warnings (${cleanTool})` +
+                `. ⚠ Linter coverage gap: ${annotated}`);
+        })() +
+            `. ${m.filesOver500Lines} files exceed 500 lines` +
+            `. Largest file: ${m.largestFilePath} (${m.largestFileLines} lines)` +
+            `. ${m.consoleLogCount} console/debug statements` +
+            (m.anyTypeCount > 0 ? `. ${m.anyTypeCount} loose type annotations` : '') +
+            (scoreInput.maxFunctionsInFile !== null
+                ? `. Densest file: ${scoreInput.maxFunctionsInFile} functions`
+                : '') +
+            '.',
+    };
 }
 //# sourceMappingURL=shallow.js.map

package/dist/analyzers/quality/shallow.js.map

@@ -1 +1 @@
-{"version":3,"file":"shallow.js","sourceRoot":"","sources":["../../../src/analyzers/quality/shallow.ts"],"names":[],"mappings":";;AASA,sDAEC;AAJD,wCAAsD;AAEtD,SAAgB,qBAAqB,CAAC,KAAiB;IACrD,OAAO,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"shallow.js","sourceRoot":"","sources":["../../../src/analyzers/quality/shallow.ts"],"names":[],"mappings":"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"}

package/dist/analyzers/quality/types.d.ts

@@ -29,6 +29,11 @@ export interface DuplicationStats {
     topClones?: CloneGroup[];
 }
 export interface QualityMetrics {
+    sourceFiles: number;
+    filesOver500Lines: number;
+    largestFileLines: number;
+    anyTypeCount: number;
+    typeErrors: number | null;
     lintErrors: number;
     lintWarnings: number;
     lintTool: string | null;
@@ -62,5 +67,14 @@ export interface QualityReport {
     slopScore: number;
     toolsUsed: string[];
     toolsUnavailable: string[];
+    /**
+     * Pack ids of every active language pack at scan time (derived from
+     * the cached DetectedStack). The renderer reads this to decide
+     * whether structural-graph signals like `orphanModuleCount` need an
+     * informational qualifier — graphify can't follow C# `using`
+     * directives across assemblies, so on csharp-dominant repos every
+     * .cs file looks orphaned and the raw count misleads.
+     */
+    activeLanguages?: string[];
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/analyzers/quality/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/analyzers/quality/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,kDAAkD;AAClD,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,SAAS,CAAC;IACb,CAAC,EAAE,SAAS,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAE7B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAGxB,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAGrC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAG7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAGjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IAGxB,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/analyzers/quality/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,0CAA0C;AAC1C,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,kDAAkD;AAClD,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,CAAC,EAAE,SAAS,CAAC;IACb,CAAC,EAAE,SAAS,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,oFAAoF;IACpF,SAAS,CAAC,EAAE,UAAU,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAM7B,WAAW,EAAE,MAAM,CAAC;IAOpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAG1B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAGxB,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAGrC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAG7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAGjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IAGxB,SAAS,EAAE,MAAM,CAAC;IAGlB,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;IAC9B,WAAW,CAAC,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;CAC5B"}

package/dist/analyzers/security/actions.d.ts

@@ -1,7 +1,14 @@
 import { RemediationAction } from '../remediation';
 import { SecurityReport } from './types';
-import { SecurityCounts } from './scoring';
-/** Project a SecurityReport into the counts shape used for scoring. */
-export declare function countsFromReport(report: SecurityReport): SecurityCounts;
-export declare function buildSecurityActions(report: SecurityReport): RemediationAction<SecurityCounts>[];
+import { SecurityScoreInput } from '../../scoring';
+/**
+ * Project a SecurityReport into the canonical scoring input shape.
+ *
+ * Partitions findings by rule + category so each one contributes to
+ * exactly one field — no double-counting. Rule strings are stable
+ * contracts owned by the gather code (`gather.ts`); changes there
+ * must keep these names in sync.
+ */
+export declare function countsFromReport(report: SecurityReport): SecurityScoreInput;
+export declare function buildSecurityActions(report: SecurityReport): RemediationAction<SecurityScoreInput>[];
 //# sourceMappingURL=actions.d.ts.map

package/dist/analyzers/security/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../src/analyzers/security/actions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAA6B,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,uEAAuE;AACvE,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,cAAc,CAavE;AAyCD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,iBAAiB,CAAC,cAAc,CAAC,EAAE,CAwDhG"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../src/analyzers/security/actions.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAA6B,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,GAAG,kBAAkB,CA2C3E;AAoED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,cAAc,GACrB,iBAAiB,CAAC,kBAAkB,CAAC,EAAE,CAuCzC"}

package/dist/analyzers/security/actions.js

@@ -2,28 +2,59 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.countsFromReport = countsFromReport;
 exports.buildSecurityActions = buildSecurityActions;
-/** Project a SecurityReport into the counts shape used for scoring. */
+/**
+ * Project a SecurityReport into the canonical scoring input shape.
+ *
+ * Partitions findings by rule + category so each one contributes to
+ * exactly one field — no double-counting. Rule strings are stable
+ * contracts owned by the gather code (`gather.ts`); changes there
+ * must keep these names in sync.
+ */
 function countsFromReport(report) {
-    const s = report.summary.findings;
+    let secretFindings = 0;
+    let privateKeyFiles = 0;
+    let envFilesInGit = 0;
+    const codeFindings = { critical: 0, high: 0, medium: 0, low: 0 };
+    for (const f of report.findings) {
+        if (f.rule === 'private-key-file') {
+            privateKeyFiles++;
+        }
+        else if (f.rule === 'env-in-git') {
+            envFilesInGit++;
+        }
+        else if (f.category === 'secret') {
+            secretFindings++;
+        }
+        else if (f.category === 'code') {
+            codeFindings[f.severity]++; // aggregator-ok: rebuilding SecurityScoreInput partitions from SecurityReport (rehydration), not user-facing aggregation
+        }
+        // Other categories are intentionally ignored by the scorer; the
+        // partition above covers every category the gather code emits today
+        // ('secret', 'code', 'config' — config is private-key-file/env-in-git
+        // which are named above). Adding a new category requires a scoring
+        // decision; silently bucketing into "other" would be the wrong default.
+    }
     const d = report.summary.dependencies;
     return {
-        critical: s.critical,
-        high: s.high,
-        medium: s.medium,
-        low: s.low,
-        depCritical: d.critical,
-        depHigh: d.high,
-        depMedium: d.medium,
-        depLow: d.low,
+        secretFindings,
+        privateKeyFiles,
+        envFilesInGit,
+        codeFindings,
+        depVulns: {
+            critical: d.critical,
+            high: d.high,
+            medium: d.medium,
+            low: d.low,
+        },
+        // D025b/D025d: read directly from DepVulnSummary.available. Both
+        // health side (via toSecurityScoreInput) and standalone side
+        // (countsFromReport here) now plumb the same boolean into the
+        // unified scorer — drift parity closes automatically. Default
+        // `true` for fixtures that pre-date the field (legacy report JSONs
+        // saved before 2.4.7).
+        depVulnsAvailable: d.available ?? true,
     };
 }
-/** Deduct N findings of the given severity from counts, clamped to 0. */
-function deductSeverity(counts, severity, n, depsOnly = false) {
-    const key = depsOnly
-        ? ('dep' + severity[0].toUpperCase() + severity.slice(1))
-        : severity;
-    return { ...counts, [key]: Math.max(0, counts[key] - n) };
-}
 /** Convert a finding into generic evidence. */
 function findingToEvidence(f) {
     return {
@@ -48,31 +79,53 @@ function groupByRule(findings) {
     }
     return groups;
 }
+/**
+ * Build a patch that reduces the appropriate `SecurityScoreInput` field
+ * for a group of findings sharing one rule. The unified scorer fields
+ * map back to the gather-code categories:
+ *   - rule === 'private-key-file'   → privateKeyFiles
+ *   - rule === 'env-in-git'         → envFilesInGit
+ *   - category === 'secret'         → secretFindings
+ *   - category === 'code'           → codeFindings[severity]
+ */
+function patchForRuleGroup(rule, findings) {
+    if (rule === 'private-key-file') {
+        return (cur) => ({ ...cur, privateKeyFiles: 0 });
+    }
+    if (rule === 'env-in-git') {
+        return (cur) => ({ ...cur, envFilesInGit: 0 });
+    }
+    const category = findings[0]?.category;
+    if (category === 'secret') {
+        const n = findings.length;
+        return (cur) => ({ ...cur, secretFindings: Math.max(0, cur.secretFindings - n) });
+    }
+    // Code findings: partition the group by severity, deduct each bucket.
+    const bySeverity = { critical: 0, high: 0, medium: 0, low: 0 };
+    for (const f of findings)
+        bySeverity[f.severity]++; // aggregator-ok: partition-for-deduction in remediation action planner, not user-facing aggregation
+    return (cur) => ({
+        ...cur,
+        codeFindings: {
+            critical: Math.max(0, cur.codeFindings.critical - bySeverity.critical),
+            high: Math.max(0, cur.codeFindings.high - bySeverity.high),
+            medium: Math.max(0, cur.codeFindings.medium - bySeverity.medium),
+            low: Math.max(0, cur.codeFindings.low - bySeverity.low),
+        },
+    });
+}
 function buildSecurityActions(report) {
     const actions = [];
     const groups = groupByRule(report.findings);
     // One action per rule group — fix ALL findings matching that rule.
     for (const [rule, findings] of groups) {
         const topSeverity = findings[0].severity;
-        const counts = {
-            critical: findings.filter((f) => f.severity === 'critical').length,
-            high: findings.filter((f) => f.severity === 'high').length,
-            medium: findings.filter((f) => f.severity === 'medium').length,
-            low: findings.filter((f) => f.severity === 'low').length,
-        };
         actions.push({
             id: `security.fix-${rule}`,
             title: `Fix ${findings.length} ${rule} finding${findings.length === 1 ? '' : 's'} (${topSeverity.toUpperCase()})`,
             rationale: `Rule ${rule} (${findings[0].tool}). ${findings[0].cwe || 'No CWE tag'}.`,
             evidence: findings.slice(0, 50).map(findingToEvidence),
-            patch: (c) => {
-                let next = c;
-                next = deductSeverity(next, 'critical', counts.critical);
-                next = deductSeverity(next, 'high', counts.high);
-                next = deductSeverity(next, 'medium', counts.medium);
-                next = deductSeverity(next, 'low', counts.low);
-                return next;
-            },
+            patch: patchForRuleGroup(rule, findings),
         });
     }
     // Dependency updates — one action covering all dep vulns.
@@ -90,12 +143,9 @@ function buildSecurityActions(report) {
                     message: `${d.total} vulnerable dependencies`,
                 },
             ],
-            patch: (c) => ({
-                ...c,
-                depCritical: 0,
-                depHigh: 0,
-                depMedium: 0,
-                depLow: 0,
+            patch: (cur) => ({
+                ...cur,
+                depVulns: { critical: 0, high: 0, medium: 0, low: 0 },
             }),
         });
     }

package/dist/analyzers/security/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/analyzers/security/actions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../src/analyzers/security/actions.ts"],"names":[],"mappings":"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"}