@contextrail/code-review-agent 0.1.1 → 0.1.2-alpha.1

package/dist/lifecycle.js

@@ -0,0 +1,52 @@
+import { createLogger, parseLogLevel } from './logging/logger.js';
+import { serializeError, toError } from './errors/error-utils.js';
+let mcpClientInstance = null;
+let isShuttingDown = false;
+export const setMcpClient = (client) => {
+    mcpClientInstance = client;
+};
+export const gracefulShutdown = async (signal, error) => {
+    const log = createLogger(parseLogLevel(process.env.DEBUG));
+    if (isShuttingDown) {
+        log.warn({ msg: 'Shutdown already in progress', signal });
+        return;
+    }
+    isShuttingDown = true;
+    log.warn({ msg: `Received ${signal}. Shutting down...`, signal });
+    try {
+        if (mcpClientInstance) {
+            await mcpClientInstance.close();
+        }
+        process.exit(error ? 1 : 0);
+    }
+    catch (shutdownError) {
+        const error = toError(shutdownError);
+        log.error({ msg: 'Error during shutdown', error: serializeError(error) });
+        process.exit(1);
+    }
+};
+export const setupLifecycleHandlers = () => {
+    process.on('uncaughtException', async (error) => {
+        const log = createLogger(parseLogLevel(process.env.DEBUG));
+        log.error({
+            msg: 'Uncaught exception',
+            error: serializeError(error),
+        });
+        await gracefulShutdown('SIGTERM', error);
+    });
+    process.on('unhandledRejection', async (reason) => {
+        const log = createLogger(parseLogLevel(process.env.DEBUG));
+        const error = toError(reason);
+        log.error({
+            msg: 'Unhandled rejection',
+            error: serializeError(error),
+        });
+        await gracefulShutdown('SIGTERM', error);
+    });
+    process.on('SIGTERM', async () => {
+        await gracefulShutdown('SIGTERM');
+    });
+    process.on('SIGINT', async () => {
+        await gracefulShutdown('SIGINT');
+    });
+};

package/dist/output/summary-logger.d.ts

@@ -0,0 +1,3 @@
+import type { Logger } from '../logging/logger.js';
+import type { ReviewResult, ReviewerResult } from './schema.js';
+export declare const logReviewSummary: (log: Logger, result: ReviewResult, reviewerResults: ReviewerResult[]) => void;

package/dist/output/summary-logger.js

