@mmnto/cli 1.15.9 → 1.16.0

package/dist/commands/recurrence-stats.test.js

@@ -0,0 +1,379 @@
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+// Mock @clack/prompts confirm to a no-op returning false.
+vi.mock('@clack/prompts', () => ({
+    confirm: vi.fn().mockResolvedValue(false),
+    isCancel: vi.fn().mockReturnValue(false),
+}));
+// Mock the GitHubCliPrAdapter and gh-utils used by recurrence-stats.
+const mockFetchPr = vi.fn();
+const mockFetchReviewComments = vi.fn();
+const mockGhFetchAndParse = vi.fn();
+vi.mock('../adapters/github-cli-pr.js', () => ({
+    // Use a real class so `new GitHubCliPrAdapter(...)` is a valid construct.
+    GitHubCliPrAdapter: class GitHubCliPrAdapter {
+        fetchPr(num) {
+            return mockFetchPr(num);
+        }
+        fetchReviewComments(num) {
+            return mockFetchReviewComments(num);
+        }
+    },
+}));
+vi.mock('../adapters/gh-utils.js', () => ({
+    ghFetchAndParse: (...args) => mockGhFetchAndParse(...args),
+    handleGhError: (err) => {
+        throw err;
+    },
+}));
+// Mock loadConfig + resolveConfigPath to a tmp totemDir.
+let tmpDir;
+let totemDir;
+vi.mock('../utils.js', () => ({
+    loadConfig: vi.fn().mockImplementation(async () => ({ totemDir: '.totem' })),
+    resolveConfigPath: vi.fn().mockReturnValue(''),
+}));
+import { runRecurrenceStats } from './recurrence-stats.js';
+// ─── Test setup ────────────────────────────────────────
+beforeEach(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'recurrence-stats-'));
+    totemDir = path.join(tmpDir, '.totem');
+    fs.mkdirSync(totemDir, { recursive: true });
+    // Run from tmpDir so totemDir resolves under it.
+    process.chdir(tmpDir);
+    mockFetchPr.mockReset();
+    mockFetchReviewComments.mockReset();
+    mockGhFetchAndParse.mockReset();
+});
+afterEach(() => {
+    // Restore cwd to a known location so test cleanup can rm tmpDir.
+    process.chdir(os.tmpdir());
+    fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 3, retryDelay: 100 });
+});
+// ─── Test data factories ───────────────────────────────
+function makeReviewComment(overrides) {
+    return {
+        id: overrides.id,
+        author: overrides.prAuthor ?? 'coderabbitai[bot]',
+        body: overrides.body,
+        path: overrides.filePath ?? 'src/handler.ts',
+        diffHunk: `@@ -1,3 +${overrides.line ?? 42},3 @@`,
+        inReplyToId: undefined,
+        createdAt: '2026-04-01T00:00:00.000Z',
+    };
+}
+function loadStats() {
+    const raw = fs.readFileSync(path.join(totemDir, 'recurrence-stats.json'), 'utf-8');
+    return JSON.parse(raw);
+}
+// ─── Tests ─────────────────────────────────────────────
+describe('runRecurrenceStats', () => {
+    it('collapses path/line variants of the same finding to one signature', async () => {
+        mockGhFetchAndParse.mockReturnValue([
+            { number: 100, mergedAt: '2026-04-01T00:00:00.000Z' },
+            { number: 101, mergedAt: '2026-04-02T00:00:00.000Z' },
+            { number: 102, mergedAt: '2026-04-03T00:00:00.000Z' },
+        ]);
+        // Same finding text, different files / lines / fenced code blocks
+        mockFetchPr.mockImplementation((num) => ({
+            number: num,
+            title: `PR ${num}`,
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        }));
+        mockFetchReviewComments.mockImplementation((num) => {
+            const variants = [
+                'Avoid using `any` in packages/cli/src/foo.ts:42 — prefer `unknown`.',
+                'Avoid using `any` in packages/core/src/bar.ts:99 — prefer `unknown`.',
+                'Avoid using `any` in src/baz.ts:7 — prefer `unknown`.',
+            ];
+            const idx = num - 100;
+            return [makeReviewComment({ id: 1000 + num, body: variants[idx], line: 42 + idx })];
+        });
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        // Threshold 1 → all clusters surface; should be exactly one cluster
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        expect(allPatterns[0].occurrences).toBe(3);
+    });
+    it('marks cluster as `mixed` when same signature spans multiple bots', async () => {
+        mockGhFetchAndParse.mockReturnValue([{ number: 200, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 200,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([
+            makeReviewComment({
+                id: 1,
+                prAuthor: 'coderabbitai[bot]',
+                body: 'Avoid using `any` — prefer `unknown`.',
+            }),
+            makeReviewComment({
+                id: 2,
+                prAuthor: 'gemini-code-assist[bot]',
+                body: 'Avoid using `any` — prefer `unknown`.',
+            }),
+        ]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        expect(allPatterns[0].tool).toBe('mixed');
+        // Two distinct findings with same signature
+        expect(allPatterns[0].occurrences).toBe(2);
+    });
+    it('counts occurrences across distinct findings, not distinct PRs', async () => {
+        mockGhFetchAndParse.mockReturnValue([
+            { number: 300, mergedAt: '2026-04-01T00:00:00.000Z' },
+            { number: 301, mergedAt: '2026-04-02T00:00:00.000Z' },
+        ]);
+        mockFetchPr.mockReturnValue({
+            number: 0,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        // PR 300 has 3 distinct findings with the same body, PR 301 has 1.
+        // Total occurrences: 4. Distinct PRs: 2.
+        mockFetchReviewComments.mockImplementation((num) => {
+            if (num === 300) {
+                return [
+                    makeReviewComment({ id: 1, body: 'Empty catch block.', filePath: 'a.ts', line: 1 }),
+                    makeReviewComment({ id: 2, body: 'Empty catch block.', filePath: 'b.ts', line: 2 }),
+                    makeReviewComment({ id: 3, body: 'Empty catch block.', filePath: 'c.ts', line: 3 }),
+                ];
+            }
+            return [makeReviewComment({ id: 4, body: 'Empty catch block.', filePath: 'd.ts', line: 4 })];
+        });
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        expect(allPatterns[0].occurrences).toBe(4);
+        expect(allPatterns[0].prs).toEqual(['300', '301']);
+    });
+    it('dedupes + sorts prs ascending numerically', async () => {
+        mockGhFetchAndParse.mockReturnValue([
+            { number: 1500, mergedAt: '2026-04-03T00:00:00.000Z' },
+            { number: 200, mergedAt: '2026-04-02T00:00:00.000Z' },
+            { number: 80, mergedAt: '2026-04-01T00:00:00.000Z' },
+        ]);
+        mockFetchPr.mockReturnValue({
+            number: 0,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockImplementation((num) => [
+            makeReviewComment({ id: num, body: 'Same finding text everywhere.', filePath: 'x.ts' }),
+        ]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        // 80 < 200 < 1500 numerically (NOT lexically — '1500' < '200' < '80' lex)
+        expect(allPatterns[0].prs).toEqual(['80', '200', '1500']);
+    });
+    it('excludes patterns below threshold from headline patterns', async () => {
+        mockGhFetchAndParse.mockReturnValue([
+            { number: 400, mergedAt: '2026-04-01T00:00:00.000Z' },
+            { number: 401, mergedAt: '2026-04-02T00:00:00.000Z' },
+        ]);
+        mockFetchPr.mockReturnValue({
+            number: 0,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockImplementation((num) => [
+            makeReviewComment({ id: num, body: `Distinct issue ${num}.`, filePath: 'x.ts' }),
+        ]);
+        // threshold=5 — neither cluster has enough occurrences (each is 1)
+        await runRecurrenceStats({ threshold: 5, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        expect(stats.patterns.length).toBe(0);
+    });
+    it('routes patterns matching an existing rule to coveredPatterns', async () => {
+        // Seed compiled-rules.json with a rule whose message overlaps the
+        // finding text well enough to clear Jaccard >= 0.6.
+        const rule = {
+            lessonHash: 'abc123',
+            lessonHeading: 'Avoid any',
+            message: 'Avoid using any type — prefer unknown',
+            pattern: 'any',
+            engine: 'regex',
+            severity: 'warning',
+            category: 'style',
+            fileGlobs: ['**/*.ts'],
+            status: 'active',
+            compiledAt: '2026-04-01T00:00:00.000Z',
+        };
+        fs.writeFileSync(path.join(totemDir, 'compiled-rules.json'), JSON.stringify({ version: 1, rules: [rule], nonCompilable: [] }));
+        mockGhFetchAndParse.mockReturnValue([{ number: 500, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 500,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([
+            makeReviewComment({
+                id: 5001,
+                body: 'Avoid using any type — prefer unknown.',
+            }),
+        ]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        expect(stats.patterns.length).toBe(0);
+        expect(stats.coveredPatterns.length).toBe(1);
+        expect(stats.coveredPatterns[0].tool).toBe('coderabbit');
+    });
+    it('atomic write — temp file is cleaned up after rename', async () => {
+        mockGhFetchAndParse.mockReturnValue([{ number: 600, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 600,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([makeReviewComment({ id: 6001, body: 'A finding.' })]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        expect(fs.existsSync(path.join(totemDir, 'recurrence-stats.json'))).toBe(true);
+        // No .tmp residue under any name (covers the legacy fixed-name path
+        // AND the unique PID+timestamp form introduced for mmnto-ai/totem#1729 CR R1).
+        const residue = fs.readdirSync(totemDir).filter((f) => f.endsWith('.tmp'));
+        expect(residue).toEqual([]);
+    });
+    it('survives concurrent invocations without temp-file collision', async () => {
+        mockGhFetchAndParse.mockReturnValue([{ number: 650, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 650,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([
+            makeReviewComment({ id: 6501, body: 'Concurrent invocation test finding.' }),
+        ]);
+        // Two parallel invocations would collide on a fixed `.tmp` path; the
+        // PID+epochMs suffix introduced for mmnto-ai/totem#1729 CR R1 keeps
+        // them disjoint. Both must resolve and the final file must be valid.
+        await Promise.all([
+            runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true }),
+            runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true }),
+        ]);
+        expect(fs.existsSync(path.join(totemDir, 'recurrence-stats.json'))).toBe(true);
+        const stats = loadStats();
+        expect(stats.version).toBe(1);
+        // No .tmp residue under any name
+        const residue = fs.readdirSync(totemDir).filter((f) => f.endsWith('.tmp'));
+        expect(residue).toEqual([]);
+    });
+    it('does not throw when compiled-rules.json is missing', async () => {
+        // Make sure rules file does not exist
+        const rulesPath = path.join(totemDir, 'compiled-rules.json');
+        if (fs.existsSync(rulesPath))
+            fs.unlinkSync(rulesPath);
+        mockGhFetchAndParse.mockReturnValue([{ number: 700, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 700,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([
+            makeReviewComment({ id: 7001, body: 'Some finding.' }),
+        ]);
+        await expect(runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true })).resolves.toBeUndefined();
+    });
+    it('folds trap-ledger override events as co-equal findings', async () => {
+        // Seed events.ndjson with one override event
+        const ledgerDir = path.join(totemDir, 'ledger');
+        fs.mkdirSync(ledgerDir, { recursive: true });
+        const event = {
+            timestamp: '2026-04-01T00:00:00.000Z',
+            type: 'override',
+            ruleId: 'rule-xyz',
+            file: 'src/legacy.ts',
+            line: 10,
+            justification: 'Legacy code we will refactor later.',
+            source: 'shield',
+        };
+        fs.writeFileSync(path.join(ledgerDir, 'events.ndjson'), JSON.stringify(event) + '\n');
+        mockGhFetchAndParse.mockReturnValue([]);
+        mockFetchPr.mockReturnValue({
+            number: 0,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        expect(allPatterns[0].tool).toBe('override');
+        // Override events are not tied to a PR
+        expect(allPatterns[0].prs).toEqual([]);
+    });
+    it('marks cluster as `mixed` when override + bot finding share a signature', async () => {
+        const ledgerDir = path.join(totemDir, 'ledger');
+        fs.mkdirSync(ledgerDir, { recursive: true });
+        // Use a justification that, after normalization, matches the bot finding
+        const event = {
+            timestamp: '2026-04-01T00:00:00.000Z',
+            type: 'override',
+            ruleId: 'rule-xyz',
+            file: 'src/handler.ts',
+            line: 10,
+            justification: 'Avoid using any type prefer unknown.',
+            source: 'shield',
+        };
+        fs.writeFileSync(path.join(ledgerDir, 'events.ndjson'), JSON.stringify(event) + '\n');
+        mockGhFetchAndParse.mockReturnValue([{ number: 800, mergedAt: '2026-04-01T00:00:00.000Z' }]);
+        mockFetchPr.mockReturnValue({
+            number: 800,
+            title: 't',
+            body: '',
+            state: 'merged',
+            comments: [],
+            reviews: [],
+        });
+        mockFetchReviewComments.mockReturnValue([
+            makeReviewComment({ id: 8001, body: 'Avoid using any type prefer unknown.' }),
+        ]);
+        await runRecurrenceStats({ threshold: 1, historyDepth: 5, yes: true });
+        const stats = loadStats();
+        const allPatterns = [...stats.patterns, ...stats.coveredPatterns];
+        expect(allPatterns.length).toBe(1);
+        expect(allPatterns[0].tool).toBe('mixed');
+        expect(allPatterns[0].occurrences).toBe(2);
+        expect(allPatterns[0].prs).toEqual(['800']);
+    });
+});
+//# sourceMappingURL=recurrence-stats.test.js.map

package/dist/commands/recurrence-stats.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recurrence-stats.test.js","sourceRoot":"","sources":["../../src/commands/recurrence-stats.test.ts"],"names":[],"mappings":"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"}

package/dist/commands/shield.d.ts

@@ -46,6 +46,23 @@ export declare function formatVerdictForDisplay(verdict: ShieldStructuredVerdict
  * boundary.
  */
 export declare function writeReviewedContentHash(cwd: string, totemDir: string, configRoot?: string, extensions?: readonly string[]): Promise<void>;
+/**
+ * Record a shield override: append the override event to the Trap Ledger
+ * AND stamp the reviewed-content-hash so the push-gate hook unblocks.
+ *
+ * mmnto-ai/totem#1716: prior to this helper the override branch only wrote the ledger
+ * entry; the missing stamp left the contributor stuck behind the push-gate
+ * with a tribal-knowledge `git reset --soft HEAD~1 && totem review --staged`
+ * workaround. Override is a legitimate completion path (with logged
+ * justification) and must produce the same cache state as a passing review.
+ */
+export declare function recordShieldOverride(params: {
+    override: string;
+    cwd: string;
+    totemDir: string;
+    configRoot?: string;
+    sourceExtensions?: readonly string[];
+}): Promise<void>;
 export type ShieldFormat = 'text' | 'sarif' | 'json';
 export interface ShieldOptions {
     raw?: boolean;
@@ -53,6 +70,8 @@ export interface ShieldOptions {
     model?: string;
     fresh?: boolean;
     staged?: boolean;
+    /** Explicit ref range for `git diff` (mmnto-ai/totem#1717). Bypasses implicit fallback chain. */
+    diff?: string;
     mode?: 'standard' | 'structural';
     learn?: boolean;
     yes?: boolean;

package/dist/commands/shield.d.ts.map

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

package/dist/commands/shield.js

@@ -348,6 +348,30 @@ export async function writeReviewedContentHash(cwd, totemDir, configRoot, extens
         }
     }
 }
+/**
+ * Record a shield override: append the override event to the Trap Ledger
+ * AND stamp the reviewed-content-hash so the push-gate hook unblocks.
+ *
+ * mmnto-ai/totem#1716: prior to this helper the override branch only wrote the ledger
+ * entry; the missing stamp left the contributor stuck behind the push-gate
+ * with a tribal-knowledge `git reset --soft HEAD~1 && totem review --staged`
+ * workaround. Override is a legitimate completion path (with logged
+ * justification) and must produce the same cache state as a passing review.
+ */
+export async function recordShieldOverride(params) {
+    const path = await import('node:path');
+    const { appendLedgerEvent } = await import('@mmnto/totem');
+    const resolvedTotemDir = path.join(params.configRoot ?? params.cwd, params.totemDir);
+    appendLedgerEvent(resolvedTotemDir, {
+        timestamp: new Date().toISOString(),
+        type: 'override',
+        ruleId: 'shield-override',
+        file: '(shield)',
+        justification: params.override,
+        source: 'shield',
+    }, (msg) => log.dim(DISPLAY_TAG, msg));
+    await writeReviewedContentHash(params.cwd, params.totemDir, params.configRoot, params.sourceExtensions);
+}
 // ─── Deterministic mode (delegates to shared engine) ─
 // ─── Learn: extract lessons from failed verdict ─────
 export async function learnFromVerdict(verdictContent, diff, options, config, cwd, configRoot) {
@@ -580,24 +604,23 @@ async function handleVerdictResult(content, diff, options, config, cwd, configRo
             await writeReviewedContentHash(cwd, config.totemDir, configRoot, config.review.sourceExtensions);
         }
         else if (options.override) {
-            const { appendLedgerEvent } = await import('@mmnto/totem');
             const criticalFindings = filtered.filter((f) => f.severity === 'CRITICAL');
             log.warn(DISPLAY_TAG, `SHIELD OVERRIDE APPLIED: ${options.override}`);
             for (const finding of criticalFindings) {
                 log.warn(DISPLAY_TAG, `  [overridden] ${finding.message}`);
             }
-            appendLedgerEvent(resolvedTotemDir, {
-                timestamp: new Date().toISOString(),
-                type: 'override',
-                ruleId: 'shield-override',
-                file: '(shield)',
-                justification: options.override,
-                source: 'shield',
-            }, (msg) => log.dim(DISPLAY_TAG, msg));
+            await recordShieldOverride({
+                override: options.override,
+                cwd,
+                totemDir: config.totemDir,
+                configRoot,
+                sourceExtensions: config.review.sourceExtensions,
+            });
             // Track overridden findings for exemption engine (only non-exempted findings)
             const { readLocalExemptions, writeLocalExemptions } = await import('../exemptions/exemption-store.js');
             const { trackFalsePositives } = await import('../exemptions/exemption-engine.js');
             const { PROMOTION_THRESHOLD } = await import('../exemptions/exemption-schema.js');
+            const { appendLedgerEvent } = await import('@mmnto/totem');
             const localExemptions = readLocalExemptions(cacheDir, (msg) => log.dim(DISPLAY_TAG, msg));
             const tracked = trackFalsePositives(criticalFindings, 'shield', localExemptions, shared);
             for (const msg of tracked.promoted) {
@@ -636,18 +659,14 @@ async function handleVerdictResult(content, diff, options, config, cwd, configRo
             await writeReviewedContentHash(cwd, config.totemDir, configRoot, config.review.sourceExtensions);
         }
         else if (options.override) {
-            const { appendLedgerEvent } = await import('@mmnto/totem');
-            const pathMod = await import('node:path');
-            const resolvedTotemDir = pathMod.join(configRoot ?? cwd, config.totemDir);
             log.warn(DISPLAY_TAG, `SHIELD OVERRIDE APPLIED: ${options.override}`);
-            appendLedgerEvent(resolvedTotemDir, {
-                timestamp: new Date().toISOString(),
-                type: 'override',
-                ruleId: 'shield-override',
-                file: '(shield)',
-                justification: options.override,
-                source: 'shield',
-            }, (msg) => log.dim(DISPLAY_TAG, msg));
+            await recordShieldOverride({
+                override: options.override,
+                cwd,
+                totemDir: config.totemDir,
+                configRoot,
+                sourceExtensions: config.review.sourceExtensions,
+            });
         }
         else {
             if (options.learn || config.shieldAutoLearn)