phpstan-mcp-mx 0.23.0 → 0.25.0

package/dist/prune.js

@@ -0,0 +1,387 @@
+import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { dirname, join, normalize, resolve } from 'node:path';
+import { BaselineError, includedBaselineFiles, unquote } from './baseline.js';
+import { PhpstanError } from './phpstan.js';
+import { analyseUnmatched, readStaleInline, readStaleRule, unmatchedGeneralPattern } from './unmatched.js';
+/** Tekens die van een pad een fnmatch-patroon maken; zo'n pad bestaat nooit letterlijk. */
+const GLOB = /[*?[\]]/;
+/**
+ * Snoeit de baselines die de config includeert: entries die niets meer matchen gaan eruit,
+ * een te hoge `count` gaat omlaag naar wat nog voorkomt. Er komt nooit iets bij.
+ *
+ * Dat is het verschil met `generate_baseline`: die ruimt ook op, maar zet alles wat nu
+ * gemeld wordt erbij, en dan verdwijnt het uit elke volgende analyse. Opruimen en verstoppen
+ * horen twee handelingen te zijn.
+ *
+ * Geen verse baseline naast de oude leggen: zolang de oude geïncludeerd is, negeert PHPStan
+ * die fouten al, en een verse baseline zou dan bijna leeg zijn. PHPStans eigen
+ * `reportUnmatchedIgnoredErrors` zegt per entry wat er niet meer klopt; dat is dezelfde run
+ * als `unmatched_ignores`.
+ *
+ * Alles wat niet eenduidig terug te vinden is, blijft staan. Een fout in het koppelen laat
+ * dus hooguit een verouderde entry achter, en haalt nooit een entry weg die nog iets doet.
+ */
+export async function pruneBaseline(project, options = {}, analyse = analyseUnmatched) {
+    const files = includedBaselineFiles(project);
+    // Zonder config includeert includedBaselineFiles niets; dit dekt dus ook dat geval.
+    if (project.config === null || files.length === 0) {
+        return nothingIncluded(project, noBaselineReason(project));
+    }
+    const before = new Map(files.map((file) => [file, readParsed(project, file)]));
+    // Eerst de entries voor een bestand dat er niet meer is. Met reportUnmatchedIgnoredErrors
+    // aan weigert PHPStan de héle run op zo'n pad ("is neither a directory, nor a file path"),
+    // dus dit moet vóór de analyse op schijf staan. Een bestand dat er niet is, kan geen fout
+    // hebben: weghalen verbergt niets.
+    const missing = new Map();
+    for (const file of files) {
+        const parsed = before.get(file);
+        const dead = parsed.blocks.filter((block) => block.known && block.path !== null && !GLOB.test(block.path) && !existsSync(resolve(project.path, dirname(file), block.path)));
+        if (dead.length > 0) {
+            writeBaseline(project, file, applyEdits(parsed, new Set(dead), new Map()));
+            missing.set(file, dead.length);
+        }
+    }
+    let result;
+    try {
+        result = await analyse(project, project.config, options);
+    }
+    catch (error) {
+        throw withMissingNotice(error, missing);
+    }
+    requireComplete(result, missing);
+    const rules = [];
+    let currentFindings = 0;
+    let inline = 0;
+    for (const finding of result.findings) {
+        // Een inline ignore die niets meer doet, staat in de code: dat is niet aan deze tool, en
+        // ook geen huidige bevinding die de baseline zou kunnen verstoppen.
+        if (readStaleInline(finding) !== null) {
+            inline++;
+            continue;
+        }
+        const rule = readStaleRule(finding, project.path);
+        // Een count die te laag is, is geen verouderde regel: de fout komt vaker voor, en die
+        // extra keer is een bevinding. Verhogen zou hem verstoppen.
+        if (rule === null || rule.kind === 'countTooLow') {
+            currentFindings++;
+        }
+        else {
+            rules.push(rule);
+        }
+    }
+    const general = result.generalErrors.filter((error) => unmatchedGeneralPattern(error) !== null).length;
+    const perFile = [];
+    const claimed = new Set();
+    let unknownCount = 0;
+    // Opnieuw inlezen: het bestand kan hierboven al gesnoeid zijn, en de regelnummers van
+    // toen kloppen dan niet meer.
+    const current = new Map(files.map((file) => [file, readParsed(project, file)]));
+    const edits = new Map(files.map((file) => [file, { remove: new Set(), lower: new Map() }]));
+    for (const rule of rules) {
+        const found = findBlock(project, current, rule, claimed);
+        if (found === null) {
+            continue;
+        }
+        claimed.add(found.block);
+        const edit = edits.get(found.file);
+        // Alleen omlaag, en alleen naar een getal dat PHPStan zelf noemde.
+        if (rule.kind === 'unmatched') {
+            edit.remove.add(found.block);
+        }
+        else if (rule.occurred === null || found.block.countLine === null || rule.occurred >= found.block.count) {
+            unknownCount++;
+        }
+        else {
+            edit.lower.set(found.block, rule.occurred);
+        }
+    }
+    for (const file of files) {
+        const parsed = current.get(file);
+        const edit = edits.get(file);
+        if (edit.remove.size > 0 || edit.lower.size > 0) {
+            writeBaseline(project, file, applyEdits(parsed, edit.remove, edit.lower));
+        }
+        const original = before.get(file);
+        const errorsAfter = errorsIn(parsed) - sumCounts(edit.remove) - [...edit.lower].reduce((sum, [block, count]) => sum + block.count - count, 0);
+        perFile.push({
+            file,
+            removed: edit.remove.size + (missing.get(file) ?? 0),
+            lowered: edit.lower.size,
+            errorsBefore: errorsIn(original),
+            errorsAfter,
+        });
+    }
+    return {
+        project: project.path,
+        files: perFile,
+        totals: {
+            removed: perFile.reduce((sum, file) => sum + file.removed, 0),
+            lowered: perFile.reduce((sum, file) => sum + file.lowered, 0),
+            missingFiles: [...missing.values()].reduce((sum, count) => sum + count, 0),
+            errorsBefore: perFile.reduce((sum, file) => sum + file.errorsBefore, 0),
+            errorsAfter: perFile.reduce((sum, file) => sum + file.errorsAfter, 0),
+        },
+        left: { outsideBaseline: rules.length - claimed.size, general, unknownCount, inline },
+        currentFindings,
+        notices: [],
+    };
+}
+/**
+ * Leest een baseline in blokken, met regelnummers, zodat een wijziging alleen die blokken
+ * raakt en de rest van het bestand byte voor byte blijft staan. Regelgericht, net als
+ * `parseBaseline`: PHPStan genereert dit bestand, dus de vorm ligt vast.
+ */
+export function parseBaselineBlocks(content) {
+    const eol = content.includes('\r\n') ? '\r\n' : '\n';
+    const lines = content.split(/\r?\n/);
+    const listLine = lines.findIndex((line) => /^\s*ignoreErrors:\s*$/.test(line));
+    if (listLine === -1) {
+        return { lines, eol, listLine: null, blocks: [] };
+    }
+    const listIndent = indentOf(lines[listLine] ?? '');
+    const blocks = [];
+    let itemIndent = null;
+    let open = null;
+    let index = listLine + 1;
+    const close = (end) => {
+        if (open !== null) {
+            blocks.push(toBlock(open.start, end, open.known, open.fields));
+        }
+        open = null;
+    };
+    for (; index < lines.length; index++) {
+        const line = lines[index] ?? '';
+        const trimmed = line.trim();
+        if (trimmed === '') {
+            continue;
+        }
+        const indent = indentOf(line);
+        if (indent <= listIndent) {
+            break;
+        }
+        // Een nieuw lijstitem op dezelfde diepte als het eerste. `- message: …` op één regel
+        // maakt PHPStan niet; zo'n blok is een grens, maar wordt niet gelezen of aangeraakt.
+        if (trimmed.startsWith('-') && (itemIndent === null || indent === itemIndent)) {
+            itemIndent ??= indent;
+            close(index);
+            open = { start: index, known: trimmed === '-', fields: new Map() };
+            continue;
+        }
+        const field = /^(identifier|path|count|message|rawMessage):\s*(.*)$/.exec(trimmed);
+        if (open !== null && field?.[1] !== undefined) {
+            open.fields.set(field[1], { value: (field[2] ?? '').trim(), line: index });
+        }
+    }
+    close(index);
+    return { lines, eol, listLine, blocks };
+}
+/**
+ * Past de wijzigingen toe en geeft de nieuwe inhoud. Weghalen gaat per blok inclusief de
+ * lege regels erna; een lagere count vervangt alleen het getal op zijn eigen regel.
+ */
+export function applyEdits(parsed, remove, lower) {
+    const lines = [...parsed.lines];
+    for (const [block, count] of lower) {
+        if (block.countLine !== null) {
+            lines[block.countLine] = (lines[block.countLine] ?? '').replace(/count:\s*\d+/, `count: ${String(count)}`);
+        }
+    }
+    const dropped = new Set();
+    for (const block of remove) {
+        for (let line = block.start; line < block.end; line++) {
+            dropped.add(line);
+        }
+    }
+    // De laatste regel is leeg als het bestand op een regeleinde eindigt; die hoort bij het
+    // bestand en niet bij het laatste blok.
+    const last = lines.length - 1;
+    if (lines[last] === '') {
+        dropped.delete(last);
+    }
+    const kept = lines.filter((_, index) => !dropped.has(index));
+    // Alles weg: `ignoreErrors:` zonder lijst eronder is in NEON null, en daar valt PHPStan
+    // over. Een lege lijst is wat er dan bedoeld wordt.
+    if (parsed.listLine !== null && remove.size === parsed.blocks.length) {
+        const at = kept.indexOf(parsed.lines[parsed.listLine] ?? '');
+        if (at !== -1) {
+            kept[at] = (kept[at] ?? '').replace(/ignoreErrors:\s*$/, 'ignoreErrors: []');
+        }
+    }
+    return kept.join(parsed.eol);
+}
+/** Schrijft een overzicht van wat er gedaan is, als tekst voor het model. */
+export function renderPruned(result) {
+    const lines = [];
+    if (result.notices.length > 0) {
+        lines.push(...result.notices.map((notice) => `Note: ${notice}`), '');
+    }
+    const changed = result.files.filter((file) => file.removed > 0 || file.lowered > 0);
+    if (changed.length === 0) {
+        lines.push(result.files.length === 0
+            ? 'Nothing to prune.'
+            : `Nothing to prune: every entry in ${result.files.map((file) => file.file).join(', ')} still matches.`);
+    }
+    for (const file of changed) {
+        const delen = [`removed ${file.removed} ${file.removed === 1 ? 'entry' : 'entries'}`];
+        if (file.lowered > 0) {
+            delen.push(`lowered the count of ${file.lowered}`);
+        }
+        lines.push(`${file.file}: ${delen.join(', ')}; ${file.errorsBefore} → ${file.errorsAfter} ignored error(s).`);
+    }
+    if (result.totals.missingFiles > 0) {
+        lines.push(`${result.totals.missingFiles} of the removed entries named a file that no longer exists.`);
+    }
+    lines.push('', result.currentFindings > 0
+        ? `Nothing was added: the ${result.currentFindings} current finding(s) are still reported. Fix them at the ` +
+            'source; generate_baseline would hide them in the baseline.'
+        : 'Nothing was added, and there are no current findings.');
+    const { left } = result;
+    if (left.outsideBaseline + left.general + left.unknownCount + left.inline > 0) {
+        lines.push('', 'Left alone:');
+        if (left.outsideBaseline > 0) {
+            lines.push(`- ${left.outsideBaseline} stale rule(s) with a path that are not in an included baseline: they are in ignoreErrors of the config. Edit that yourself.`);
+        }
+        if (left.general > 0) {
+            lines.push(`- ${left.general} pattern(s) without a path: from ignoreErrors of a config, often one a package ships. A baseline change does nothing about them.`);
+        }
+        if (left.unknownCount > 0) {
+            lines.push(`- ${left.unknownCount} count(s) that are too high, where PHPStan did not say how often the error still occurs.`);
+        }
+        if (left.inline > 0) {
+            lines.push(`- ${left.inline} inline @phpstan-ignore comment(s) that no longer suppress anything: those are in the code. unmatched_ignores lists them.`);
+        }
+    }
+    return lines.join('\n');
+}
+function toBlock(start, end, known, fields) {
+    const value = (key) => {
+        const field = fields.get(key);
+        return field === undefined ? null : unquote(field.value);
+    };
+    const message = value('message');
+    const raw = value('rawMessage');
+    const count = fields.get('count');
+    return {
+        start,
+        end,
+        known,
+        path: value('path'),
+        identifier: value('identifier'),
+        // Zoals PHPStans IgnoredError::stringifyPattern het schrijft: `rawMessage` tussen dubbele
+        // quotes, zodat hij te koppelen is aan de melding over een verouderde regel.
+        pattern: message ?? (raw === null ? null : `"${raw}"`),
+        count: count === undefined ? 1 : Number.parseInt(count.value, 10) || 1,
+        countLine: count?.line ?? null,
+    };
+}
+/**
+ * Het blok dat bij een verouderde regel hoort, of null als het niet eenduidig te vinden is.
+ * Een blok wordt maar één keer gebruikt: twee gelijke entries leveren twee meldingen op.
+ */
+function findBlock(project, baselines, rule, claimed) {
+    for (const [file, parsed] of baselines) {
+        for (const block of parsed.blocks) {
+            if (!claimed.has(block) && matches(project, file, block, rule)) {
+                return { file, block };
+            }
+        }
+    }
+    return null;
+}
+function matches(project, file, block, rule) {
+    if (!block.known || block.path === null || !samePath(resolve(project.path, dirname(file), block.path), rule.file)) {
+        return false;
+    }
+    // Een regel met alleen een identifier noemt PHPStan bij die identifier, zonder haakjes.
+    if (block.pattern === null) {
+        return rule.identifier === null && rule.pattern === block.identifier;
+    }
+    return rule.pattern === block.pattern && rule.identifier === block.identifier;
+}
+function samePath(a, b) {
+    // Windows vergelijkt zonder hoofdletters, en PHPStan schrijft het pad zoals het die kreeg.
+    return process.platform === 'win32' ? normalize(a).toLowerCase() === normalize(b).toLowerCase() : normalize(a) === normalize(b);
+}
+/**
+ * Een onvolledige analyse laat entries verouderd lijken die dat niet zijn. Dan wordt er
+ * niets geschreven: liever niets snoeien dan een baseline half leeghalen omdat PHPStan
+ * halverwege klapte.
+ */
+function requireComplete(result, missing) {
+    const incomplete = result.warnings.find((warning) => /Result is incomplete/i.test(warning));
+    const errors = result.generalErrors.filter((error) => unmatchedGeneralPattern(error) === null);
+    if (incomplete === undefined && errors.length === 0) {
+        return;
+    }
+    const reason = incomplete ?? errors.slice(0, 3).join('\n');
+    throw withMissingNotice(new PhpstanError(`The analysis did not cover the whole project, so the baseline was not pruned: an entry can look stale ` +
+        `when PHPStan simply did not get that far.\n\n${reason}`, 'phpstan_failed'), missing);
+}
+/** Een fout na het weghalen van entries voor verdwenen bestanden: dat is dan wél gebeurd. */
+function withMissingNotice(error, missing) {
+    if (missing.size === 0 || !(error instanceof PhpstanError)) {
+        return error;
+    }
+    const wat = [...missing].map(([file, count]) => `${count} from ${file}`).join(', ');
+    return new PhpstanError(`${error.message}\n\nAlready removed before the analysis: the entries for files that no longer exist (${wat}).`, error.reason, error.details);
+}
+function readParsed(project, file) {
+    let content;
+    try {
+        content = readFileSync(join(project.path, file), 'utf8');
+    }
+    catch (error) {
+        throw new BaselineError(`${file} cannot be read: ${error instanceof Error ? error.message : String(error)}.`);
+    }
+    const parsed = parseBaselineBlocks(content);
+    // Hetzelfde onderscheid als bij baseline_summary: ignoreErrors noemen en niets opleveren is
+    // een vorm die we niet kennen, en daar wordt niet in geschreven.
+    if (parsed.blocks.filter((block) => block.known).length === 0 && parsed.blocks.length > 0) {
+        throw new BaselineError(`${file} contains ignoreErrors, but not a single entry could be read from it; it was not changed.`);
+    }
+    return parsed;
+}
+/**
+ * Via een tijdelijk bestand naast het origineel en een rename: een analyse die tegelijk
+ * leest, ziet het oude of het nieuwe bestand en nooit een half.
+ */
+function writeBaseline(project, file, content) {
+    const target = join(project.path, file);
+    const tmp = `${target}.phpstan-mcp-${String(process.pid)}`;
+    try {
+        writeFileSync(tmp, content);
+        renameSync(tmp, target);
+    }
+    catch (error) {
+        throw new BaselineError(`${file} could not be written: ${error instanceof Error ? error.message : String(error)}.`);
+    }
+}
+function nothingIncluded(project, notice) {
+    return {
+        project: project.path,
+        files: [],
+        totals: { removed: 0, lowered: 0, missingFiles: 0, errorsBefore: 0, errorsAfter: 0 },
+        left: { outsideBaseline: 0, general: 0, unknownCount: 0, inline: 0 },
+        currentFindings: 0,
+        notices: [notice],
+    };
+}
+function noBaselineReason(project) {
+    return project.config === null
+        ? `${project.path} has no phpstan.neon(.dist), so no baseline is included.`
+        : `The config of ${project.path} includes no phpstan-baseline*.neon from the project root; there is nothing to prune.`;
+}
+function errorsIn(parsed) {
+    return parsed.blocks.reduce((sum, block) => sum + block.count, 0);
+}
+function sumCounts(blocks) {
+    let sum = 0;
+    for (const block of blocks) {
+        sum += block.count;
+    }
+    return sum;
+}
+function indentOf(line) {
+    return /^\s*/.exec(line)?.[0].length ?? 0;
+}
+//# sourceMappingURL=prune.js.map