@@ -0,0 +1,81 @@
+export const logReviewSummary = (log, result, reviewerResults) => {
+    log.info('\n═══════════════════════════════════════════════════════════');
+    log.info('Review Summary');
+    log.info('═══════════════════════════════════════════════════════════');
+    log.info(`  Files reviewed: ${result.metadata.fileCount}`);
+    log.info(`  Reviewers executed: ${reviewerResults.length}`);
+    log.info(`  Total issue findings: ${result.summary.totalFindings}`);
+    log.info(`  Critical: ${result.summary.bySeverity.critical}`);
+    log.info(`  Major: ${result.summary.bySeverity.major}`);
+    log.info(`  Minor: ${result.summary.bySeverity.minor}`);
+    log.info(`  Info: ${result.summary.bySeverity.info}`);
+    log.info(`  Pass signals: ${result.summary.bySeverity.pass}`);
+    if (result.summary.totalFindings > 0) {
+        log.info('\n  Findings by reviewer:');
+        for (const [reviewer, count] of Object.entries(result.summary.byReviewer)) {
+            log.info(`    ${reviewer}: ${count} finding(s)`);
+        }
+    }
+    log.info(`\n  Decision: ${result.decision.decision.toUpperCase()}`);
+    log.info(`  Summary: ${result.decision.summary}`);
+    log.info(`  Rationale: ${result.decision.rationale}`);
+    const passReviewers = reviewerResults
+        .map((rr) => ({
+        reviewer: rr.reviewer,
+        passFinding: rr.findings.find((f) => f.severity === 'pass'),
+        notes: rr.notes,
+        validated: rr.validated,
+    }))
+        .filter((rr) => rr.validated && (rr.passFinding || rr.notes));
+    if (passReviewers.length > 0) {
+        log.info('\n  Reviewer pass summaries:');
+        for (const rr of passReviewers) {
+            const passLine = rr.notes?.trim() ?? rr.passFinding?.title ?? 'PASS';
+            log.info(`    ${rr.reviewer}: ${passLine.split('\n')[0] ?? passLine}`);
+        }
+    }
+    if (result.synthesis && result.synthesis.findings.length > 0) {
+        log.debug('\n  Deduplicated findings (synthesis):');
+        for (const finding of result.synthesis.findings) {
+            log.debug(`      [${finding.severity.toUpperCase()}] ${finding.title}`);
+            if (finding.file) {
+                log.debug(`        File: ${finding.file}${finding.line ? `:${finding.line}` : ''}`);
+            }
+            if (finding.sourceReviewers && finding.sourceReviewers.length > 0) {
+                log.debug(`        Source reviewers: ${finding.sourceReviewers.join(', ')}`);
+            }
+            if (finding.contextTitles && finding.contextTitles.length > 0) {
+                log.debug(`        ContextRail Standards: ${finding.contextTitles.join(', ')}`);
+            }
+            log.debug(`        ${finding.description}`);
+        }
+    }
+    else {
+        const hasAnyEntries = reviewerResults.some((rr) => rr.findings.length > 0);
+        if (hasAnyEntries) {
+            log.debug('\n  All findings:');
+            for (const rr of reviewerResults) {
+                if (rr.findings.length > 0) {
+                    log.debug(`\n    ${rr.reviewer}:`);
+                    for (const finding of rr.findings) {
+                        log.debug(`      [${finding.severity.toUpperCase()}] ${finding.title}`);
+                        if (finding.file) {
+                            log.debug(`        File: ${finding.file}${finding.line ? `:${finding.line}` : ''}`);
+                        }
+                        if (finding.contextTitles && finding.contextTitles.length > 0) {
+                            log.debug(`        ContextRail Standards: ${finding.contextTitles.join(', ')}`);
+                        }
+                        log.debug(`        ${finding.description}`);
+                    }
+                }
+            }
+        }
+    }
+    if (result.failures && result.failures.length > 0) {
+        log.warn('\n  Reviewer failures:');
+        for (const failure of result.failures) {
+            log.warn(`    ${failure.reviewer}: ${failure.message}`);
+        }
+    }
+    log.info('═══════════════════════════════════════════════════════════\n');
+};

package/dist/pipeline.d.ts

@@ -0,0 +1,25 @@
+import type { ValidatedReviewAgentConfig } from './config/index.js';
+import type { Logger } from './logging/logger.js';
+import { McpClient } from './mcp/client.js';
+export type PipelineInput = {
+    config: ValidatedReviewAgentConfig;
+    repoPath: string;
+    outputDir: string;
+    files?: string[];
+    from?: string;
+    to?: string;
+    prDescription?: string;
+    log: Logger;
+    onMcpClientReady?: (client: McpClient) => void;
+};
+export type PipelineResult = {
+    decision: string;
+    resultPath: string;
+    totalFindings: number;
+    hasValidationFailures: boolean;
+    failures: Array<{
+        reviewer: string;
+        message: string;
+    }>;
+};
+export declare const runReview: (input: PipelineInput) => Promise<PipelineResult>;

package/dist/pipeline.js

