code-context-control 2.123.0__tar.gz → 2.124.0__tar.gz

{code_context_control-2.123.0/code_context_control.egg-info → code_context_control-2.124.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.123.0
+Version: 2.124.0
 Summary: Local MCP code-intelligence for AI coding tools: surgical search/read/edit, agent-config version history, path-level access + masking guards, and a multi-project hub.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.123.0 → code_context_control-2.124.0}/cli/c3.py

@@ -92,7 +92,7 @@ console = Console() if HAS_RICH else None
 # Config
 CONFIG_DIR = ".c3"
 CONFIG_FILE = ".c3/config.json"
-__version__ = "2.123.0"
+__version__ = "2.124.0"
 
 
 def _compress_file_cli(compressor, path, mode="smart", **kw):

{code_context_control-2.123.0 → code_context_control-2.124.0}/cli/mcp_server.py

@@ -47,7 +47,6 @@ C3_VERSION = _read_version()
 # Tool handlers
 from cli.tools._helpers import maybe_related_facts, validate_file_path
 from cli.tools.agent import handle_agent
-from cli.tools.compress import handle_compress
 from cli.tools.delegate import handle_delegate
 from cli.tools.edit import handle_edit
 from cli.tools.filter import handle_filter
@@ -85,7 +84,7 @@ def _build_instructions(ide_name: str) -> str:
     return (
         "C3 — local code intelligence. Route by goal:\n"
         "  FIND candidates → c3_search\n"
-        "  MAP a file → c3_read(file_path) with no symbols, then READ → c3_read(symbols=…); batch maps → c3_compress\n"
+        "  MAP a file/dir → c3_read(file_path) with no symbols (comma paths batch), then READ → c3_read(symbols=…)\n"
         "  EDIT code → c3_edit (always; it logs to the ledger automatically)\n"
         "  VALIDATE after every edit → c3_validate\n"
         "  BLAST RADIUS before shared-symbol edits → c3_impact\n"
@@ -598,22 +597,10 @@ async def c3_read(file_path: str, symbols: Any = None, lines: Any = None,
     return await asyncio.to_thread(handle_read, file_path, symbols, lines, include_docstrings, svc, finalize)
 
 
-@mcp.tool()
-async def c3_compress(file_path: str, mode: str = "map", ctx: Context = None) -> str:
-    """MAP a file — one line per symbol with full signature and [La-Lb] range, ~10% of the
-    file's tokens (read-only, plan-mode safe). Same map as c3_read(file_path) with no symbols;
-    use this form for a comma-separated batch (up to 10). mode: map (default); other modes
-    are legacy."""
-    path_err = validate_file_path(file_path)
-    if path_err:
-        return f"[c3_compress:error] {path_err}"
-    svc = _svc(ctx)
-
-    def finalize(name, args, resp, summ, **kw):
-        return _finalize_response(ctx, name, args, resp, summ, **kw)
-
-    return await asyncio.to_thread(handle_compress, file_path, mode, svc, finalize, maybe_related_facts)
-
+# c3_compress left the MCP surface in 2.124.0: c3_read(file_path) serves the
+# same map, c3_read('a.py,b.py') the same batch, c3_read('<dir>') a directory.
+# handle_compress stays importable for c3_project, the Oracle bridge and the
+# CLI (docs/file-map.md § Retired modes).
 
 @mcp.tool()
 async def c3_validate(file_path: str, ctx: Context = None) -> str:

{code_context_control-2.123.0 → code_context_control-2.124.0}/cli/tools/compress.py

@@ -102,7 +102,7 @@ def _build_map(svc, rel: str) -> str:
         svc.file_memory.complete_updates(completed)
     if failed:
         svc.file_memory.complete_updates(failed, failed=True)
-    return svc.file_memory.get_or_build_map(rel)
+    return svc.file_memory.get_or_build_map(rel, max_tokens=svc.file_memory.MAP_TOKEN_BUDGET)
 
 
 def _compress_single(file_path: str, requested: str, note: str, svc, finalize) -> str:
@@ -197,7 +197,8 @@ def _compress_batch(paths: list, requested: str, note: str, svc, finalize) -> st
                 return fp, None, None, None, "not found"
             rel = str(full.resolve().relative_to(
                 Path(svc.project_path).resolve())).replace("\\", "/")
-            res = svc.file_memory.get_or_build_map(rel)
+            res = svc.file_memory.get_or_build_map(
+                rel, max_tokens=svc.file_memory.MAP_TOKEN_BUDGET)
             try:
                 raw_tok = count_tokens(full.read_text(encoding="utf-8", errors="replace"))
                 map_tok = count_tokens(res)

{code_context_control-2.123.0 → code_context_control-2.124.0}/cli/tools/read.py

@@ -331,7 +331,8 @@ def handle_read(file_path: str, symbols: Any = None, lines: Any = None,
 
     if not ranges:
         map_cached = not svc.file_memory.needs_update(rel_path)
-        file_map = svc.file_memory.get_or_build_map(rel_path)
+        file_map = svc.file_memory.get_or_build_map(
+            rel_path, max_tokens=svc.file_memory.MAP_TOKEN_BUDGET)
         if count_tokens(file_map) >= full_file_tokens():
             # A map that costs more than the file is worth nothing: serve the
             # file (docs/file-map.md § Small files).
@@ -341,6 +342,8 @@ def handle_read(file_path: str, symbols: Any = None, lines: Any = None,
                 + "\n[map only — pass lines=[start,end] or symbols=[...] for exact source]"
                 + maybe_related_facts(svc, rel_path, top_k=3, context="read"))
         map_tok = count_tokens(resp)
+        if finalize is None:
+            return resp
         return finalize_with_tokens(
             finalize, svc, "c3_read", {"file": file_path},
             resp, f"{full_file_tokens()}->{map_tok}tok",

{code_context_control-2.123.0 → code_context_control-2.124.0/code_context_control.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-context-control
-Version: 2.123.0
+Version: 2.124.0
 Summary: Local MCP code-intelligence for AI coding tools: surgical search/read/edit, agent-config version history, path-level access + masking guards, and a multi-project hub.
 Author-email: Dimitri Tselenchuk <dtselenc@gmail.com>
 License-Expression: Apache-2.0

{code_context_control-2.123.0 → code_context_control-2.124.0}/code_context_control.egg-info/SOURCES.txt

@@ -394,6 +394,7 @@ tests/test_jira_credentials.py
 tests/test_jira_links.py
 tests/test_jira_routes.py
 tests/test_jira_tool.py
+tests/test_large_files_c4.py
 tests/test_lazy_store_init.py
 tests/test_map_eval.py
 tests/test_map_telemetry_c0.py

{code_context_control-2.123.0 → code_context_control-2.124.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "code-context-control"
-version = "2.123.0"
+version = "2.124.0"
 description = "Local MCP code-intelligence for AI coding tools: surgical search/read/edit, agent-config version history, path-level access + masking guards, and a multi-project hub."
 readme = "README.md"
 requires-python = ">=3.10"

{code_context_control-2.123.0 → code_context_control-2.124.0}/services/file_map.py

@@ -56,7 +56,7 @@ _PY_DEF = re.compile(r"^(?:async\s+)?def\s+[\w.]+\s*\((?P<params>.*)\)\s*(?:->\s
 _PY_CLASS = re.compile(r"^class\s+\w+\s*(?:\((?P<bases>.*)\))?\s*:?$")
 _GO_FUNC = re.compile(r"^func\s+(?:\((?P<recv>[^)]*)\)\s*)?\w+\s*\((?P<params>.*?)\)\s*(?P<ret>[^{]*?)\s*\{?$")
 _RS_FN = re.compile(r"^(?:pub(?:\([^)]*\))?\s+)?(?:async\s+|const\s+|unsafe\s+)*fn\s+\w+(?:<[^>]*>)?\s*\((?P<params>.*)\)\s*(?:->\s*(?P<ret>[^{]+?))?\s*(?:where\b.*)?\{?$")
-_JS_FUNC = re.compile(r"^(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*\*?\s*\w*\s*(?:<[^>]*>)?\s*\((?P<params>.*)\)\s*(?::\s*(?P<ret>[^{]+?))?\s*\{?$")
+_JS_FUNC = re.compile(r"^(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*\*?\s*[\w$]*\s*(?:<[^>]*>)?\s*\((?P<params>.*)\)\s*(?::\s*(?P<ret>[^{]+?))?\s*\{?\s*$")
 _JS_ARROW = re.compile(r"^(?:export\s+)?(?:const|let|var)\s+\w+\s*(?::[^=]+)?=\s*(?:async\s+)?\((?P<params>.*)\)\s*(?::\s*(?P<ret>[^=]+?))?\s*=>")
 _JS_ARROW1 = re.compile(r"^(?:export\s+)?(?:const|let|var)\s+\w+\s*=\s*(?:async\s+)?(?P<params>\w+)\s*=>")
 _JS_CLASS = re.compile(r"^(?:export\s+)?(?:default\s+)?(?:abstract\s+)?class\s+\w+(?:<[^>]*>)?\s*(?:extends\s+(?P<base>[\w.<>, ]+?))?\s*(?:implements\s+(?P<impl>[\w.<>, ]+?))?\s*\{?$")
@@ -67,6 +67,40 @@ def _norm(text: str) -> str:
     return _WS.sub(" ", str(text or "")).strip()
 
 
+def _declaration_head(sig: str) -> str:
+    """Cut a brace-language signature after its parameter list and return
+    type: the text up to the body's `{`, an arrow, or a `;`. Parentheses
+    are depth-matched, so a 400-char minified chunk holding several
+    declarations yields only the first one's head."""
+    i = sig.find("(")
+    if i < 0:
+        j = sig.find("{")
+        return sig if j < 0 else sig[:j].rstrip()
+    depth = 0
+    close = -1
+    for k in range(i, len(sig)):
+        ch = sig[k]
+        if ch == "(":
+            depth += 1
+        elif ch == ")":
+            depth -= 1
+            if depth == 0:
+                close = k
+                break
+    if close < 0:
+        return sig
+    rest = sig[close + 1:]
+    cut = len(rest)
+    for stop in ("{", ";"):
+        j = rest.find(stop)
+        if 0 <= j < cut:
+            cut = j
+    j = rest.find("=>")
+    if 0 <= j < cut:
+        cut = j + 2   # keep the arrow: the arrow-function grammar needs it
+    return (sig[:close + 1] + rest[:cut]).rstrip()
+
+
 def parse_signature(signature: str, language: str) -> dict:
     """Split a raw signature into params / ret / receiver / bases.
 
@@ -78,6 +112,10 @@ def parse_signature(signature: str, language: str) -> dict:
     if not sig:
         return {}
     lang = (language or "").lower()
+    if lang in ("javascript", "typescript", "go", "rust") and not sig.lstrip().startswith(
+            ("class ", "export class", "export default class", "abstract class",
+             "struct ", "pub struct", "enum ", "pub enum", "trait ", "pub trait", "impl ", "type ")):
+        sig = _declaration_head(sig)
     out: dict = {}
     if lang == "python":
         m = _PY_DEF.match(sig)
@@ -290,6 +328,25 @@ def render_map(record: dict, *, include_docs: bool = False,
     header = f"# {path} ({total_lines}L {language})".rstrip()
     body: list = []
 
+    shape = record.get("shape") or {}
+    parser = str(record.get("parser") or "")
+    minified = bool(shape.get("minified"))
+    if parser == "skipped" or shape.get("oversized"):
+        body.append(f"[map:not mapped] {shape.get('bytes', 0):,} bytes on {total_lines} lines, "
+                    f"longest line {shape.get('longest_line', 0):,} chars — read with lines=[a,b]")
+        return "\n".join([header] + body)
+    if parser == "lexical":
+        body.append("[map:lexical-fallback] the parse overran its deadline; "
+                    "symbols come from a line scan and may be incomplete")
+    if minified:
+        # A minified bundle's `var` soup is not structure; named declarations are.
+        soup = [s for s in sections if s.get("type") in ("variable", "constant")]
+        sections = [s for s in sections if s.get("type") not in ("variable", "constant")]
+        body.append(f"[map:minified] longest line {shape.get('longest_line', 0):,} chars; "
+                    f"{len(soup)} var bindings omitted")
+    elif shape.get("generated"):
+        body.append("[map:generated] the file says it is generated")
+
     imports = [s for s in sections if s.get("type") == "import"]
     others = [s for s in sections if s.get("type") != "import"]
     if imports:
@@ -329,7 +386,9 @@ def render_map(record: dict, *, include_docs: bool = False,
         while kept and count_tokens("\n".join([header] + kept)) > max_tokens:
             kept.pop()
         dropped = len(body) - len(kept)
-        text = "\n".join([header] + kept + [f"… {dropped} more symbols"])
+        text = "\n".join([header] + kept + [
+            f"… {dropped} more symbols (map budget {max_tokens} tokens; "
+            f"pass symbols=[…] or lines=[a,b] for the part you need)"])
     return text
 
 

{code_context_control-2.123.0 → code_context_control-2.124.0}/services/file_memory.py

@@ -195,6 +195,10 @@ class FileMemoryStore:
             "parser": parser,
             "sections": sections,
         }
+        shape = getattr(self, "_last_shape", None) or {}
+        if shape.get("minified") or shape.get("generated") or shape.get("oversized"):
+            record["shape"] = {k: shape[k] for k in ("minified", "generated", "oversized",
+                                                      "longest_line", "bytes") if k in shape}
 
         self._save(rel_path, record)
         self._cache_map(rel_path, record)
@@ -213,17 +217,31 @@ class FileMemoryStore:
             return None
         return self._cache_map(rel_path, record)
 
-    def get_or_build_map(self, rel_path: str) -> str:
-        """Get map if cached, otherwise build it on-demand."""
+    #: Default token budget for a map served to the model (C4, 2.124.0). A
+    #: 250 KB generated module renders 117k tokens unbounded; the MCP
+    #: response cap is 25k. Over budget the map keeps its first lines and
+    #: says how many symbols it left out.
+    MAP_TOKEN_BUDGET = 6000
+
+    def get_or_build_map(self, rel_path: str, max_tokens: Optional[int] = None) -> str:
+        """Get map if cached, otherwise build it on-demand.
+
+        `max_tokens` renders a budgeted map (never cached); None serves the
+        cached full map.
+        """
         record = self.get(rel_path)
 
         # Check staleness
         if record and not self.needs_update(rel_path):
+            if max_tokens:
+                return render_map(record, max_tokens=max_tokens)
             return self._cache_map(rel_path, record)
 
         # Build fresh
         updated = self.update(rel_path)
         if updated:
+            if max_tokens:
+                return render_map(updated, max_tokens=max_tokens)
             return self._cache_map(rel_path, updated)
 
         return f"[file_map] Could not build map for {rel_path} — file not found or unreadable."
@@ -556,6 +574,39 @@ class FileMemoryStore:
     PARSER_TREE_SITTER = "tree_sitter"
     PARSER_REGEX = "regex"
     PARSER_GENERIC = "generic"
+    PARSER_LEXICAL = "lexical"       # deadline or parse failure -> regex scan
+    PARSER_SKIPPED = "skipped"       # minified / oversized: not parsed
+
+    #: Bounds for large files (C4, 2.124.0). A parse that overruns the
+    #: deadline is abandoned for the regex scan; a minified or oversized
+    #: file is not parsed at all.
+    PARSE_DEADLINE_S = 1.5
+    MAX_PARSE_BYTES = 2 * 1024 * 1024
+    MINIFIED_LINE_CHARS = 2000
+    MINIFIED_AVG_LINE_CHARS = 400
+    GENERATED_MARKERS = ("do not edit", "autogenerated", "auto-generated",
+                         "@generated", "generated by", "generated file")
+
+    @classmethod
+    def classify_large(cls, content: str) -> dict:
+        """Cheap shape facts before any parse: {minified, generated, longest_line, oversized}."""
+        size = len(content)
+        longest = 0
+        n_lines = 0
+        for line in content.split("\n"):
+            n_lines += 1
+            if len(line) > longest:
+                longest = len(line)
+        avg = size / max(1, n_lines)
+        head = "\n".join(content.split("\n", 6)[:6]).lower()
+        return {
+            "bytes": size,
+            "lines": n_lines,
+            "longest_line": longest,
+            "minified": longest >= cls.MINIFIED_LINE_CHARS and avg >= cls.MINIFIED_AVG_LINE_CHARS,
+            "generated": any(m in head for m in cls.GENERATED_MARKERS),
+            "oversized": size >= cls.MAX_PARSE_BYTES,
+        }
 
     def _extract_sections(self, filepath: Path, content: str) -> list:
         """Extract structural sections with line ranges from source code."""
@@ -570,18 +621,56 @@ class FileMemoryStore:
         older single-value call keeps working.
         """
         ext = filepath.suffix.lower()
-
-        # Try AST parser first
-        ast_sections = extract_sections_ast(content, ext)
-        if ast_sections is not None:
-            return ast_sections, self.PARSER_TREE_SITTER
+        shape = self.classify_large(content)
+        self._last_shape = shape
+        if shape["oversized"]:
+            # Not worth a parse: the map says so and stops (docs/file-map.md
+            # § Large files). Minified files ARE parsed — bounded signature
+            # capture made that cheap — and the renderer drops their
+            # binding soup.
+            return [{"type": "content", "name": "(not mapped)",
+                     "line_start": 1, "line_end": max(1, shape["lines"]),
+                     "note": "oversized"}], self.PARSER_SKIPPED
 
         lines = content.splitlines()
         patterns = STRUCTURE_PATTERNS.get(ext, {})
 
+        # Try AST parser first, under a deadline. tree-sitter 0.26 has no
+        # parse timeout, so the parse runs on a worker and is abandoned
+        # (not killed) when it overruns; the regex scan answers instead.
+        ast_sections, overran = self._extract_ast_with_deadline(content, ext)
+        if ast_sections is not None:
+            return ast_sections, self.PARSER_TREE_SITTER
+        if overran and patterns:
+            secs, _ = self._extract_regex_sections(lines, ext, patterns)
+            return secs, self.PARSER_LEXICAL
+
         if not patterns:
             return self._extract_generic_sections(lines), self.PARSER_GENERIC
 
+        secs, _ = self._extract_regex_sections(lines, ext, patterns)
+        return secs, self.PARSER_REGEX
+
+    def _extract_ast_with_deadline(self, content: str, ext: str):
+        """(sections | None, overran). Runs extract_sections_ast on a worker
+        thread bounded by PARSE_DEADLINE_S; the thread is daemonic so an
+        abandoned parse cannot hold the process open."""
+        import concurrent.futures as _cf
+        pool = _cf.ThreadPoolExecutor(max_workers=1, thread_name_prefix="c3-parse")
+        try:
+            fut = pool.submit(extract_sections_ast, content, ext)
+            try:
+                return fut.result(timeout=self.PARSE_DEADLINE_S), False
+            except _cf.TimeoutError:
+                self._record_diag("parse_deadline", ext, f"{len(content)} bytes")
+                return None, True
+            except Exception:
+                return None, True
+        finally:
+            pool.shutdown(wait=False)
+
+    def _extract_regex_sections(self, lines: list, ext: str, patterns: dict) -> tuple:
+        """The regex/indentation extractor (the pre-tree-sitter path)."""
         sections = []
         i = 0
         current_class = None  # Track current class for method nesting
@@ -674,6 +763,14 @@ class FileMemoryStore:
 
         base_indent = len(lines[start]) - len(lines[start].lstrip())
 
+        def _last_code_line(upto: int) -> int:
+            # 1-indexed line number of the last non-blank line before `upto`
+            # (0-indexed exclusive): blank lines belong to nobody.
+            j = upto
+            while j > start + 1 and not lines[j - 1].strip():
+                j -= 1
+            return j
+
         for i in range(start + 1, len(lines)):
             line = lines[i]
             stripped = line.strip()
@@ -681,11 +778,11 @@ class FileMemoryStore:
                 continue
             current_indent = len(line) - len(line.lstrip())
             if current_indent <= base_indent:
-                return i  # 1-indexed
+                return _last_code_line(i)  # 1-indexed
             # Check for decorators at same level (next function)
             if current_indent == base_indent and stripped.startswith('@'):
-                return i
-        return len(lines)
+                return _last_code_line(i)
+        return _last_code_line(len(lines))
 
     def _find_brace_block_end(self, lines: list, start: int) -> int:
         """Find end of a brace-delimited block.

{code_context_control-2.123.0 → code_context_control-2.124.0}/services/parser.py

@@ -57,6 +57,28 @@ PARSER_VERSION = "4"  # 4: records carry parser attribution, no summary, posix p
 
 _WS_RUN = re.compile(r"\s+")
 
+#: A signature is never longer than this. A 680 KB minified line used to be
+#: copied into every one of its 20,000 symbols (176 s, an 11 MB record).
+SIGNATURE_MAX_CHARS = 400
+
+
+def _sig_line(lines: List[str], node) -> str:
+    """The node's first line from its start column, capped at SIGNATURE_MAX_CHARS."""
+    row, col = node.start_point
+    line = lines[row] if row < len(lines) else ""
+    chunk = line[col:col + SIGNATURE_MAX_CHARS] if len(line) - col > SIGNATURE_MAX_CHARS else line[col:]
+    if not chunk.strip():
+        chunk = line[:SIGNATURE_MAX_CHARS]
+    return chunk.strip()
+
+
+def _sig_span(lines: List[str], start_row: int, end_row: int) -> str:
+    """Lines start_row..end_row joined, capped at SIGNATURE_MAX_CHARS."""
+    text = "\n".join(lines[start_row:end_row + 1]).strip()
+    if len(text) > SIGNATURE_MAX_CHARS:
+        text = text[:SIGNATURE_MAX_CHARS].rstrip() + "…"
+    return text
+
 
 def _node_text(node, lines: List[str]) -> str:
     """The source text of a node, joined across lines, whitespace-normalized."""
@@ -157,7 +179,7 @@ def _walk_python(node, lines: List[str], sections: List[Dict[str, Any]], parent_
             # Find the colon
             colon_node = next((c for c in child.children if c.type == ':'), None)
             sig_end = colon_node.end_point[0] if colon_node else sig_start
-            signature = '\n'.join(lines[sig_start:sig_end+1]).strip()
+            signature = _sig_span(lines, sig_start, sig_end)
 
             section = {
                 "type": "class",
@@ -186,7 +208,7 @@ def _walk_python(node, lines: List[str], sections: List[Dict[str, Any]], parent_
             sig_start = child.start_point[0]
             colon_node = next((c for c in child.children if c.type == ':'), None)
             sig_end = colon_node.end_point[0] if colon_node else sig_start
-            signature = '\n'.join(lines[sig_start:sig_end+1]).strip()
+            signature = _sig_span(lines, sig_start, sig_end)
 
             is_async = any(c.type == 'async' for c in child.children)
 
@@ -232,7 +254,7 @@ def _walk_python(node, lines: List[str], sections: List[Dict[str, Any]], parent_
                                 "name": name,
                                 "line_start": child.start_point[0] + 1,
                                 "line_end": child.end_point[0] + 1,
-                                "signature": lines[child.start_point[0]].strip()
+                                "signature": _sig_line(lines, child)
                             })
 
         elif child.type == 'comment':
@@ -249,10 +271,10 @@ def _walk_python(node, lines: List[str], sections: List[Dict[str, Any]], parent_
         elif child.type in ('import_statement', 'import_from_statement'):
             section = {
                 "type": "import",
-                "name": lines[child.start_point[0]].strip(),
+                "name": _sig_line(lines, child),
                 "line_start": child.start_point[0] + 1,
                 "line_end": child.end_point[0] + 1,
-                "signature": lines[child.start_point[0]].strip()
+                "signature": _sig_line(lines, child)
             }
             if not parent_section:
                 sections.append(section)
@@ -294,7 +316,7 @@ def _walk_js_ts(node, lines: List[str], sections: List[Dict[str, Any]], parent_s
             name = lines[name_node.start_point[0]][name_node.start_point[1]:name_node.end_point[1]] if name_node else 'Unknown'
 
             # Simple signature heuristic: first line
-            signature = lines[child.start_point[0]].strip()
+            signature = _sig_line(lines, child)
 
             t = child.type.split('_')[0]
             section = {
@@ -321,7 +343,7 @@ def _walk_js_ts(node, lines: List[str], sections: List[Dict[str, Any]], parent_s
             name_node = next((c for c in child.children if c.type in ('property_identifier', 'identifier', 'private_property_identifier')), None)
             name = lines[name_node.start_point[0]][name_node.start_point[1]:name_node.end_point[1]] if name_node else 'Unknown'
 
-            signature = lines[child.start_point[0]].strip()
+            signature = _sig_line(lines, child)
 
             is_async = any(c.type == 'async' for c in child.children)
 
@@ -373,7 +395,7 @@ def _walk_js_ts(node, lines: List[str], sections: List[Dict[str, Any]], parent_s
                         "name": name,
                         "line_start": child.start_point[0] + 1,
                         "line_end": child.end_point[0] + 1,
-                        "signature": lines[child.start_point[0]].strip()
+                        "signature": _sig_line(lines, child)
                     }
                     if is_async: section["async"] = True
                     doc = _extract_docstring_js(child, lines)
@@ -391,7 +413,7 @@ def _walk_js_ts(node, lines: List[str], sections: List[Dict[str, Any]], parent_s
                         "name": name,
                         "line_start": child.start_point[0] + 1,
                         "line_end": child.end_point[0] + 1,
-                        "signature": lines[child.start_point[0]].strip()
+                        "signature": _sig_line(lines, child)
                     })
 
         elif child.type == 'comment':
@@ -408,10 +430,10 @@ def _walk_js_ts(node, lines: List[str], sections: List[Dict[str, Any]], parent_s
         elif child.type == 'import_statement':
             section = {
                 "type": "import",
-                "name": lines[child.start_point[0]].strip(),
+                "name": _sig_line(lines, child),
                 "line_start": child.start_point[0] + 1,
                 "line_end": child.end_point[0] + 1,
-                "signature": lines[child.start_point[0]].strip()
+                "signature": _sig_line(lines, child)
             }
             if not parent_section:
                 sections.append(section)
@@ -446,7 +468,7 @@ def _walk_html(node, lines: List[str], sections: List[Dict[str, Any]]):
                         "name": f"{tag_name}: {text_content.strip()[:60]}",
                         "line_start": child.start_point[0] + 1,
                         "line_end": child.end_point[0] + 1,
-                        "signature": lines[child.start_point[0]].strip()
+                        "signature": _sig_line(lines, child)
                     })
 
                 # Check for ID attribute
@@ -474,7 +496,7 @@ def _walk_html(node, lines: List[str], sections: List[Dict[str, Any]]):
                             "tag": tag_name,
                             "line_start": child.start_point[0] + 1,
                             "line_end": child.end_point[0] + 1,
-                            "signature": lines[child.start_point[0]].strip()
+                            "signature": _sig_line(lines, child)
                         })
 
             # Recurse into element children
@@ -504,7 +526,7 @@ def _walk_markdown(node, lines: List[str], sections: List[Dict[str, Any]]):
                 "name": f"{level}: {content_text.strip()[:60]}",
                 "line_start": child.start_point[0] + 1,
                 "line_end": child.end_point[0] + 1,
-                "signature": lines[child.start_point[0]].strip()
+                "signature": _sig_line(lines, child)
             })
 
         # Recurse if needed (atx headings are top level usually, but just in case)
@@ -582,7 +604,7 @@ def _walk_go(node, lines: List[str], sections: List[Dict[str, Any]]):
             name_node = next((c for c in child.children if c.type == 'identifier' or c.type == 'field_identifier'), None)
             name = lines[name_node.start_point[0]][name_node.start_point[1]:name_node.end_point[1]] if name_node else 'Unknown'
 
-            signature = lines[child.start_point[0]].strip()
+            signature = _sig_line(lines, child)
 
             receiver = ""
             if child.type == 'method_declaration':
@@ -609,7 +631,7 @@ def _walk_go(node, lines: List[str], sections: List[Dict[str, Any]]):
                             "name": _node_text(ident, lines),
                             "line_start": spec.start_point[0] + 1,
                             "line_end": spec.end_point[0] + 1,
-                            "signature": lines[spec.start_point[0]].strip()
+                            "signature": _sig_line(lines, spec)
                         })
         elif child.type == 'type_declaration':
             # Drill into type specs
@@ -625,7 +647,7 @@ def _walk_go(node, lines: List[str], sections: List[Dict[str, Any]]):
                         "name": name,
                         "line_start": child.start_point[0] + 1,
                         "line_end": child.end_point[0] + 1,
-                        "signature": lines[child.start_point[0]].strip()
+                        "signature": _sig_line(lines, child)
                     })
         _walk_go(child, lines, sections)
 
@@ -656,9 +678,9 @@ def _walk_rust(node, lines: List[str], sections: List[Dict[str, Any]]):
                     sig.append(ln)
                     if '{' in ln or ln.rstrip().endswith(';'):
                         break
-                signature = " ".join(x.strip() for x in sig)
+                signature = " ".join(x.strip() for x in sig)[:SIGNATURE_MAX_CHARS]
             else:
-                signature = lines[child.start_point[0]].strip()
+                signature = _sig_line(lines, child)
             sections.append({
                 "type": stype,
                 "name": name,

{code_context_control-2.123.0 → code_context_control-2.124.0}/tests/test_file_map_c1.py

@@ -122,8 +122,10 @@ class TestRenderGrammar(unittest.TestCase):
             store, rec = self._record(tmp)
             full = render_map(rec)
             short = render_map(rec, max_tokens=40)
-            self.assertLessEqual(count_tokens(short), 40 + count_tokens("… 9 more symbols"))
-            self.assertTrue(short.splitlines()[-1].startswith("… "))
+            note = short.splitlines()[-1]
+            self.assertTrue(note.startswith("… "))
+            self.assertIn("more symbols", note)
+            self.assertLessEqual(count_tokens(short), 40 + count_tokens(note))
             self.assertTrue(short.startswith(full.splitlines()[0]))
             self.assertLess(len(short.splitlines()), len(full.splitlines()))