ucn 5.4.0 → 5.4.2

package/core/check.js

@@ -73,6 +73,11 @@ function check(index, options = {}) {
     const modified = (dr && Array.isArray(dr.functions)) ? dr.functions : [];
     const added    = (dr && Array.isArray(dr.newFunctions)) ? dr.newFunctions : [];
     const deleted  = (dr && Array.isArray(dr.deletedFunctions)) ? dr.deletedFunctions : [];
+    const declarations = [
+        ...(dr?.symbols || []).map(s => ({ ...s, _kind: 'modified', _nonCallable: true })),
+        ...(dr?.newSymbols || []).map(s => ({ ...s, _kind: 'added', _nonCallable: true })),
+        ...(dr?.deletedSymbols || []).map(s => ({ ...s, _kind: 'deleted', _nonCallable: true })),
+    ];
     const pathCounts = {
         changedPaths: dr?.changedPaths || 0,
         nonSourcePaths: dr?.nonSourcePaths || 0,
@@ -82,9 +87,10 @@ function check(index, options = {}) {
     const allChanged = [
         ...modified.map(f => ({ ...f, _kind: 'modified' })),
         ...added.map(f => ({ ...f, _kind: 'added' })),
+        ...declarations,
     ];
 
-    if (!dr || (modified.length === 0 && added.length === 0 && deleted.length === 0)) {
+    if (!dr || (allChanged.length === 0 && deleted.length === 0)) {
         // fix #283: say what the diff actually contained. "no changes
         // detected" with three changed files reads as a false negative in a
         // pre-commit hook — the truth is the changes are outside what the
@@ -95,7 +101,7 @@ function check(index, options = {}) {
         if (changedPaths > 0 && nonSourcePaths === changedPaths) {
             reason = `${changedPaths} changed path(s), all outside supported source files; untracked source files are included`;
         } else if (changedPaths > 0) {
-            reason = 'no callable-symbol changes in the diff or untracked source files';
+            reason = 'no indexed-symbol changes in the diff or untracked source files';
         }
         return {
             base: options.base || 'HEAD',
@@ -116,9 +122,23 @@ function check(index, options = {}) {
     // For each changed function, run verify and gather caller summary
     for (const fn of changed) {
         const filePath = fn.relativePath || fn.file || '';
+        if (fn._nonCallable) {
+            const dependency = fn.impact?.typeReferences || fn.impact?.propertyAccesses;
+            items.push({
+                name: fn.name, file: filePath, line: fn.startLine, kind: fn._kind,
+                symbolType: fn.type, requiresToolchainValidation: true,
+                callerCount: fn.impact?.totalCallSites || 0,
+                unverifiedCallerCount: fn.impact?.unverifiedSites?.length || 0,
+                dependencyCount: dependency?.confirmedCount || 0,
+                unverifiedDependencyCount: (dependency?.unverifiedCount || 0) + (fn.remainingReferences?.length || 0),
+                signatureMismatches: 0,
+                account: summarizeAccount(fn.impact?.account),
+            });
+            continue;
+        }
         let verifyResult;
         try {
-            verifyResult = index.verify(fn.name, { file: filePath });
+            verifyResult = index.verify(fn.name, { file: filePath, line: fn.startLine });
         } catch (e) {
             verifyResult = null;
         }
@@ -225,6 +245,13 @@ function check(index, options = {}) {
     // Action items
     const actions = [];
     for (const it of items) {
+        if (it.requiresToolchainValidation) {
+            actions.push({
+                severity: it.kind === 'added' ? 'warn' : 'error',
+                kind: 'declaration_change',
+                message: `${it.name}: ${it.kind} ${it.symbolType}; shape/inheritance compatibility is not checked by arity analysis — review dependency sites and run the compiler/type checker and tests`,
+            });
+        }
         if (!it.account || !it.account.textComplete) {
             actions.push({
                 severity: 'error',
@@ -272,7 +299,7 @@ function check(index, options = {}) {
         actions.push({
             severity: 'error',
             kind: 'truncated_change_set',
-            message: `${allChanged.length - limit} changed function(s) were not checked; rerun without --limit`,
+            message: `${allChanged.length - limit} changed symbol(s) were not checked; rerun without --limit`,
         });
     }
     if (testFiles.length > 0) {
@@ -289,9 +316,10 @@ function check(index, options = {}) {
     const signatureMismatches = items.reduce((sum, it) => sum + (it.signatureMismatches || 0), 0);
     const filteredEdges = items.reduce((sum, it) => sum + (it.account ? it.account.filtered || 0 : 0), 0);
     const usageReviewSymbols = items.filter(it => it.account && it.account.requiresUsageReview).length;
+    const unvalidatedDeclarations = items.filter(it => it.requiresToolchainValidation && it.kind !== 'added').length;
     const reviewRequired = incompleteAccounts > 0 || unverifiedCallSites > 0 ||
         signatureMismatches > 0 || filteredEdges > 0 || usageReviewSymbols > 0 ||
-        actions.some(a => a.kind === 'orphan_new') ||
+        actions.some(a => a.kind === 'orphan_new' || a.kind === 'declaration_change') ||
         !!(limit && allChanged.length > limit);
 
     return {
@@ -308,7 +336,7 @@ function check(index, options = {}) {
         totalTests: testCount,
         actions,
         trust: {
-            status: incompleteAccounts > 0 || signatureMismatches > 0
+            status: incompleteAccounts > 0 || signatureMismatches > 0 || unvalidatedDeclarations > 0
                 ? 'BLOCKED'
                 : reviewRequired ? 'REVIEW_REQUIRED' : 'READY_FOR_TOOLCHAIN',
             accountsChecked: items.filter(it => it.account && it.account.available).length,
@@ -317,6 +345,7 @@ function check(index, options = {}) {
             signatureMismatches,
             filteredEdges,
             usageReviewSymbols,
+            unvalidatedDeclarations,
             semanticComplete: false,
             safeToDelete: false,
             requiresCompilerAndTests: true,

package/core/command-contracts.js

@@ -301,7 +301,7 @@ const COMMAND_CONTRACTS = Object.freeze({
             { name: 'bridge', when: '`bridge=true`.', answer: 'Exact/parameterized route-request matches plus unmatched sides.' },
             { name: 'unmatched', when: '`unmatched=true`.', answer: 'Only unmatched supported boundaries.' },
         ],
-        defaults: ['Framework-specific static extraction.', 'Interpolated-path uncertainty remains visible unless hidden explicitly.'],
+        defaults: ['Framework-specific static extraction.', 'Test routes/requests are labeled; excludeTests=true hides them and in scopes a directory.', 'Interpolated-path uncertainty remains visible unless hidden explicitly.'],
         truth: 'Findings are static matches for supported framework call/decorator shapes; bridge confidence is match quality, not runtime probability.',
         nonGoals: ['Network discovery.', 'Frameworks not represented by an endpoint adapter.'],
         invalidCombinations: ['`serverOnly` and `clientOnly` cannot both describe a useful result.'],

package/core/execute.js

@@ -1796,6 +1796,8 @@ const HANDLERS = {
             method: normMethod,
             prefix: p.prefix || null,
             showUncertain: !p.hideUncertain,
+            in: p.in,
+            excludeTests: !!p.excludeTests,
         });
         if (p.framework != null && String(p.framework).trim() !== '') {
             const framework = String(p.framework).trim().toLowerCase();
@@ -1859,6 +1861,7 @@ const HANDLERS = {
         // Recompute meta after filtering
         result.meta = {
             totalRoutes: result.routes.length,
+            testRoutes: result.routes.filter(r => r.isTest).length,
             totalRequests: result.requests.length,
             uncertainRequests: (result.uncertainRequests || []).length,
             totalBridges: result.bridges.length,
@@ -2286,7 +2289,7 @@ const HANDLERS = {
         const limit = num(p.limit, undefined);
         let note;
         if (limit && limit > 0 && result) {
-            const groups = ['functions', 'moduleLevelChanges', 'newFunctions', 'deletedFunctions'];
+            const groups = ['functions', 'symbols', 'newSymbols', 'deletedSymbols', 'moduleLevelChanges', 'newFunctions', 'deletedFunctions'];
             const total = groups.reduce((sum, key) => sum + (result[key]?.length || 0), 0);
             if (total > limit) {
                 let remaining = limit;

package/core/output/analysis-ext.js

@@ -204,12 +204,18 @@ function formatDiffImpact(result, options = {}) {
 
     const s = result.summary || {};
     const parts = [];
-    if (s.modifiedFunctions > 0) parts.push(`${s.modifiedFunctions} modified`);
-    if (s.deletedFunctions > 0) parts.push(`${s.deletedFunctions} deleted`);
-    if (s.newFunctions > 0) parts.push(`${s.newFunctions} new`);
+    for (const [label, suffix] of [['Functions', 'Functions'], ['Declarations', 'Symbols']]) {
+        const counts = ['modified', 'new', 'deleted']
+            .filter(kind => s[kind + suffix] > 0)
+            .map(kind => `${s[kind + suffix]} ${kind}`);
+        if (counts.length) parts.push(`${label}: ${counts.join(', ')}`);
+    }
     parts.push(`${s.totalCallSites || 0} call sites across ${s.affectedFiles || 0} files`);
     if (s.unverifiedCallSites > 0) parts.push(`${s.unverifiedCallSites} unverified`);
-    lines.push(parts.join(', '));
+    if (s.totalDependencySites || s.unverifiedDependencySites) {
+        parts.push(`${s.totalDependencySites || 0} confirmed + ${s.unverifiedDependencySites || 0} unverified non-call dependency sites across ${s.dependencyFiles || 0} files`);
+    }
+    lines.push(parts.join('; '));
     // fix #283: changed paths outside supported source are invisible to the
     // symbol analysis — disclose instead of silently narrowing the diff.
     if (result.nonSourcePaths > 0) {
@@ -229,10 +235,10 @@ function formatDiffImpact(result, options = {}) {
             lines.push(`  ${fn.relativePath}:${fn.startLine}`);
             lines.push(`  ${fn.signature}`);
             if (fn.addedLines.length > 0) {
-                lines.push(`  Lines added: ${formatLineRanges(fn.addedLines)}`);
+                lines.push(`  Added at lines: ${formatLineRanges(fn.addedLines)}`);
             }
             if (fn.deletedLines.length > 0) {
-                lines.push(`  Lines deleted: ${formatLineRanges(fn.deletedLines)}`);
+                lines.push(`  Deleted at old lines: ${formatLineRanges(fn.deletedLines)}`);
             }
 
             if (fn.callers.length > 0) {
@@ -302,6 +308,24 @@ function formatDiffImpact(result, options = {}) {
         }
     }
 
+    for (const [key, title] of [['symbols', 'MODIFIED'], ['newSymbols', 'NEW'], ['deletedSymbols', 'DELETED']]) {
+        if (!result[key]?.length) continue;
+        lines.push(`\n${title} DECLARATIONS:`);
+        for (const symbol of result[key]) {
+            lines.push(`  ${symbol.type} ${symbol.name} — ${symbol.relativePath}:${symbol.startLine}`);
+            if (symbol.impact) {
+                lines.push(require('./analysis').formatImpact(symbol.impact, { compact: true }));
+            } else {
+                const refs = symbol.remainingReferences || [];
+                lines.push(`  Remaining name references: ${refs.length} unverified (deleted target)`);
+                for (const site of refs.slice(0, MAX_CALLERS_PER_FN)) {
+                    lines.push(`    ${site.file}:${site.line}: ${site.expression}`);
+                }
+                if (refs.length > MAX_CALLERS_PER_FN) lines.push(`    (+${refs.length - MAX_CALLERS_PER_FN} more)`);
+            }
+        }
+    }
+
     // Module-level changes
     if (result.moduleLevelChanges.length > 0) {
         lines.push('\nMODULE-LEVEL CHANGES:');

package/core/output/analysis.js

@@ -837,8 +837,10 @@ function formatImpact(impact, options = {}) {
     }
 
     // By file (confirmed tier)
-    if (!compact) lines.push('');
-    lines.push('BY FILE:');
+    if (impact.byFile.length > 0) {
+        if (!compact) lines.push('');
+        lines.push('BY FILE:');
+    }
 
     // Evidence aggregate over ALL sites (replaces per-edge confidence lines)
     const allSites = impact.byFile.flatMap(g => g.sites);
@@ -881,7 +883,7 @@ function formatImpact(impact, options = {}) {
             for (const site of group.sites) {
                 const caller = site.callerName ? ` [${site.callerName}]` : '';
                 const expr = site.expression ? `: ${site.expression.replace(/\s+/g, ' ').slice(0, 100)}` : '';
-                lines.push(`  ${group.file}:${site.line}${caller}${expr}`);
+                lines.push(`  ${group.file}:${site.line}${caller} [${site.accessKind || 'access'}${Number.isInteger(site.column) ? `, column ${site.column + 1}` : ''}]${expr}`);
             }
         }
         if (access.unverifiedSites.length > 0) {
@@ -889,7 +891,7 @@ function formatImpact(impact, options = {}) {
             for (const site of access.unverifiedSites.slice(0, 10)) {
                 const caller = site.callerName ? ` [${site.callerName}]` : '';
                 const expr = site.expression ? `: ${site.expression.replace(/\s+/g, ' ').slice(0, 100)}` : '';
-                lines.push(`  ${site.file}:${site.line}${caller}${expr}`);
+                lines.push(`  ${site.file}:${site.line}${caller} [${site.accessKind || 'access'}${Number.isInteger(site.column) ? `, column ${site.column + 1}` : ''}]${expr}`);
             }
             if (access.unverifiedSites.length > 10) {
                 lines.push(`  (+${access.unverifiedSites.length - 10} more unverified)`);

package/core/output/check.js

@@ -29,15 +29,17 @@ function formatCheck(result) {
         if (result.trust.signatureMismatches) trustDetails.push(`${result.trust.signatureMismatches} signature mismatch(es)`);
         if (result.trust.filteredEdges) trustDetails.push(`${result.trust.filteredEdges} filtered edge(s)`);
         if (result.trust.usageReviewSymbols) trustDetails.push(`${result.trust.usageReviewSymbols} symbol(s) need usages review`);
+        if (result.trust.unvalidatedDeclarations) trustDetails.push(`${result.trust.unvalidatedDeclarations} declaration change(s) need toolchain validation`);
         if (trustDetails.length > 0) lines.push(`  ${trustDetails.join(' · ')}`);
     }
 
     // Changed functions section
     const items = result.changed || [];
+    const noun = items.some(it => it.symbolType) ? 'symbol' : 'function';
     if (result.truncated) {
-        lines.push(`Changed: ${items.length} of ${result.totalChanged} functions`);
+        lines.push(`Changed: ${items.length} of ${result.totalChanged} ${noun}s`);
     } else {
-        lines.push(`Changed: ${items.length} function${items.length === 1 ? '' : 's'}`);
+        lines.push(`Changed: ${items.length} ${noun}${items.length === 1 ? '' : 's'}`);
     }
     if (items.length === 0) {
         lines.push('  (none — only non-function changes)');
@@ -47,6 +49,7 @@ function formatCheck(result) {
             if (it.kind && it.kind !== 'changed') tags.push(it.kind.toUpperCase());
             if (it.signatureMismatches > 0) tags.push(`SIG-DRIFT(${it.signatureMismatches})`);
             if (it.orphan) tags.push('ORPHAN');
+            if (it.symbolType) tags.push(it.symbolType);
             if (it.account && !it.account.textComplete) tags.push('ACCOUNT-INCOMPLETE');
             const tagStr = tags.length ? ' [' + tags.join(', ') + ']' : '';
             let callers = it.callerCount != null ? `${it.callerCount} caller${it.callerCount === 1 ? '' : 's'}` : '';
@@ -54,6 +57,7 @@ function formatCheck(result) {
                 callers += ` (+${it.unverifiedCallerCount} unverified)`;
             }
             lines.push(`  ${it.name} (${it.file}:${it.line})${tagStr}  ${callers}`);
+            if (it.symbolType) lines.push(`    Dependencies: ${it.dependencyCount || 0} confirmed, ${it.unverifiedDependencyCount || 0} unverified`);
             if (it.mismatches && it.mismatches.length > 0) {
                 for (const m of it.mismatches.slice(0, 3)) {
                     const where = m.file ? ` at ${m.file}:${m.line}` : '';

package/core/output/endpoints.js

@@ -55,7 +55,7 @@ function formatUncertainRequests(result, options) {
     lines.push(`Possible client requests (${list.length}) — request-shaped call with a path literal, receiver not recognized as an HTTP client:`);
     const cap = options.all ? Infinity : 10;
     for (const r of list.slice(0, cap)) {
-        lines.push(`  ${r.file}:${r.line} ${r.receiver}.${r.method}(${JSON.stringify(r.path)}) in ${r.callerName}`);
+        lines.push(`  ${r.file}:${r.line} ${r.receiver}.${r.method}(${JSON.stringify(r.path)}) in ${r.callerName}${r.isTest ? ' [test]' : ''}`);
     }
     if (list.length > cap) lines.push(`  (+${list.length - cap} more — use --all)`);
     return lines;
@@ -88,7 +88,7 @@ function formatRoutesAndRequests(routes, requests, meta, options, advisory = nul
                 for (const r of list) {
                     const handler = r.handler || '<anonymous>';
                     const fw = r.framework ? `[${r.framework}]` : '';
-                    lines.push(`  ${pad(r.method, 7)} ${pad(r.path, 40)} → ${handler} ${fw} :${r.line}`);
+                    lines.push(`  ${pad(r.method, 7)} ${pad(r.path, 40)} → ${handler} ${fw}${r.isTest ? ' [test]' : ''} :${r.line}`);
                 }
                 lines.push('');
             }
@@ -115,7 +115,7 @@ function formatRoutesAndRequests(routes, requests, meta, options, advisory = nul
                     const inferred = r.methodInferred ? '?' : '';
                     const interp = r.interp ? ' (interp)' : '';
                     const fw = r.framework ? `[${r.framework}]` : '';
-                    lines.push(`  ${pad(r.method + inferred, 7)} ${pad(r.path + interp, 40)} from ${r.callerName} ${fw} :${r.line}`);
+                    lines.push(`  ${pad(r.method + inferred, 7)} ${pad(r.path + interp, 40)} from ${r.callerName} ${fw}${r.isTest ? ' [test]' : ''} :${r.line}`);
                 }
                 lines.push('');
             }
@@ -166,12 +166,12 @@ function formatBridges(bridges, unmatchedRoutes, unmatchedRequests, meta, option
 
         lines.push(`Matched (${sorted.length} routes):`);
         for (const { route, clients } of sorted) {
-            lines.push(`  ${pad(route.method, 7)} ${route.path}  [${route.framework}]  ${route.file}:${route.line}`);
+            lines.push(`  ${pad(route.method, 7)} ${route.path}  [${route.framework}]${route.isTest ? ' [test]' : ''}  ${route.file}:${route.line}`);
             for (const b of clients) {
                 const conf = b.confidence.toFixed(2);
                 const tier = b.matchType.toUpperCase();
                 const inf = b.methodInferred ? ' method?' : '';
-                lines.push(`    ↔ ${pad(b.request.method + inf, 9)} ${pad(b.request.path, 30)}  ${tier} (${conf})  from ${b.request.callerName}  ${b.request.file}:${b.request.line}`);
+                lines.push(`    ↔ ${pad(b.request.method + inf, 9)} ${pad(b.request.path, 30)}  ${tier} (${conf})  from ${b.request.callerName}${b.request.isTest ? ' [test]' : ''}  ${b.request.file}:${b.request.line}`);
             }
             lines.push('');
         }
@@ -180,7 +180,7 @@ function formatBridges(bridges, unmatchedRoutes, unmatchedRequests, meta, option
     if (unmatchedRoutes.length > 0) {
         lines.push(`Unmatched server routes (${unmatchedRoutes.length}):`);
         for (const r of unmatchedRoutes) {
-            lines.push(`  ${pad(r.method, 7)} ${pad(r.path, 40)} → ${r.handler}  [${r.framework}]  ${r.file}:${r.line}`);
+            lines.push(`  ${pad(r.method, 7)} ${pad(r.path, 40)} → ${r.handler}  [${r.framework}]${r.isTest ? ' [test]' : ''}  ${r.file}:${r.line}`);
         }
         lines.push('');
     }
@@ -190,7 +190,7 @@ function formatBridges(bridges, unmatchedRoutes, unmatchedRequests, meta, option
         for (const r of unmatchedRequests) {
             const inferred = r.methodInferred ? '?' : '';
             const interp = r.interp ? ' (interp)' : '';
-            lines.push(`  ${pad(r.method + inferred, 7)} ${pad(r.path + interp, 40)} from ${r.callerName}  [${r.framework}]  ${r.file}:${r.line}`);
+            lines.push(`  ${pad(r.method + inferred, 7)} ${pad(r.path + interp, 40)} from ${r.callerName}  [${r.framework}]${r.isTest ? ' [test]' : ''}  ${r.file}:${r.line}`);
         }
     }
 
@@ -213,6 +213,7 @@ function formatEndpointsJson(result, options = {}) {
         file: r.file,
         line: r.line,
         framework: r.framework,
+        isTest: !!r.isTest,
         ...(r.classPrefix && { classPrefix: r.classPrefix }),
     });
     const trimReq = (r) => ({
@@ -225,6 +226,7 @@ function formatEndpointsJson(result, options = {}) {
         callerName: r.callerName,
         ...(r.callerStartLine && { callerStartLine: r.callerStartLine }),
         framework: r.framework,
+        isTest: !!r.isTest,
         ...(r.methodInferred && { methodInferred: true }),
     });
     const trimBridge = (b) => ({
@@ -250,6 +252,7 @@ function formatEndpointsJson(result, options = {}) {
             uncertainRequests: (result.uncertainRequests || []).map(r => ({
                 receiver: r.receiver, method: r.method, path: r.path,
                 file: r.file, line: r.line, callerName: r.callerName, reason: r.reason,
+                isTest: !!r.isTest,
             })),
             // In unmatched-only mode, the matched bridges array is suppressed
             // — consumers that want both should not pass --unmatched.

package/core/output/find.js

@@ -158,10 +158,13 @@ function formatFindDetailed(symbols, query, options = {}) {
         const confStr = confidence.level !== 'high' ? ` [${confidence.level}]` : '';
         const handle = formatSymbolHandle(s);
         const loc = handle || (s.relativePath + ':' + s.startLine);
+        const nameLocation = s.nameLine && s.nameLine !== s.startLine
+            ? `name token at ${s.relativePath || s.file}:${s.nameLine}` : '';
 
         if (compact) {
             // One line per result: "<handle>  <sig>  <usages?>  <doc snippet?>"
             const parts = [`${loc}  ${sig}${confStr}`];
+            if (nameLocation) parts.push(`[${nameLocation}]`);
             if (s.usageCounts !== undefined && s.usageCounts.total > 0) {
                 const scope = sameNameDefinitionCounts.get(s.name) > 1 ? ' name-wide' : '';
                 const label = s.usageCounts.complete === false
@@ -186,6 +189,7 @@ function formatFindDetailed(symbols, query, options = {}) {
         }
 
         lines.push(`${loc}  ${sig}${confStr}`);
+        if (nameLocation) lines.push(`  ${nameLocation} (handle starts at declaration line ${s.startLine})`);
         if (s.docstring) {
             const snip = firstSentenceShort(s.docstring);
             if (snip) lines.push(`  "${snip}"`);

package/core/output/lines.js

@@ -64,22 +64,39 @@ function accountComments(account) {
 
 function findRecords(result) {
     const out = [];
+    const notes = [];
     if (Array.isArray(result)) {
-        for (const symbol of result) out.push(record(pathOf(symbol), symbol.startLine, signatureOf(symbol), symbol.type));
+        for (const symbol of result) {
+            out.push(record(pathOf(symbol), symbol.startLine, signatureOf(symbol), symbol.type));
+            if (symbol.nameLine && symbol.nameLine !== symbol.startLine) {
+                notes.push(`# ${record(pathOf(symbol), symbol.startLine, symbol.name)} starts at the declaration; name token at line ${symbol.nameLine} (usages reports the token line).`);
+            }
+        }
     } else if (result && Array.isArray(result.types)) {
         for (const type of result.types) {
             out.push(record(pathOf(type), type.startLine ?? type.line, type.name, type.type || type.kind));
         }
     }
-    return { records: out, notes: [] };
+    return { records: out, notes };
 }
 
 function usagesRecords(result) {
     const out = [];
     const notes = [];
+    const byLine = new Map();
     for (const usage of Array.isArray(result) ? result : []) {
         const kind = usage.isDefinition ? 'definition' : (usage.usageType || 'reference');
-        out.push(record(pathOf(usage), usage.line, usage.content, kind === 'call' ? '' : kind));
+        const key = `${pathOf(usage)}\0${usage.line}`;
+        if (!byLine.has(key)) byLine.set(key, { usage, kinds: new Set(), count: 0 });
+        const row = byLine.get(key);
+        row.kinds.add(kind);
+        row.count++;
+    }
+    for (const { usage, kinds, count } of byLine.values()) {
+        const tags = [...kinds].filter(kind => kind !== 'call');
+        if (kinds.has('call') && tags.length) tags.unshift('call');
+        if (count > 1) tags.push(`${count} occurrences`);
+        out.push(record(pathOf(usage), usage.line, usage.content, tags.join('; ')));
     }
     const counts = result && result.summaryCounts;
     if (counts && counts.hiddenTestUsages > 0) {
@@ -187,6 +204,17 @@ function impactRecords(result) {
                 out.push(record(pathOf(site), site.line, site.content, 'unverified: deleted-target-name-match'));
             }
         }
+        for (const symbol of [...(result.symbols || []), ...(result.newSymbols || []), ...(result.deletedSymbols || [])]) {
+            out.push(record(symbol.relativePath, symbol.startLine, symbol.name, `${symbol.type} declaration change`));
+            if (symbol.impact) {
+                const nested = impactRecords(symbol.impact);
+                out.push(...nested.records);
+                notes.push(...nested.notes);
+            }
+            for (const site of symbol.remainingReferences || []) {
+                out.push(record(site.file, site.line, site.expression, 'unverified: deleted-target-name-match'));
+            }
+        }
         const summary = result.summary || {};
         notes.push(`# Diff: ${summary.modifiedFunctions || 0} modified, ${summary.newFunctions || 0} new, ${summary.deletedFunctions || 0} deleted functions; ${(result.moduleLevelChanges || []).length} file(s) with module-level changes.`);
         if (result.nonSourcePaths) notes.push(`# ${result.nonSourcePaths} changed path(s) outside supported source files not analyzed.`);
@@ -206,11 +234,11 @@ function impactRecords(result) {
         const accesses = result.propertyAccesses;
         for (const group of accesses.byFile || []) {
             for (const access of group.sites || []) {
-                out.push(record(group.file, access.line, access.expression, 'property-access'));
+                out.push(record(group.file, access.line, access.expression, `property-access: ${access.accessKind || 'access'}${Number.isInteger(access.column) ? `, column ${access.column + 1}` : ''}`));
             }
         }
         for (const access of accesses.unverifiedSites || []) {
-            out.push(record(pathOf(access), access.line, access.expression, `${unverifiedTag(access)}; property-access`));
+            out.push(record(pathOf(access), access.line, access.expression, `${unverifiedTag(access)}; property-access: ${access.accessKind || 'access'}${Number.isInteger(access.column) ? `, column ${access.column + 1}` : ''}`));
         }
         notes.push(`# PROPERTY ACCESS SITES: ${accesses.confirmedCount} confirmed, ${accesses.unverifiedCount} unverified, ${accesses.excluded?.total || 0} other-target (separate from caller ACCOUNT).`);
     }

package/core/output/reporting.js

@@ -284,7 +284,7 @@ function formatDeadcode(results, options = {}) {
         lines.push(`\n${extHint}`);
     }
     if (results.excludedRuntimeContract > 0) {
-        lines.push(`\n${results.excludedRuntimeContract} Java serialization callback(s) hidden (JVM runtime contract, not dead).`);
+        lines.push(`\n${results.excludedRuntimeContract} runtime callback(s) hidden (language/runtime registrations, not dead).`);
     }
     if (results.pythonImplicitExportFiles > 0) {
         lines.push(`\nPython public-surface rule active in ${results.pythonImplicitExportFiles} file(s) without __all__: top-level non-underscore names are treated as externally reachable.`);

package/core/output-budget.js

@@ -15,7 +15,7 @@ const BROAD_COMMANDS = new Set([
     ...[...BROAD_CANONICAL].map(toMcpName),
 ]);
 
-const CONTRACT_LINE_RE = /^\s*(?:(?:Summary|ACCOUNT|CONTRACT|WARNING|FILTERED|CALLEE ACCOUNT|TREE ACCOUNT):|\d+ test-file usage\(s\) hidden\b|(?:Note:\s*)?Found \d+ (?:definitions|fuzzy matches)\b)/;
+const CONTRACT_LINE_RE = /^\s*(?:(?:Summary|ACCOUNT|CONTRACT|WARNING|FILTERED|CALLEE ACCOUNT|TREE ACCOUNT|Note):|\d+ test-file usage\(s\) hidden\b|Found \d+ (?:definitions|fuzzy matches)\b)/;
 const MAX_PRESERVED_CONTRACT_LINES = 24;
 const MAX_PRESERVED_CONTRACT_CHARS = 8000;
 
@@ -132,29 +132,31 @@ function applyOutputBudget(text, {
     all = false,
     surface = 'cli',
     params = {},
+    trailingChars = 0,
 } = {}) {
+    const defaultLimit = BROAD_COMMANDS.has(command)
+        ? BROAD_OUTPUT_CHARS
+        : DEFAULT_OUTPUT_CHARS;
+    const requested = maxChars || (all ? MAX_OUTPUT_CHARS : defaultLimit);
+    const hardLimit = Math.min(requested, MAX_OUTPUT_CHARS);
+    const limit = Math.max(0, hardLimit - trailingChars);
     if (!text) {
         return {
-            text: '(no output)',
-            truncated: false,
+            text: '(no output)'.slice(0, limit),
+            truncated: '(no output)'.length > limit,
             fullChars: 0,
-            requestedLimit: maxChars || null,
+            requestedLimit: hardLimit,
             contractMetadata: [],
             contractMetadataComplete: true,
         };
     }
 
-    const defaultLimit = BROAD_COMMANDS.has(command)
-        ? BROAD_OUTPUT_CHARS
-        : DEFAULT_OUTPUT_CHARS;
-    const requested = maxChars || (all ? MAX_OUTPUT_CHARS : defaultLimit);
-    const limit = Math.min(requested, MAX_OUTPUT_CHARS);
     if (text.length <= limit) {
         return {
             text,
             truncated: false,
             fullChars: text.length,
-            requestedLimit: limit,
+            requestedLimit: hardLimit,
             contractMetadata: [],
             contractMetadataComplete: true,
         };
@@ -178,8 +180,8 @@ function applyOutputBudget(text, {
         ? `Raise ${raiseHint}.`
         : `Narrow with ${compactScope || raiseHint}; raise ${raiseHint}.`;
     let notice = compactBudget
-        ? `... OUTPUT TRUNCATED (${text.length}→${limit}). ${compactGuidance}`
-        : `... OUTPUT TRUNCATED: ${text.length} chars total; hard limit ${limit}. ` +
+        ? `... OUTPUT TRUNCATED (${text.length}→${hardLimit}). ${compactGuidance}`
+        : `... OUTPUT TRUNCATED: ${text.length} chars total; hard limit ${hardLimit}. ` +
             `${narrowingHint(command, surface, params)} ${allHint}`;
     if (compactBudget && notice.length > limit) {
         const emergency = supportsAll
@@ -194,10 +196,21 @@ function applyOutputBudget(text, {
     // can consume most of the transport. Trust/account lines take precedence
     // over body detail and are appended directly after a compact notice.
     if (compactBudget) {
-        const metadataCapacity = Math.max(0, limit - notice.length - 1);
-        const candidate = preservedContractMetadata(text, '', {
-            maxChars: metadataCapacity,
+        let candidate = preservedContractMetadata(text, '', {
+            maxChars: Math.max(0, limit - notice.length - 1),
         });
+        if (candidate.omitted > 0) {
+            // Spend less on generic guidance when that lets a complete scope
+            // or parameter warning survive even a tiny transport ceiling.
+            const shorterNotice = `... OUTPUT TRUNCATED. Raise ${raiseHint}.`;
+            const shorterCandidate = preservedContractMetadata(text, '', {
+                maxChars: Math.max(0, limit - shorterNotice.length - 1),
+            });
+            if (shorterNotice.length < notice.length && shorterCandidate.lines.length > candidate.lines.length) {
+                notice = shorterNotice;
+                candidate = shorterCandidate;
+            }
+        }
         const candidateText = candidate.lines.join('\n');
         const separatorChars = candidateText ? 2 : 1;
         const bodyBudget = Math.max(0,
@@ -225,7 +238,7 @@ function applyOutputBudget(text, {
             text: pieces.join('\n').slice(0, limit),
             truncated: true,
             fullChars: text.length,
-            requestedLimit: limit,
+            requestedLimit: hardLimit,
             contractMetadata: contractMetadata.lines,
             contractMetadataComplete: contractMetadata.complete,
         };
@@ -283,7 +296,7 @@ function applyOutputBudget(text, {
         text: rendered,
         truncated: true,
         fullChars: text.length,
-        requestedLimit: limit,
+        requestedLimit: hardLimit,
         contractMetadata: contractMetadata.lines,
         contractMetadataComplete: contractMetadata.complete,
     };

package/core/registry.js

@@ -149,7 +149,7 @@ const FLAG_APPLICABILITY = {
     repo:         ['file', 'exclude', 'top', 'limit', 'all', 'detailed', 'topLevel', 'in', 'functions', 'hot', 'deep', 'sections'],
     deadcode:     ['file', 'exclude', 'includeTests', 'includeExported', 'includeDecorated', 'limit', 'in'],
     entrypoints:  ['file', 'exclude', 'includeTests', 'excludeTests', 'limit', 'type', 'framework'],
-    endpoints:    ['file', 'exclude', 'limit', 'framework', 'bridge', 'serverOnly', 'clientOnly', 'unmatched', 'method', 'prefix', 'hideUncertain'],
+    endpoints:    ['file', 'in', 'exclude', 'excludeTests', 'limit', 'framework', 'bridge', 'serverOnly', 'clientOnly', 'unmatched', 'method', 'prefix', 'hideUncertain'],
     stacktrace:   ['stack'],
     auditAsync:   ['file', 'exclude', 'limit'],
 };