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

{code_context_control-2.122.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.122.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.122.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.122.0"
+__version__ = "2.124.0"
 
 
 def _compress_file_cli(compressor, path, mode="smart", **kw):
@@ -271,7 +271,7 @@ _STALE_MCP_TOOLS = {
     "mcp__c3__c3_remember",           # → c3_memory(action='add')
     "mcp__c3__c3_recall",             # → c3_memory(action='recall')
     "mcp__c3__c3_sltm_add",           # → c3_memory(action='add')
-    "mcp__c3__c3_file_map",           # → c3_compress(mode='map')
+    "mcp__c3__c3_file_map",           # → c3_read(file_path) map
     "mcp__c3__c3_extract",            # → c3_read
     "mcp__c3__c3_transcript_search",  # → c3_search(action='transcript')
     "mcp__c3__c3_session_log",        # → c3_session(action='log')
@@ -3971,7 +3971,7 @@ def cmd_benchmark(args):
             "prompt_budget_multiplier": round(_prompt_gain(comp_comp, comp_orig), 2),
         },
         "file_navigation": {
-            "description": "Use c3_compress(mode='map') to choose targeted reads instead of opening whole files blindly.",
+            "description": "Use the c3_read file map to choose targeted reads instead of opening whole files blindly.",
             "performance_metric": "map success rate",
             "with_c3": {"tool": "c3_compress(mode='map')", "total_tokens": file_map_comp, "avg_latency_ms": round(_avg(file_map_c3_latencies), 2), "performance": round((file_map_successes / len(file_map_sample) * 100), 1) if file_map_sample else 0.0},
             "without_c3": {"approach": "read full files into context", "total_tokens": file_map_orig, "avg_latency_ms": round(_avg(file_map_baseline_latencies), 2), "performance": 100.0},
@@ -5005,7 +5005,7 @@ back to native tools as the task progresses.
 
 ## Quick Reference
 - **Search**: `c3_search(query=..., action='code|files|semantic')` — before Grep/Glob
-- **Read**: `c3_compress(mode='map')` then `c3_read(symbols=...)` — before native Read
+- **Read**: `c3_read(file_path)` maps a file (or directory), then `c3_read(symbols=['Class.method'])` — before native Read
 - **Impact**: `c3_impact(target='symbol')` — blast-radius check before editing shared symbols
 - **Edit**: `c3_edit(file_path=..., old_string=..., new_string=...)` — before Edit/Write
 - **Validate**: `c3_validate(file_path=...)` — after every edit (pyright/tsc type check if installed)

{code_context_control-2.122.0 → code_context_control-2.124.0}/cli/guide/index.html

@@ -636,7 +636,7 @@
             <span>Discover files / content — never start with Grep/Glob</span>
           </div>
           <div class="quick-item">
-            <code>3. c3_compress(mode='map') + c3_read(symbols=…)</code>
+            <code>3. c3_read(file_path) + c3_read(symbols=…)</code>
             <span>Map then surgically read — never start with native Read</span>
           </div>
           <div class="quick-item">

{code_context_control-2.122.0 → code_context_control-2.124.0}/cli/guide/workflow.html

@@ -315,7 +315,7 @@
           <tr>
             <td><span class="badge badge-blue">3</span></td>
             <td><strong>Map + Read</strong></td>
-            <td><code>c3_compress(mode='map')</code> → <code>c3_read(symbols=…)</code></td>
+            <td><code>c3_read(file_path)</code> (map) → <code>c3_read(symbols=…)</code></td>
             <td>Before reading any file content</td>
           </tr>
           <tr>

{code_context_control-2.122.0 → code_context_control-2.124.0}/cli/hook_pretool_enforce.py

@@ -130,7 +130,7 @@ _VAULT_FILES = frozenset({"config.json", "secrets.enc", "cred_state.json",
 # Redirect messages per native tool
 _REDIRECTS = {
     "Read": (
-        "Use c3_compress(file_path='...', mode='map') to map the file first, "
+        "Use c3_read(file_path='...') to map the file first (one line per symbol), "
         "then c3_read(file_path='...', symbols=['...']) for surgical extraction."
     ),
     "Grep": (

{code_context_control-2.122.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.122.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.122.0 → code_context_control-2.124.0}/cli/tools/read.py

@@ -177,6 +177,22 @@ def handle_read(file_path: str, symbols: Any = None, lines: Any = None,
 
     rel_path = str(full.resolve().relative_to(Path(svc.project_path).resolve())).replace("\\", "/")
 
+    if full.is_dir():
+        # A directory maps to one line per file, budgeted
+        # (docs/file-map.md § Directories). `lines=<int>` sets the budget.
+        from services.dir_map import DEFAULT_MAX_TOKENS, render_directory_map
+        budget = DEFAULT_MAX_TOKENS
+        if isinstance(lines, int) and not isinstance(lines, bool) and lines > 0:
+            budget = lines
+        text, dir_detail = render_directory_map(svc, rel_path, max_tokens=budget)
+        tok = count_tokens(text)
+        if finalize is None:
+            return text
+        return finalize_with_tokens(
+            finalize, svc, "c3_read", {"file": file_path}, text,
+            f"dir:{dir_detail['files']}files->{tok}tok",
+            optimized_tokens=tok, response_tokens=tok, detail=dir_detail)
+
     # Resolve ranges
     ranges = []
 
@@ -315,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).
@@ -325,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.122.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.122.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.122.0 → code_context_control-2.124.0}/code_context_control.egg-info/SOURCES.txt

@@ -217,6 +217,7 @@ services/conversation_store.py
 services/cred_audit.py
 services/cred_telemetry.py
 services/credential_store.py
+services/dir_map.py
 services/doc_index.py
 services/e2e_benchmark.py
 services/e2e_evaluator.py
@@ -345,6 +346,7 @@ tests/test_credentials_tool.py
 tests/test_creds_cli_smoke.py
 tests/test_delegate_cascade.py
 tests/test_delegate_version_probe.py
+tests/test_dir_map_c3.py
 tests/test_e2e_benchmark.py
 tests/test_edit_ledger_deadline.py
 tests/test_edit_ledger_hook.py
@@ -392,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.122.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.122.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.122.0 → code_context_control-2.124.0}/services/claude_md.py

@@ -32,7 +32,7 @@ When falling back, state which c3_* tool was attempted and why it was insufficie
 ## Workflow (follow this order — do not skip steps)
 1. **RECALL**: `c3_memory(action='recall')` — before any multi-step or context-dependent task. Large memory stores: use `index` first (compact list), then `fetch` for specific IDs
 2. **SEARCH FIRST**: `c3_search(action='code|files|semantic')` — before ANY file discovery or content search. Never start with Grep/Glob
-3. **MAP before READ**: `c3_compress(mode='map')` then `c3_read(symbols=...|lines=...)` — for ANY file read. Never start with native Read. Use `mode='ast'` for knowledge-graph overview (requires codebase-memory-mcp)
+3. **MAP before READ**: `c3_read(file_path)` with no symbols/lines returns the file map (one line per symbol with signature and `[La-Lb]` range, ~10% of the file's tokens; a directory path maps its files), then `c3_read(symbols=['Class.method']|lines=[a,b])` for the source you need. Never start with native Read. `c3_compress` is the same map for a comma-separated batch (legacy; removed in 2.124.0)
 4. **IMPACT** (shared symbols): `c3_impact(target='symbol')` — blast-radius check before editing any function/class used across files
 5. **EDIT via C3**: `c3_edit(file_path, old_string, new_string, summary)` — for ALL edits. Parallel across files; `edits=[]` batch for same file
 6. **FILTER**: `c3_filter(text=...)` — for terminal output >10 lines or log files
@@ -55,7 +55,7 @@ In plan mode, all c3_* read tools (search, read, compress, filter, validate, sta
 ## Anti-patterns (DO NOT do these)
 - Starting with native file search/read/grep without a prior c3_* call
 - Using native Edit when c3_edit is available
-- Reading entire files when c3_compress + c3_read would be more surgical
+- Reading entire files when a c3_read map + a symbol read would be more surgical
 - Skipping c3_validate after making edits"""
 
 # Pointer that replaces the embedded Project Context tree (v2.60.0).
@@ -73,14 +73,14 @@ C3_NANO_WORKFLOW = """\
 ## C3 Tools — MANDATORY
 Native tools BLOCKED unless c3_* called first. State reason when falling back.
 1. c3_search(action='code|files|semantic') — BEFORE any search/grep/glob
-2. c3_compress(mode='map') then c3_read(symbols=...|lines=...) — BEFORE any file read
+2. c3_read(file_path) maps a file (or directory); then c3_read(symbols=['Class.method']|lines=[a,b]) — BEFORE any file read
 3. c3_edit(file_path, old_string, new_string, summary) — for ALL edits; edits=[{...}] batch
 4. c3_filter(text='...') — output >10 lines
 5. c3_validate(file_path) — after edits
 6. c3_session(action='log'|'snapshot') — decisions / before /clear
 7. `[c3-access:confirm]` = PAUSE, not block: a human approves this exact write (agent-config files — .mcp.json, instruction docs, .claude bodies — hold by default). Read the S8 tail: wait on the request it names (c3_override(action='wait', request_id='...', timeout_s=180)), then retry once. Never retry early, never route around it.
 Plan mode: all c3_* read tools work normally — skip edit/delegate steps.
-DO NOT: start with native Read/Grep/Glob/Edit, skip c3_validate, read full files without c3_compress."""
+DO NOT: start with native Read/Grep/Glob/Edit, skip c3_validate, read full files without mapping them first."""
 
 
 # --- Per-IDE workflow adaptation ----------------------------------------------

{code_context_control-2.122.0 → code_context_control-2.124.0}/services/codex_integration.py

@@ -8,7 +8,7 @@ CODEX_WORKFLOW = """# C3 — Codex workflow
 
 Use C3 for repository intelligence and audited changes:
 1. Recall relevant project facts with c3_memory; inspect .c3/MAP.md.
-2. Find candidates with c3_search; map with c3_compress(mode='map'), then
+2. Find candidates with c3_search; map with c3_read(file_path) (no symbols), then
    read exact symbols or lines with c3_read. Check shared changes with c3_impact.
 3. Edit with c3_edit, validate with c3_validate, and record decisions with
    c3_session(action='log'). Preserve unrelated work.

code_context_control-2.124.0/services/dir_map.py

@@ -0,0 +1,176 @@
+"""Directory maps — one line per file, budgeted, for `c3_read('<dir>')`.
+
+    # services/ (58 files, 41,203L)
+    compressor.py (809L python) — CodeCompressor; compress_file; STRUCTURE_PATTERNS
+    file_map.py (280L python) — render_map; parse_signature; parse_map; KINDS
+    …
+    … 12 more files
+
+Files are ranked the way a reader would want them: recently edited first
+(the edit ledger), then by how much structure they hold (symbol count),
+then by path. The map is filled to a token budget and closes with how
+many files it left out. Traversal is bounded — the scanner's SKIP_DIRS
+and .gitignore pruning, never following symlinks, a hard file cap — and
+structure comes from file_memory records, extracting on the fly only
+for a bounded number of code files (docs/file-map.md § Directories).
+"""
+from __future__ import annotations
+
+import time
+from pathlib import Path
+from typing import Optional
+
+from core import count_tokens
+from services.file_memory import CODE_EXTENSIONS, LANG_MAP
+from services.scanner import iter_files
+
+DEFAULT_MAX_TOKENS = 1500
+MAX_FILES = 400            # hard traversal cap
+MAX_EXTRACT_FILES = 120    # code files parsed on the fly, per call
+EXTRACT_DEADLINE_S = 3.0   # then the rest show line counts only
+MAX_EXTRACT_BYTES = 200 * 1024
+SYMBOLS_PER_FILE = 6
+LEDGER_LOOKBACK = 300      # recent ledger entries consulted for ranking
+
+
+def _recent_edit_ranks(svc) -> dict:
+    """path -> recency rank (0 = most recent) from the edit ledger."""
+    ledger = getattr(svc, "edit_ledger", None)
+    if ledger is None:
+        return {}
+    try:
+        entries = ledger.get_history(limit=LEDGER_LOOKBACK)
+    except Exception:
+        return {}
+    ranks: dict = {}
+    for entry in entries or []:
+        f = str((entry or {}).get("file") or "").replace("\\", "/")
+        if f and f not in ranks:
+            ranks[f] = len(ranks)
+    return ranks
+
+
+#: What a reader wants to see first on a one-line summary of a file.
+_SYMBOL_PRIORITY = {"class": 0, "interface": 0, "struct": 0, "trait": 0, "enum": 0,
+                    "function": 1, "method": 1, "type": 2, "heading": 2, "section": 2,
+                    "constant": 3, "variable": 3}
+_SKIP_SYMBOL_TYPES = {"import", "decorator", "comment", "content", "property", "impl"}
+
+
+def _structural_sections(record: Optional[dict]) -> list:
+    return [s for s in (record or {}).get("sections") or []
+            if s.get("type") not in _SKIP_SYMBOL_TYPES
+            and str(s.get("name") or "").strip() not in ("", "(full file)")]
+
+
+def _top_symbols(record: Optional[dict]) -> list:
+    """Up to SYMBOLS_PER_FILE names: classes first, then functions, then the
+    rest, constants last — each group in source order."""
+    picked = sorted(enumerate(_structural_sections(record)),
+                    key=lambda iv: (_SYMBOL_PRIORITY.get(iv[1].get("type"), 2),
+                                    str(iv[1].get("name") or "").startswith("_"),
+                                    iv[0]))
+    names = []
+    for _, s in picked[:SYMBOLS_PER_FILE]:
+        name = str(s.get("name") or "").strip()
+        if s.get("type") == "heading":
+            name = name.split(":", 1)[-1].strip()
+        names.append(name)
+    return names
+
+
+def _line_count(path: Path) -> int:
+    try:
+        with open(path, "rb") as fh:
+            return sum(1 for _ in fh)
+    except OSError:
+        return 0
+
+
+def render_directory_map(svc, rel_dir: str, *, max_tokens: int = DEFAULT_MAX_TOKENS) -> tuple:
+    """Return (text, detail) for the directory `rel_dir` (project-relative, posix)."""
+    root = Path(svc.project_path).resolve()
+    rel_dir = str(rel_dir).replace("\\", "/").strip("/")
+    target = (root / rel_dir).resolve() if rel_dir else root
+    label = (rel_dir + "/") if rel_dir else "./"
+
+    files = []
+    capped = False
+    for fp in iter_files(target, max_files=MAX_FILES + 1):
+        if len(files) >= MAX_FILES:
+            capped = True
+            break
+        try:
+            files.append(fp.resolve().relative_to(root).as_posix())
+        except ValueError:
+            continue
+
+    store = getattr(svc, "file_memory", None)
+    recent = _recent_edit_ranks(svc)
+    started = time.monotonic()
+    extracted = 0
+    rows = []
+    total_lines = 0
+    for rel in files:
+        record = None
+        if store is not None:
+            try:
+                record = store.get(rel)
+            except Exception:
+                record = None
+            ext = Path(rel).suffix.lower()
+            if (record is None and ext in CODE_EXTENSIONS
+                    and extracted < MAX_EXTRACT_FILES
+                    and time.monotonic() - started < EXTRACT_DEADLINE_S):
+                try:
+                    if (root / rel).stat().st_size <= MAX_EXTRACT_BYTES:
+                        record = store.update(rel)
+                        extracted += 1
+                except Exception:
+                    record = None
+        lines = int((record or {}).get("lines") or 0) or _line_count(root / rel)
+        total_lines += lines
+        ext = Path(rel).suffix.lower()
+        lang = str((record or {}).get("language") or LANG_MAP.get(ext) or ext.lstrip(".") or "")
+        symbols = _top_symbols(record)
+        rows.append({
+            "rel": rel,
+            "name": rel[len(rel_dir) + 1:] if rel_dir and rel.startswith(rel_dir + "/") else rel,
+            "lines": lines,
+            "lang": lang,
+            "symbols": symbols,
+            "recent": recent.get(rel, 10 ** 6),
+            "nsym": len(_structural_sections(record)),
+        })
+
+    rows.sort(key=lambda r: (r["recent"], -r["nsym"], r["rel"]))
+
+    header = f"# {label} ({len(files)}{'+' if capped else ''} files, {total_lines:,}L)"
+    body = []
+    for r in rows:
+        line = f"{r['name']} ({r['lines']}L {r['lang']})".rstrip()
+        if r["symbols"]:
+            line += " — " + "; ".join(r["symbols"])
+        body.append(line)
+
+    kept = list(body)
+    while kept and count_tokens("\n".join([header] + kept)) > max_tokens:
+        kept.pop()
+    dropped = len(body) - len(kept)
+    parts = [header] + kept
+    if dropped:
+        parts.append(f"… {dropped} more files")
+    if capped:
+        parts.append(f"[dir_map] traversal capped at {MAX_FILES} files; map a subdirectory")
+    # In source order the reader gets recency first; say so once.
+    parts.append("[dir_map] recently edited first, then by structure; "
+                 "c3_read('<file>') maps one file")
+    text = "\n".join(parts)
+    detail = {
+        "backend": "directory",
+        "files": len(files),
+        "listed": len(kept),
+        "extracted": extracted,
+        "capped": capped,
+    }
+    return text, detail

{code_context_control-2.122.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