package/dist/prune.js.map

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

package/dist/tools/inspect.d.ts

@@ -12,7 +12,11 @@ export declare function registerServerConfig(server: McpServer, roots: RootSourc
 export declare function registerDiagnose(server: McpServer, roots: RootSource): void;
 /** Hangt `baseline_summary` aan de server: wat de baseline verbergt. */
 export declare function registerBaselineSummary(server: McpServer, roots: RootSource): void;
+/** Hangt `baseline_history` aan de server: hoe de baseline door de git-geschiedenis veranderde. */
+export declare function registerBaselineHistory(server: McpServer, roots: RootSource): void;
 /** Hangt `unmatched_ignores` aan de server: negeerregels die niets meer doen. */
 export declare function registerUnmatchedIgnores(server: McpServer, roots: RootSource): void;
 /** Hangt `inspect_type` aan de server: het type dat PHPStan op een regel afleidt. */
 export declare function registerInspectType(server: McpServer, roots: RootSource): void;
+/** Hangt `show_finding` aan de server: een bevinding met de code en de types eromheen. */
+export declare function registerShowFinding(server: McpServer, roots: RootSource): void;

package/dist/tools/inspect.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { baselineEntriesFor, renderBaseline, summariseBaseline } from '../baseline.js';
 import { GitError, countInlineIgnores } from '../changed.js';
+import { DEFAULT_HISTORY_LIMIT, MAX_HISTORY_LIMIT, baselineHistory, renderHistory } from '../history.js';
 import { diagnose, loadDefaultMemoryLimit, loadMaxParallel, serverInvocation } from '../phpstan.js';
 import { findMissingExtensions, readComposerScripts, renderComposerScripts, renderMissingExtensions } from '../composer.js';
 import { discoverProjects } from '../project.js';
@@ -12,6 +13,7 @@ import { DEFAULT_LIMIT, MAX_LIMIT } from '../report.js';
 import { loadTmpDirMode } from '../tmpdir.js';
 import { findUnmatchedIgnores, renderUnmatched } from '../unmatched.js';
 import { MAX_EXPRESSIONS, inspectType, renderTypes } from '../dumptype.js';
+import { DEFAULT_CONTEXT, MAX_CONTEXT, renderFinding, showFinding } from '../finding.js';
 import { renderParameters } from '../phpstan/parameters.js';
 import { VERSION } from '../version.js';
 import { common, configArgument, failure, log, nullable, projectArgument, readOnly, toFailure } from './shared.js';
@@ -447,7 +449,8 @@ function renderInlineIgnores({ inlineIgnores: inline, inlineIgnoresProblem: prob
     }
     const lines = [
         `${String(inline.total)} inline @phpstan-ignore comment(s) in ${String(inline.files)} file(s) counted in all PHP ` +
-            'files git knows, also outside the analysed paths. These are hidden too, and a new baseline does not touch them.',
+            'files git knows, also outside the analysed paths. These are hidden too, and a new baseline does not touch them. ' +
+            'unmatched_ignores says which of them no longer suppress anything.',
     ];
     if (inline.withoutIdentifier > 0) {
         lines.push(`${String(inline.withoutIdentifier)} have no identifier (@phpstan-ignore-line, -next-line): they ignore every error on their line.`);
@@ -474,13 +477,71 @@ function renderEntries(path, entries) {
         ...entries.map((entry) => `  ${String(entry.count).padStart(3)}  ${entry.identifier}${kort(entry.message)}`),
     ].join('\n');
 }
+/** Hangt `baseline_history` aan de server: hoe de baseline door de git-geschiedenis veranderde. */
+export function registerBaselineHistory(server, roots) {
+    const count = z.object({ entries: z.number(), errors: z.number().describe('Ignored errors; one entry can cover several') });
+    server.registerTool('baseline_history', {
+        title: 'Baseline history',
+        description: 'Shows how the included phpstan-baseline*.neon changed through the git history: per commit that touched ' +
+            'it, the number of ignored errors, the change against the previous version, and which identifiers grew or ' +
+            'shrank most. Answers whether a baseline is being paid off or is quietly growing, and which commit added a ' +
+            'pile. Follows the first-parent line of HEAD, so a merged branch is one change. Reads git only; does not ' +
+            'run PHPStan.',
+        inputSchema: {
+            project: projectArgument,
+            limit: z
+                .number()
+                .int()
+                .min(1)
+                .max(MAX_HISTORY_LIMIT)
+                .optional()
+                .describe(`How many changes per baseline file (default ${String(DEFAULT_HISTORY_LIMIT)})`),
+        },
+        outputSchema: {
+            project: z.string(),
+            files: z.array(z.object({
+                file: z.string(),
+                rows: z
+                    .array(z.object({
+                    commit: nullable(z.string()).describe('Null for the working copy, when it differs from the last commit'),
+                    date: nullable(z.string()).describe('Commit date, ISO 8601'),
+                    subject: nullable(z.string()),
+                    file: z.string().describe('The name of the baseline in that commit; differs when it was renamed later'),
+                    count: nullable(count).describe('Null if the baseline could not be read in that commit'),
+                    delta: nullable(count).describe('Against the row below; null if either could not be read'),
+                    changes: z
+                        .array(z.object({ identifier: z.string(), change: z.number() }))
+                        .describe('The identifiers that changed most, in ignored errors; positive means added'),
+                }))
+                    .describe('Newest first'),
+                start: nullable(count).describe('The baseline before the oldest row; zero when it was created there'),
+                olderCommits: z.boolean().describe('Whether older commits changed it too; a higher limit shows them'),
+            })),
+            notices: z.array(z.string()),
+        },
+        annotations: readOnly(),
+    }, async ({ project, limit }) => {
+        try {
+            const resolved = await roots.resolveProject(project);
+            const history = await baselineHistory(resolved, limit);
+            return {
+                content: [{ type: 'text', text: renderHistory(history) }],
+                structuredContent: { ...history },
+            };
+        }
+        catch (error) {
+            return toFailure(error);
+        }
+    });
+}
 /** Hangt `unmatched_ignores` aan de server: negeerregels die niets meer doen. */
 export function registerUnmatchedIgnores(server, roots) {
     server.registerTool('unmatched_ignores', {
         title: 'Find stale ignore rules',
         description: 'Runs a full analysis with reportUnmatchedIgnoredErrors enabled and returns the ' +
             'ignore rules that no longer match anything, or match less often than their count ' +
-            'from the baseline and from ignoreErrors in the config. Such a rule belongs to an ' +
+            'from the baseline and from ignoreErrors in the config, plus the inline @phpstan-ignore ' +
+            'comments that no longer suppress anything. Such a rule belongs to an ' +
             'error that has been fixed and can be removed. Does not change anything in the ' +
             'project: the temporary config lives outside it for a project with a runner, in ' +
             "that runner's temp directory.",
@@ -508,6 +569,8 @@ export function registerUnmatchedIgnores(server, roots) {
                 countTooHigh: z.number(),
                 inBaseline: z.number(),
                 general: z.number(),
+                inline: z.number().describe('Inline @phpstan-ignore comments in the code that no longer suppress anything'),
+                inlineWithoutIdentifier: z.number().describe('How many of those name no identifier: they ignore every error on their line'),
                 otherFindings: z
                     .number()
                     .describe('Regular findings from the same run; a new baseline would hide those too'),
@@ -525,12 +588,19 @@ export function registerUnmatchedIgnores(server, roots) {
             general: z
                 .array(z.string())
                 .describe('Patterns without a path that no longer match anything; these are not in the baseline'),
+            inline: z
+                .array(z.object({
+                path: z.string().describe('Path relative to the project root'),
+                line: nullable(z.number()).describe('The line the ignore applies to; for a comment on a line of its own, the line below it'),
+                identifier: nullable(z.string()).describe('The identifier that no longer occurs there; null for an ignore without identifier'),
+            }))
+                .describe('Inline @phpstan-ignore comments that no longer suppress anything; these are in the code, not in a baseline'),
             generalErrors: z.array(z.string()),
             warnings: z
                 .array(z.string())
                 .describe('If this contains "Result is incomplete", PHPStan may have missed stale rules'),
             notices: z.array(z.string()),
-            omitted: z.object({ general: z.number(), generalErrors: z.number(), warnings: z.number() }),
+            omitted: z.object({ general: z.number(), inline: z.number(), generalErrors: z.number(), warnings: z.number() }),
             page: z.object({
                 offset: z.number(),
                 limit: z.number(),
@@ -555,6 +625,7 @@ export function registerUnmatchedIgnores(server, roots) {
                 project: resolved.path,
                 stale: report.totals.unmatched + report.totals.countTooHigh,
                 general: report.totals.general,
+                inline: report.totals.inline,
                 durationMs: Date.now() - begin,
             });
             return {
@@ -641,4 +712,65 @@ export function registerInspectType(server, roots) {
         }
     });
 }
+/** Hangt `show_finding` aan de server: een bevinding met de code en de types eromheen. */
+export function registerShowFinding(server, roots) {
+    server.registerTool('show_finding', {
+        title: 'Show finding in context',
+        description: 'Shows the code around one line of a PHP file, what PHPStan reports on that line, and the types PHPStan ' +
+            'infers right before it for the variables and properties used there. For looking at a finding from ' +
+            'analyse_project, analyse_file or analyse_changed when you cannot open the file yourself. Does not change ' +
+            'the project: the types come from a temporary copy, like inspect_type. On a line without variables, ' +
+            'PHPStan is not started and only the code is shown.',
+        inputSchema: {
+            project: projectArgument,
+            path: z.string().describe('PHP file inside the project, as the finding names it'),
+            line: z.number().int().min(1).describe('The line of the finding'),
+            context: z
+                .number()
+                .int()
+                .min(0)
+                .max(MAX_CONTEXT)
+                .optional()
+                .describe(`Lines of code before and after it (default ${String(DEFAULT_CONTEXT)})`),
+            expressions: z
+                .array(z.string())
+                .min(1)
+                .max(MAX_EXPRESSIONS)
+                .optional()
+                .describe('Expressions to show the type of instead of the variables on the line'),
+            config: configArgument,
+            memoryLimit: z.string().optional(),
+            timeoutSeconds: z.number().int().positive().max(1800).optional(),
+        },
+        outputSchema: {
+            project: z.string(),
+            file: z.string().describe('Path relative to the project root'),
+            line: z.number(),
+            code: z.array(z.object({ number: z.number(), text: z.string() })).describe('The lines around it, with their numbers'),
+            findings: nullable(z.array(z.object({ message: z.string(), identifier: nullable(z.string()), tip: nullable(z.string()) }))).describe('What PHPStan reports on this line; null if PHPStan was not started or could not read the copy'),
+            types: z.array(z.object({
+                expression: z.string(),
+                type: nullable(z.string()).describe('As PHPStan infers it; null if PHPStan reported none'),
+                problems: z.array(z.object({ identifier: nullable(z.string()), message: z.string() })),
+            })),
+            typesProblem: nullable(z.string()).describe('Why there are no types; null when there are'),
+            parseErrors: z.array(z.object({ line: nullable(z.number()), inserted: z.boolean(), message: z.string() })),
+            generalErrors: z.array(z.string()),
+            warnings: z.array(z.string()),
+        },
+        annotations: readOnly(),
+    }, async (args, extra) => {
+        try {
+            const resolved = await roots.resolveProject(args.project);
+            const view = await showFinding(resolved, { path: args.path, line: args.line, context: args.context, expressions: args.expressions }, { ...common(resolved, args), signal: extra.signal });
+            return {
+                content: [{ type: 'text', text: renderFinding(view) }],
+                structuredContent: { ...view },
+            };
+        }
+        catch (error) {
+            return toFailure(error);
+        }
+    });
+}
 //# sourceMappingURL=inspect.js.map