ucn 5.4.0 → 5.4.2

package/core/verify.js

@@ -247,14 +247,26 @@ function classifyCallContext(callNode, language) {
 /**
  * Find a call expression node at the target line matching funcName
  */
-function findCallNode(node, callTypes, targetRow, funcName, occurrence = 0) {
+function findCallNode(node, callTypes, targetRow, funcName, occurrence = 0, site = null) {
     // Several same-name calls can share one line (`greet("a") + greet("b")`,
     // f-strings) — fix #231: callers pass the site's per-line ordinal so each
     // record is arg-checked against ITS OWN node, not the line's first.
     // Records and this walk are both pre-order, so ordinals align; an
     // out-of-range ordinal falls back to the first match (never worse than
     // the pre-fix behavior when a parse shape hides a node).
-    const matches = _collectCallNodes(node, callTypes, targetRow, funcName, occurrence + 1);
+    const matches = _collectCallNodes(node, callTypes, targetRow, funcName, site ? Infinity : occurrence + 1);
+    if (Number.isInteger(site?.start)) {
+        // The resolver already identified the callee token. Preserve that
+        // identity through argument extraction, including aliases and several
+        // calls on one line (some of which may target another declaration).
+        const exact = matches.filter(candidate => {
+            const callee = candidate.childForFieldName('function') ||
+                candidate.childForFieldName('name') ||
+                candidate.childForFieldName('constructor') || candidate.childForFieldName('type');
+            return callee && callee.startIndex <= site.start && callee.endIndex >= site.end;
+        });
+        if (exact.length === 1) return exact[0];
+    }
     return matches[occurrence] || matches[0] || null;
 }
 
@@ -795,8 +807,10 @@ function computePlanCallSites(index, name, def) {
             content: c.content,
             usageType: 'call',
             receiver: c.receiver,
+            calledAs: c.calledAs,
+            callSite: c.provenance?.facts?.site,
         };
-        const siteKey = `${c.file}:${c.line}`;
+        const siteKey = `${c.file}:${c.line}:${c.calledAs || name}`;
         const occurrence = planLineSeen.get(siteKey) || 0;
         planLineSeen.set(siteKey, occurrence + 1);
         const analysis = analyzeCallSite(index, call, name, occurrence);
@@ -898,7 +912,9 @@ function analyzeCallSite(index, call, funcName, occurrence = 0) {
         const targetRow = call.line - 1; // tree-sitter is 0-indexed
 
         // Find the call expression at the target line matching funcName
-        const callNode = findCallNode(tree.rootNode, callTypes, targetRow, funcName, occurrence);
+        const spelling = call.calledAs && call.calledAs !== 'bound' ? call.calledAs : funcName;
+        const callNode = findCallNode(tree.rootNode, callTypes, targetRow, spelling, occurrence,
+            call.callSite || call.provenance?.facts?.site);
         if (!callNode) return { args: null, argCount: 0 };
 
         // Check if this is a method call (obj.func()) vs a direct call (func())
@@ -1353,6 +1369,8 @@ function verify(index, name, options = {}) {
         content: c.content,
         usageType: 'call',
         receiver: c.receiver,
+        calledAs: c.calledAs,
+        callSite: c.provenance?.facts?.site,
         // Preserve receiver identity through the usage-shaped adapter. Go
         // permits a local value to have the same spelling as its type; only
         // a type-qualified call is a method expression with an explicit
@@ -1394,7 +1412,7 @@ function verify(index, name, options = {}) {
 
     const verifyLineSeen = new Map(); // 'file:line' -> per-line ordinal (fix #231)
     for (const call of calls) {
-        const siteKey = `${call.file}:${call.line}`;
+        const siteKey = `${call.file}:${call.line}:${call.calledAs || name}`;
         const occurrence = verifyLineSeen.get(siteKey) || 0;
         verifyLineSeen.set(siteKey, occurrence + 1);
         const analysis = analyzeCallSite(index, call, name, occurrence);

package/mcp/server.js

@@ -119,7 +119,7 @@ const server = new StdioMcpServer({
 
 function toolResult(text, command, maxChars, suffixNote, params = {}) {
     const suffix = suffixNote || '';
-    const budget = applyOutputBudget(text, {
+    const budget = applyOutputBudget(text + suffix, {
         command,
         maxChars,
         surface: 'mcp',
@@ -130,7 +130,7 @@ function toolResult(text, command, maxChars, suffixNote, params = {}) {
     // narrowing hints; preserved contract lines follow). A structuredContent
     // side-channel is rendered INSTEAD of content by MCP clients that prefer
     // structured results, which discards the entire answer (fix #284).
-    return { content: [{ type: 'text', text: budget.text + suffix }] };
+    return { content: [{ type: 'text', text: budget.text }] };
 }
 
 function toolError(message) {
@@ -307,7 +307,7 @@ const INPUT_SHAPE = {
     line: integerParam('Definition line pin. Resolves the symbol defined at this exact line (the middle component of a file:line:name handle). Disambiguates same-file same-name definitions.', { exclusiveMinimum: 0, maximum: Number.MAX_SAFE_INTEGER }),
     limit: integerParam('Max results to return (default: 500; structural search: 50; usages and lines: uncapped). Caps find, usages, search, deadcode, api, and repo files. Must be a positive integer.', { exclusiveMinimum: 0, maximum: 1000000 }),
     max_files: integerParam('Max files to index (default: 10000). Use for very large codebases. Must be a positive integer.', { exclusiveMinimum: 0, maximum: 10000000 }),
-    max_chars: integerParam('Max output chars before truncation. Broad sweep commands (repo, entrypoints, endpoints, deadcode, deps, check, audit_async) default to 3K; all other commands default to 10K. Maximum: 100K. all=true lifts formatter caps but keeps the 100K transport ceiling.', { exclusiveMinimum: 0, maximum: 100000 }),
+    max_chars: integerParam('Max output characters, not UTF-8 bytes, including notes and preserved metadata. Broad sweep commands (repo, entrypoints, endpoints, deadcode, deps, check, audit_async) default to 3K; all other commands default to 10K. Maximum: 100K. all=true lifts formatter caps but keeps the 100K transport ceiling.', { exclusiveMinimum: 0, maximum: 100000 }),
     type: stringParam('Symbol type filter for structural search: function, class, call, method, type, state, field, constant, macro. Triggers index-based search.'),
     param: stringParam('Filter by parameter name or type (structural search). E.g. "Request", "ctx".'),
     receiver: stringParam('Filter calls by receiver (structural search, type=call). E.g. "db", "http".'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ucn",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "mcpName": "io.github.mleoca/ucn",
   "description": "Auditable AST code intelligence for AI agents: 18 task-oriented commands through one MCP tool, CLI, or agent skill. Supports JS/TS, Python, Go, Rust, Java, C, C++, C#, and HTML.",
   "main": "index.js",
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "version": "node scripts/sync-server-version.js && git add server.json",
-    "test": "node --test test/audit-5.3.8.test.js test/audit-5.3.7.test.js test/audit-5.3.6.test.js test/evidence-provenance.test.js test/provenance-unit.test.js test/shell-output.test.js test/parser-unit.test.js test/integration.test.js test/cache.test.js test/formatter.test.js test/interactive.test.js test/feature.test.js test/regression-js.test.js test/regression-py.test.js test/regression-go.test.js test/regression-java.test.js test/regression-rust.test.js test/regression-c-family.test.js test/regression-cross.test.js test/regression-mcp.test.js test/mcp-protocol.test.js test/mcp-sdk-compat.test.js test/dependency-security.test.js test/regression-parser.test.js test/regression-commands.test.js test/regression-fixes.test.js test/regression-bugfixes.test.js test/release-surface-regressions.test.js test/prerelease-audit.test.js test/release-readiness-audit.test.js test/cross-language.test.js test/accuracy.test.js test/command-coverage.test.js test/perf-optimizations.test.js test/performance-gate-policy.test.js test/oracle-gate-policy.test.js test/outcome-policy.test.js test/consistency-eval.test.js test/agent-public-surface-benchmark.test.js test/command-contracts.test.js test/language-adapter.test.js test/systematic-test.js test/mcp-edge-cases.js test/conservation.test.js test/parity-test.js test/trust-matrix.test.js",
+    "test": "node --test test/audit-5.4.0.test.js test/audit-5.3.8.test.js test/audit-5.3.7.test.js test/audit-5.3.6.test.js test/evidence-provenance.test.js test/provenance-unit.test.js test/shell-output.test.js test/parser-unit.test.js test/integration.test.js test/cache.test.js test/formatter.test.js test/interactive.test.js test/feature.test.js test/regression-js.test.js test/regression-py.test.js test/regression-go.test.js test/regression-java.test.js test/regression-rust.test.js test/regression-c-family.test.js test/regression-cross.test.js test/regression-mcp.test.js test/mcp-protocol.test.js test/mcp-sdk-compat.test.js test/dependency-security.test.js test/regression-parser.test.js test/regression-commands.test.js test/regression-fixes.test.js test/regression-bugfixes.test.js test/release-surface-regressions.test.js test/prerelease-audit.test.js test/release-readiness-audit.test.js test/cross-language.test.js test/accuracy.test.js test/command-coverage.test.js test/perf-optimizations.test.js test/performance-gate-policy.test.js test/oracle-gate-policy.test.js test/outcome-policy.test.js test/consistency-eval.test.js test/agent-public-surface-benchmark.test.js test/command-contracts.test.js test/language-adapter.test.js test/systematic-test.js test/mcp-edge-cases.js test/conservation.test.js test/parity-test.js test/trust-matrix.test.js",
     "benchmark:agent": "node test/agent-public-surface-benchmark.js",
     "benchmark:agent:gate": "node test/agent-public-surface-benchmark.js --gate",
     "benchmark:agent:legacy": "node test/agent-understanding-benchmark.js",