@@ -0,0 +1,267 @@
+import path from 'node:path';
+import { DEFAULT_ORCHESTRATOR_MODEL, DEFAULT_REVIEWER_MODEL } from './config/defaults.js';
+import { McpClient } from './mcp/client.js';
+import { buildReviewInputs, triagePr } from './review-inputs/index.js';
+import { runOrchestrator } from './orchestrator/agentic-orchestrator.js';
+import { runReviewerLoop } from './reviewers/executor.js';
+import { aggregateResults, writeResult, writeTokenBudgetMetrics } from './output/writer.js';
+import { logReviewSummary } from './output/summary-logger.js';
+import { metadataSchema, reviewerFindingsSchema } from './output/schema.js';
+import { generateReviewDecision, normalizeDecisionWithSynthesis, synthesizeFindings } from './output/aggregator.js';
+import { serializeError, toError } from './errors/error-utils.js';
+export const runReview = async (input) => {
+    const { config, repoPath, outputDir, files, from, to, prDescription, log, onMcpClientReady } = input;
+    log.info('Starting code review...');
+    log.info(`Repository: ${repoPath}`);
+    log.info(`Output: ${outputDir}`);
+    if (files && files.length > 0) {
+        log.info(`Files: ${files.join(', ')}`);
+    }
+    else {
+        log.info(`From: ${from}`);
+        log.info(`To: ${to}`);
+    }
+    const mcpClient = new McpClient({
+        serverUrl: config.mcpServerUrl,
+        authToken: config.mcpAuthToken,
+        clientName: 'code-review-agent',
+        clientVersion: '0.1.0',
+        logger: log,
+    });
+    onMcpClientReady?.(mcpClient);
+    try {
+        try {
+            await mcpClient.connect();
+            log.info('Connected to MCP server');
+        }
+        catch (error) {
+            const connectionError = toError(error);
+            log.error({
+                msg: 'Failed to connect to MCP server',
+                serverUrl: config.mcpServerUrl,
+                error: serializeError(connectionError),
+            });
+            throw new Error(`Failed to connect to MCP server at ${config.mcpServerUrl}: ${connectionError.message}`, {
+                cause: connectionError,
+            });
+        }
+        // Build review inputs
+        log.info('Building review inputs...');
+        const inputs = files && files.length > 0
+            ? await buildReviewInputs({
+                mode: 'file-list',
+                files,
+                basePath: repoPath,
+                surroundingContext: {
+                    enabled: true,
+                    maxTokensPerFile: config.maxTokensPerFile,
+                    contextLines: config.contextLines,
+                },
+            })
+            : await buildReviewInputs({
+                mode: 'diff',
+                repoPath,
+                from: from,
+                to: to,
+                surroundingContext: {
+                    enabled: true,
+                    maxTokensPerFile: config.maxTokensPerFile,
+                    contextLines: config.contextLines,
+                },
+            });
+        log.info(`Found ${inputs.files.length} files to review`);
+        if (inputs.files.length > 0) {
+            log.debug(`  Files: ${inputs.files.slice(0, 10).join(', ')}${inputs.files.length > 10 ? ` ... and ${inputs.files.length - 10} more` : ''}`);
+        }
+        // Triage PR to determine if it's trivial
+        const triageResult = triagePr(inputs);
+        log.info(`PR triage: ${triageResult.reason}`);
+        if (triageResult.isTrivial) {
+            log.info(`Trivial PR detected (${triageResult.isDocsOnly ? 'docs-only' : 'small'}). Skipping full reviewer flow.`);
+            // For trivial PRs, we still run orchestrator but with awareness
+            // The orchestrator can use this information to select fewer reviewers or skip entirely
+        }
+        // Run orchestrator
+        log.info('Running orchestrator...');
+        if (prDescription) {
+            log.debug('PR description provided, will be included in prompts');
+        }
+        if (config.reviewDomains && config.reviewDomains.length > 0) {
+            log.debug(`Review domains provided: ${config.reviewDomains.join(', ')}`);
+        }
+        const orchestratorOutput = await runOrchestrator(inputs, outputDir, {
+            mcpClient,
+            config: {
+                openRouterApiKey: config.openRouterApiKey,
+                orchestratorModel: config.orchestratorModel ?? DEFAULT_ORCHESTRATOR_MODEL,
+                maxSteps: config.maxSteps,
+                prDescription,
+                reviewDomains: config.reviewDomains,
+            },
+            logger: log,
+        });
+        log.info(`Selected reviewers: ${orchestratorOutput.reviewers.join(', ')}`);
+        log.debug(`Orchestrator understanding:\n${orchestratorOutput.understanding}`);
+        // Run reviewers in parallel with progress logging
+        log.info(`Running ${orchestratorOutput.reviewers.length} reviewer(s) in parallel...`);
+        const reviewerFailures = [];
+        const reviewerResults = await Promise.all(orchestratorOutput.reviewers.map(async (reviewer) => {
+            const startTime = Date.now();
+            log.info(`[${reviewer}] Starting review...`);
+            try {
+                const rawFindings = await runReviewerLoop(reviewer, inputs, orchestratorOutput.understanding, outputDir, {
+                    mcpClient,
+                    config: {
+                        openRouterApiKey: config.openRouterApiKey,
+                        reviewerModel: config.reviewerModel ?? DEFAULT_REVIEWER_MODEL,
+                        criticModel: config.criticModel,
+                        maxSteps: config.maxSteps,
+                        maxIterations: config.maxIterations,
+                        prDescription,
+                        reviewDomains: config.reviewDomains,
+                    },
+                    logger: log,
+                });
+                const parsedFindings = reviewerFindingsSchema.safeParse(rawFindings);
+                if (!parsedFindings.success) {
+                    throw new Error(`Reviewer ${reviewer} returned invalid findings payload: ${parsedFindings.error.issues
+                        .slice(0, 3)
+                        .map((issue) => `${issue.path.join('.') || 'root'}: ${issue.message}`)
+                        .join('; ')}`, { cause: parsedFindings.error });
+                }
+                const findings = parsedFindings.data;
+                const result = {
+                    reviewer,
+                    findings: findings.findings,
+                    validated: findings.validated,
+                    notes: findings.notes ?? undefined,
+                };
+                const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+                log.info(`[${reviewer}] Completed in ${duration}s`);
+                const issueCount = findings.findings.filter((f) => f.severity !== 'pass').length;
+                const passCount = findings.findings.filter((f) => f.severity === 'pass').length;
+                if (issueCount === 0) {
+                    log.info(`  ✓ ${reviewer}: Clean pass (pass signals: ${passCount}, validated: ${findings.validated})`);
+                }
+                else {
+                    log.info(`  ✓ ${reviewer}: ${issueCount} issue(s) (pass signals: ${passCount}, validated: ${findings.validated})`);
+                }
+                log.debug(`    Findings: ${JSON.stringify(findings.findings, null, 2)}`);
+                if (findings.notes) {
+                    log.debug(`    Notes: ${findings.notes}`);
+                }
+                return result;
+            }
+            catch (error) {
+                const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+                const reviewerError = toError(error);
+                const message = reviewerError.message;
+                log.error({
+                    msg: `[${reviewer}] Failed after ${duration}s`,
+                    reviewer,
+                    durationSeconds: Number(duration),
+                    error: serializeError(reviewerError),
+                });
+                if (message.includes('No object generated') || message.includes('No output generated')) {
+                    log.error({
+                        msg: `[${reviewer}] TROUBLESHOOTING`,
+                        reviewer,
+                        guidance: [
+                            'The model may not support structured output well.',
+                            'Try using a different model (e.g., anthropic/claude-haiku-4.5).',
+                            'Check model compatibility with structured output.',
+                            "Review the model's response format requirements.",
+                        ],
+                    });
+                }
+                reviewerFailures.push({ reviewer, message });
+                return {
+                    reviewer,
+                    findings: [],
+                    validated: false,
+                    notes: `Error: ${message}`,
+                };
+            }
+        }));
+        // Aggregate results
+        log.info('Aggregating results...');
+        log.debug(`  Total issue findings to aggregate: ${reviewerResults.reduce((sum, rr) => sum + rr.findings.filter((f) => f.severity !== 'pass').length, 0)}`);
+        log.debug(`  Total pass signals to aggregate: ${reviewerResults.reduce((sum, rr) => sum + rr.findings.filter((f) => f.severity === 'pass').length, 0)}`);
+        log.debug(`  Reviewers validated: ${reviewerResults.filter((rr) => rr.validated).length}/${reviewerResults.length}`);
+        const metadata = metadataSchema.parse({
+            timestamp: new Date().toISOString(),
+            mode: inputs.mode,
+            fileCount: inputs.files.length,
+        });
+        // Synthesize findings across reviewers (deduplication, contradictions, compound risks)
+        log.info(`Synthesis pass starting (model: ${config.orchestratorModel ?? DEFAULT_ORCHESTRATOR_MODEL}, reviewers: ${reviewerResults.length})`);
+        const synthesisResult = await synthesizeFindings(reviewerResults, {
+            openRouterApiKey: config.openRouterApiKey,
+            model: config.orchestratorModel ?? DEFAULT_ORCHESTRATOR_MODEL,
+            maxSteps: config.aggregationMaxSteps,
+            logger: log,
+        });
+        log.info(`Synthesis pass complete: ${synthesisResult.synthesis.findings.length} deduped findings, ${synthesisResult.synthesis.contradictions.length} contradictions, ${synthesisResult.synthesis.compoundRisks.length} compound risks`);
+        log.debug(`  Synthesis: ${synthesisResult.synthesis.findings.length} deduplicated findings`);
+        log.debug(`  Contradictions: ${synthesisResult.synthesis.contradictions.length}`);
+        log.debug(`  Compound risks: ${synthesisResult.synthesis.compoundRisks.length}`);
+        const synthesisSeverityCounts = synthesisResult.synthesis.findings.reduce((acc, finding) => {
+            acc[finding.severity] += 1;
+            return acc;
+        }, { critical: 0, major: 0, minor: 0, info: 0, pass: 0 });
+        log.debug(`  Synthesis severity: ${JSON.stringify(synthesisSeverityCounts)}`);
+        // Generate review decision based on synthesized findings
+        log.info(`Decision pass starting (model: ${config.orchestratorModel ?? DEFAULT_ORCHESTRATOR_MODEL}, synthesis findings: ${synthesisResult.synthesis.findings.length})`);
+        const decisionResult = await generateReviewDecision(orchestratorOutput.understanding, synthesisResult.synthesis, {
+            openRouterApiKey: config.openRouterApiKey,
+            model: config.orchestratorModel ?? DEFAULT_ORCHESTRATOR_MODEL,
+            maxSteps: config.aggregationMaxSteps,
+            logger: log,
+        });
+        const normalizedDecision = normalizeDecisionWithSynthesis(decisionResult.decision, synthesisResult.synthesis);
+        const decisionEvidence = {
+            findings: synthesisResult.synthesis.findings.length,
+            blockingFindings: synthesisResult.synthesis.findings.filter((f) => f.severity === 'critical' || f.severity === 'major').length,
+            contradictions: synthesisResult.synthesis.contradictions.length,
+            compoundRisks: synthesisResult.synthesis.compoundRisks.length,
+            modelDecision: decisionResult.decision.decision,
+            normalizedDecision: normalizedDecision.decision,
+        };
+        log.debug(`  Decision evidence: ${JSON.stringify(decisionEvidence)}`);
+        if (normalizedDecision.decision !== decisionResult.decision.decision) {
+            log.warn(`Decision normalized from ${decisionResult.decision.decision} to ${normalizedDecision.decision} to match synthesized findings.`);
+        }
+        log.info(`Decision pass complete: ${normalizedDecision.decision}`);
+        log.debug(`  Aggregation decision: ${normalizedDecision.decision}`);
+        log.debug(`  Decision summary: ${normalizedDecision.summary}`);
+        log.debug(`  Decision rationale: ${normalizedDecision.rationale}`);
+        const result = aggregateResults(metadata, orchestratorOutput.understanding, normalizedDecision, reviewerResults, reviewerFailures, synthesisResult.synthesis);
+        // Write result.json
+        await writeResult(outputDir, result);
+        const resultPath = path.join(outputDir, 'result.json');
+        log.info(`Results written to ${resultPath}`);
+        log.debug(`  Full review results available at: ${resultPath}`);
+        // Write token budget metrics
+        const aggregationUsage = [];
+        if (synthesisResult.usage) {
+            aggregationUsage.push(synthesisResult.usage);
+        }
+        if (decisionResult.usage) {
+            aggregationUsage.push(decisionResult.usage);
+        }
+        await writeTokenBudgetMetrics(outputDir, orchestratorOutput.reviewers, aggregationUsage.length > 0 ? aggregationUsage : undefined);
+        log.info(`Token budget metrics written to ${path.join(outputDir, 'token-budget.json')}`);
+        // Print summary
+        logReviewSummary(log, result, reviewerResults);
+        return {
+            decision: result.decision.decision,
+            resultPath,
+            totalFindings: result.summary.totalFindings,
+            hasValidationFailures: reviewerResults.some((rr) => !rr.validated),
+            failures: result.failures ?? [],
+        };
+    }
+    finally {
+        await mcpClient.close();
+    }
+};

