sigmap 8.16.1 → 8.17.0

package/AGENTS.md

@@ -33,17 +33,16 @@ Always run `sigmap ask` (or `sigmap --query`) before searching for files relevan
 src/extractors/python_ast.py ← ast
 ```
 
-## changes (last 5 commits — 0 seconds ago)
+## changes (last 5 commits — 1 second ago)
 ```
+src/extractors/csharp.js                      ~extract  ~extractMembers
+src/extractors/go.js                          ~extract  ~extractInterfaceMethods
+src/extractors/java.js                        ~extract  ~extractMembers
+src/extractors/rust.js                        ~extract  ~extractMethods  ~extractReturnType
 src/evidence/pack.js                          +riskFactorsFor  ~parseAnchor  ~buildEvidencePack  ~formatMarkdown
-src/graph/call-graph.js                       +calls  +maskRust  +name  +goDefs
-src/mcp/handlers.js                           +that  +getMethodImpact  ~queryContext  ~squeezeOutput
-src/mcp/server.js                             ~dispatch
-src/mcp/tools.js                              +it
+src/graph/call-graph.js                       +buildCallFileGraph  ~buildCallGraph  ~formatCallGraphJSON  ~_resolveSymbol
+src/mcp/handlers.js                           ~queryContext
 src/retrieval/ranker.js                       ~scoreFile  ~rank
-src/graph/blast-radius.js                     +tierFor  +_normRel  +_bfs  +methodBlastRadius
-src/review/pr-evidence.js                     ~buildPrEvidence  ~formatPrEvidenceMarkdown
-src/review/review-pr.js                       ~isSource  ~reviewPr
 ```
 
 ## packages
@@ -175,86 +174,43 @@ code-fence ---
 
 ## src
 
-### src/config/defaults.js
+### src/extractors/csharp.js
 ```
-module.exports = { DEFAULTS }  :163-163
+module.exports = { extract }  :71-71
+function extract(src) → string[]  :12-71
+function extractBlock(src, startIndex)  :35-44
+function extractMembers(block)  :46-59
+function normalizeParams(params)  :61-64
+function normalizeType(type)  :66-69
 ```
 
-### src/evidence/pack.js
+### src/extractors/go.js
 ```
