diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84af35ad6..4899b77ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 Full release notes with details on each version: [GitHub Releases](https://github.com/Vit129/graphify/releases)
 
-## 0.17.0 (2026-07-18)
+## Unreleased
+
+- Feature: a fourth `graph.html` view lens, "Calls" — alongside Community/File/Dependencies. Unlike Community (colors by inferred Leiden cluster, which mixes short code-symbol labels with long prose `concept`/`rationale` node labels from the LLM extraction pass) and Dependencies (collapses to one node per file), Calls stays at per-symbol granularity but hides every non-`code` `file_type` node (`concept`/`rationale`/`document`/`paper`) and restricts edges to the same real call/dependency relation whitelist Dependencies already used (`calls`/`imports`/`imports_from`/`references`/`inherits`/`implements`/`indirect_call`/`re_exports`/`uses`/`embeds`) — a plain function-to-function/class-to-class view without doc-node clutter or file collapsing. `graphify/export.py`; the relation whitelist is now hoisted to module scope and shared between the Dependencies and Calls lenses instead of being duplicated.
+- Fix/Feature: `graph.html`'s search box had four gaps that made it harder to find a node than the CLI's `graphify query`. (1) It ignored the active lens — a hidden `concept`/`rationale` node in the new Calls lens could still surface as a search result, and clicking it silently panned the camera to nothing (`isNodeHidden` is now checked). (2) Matching was plain substring-on-label only — it now also tokenizes on camelCase/snake_case boundaries (same split rule as the CLI's `query.py` `_tokenize`, ported to JS) so e.g. searching "notification" finds `handleNotification`. (3) `source_file` is now also matched, so a file path substring finds nodes in that file. (4) A file-type dropdown (`code`/`concept`/`rationale`/`document`/`paper`/all) narrows results directly. Deliberately does not port the CLI's BM25 scoring, typo-correction, or synonym expansion — this is a client-side filter over an at-most-20-result list per keystroke, not a scored corpus search; a lightweight tiered ranking (exact > token match > token prefix > file match > substring) is enough at that scale.
 
-- Feature: `.html`/`.htm` extraction now also runs a JS pass over inline `<script>` block bodies (`graphify/extract.py`'s `extract_html_with_scripts`, reusing the Vue SFC extractor's `_vue_mask_non_script` blank-and-preserve-newlines technique — that regex was already generic HTML script-tag matching, not Vue-specific). Previously only elements with an `id` attribute became nodes; a function/class defined inside a `<script>` block (the common single-file-app pattern) was invisible to the graph entirely — `graphify explain`/`query` could never find it. `<script src="...">` (external, no inline body) masks to an empty span and contributes nothing, unchanged.
-- Fix: `explain`/`get_neighbors`/`blast_radius`/`path` (`_find_node_core` in `graphify/query.py`) could return "No node matching" for a real, unambiguous node whose name spans two fields — e.g. `ClassName.methodName` where the class lives in `source_file` and the method is the `label` — because every existing tier (source-exact/exact/prefix/substring) only checks a single field for the *whole* query string. Added a last-resort BM25 cross-field fallback tier (same ranking `query`/`path` already use), only engaged when all single-field tiers come up completely empty, returning every near-tied top scorer (10% gap) so a genuine tie still surfaces through the existing `_find_node_tied_group` ambiguity warning instead of a silent pick.
-- Fix: `graphify affected` (`graphify/affected.py`'s `resolve_seed`) required an *exact single-field match count of 1* at every tier, so a name matching several nodes by raw substring count (even when one was clearly the better match) returned a blunt "No unique node match" instead of resolving. Added the same BM25 cross-field fallback as above (`_bm25_confident_pick`), but kept `resolve_seed`'s existing fail-closed contract intact: it only returns a pick when the top score clearly separates from the rest (10% gap) — a genuine near-tie (e.g. two identically-labeled nodes) still returns `None`, same as before.
+## 0.17.0 (2026-07-18)
 - Feature: editable git-clone checkouts now get a daily self-update notice, separate from the existing PyPI-upstream check. `graphify/git_update_check.py` compares this checkout's `CURRENT_VERSION` against `version.json` on this repo's `main` branch and, only on a clean working tree in an interactive terminal, asks y/N before running `git pull origin main`. A dirty tree gets a notice instead of a prompt; declining (or a non-interactive run) remembers the dismissal in `~/.config/graphify/update-dismissed` so it doesn't ask again until a newer version ships. Never auto-pulls.
 - Fix (security): `collect_files()`/`detect()` had no check that a symlink inside the scan root actually resolves to a target under that root — a symlink pointing outside (accidental or planted) was silently followed and its content ingested into `graph.json`. Ported upstream's `_resolves_under_root()` containment check into both the directory-walk pruning and the per-file filter, in `extract.py` and `detect.py`. This fork's own `_auto_follow_symlinks` auto-detect convenience feature (upstream removed it in favor of opt-in-only) was left intact — only the missing containment check was closed, not that separate design choice. The LLM extraction path (`llm.py`'s `_read_files`/`_build_image_refs`) had the same gap — a symlinked text or image file was read straight off the escaped path before this fix — and now uses the same `_resolves_under_root()` guard, skipping with a stderr notice instead of reading through.
 - Fix (#1638): an unresolved JS/TS import (bare package name after local/tsconfig resolution fails) is now namespaced with a `ref:` id prefix instead of a bare last-segment id, so it can no longer collide with an unrelated local file of the same stem and fabricate a phantom cross-language `imports_from` edge (e.g. `tailwindcss/colors` no longer aliases onto an unrelated `backend/utils/colors.py`).
diff --git a/README.md b/README.md
index 3f9f1db29..5e94fa8ef 100644
--- a/README.md
+++ b/README.md
@@ -41,19 +41,19 @@ graphify export callflow-html
 
 ## What's different from upstream
 
-This fork started from [safishamsi/graphify](https://github.com/safishamsi/graphify) and has repeatedly adopted upstream's own `v8` rewrite branch as its base over several months — verified down to commit author (`affected.py`, `resolver_registry.py`, `symbol_resolution.py`, and most of the rest of the shared package were written by upstream's own maintainer and contributors, not this fork). What follows is only what's built *on top of* that shared base, checked directly against upstream's current source (`3140b2e`, v0.9.6), not assumed:
+This fork started from [safishamsi/graphify](https://github.com/safishamsi/graphify) and has repeatedly adopted upstream's own `v8` rewrite branch as its base over several months — verified down to commit author (`affected.py`, `resolver_registry.py`, `symbol_resolution.py`, and most of the rest of the shared package were written by upstream's own maintainer and contributors, not this fork). What follows is only what's built *on top of* that shared base, checked directly against upstream's current source (`fb992ce`, v0.9.19, re-verified 2026-07-18 — no claim below went stale across the 13 releases since the prior `3140b2e`/v0.9.6 check), not assumed:
 
 **Fork-only, confirmed absent from upstream entirely:**
 - **A real query/pathfinding layer** (`graphify/query.py`) — BM25 scoring with camelCase/snake_case tokenization, a typo/abbreviation/fuzzy-substring correction cascade, query synonym expansion, an optional local-embedding last resort, and `find_path_with_disambiguation` (retries every near-tied candidate pair, avoids degree-heavy hub nodes). Upstream's `serve.py` still resolves nodes with the older tiered `_EXACT_MATCH_BONUS` scorer and a bare `nx.shortest_path` with no hub avoidance. `--path`/`--source-path`/`--target-path`/`--context` flags on `path`/`explain`/`query` are part of this same layer.
 - **7 extra language/config extractors** — `.css`/`.scss`, `.html`/`.htm`, `.yaml`/`.yml`, `.toml`, `.robot`/`.resource`, `.feature` (Gherkin), Fish shell (54 tree-sitter grammars vs upstream's 36).
 - **Opt-in value-coupling** (`shares_value:<value>` edges, `value_coupling = true`) for config-as-code repos where nothing an AST sees actually "calls" anything.
 - **Per-project config + `update --all`** (`graphify.toml` / `[tool.graphify]`, `config.py`).
-- **Extra analysis & UX**: `god_nodes(by="pagerank")`, `cross_cutting_nodes()`, `unreachable_functions()`, `GRAPH_SUMMARY.md`, a 3D/lens `graph.html` viewer, dated-backup pruning, Playwright/Jest `test()`/`describe()` node synthesis.
+- **Extra analysis & UX**: `god_nodes(by="pagerank")`, `cross_cutting_nodes()`, `unreachable_functions()`, `GRAPH_SUMMARY.md`, a 3D/lens `graph.html` viewer (Community/File/Dependencies/Calls lenses, lens-aware token/file-path search), dated-backup pruning, Playwright/Jest `test()`/`describe()` node synthesis.
 - **CLI surface** is otherwise the same, not larger — upstream's `v8`-derived tree already ships the same `prs`, `reflect`, `global`, `merge-graphs`, `save-result`, and all 23 per-platform install subcommands.
 
 **Upstream-only, not carried by this fork (some fixed here, most still open):**
 - The entire **Obsidian/Canvas export** pipeline (`graphify export obsidian`) — this fork doesn't have it at all, by omission, not oversight.
-- Several extraction-correctness fixes not yet pulled in: Ruby `module`/`Struct.new`/`Class.new` container nodes, Kotlin interface-delegation edges, Apex multi-interface `extends`, TS `namespace`/generator-function/import-equals nodes, `.mts`/`.cts` recognition.
+- Several extraction-correctness fixes not yet pulled in: Ruby `module`/`Struct.new`/`Class.new` container nodes, Kotlin interface-delegation edges, Apex multi-interface `extends`, TS `namespace`/generator-function/import-equals nodes, `.mts`/`.cts` recognition. A second, narrower gap in the same area landed upstream since the last check (#1881, v0.9.16): uppercase TypeScript extensions (`.TS`/`.TSX`/`.MTS`/`.CTS`) aren't dispatched to the TS extractor — distinct from the `.mts`/`.cts`-recognition-at-all gap above, this is recognition failing only on case.
 - Robustness fixes not yet pulled in: deterministic parallel-merge ordering, Windows long-path I/O, Office `--update` re-conversion, cached word-count detection.
 - **Already fixed here**, previously upstream-only: C# receiver-typed member-call resolution (#1609), two JS/TS cross-file phantom-edge bugs (#1638, #1659), and a symlink-containment security gap in file collection.
 
diff --git a/graphify/export.py b/graphify/export.py
index 951482133..0bd2ccc1c 100644
--- a/graphify/export.py
+++ b/graphify/export.py
@@ -207,9 +207,13 @@ def _html_styles() -> str:
   #search-wrap { padding: 12px; border-bottom: 1px solid #2a2a4e; }
   #search { width: 100%; background: #0f0f1a; border: 1px solid #3a3a5e; color: #e0e0e0; padding: 7px 10px; border-radius: 6px; font-size: 13px; outline: none; }
   #search:focus { border-color: #4E79A7; }
-  #search-results { max-height: 140px; overflow-y: auto; padding: 4px 12px; border-bottom: 1px solid #2a2a4e; display: none; }
-  .search-item { padding: 4px 6px; cursor: pointer; border-radius: 4px; font-size: 12px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  #search-type-filter { width: 100%; margin-top: 6px; background: #0f0f1a; border: 1px solid #3a3a5e; color: #e0e0e0; padding: 5px 8px; border-radius: 6px; font-size: 12px; outline: none; }
+  #search-type-filter:focus { border-color: #4E79A7; }
+  #search-results { max-height: 160px; overflow-y: auto; padding: 4px 12px; border-bottom: 1px solid #2a2a4e; display: none; }
+  .search-item { padding: 4px 6px; cursor: pointer; border-radius: 4px; }
   .search-item:hover { background: #2a2a4e; }
+  .search-item-label { font-size: 12px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+  .search-item-meta { font-size: 10px; color: #666; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
   #info-panel { padding: 14px; border-bottom: 1px solid #2a2a4e; min-height: 140px; }
   #info-panel h3 { font-size: 13px; color: #aaa; margin-bottom: 8px; text-transform: uppercase; letter-spacing: 0.05em; }
   #info-content { font-size: 13px; color: #ccc; line-height: 1.6; }
@@ -414,21 +418,59 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   }}
 }});
 
+// Same identifier-splitting regex as the CLI's query.py _tokenize() (camelCase/
+// snake_case/digit-run boundaries) — ponytail: token-substring + tiered ranking
+// only, no BM25/typo-correction/synonym-expansion port; this list is at most 20
+// results per keystroke over data already in memory, not a scored corpus search.
+const CAMEL_SPLIT_RE = /[A-Z]+(?![a-z])|[A-Z]?[a-z]+|[0-9]+|[^\\W\\d_]+/g;
+// Combining-diacritics range (U+0300-U+036F), built via code points instead of
+// a unicode-escape literal to keep this file plain-ASCII and diff-clean.
+const COMBINING_MARKS_RE = new RegExp('[' + String.fromCodePoint(0x300) + '-' + String.fromCodePoint(0x36f) + ']', 'g');
+function tokenize(text) {{
+  return (text || '').normalize('NFKD').replace(COMBINING_MARKS_RE, '')
+    .match(CAMEL_SPLIT_RE)?.map(t => t.toLowerCase()) || [];
+}}
+
 const searchInput = document.getElementById('search');
+const searchTypeFilter = document.getElementById('search-type-filter');
 const searchResults = document.getElementById('search-results');
-searchInput.addEventListener('input', () => {{
-  const q = searchInput.value.toLowerCase().trim();
+function runSearch() {{
+  const raw = searchInput.value.trim();
+  const q = raw.toLowerCase();
+  const typeFilter = searchTypeFilter.value;
   searchResults.innerHTML = '';
   if (!q) {{ searchResults.style.display = 'none'; return; }}
-  const matches = RAW_NODES.filter(n => n.label.toLowerCase().includes(q)).slice(0, 20);
+
+  const qTokens = tokenize(raw);
+  const scored = [];
+  RAW_NODES.forEach(n => {{
+    if (isNodeHidden(n)) return; // respect the active lens (e.g. Calls hides concept/doc nodes)
+    if (typeFilter !== 'all' && n.file_type !== typeFilter) return;
+    const label = n.label.toLowerCase();
+    const file = (n.source_file || '').toLowerCase();
+    const labelTokens = tokenize(n.label);
+    const fileMatch = file.includes(q);
+    const tokenHit = qTokens.length > 0 && qTokens.every(qt => labelTokens.some(lt => lt.includes(qt)));
+    if (!label.includes(q) && !fileMatch && !tokenHit) return;
+    let score = 3; // substring-only fallback
+    if (label === q) score = 0;
+    else if (labelTokens.some(lt => qTokens.includes(lt))) score = 1;
+    else if (labelTokens.some(lt => qTokens.some(qt => lt.startsWith(qt)))) score = 2;
+    else if (fileMatch && !label.includes(q)) score = 2.5;
+    scored.push({{ n, score }});
+  }});
+  scored.sort((a, b) => a.score - b.score);
+  const matches = scored.slice(0, 20).map(s => s.n);
+
   if (!matches.length) {{ searchResults.style.display = 'none'; return; }}
   searchResults.style.display = 'block';
   matches.forEach(n => {{
     const el = document.createElement('div');
     el.className = 'search-item';
-    el.textContent = n.label;
     el.style.borderLeft = `3px solid ${{n.color.background}}`;
     el.style.paddingLeft = '8px';
+    el.innerHTML = `<div class="search-item-label">${{esc(n.label)}}</div>
+      <div class="search-item-meta">${{esc(n.file_type || 'unknown')}} · ${{esc(n.source_file || '-')}}</div>`;
     el.onclick = () => {{
       focusNode(n.id);
       searchResults.style.display = 'none';
@@ -436,7 +478,9 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
     }};
     searchResults.appendChild(el);
   }});
-}});
+}}
+searchInput.addEventListener('input', runSearch);
+searchTypeFilter.addEventListener('change', runSearch);
 document.addEventListener('click', e => {{
   if (!searchResults.contains(e.target) && e.target !== searchInput)
     searchResults.style.display = 'none';
@@ -449,9 +493,14 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
 // computed lazily here in the browser from data already embedded above, so
 // building/updating the graph (`extract`, `update`, `cluster-only`) does no
 // extra work and graph.html isn't any bigger than before.
-let currentLens = 'community'; // 'community' | 'file' | 'deps'
+let currentLens = 'community'; // 'community' | 'file' | 'deps' | 'calls'
 const hiddenCommunities = new Set();
 const hiddenFiles = new Set();
+// Real relation vocabulary measured across Python/YAML, Swift, and JS/TS corpora (2026-07-04):
+// excludes structural/containment relations (contains, method, defines, case_of)
+// and doc-explains-code (rationale_for), which aren't call/dependency structure.
+// Shared by the 'deps' (file-collapsed) and 'calls' (per-symbol) lenses.
+const REL_WHITELIST = new Set(['calls', 'imports', 'imports_from', 'references', 'inherits', 'implements', 'indirect_call', 're_exports', 'uses', 'embeds']);
 let depNodesCache = null;
 let depEdgesCache = null;
 
@@ -470,12 +519,13 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
 }}
 
 function isNodeHidden(n) {{
-  if (currentLens === 'file') return hiddenFiles.has(n.source_file || n._source_file || '(none)');
+  if (currentLens === 'calls' && (n.file_type || n._file_type) !== 'code') return true;
+  if (currentLens === 'file' || currentLens === 'calls') return hiddenFiles.has(n.source_file || n._source_file || '(none)');
   return hiddenCommunities.has(n.community !== undefined ? n.community : n._community);
 }}
 
 function nodeDisplayColor(n) {{
-  if (currentLens === 'file') return colorForFile(n.source_file || n._source_file || '(none)');
+  if (currentLens === 'file' || currentLens === 'calls') return colorForFile(n.source_file || n._source_file || '(none)');
   return n.color.background;
 }}
 
@@ -495,6 +545,13 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   update3DGraphData();
 }}
 
+// File-legend scope for the current lens: Calls only counts/lists files
+// through their code-symbol nodes, so counts match what's actually visible
+// (a file with only concept/rationale nodes wouldn't show any node there anyway).
+function fileScopedNodes() {{
+  return currentLens === 'calls' ? RAW_NODES.filter(n => n.file_type === 'code') : RAW_NODES;
+}}
+
 function toggleAllGroups(hide) {{
   document.querySelectorAll('.legend-item').forEach(item => {{
     hide ? item.classList.add('dimmed') : item.classList.remove('dimmed');
@@ -503,11 +560,11 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   if (currentLens === 'community') {{
     LEGEND.forEach(c => {{ if (hide) hiddenCommunities.add(c.cid); else hiddenCommunities.delete(c.cid); }});
   }} else {{
-    const files = new Set(RAW_NODES.map(n => n.source_file || '(none)'));
+    const files = new Set(fileScopedNodes().map(n => n.source_file || '(none)'));
     files.forEach(f => {{ if (hide) hiddenFiles.add(f); else hiddenFiles.delete(f); }});
   }}
   applyVisibility();
-  const total = currentLens === 'community' ? LEGEND.length : new Set(RAW_NODES.map(n => n.source_file || '(none)')).size;
+  const total = currentLens === 'community' ? LEGEND.length : new Set(fileScopedNodes().map(n => n.source_file || '(none)')).size;
   const hidden = currentLens === 'community' ? hiddenCommunities.size : hiddenFiles.size;
   updateSelectAllState(total, hidden);
 }}
@@ -543,7 +600,7 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   legendTitleEl.textContent = currentLens === 'deps' ? 'Files' : 'Files (color)';
   legendEl.innerHTML = '';
   const counts = {{}};
-  RAW_NODES.forEach(n => {{ const f = n.source_file || '(none)'; counts[f] = (counts[f] || 0) + 1; }});
+  fileScopedNodes().forEach(n => {{ const f = n.source_file || '(none)'; counts[f] = (counts[f] || 0) + 1; }});
   const files = Object.keys(counts).sort((a, b) => counts[b] - counts[a]);
   files.forEach(f => {{
     const color = colorForFile(f);
@@ -587,10 +644,6 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
     nodeToFile[n.id] = f;
     fileCounts[f] = (fileCounts[f] || 0) + 1;
   }});
-  // Real relation vocabulary measured across Python/YAML, Swift, and JS/TS corpora (2026-07-04):
-  // excludes structural/containment relations (contains, method, defines, case_of)
-  // and doc-explains-code (rationale_for), which aren't file-to-file coupling.
-  const REL_WHITELIST = new Set(['calls', 'imports', 'imports_from', 'references', 'inherits', 'implements', 'indirect_call', 're_exports', 'uses', 'embeds']);
   const edgeAgg = {{}};
   RAW_EDGES.forEach(e => {{
     const fa = nodeToFile[e.from], fb = nodeToFile[e.to];
@@ -652,7 +705,7 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
     nodesDS.clear();
     nodesDS.add(RAW_NODES.map(n => ({{
       id: n.id, label: n.label,
-      color: lens === 'file'
+      color: (lens === 'file' || lens === 'calls')
         ? {{ background: colorForFile(n.source_file || '(none)'), border: colorForFile(n.source_file || '(none)'), highlight: {{ background: '#fff', border: colorForFile(n.source_file || '(none)') }} }}
         : n.color,
       size: n.size, font: n.font, title: n.title,
@@ -661,7 +714,7 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
       hidden: isNodeHidden(n),
     }})));
     edgesDS.clear();
-    edgesDS.add(RAW_EDGES.map((e, i) => ({{
+    edgesDS.add(RAW_EDGES.filter(e => lens !== 'calls' || REL_WHITELIST.has((e.label || '').toLowerCase())).map((e, i) => ({{
       id: i, from: e.from, to: e.to, label: '', title: e.title,
       dashes: e.dashes, width: e.width, color: e.color,
       arrows: {{ to: {{ enabled: true, scaleFactor: 0.5 }} }},
@@ -826,7 +879,8 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   const container = document.getElementById('graph-3d');
   const activeNodes = RAW_NODES.filter(n => !isNodeHidden(n));
   const activeNodeIds = new Set(activeNodes.map(n => n.id));
-  const activeEdges = RAW_EDGES.filter(e => activeNodeIds.has(e.from) && activeNodeIds.has(e.to));
+  const activeEdges = RAW_EDGES.filter(e => activeNodeIds.has(e.from) && activeNodeIds.has(e.to)
+    && (currentLens !== 'calls' || REL_WHITELIST.has((e.label || '').toLowerCase())));
 
   const gData = {{
     nodes: activeNodes.map(n => ({{
@@ -890,7 +944,8 @@ def _html_script(nodes_json: str, edges_json: str, legend_json: str) -> str:
   if (!graph3DInstance) return;
   const activeNodes = RAW_NODES.filter(n => !isNodeHidden(n));
   const activeNodeIds = new Set(activeNodes.map(n => n.id));
-  const activeEdges = RAW_EDGES.filter(e => activeNodeIds.has(e.from) && activeNodeIds.has(e.to));
+  const activeEdges = RAW_EDGES.filter(e => activeNodeIds.has(e.from) && activeNodeIds.has(e.to)
+    && (currentLens !== 'calls' || REL_WHITELIST.has((e.label || '').toLowerCase())));
 
   graph3DInstance.graphData({{
     nodes: activeNodes.map(n => ({{
@@ -1312,9 +1367,18 @@ def _js_safe(obj) -> str:
     <button id="lens-btn-community" class="toggle-btn active lens-btn" onclick="switchLens('community')" title="Group/color by inferred community">Community</button>
     <button id="lens-btn-file" class="toggle-btn lens-btn" onclick="switchLens('file')" title="Group/color by source file">File</button>
     <button id="lens-btn-deps" class="toggle-btn lens-btn" onclick="switchLens('deps')" title="Collapse to one node per file, edges = calls/imports/references/extends between files">Dependencies</button>
+    <button id="lens-btn-calls" class="toggle-btn lens-btn" onclick="switchLens('calls')" title="Code symbols only (functions/classes/methods) — hides concept/rationale/document nodes, edges = real calls/imports/references between symbols">Calls</button>
   </div>
   <div id="search-wrap">
-    <input id="search" type="text" placeholder="Search nodes..." autocomplete="off">
+    <input id="search" type="text" placeholder="Search nodes... (label, tokens, or file path)" autocomplete="off">
+    <select id="search-type-filter">
+      <option value="all">All types</option>
+      <option value="code">Code</option>
+      <option value="concept">Concept</option>
+      <option value="rationale">Rationale</option>
+      <option value="document">Document</option>
+      <option value="paper">Paper</option>
+    </select>
     <div id="search-results"></div>
   </div>
   <div id="info-panel">
diff --git a/tests/test_export.py b/tests/test_export.py
index 08bf49b61..436649e85 100644
--- a/tests/test_export.py
+++ b/tests/test_export.py
@@ -175,6 +175,55 @@ def test_to_html_contains_nodes_and_edges():
         assert "RAW_NODES" in content
         assert "RAW_EDGES" in content
 
+def test_to_html_contains_calls_lens():
+    # 'calls' lens: code-symbol-only, non-collapsed view (file_type != 'code'
+    # hidden, edges restricted to REL_WHITELIST) — distinct from the existing
+    # community/file/deps lenses.
+    G = make_graph()
+    communities = cluster(G)
+    with tempfile.TemporaryDirectory() as tmp:
+        out = Path(tmp) / "graph.html"
+        to_html(G, communities, str(out))
+        content = out.read_text()
+        assert "lens-btn-calls" in content
+        assert "switchLens('calls')" in content
+        assert "REL_WHITELIST" in content
+        assert content.count("REL_WHITELIST = new Set(") == 1
+
+def test_to_html_search_respects_lens_and_has_type_filter():
+    # Search gaps closed together: (1) results must respect the active lens
+    # (isNodeHidden) so a hidden concept/rationale node in the Calls lens can't
+    # surface and then fail to focus, (2) label matching is tokenized
+    # (camelCase/snake_case split, same rule as the CLI's query.py _tokenize),
+    # (3) source_file is also searchable, (4) a file_type dropdown filter.
+    G = make_graph()
+    communities = cluster(G)
+    with tempfile.TemporaryDirectory() as tmp:
+        out = Path(tmp) / "graph.html"
+        to_html(G, communities, str(out))
+        content = out.read_text()
+        assert "search-type-filter" in content
+        assert "function tokenize(text)" in content
+        assert "function runSearch()" in content
+        assert "if (isNodeHidden(n)) return;" in content
+        assert "typeFilter !== 'all' && n.file_type !== typeFilter" in content
+        assert "file.includes(q)" in content
+
+def test_to_html_calls_lens_legend_counts_code_only():
+    # Legend/select-all counts for the Calls lens must come from code-type
+    # nodes only (fileScopedNodes), or the displayed count wouldn't match what
+    # the lens actually shows (a file with only concept/rationale nodes has
+    # nothing visible in Calls, so it shouldn't inflate the file count/legend).
+    G = make_graph()
+    communities = cluster(G)
+    with tempfile.TemporaryDirectory() as tmp:
+        out = Path(tmp) / "graph.html"
+        to_html(G, communities, str(out))
+        content = out.read_text()
+        assert "function fileScopedNodes()" in content
+        assert "fileScopedNodes().map(n => n.source_file" in content
+        assert "fileScopedNodes().forEach(n => { const f = n.source_file" in content
+
 
 def test_to_html_member_counts_accepted():
     """to_html accepts member_counts without raising."""