package/dist/review-inputs/filtering.d.ts

@@ -8,7 +8,21 @@ export type FilteringConfig = {
      * Default: DEFAULT_EXCLUDE_PATTERNS
      */
     excludePatterns?: ReadonlyArray<string>;
+    /**
+     * Patterns to explicitly re-include after exclusion matching.
+     * Intended for `.gitignore` negation rules (`!pattern`).
+     */
+    includePatterns?: ReadonlyArray<string>;
+};
+export type GitignorePatterns = {
+    excludePatterns: string[];
+    includePatterns: string[];
 };
+/**
+ * Parse root `.gitignore` contents into exclude/include glob sets.
+ * Negations (`!pattern`) become include patterns used to re-include files.
+ */
+export declare const parseGitignoreContent: (contents: string) => GitignorePatterns;
 /**
  * Filter files based on exclude patterns.
  *

package/dist/review-inputs/filtering.js

@@ -1,22 +1,102 @@
 import { DEFAULT_EXCLUDE_PATTERNS } from '../config/defaults.js';
 import { fileMatchesPatterns } from './file-patterns.js';
 /**
- * Check if a file path matches any exclude pattern.
+ * Check if a file path matches any pattern set.
  * Uses minimatch for secure glob pattern matching (prevents ReDoS).
  *
  * @param filePath - File path to check (relative or absolute)
  * @param patterns - Glob patterns to match against
- * @returns True if file should be excluded
+ * @returns True if file matches at least one pattern
  */