-module.exports = { buildEvidencePack, formatJSON, formatMarkdown, parseAnchor, riskLabelFor, riskFactorsFor, findRelatedTests, SCHEMA_VERSION, SCHEMA_URL, TEST_DISCOVERY }  :326-337
-function parseAnchor(sig) → { symbol: string, start:   :64-72
-function riskLabelFor(relPath) → 'generated'|'test'|'migra  :84-86
-function riskFactorsFor(relPath) → string[]  :96-108
-function stemOf(relPath)  :111-114
-function testTargetStem(relPath) → string  :126-132
-function findRelatedTests(relPath, allFiles) → string[]  :143-154
-function reasonFor(signals)  :157-168
-function sigTokens(sigs)  :171-173
-function canonicalize(value) → string  :180-182
-function sortKeys(value)  :184-192
-function buildEvidencePack(query, cwd, opts = {}) → object  :205-281
-function ranked0Empty(query)  :284-286
-function formatJSON(pack)  :289-291
-function formatMarkdown(pack)  :294-324
+module.exports = { extract }  :81-81
+function extract(src) → string[]  :12-81
+function extractBlock(src, startIndex)  :51-60
+function extractInterfaceMethods(block)  :62-74
+function normalizeParams(params)  :76-79
 ```
 
-### src/graph/call-graph.js
+### src/extractors/java.js
 ```
-module.exports = { buildCallGraph, buildCallFileGraph, methodImpact, methodCallees, formatCallGraph, formatCallGraphJSON, extractDefs, maskJs, maskPy, maskRust }  :563-567
-function normalizePath(p)  :41-41
-function toRel(cwd, f)  :42-42
-function symId(cwd, absFile, name)  :43-43
-function maskJs(src)  :49-65
-function maskRust(src)  :70-91
-function maskPy(src)  :93-110
-function matchDelim(masked, openIdx, open, close)  :113-120
-function lineAt(src, idx)  :122-127
-function jsDefs(masked)  :132-237
-function pyDefs(masked)  :200-220
-function goDefs(masked)  :224-344
-function javaDefs(masked)  :250-367
-function rustDefs(masked)  :278-401
-function maskFor(filePath, src)  :300-305
-function extractDefs(filePath, src)  :307-315
-function callsInRange(masked, start, end)  :318-330
-function _walk(dir, excludeSet, out, depth)  :334-347
-function buildCallGraph(cwd, opts = {}) → { * forward: Map<string,s  :363-446
-function buildCallFileGraph(cwd, opts = {}) → { forward: Map<string,str  :459-482
-function _resolveSymbol(symbol, defs)  :485-490
-function _bfs(seedIds, graph, maxDepth)  :493-506
-function methodImpact(symbol, cwd, opts = {}) → { symbol:string, resolved  :516-522
-function methodCallees(symbol, cwd, opts = {}) → { symbol:string, resolved  :528-534
-function formatCallGraph(result, kind)  :537-549
-… +1 more signatures
+module.exports = { extract }  :71-71
+function extract(src) → string[]  :12-71
+function extractBlock(src, startIndex)  :34-44
+function extractMembers(block)  :46-59
+function normalizeParams(params)  :61-64
+function normalizeType(type)  :66-69
 ```
 
-### src/mcp/handlers.js
+### src/extractors/rust.js
 ```
-module.exports = { readContext, searchSignatures, getMap, createCheckpoint, getRouting, explainFile, listModules, queryContext, getMethodImpact, getImpact, getLines, readMemory, getCalleeSignatures, notifyFileCreated, notifySymbolAdded, notifyFileDeleted, getDiffContext, getArchitectureOverview, verifySuggestion, squeezeOutput }  :975-975
-function _readContextFiles(cwd)  :10-17
-function readContext(args, cwd)  :36-66
-function searchSignatures(args, cwd)  :74-100
-function getMap(args, cwd)  :108-131
-function createCheckpoint(args, cwd)  :143-215
-function getRouting(args, cwd)  :224-261
-function explainFile(args, cwd)  :269-356
-function listModules(args, cwd)  :364-403
-function queryContext(args, cwd)  :411-438
-function getMethodImpact(args, cwd)  :446-460
-function getImpact(args, cwd)  :468-480
-function getLines(args, cwd)  :489-537
-function readMemory(args, cwd)  :545-580
-function getCalleeSignatures(args, cwd)  :589-634
-function _pkgVersion(cwd)  :641-644
-function notifyFileCreated(args, cwd)  :648-670
-function notifySymbolAdded(args, cwd)  :673-693
-function notifyFileDeleted(args, cwd)  :696-710
-function _changedFiles(cwd, args)  :716-728
-function getDiffContext(args, cwd)  :737-808
-function getArchitectureOverview(args, cwd)  :817-885
-function verifySuggestion(args, cwd)  :895-930
-function squeezeOutput(args, cwd)  :940-973
+module.exports = { extract }  :110-110
+function extract(src) → string[]  :12-110
+function extractBlock(src, startIndex)  :72-81
+function extractMethods(block)  :83-110
+function normalizeParams(params)  :97-100
+function extractReturnType(afterParen)  :102-110
 ```
 
 ### src/mcp/server.js
@@ -266,29 +222,6 @@ function dispatch(msg, cwd)  :41-108
 function start(cwd)  :113-139
 ```
 
-### src/mcp/tools.js
-```
-module.exports = { TOOLS }  :392-392
-```
-
-### src/retrieval/ranker.js
-```
-module.exports = { rank, buildSigIndex, scoreFile, formatRankTable, formatRankJSON, DEFAULT_WEIGHTS, GRAPH_BOOST_AMOUNTS, detectIntent }  :598-598
-function _computePenalty(filePath)  :63-70
-function _computeHubs(graph)  :73-84
-function _isHub(filePath)  :87-91
-function scoreFile(filePath, sigs, queryTokens, weights) → { score: number, signals:  :102-159
-function rank(query, sigIndex, opts) → { file: string, score: nu  :177-302
-function _parseContextFile(contextPath) → Map<string, string[]>  :372-404
-function _mergeSigIndex(target, source)  :407-415
-function _buildSigIndexFromCache(cwd) → Map<string, string[]>  :422-442
-function _enrichSigIndexFromStrategy(cwd, index) → Map<string, string[]>  :450-456
-function buildSigIndex(cwd, opts) → Map<string, string[]>  :473-506
-function formatRankTable(results, query) → string  :515-551
-function formatRankJSON(results, query) → object  :560-575
-function detectIntent(query)  :590-596
-```
-
 ### src/analysis/coverage-score.js
 ```
 module.exports = { coverageScore, CODE_EXTS }  :105-105
@@ -326,6 +259,11 @@ function getChangedFiles(files, cache) → { changed: string[], unch  :71-88
 function updateCacheEntries(cache, extracted)  :96-103
 ```
 
+### src/config/defaults.js
+```
+module.exports = { DEFAULTS }  :163-163
+```
+
 ### src/config/loader.js
 ```
 module.exports = { loadConfig, loadBaseConfig }  :313-313
@@ -539,6 +477,25 @@ function scoreUsefulness(taskResult, rankingScore)  :11-38
 function computeUsefulnessStats(taskResults)  :40-66
 ```
 
+### src/evidence/pack.js
+```
+module.exports = { buildEvidencePack, formatJSON, formatMarkdown, parseAnchor, riskLabelFor, riskFactorsFor, findRelatedTests, SCHEMA_VERSION, SCHEMA_URL, TEST_DISCOVERY }  :326-337
+function parseAnchor(sig) → { symbol: string, start:   :64-72
+function riskLabelFor(relPath) → 'generated'|'test'|'migra  :84-86
+function riskFactorsFor(relPath) → string[]  :96-108
+function stemOf(relPath)  :111-114
+function testTargetStem(relPath) → string  :126-132
+function findRelatedTests(relPath, allFiles) → string[]  :143-154
+function reasonFor(signals)  :157-168
+function sigTokens(sigs)  :171-173
+function canonicalize(value) → string  :180-182
+function sortKeys(value)  :184-192
+function buildEvidencePack(query, cwd, opts = {}) → object  :205-281
+function ranked0Empty(query)  :284-286
+function formatJSON(pack)  :289-291
+function formatMarkdown(pack)  :294-324
+```
+
 ### src/extractors/coverage.js
 ```
 module.exports = { buildTestIndex, isTested }  :79-79
@@ -557,16 +514,6 @@ function normalizeParams(params)  :59-62
 function normalizeType(type)  :64-67
 ```
 
-### src/extractors/csharp.js
-```
-module.exports = { extract }  :59-59
-function extract(src) → string[]  :8-59
-function extractBlock(src, startIndex)  :27-36
-function extractMembers(block)  :38-47
-function normalizeParams(params)  :49-52
-function normalizeType(type)  :54-57
-```
-
 ### src/extractors/css.js
 ```
 module.exports = { extract }  :69-69
@@ -618,15 +565,6 @@ module.exports = { extract }  :2-2
 function extract(src)  :14-26
 ```
 
-### src/extractors/go.js
-```
-module.exports = { extract }  :65-65
-function extract(src) → string[]  :8-65
-function extractBlock(src, startIndex)  :39-48
-function extractInterfaceMethods(block)  :50-58
-function normalizeParams(params)  :60-63
-```
-
 ### src/extractors/graphql.js
 ```
 module.exports = { extract }  :66-66
@@ -639,16 +577,6 @@ module.exports = { extract }  :39-39
 function extract(src) → string[]  :9-37
 ```
 
-### src/extractors/java.js
-```
-module.exports = { extract }  :60-60
-function extract(src) → string[]  :8-60
-function extractBlock(src, startIndex)  :27-37
-function extractMembers(block)  :39-48
-function normalizeParams(params)  :50-53
-function normalizeType(type)  :55-58
-```
-
 ### src/extractors/javascript.js
 ```
 module.exports = { extract }  :147-147
@@ -781,16 +709,6 @@ function normalizeParams(params)  :40-43
 function extractReturnHint(stripped, index)  :45-52
 ```
 
-### src/extractors/rust.js
-```
-module.exports = { extract }  :82-82
-function extract(src) → string[]  :8-82
-function extractBlock(src, startIndex)  :48-57
-function extractMethods(block)  :59-82
-function normalizeParams(params)  :69-72
-function extractReturnType(afterParen)  :74-82
-```
-
 ### src/extractors/scala.js
 ```
 module.exports = { extract }  :76-76
@@ -1033,6 +951,36 @@ function build(files, cwd, ctx) → { forward: Map<string,str  :387-426
 function buildFromCwd(cwd, opts) → { forward: Map<string,str  :438-492
 ```
 
+### src/graph/call-graph.js
+```
+module.exports = { buildCallGraph, buildCallFileGraph, methodImpact, methodCallees, formatCallGraph, formatCallGraphJSON, extractDefs, maskJs, maskPy, maskRust }  :563-567
+function normalizePath(p)  :41-41
+function toRel(cwd, f)  :42-42
+function symId(cwd, absFile, name)  :43-43
+function maskJs(src)  :49-65
+function maskRust(src)  :70-91
+function maskPy(src)  :93-110
+function matchDelim(masked, openIdx, open, close)  :113-120
+function lineAt(src, idx)  :122-127
+function jsDefs(masked)  :132-237
+function pyDefs(masked)  :200-220
+function goDefs(masked)  :224-344
+function javaDefs(masked)  :250-367
+function rustDefs(masked)  :278-401
+function maskFor(filePath, src)  :300-305
+function extractDefs(filePath, src)  :307-315
+function callsInRange(masked, start, end)  :318-330
+function _walk(dir, excludeSet, out, depth)  :334-347
+function buildCallGraph(cwd, opts = {}) → { * forward: Map<string,s  :363-446
+function buildCallFileGraph(cwd, opts = {}) → { forward: Map<string,str  :459-482
+function _resolveSymbol(symbol, defs)  :485-490
+function _bfs(seedIds, graph, maxDepth)  :493-506
+function methodImpact(symbol, cwd, opts = {}) → { symbol:string, resolved  :516-522
+function methodCallees(symbol, cwd, opts = {}) → { symbol:string, resolved  :528-534
+function formatCallGraph(result, kind)  :537-549
+… +1 more signatures
+```
+
 ### src/graph/impact.js
 ```
 module.exports = { getImpact, analyzeImpact, formatImpact, formatImpactJSON }  :240-240
@@ -1147,6 +1095,34 @@ function shouldSkipFile(rel)  :18-21
 function analyze(files, cwd)  :23-125
 ```
 
+### src/mcp/handlers.js
+```
+module.exports = { readContext, searchSignatures, getMap, createCheckpoint, getRouting, explainFile, listModules, queryContext, getMethodImpact, getImpact, getLines, readMemory, getCalleeSignatures, notifyFileCreated, notifySymbolAdded, notifyFileDeleted, getDiffContext, getArchitectureOverview, verifySuggestion, squeezeOutput }  :975-975
+function _readContextFiles(cwd)  :10-17
+function readContext(args, cwd)  :36-66
+function searchSignatures(args, cwd)  :74-100
+function getMap(args, cwd)  :108-131
+function createCheckpoint(args, cwd)  :143-215
+function getRouting(args, cwd)  :224-261
+function explainFile(args, cwd)  :269-356
+function listModules(args, cwd)  :364-403
+function queryContext(args, cwd)  :411-438
+function getMethodImpact(args, cwd)  :446-460
+function getImpact(args, cwd)  :468-480
+function getLines(args, cwd)  :489-537
+function readMemory(args, cwd)  :545-580
+function getCalleeSignatures(args, cwd)  :589-634
+function _pkgVersion(cwd)  :641-644
+function notifyFileCreated(args, cwd)  :648-670
+function notifySymbolAdded(args, cwd)  :673-693
+function notifyFileDeleted(args, cwd)  :696-710
+function _changedFiles(cwd, args)  :716-728
+function getDiffContext(args, cwd)  :737-808
+function getArchitectureOverview(args, cwd)  :817-885
+function verifySuggestion(args, cwd)  :895-930
+function squeezeOutput(args, cwd)  :940-973
+```
+
 ### src/mcp/install.js
 ```
 module.exports = { CLIENTS, listClients, installClient, resolveTarget }  :142-142
@@ -1159,6 +1135,11 @@ function _installYaml(filePath, scriptPath)  :99-117
 function installClient(client, opts = {}) → client, label, path, stat  :124-140
 ```
 
+### src/mcp/tools.js
+```
+module.exports = { TOOLS }  :392-392
+```
+
 ### src/nudge.js
 ```
 module.exports = { checkStarNudge, readUsage, usagePath, showStarNudge, RUN_THRESHOLD, SUCCESS_THRESHOLD }  :92-92
@@ -1192,6 +1173,24 @@ function expandQuery(qToks) → Map<string, number>  :132-141
 function bm25rank(query, candidates) → Array<object & { score: n  :154-193
 ```
 
+### src/retrieval/ranker.js
+```
+module.exports = { rank, buildSigIndex, scoreFile, formatRankTable, formatRankJSON, DEFAULT_WEIGHTS, GRAPH_BOOST_AMOUNTS, detectIntent }  :598-598
+function _computePenalty(filePath)  :63-70
+function _computeHubs(graph)  :73-84
+function _isHub(filePath)  :87-91
+function scoreFile(filePath, sigs, queryTokens, weights) → { score: number, signals:  :102-159
+function rank(query, sigIndex, opts) → { file: string, score: nu  :177-302
+function _parseContextFile(contextPath) → Map<string, string[]>  :372-404
+function _mergeSigIndex(target, source)  :407-415
+function _buildSigIndexFromCache(cwd) → Map<string, string[]>  :422-442
+function _enrichSigIndexFromStrategy(cwd, index) → Map<string, string[]>  :450-456
+function buildSigIndex(cwd, opts) → Map<string, string[]>  :473-506
+function formatRankTable(results, query) → string  :515-551
+function formatRankJSON(results, query) → object  :560-575
+function detectIntent(query)  :590-596
+```
+
 ### src/retrieval/tokenizer.js
 ```
 module.exports = { tokenize, STOP_WORDS }  :54-54

package/CHANGELOG.md

@@ -10,6 +10,15 @@ Format: [Semantic Versioning](https://semver.org/)
 
 ---
 
+## [8.17.0] — 2026-07-12
+
+Minor release — **line anchors for Java, Go, Rust, and C#** (§7.4 Lang ceiling, the roadmap's long-named "anchors for the remaining extractors" item).
+
+### Added
+- **Extractor line anchors for Java/Go/Rust/C# (#483, PR #484):** signatures from these languages now carry `:start-end` anchors — types/functions with bodies get real brace-matched ranges, single-line members get `:n-n`, Rust bodyless items (unit structs, trait declarations) get single-line anchors. Prerequisite fix folded in: the four extractors' comment strips are now **newline-preserving** (block comments previously collapsed outright, making true line numbers impossible — regression-tested with a multi-line license header above declarations). Downstream, verified: Evidence Pack `anchorCoverage` goes **0 → 1.0** on Go/Java fixtures with populated `sourceLines`, and `get_lines` (Surgical Context) works on all four languages. Expected extractor fixtures regenerated; `parseAnchor` round-trips every emitted anchor.
+
+---
+
 ## [8.16.1] — 2026-07-12
 
 Patch release — **benchmark hygiene**; the published package is unchanged (scripts + tests only).

package/README.md

@@ -122,8 +122,8 @@ Ask → Rank → Context → Validate → Judge → Learn
 
 <!--SM:benchmarkBlock-->
 ```
-Benchmark : sigmap-v8.16-main (21 repositories, including R language)
-Date      : 2026-07-11
+Benchmark : sigmap-v8.17-main (21 repositories, including R language)
+Date      : 2026-07-12
 
 Hit@5          : 87.8%   (baseline 13.6%  — 6.5× lift)
 Token reduction: 97.0%   (across 21 repos)

package/gen-context.js

@@ -5229,8 +5229,12 @@ __factories["./src/extractors/cpp"] = function(module, exports) {
 // ── ./src/extractors/csharp ──
 __factories["./src/extractors/csharp"] = function(module, exports) {
   
+  const { lineAt, withAnchor } = __require('./src/extractors/line-anchor');
+
   /**
    * Extract signatures from C# source code.
+   * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+   * strip below is newline-preserving so anchor lines match the original file.
    * @param {string} src - Raw file content
    * @returns {string[]} Array of signature strings
    */
@@ -5240,14 +5244,18 @@ __factories["./src/extractors/csharp"] = function(module, exports) {
 
     const stripped = src
       .replace(/\/\/.*$/gm, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '');
+      .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
 
     // Classes and interfaces
     const typeRe = /^\s*(?:public\s+|internal\s+|protected\s+)?(?:abstract\s+|sealed\s+|static\s+)?(class|interface|enum|record|struct)\s+(\w+)(?:<[^{]*>)?(?:\s*:\s*[\w<>, .]+)?\s*\{/gm;
     for (const m of stripped.matchAll(typeRe)) {
-      sigs.push(`${m[1]} ${m[2]}`);
-      const block = extractBlock(stripped, m.index + m[0].length);
-      for (const meth of extractMembers(block)) sigs.push(`  ${meth}`);
+      const declIdx = m.index + (m[0].length - m[0].trimStart().length);
+      const bodyStart = m.index + m[0].length;
+      const block = extractBlock(stripped, bodyStart);
+      sigs.push(withAnchor(`${m[1]} ${m[2]}`, lineAt(stripped, declIdx), lineAt(stripped, bodyStart + block.length)));
+      for (const meth of extractMembers(block)) {
+        sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+      }
     }
 
     return sigs.slice(0, 25);
@@ -5270,7 +5278,11 @@ __factories["./src/extractors/csharp"] = function(module, exports) {
     for (const m of block.matchAll(methodRe)) {
       const ret = normalizeType(m[1]);
       const retStr = ret ? ` → ${ret}` : '';
-      members.push(`${m[2]}(${normalizeParams(m[3])})${retStr}`);
+      members.push({
+        text: `${m[2]}(${normalizeParams(m[3])})${retStr}`,
+        declIdx: m.index + (m[0].length - m[0].trimStart().length),
+        endIdx: m.index + m[0].length,
+      });
     }
     return members.slice(0, 8);
   }
@@ -5878,8 +5890,12 @@ __factories["./src/extractors/generic"] = function(module, exports) {
 // ── ./src/extractors/go ──
 __factories["./src/extractors/go"] = function(module, exports) {
   
+  const { lineAt, withAnchor } = __require('./src/extractors/line-anchor');
+
   /**
    * Extract signatures from Go source code.
+   * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+   * strip below is newline-preserving so anchor lines match the original file.
    * @param {string} src - Raw file content
    * @returns {string[]} Array of signature strings
    */
@@ -5889,26 +5905,34 @@ __factories["./src/extractors/go"] = function(module, exports) {
 
     const stripped = src
       .replace(/\/\/.*$/gm, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '');
+      .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
+
+    // Index of the closing brace for a block opened just before startIndex.
+    const blockEndIdx = (startIndex) => startIndex + extractBlock(stripped, startIndex).length;
 
     // Structs
     for (const m of stripped.matchAll(/^type\s+(\w+)\s+struct\s*\{/gm)) {
-      sigs.push(`type ${m[1]} struct`);
+      const end = blockEndIdx(m.index + m[0].length);
+      sigs.push(withAnchor(`type ${m[1]} struct`, lineAt(stripped, m.index), lineAt(stripped, end)));
     }
 
     // Interfaces
     for (const m of stripped.matchAll(/^type\s+(\w+)\s+interface\s*\{/gm)) {
-      sigs.push(`type ${m[1]} interface`);
-      const block = extractBlock(stripped, m.index + m[0].length);
-      for (const method of extractInterfaceMethods(block)) sigs.push(`  ${method}`);
+      const bodyStart = m.index + m[0].length;
+      const block = extractBlock(stripped, bodyStart);
+      sigs.push(withAnchor(`type ${m[1]} interface`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+      for (const meth of extractInterfaceMethods(block)) {
+        sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+      }
     }
 
     // Functions and methods — capture return type between ) and {
     for (const m of stripped.matchAll(/^func\s+(?:\((\w+)\s+[\w*]+\)\s+)?(\w+)\s*\(([^)]*)\)([^{]*)\{/gm)) {
       const receiver = m[1] ? `(${m[1]}) ` : '';
       const retType = m[4] ? m[4].trim().replace(/\s+/g, ' ') : '';
-      const retStr = retType ? ` \u2192 ${retType.slice(0, 30)}` : '';
-      sigs.push(`func ${receiver}${m[2]}(${normalizeParams(m[3])})${retStr}`);
+      const retStr = retType ? ` → ${retType.slice(0, 30)}` : '';
+      const end = blockEndIdx(m.index + m[0].length);
+      sigs.push(withAnchor(`func ${receiver}${m[2]}(${normalizeParams(m[3])})${retStr}`, lineAt(stripped, m.index), lineAt(stripped, end)));
     }
 
     return sigs.slice(0, 25);
@@ -5929,8 +5953,12 @@ __factories["./src/extractors/go"] = function(module, exports) {
     const methods = [];
     for (const m of block.matchAll(/^\s+(\w+)\s*\(([^)]*)\)([^\n]*)/gm)) {
       const retType = m[3] ? m[3].trim().replace(/\s+/g, ' ') : '';
-      const retStr = retType ? ` \u2192 ${retType.slice(0, 30)}` : '';
-      methods.push(`${m[1]}(${normalizeParams(m[2])})${retStr}`);
+      const retStr = retType ? ` → ${retType.slice(0, 30)}` : '';
+      methods.push({
+        text: `${m[1]}(${normalizeParams(m[2])})${retStr}`,
+        declIdx: m.index + (m[0].length - m[0].trimStart().length),
+        endIdx: m.index + m[0].length,
+      });
     }
     return methods.slice(0, 8);
   }
@@ -6060,8 +6088,12 @@ __factories["./src/extractors/html"] = function(module, exports) {
 // ── ./src/extractors/java ──
 __factories["./src/extractors/java"] = function(module, exports) {
   
+  const { lineAt, withAnchor } = __require('./src/extractors/line-anchor');
+
   /**
    * Extract signatures from Java source code.
+   * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+   * strip below is newline-preserving so anchor lines match the original file.
    * @param {string} src - Raw file content
    * @returns {string[]} Array of signature strings
    */
@@ -6071,14 +6103,17 @@ __factories["./src/extractors/java"] = function(module, exports) {
 
     const stripped = src
       .replace(/\/\/.*$/gm, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '');
+      .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
 
     // Classes and interfaces
     const typeRegex = /^(?:public\s+|protected\s+)?(?:abstract\s+|final\s+)?(class|interface|enum)\s+(\w+)(?:\s+extends\s+[\w<>, .]+)?(?:\s+implements\s+[\w<>, .]+)?\s*\{/gm;
     for (const m of stripped.matchAll(typeRegex)) {
-      sigs.push(`${m[1]} ${m[2]}`);
-      const block = extractBlock(stripped, m.index + m[0].length);
-      for (const meth of extractMembers(block)) sigs.push(`  ${meth}`);
+      const bodyStart = m.index + m[0].length;
+      const block = extractBlock(stripped, bodyStart);
+      sigs.push(withAnchor(`${m[1]} ${m[2]}`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+      for (const meth of extractMembers(block)) {
+        sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+      }
     }
 
     return sigs.slice(0, 25);
@@ -6102,7 +6137,11 @@ __factories["./src/extractors/java"] = function(module, exports) {
     for (const m of block.matchAll(methodRe)) {
       const ret = normalizeType(m[1]);
       const retStr = ret ? ` → ${ret}` : '';
-      members.push(`${m[2]}(${normalizeParams(m[3])})${retStr}`);
+      members.push({
+        text: `${m[2]}(${normalizeParams(m[3])})${retStr}`,
+        declIdx: m.index + (m[0].length - m[0].trimStart().length),
+        endIdx: m.index + m[0].length,
+      });
     }
     return members.slice(0, 8);
   }
@@ -7513,8 +7552,12 @@ __factories["./src/extractors/ruby"] = function(module, exports) {
 // ── ./src/extractors/rust ──
 __factories["./src/extractors/rust"] = function(module, exports) {
   
+  const { lineAt, withAnchor } = __require('./src/extractors/line-anchor');
+
   /**
    * Extract signatures from Rust source code.
+   * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+   * strip below is newline-preserving so anchor lines match the original file.
    * @param {string} src - Raw file content
    * @returns {string[]} Array of signature strings
    */
@@ -7524,35 +7567,55 @@ __factories["./src/extractors/rust"] = function(module, exports) {
 
     const stripped = src
       .replace(/\/\/.*$/gm, '')
-      .replace(/\/\*[\s\S]*?\*\//g, '');
+      .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
+
+    // Anchor range for a declaration at declIdx whose header ends at afterIdx:
+    // if a `{` body follows, range to its closing brace; else single-line.
+    const rangeFor = (declIdx, afterIdx) => {
+      let k = afterIdx;
+      while (k < stripped.length && /[ \t]/.test(stripped[k])) k++;
+      if (stripped[k] === '{') {
+        const end = k + 1 + extractBlock(stripped, k + 1).length;
+        return [lineAt(stripped, declIdx), lineAt(stripped, end)];
+      }
+      const line = lineAt(stripped, declIdx);
+      return [line, line];
+    };
 
     // Structs
     for (const m of stripped.matchAll(/^pub\s+struct\s+(\w+)(?:<[^{]*>)?/gm)) {
-      sigs.push(`pub struct ${m[1]}`);
+      const [s, e] = rangeFor(m.index, m.index + m[0].length);
+      sigs.push(withAnchor(`pub struct ${m[1]}`, s, e));
     }
 
     // Enums
     for (const m of stripped.matchAll(/^pub\s+enum\s+(\w+)(?:<[^{]*>)?/gm)) {
-      sigs.push(`pub enum ${m[1]}`);
+      const [s, e] = rangeFor(m.index, m.index + m[0].length);
+      sigs.push(withAnchor(`pub enum ${m[1]}`, s, e));
     }
 
     // Traits
     for (const m of stripped.matchAll(/^pub\s+trait\s+(\w+)(?:<[^{]*>)?/gm)) {
-      sigs.push(`pub trait ${m[1]}`);
+      const [s, e] = rangeFor(m.index, m.index + m[0].length);
+      sigs.push(withAnchor(`pub trait ${m[1]}`, s, e));
     }
 
     // impl blocks
     for (const m of stripped.matchAll(/^impl(?:<[^>]*>)?\s+(?:[\w:]+\s+for\s+)?(\w+)(?:<[^{]*>)?\s*\{/gm)) {
-      sigs.push(`impl ${m[1]}`);
-      const block = extractBlock(stripped, m.index + m[0].length);
-      for (const fn of extractMethods(block)) sigs.push(`  ${fn}`);
+      const bodyStart = m.index + m[0].length;
+      const block = extractBlock(stripped, bodyStart);
+      sigs.push(withAnchor(`impl ${m[1]}`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+      for (const fn of extractMethods(block)) {
+        sigs.push(withAnchor(`  ${fn.text}`, lineAt(stripped, bodyStart + fn.declIdx), lineAt(stripped, bodyStart + fn.endIdx)));
+      }
     }
 
     // Top-level pub fns — capture everything after ) up to { or ; for return type
     for (const m of stripped.matchAll(/^pub(?:\s+async)?\s+fn\s+(\w+)(?:<[^(]*>)?\s*\(([^)]*)\)([^{;]*)/gm)) {
       const asyncKw = m[0].includes('async') ? 'async ' : '';
       const retStr = extractReturnType(m[3]);
-      sigs.push(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`);
+      const [s, e] = rangeFor(m.index, m.index + m[0].length);
+      sigs.push(withAnchor(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`, s, e));
     }
 
     return sigs.slice(0, 25);
@@ -7574,7 +7637,11 @@ __factories["./src/extractors/rust"] = function(module, exports) {
     for (const m of block.matchAll(/^\s+pub(?:\s+async)?\s+fn\s+(\w+)(?:<[^(]*>)?\s*\(([^)]*)\)([^{;]*)/gm)) {
       const asyncKw = m[0].includes('async') ? 'async ' : '';
       const retStr = extractReturnType(m[3]);
-      methods.push(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`);
+      methods.push({
+        text: `pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`,
+        declIdx: m.index + (m[0].length - m[0].trimStart().length),
+        endIdx: m.index + m[0].length,
+      });
     }
     return methods.slice(0, 8);
   }
@@ -7589,7 +7656,7 @@ __factories["./src/extractors/rust"] = function(module, exports) {
     const m = afterParen.match(/->\s*([^{;]+)/);
     if (!m) return '';
     const rt = m[1].trim().replace(/\s+/g, ' ');
-    return ` \u2192 ${rt.length > 30 ? rt.slice(0, 27) + '...' : rt}`;
+    return ` → ${rt.length > 30 ? rt.slice(0, 27) + '...' : rt}`;
   }
 
   module.exports = { extract };
@@ -14414,7 +14481,7 @@ __factories["./src/mcp/server"] = function(module, exports) {
 
   const SERVER_INFO = {
     name: 'sigmap',
-    version: '8.16.1',
+    version: '8.17.0',
     description: 'SigMap MCP server — code signatures on demand',
   };
 
@@ -19455,7 +19522,7 @@ function __tryGit(args, opts = {}) {
   catch (_) { return ''; }
 }
 
-const VERSION = '8.16.1';
+const VERSION = '8.17.0';
 const MARKER = '\n\n## Auto-generated signatures\n<!-- Updated by gen-context.js -->\n';
 
 function requireSourceOrBundled(key) {

package/llms-full.txt

@@ -11,13 +11,13 @@ ranking keeps the relevant context in scope (cutting tokens ~97% as a side
 effect), with no LLM calls, embeddings, or vector database. Works with Claude,
 Cursor, GitHub Copilot, Aider, Windsurf, local LLMs, and MCP.
 
-# Version: 8.16.1 | Benchmark: sigmap-v8.16-main (2026-07-11)
+# Version: 8.17.0 | Benchmark: sigmap-v8.17-main (2026-07-12)
 # Source: auto-generated from package.json, version.json, benchmarks/latest.json, src/mcp/tools.js, src/config/defaults.js
 # Regenerate: npm run generate:llms   |   Validate: npm run validate:llms
 
 ---
 
-## Core metrics (benchmark: sigmap-v8.16-main, 2026-07-11)
+## Core metrics (benchmark: sigmap-v8.17-main, 2026-07-12)
 
 | Metric | Without SigMap | With SigMap |
 |--------|----------------|-------------|

package/llms.txt

@@ -11,7 +11,7 @@ ranking keeps the relevant context in scope (cutting tokens ~97% as a side
 effect), with no LLM calls, embeddings, or vector database. Works with Claude,
 Cursor, GitHub Copilot, Aider, Windsurf, local LLMs, and MCP.
 
-# Version: 8.16.1 | Benchmark: sigmap-v8.16-main (2026-07-11)
+# Version: 8.17.0 | Benchmark: sigmap-v8.17-main (2026-07-12)
 # Source: auto-generated from package.json, version.json, benchmarks/latest.json, src/mcp/tools.js, src/config/defaults.js
 # Regenerate: npm run generate:llms   |   Validate: npm run validate:llms
 
@@ -23,7 +23,7 @@ Cursor, GitHub Copilot, Aider, Windsurf, local LLMs, and MCP.
 - No blast-radius awareness before editing a hub file — `--impact` shows every file a change touches.
 - Pasted stack traces, CI logs, and JSON bloat the prompt — `squeeze` minimizes them and enriches the top frame from the symbol index.
 
-## Core metrics (benchmark: sigmap-v8.16-main, 2026-07-11)
+## Core metrics (benchmark: sigmap-v8.17-main, 2026-07-12)
 
 - hit@5 retrieval: 87.8% vs 13.6% random baseline (6.5× lift)
 - Token reduction: 97.0% average across benchmark repos

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sigmap",
-  "version": "8.16.1",
+  "version": "8.17.0",
   "description": "The deterministic, verifiable grounding layer for AI code work — a zero-dependency signature-and-evidence map that grounds Claude, Cursor, Copilot, Aider, Windsurf, local LLMs & MCP agents against your real code (repo + installed libraries) so they stop hallucinating files, imports & APIs. Runs offline via npx; byte-stable output; ~97% token reduction as proof.",
   "main": "packages/core/index.js",
   "exports": {

package/packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sigmap-cli",
-  "version": "8.16.1",
+  "version": "8.17.0",
   "description": "SigMap CLI wrapper — thin adapter for programmatic CLI invocation",
   "main": "index.js",
   "keywords": [

package/packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sigmap-core",
-  "version": "8.16.1",
+  "version": "8.17.0",
   "description": "SigMap core library — zero-dependency code signature extraction, retrieval, and security scanning",
   "main": "index.js",
   "keywords": [

package/src/extractors/csharp.js

@@ -1,7 +1,11 @@
 'use strict';
 
+const { lineAt, withAnchor } = require('./line-anchor');
+
 /**
  * Extract signatures from C# source code.
+ * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+ * strip below is newline-preserving so anchor lines match the original file.
  * @param {string} src - Raw file content
  * @returns {string[]} Array of signature strings
  */
@@ -11,14 +15,18 @@ function extract(src) {
 
   const stripped = src
     .replace(/\/\/.*$/gm, '')
-    .replace(/\/\*[\s\S]*?\*\//g, '');
+    .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
 
   // Classes and interfaces
   const typeRe = /^\s*(?:public\s+|internal\s+|protected\s+)?(?:abstract\s+|sealed\s+|static\s+)?(class|interface|enum|record|struct)\s+(\w+)(?:<[^{]*>)?(?:\s*:\s*[\w<>, .]+)?\s*\{/gm;
   for (const m of stripped.matchAll(typeRe)) {
-    sigs.push(`${m[1]} ${m[2]}`);
-    const block = extractBlock(stripped, m.index + m[0].length);
-    for (const meth of extractMembers(block)) sigs.push(`  ${meth}`);
+    const declIdx = m.index + (m[0].length - m[0].trimStart().length);
+    const bodyStart = m.index + m[0].length;
+    const block = extractBlock(stripped, bodyStart);
+    sigs.push(withAnchor(`${m[1]} ${m[2]}`, lineAt(stripped, declIdx), lineAt(stripped, bodyStart + block.length)));
+    for (const meth of extractMembers(block)) {
+      sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+    }
   }
 
   return sigs.slice(0, 25);
@@ -41,7 +49,11 @@ function extractMembers(block) {
   for (const m of block.matchAll(methodRe)) {
     const ret = normalizeType(m[1]);
     const retStr = ret ? ` → ${ret}` : '';
-    members.push(`${m[2]}(${normalizeParams(m[3])})${retStr}`);
+    members.push({
+      text: `${m[2]}(${normalizeParams(m[3])})${retStr}`,
+      declIdx: m.index + (m[0].length - m[0].trimStart().length),
+      endIdx: m.index + m[0].length,
+    });
   }
   return members.slice(0, 8);
 }

package/src/extractors/go.js

@@ -1,7 +1,11 @@
 'use strict';
 
+const { lineAt, withAnchor } = require('./line-anchor');
+
 /**
  * Extract signatures from Go source code.
+ * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+ * strip below is newline-preserving so anchor lines match the original file.
  * @param {string} src - Raw file content
  * @returns {string[]} Array of signature strings
  */
@@ -11,26 +15,34 @@ function extract(src) {
 
   const stripped = src
     .replace(/\/\/.*$/gm, '')
-    .replace(/\/\*[\s\S]*?\*\//g, '');
+    .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
+
+  // Index of the closing brace for a block opened just before startIndex.
+  const blockEndIdx = (startIndex) => startIndex + extractBlock(stripped, startIndex).length;
 
   // Structs
   for (const m of stripped.matchAll(/^type\s+(\w+)\s+struct\s*\{/gm)) {
-    sigs.push(`type ${m[1]} struct`);
+    const end = blockEndIdx(m.index + m[0].length);
+    sigs.push(withAnchor(`type ${m[1]} struct`, lineAt(stripped, m.index), lineAt(stripped, end)));
   }
 
   // Interfaces
   for (const m of stripped.matchAll(/^type\s+(\w+)\s+interface\s*\{/gm)) {
-    sigs.push(`type ${m[1]} interface`);
-    const block = extractBlock(stripped, m.index + m[0].length);
-    for (const method of extractInterfaceMethods(block)) sigs.push(`  ${method}`);
+    const bodyStart = m.index + m[0].length;
+    const block = extractBlock(stripped, bodyStart);
+    sigs.push(withAnchor(`type ${m[1]} interface`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+    for (const meth of extractInterfaceMethods(block)) {
+      sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+    }
   }
 
   // Functions and methods — capture return type between ) and {
   for (const m of stripped.matchAll(/^func\s+(?:\((\w+)\s+[\w*]+\)\s+)?(\w+)\s*\(([^)]*)\)([^{]*)\{/gm)) {
     const receiver = m[1] ? `(${m[1]}) ` : '';
     const retType = m[4] ? m[4].trim().replace(/\s+/g, ' ') : '';
-    const retStr = retType ? ` \u2192 ${retType.slice(0, 30)}` : '';
-    sigs.push(`func ${receiver}${m[2]}(${normalizeParams(m[3])})${retStr}`);
+    const retStr = retType ? ` → ${retType.slice(0, 30)}` : '';
+    const end = blockEndIdx(m.index + m[0].length);
+    sigs.push(withAnchor(`func ${receiver}${m[2]}(${normalizeParams(m[3])})${retStr}`, lineAt(stripped, m.index), lineAt(stripped, end)));
   }
 
   return sigs.slice(0, 25);
@@ -51,8 +63,12 @@ function extractInterfaceMethods(block) {
   const methods = [];
   for (const m of block.matchAll(/^\s+(\w+)\s*\(([^)]*)\)([^\n]*)/gm)) {
     const retType = m[3] ? m[3].trim().replace(/\s+/g, ' ') : '';
-    const retStr = retType ? ` \u2192 ${retType.slice(0, 30)}` : '';
-    methods.push(`${m[1]}(${normalizeParams(m[2])})${retStr}`);
+    const retStr = retType ? ` → ${retType.slice(0, 30)}` : '';
+    methods.push({
+      text: `${m[1]}(${normalizeParams(m[2])})${retStr}`,
+      declIdx: m.index + (m[0].length - m[0].trimStart().length),
+      endIdx: m.index + m[0].length,
+    });
   }
   return methods.slice(0, 8);
 }

package/src/extractors/java.js

@@ -1,7 +1,11 @@
 'use strict';
 
+const { lineAt, withAnchor } = require('./line-anchor');
+
 /**
  * Extract signatures from Java source code.
+ * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+ * strip below is newline-preserving so anchor lines match the original file.
  * @param {string} src - Raw file content
  * @returns {string[]} Array of signature strings
  */
@@ -11,14 +15,17 @@ function extract(src) {
 
   const stripped = src
     .replace(/\/\/.*$/gm, '')
-    .replace(/\/\*[\s\S]*?\*\//g, '');
+    .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
 
   // Classes and interfaces
   const typeRegex = /^(?:public\s+|protected\s+)?(?:abstract\s+|final\s+)?(class|interface|enum)\s+(\w+)(?:\s+extends\s+[\w<>, .]+)?(?:\s+implements\s+[\w<>, .]+)?\s*\{/gm;
   for (const m of stripped.matchAll(typeRegex)) {
-    sigs.push(`${m[1]} ${m[2]}`);
-    const block = extractBlock(stripped, m.index + m[0].length);
-    for (const meth of extractMembers(block)) sigs.push(`  ${meth}`);
+    const bodyStart = m.index + m[0].length;
+    const block = extractBlock(stripped, bodyStart);
+    sigs.push(withAnchor(`${m[1]} ${m[2]}`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+    for (const meth of extractMembers(block)) {
+      sigs.push(withAnchor(`  ${meth.text}`, lineAt(stripped, bodyStart + meth.declIdx), lineAt(stripped, bodyStart + meth.endIdx)));
+    }
   }
 
   return sigs.slice(0, 25);
@@ -42,7 +49,11 @@ function extractMembers(block) {
   for (const m of block.matchAll(methodRe)) {
     const ret = normalizeType(m[1]);
     const retStr = ret ? ` → ${ret}` : '';
-    members.push(`${m[2]}(${normalizeParams(m[3])})${retStr}`);
+    members.push({
+      text: `${m[2]}(${normalizeParams(m[3])})${retStr}`,
+      declIdx: m.index + (m[0].length - m[0].trimStart().length),
+      endIdx: m.index + m[0].length,
+    });
   }
   return members.slice(0, 8);
 }

package/src/extractors/rust.js

@@ -1,7 +1,11 @@
 'use strict';
 
+const { lineAt, withAnchor } = require('./line-anchor');
+
 /**
  * Extract signatures from Rust source code.
+ * Signatures carry `:start-end` line anchors (Surgical Context); the comment
+ * strip below is newline-preserving so anchor lines match the original file.
  * @param {string} src - Raw file content
  * @returns {string[]} Array of signature strings
  */
@@ -11,35 +15,55 @@ function extract(src) {
 
   const stripped = src
     .replace(/\/\/.*$/gm, '')
-    .replace(/\/\*[\s\S]*?\*\//g, '');
+    .replace(/\/\*[\s\S]*?\*\//g, (s) => s.replace(/[^\n]/g, ' '));
+
+  // Anchor range for a declaration at declIdx whose header ends at afterIdx:
+  // if a `{` body follows, range to its closing brace; else single-line.
+  const rangeFor = (declIdx, afterIdx) => {
+    let k = afterIdx;
+    while (k < stripped.length && /[ \t]/.test(stripped[k])) k++;
+    if (stripped[k] === '{') {
+      const end = k + 1 + extractBlock(stripped, k + 1).length;
+      return [lineAt(stripped, declIdx), lineAt(stripped, end)];
+    }
+    const line = lineAt(stripped, declIdx);
+    return [line, line];
+  };
 
   // Structs
   for (const m of stripped.matchAll(/^pub\s+struct\s+(\w+)(?:<[^{]*>)?/gm)) {
-    sigs.push(`pub struct ${m[1]}`);
+    const [s, e] = rangeFor(m.index, m.index + m[0].length);
+    sigs.push(withAnchor(`pub struct ${m[1]}`, s, e));
   }
 
   // Enums
   for (const m of stripped.matchAll(/^pub\s+enum\s+(\w+)(?:<[^{]*>)?/gm)) {
-    sigs.push(`pub enum ${m[1]}`);
+    const [s, e] = rangeFor(m.index, m.index + m[0].length);
+    sigs.push(withAnchor(`pub enum ${m[1]}`, s, e));
   }
 
   // Traits
   for (const m of stripped.matchAll(/^pub\s+trait\s+(\w+)(?:<[^{]*>)?/gm)) {
-    sigs.push(`pub trait ${m[1]}`);
+    const [s, e] = rangeFor(m.index, m.index + m[0].length);
+    sigs.push(withAnchor(`pub trait ${m[1]}`, s, e));
   }
 
   // impl blocks
   for (const m of stripped.matchAll(/^impl(?:<[^>]*>)?\s+(?:[\w:]+\s+for\s+)?(\w+)(?:<[^{]*>)?\s*\{/gm)) {
-    sigs.push(`impl ${m[1]}`);
-    const block = extractBlock(stripped, m.index + m[0].length);
-    for (const fn of extractMethods(block)) sigs.push(`  ${fn}`);
+    const bodyStart = m.index + m[0].length;
+    const block = extractBlock(stripped, bodyStart);
+    sigs.push(withAnchor(`impl ${m[1]}`, lineAt(stripped, m.index), lineAt(stripped, bodyStart + block.length)));
+    for (const fn of extractMethods(block)) {
+      sigs.push(withAnchor(`  ${fn.text}`, lineAt(stripped, bodyStart + fn.declIdx), lineAt(stripped, bodyStart + fn.endIdx)));
+    }
   }
 
   // Top-level pub fns — capture everything after ) up to { or ; for return type
   for (const m of stripped.matchAll(/^pub(?:\s+async)?\s+fn\s+(\w+)(?:<[^(]*>)?\s*\(([^)]*)\)([^{;]*)/gm)) {
     const asyncKw = m[0].includes('async') ? 'async ' : '';
     const retStr = extractReturnType(m[3]);
-    sigs.push(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`);
+    const [s, e] = rangeFor(m.index, m.index + m[0].length);
+    sigs.push(withAnchor(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`, s, e));
   }
 
   return sigs.slice(0, 25);
@@ -61,7 +85,11 @@ function extractMethods(block) {
   for (const m of block.matchAll(/^\s+pub(?:\s+async)?\s+fn\s+(\w+)(?:<[^(]*>)?\s*\(([^)]*)\)([^{;]*)/gm)) {
     const asyncKw = m[0].includes('async') ? 'async ' : '';
     const retStr = extractReturnType(m[3]);
-    methods.push(`pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`);
+    methods.push({
+      text: `pub ${asyncKw}fn ${m[1]}(${normalizeParams(m[2])})${retStr}`,
+      declIdx: m.index + (m[0].length - m[0].trimStart().length),
+      endIdx: m.index + m[0].length,
+    });
   }
   return methods.slice(0, 8);
 }
@@ -76,7 +104,7 @@ function extractReturnType(afterParen) {
   const m = afterParen.match(/->\s*([^{;]+)/);
   if (!m) return '';
   const rt = m[1].trim().replace(/\s+/g, ' ');
-  return ` \u2192 ${rt.length > 30 ? rt.slice(0, 27) + '...' : rt}`;
+  return ` → ${rt.length > 30 ? rt.slice(0, 27) + '...' : rt}`;
 }
 
 module.exports = { extract };

package/src/mcp/server.js

@@ -18,7 +18,7 @@ const { readContext, searchSignatures, getMap, createCheckpoint, getRouting, exp
 
 const SERVER_INFO = {
   name: 'sigmap',
-  version: '8.16.1',
+  version: '8.17.0',
   description: 'SigMap MCP server — code signatures on demand',
 };