-const matchesExcludePattern = (filePath, patterns) => {
-    // Convert patterns to FilePatterns format for consistent matching
+const matchesIncludePatternSet = (filePath, patterns) => {
+    // Convert patterns to FilePatterns format for consistent matching.
     const filePatterns = {
-        exclude: [...patterns],
+        include: [...patterns],
     };
     // Use fileMatchesPatterns which handles minimatch safely
-    // If file matches exclude patterns, it should be excluded
+    // If file matches include patterns, it should be included
+    return fileMatchesPatterns(filePath, filePatterns);
+};
+/**
+ * Check if a file path matches any exclude pattern.
+ *
+ * @param filePath - File path to check
+ * @param patterns - Exclude patterns
+ * @returns True when file is matched by exclusion rules
+ */
+const matchesExcludePatternSet = (filePath, patterns) => {
+    const filePatterns = {
+        exclude: [...patterns],
+    };
+    // fileMatchesPatterns returns false when exclude matches, so invert it here.
     return !fileMatchesPatterns(filePath, filePatterns);
 };
+/**
+ * Convert a root `.gitignore` rule into a minimatch-style glob pattern.
+ * This is intentionally low-lift (root file only) and does not attempt full git parity.
+ */
+const gitignoreRuleToGlob = (rule) => {
+    let pattern = rule.trim();
+    if (!pattern) {
+        return null;
+    }
+    // Keep escaped literals for leading comment/negation markers.
+    if (pattern.startsWith('\\#')) {
+        pattern = pattern.slice(1);
+    }
+    else if (pattern.startsWith('#')) {
+        return null;
+    }
+    if (pattern.startsWith('\\!')) {
+        pattern = pattern.slice(1);
+    }
+    // Normalize separators for cross-platform matching.
+    pattern = pattern.replace(/\\/g, '/');
+    const isRootAnchored = pattern.startsWith('/');
+    if (isRootAnchored) {
+        pattern = pattern.slice(1);
+    }
+    const isDirectoryPattern = pattern.endsWith('/');
+    if (isDirectoryPattern) {
+        pattern = pattern.slice(0, -1);
+    }
+    if (!pattern) {
+        return null;
+    }
+    const hasSlash = pattern.includes('/');
+    let glob = hasSlash ? (isRootAnchored ? pattern : `**/${pattern}`) : `**/${pattern}`;
+    if (isDirectoryPattern) {
+        glob = `${glob}/**`;
+    }
+    return glob;
+};
+/**
+ * Parse root `.gitignore` contents into exclude/include glob sets.
+ * Negations (`!pattern`) become include patterns used to re-include files.
+ */
+export const parseGitignoreContent = (contents) => {
+    const excludePatterns = [];
+    const includePatterns = [];
+    for (const rawLine of contents.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (!line) {
+            continue;
+        }
+        const isNegation = line.startsWith('!') && !line.startsWith('\\!');
+        const normalizedRule = isNegation ? line.slice(1) : line;
+        const glob = gitignoreRuleToGlob(normalizedRule);
+        if (!glob) {
+            continue;
+        }
+        if (isNegation) {
+            includePatterns.push(glob);
+        }
+        else {
+            excludePatterns.push(glob);
+        }
+    }
+    return { excludePatterns, includePatterns };
+};
 /**
  * Filter files based on exclude patterns.
  *
@@ -25,8 +105,17 @@ const matchesExcludePattern = (filePath, patterns) => {
  * @returns Filtered array of file paths
  */
 export const filterFiles = (files, config = {}) => {
-    const patterns = config.excludePatterns ?? DEFAULT_EXCLUDE_PATTERNS;
-    return files.filter((file) => !matchesExcludePattern(file, patterns));
+    const excludePatterns = config.excludePatterns ?? DEFAULT_EXCLUDE_PATTERNS;
+    const includePatterns = config.includePatterns ?? [];
+    return files.filter((file) => {
+        const isExcluded = matchesExcludePatternSet(file, excludePatterns);
+        if (!isExcluded) {
+            return true;
+        }
+        // `.gitignore` negations can re-include previously excluded files.
+        const isReIncluded = includePatterns.length > 0 && matchesIncludePatternSet(file, includePatterns);
+        return isReIncluded;
+    });
 };
 /**
  * Filter diff inputs by removing excluded files and their diffs.