diff --git a/.github/workflows/daemon-lifecycle.yml b/.github/workflows/daemon-lifecycle.yml
index a6e82d974e..1394dc48df 100644
--- a/.github/workflows/daemon-lifecycle.yml
+++ b/.github/workflows/daemon-lifecycle.yml
@@ -58,4 +58,4 @@ jobs:
       - run: npm ci --ignore-scripts
       - run: npm run build:kernel
       - run: npm run build
-      - run: npx vitest run __tests__/runtime-control.test.ts __tests__/daemon-install-check.test.ts __tests__/daemon-older-version.test.ts __tests__/cli-version.test.ts __tests__/daemon-registry.test.ts __tests__/daemon-pid-reuse.test.ts __tests__/daemon-lock-refresh.test.ts __tests__/mcp-daemon.test.ts __tests__/daemon-client-liveness.test.ts __tests__/daemon-bind-failure.test.ts __tests__/daemon-socket-fallback.test.ts __tests__/daemon-rendezvous-case.test.ts __tests__/writer-lock.test.ts __tests__/writer-handover-ordering.test.ts __tests__/mcp-writer-lock.test.ts __tests__/mcp-projectpath-lifecycle.test.ts __tests__/query-pool.test.ts __tests__/status-index-health.test.ts --maxWorkers=2 --minWorkers=1
+      - run: npx vitest run __tests__/runtime-control.test.ts __tests__/daemon-install-check.test.ts __tests__/daemon-older-version.test.ts __tests__/cli-version.test.ts __tests__/daemon-registry.test.ts __tests__/daemon-pid-reuse.test.ts __tests__/daemon-lock-refresh.test.ts __tests__/mcp-daemon.test.ts __tests__/daemon-client-liveness.test.ts __tests__/daemon-bind-failure.test.ts __tests__/daemon-socket-fallback.test.ts __tests__/daemon-rendezvous-case.test.ts __tests__/writer-lock.test.ts __tests__/writer-handover-ordering.test.ts __tests__/mcp-writer-lock.test.ts __tests__/mcp-projectpath-lifecycle.test.ts __tests__/query-pool.test.ts __tests__/status-index-health.test.ts __tests__/vbnet-project-ties.test.ts __tests__/vbnet-receiver-types.test.ts __tests__/upstream-native-scope-regressions.test.ts --maxWorkers=2 --minWorkers=1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index eae1a5980c..5226c01f71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,10 +32,6 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### New Features
 
-- Ordinary watcher startup can initialize a missing project index under daemon ownership and waits for fresh file indexing and queued synthesized edges before reporting readiness.
-
-- Installers can start or reuse a checkout's active watcher without replacing existing writers, and MCP launchers can preserve existing daemons across reconnects with `--preserve-existing`.
-
 - Installers can verify daemon readiness and safely hand writer ownership across build promotion and rollback through a supported runtime-control API.
 
 - `codegraph_explore` now finds quoted prose in script strings and template text through a capped source scan, ignoring case and punctuation without requiring a re-index.
@@ -93,8 +89,21 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - **Markdown is indexed, and a documentation question gets the section, not the graph.** Every `.md` file's headings, sections, tables and links are nodes (the extractor from #361), and a doc-shaped `codegraph_explore` query that names a markdown file now renders that file's best sections first and whole — the top three by idf-weighted line hits, a heading the query covers word for word counted as named, 8k characters per file — with the blast-radius, relationships and "additional files" blocks held back unless a code file rendered too. Measured on a 109-file docs corpus under headless Claude Code, 36 cells over three rounds: the right file and section in every call, median 1 tool call against 4 for Grep-then-Read, 36 of 36 correct. Code answers keep their shape: markdown nodes leave a subgraph the doc tier did not seed, a markdown body is never mistaken for a generated-file header, and the explore budget tiers count code files only, so a README-heavy repo does not cross a breakpoint. The server instructions say markdown is indexed, which the branch's own text still denied. (#361, #1439)
 
+- Installers can start or reuse a checkout's active watcher without replacing existing writers, and MCP launchers can preserve existing daemons across reconnects with `--preserve-existing`.
+
+- Ordinary watcher startup can initialize a missing project index under daemon ownership and waits for fresh file indexing and queued synthesized edges before reporting readiness.
+
 ### Fixes
 
+- Incremental Go sync invalidates nearest-module caches after a module is renamed, removed or added.
+- JavaScript loop-local object paths stay local, and scoped destructured member calls resolve across source lines while preserving their declaration-site source binding in scripts and single-file components.
+- Dart fields in the visible class hierarchy shadow inherited and extension getters; an unrelated same-named class cannot suppress a getter call.
+- C# target-typed initializers retain relative and global qualified declared types in both native and generic extraction.
+
+- Vue template attributes decode HTML entities before finding calls, so quoted strings do not create false callers and helper calls retain their source positions.
+
+- Go factory chains retain qualified return types and resolve them through the factory declaration's imports. A local or parameter that shadows a package factory no longer borrows that factory's return type.
+
 - Writer handovers, stale-lock cleanup, readiness updates and releases now share an OS file lock, preventing a competing launcher from overwriting a newer writer. The OS releases coordination locks on process exit. Contended retirement retries release while the owner stays alive; legacy daemons without coordinated handover stay running until their old sessions are restarted.
 
 - Python member calls no longer keep a receiver's original type after it is reassigned on a later line.
@@ -308,6 +317,46 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - A file is no longer saved with no symbols when its language parser can't be loaded, which is what happened to every file a background server re-indexed after an upgrade removed its install: the file keeps what it had and is indexed again once the parser loads, and files an earlier version emptied this way are re-indexed by the next sync. A background server also exits on its own once its install is upgraded or removed, so the next session starts one from the current install. Thanks @lipchey for the report. (#2335)
 
 - `codegraph status` no longer says the index is up to date while indexed files are missing their symbols: it now names files the parser couldn't read and files stored without their symbols (which `codegraph sync` repairs), `status --json` counts both, and `codegraph files --json` lists each file's recorded errors. Thanks @lipchey for the report. (#2336)
+
+- In C#, a field or property initializer like `private readonly ILogger _log = LogManager.GetLogger(typeof(X));` or `public List<Foo> Items { get; } = new();` now links what it calls, creates and reads, including inside a lambda, and a target-typed `new()` there counts as creating the declared type. Before, initializers were skipped, so a method or class used only from one — like a converter created in a static list — looked unused, and a method passed as a value there was credited to the whole class instead of the field or property.
+
+- In C# and VB.NET, a constant no longer stands in for a type with the same name: `new Station { … }` links to class `Station` even when another class declares `private const string Station`, `new Version(…)` no longer links to a `const string Version`, and a field like `static readonly Meter Meter` no longer points at itself. Thanks @EvanYu1980 for the report and @drakeo338. (#2337)
+
+- In VB.NET, a call on a variable, parameter, field or property now reaches a method of the type it is declared with — one that type inherits, or an extension method written for it — and nothing when that type comes from outside your project, instead of any project method that merely shares the name.
+
+- In VB.NET, a call to one of .NET's own methods such as `Add`, `Contains`, `Clear` or `Dispose` on a value whose type isn't known is no longer linked to a project method of that name, unless the value is named after that method's class.
+
+- VB.NET resolves type names through surrounding namespaces, file and project `Imports` (including aliases), and the caller's project. Same-named types in different namespaces or projects no longer capture every call. When scope and imports do not distinguish the candidates, the call stays unlinked.
+
+- In VB.NET, a call with no receiver, or on `Me`, now reaches only a member of the class it is written in, of a class it inherits, or of a Module, and no longer a nearby class's member of the same name.
+
+- VB.NET designer code such as `New System.Drawing.Point(…)` or `Me.Size = New System.Drawing.Size(…)` is no longer linked to a project type or member that only shares the name, and a class nested inside another is matched by its bare name only from inside that class or one that inherits it.
+
+- Python global-write inference validates the local binding before scanning other files. The native resolver retains its bounded source and name caches.
+
+- In VB.NET, reading or setting a `Shared` field or property through its class or module name, like `AppSession.SessionId`, `AppSession.CurrentUser = "demo"` or `AppSession.Items(0)`, now counts as a use of that member and of the class, and so do reading an `Enum` value like `Mode.Fast` and calling a `Shared` function without parentheses. Before, only calls written with parentheses were linked, so `codegraph callers` on such a field, property or class came back empty and impact missed most of the code that depends on it. A local, parameter or field that only shares a class's name is not mistaken for the class. Thanks @serkanince for the report and @ChrisPrapas. (#2305)
+
+- In Vue and Nuxt components, calls written in the template (`{{ formatDate(post) }}`, `:to="getAccountRoute(account)"`, `@click="save(item)"`) and calls in a destructuring declaration at the top of `<script setup>` or of a TypeScript or JavaScript file (`const { t } = useI18n()`) now link to the function they call, so `callers` and impact for a composable or helper used this way are no longer mostly empty. A `v-for` item or slot prop is never taken for a project function, a handler like `@click="open = false"` no longer links to an unrelated function of the same name, and a component's own function named like a Nuxt helper, such as `clearError`, is now the one its calls reach. Thanks @deniskern for the report, and @drakeo338 and @L0garithmic. (#2340)
+
+- In COBOL, asking `codegraph_explore` (or `codegraph explore` and `codegraph context`) about a copybook by name, such as `CVACT01Y` or a member brought in with `EXEC SQL INCLUDE`, now answers with the copybook's own source when it is indexed and every `COPY` or `EXEC SQL INCLUDE` statement that includes it, and says so when the copybook's source isn't part of the project. Before, it answered "No relevant code found", or showed an unrelated program whose name was a letter or two away. Thanks @popolusiak for the report. (#2342)
+
+- In Dart, reading a getter such as `box.area` or `status.label` now counts as calling it, so `codegraph callers` and impact list the code that reads it — whether the getter is declared on the class, inherited, or added by an extension — and a method an extension adds to an enum, like `shape.shout()`, now links as well. A plain field, a getter of a type from outside your project, or a value whose type isn't written down still links nothing. Re-index Dart projects after upgrading. Thanks @brookly255-lv for the report. (#2338)
+
+- In Dart, a type is now linked from more of the places it is written, not only from parameters and return types: the type an `extension … on` targets, a field's type, a top-level variable's type, generic arguments such as `Future<Report?>.value(null)` or Riverpod's `final reportProvider = Family<Report?, String>()`, and a local variable's type, a cast or a type check inside a function. So `callers` and impact for a model class now reach the extensions, models and providers that use it. Thanks @mg-mg-mg for the report. (#2327)
+
+- In Go, calls through a method receiver or parameter of an unexported type, the usual shape of gRPC and HTTP handlers (`s.service.AddItem()` inside `func (s *server) Create()`), now resolve, and always within that type's own package: another package's `server` with a same-named method no longer takes the call, and a method the type gets from a struct or interface it embeds is found too. Re-index Go projects after upgrading. Thanks @GoDiao for the report and the fix. (#2323)
+
+- In Go, calls into a module whose `go.mod` is not at the project root now resolve, whether it is a `server/` backend next to a `web/` frontend or one of several modules side by side as in etcd, so calls like `store.New()` and `s.db.CreateItem()` find their targets instead of being treated as calls into a third-party package. A name written through a package, like a `job.OPCommand` result type or a field of type `artifact.Manager`, now links to that package's symbol rather than a same-named one elsewhere, which also corrects links in projects with a single `go.mod`. Re-index Go projects after upgrading. Thanks @GoDiao for the report and @danusha2345 for the fix. (#2322)
+
+- JavaScript and TypeScript named-object resolution reuses scoped file facts and releases them when the resolver closes.
+
+- The time `codegraph init` and `codegraph index` print beside the node and edge counts now covers the whole run, resolving references and linking included, and `codegraph sync` reports its whole run the same way. Before, it counted only reading and parsing the files, which can be a small part of an index, so a slow index looked fast. Thanks @bompus for the report. (#2334)
+
+- In Rust, code that uses an enum only through its variants, like `mode::Mode::A` in an expression, a `Mode::B =>` match arm or `Self::A` inside the enum's own `impl`, now shows up in that enum's callers and impact, linked to the enum that actually declares the variant rather than to a same-named type elsewhere. Standard-library variants like `Ordering::Less` or `Option::Some` and associated items like `Foo::new()` or `Foo::MAX` don't count as using a project enum. Re-index Rust projects after upgrading. Thanks @mg-mg-mg for the report and @danusha2345. (#2328)
+
+- Axum routes now link to their handler when rustfmt wraps the `.route(` call so the handler sits on a later line, and when the handler's name also appears elsewhere on the line, as in `delete(handlers::user::delete)` or `.route("/login", post(handlers::user::login))`; Actix's `web::resource(…)` and `.route(…)` registrations get the same fix. A call inside a closure handler is no longer mistaken for a route, and an Actix resource no longer takes the next route's handler as its own. Thanks @mg-mg-mg for the report and @danusha2345. (#2326)
+
+- In JavaScript and TypeScript, the functions written inside a named object literal are now symbols of their own even when the object isn't exported: a plain `const api = { load() {…} }`, an object declared inside an IIFE or a function, and a namespace hung on the page or on another object, like `window.App = { init() {…} }`, `App.utils = {…}` or `dw_page = {…}`. Calls such as `api.load()`, `window.App.init()`, `App.utils.pad()`, a sibling's `this.render()`, and `App.init()` from another script on the page now reach them, the calls made inside a member belong to that member instead of the object, and a bare `init()` is no longer taken for `App.init`, so script-tag apps no longer lose most of their code from `callers` and impact. A member's qualified name now carries its object, exported or not (`api::load`, `window.App::init`), so asking for `App.init` finds it. Re-index JavaScript and TypeScript projects after upgrading. Thanks @tkhoaaa for the report and @danusha2345. (#2300)
 #### MCP / indexing
 
 - Full indexes of large projects no longer sometimes run two to three times slower than usual. A timing clash between two background database maintenance steps could switch reference resolution from several threads to one partway through.
diff --git a/README.md b/README.md
index 8b9928e8f9..b0a50a620b 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ Follow [@getcodegraph](https://x.com/getcodegraph) on X for updates.
 
 ## About this fork
 
-This is **bompus/codegraph**, a fork of [colbymchenry/codegraph](https://github.com/colbymchenry/codegraph). Its default branch, `fork/consolidated`, contains upstream `main` through [`dea076fd`](https://github.com/colbymchenry/codegraph/commit/dea076fd1e9fa3e236e93fa915bb0feebe73579d) (after v1.6.2, merged 2026-10-05) plus the fork's own work, and it takes upstream changes as they land. Changes that suit upstream are also offered there as pull requests.
+This is **bompus/codegraph**, a fork of [colbymchenry/codegraph](https://github.com/colbymchenry/codegraph). Its default branch, `fork/consolidated`, contains upstream `main` through [`f40db4b9`](https://github.com/colbymchenry/codegraph/commit/f40db4b9ccdda007cb9a7076419ee268c4ef6b9f) (after v1.6.2) plus the fork's own work, and it takes upstream changes as they land. Changes that suit upstream are also offered there as pull requests.
 
 The fork publishes no releases. The install scripts, npm package, badges and `codegraph upgrade` further down this page install **upstream's** releases. To run the fork, build it from source (below).
 
@@ -74,7 +74,7 @@ Then run `codegraph init` in each project, as in [Get Started](#get-started). In
 
 ### What the fork adds
 
-Compared with upstream `main` at `dea076fd` (after v1.6.2). Each item here and in the dispatch and framework lists below was checked against upstream's tree at that commit.
+Compared with upstream `main` at `f40db4b9` (after v1.6.2). Each item here and in the dispatch and framework lists below was checked against upstream's tree at that commit.
 
 | Feature | Upstream | Fork | What it does |
 |---|:-:|:-:|---|
@@ -108,6 +108,14 @@ The other languages are the same in both, listed under [Supported Languages](#su
 
 C# property accessors and expression-bodied properties contribute calls and references owned by the property. VB.NET member bodies and field initializers also contribute their calls and references.
 
+C# field and property initializers retain their calls and references under the member that owns them. Target-typed `new()` resolves relative declared types through enclosing namespaces and honors `global::` qualification without requiring a redundant `using`. VB.NET resolves typed receivers, enclosing and inherited members, and Shared member reads without choosing unrelated project declarations.
+
+Go imports follow the nearest indexed module and the longest matching module path, including module changes during incremental sync. Unexported receivers and embedded methods stay in their declaring package. Dart getter reads become calls only when the receiver type reaches that getter and no nearer field in the visible class hierarchy overrides it; enum extensions and type-position references participate in resolution. Rust enum-variant values retain their enum references.
+
+Named JavaScript and TypeScript object literals own their function members, including local objects and classic-script global assignments. Member calls follow the visible object; loop-local objects stay within their scope. Destructured member calls resolve across lines while preserving the source binding at the destructure declaration; unrelated bare names stay unresolved. Vue template expressions contribute calls to script bindings while preserving component ownership. Encoded attribute expressions retain their original source positions, and template-local bindings stay within their scope.
+
+A COBOL copybook named in an explore query prioritizes its indexed source and lists its COPY and EXEC SQL INCLUDE sites. Missing indexed source is reported explicitly.
+
 `codegraph status` reports files that need re-indexing and files with recorded parse errors. `status --json` includes `index.filesNeedingReindex` and `index.filesWithParseErrors`; `files --json` includes each file's extraction errors. A transient parser failure preserves the previous graph and retries on the next sync.
 
 The MCP launcher can replace a daemon from an older release when its hello confirms coordinated writer handover. `serve --mcp --path <root> --preserve-existing` opts out of replacement on initial connection and reconnect, requires an index at that exact root, and keeps fallback reads without a watcher. Adding `--initialize-index` lets the elected daemon create a missing exact-root index after acquiring writer ownership. Legacy daemons stay running while new sessions serve reads without auto-sync; stop the old MCP sessions and daemon, then reconnect with the current install. A daemon exits when its installation is deleted or its package version changes. Different managed builds of the same release retain the fork's version-identity checks.
diff --git a/__tests__/csharp-member-initializers.test.ts b/__tests__/csharp-member-initializers.test.ts
new file mode 100644
index 0000000000..07395b8cc0
--- /dev/null
+++ b/__tests__/csharp-member-initializers.test.ts
@@ -0,0 +1,170 @@
+/**
+ * C# field and property initializers belong to the member they initialize.
+ * `private readonly ILogger _log = LogManager.GetLogger(typeof(X));` and
+ * `public List<Foo> Items { get; } = new List<Foo>();` used to be skipped by
+ * both extractors, so the calls, instantiations and static reads written
+ * there were lost, and a method passed as a value there was the class's
+ * reference rather than the member's.
+ *
+ * A target-typed `new()` names no type of its own; as an initializer it
+ * constructs the member's declared type.
+ *
+ * Runs against the native walker and the generic native-tree extractor, which
+ * must agree.
+ */
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+import type { Node } from '../src/types';
+
+const FILES: Record<string, string> = {
+  'Lib.cs': `namespace Lib
+{
+    public class Crate { }
+}
+public interface ILogger { }
+public static class LogManager
+{
+    public static ILogger GetLogger(System.Type t) => null;
+}
+public static class Helper
+{
+    public static int Compute(int n) => n;
+    public static int Seed() => 1;
+    public static void Register(System.Action a) { }
+    public static System.Action Wrap(System.Action a) => a;
+}
+public class Widget
+{
+    public Widget() { }
+    public Widget(int n) { }
+    public int Size { get; set; }
+}
+public class Bag<T> { }
+public static class Defaults
+{
+    public const string Name = "x";
+    public static readonly Widget Empty = new Widget();
+}
+`,
+  'Box.cs': `using Lib;
+
+public class Box
+{
+    private readonly ILogger _log = LogManager.GetLogger(typeof(Box));
+    private int _a = 1, _b = Helper.Compute(2);
+    private static readonly int Max = Helper.Seed();
+    private readonly Widget _made = new Widget(3);
+    private readonly Widget _typed = new() { Size = Helper.Seed() };
+    private Widget? _maybe = new();
+    private readonly Bag<Widget> _bag = new();
+    private readonly Lib.Crate _crate = new();
+    private readonly string _label = Defaults.Name;
+    private readonly System.Func<int, int> _square = x => Helper.Compute(x * x);
+    private readonly System.Action _later = () => Helper.Register(Handle);
+    private readonly System.Action _direct = Handle;
+    [System.Obsolete("use Helper.Seed()")] private int _flagged;
+    public Bag<Widget> Items { get; } = new Bag<Widget>();
+    public Widget Made { get; set; } = new();
+    public Widget Copy { get; } = Defaults.Empty;
+    public System.Action Wrapped { get; } = Helper.Wrap(Handle);
+    public int Seeded { get; } = Helper.Seed();
+    private static void Handle() { }
+}
+`,
+};
+
+describe('C# field and property initializers', () => {
+  let root = '';
+  let cg: CodeGraph | undefined;
+  let kernel: string | undefined;
+
+  beforeEach(() => {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-cs-initializers-'));
+    for (const [rel, content] of Object.entries(FILES)) fs.writeFileSync(path.join(root, rel), content);
+    kernel = process.env.CODEGRAPH_KERNEL;
+  });
+
+  afterEach(() => {
+    cg?.close();
+    cg = undefined;
+    fs.rmSync(root, { recursive: true, force: true });
+    if (kernel === undefined) delete process.env.CODEGRAPH_KERNEL;
+    else process.env.CODEGRAPH_KERNEL = kernel;
+  });
+
+  it.each(['default', 'generic'])('resolves relative and global declared type namespaces (%s)', async backend => {
+    fs.writeFileSync(path.join(root, 'Lib.cs'), 'namespace Lib { public class Crate {} }\nnamespace Outer { namespace Lib { public class Crate {} } }\n');
+    fs.writeFileSync(path.join(root, 'Box.cs'), 'namespace Outer { public class Box { private readonly Lib.Crate _near = new(); private readonly global::Lib.Crate _global = new(); } }\n');
+    if (backend === 'generic') process.env.CODEGRAPH_KERNEL = '0';
+    else delete process.env.CODEGRAPH_KERNEL;
+    cg = await CodeGraph.init(root, { index: true });
+    for (const [field, target] of [['_near', 'Outer.Lib::Crate'], ['_global', 'Lib::Crate']]) {
+      const node = cg.getNodesByQualifiedName(`Outer::Box::${field}`)[0]!;
+      expect(node).toBeDefined();
+      expect(cg.getOutgoingEdges(node.id).filter(edge => edge.kind === 'instantiates')
+        .map(edge => cg!.getNode(edge.target)!.qualifiedName)).toEqual([target]);
+    }
+  });
+
+  it.each(['default', 'generic'].flatMap(backend => [false, true].map(qualifiedOnly => ({ backend, qualifiedOnly }))))('are walked as the member they initialize ($backend, qualified type only $qualifiedOnly)', async ({ backend, qualifiedOnly }) => {
+    if (qualifiedOnly) fs.writeFileSync(path.join(root, 'Box.cs'), FILES['Box.cs']!.replace('using Lib;\n', ''));
+    if (backend === 'generic') process.env.CODEGRAPH_KERNEL = '0';
+    else delete process.env.CODEGRAPH_KERNEL;
+    cg = await CodeGraph.init(root, { index: true });
+    const graph = cg;
+    const member = (qualifiedName: string): Node => {
+      const node = graph.getNodesInFile('Box.cs').find((n) => n.qualifiedName === qualifiedName);
+      expect(node, qualifiedName).toBeDefined();
+      return node!;
+    };
+    const targets = (node: Node, kind: string): string[] =>
+      graph
+        .getOutgoingEdgesFrom([node.id])
+        .filter((e) => e.kind === kind)
+        .map((e) => graph.getNode(e.target)!.qualifiedName)
+        .sort();
+
+    // Calls, per declarator.
+    expect(targets(member('Box::_log'), 'calls')).toEqual(['LogManager::GetLogger']);
+    expect(targets(member('Box::_a'), 'calls')).toEqual([]);
+    expect(targets(member('Box::_b'), 'calls')).toEqual(['Helper::Compute']);
+    expect(member('Box::Max').kind).toBe('constant');
+    expect(targets(member('Box::Max'), 'calls')).toEqual(['Helper::Seed']);
+    expect(targets(member('Box::Seeded'), 'calls')).toEqual(['Helper::Seed']);
+
+    // Instantiations, including a target-typed `new()` of the declared type.
+    expect(targets(member('Box::_made'), 'instantiates')).toEqual(['Widget']);
+    expect(targets(member('Box::_typed'), 'instantiates')).toEqual(['Widget']);
+    expect(targets(member('Box::_typed'), 'calls')).toEqual(['Helper::Seed']);
+    expect(targets(member('Box::_maybe'), 'instantiates')).toEqual(['Widget']);
+    expect(targets(member('Box::_bag'), 'instantiates')).toEqual(['Bag']);
+    expect(targets(member('Box::_crate'), 'instantiates')).toEqual(['Lib::Crate']);
+    expect(targets(member('Box::Items'), 'instantiates')).toEqual(['Bag']);
+    expect(targets(member('Box::Made'), 'instantiates')).toEqual(['Widget']);
+
+    // Static reads.
+    expect(targets(member('Box::_label'), 'references')).toContain('Defaults');
+    expect(targets(member('Box::Copy'), 'references')).toContain('Defaults');
+
+    // Lambda bodies belong to the member the lambda initializes.
+    expect(targets(member('Box::_square'), 'calls')).toEqual(['Helper::Compute']);
+    expect(targets(member('Box::_later'), 'calls')).toEqual(['Helper::Register']);
+
+    // A method passed as a value is the member's reference, captured once —
+    // not the class's as well.
+    expect(targets(member('Box::_later'), 'references')).toContain('Box::Handle');
+    expect(targets(member('Box::_direct'), 'references')).toContain('Box::Handle');
+    expect(targets(member('Box::Wrapped'), 'calls')).toEqual(['Helper::Wrap']);
+    expect(targets(member('Box::Wrapped'), 'references')).toContain('Box::Handle');
+    expect(targets(member('Box'), 'references')).not.toContain('Box::Handle');
+
+    // Attribute arguments are not an initializer, and the class itself
+    // calls and creates nothing.
+    expect(targets(member('Box::_flagged'), 'calls')).toEqual([]);
+    expect(targets(member('Box'), 'calls')).toEqual([]);
+    expect(targets(member('Box'), 'instantiates')).toEqual([]);
+  });
+});
diff --git a/__tests__/csharp-type-position-refs.test.ts b/__tests__/csharp-type-position-refs.test.ts
index c000d92105..ccfba566b9 100644
--- a/__tests__/csharp-type-position-refs.test.ts
+++ b/__tests__/csharp-type-position-refs.test.ts
@@ -69,4 +69,46 @@ describe('C#: a type position names a type', () => {
       cg.close();
     }
   });
+
+  it('never a constant that shares the name', async () => {
+    // `const` and `static readonly` fields are constants: jellyfin's `new
+    // Version(5, 18)` (System.Version) bound to a `const string Version`
+    // claim name, and serilog's `static readonly Meter Meter = new(…)`
+    // instantiated itself.
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-cs-type-refs-'));
+    roots.push(root);
+    const files: Record<string, string> = {
+      'src/Claims.cs': `namespace App;
+public static class ClaimTypes {
+    public const string Version = "v";
+}
+`,
+      'src/Encoder.cs': `namespace App;
+using System;
+public class ValueFormatter { }
+public class Encoder {
+    private static readonly Version MinVersion = new Version(5, 18);
+    private static readonly Meter Meter = new("app");
+    private static readonly ValueFormatter ValueFormatter = new();
+    public void Check() { var v = new Version(1, 0); }
+}
+`,
+    };
+    for (const [rel, content] of Object.entries(files)) {
+      fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+      fs.writeFileSync(path.join(root, rel), content);
+    }
+    const cg = await CodeGraph.init(root, { index: true });
+    try {
+      const members = cg.getNodesInFile('src/Encoder.cs').filter((n) => n.kind !== 'file');
+      const targets = cg
+        .getOutgoingEdgesFrom(members.map((n) => n.id), ['references', 'instantiates', 'type_of'])
+        .map((e) => `${cg.getNode(e.source)!.name} ${e.kind} ${cg.getNode(e.target)!.kind}:${cg.getNode(e.target)!.qualifiedName}`)
+        .sort();
+      expect(targets.filter((t) => t.includes(' constant:'))).toEqual([]);
+      expect(targets).toContain('ValueFormatter instantiates class:App::ValueFormatter');
+    } finally {
+      cg.close();
+    }
+  });
 });
diff --git a/__tests__/dart-getter-reads.test.ts b/__tests__/dart-getter-reads.test.ts
new file mode 100644
index 0000000000..59f924fd3f
--- /dev/null
+++ b/__tests__/dart-getter-reads.test.ts
@@ -0,0 +1,199 @@
+/**
+ * Dart getter reads and extension members on enums (#2338).
+ *
+ * Reading a getter runs it: `x.area` calls `Box`'s `int get area`. A read
+ * linked to nothing, so `callers area` was empty while `x.grow()` worked. And
+ * a member an `extension … on` an ENUM adds (`s.shout()`) resolved nowhere,
+ * while the same extension on a class did.
+ *
+ * A read links only a getter the receiver's type reaches — never a field (they
+ * mint no nodes), a getter of a type outside the project, or a same-named
+ * getter guessed by name.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-dart-getters-'));
+  const files: Record<string, string> = {
+    'pubspec.yaml': 'name: repro\nenvironment:\n  sdk: ">=3.0.0 <4.0.0"\n',
+    // The issue's two files, verbatim.
+    'lib/shape.dart': `enum Shape { circle, square }
+
+extension ShapeInfo on Shape {
+  String get label => name.toUpperCase();
+  String shout() => name.toUpperCase();
+}
+
+class Box {
+  const Box(this.size);
+  final int size;
+  int get area => size * size;
+  int grow() => size + 1;
+}
+
+extension BoxActions on Box {
+  int twice() => size * 2;
+}
+`,
+    // This unimported library cannot override render.dart's Square getter lineage.
+    'lib/unrelated.dart': 'class Square { final int area = 7; }\n',
+    'lib/derived.dart': `import 'shape.dart';
+class ImportedSolid extends Box {
+  final int area = 7;
+  ImportedSolid(int size) : super(size);
+}
+`,
+    'lib/barrel.dart': "export 'derived.dart';\n",
+    'lib/package-use.dart': `import 'package:repro/derived.dart';
+int packageOverride(ImportedSolid x) => x.area;
+`,
+    'lib/barrel-use.dart': `import 'barrel.dart';
+int exportedOverride(ImportedSolid x) => x.area;
+`,
+    'lib/use.dart': `import 'shape.dart';
+import 'derived.dart';
+
+String a(Shape s) => s.label;   // getter, extension on enum
+String b(Shape s) => s.shout(); // method, extension on enum
+int c(Box x) => x.area;         // getter, plain class
+int d(Box x) => x.grow();       // method, plain class
+int e(Box x) => x.twice();      // method, extension on class
+int importedOverride(ImportedSolid x) => x.area;
+`,
+    // Block bodies and class methods, through a parameter, a local and a field.
+    'lib/render.dart': `import 'shape.dart';
+
+class Square extends Box {
+  const Square(int size) : super(size);
+  static Square get unit => const Square(1);
+}
+
+class Solid extends Box {
+  final int area = 7;
+  const Solid(int size) : super(size);
+}
+
+int overridden(Solid s) => s.area;
+
+class Renderer {
+  final Box box;
+  final Shape shape;
+  Renderer(this.box, this.shape);
+
+  int paint(Box other) {
+    final local = Box(2);
+    return other.area + local.area;
+  }
+
+  int viaField() {
+    return box.area;
+  }
+
+  String tag() {
+    final text = shape.label;
+    return text + shape.shout();
+  }
+}
+
+int inherited(Square s) {
+  return s.area;
+}
+
+Square staticGetter() => Square.unit;
+`,
+    // Reads that must link nothing.
+    'lib/other.dart': `class Panel {
+  int get size => 0;
+  int get length => 0;
+}
+
+extension on Box {
+  int get hidden => 0;
+}
+`,
+    'lib/negatives.dart': `import 'shape.dart';
+
+int fieldRead(Box x) => x.size;           // a field, not Panel's getter
+int outside(List<int> xs) => xs.length;   // a getter of a type outside the project
+int untyped(dynamic d) => d.area;         // nothing says what d is
+int unnamed(Box x) => x.hidden;           // an unnamed extension in another library
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `kind name` of each caller of the node with qualified name `qn`, sorted. */
+function callersOf(qn: string): string[] {
+  const [target] = cg.getNodesByQualifiedName(qn);
+  expect(target, `no node ${qn}`).toBeDefined();
+  return cg.getCallers(target!.id).map(({ node, edge }) => `${edge.kind} ${node.qualifiedName}`).sort();
+}
+
+describe('Dart getter reads (#2338)', () => {
+  it('link a getter read on a plain class, as a call', () => {
+    expect(callersOf('Box::area')).toContain('calls c');
+  });
+
+  it('link a getter an extension on an enum adds', () => {
+    expect(callersOf('ShapeInfo::label')).toEqual(['calls Renderer::tag', 'calls a']);
+  });
+
+  it('link reads in block bodies and class methods, through parameters, locals and fields', () => {
+    expect(callersOf('Box::area')).toEqual([
+      'calls Renderer::paint',
+      'calls Renderer::viaField',
+      'calls c',
+      'calls inherited',
+    ]);
+  });
+
+  it('does not call an inherited getter overridden by a field', () => {
+    const fn = cg.getNodesByQualifiedName('overridden')[0]!;
+    expect(cg.getOutgoingEdges(fn.id).filter(edge => edge.kind === 'calls')).toEqual([]);
+  });
+
+  it.each(['importedOverride', 'packageOverride', 'exportedOverride'])('does not call an inherited getter overridden by an imported class field (%s)', caller => {
+    const fn = cg.getNodesByQualifiedName(caller)[0]!;
+    expect(cg.getOutgoingEdges(fn.id).filter(edge => edge.kind === 'calls')).toEqual([]);
+  });
+
+  it('link a static getter read through its class', () => {
+    expect(callersOf('Square::unit')).toEqual(['calls staticGetter']);
+  });
+
+  it('link nothing for a field, an outside type, an untyped receiver or an out-of-library unnamed extension', () => {
+    const ids = cg.getNodesInFile('lib/negatives.dart').map((n) => n.id);
+    const targets = cg.getOutgoingEdgesFrom(ids, ['calls'])
+      .map((edge) => cg.getNode(edge.target)!.qualifiedName);
+    expect(targets).toEqual([]);
+    expect(callersOf('Panel::size')).toEqual([]);
+    expect(callersOf('Panel::length')).toEqual([]);
+  });
+});
+
+describe('Dart extension members on an enum (#2338)', () => {
+  it('resolve a method an extension on an enum adds', () => {
+    expect(callersOf('ShapeInfo::shout')).toEqual(['calls Renderer::tag', 'calls b']);
+  });
+
+  it('still resolve methods on a class and its extensions', () => {
+    expect(callersOf('Box::grow')).toEqual(['calls d']);
+    expect(callersOf('BoxActions::twice')).toEqual(['calls e']);
+  });
+});
diff --git a/__tests__/dart-type-positions.test.ts b/__tests__/dart-type-positions.test.ts
new file mode 100644
index 0000000000..79ead5c731
--- /dev/null
+++ b/__tests__/dart-type-positions.test.ts
@@ -0,0 +1,126 @@
+/**
+ * Dart type positions that recorded no reference (#2327).
+ *
+ * `callers` / impact for a Dart type only saw parameter and return types: the
+ * type an extension is `on`, a field's type, and a type named in a body or an
+ * initializer (`Future<Report?>.value(null)`, riverpod's `final p =
+ * Family<Report?, String>()`) linked nothing, so model-to-UI impact missed
+ * most uses of shared API types.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-dart-types-'));
+  const files: Record<string, string> = {
+    'pubspec.yaml': 'name: repro\nenvironment:\n  sdk: ">=3.0.0 <4.0.0"\n',
+    // The issue's six files, verbatim.
+    'lib/report.dart': 'class Report {\n  final int score;\n  const Report(this.score);\n}\n',
+    'lib/a_parameter.dart': "import 'report.dart';\n\nint score(Report r) => r.score;\n",
+    'lib/b_return_generic.dart': "import 'report.dart';\n\nFuture<Report?> load() async => null;\n",
+    'lib/c_extension_on.dart': "import 'report.dart';\n\nextension ReportX on Report {\n  bool get high => score > 5;\n}\n",
+    'lib/d_field_type.dart': "import 'report.dart';\n\nclass Holder {\n  final Report report;\n  const Holder(this.report);\n}\n",
+    'lib/e_toplevel_initializer_generic.dart': "import 'report.dart';\n\nclass Family<T, A> {\n  const Family();\n}\n\nfinal reportProvider = Family<Report?, String>();\n",
+    'lib/f_expression_generic.dart': "import 'report.dart';\n\nvoid run() {\n  Future<Report?>.value(null);\n}\n",
+    // The same gap's other shapes.
+    'lib/model.dart': `class Score {
+  const Score(this.value);
+  final int value;
+}
+
+class ScoreError implements Exception {}
+`,
+    'lib/more.dart': `import 'model.dart' as m;
+import 'model.dart';
+
+extension ScoresX on List<Score> {
+  int get total => length;
+}
+
+enum Grade {
+  a(null);
+  const Grade(this.best);
+  final Score? best;
+}
+
+class Board {
+  Score? top;
+  final List<Score> all = [];
+  static const Score zero = Score(0);
+  var cache = <String, Score>{};
+  late final m.Score prefixed;
+}
+
+Score? current;
+final scores = <Score>[];
+
+int body(Object o) {
+  final Score s = o as Score;
+  if (o is Score) {}
+  final made = Score(1);
+  final built = const Score(2);
+  try {} on ScoreError catch (_) {}
+  return s.value + made.value + built.value;
+}
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `kind qualifiedName` of each node with an incoming `kind` edge to `qn`, sorted and de-duplicated. */
+function referrers(qn: string, kind: 'references' | 'instantiates' = 'references'): string[] {
+  const [target] = cg.getNodesByQualifiedName(qn);
+  expect(target, `no node ${qn}`).toBeDefined();
+  const edges = cg.getIncomingEdgesTo([target!.id], [kind]);
+  return [...new Set(edges.map((e) => cg.getNode(e.source)!).map((n) => `${n.kind} ${n.qualifiedName}`))].sort();
+}
+
+describe('Dart type positions (#2327)', () => {
+  it('reference the type from every position in the issue', () => {
+    expect(referrers('Report')).toEqual([
+      'class Holder',              // field type
+      'class ReportX',             // extension target
+      'constant reportProvider',   // generic argument in a top-level initializer
+      'function load',             // return type's generic argument (already linked)
+      'function run',              // generic argument in an expression
+      'function score',            // parameter type (already linked)
+    ]);
+  });
+
+  it('reference the type from fields, enum fields, initializers, locals, casts, type tests and the file', () => {
+    expect(referrers('Score')).toEqual([
+      'class Board',               // field types, `<String, Score>{}`, the prefixed `m.Score`
+      'class ScoresX',             // `on List<Score>`
+      'enum Grade',                // an enhanced enum's field
+      'file lib/more.dart',        // a top-level variable's type
+      'function body',             // a local's type, a cast, a type test
+      'constant scores',           // `<Score>[]`
+    ].sort());
+    expect(referrers('ScoreError')).toEqual(['function body']);
+  });
+
+  it('leave a constructor call to its instantiation, and an import prefix out', () => {
+    // `Score(1)` / `const Score(2)` instantiate; they add no reference of their own.
+    const body = cg.getNodesByQualifiedName('body')[0]!;
+    const refs = cg.getOutgoingEdgesFrom([body.id], ['references']).filter((e) => cg.getNode(e.target)!.name === 'Score');
+    expect([...new Set(refs.map((e) => e.line))].sort()).toEqual([26, 27]);
+    expect(referrers('Score', 'instantiates')).toEqual(['function body']);
+    const prefixRefs = cg.getUnresolvedReferencesInFile('lib/more.dart').filter((r) => r.referenceName === 'm');
+    expect(prefixRefs).toEqual([]);
+  });
+});
diff --git a/__tests__/explore-cobol-copybook.test.ts b/__tests__/explore-cobol-copybook.test.ts
new file mode 100644
index 0000000000..0dc2c40ec0
--- /dev/null
+++ b/__tests__/explore-cobol-copybook.test.ts
@@ -0,0 +1,190 @@
+/**
+ * COBOL copybooks are findable by name in explore (#2342).
+ *
+ * `COPY X` and `EXEC SQL INCLUDE X` are indexed as `import` nodes, and the
+ * context builder's default kind filter drops imports (for JavaScript an
+ * import statement is noise). So `codegraph_explore "MYCOPYBOOK"` — and the
+ * CLI `explore`, which runs the same handler — answered "No relevant code
+ * found" while `query`/`node` found the include at once. A copybook name with
+ * a digit in it (`CVACT01Y`) fared worse: the text search fell through to its
+ * fuzzy fallback and answered with an unrelated program one edit away.
+ *
+ * Now a query that names a copybook gets the copybook's own source (pinned,
+ * first) and every statement that includes it; a member whose source is not
+ * indexed says so. Other languages' imports stay out of explore.
+ */
+import { afterEach, describe, expect, it } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import CodeGraph from '../src/index';
+import { ToolHandler } from '../src/mcp/tools';
+
+let dir: string;
+let cg: CodeGraph;
+
+async function index(files: Record<string, string>): Promise<void> {
+  dir = fs.mkdtempSync(path.join(os.tmpdir(), 'codegraph-cobol-copybook-'));
+  for (const [name, source] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(dir, name)), { recursive: true });
+    fs.writeFileSync(path.join(dir, name), source);
+  }
+  cg = CodeGraph.initSync(dir);
+  await cg.indexAll();
+}
+
+async function explore(query: string): Promise<string> {
+  const result = await new ToolHandler(cg).execute('codegraph_explore', { query });
+  expect(result.isError).toBeFalsy();
+  return result.content[0]!.text;
+}
+
+afterEach(() => {
+  cg?.destroy();
+  if (dir) fs.rmSync(dir, { recursive: true, force: true });
+});
+
+const lines = (...l: string[]): string => l.join('\n') + '\n';
+
+/** The issue's reproduction, verbatim: an EXEC SQL INCLUDE whose member is not indexed. */
+const TESTPROG = lines(
+  '       IDENTIFICATION DIVISION.',
+  '       PROGRAM-ID. TESTPROG.',
+  '       PROCEDURE DIVISION.',
+  '       UP-INCLUDE-COPYBOOK SECTION.',
+  '       UP-INCLUDE-COPYBOOK-10.',
+  '           EXEC SQL INCLUDE MYCOPYBOOK END-EXEC.',
+);
+
+/** An indexed data copybook, COPY'd by two programs. */
+const COPYBOOK_PROJECT = {
+  'cpy/CVACT01Y.cpy': lines(
+    '       01  ACCOUNT-RECORD.',
+    '           05  ACCT-ID          PIC 9(11).',
+    '           05  ACCT-CURR-BAL    PIC S9(10)V99.',
+  ),
+  'cbl/ACCTUPDT.cbl': lines(
+    '       IDENTIFICATION DIVISION.',
+    '       PROGRAM-ID. ACCTUPDT.',
+    '       DATA DIVISION.',
+    '       WORKING-STORAGE SECTION.',
+    '       COPY CVACT01Y.',
+    '       01  WS-COUNT    PIC 9(4) VALUE 0.',
+    '       PROCEDURE DIVISION.',
+    '       MAIN-PARA.',
+    '           MOVE 1 TO ACCT-ID',
+    '           STOP RUN.',
+  ),
+  'cbl/ACCTVIEW.cbl': lines(
+    '       IDENTIFICATION DIVISION.',
+    '       PROGRAM-ID. ACCTVIEW.',
+    '       DATA DIVISION.',
+    '       WORKING-STORAGE SECTION.',
+    '       COPY CVACT01Y.',
+    '       PROCEDURE DIVISION.',
+    '       MAIN-PARA.',
+    '           DISPLAY ACCT-CURR-BAL',
+    '           STOP RUN.',
+  ),
+  // One edit away from the copybook's name, and includes nothing: the
+  // program the fuzzy fallback used to answer `CVACT01Y` with.
+  'cbl/CBACT01C.cbl': lines(
+    '       IDENTIFICATION DIVISION.',
+    '       PROGRAM-ID. CBACT01C.',
+    '       PROCEDURE DIVISION.',
+    '       MAIN-PARA.',
+    '           DISPLAY "BATCH"',
+    '           STOP RUN.',
+  ),
+};
+
+describe('explore finds COBOL copybooks by name (#2342)', () => {
+  it('surfaces an EXEC SQL INCLUDE whose copybook is not indexed (the issue repro)', async () => {
+    await index({ 'TESTPROG.cbl': TESTPROG });
+    const text = await explore('MYCOPYBOOK');
+    expect(text).not.toContain('No relevant code found');
+    // The include site, listed and rendered.
+    expect(text).toContain('`TESTPROG.cbl:6` — EXEC SQL INCLUDE');
+    expect(text).toMatch(/6\t\s+EXEC SQL INCLUDE MYCOPYBOOK END-EXEC\./);
+    // And the honest note that there is no copybook source here to look for.
+    expect(text).toContain('no indexed source');
+  });
+
+  it('pins an indexed copybook ahead of every include site, and lists all of them', async () => {
+    await index(COPYBOOK_PROJECT);
+    const text = await explore('CVACT01Y');
+    expect(text).not.toContain('No relevant code found');
+    expect(text).toContain('source `cpy/CVACT01Y.cpy`; included at 2 sites');
+    expect(text).toContain('`cbl/ACCTUPDT.cbl:5` — COPY');
+    expect(text).toContain('`cbl/ACCTVIEW.cbl:5` — COPY');
+    // The copybook's own source renders, before any including program.
+    const copybookAt = text.indexOf('**`cpy/CVACT01Y.cpy`**');
+    expect(copybookAt).toBeGreaterThan(-1);
+    expect(text).toContain('01  ACCOUNT-RECORD.');
+    for (const program of ['cbl/ACCTUPDT.cbl', 'cbl/ACCTVIEW.cbl']) {
+      const at = text.indexOf(`**\`${program}\`**`);
+      expect(at).toBeGreaterThan(copybookAt);
+    }
+    expect(text).toContain('COPY CVACT01Y.');
+    expect(text).toContain('1 file pinned from the query');
+    // Not the program one edit away from the copybook's name.
+    expect(text).not.toContain('CBACT01C');
+  });
+
+  it('feeds the same entry points to codegraph context (buildContext)', async () => {
+    await index({ 'TESTPROG.cbl': TESTPROG, ...COPYBOOK_PROJECT });
+    const missing = await cg.buildContext('MYCOPYBOOK', { format: 'markdown' });
+    expect(missing).toContain('EXEC SQL INCLUDE MYCOPYBOOK END-EXEC');
+    const indexed = await cg.buildContext('CVACT01Y', { format: 'markdown' });
+    expect(indexed).toContain('ACCOUNT-RECORD');
+    expect(indexed).toContain('COPY CVACT01Y.');
+    expect(indexed).not.toContain('CBACT01C');
+  });
+
+  it('leaves the copybook out when an explicit kind filter excludes imports', async () => {
+    await index({ 'TESTPROG.cbl': TESTPROG });
+    const subgraph = await cg.findRelevantContext('MYCOPYBOOK', { nodeKinds: ['function'] });
+    expect([...subgraph.nodes.values()].some((n) => n.kind === 'import')).toBe(false);
+  });
+
+  it('keeps copybook declaration roots within an explicit kind filter', async () => {
+    await index(COPYBOOK_PROJECT);
+    const subgraph = await cg.findRelevantContext('CVACT01Y', { nodeKinds: ['import'] });
+    const roots = subgraph.roots.map(id => subgraph.nodes.get(id)!);
+    expect(roots.length).toBeGreaterThan(0);
+    expect(roots.map(node => node.kind)).toEqual(roots.map(() => 'import'));
+  });
+
+  it('keeps imports of other languages out of explore', async () => {
+    await index({
+      'main.ts': "import { CVACT01Y } from './lib';\nexport function run() { return CVACT01Y; }\n",
+      'lib.ts': 'export const CVACT01Y = 1;\n',
+    });
+    const subgraph = await cg.findRelevantContext('CVACT01Y ./lib');
+    expect([...subgraph.nodes.values()].some((n) => n.kind === 'import')).toBe(false);
+    const text = await explore('CVACT01Y');
+    expect(text).not.toContain('COBOL copybook');
+    expect(text).toContain('export const CVACT01Y = 1;');
+  });
+});
+
+describe('copybook member tokens (#2342)', () => {
+  // Imported lazily so the behavioural cases above load (and fail) on a build
+  // that predates the module.
+  const tokens = async (query: string): Promise<string[]> =>
+    (await import('../src/graph/cobol-copybooks')).copybookMemberTokens(query);
+
+  it('keeps COBOL-shaped words and skips plain lowercase English', async () => {
+    expect(await tokens('where is CVACT01Y included from cust-rec and dfh$aid'))
+      .toEqual(['CVACT01Y', 'cust-rec', 'dfh$aid']);
+  });
+
+  it('dedupes case-insensitively and drops short or digit-only tokens', async () => {
+    expect(await tokens('SQLCA sqlca IO 0042 Sqlca')).toEqual(['SQLCA']);
+  });
+
+  it('takes a one-word query as a name whatever its case', async () => {
+    expect(await tokens('lgpolicy')).toEqual(['lgpolicy']);
+    expect(await tokens('the lgpolicy')).toEqual([]);
+  });
+});
diff --git a/__tests__/extraction.test.ts b/__tests__/extraction.test.ts
index 2ab2c7dce1..6867eb22fc 100644
--- a/__tests__/extraction.test.ts
+++ b/__tests__/extraction.test.ts
@@ -1405,7 +1405,7 @@ export const exported = { handler: () => target() };
       return result.unresolvedReferences
         .filter((u) => u.referenceKind === 'calls' && u.referenceName === name)
         .map((u) => byId.get(u.fromNodeId))
-        .map((n) => (n ? `${n.kind}:${n.name}` : '?'))
+        .map((n) => (n ? `${n.kind}:${n.qualifiedName}` : '?'))
         .sort();
     };
 
@@ -1416,17 +1416,55 @@ export const exported = { handler: () => target() };
     });
 
     it('a non-exported object literal contributes calls (it was skipped outright)', () => {
-      // `exported`'s members are minted as their own function nodes, so its
-      // arrow's call comes from `handler`; the non-exported ones attribute to
-      // the declared constant.
+      // A named literal's function members are its own nodes, exported or not
+      // (#2300), so each arrow's call comes from its `handler`; the literal's
+      // eager value and the array's arrow attribute to the declared constant.
       expect(callersOf('target')).toEqual([
         'constant:list',
         'constant:obj',
-        'constant:obj',
-        'function:handler',
+        'function:exported::handler',
+        'function:obj::handler',
       ]);
     });
   });
+
+  // A destructuring declaration mints no symbol, so its initializer was never
+  // walked at module scope: `const { a } = useFoo(1)` recorded no call at all,
+  // where the same line inside a function did (#2340).
+  it.each(['ts', 'tsx', 'js', 'jsx'])('records the calls of a module-scope destructuring declaration (%s, #2340)', (ext) => {
+    const code = [
+      'const { a } = useFoo(1)',
+      'let [b, c] = pair()',
+      'var { d: { e } } = nested()',
+      'const { f = fallback() } = withDefault()',
+      'const [g = other(), ...rest] = list()',
+      'export const { h } = exported()',
+      'const { i } = await load(() => inArrow())',
+      'export function probe() { const { j } = inner(); return j }',
+      '',
+    ].join('\n');
+    const result = extractFromSource(`app.${ext}`, code);
+    const byId = new Map(result.nodes.map((n) => [n.id, n]));
+    const calls = result.unresolvedReferences
+      .filter((r) => r.referenceKind === 'calls')
+      .map((r) => `${byId.get(r.fromNodeId)?.kind}:${r.referenceName}@${r.line}`)
+      .sort();
+    expect(calls).toEqual([
+      'file:exported@6',
+      'file:fallback@4',
+      'file:inArrow@7',
+      'file:list@5',
+      'file:load@7',
+      'file:nested@3',
+      'file:other@5',
+      'file:pair@2',
+      'file:useFoo@1',
+      'file:withDefault@4',
+      'function:inner@8', // inside a function: the function's, as before
+    ]);
+    // Exported factory bindings remain indexed by the fork.
+    expect(result.nodes.filter((n) => n.kind === 'constant' || n.kind === 'variable').map((n) => n.name)).toEqual(['h']);
+  });
 });
 
 describe('File Node Extraction', () => {
@@ -9705,6 +9743,33 @@ const token = getTokenMp();
     expect(call).toBeDefined();
   });
 
+  it.each(['LF', 'CRLF'])('should attribute calls in <script setup> destructuring and in the template to the component (%s, #2340)', (ending) => {
+    const lf = `<template>
+  <NuxtLink :to="useBar(link.location)">{{ useBar(link) }}</NuxtLink>
+  <li v-for="item in items" @click="item.open()">{{ label(item) }}</li>
+</template>
+
+<script setup lang="ts">
+const { a } = useFoo(1)
+const [b] = useFoo(2)
+</script>
+`;
+    const code = ending === 'CRLF' ? lf.replace(/\n/g, '\r\n') : lf;
+    const result = extractFromSource('Card.vue', code);
+    const component = result.nodes.find((n) => n.kind === 'component')!;
+    const calls = result.unresolvedReferences
+      .filter((r) => r.referenceKind === 'calls')
+      .map((r) => `${r.fromNodeId === component.id ? 'component' : r.fromNodeId}:${r.referenceName}@${r.line}`)
+      .sort();
+    expect(calls).toEqual([
+      'component:label@3',
+      'component:useBar@2',
+      'component:useBar@2',
+      'component:useFoo@7',
+      'component:useFoo@8',
+    ]);
+  });
+
   it('should extract calls from Vue Options API object methods', () => {
     const code = `<template>
   <button @click="save">Save</button>
diff --git a/__tests__/fixtures/golden/payroll-go.dump b/__tests__/fixtures/golden/payroll-go.dump
index dfd634e66d..6ae86696c0 100644
--- a/__tests__/fixtures/golden/payroll-go.dump
+++ b/__tests__/fixtures/golden/payroll-go.dump
@@ -31,7 +31,7 @@
 {"id":"file:internal/usecase/payroll/prorate.go","kind":"file","name":"prorate.go","qualified_name":"internal/usecase/payroll/prorate.go","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":1,"end_line":54,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:00884e47e06de8395363f17646801d9e","kind":"function","name":"RegisterPayrollServiceServer","qualified_name":"RegisterPayrollServiceServer","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":90,"end_line":92,"start_column":0,"end_column":1,"docstring":"RegisterPayrollServiceServer registers the generated service.","signature":"(s grpc.ServiceRegistrar, srv PayrollServiceServer)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:031a254efe4755a89bab7f6d9209b4ea","kind":"function","name":"NewPayrollServiceClient","qualified_name":"NewPayrollServiceClient","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":33,"end_line":35,"start_column":0,"end_column":1,"docstring":"NewPayrollServiceClient returns a generated client.","signature":"(cc grpc.ClientConnInterface) PayrollServiceClient","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollServiceClient"}
-{"id":"function:03a41d6c149ff7b81fd46b0c79fe7ce4","kind":"function","name":"NewRouter","qualified_name":"NewRouter","file_path":"internal/transport/httpapi/router.go","language":"go","start_line":7,"end_line":14,"start_column":0,"end_column":1,"docstring":"NewRouter wires the HTTP surface. The payroll cycle endpoint is the only\nentry point into the hand-written use-case layer.","signature":"(h *PayrollHandler) http.Handler","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Handler"}
+{"id":"function:03a41d6c149ff7b81fd46b0c79fe7ce4","kind":"function","name":"NewRouter","qualified_name":"NewRouter","file_path":"internal/transport/httpapi/router.go","language":"go","start_line":7,"end_line":14,"start_column":0,"end_column":1,"docstring":"NewRouter wires the HTTP surface. The payroll cycle endpoint is the only\nentry point into the hand-written use-case layer.","signature":"(h *PayrollHandler) http.Handler","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"http.Handler"}
 {"id":"function:0414eb07a8b96d1a74af19b17a88be3d","kind":"function","name":"calculate.go CalculatePayrollCycleTotals, CalculatePayslipNet,","qualified_name":"README.md::command:26:2:calculate.go      CalculatePayrollCycleTotals, CalculatePayslipNet, …","file_path":"README.md","language":"markdown","start_line":26,"end_line":26,"start_column":2,"end_column":71,"docstring":null,"signature":"calculate.go      CalculatePayrollCycleTotals, CalculatePayslipNet, …","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:05eca0e54aeccbabbb69152ff002657c","kind":"function","name":"GetEmployee","qualified_name":"GetEmployee","file_path":"internal/gen/fkit/employee/employee.go","language":"go","start_line":45,"end_line":48,"start_column":0,"end_column":1,"docstring":"GetEmployee selects one employee row by primary key.","signature":"(ctx context.Context, db *sql.DB, id string) (EmployeeRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"EmployeeRow"}
 {"id":"function:0709805de829555a8b769b387496185d","kind":"function","name":"DeletePayslip","qualified_name":"DeletePayslip","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":75,"end_line":79,"start_column":0,"end_column":1,"docstring":"DeletePayslip removes one payslip row.","signature":"(ctx context.Context, db *sql.DB, id string) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
@@ -46,8 +46,8 @@
 {"id":"function:2b4f03c93cfc20f726251980faf21e4b","kind":"function","name":"PayrollCycleToDTO","qualified_name":"PayrollCycleToDTO","file_path":"internal/gen/fkit/payroll/dto.go","language":"go","start_line":69,"end_line":71,"start_column":0,"end_column":1,"docstring":"PayrollCycleToDTO converts a payroll_cycle row to its wire form.","signature":"(r PayrollCycleRow) PayrollCycleDTO","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleDTO"}
 {"id":"function:2b54c509c897b69fda45f099b03ddecc","kind":"function","name":"internal/store/payslipstore/store.go the real","qualified_name":"README.md::command:19:0:internal/store/payslipstore/store.go        the real Upsert","file_path":"README.md","language":"markdown","start_line":19,"end_line":19,"start_column":0,"end_column":59,"docstring":null,"signature":"internal/store/payslipstore/store.go        the real Upsert","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:2b593a9d67adcbcc2f8157621f1b08f4","kind":"function","name":"CreatePayrollCycle","qualified_name":"CreatePayrollCycle","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":40,"end_line":43,"start_column":0,"end_column":1,"docstring":"CreatePayrollCycle inserts one payroll_cycle row.","signature":"(ctx context.Context, db *sql.DB, req PayrollCycleCreateRequest) (PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
-{"id":"function:2de35841246f09a810efb472eacc8bdb","kind":"function","name":"laterOf","qualified_name":"laterOf","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":41,"end_line":46,"start_column":0,"end_column":1,"docstring":null,"signature":"(a, b time.Time) time.Time","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Time"}
-{"id":"function:2f7a92e2ac264db827c2eedf3fe7c448","kind":"function","name":"earlierOf","qualified_name":"earlierOf","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":48,"end_line":53,"start_column":0,"end_column":1,"docstring":null,"signature":"(a, b time.Time) time.Time","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Time"}
+{"id":"function:2de35841246f09a810efb472eacc8bdb","kind":"function","name":"laterOf","qualified_name":"laterOf","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":41,"end_line":46,"start_column":0,"end_column":1,"docstring":null,"signature":"(a, b time.Time) time.Time","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"time.Time"}
+{"id":"function:2f7a92e2ac264db827c2eedf3fe7c448","kind":"function","name":"earlierOf","qualified_name":"earlierOf","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":48,"end_line":53,"start_column":0,"end_column":1,"docstring":null,"signature":"(a, b time.Time) time.Time","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"time.Time"}
 {"id":"function:314d7259385972532d50bfb35a88f851","kind":"function","name":"prorate.go","qualified_name":"README.md::command:17:2:prorate.go","file_path":"README.md","language":"markdown","start_line":17,"end_line":17,"start_column":2,"end_column":12,"docstring":null,"signature":"prorate.go","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:34b9bf3532aea2d43bc29ca82a937846","kind":"function","name":"CalculatePayslipNet","qualified_name":"CalculatePayslipNet","file_path":"internal/gen/fkit/payroll/calculate.go","language":"go","start_line":37,"end_line":39,"start_column":0,"end_column":1,"docstring":"CalculatePayslipNet recomputes net from the stored gross and deduction\ncolumns of one row. Pure column arithmetic — no pay rules.","signature":"(row PayslipRow) int64","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"function:371445b42f0b89d0e09b6c77c0cae1c9","kind":"function","name":"CreatePayslip","qualified_name":"CreatePayslip","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":51,"end_line":56,"start_column":0,"end_column":1,"docstring":"CreatePayslip inserts one payslip row.","signature":"(ctx context.Context, db *sql.DB, req PayslipCreateRequest) (PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
@@ -61,7 +61,7 @@
 {"id":"function:5d48feb09a7faedf052939df2141b437","kind":"function","name":"CalculatePayrollCycleTotals","qualified_name":"CalculatePayrollCycleTotals","file_path":"internal/gen/fkit/payroll/calculate.go","language":"go","start_line":25,"end_line":33,"start_column":0,"end_column":1,"docstring":"CalculatePayrollCycleTotals runs the generated SUM aggregate over the\npayslip rows of one cycle. It totals what is already stored; it does not\ncalculate any payslip.","signature":"(ctx context.Context, db *sql.DB, cycleID string) (PayrollCycleTotals, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleTotals"}
 {"id":"function:5dcd3514b7efa1f5e466655bd84a5f3f","kind":"function","name":"internal/transport/httpapi/ HTTP entry","qualified_name":"README.md::command:13:0:internal/transport/httpapi/                 HTTP entry point → use-case","file_path":"README.md","language":"markdown","start_line":13,"end_line":13,"start_column":0,"end_column":71,"docstring":null,"signature":"internal/transport/httpapi/                 HTTP entry point → use-case","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:5e2796c1fbc4081e6b6f6a4307fe4bc0","kind":"function","name":"key","qualified_name":"key","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":31,"end_line":31,"start_column":0,"end_column":81,"docstring":null,"signature":"(cycleID, employeeID string) string","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
-{"id":"function:63f3bd99966467470cbabcb097ad36dd","kind":"function","name":"ListPayslipsByCycle","qualified_name":"ListPayslipsByCycle","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":82,"end_line":100,"start_column":0,"end_column":1,"docstring":"ListPayslipsByCycle selects every payslip row for a cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) ([]PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
+{"id":"function:63f3bd99966467470cbabcb097ad36dd","kind":"function","name":"ListPayslipsByCycle","qualified_name":"ListPayslipsByCycle","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":82,"end_line":100,"start_column":0,"end_column":1,"docstring":"ListPayslipsByCycle selects every payslip row for a cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) ([]PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:680f46cf762a57779b8a8dbe6de8c989","kind":"function","name":"scanContract","qualified_name":"scanContract","file_path":"internal/gen/fkit/employee/contract.go","language":"go","start_line":79,"end_line":84,"start_column":0,"end_column":1,"docstring":null,"signature":"(row *sql.Row) (ContractRow, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"ContractRow"}
 {"id":"function:6d24ec374e85d64ae8e29a2c106c215d","kind":"function","name":"CalculatePayrollCycleAverage","qualified_name":"CalculatePayrollCycleAverage","file_path":"internal/gen/fkit/payroll/calculate.go","language":"go","start_line":42,"end_line":51,"start_column":0,"end_column":1,"docstring":"CalculatePayrollCycleAverage averages the stored net over a cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) (int64, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"function:722290a9483dc9f47a174b89cbb6aca1","kind":"function","name":"CreateTimesheet","qualified_name":"CreateTimesheet","file_path":"internal/gen/fkit/timesheet/timesheet.go","language":"go","start_line":34,"end_line":37,"start_column":0,"end_column":1,"docstring":"CreateTimesheet inserts one timesheet row.","signature":"(ctx context.Context, db *sql.DB, req TimesheetCreateRequest) (TimesheetRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"TimesheetRow"}
@@ -72,10 +72,10 @@
 {"id":"function:7b3e5cb66aaaa7349a6ec9bd7f401259","kind":"function","name":"UpdateEmployee","qualified_name":"UpdateEmployee","file_path":"internal/gen/fkit/employee/employee.go","language":"go","start_line":51,"end_line":55,"start_column":0,"end_column":1,"docstring":"UpdateEmployee patches one employee row.","signature":"(ctx context.Context, db *sql.DB, id string, req EmployeeUpdateRequest) (EmployeeRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"EmployeeRow"}
 {"id":"function:7ed76b62f3223020612f80cf9c2e6ee7","kind":"function","name":"internal/gen/fkit/employee/, timesheet/ more","qualified_name":"README.md::command:28:0:internal/gen/fkit/employee/, timesheet/     more generated CRUD","file_path":"README.md","language":"markdown","start_line":28,"end_line":28,"start_column":0,"end_column":63,"docstring":null,"signature":"internal/gen/fkit/employee/, timesheet/     more generated CRUD","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:80943211ed2b432c66489bcda8e6d0a4","kind":"function","name":"prorateSalary","qualified_name":"prorateSalary","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":11,"end_line":24,"start_column":0,"end_column":1,"docstring":"prorateSalary scales a full period rate down when the contract covers only\npart of the cycle window (a mid-period joiner or leaver).","signature":"(fullCents int64, contract payroll.Contract, cycle payroll.Cycle) int64","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
-{"id":"function:81328c12525c00ff7d9778f2e988eab3","kind":"function","name":"ListEmployeesByStatus","qualified_name":"ListEmployeesByStatus","file_path":"internal/gen/fkit/employee/employee.go","language":"go","start_line":65,"end_line":82,"start_column":0,"end_column":1,"docstring":"ListEmployeesByStatus selects employee rows in one status.","signature":"(ctx context.Context, db *sql.DB, status string) ([]EmployeeRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"EmployeeRow"}
+{"id":"function:81328c12525c00ff7d9778f2e988eab3","kind":"function","name":"ListEmployeesByStatus","qualified_name":"ListEmployeesByStatus","file_path":"internal/gen/fkit/employee/employee.go","language":"go","start_line":65,"end_line":82,"start_column":0,"end_column":1,"docstring":"ListEmployeesByStatus selects employee rows in one status.","signature":"(ctx context.Context, db *sql.DB, status string) ([]EmployeeRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:82bd498c77e3b6ab5b76ae283f737fde","kind":"function","name":"CreateContract","qualified_name":"CreateContract","file_path":"internal/gen/fkit/employee/contract.go","language":"go","start_line":39,"end_line":44,"start_column":0,"end_column":1,"docstring":"CreateContract inserts one contract row.","signature":"(ctx context.Context, db *sql.DB, req ContractCreateRequest) (ContractRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"ContractRow"}
 {"id":"function:83cf216ee860f62e450ed62c0977ab07","kind":"function","name":"DeletePayrollCycle","qualified_name":"DeletePayrollCycle","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":60,"end_line":64,"start_column":0,"end_column":1,"docstring":"DeletePayrollCycle removes one payroll_cycle row.","signature":"(ctx context.Context, db *sql.DB, id string) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
-{"id":"function:840b0285a601a69c58d31e483b0ab2c8","kind":"function","name":"ListTimesheetsByCycle","qualified_name":"ListTimesheetsByCycle","file_path":"internal/gen/fkit/timesheet/timesheet.go","language":"go","start_line":52,"end_line":69,"start_column":0,"end_column":1,"docstring":"ListTimesheetsByCycle selects timesheet rows for one cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) ([]TimesheetRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"TimesheetRow"}
+{"id":"function:840b0285a601a69c58d31e483b0ab2c8","kind":"function","name":"ListTimesheetsByCycle","qualified_name":"ListTimesheetsByCycle","file_path":"internal/gen/fkit/timesheet/timesheet.go","language":"go","start_line":52,"end_line":69,"start_column":0,"end_column":1,"docstring":"ListTimesheetsByCycle selects timesheet rows for one cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) ([]TimesheetRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:852fbd5b1a3434558ad769f0855ecfae","kind":"function","name":"sumKind","qualified_name":"sumKind","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":142,"end_line":150,"start_column":0,"end_column":1,"docstring":null,"signature":"(lines []payroll.Line, kind payroll.LineKind) int64","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"function:8e554156c22d75e629b346ea4ed215d1","kind":"function","name":"npx vitest run","qualified_name":"README.md::command:76:0:npx vitest run __tests__/explore-allocation-1500.test.ts  # green today, by design","file_path":"README.md","language":"markdown","start_line":76,"end_line":76,"start_column":0,"end_column":82,"docstring":null,"signature":"npx vitest run __tests__/explore-allocation-1500.test.ts  # green today, by design","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:90eb51f51a3d9a397d4a53f26f2019aa","kind":"function","name":"main","qualified_name":"main","file_path":"cmd/payrolld/main.go","language":"go","start_line":15,"end_line":35,"start_column":0,"end_column":1,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -96,16 +96,16 @@
 {"id":"function:c304f28b41560a488fa25f4c0bdf4c46","kind":"function","name":"prorateAllowance","qualified_name":"prorateAllowance","file_path":"internal/usecase/payroll/prorate.go","language":"go","start_line":27,"end_line":32,"start_column":0,"end_column":1,"docstring":"prorateAllowance applies the same window rule to a recurring allowance.","signature":"(a payroll.Allowance, cycle payroll.Cycle, e payroll.Employee) int64","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"function:c58e8b67983f5b87ff8b159278954265","kind":"function","name":"internal/domain/payroll/payslip.go hand-written domain","qualified_name":"README.md::command:18:0:internal/domain/payroll/payslip.go          hand-written domain types","file_path":"README.md","language":"markdown","start_line":18,"end_line":18,"start_column":0,"end_column":69,"docstring":null,"signature":"internal/domain/payroll/payslip.go          hand-written domain types","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:c6392c858f3b95686ef12895ec918b6e","kind":"function","name":"CreateEmployee","qualified_name":"CreateEmployee","file_path":"internal/gen/fkit/employee/employee.go","language":"go","start_line":39,"end_line":42,"start_column":0,"end_column":1,"docstring":"CreateEmployee inserts one employee row.","signature":"(ctx context.Context, db *sql.DB, req EmployeeCreateRequest) (EmployeeRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"EmployeeRow"}
-{"id":"function:c68d01c236174f79631f8e8222523fa4","kind":"function","name":"ListPayrollCycles","qualified_name":"ListPayrollCycles","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":67,"end_line":84,"start_column":0,"end_column":1,"docstring":"ListPayrollCycles selects every payroll_cycle row.","signature":"(ctx context.Context, db *sql.DB) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
+{"id":"function:c68d01c236174f79631f8e8222523fa4","kind":"function","name":"ListPayrollCycles","qualified_name":"ListPayrollCycles","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":67,"end_line":84,"start_column":0,"end_column":1,"docstring":"ListPayrollCycles selects every payroll_cycle row.","signature":"(ctx context.Context, db *sql.DB) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:cf3f266e9ee5695886d6eff55fe33457","kind":"function","name":"cycle.go runPayrollCycleAll (227","qualified_name":"README.md::command:15:2:cycle.go                                    runPayrollCycleAll (227 lines)","file_path":"README.md","language":"markdown","start_line":15,"end_line":15,"start_column":2,"end_column":76,"docstring":null,"signature":"cycle.go                                    runPayrollCycleAll (227 lines)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:d08f890a663db7d10ae4f6cb67b95970","kind":"function","name":"internal/usecase/payroll/ ← THE","qualified_name":"README.md::command:14:0:internal/usecase/payroll/                   ← THE ANSWER. Hand-written workflow:","file_path":"README.md","language":"markdown","start_line":14,"end_line":14,"start_column":0,"end_column":80,"docstring":null,"signature":"internal/usecase/payroll/                   ← THE ANSWER. Hand-written workflow:","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:d82ab6b26c7b41b587b8d940d1c57034","kind":"function","name":"scanPayslip","qualified_name":"scanPayslip","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":123,"end_line":129,"start_column":0,"end_column":1,"docstring":null,"signature":"(row *sql.Row) (PayslipRow, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
 {"id":"function:dafc49538832924fdd27fb95ee61d479","kind":"function","name":"DeleteContract","qualified_name":"DeleteContract","file_path":"internal/gen/fkit/employee/contract.go","language":"go","start_line":53,"end_line":57,"start_column":0,"end_column":1,"docstring":"DeleteContract removes one contract row.","signature":"(ctx context.Context, db *sql.DB, id string) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
-{"id":"function:de0b4136eaf549d0e68341f4123657ba","kind":"function","name":"ListPayrollCyclesByStatus","qualified_name":"ListPayrollCyclesByStatus","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":87,"end_line":104,"start_column":0,"end_column":1,"docstring":"ListPayrollCyclesByStatus selects payroll_cycle rows in one status.","signature":"(ctx context.Context, db *sql.DB, status string) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
+{"id":"function:de0b4136eaf549d0e68341f4123657ba","kind":"function","name":"ListPayrollCyclesByStatus","qualified_name":"ListPayrollCyclesByStatus","file_path":"internal/gen/fkit/payroll/payroll_cycle.go","language":"go","start_line":87,"end_line":104,"start_column":0,"end_column":1,"docstring":"ListPayrollCyclesByStatus selects payroll_cycle rows in one status.","signature":"(ctx context.Context, db *sql.DB, status string) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:e21d5f54a14c6f4f3342cccb27e8a6eb","kind":"function","name":"Zone","qualified_name":"Zone","file_path":"internal/platform/clock/defaults.go","language":"go","start_line":8,"end_line":13,"start_column":0,"end_column":1,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"function:ec95f80b7e074efca14308b96f0fae41","kind":"function","name":"httpError","qualified_name":"httpError","file_path":"internal/transport/httpapi/payroll_handler.go","language":"go","start_line":94,"end_line":96,"start_column":0,"end_column":1,"docstring":null,"signature":"(w http.ResponseWriter, status int, msg string)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:ef7fb056c49eb36d083213308b4cbbb1","kind":"function","name":"CountPayslipsByCycle","qualified_name":"CountPayslipsByCycle","file_path":"internal/gen/fkit/payroll/payslip.go","language":"go","start_line":103,"end_line":108,"start_column":0,"end_column":1,"docstring":"CountPayslipsByCycle counts payslip rows for a cycle.","signature":"(ctx context.Context, db *sql.DB, cycleID string) (int64, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
-{"id":"function:f56104b93009b7d690676165ae7f0fd0","kind":"function","name":"ListContractsForEmployee","qualified_name":"ListContractsForEmployee","file_path":"internal/gen/fkit/employee/contract.go","language":"go","start_line":60,"end_line":77,"start_column":0,"end_column":1,"docstring":"ListContractsForEmployee selects contract rows for one employee.","signature":"(ctx context.Context, db *sql.DB, employeeID string) ([]ContractRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"ContractRow"}
+{"id":"function:f56104b93009b7d690676165ae7f0fd0","kind":"function","name":"ListContractsForEmployee","qualified_name":"ListContractsForEmployee","file_path":"internal/gen/fkit/employee/contract.go","language":"go","start_line":60,"end_line":77,"start_column":0,"end_column":1,"docstring":"ListContractsForEmployee selects contract rows for one employee.","signature":"(ctx context.Context, db *sql.DB, employeeID string) ([]ContractRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:f5bb323394b903d448de3194d3804241","kind":"function","name":"dto.go","qualified_name":"README.md::command:27:2:dto.go","file_path":"README.md","language":"markdown","start_line":27,"end_line":27,"start_column":2,"end_column":8,"docstring":null,"signature":"dto.go","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:fd984744d95388a5603b37d63b6b7035","kind":"function","name":"GetTimesheet","qualified_name":"GetTimesheet","file_path":"internal/gen/fkit/timesheet/timesheet.go","language":"go","start_line":40,"end_line":43,"start_column":0,"end_column":1,"docstring":"GetTimesheet selects one timesheet row by primary key.","signature":"(ctx context.Context, db *sql.DB, id string) (TimesheetRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"TimesheetRow"}
 {"id":"import:00f1a8a378ccaf8584e4437b6729d26a","kind":"import","name":"time","qualified_name":"time","file_path":"internal/platform/clock/clock.go","language":"go","start_line":3,"end_line":3,"start_column":7,"end_column":13,"docstring":null,"signature":"\"time\"","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -178,7 +178,7 @@
 {"id":"interface:42cfdfeed096dbb476259a39846085a2","kind":"interface","name":"PayrollServiceClient","qualified_name":"PayrollServiceClient","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":22,"end_line":26,"start_column":5,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"interface:9382b4b7c3b120f81bd0566fb2d74864","kind":"interface","name":"PayrollServiceServer","qualified_name":"PayrollServiceServer","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":65,"end_line":70,"start_column":5,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"interface:a2c04a6e9d1203f224eb044d73e38f03","kind":"interface","name":"Clock","qualified_name":"Clock","file_path":"internal/platform/clock/clock.go","language":"go","start_line":6,"end_line":8,"start_column":5,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"method:01c8a961c1fdfb54ea0c32614f905acc","kind":"method","name":"rosterFor","qualified_name":"Service::rosterFor","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":136,"end_line":163,"start_column":0,"end_column":1,"docstring":"rosterFor resolves which employees this cycle pays. An employee joins the\nroster when their contract overlaps the cycle window and they are not on\nunpaid leave for the whole period.","signature":"(ctx context.Context, cycle payroll.Cycle, opts RunOptions) ([]payroll.Employee, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Employee"}
+{"id":"method:01c8a961c1fdfb54ea0c32614f905acc","kind":"method","name":"rosterFor","qualified_name":"Service::rosterFor","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":136,"end_line":163,"start_column":0,"end_column":1,"docstring":"rosterFor resolves which employees this cycle pays. An employee joins the\nroster when their contract overlaps the cycle window and they are not on\nunpaid leave for the whole period.","signature":"(ctx context.Context, cycle payroll.Cycle, opts RunOptions) ([]payroll.Employee, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:06037b3320edb6047597bb589b08b240","kind":"method","name":"GetCycleId","qualified_name":"RunPayrollCycleRequest::GetCycleId","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":26,"end_line":31,"start_column":0,"end_column":1,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"method:069338e91f3b3bc0a6b434212386e59b","kind":"method","name":"DeletePayslip","qualified_name":"Store::DeletePayslip","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":60,"end_line":62,"start_column":0,"end_column":1,"docstring":"DeletePayslip removes one payslip row through the store.","signature":"(ctx context.Context, id string) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
 {"id":"method:0f882862f60ecd98b79db60e64ec66eb","kind":"method","name":"CreatePayrollCycle","qualified_name":"Store::CreatePayrollCycle","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":70,"end_line":72,"start_column":0,"end_column":1,"docstring":"CreatePayrollCycle inserts one payroll_cycle row through the store.","signature":"(ctx context.Context, req PayrollCycleCreateRequest) (PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
@@ -187,32 +187,32 @@
 {"id":"method:16a61da8990e9e8548eaba76a0d96d9f","kind":"method","name":"GetPayrollCycle","qualified_name":"PayrollServiceServer::GetPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":67,"end_line":67,"start_column":1,"end_column":81,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*PayrollCycle, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:18a9696cad4179d634834650c0684f0c","kind":"method","name":"RunPayrollCycle","qualified_name":"payrollServiceClient::RunPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":37,"end_line":44,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, in *RunPayrollCycleRequest, opts ...grpc.CallOption) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunPayrollCycleResponse"}
 {"id":"method:1b4f96e5a5a8b2784487acc4f7134ff7","kind":"method","name":"UnpaidLeaveCoversWindow","qualified_name":"Employee::UnpaidLeaveCoversWindow","file_path":"internal/domain/payroll/payslip.go","language":"go","start_line":149,"end_line":159,"start_column":0,"end_column":1,"docstring":"UnpaidLeaveCoversWindow reports whether unpaid leave swallows the whole window.","signature":"(from, to time.Time) bool","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"bool"}
-{"id":"method:24e3292f2546abebcb9d371572f38e20","kind":"method","name":"ListByCycle","qualified_name":"Store::ListByCycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":50,"end_line":63,"start_column":0,"end_column":1,"docstring":"ListByCycle returns every payslip a cycle produced.","signature":"(ctx context.Context, cycleID string) ([]payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Payslip"}
+{"id":"method:24e3292f2546abebcb9d371572f38e20","kind":"method","name":"ListByCycle","qualified_name":"Store::ListByCycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":50,"end_line":63,"start_column":0,"end_column":1,"docstring":"ListByCycle returns every payslip a cycle produced.","signature":"(ctx context.Context, cycleID string) ([]payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:2a060e193a7a00f9b848b18be73aca0e","kind":"method","name":"GetReason","qualified_name":"RunPayrollCycleRequest::GetReason","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":40,"end_line":45,"start_column":0,"end_column":1,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"method:2eb01c123ced28db3096d2168949061f","kind":"method","name":"mustEmbedUnimplementedPayrollServiceServer","qualified_name":"PayrollServiceServer::mustEmbedUnimplementedPayrollServiceServer","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":69,"end_line":69,"start_column":1,"end_column":45,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:2f3ad781c22d07dedb06b0a2f536ba18","kind":"method","name":"String","qualified_name":"RunPayrollCycleResponse::String","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":70,"end_line":70,"start_column":0,"end_column":91,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"method:3367319bda79cdcf1fefc366ce7322ac","kind":"method","name":"Reset","qualified_name":"Payslip::Reset","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":102,"end_line":102,"start_column":0,"end_column":52,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:3708105303f9a5feb2601fa8f3fe731e","kind":"method","name":"Upsert","qualified_name":"Store::Upsert","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":36,"end_line":47,"start_column":0,"end_column":1,"docstring":"Upsert writes a payslip, replacing any prior slip for the same\n(cycle, employee). A re-run of a cycle must not duplicate rows, so this is\nan upsert rather than an insert.","signature":"(ctx context.Context, slip payroll.Payslip) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
-{"id":"method:3af34007f72fd40aebe0e4504e8228ae","kind":"method","name":"PayslipsForCycle","qualified_name":"Service::PayslipsForCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":205,"end_line":212,"start_column":0,"end_column":1,"docstring":"PayslipsForCycle lists the payslips a completed cycle produced.","signature":"(ctx context.Context, cycleID string) ([]payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Payslip"}
+{"id":"method:3af34007f72fd40aebe0e4504e8228ae","kind":"method","name":"PayslipsForCycle","qualified_name":"Service::PayslipsForCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":205,"end_line":212,"start_column":0,"end_column":1,"docstring":"PayslipsForCycle lists the payslips a completed cycle produced.","signature":"(ctx context.Context, cycleID string) ([]payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:3f9811f3a17dc661bfba3de069234279","kind":"method","name":"Reset","qualified_name":"RunPayrollCycleResponse::Reset","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":69,"end_line":69,"start_column":0,"end_column":84,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:412163f69abf5ae22adf9b9141ba79e2","kind":"method","name":"mustEmbedUnimplementedPayrollServiceServer","qualified_name":"UnimplementedPayrollServiceServer::mustEmbedUnimplementedPayrollServiceServer","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":87,"end_line":87,"start_column":0,"end_column":88,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"method:41899a297d23af6d3d2da3506b936eec","kind":"method","name":"BuildPayslip","qualified_name":"Service::BuildPayslip","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":17,"end_line":87,"start_column":0,"end_column":1,"docstring":"BuildPayslip turns one employee's contract and timesheet into a complete\npayslip for the cycle: base pay, overtime, allowances, then deductions and\ntax, in that order. Every amount is in integer cents; nothing here rounds\nuntil the final net, so a cent never disappears between two lines.\n\nThis is the calculation the generated CRUD layer does NOT do — fkit's\nBuildPayslip only copies fields between a DTO and a row.","signature":"(\n\tctx context.Context,\n\tcycle payroll.Cycle,\n\temployee payroll.Employee,\n\ttimesheet payroll.Timesheet,\n) (payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Payslip"}
+{"id":"method:41899a297d23af6d3d2da3506b936eec","kind":"method","name":"BuildPayslip","qualified_name":"Service::BuildPayslip","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":17,"end_line":87,"start_column":0,"end_column":1,"docstring":"BuildPayslip turns one employee's contract and timesheet into a complete\npayslip for the cycle: base pay, overtime, allowances, then deductions and\ntax, in that order. Every amount is in integer cents; nothing here rounds\nuntil the final net, so a cent never disappears between two lines.\n\nThis is the calculation the generated CRUD layer does NOT do — fkit's\nBuildPayslip only copies fields between a DTO and a row.","signature":"(\n\tctx context.Context,\n\tcycle payroll.Cycle,\n\temployee payroll.Employee,\n\ttimesheet payroll.Timesheet,\n) (payroll.Payslip, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Payslip"}
 {"id":"method:4275e437d50514e430b25f9c11363ddf","kind":"method","name":"GetPayrollCycle","qualified_name":"PayrollServiceClient::GetPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":24,"end_line":24,"start_column":1,"end_column":113,"docstring":null,"signature":"(ctx context.Context, in *RunPayrollCycleRequest, opts ...grpc.CallOption) (*PayrollCycle, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:4a3dff65c0d488ecc09cf9edabe95d42","kind":"method","name":"taxCents","qualified_name":"Service::taxCents","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":119,"end_line":140,"start_column":0,"end_column":1,"docstring":"taxCents applies the employee's tax band schedule to the gross.","signature":"(e payroll.Employee, gross int64) (int64, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"method:4df364d0c37da3d10e39207b87a94ca8","kind":"method","name":"RunPayrollCycle","qualified_name":"PayrollServiceServer::RunPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":66,"end_line":66,"start_column":1,"end_column":92,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:4f0ac2154c360ad1c55284c03d1f0c73","kind":"method","name":"Tx","qualified_name":"Store::Tx","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":85,"end_line":95,"start_column":0,"end_column":1,"docstring":"Tx runs fn inside a transaction.","signature":"(ctx context.Context, fn func(*Store) error) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
-{"id":"method:4f57884a5e57e13884848a959e466e9d","kind":"method","name":"ListPayslipsByCycle","qualified_name":"Store::ListPayslipsByCycle","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":65,"end_line":67,"start_column":0,"end_column":1,"docstring":"ListPayslipsByCycle lists payslip rows for a cycle through the store.","signature":"(ctx context.Context, cycleID string) ([]PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
+{"id":"method:4f57884a5e57e13884848a959e466e9d","kind":"method","name":"ListPayslipsByCycle","qualified_name":"Store::ListPayslipsByCycle","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":65,"end_line":67,"start_column":0,"end_column":1,"docstring":"ListPayslipsByCycle lists payslip rows for a cycle through the store.","signature":"(ctx context.Context, cycleID string) ([]PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:578c07e761ce9e31fb80ec2ae5ee7713","kind":"method","name":"Reset","qualified_name":"RunPayrollCycleRequest::Reset","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":47,"end_line":47,"start_column":0,"end_column":82,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:599cba080912c1a44a7e4f727a98e155","kind":"method","name":"String","qualified_name":"RunPayrollCycleRequest::String","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":48,"end_line":48,"start_column":0,"end_column":90,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"method:59c25996edd43745355454c918ca737d","kind":"method","name":"SaveCycle","qualified_name":"Store::SaveCycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":78,"end_line":86,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycle payroll.Cycle) error","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
 {"id":"method:5da2578b83fc2de6a32dda8e01704ad3","kind":"method","name":"OverlapsWindow","qualified_name":"Contract::OverlapsWindow","file_path":"internal/domain/payroll/payslip.go","language":"go","start_line":91,"end_line":99,"start_column":0,"end_column":1,"docstring":"OverlapsWindow reports whether the contract is live at any point in the window.","signature":"(from, to time.Time) bool","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"bool"}
 {"id":"method:64fce125a13481bd9c53202505ebb26f","kind":"method","name":"GetPayrollCycle","qualified_name":"UnimplementedPayrollServiceServer::GetPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":79,"end_line":81,"start_column":0,"end_column":1,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*PayrollCycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycle"}
 {"id":"method:68acffbff0c2b5a4b3846a2cb887e3d0","kind":"method","name":"ListPayslips","qualified_name":"UnimplementedPayrollServiceServer::ListPayslips","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":83,"end_line":85,"start_column":0,"end_column":1,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunPayrollCycleResponse"}
-{"id":"method:69ac55ca7f86919d7f4ed769540cd552","kind":"method","name":"Now","qualified_name":"System::Now","file_path":"internal/platform/clock/clock.go","language":"go","start_line":13,"end_line":13,"start_column":0,"end_column":57,"docstring":null,"signature":"() time.Time","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Time"}
+{"id":"method:69ac55ca7f86919d7f4ed769540cd552","kind":"method","name":"Now","qualified_name":"System::Now","file_path":"internal/platform/clock/clock.go","language":"go","start_line":13,"end_line":13,"start_column":0,"end_column":57,"docstring":null,"signature":"() time.Time","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"time.Time"}
 {"id":"method:6cf9498c0d766de9682085ddb6e0a655","kind":"method","name":"runPayrollCycleAll","qualified_name":"Service::runPayrollCycleAll","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":81,"end_line":131,"start_column":0,"end_column":1,"docstring":"runPayrollCycleAll is the heart of the cycle: for every employee on the\nroster it builds a payslip from that employee's contract and timesheet,\nthen upserts the result. Ordering matters — a payslip is only persisted\nafter every earning, deduction and tax line has been resolved, so a\npartially-computed slip can never reach the store.","signature":"(\n\tctx context.Context,\n\tcycle payroll.Cycle,\n\troster []payroll.Employee,\n\topts RunOptions,\n) (RunResult, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunResult"}
 {"id":"method:6e0fe8d0272ee955601347cf37b5a383","kind":"method","name":"ListPayslips","qualified_name":"PayrollHandler::ListPayslips","file_path":"internal/transport/httpapi/payroll_handler.go","language":"go","start_line":79,"end_line":86,"start_column":0,"end_column":1,"docstring":null,"signature":"(w http.ResponseWriter, r *http.Request)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:72b795cb8a990681705170df3b9beacd","kind":"method","name":"GetPayrollCycle","qualified_name":"Store::GetPayrollCycle","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":75,"end_line":77,"start_column":0,"end_column":1,"docstring":"GetPayrollCycle reads one payroll_cycle row through the store.","signature":"(ctx context.Context, id string) (PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
-{"id":"method:75bdf0b5152e4d85c947a608505c15c1","kind":"method","name":"EmployeesForCycle","qualified_name":"Store::EmployeesForCycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":88,"end_line":95,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) ([]payroll.Employee, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Employee"}
+{"id":"method:75bdf0b5152e4d85c947a608505c15c1","kind":"method","name":"EmployeesForCycle","qualified_name":"Store::EmployeesForCycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":88,"end_line":95,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) ([]payroll.Employee, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:83f3b7afb07d631d545c5f12a344383b","kind":"method","name":"overtimeCents","qualified_name":"Service::overtimeCents","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":106,"end_line":116,"start_column":0,"end_column":1,"docstring":"overtimeCents pays approved units above the contractual threshold at the\ncontract's overtime multiplier.","signature":"(e payroll.Employee, ts payroll.Timesheet) int64","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"method:84b624c4861c4c33658499d7a4d48d3b","kind":"method","name":"RunCycle","qualified_name":"PayrollHandler::RunCycle","file_path":"internal/transport/httpapi/payroll_handler.go","language":"go","start_line":34,"end_line":68,"start_column":0,"end_column":1,"docstring":"RunCycle kicks off a payroll cycle: it hands the cycle id to the use-case\nlayer, which builds and persists a payslip per active employee.","signature":"(w http.ResponseWriter, r *http.Request)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:8904bbaa5fa8cab291d499d75ceccf2c","kind":"method","name":"CreatePayslip","qualified_name":"Store::CreatePayslip","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":45,"end_line":47,"start_column":0,"end_column":1,"docstring":"CreatePayslip inserts one payslip row through the store.","signature":"(ctx context.Context, req PayslipCreateRequest) (PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
@@ -222,29 +222,29 @@
 {"id":"method:9b6984f4380172dd0fa8449ec4848fd9","kind":"method","name":"UpsertPayrollCycle","qualified_name":"Store::UpsertPayrollCycle","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":36,"end_line":42,"start_column":0,"end_column":1,"docstring":"UpsertPayrollCycle writes one payroll_cycle row, keyed by id.","signature":"(ctx context.Context, row PayrollCycleRow) (PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
 {"id":"method:9d5b1deafa95d4bdd73c8d7edebbd78e","kind":"method","name":"UpdatePayslip","qualified_name":"Store::UpdatePayslip","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":55,"end_line":57,"start_column":0,"end_column":1,"docstring":"UpdatePayslip patches one payslip row through the store.","signature":"(ctx context.Context, id string, req PayslipUpdateRequest) (PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
 {"id":"method:9fb9bdbd7bbd9dc61cf38dda2c30809a","kind":"method","name":"Upsert","qualified_name":"Store::Upsert","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":22,"end_line":33,"start_column":0,"end_column":1,"docstring":"Upsert writes one payslip row, keyed by (cycle_id, employee_id).","signature":"(ctx context.Context, row PayslipRow) (PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
-{"id":"method:a1cfcb03fa859746d05499b8e1b91979","kind":"method","name":"Timesheet","qualified_name":"Store::Timesheet","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":97,"end_line":108,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID, employeeID string) (payroll.Timesheet, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Timesheet"}
+{"id":"method:a1cfcb03fa859746d05499b8e1b91979","kind":"method","name":"Timesheet","qualified_name":"Store::Timesheet","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":97,"end_line":108,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID, employeeID string) (payroll.Timesheet, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Timesheet"}
 {"id":"method:a235478f8389c36b95d45a62664c4557","kind":"method","name":"ListPayslips","qualified_name":"PayrollServiceServer::ListPayslips","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":68,"end_line":68,"start_column":1,"end_column":89,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:a4ce902b76dd179abd47583d02fd2a12","kind":"method","name":"GetId","qualified_name":"Payslip::GetId","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":88,"end_line":93,"start_column":0,"end_column":1,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
 {"id":"method:a51e3df6f33aff769f591399d86eb5af","kind":"method","name":"ListPayslips","qualified_name":"PayrollServiceClient::ListPayslips","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":25,"end_line":25,"start_column":1,"end_column":121,"docstring":null,"signature":"(ctx context.Context, in *RunPayrollCycleRequest, opts ...grpc.CallOption) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"method:a68d11d25279e217ec83342d95b172f6","kind":"method","name":"Now","qualified_name":"Fixed::Now","file_path":"internal/platform/clock/clock.go","language":"go","start_line":18,"end_line":18,"start_column":0,"end_column":46,"docstring":null,"signature":"() time.Time","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Time"}
-{"id":"method:abcc0b4bca6145184f692d4019641c7f","kind":"method","name":"Cycle","qualified_name":"Service::Cycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":200,"end_line":202,"start_column":0,"end_column":1,"docstring":"Cycle exposes a cycle for the read endpoints.","signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Cycle"}
+{"id":"method:a68d11d25279e217ec83342d95b172f6","kind":"method","name":"Now","qualified_name":"Fixed::Now","file_path":"internal/platform/clock/clock.go","language":"go","start_line":18,"end_line":18,"start_column":0,"end_column":46,"docstring":null,"signature":"() time.Time","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"time.Time"}
+{"id":"method:abcc0b4bca6145184f692d4019641c7f","kind":"method","name":"Cycle","qualified_name":"Service::Cycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":200,"end_line":202,"start_column":0,"end_column":1,"docstring":"Cycle exposes a cycle for the read endpoints.","signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Cycle"}
 {"id":"method:b27d090751d2cb16edf0e5b79bf229a6","kind":"method","name":"GetPayslip","qualified_name":"Store::GetPayslip","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":50,"end_line":52,"start_column":0,"end_column":1,"docstring":"GetPayslip reads one payslip row through the store.","signature":"(ctx context.Context, id string) (PayslipRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayslipRow"}
 {"id":"method:b32c3975c878ce8570b17cb4638c5055","kind":"method","name":"PeriodUnits","qualified_name":"Contract::PeriodUnits","file_path":"internal/domain/payroll/payslip.go","language":"go","start_line":103,"end_line":109,"start_column":0,"end_column":1,"docstring":"PeriodUnits is the contractual unit count for a window, used when a salaried\nemployee has no approved timesheet.","signature":"(from, to time.Time) int","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"method:b7b7504326d93c240db9e8bcb37454e5","kind":"method","name":"Reset","qualified_name":"PayrollCycle::Reset","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":124,"end_line":124,"start_column":0,"end_column":62,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:b90cd7088a55c9068e12a8120b256e13","kind":"method","name":"RunPayrollCycle","qualified_name":"UnimplementedPayrollServiceServer::RunPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":75,"end_line":77,"start_column":0,"end_column":1,"docstring":null,"signature":"(context.Context, *RunPayrollCycleRequest) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunPayrollCycleResponse"}
 {"id":"method:c481d719be40f20f63e077521f87b89b","kind":"method","name":"ListPayslips","qualified_name":"payrollServiceClient::ListPayslips","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":55,"end_line":62,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, in *RunPayrollCycleRequest, opts ...grpc.CallOption) (*RunPayrollCycleResponse, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunPayrollCycleResponse"}
 {"id":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","kind":"method","name":"Seed","qualified_name":"Store::Seed","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":111,"end_line":119,"start_column":0,"end_column":1,"docstring":"Seed loads fixture data; the real service reads from Postgres.","signature":"(cycle payroll.Cycle, employees []payroll.Employee, sheets []payroll.Timesheet)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","kind":"method","name":"timesheetFor","qualified_name":"Service::timesheetFor","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":165,"end_line":184,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycle payroll.Cycle, e payroll.Employee) (payroll.Timesheet, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Timesheet"}
-{"id":"method:d14d0b12675b711f5f90a392b7b297aa","kind":"method","name":"loadCycle","qualified_name":"Service::loadCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":186,"end_line":191,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Cycle"}
+{"id":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","kind":"method","name":"timesheetFor","qualified_name":"Service::timesheetFor","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":165,"end_line":184,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycle payroll.Cycle, e payroll.Employee) (payroll.Timesheet, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Timesheet"}
+{"id":"method:d14d0b12675b711f5f90a392b7b297aa","kind":"method","name":"loadCycle","qualified_name":"Service::loadCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":186,"end_line":191,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Cycle"}
 {"id":"method:d4c880f819795f197c94de3201fb709e","kind":"method","name":"basePayCents","qualified_name":"Service::basePayCents","file_path":"internal/usecase/payroll/payslip_builder.go","language":"go","start_line":92,"end_line":102,"start_column":0,"end_column":1,"docstring":"basePayCents is the contractual pay for the period: salaried staff get the\nperiod rate prorated across their contract window, hourly staff get rate ×\napproved units.","signature":"(e payroll.Employee, cycle payroll.Cycle, ts payroll.Timesheet) int64","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"method:d73f595573e869571a14f1606df5c296","kind":"method","name":"Now","qualified_name":"Clock::Now","file_path":"internal/platform/clock/clock.go","language":"go","start_line":7,"end_line":7,"start_column":1,"end_column":16,"docstring":null,"signature":"() time.Time","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:dd6580e3209a7f4efedb099a9bd5576d","kind":"method","name":"AmountFor","qualified_name":"Deduction::AmountFor","file_path":"internal/domain/payroll/payslip.go","language":"go","start_line":119,"end_line":124,"start_column":0,"end_column":1,"docstring":"AmountFor resolves a deduction against a gross amount.","signature":"(grossCents int64) int64","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int64"}
 {"id":"method:e0490e3e69744ec0d57d332d3bda8c60","kind":"method","name":"GetPayrollCycle","qualified_name":"payrollServiceClient::GetPayrollCycle","file_path":"internal/gen/payrollpb/payroll_grpc.pb.go","language":"go","start_line":46,"end_line":53,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, in *RunPayrollCycleRequest, opts ...grpc.CallOption) (*PayrollCycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycle"}
 {"id":"method:e267262348db43f8e9f40f77f277ce9c","kind":"method","name":"GetId","qualified_name":"PayrollCycle::GetId","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":117,"end_line":122,"start_column":0,"end_column":1,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
-{"id":"method:e5d8405d7063593214cc4d16d2bbec81","kind":"method","name":"Cycle","qualified_name":"Store::Cycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":65,"end_line":76,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Cycle"}
+{"id":"method:e5d8405d7063593214cc4d16d2bbec81","kind":"method","name":"Cycle","qualified_name":"Store::Cycle","file_path":"internal/store/payslipstore/store.go","language":"go","start_line":65,"end_line":76,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycleID string) (payroll.Cycle, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"payroll.Cycle"}
 {"id":"method:eba91430ad280a0c070af5c64e79d2d0","kind":"method","name":"GetPayslips","qualified_name":"RunPayrollCycleResponse::GetPayslips","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":62,"end_line":67,"start_column":0,"end_column":1,"docstring":null,"signature":"() []*Payslip","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:ed702f7226c3efff6b07f6f5afd73bf8","kind":"method","name":"closeCycle","qualified_name":"Service::closeCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":193,"end_line":197,"start_column":0,"end_column":1,"docstring":null,"signature":"(ctx context.Context, cycle payroll.Cycle, at time.Time) error","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"error"}
-{"id":"method:ee60f0f8c18e9fd703205c637e5b5f8d","kind":"method","name":"ListPayrollCycles","qualified_name":"Store::ListPayrollCycles","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":80,"end_line":82,"start_column":0,"end_column":1,"docstring":"ListPayrollCycles lists payroll_cycle rows through the store.","signature":"(ctx context.Context) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"PayrollCycleRow"}
+{"id":"method:ee60f0f8c18e9fd703205c637e5b5f8d","kind":"method","name":"ListPayrollCycles","qualified_name":"Store::ListPayrollCycles","file_path":"internal/gen/fkit/payroll/store.go","language":"go","start_line":80,"end_line":82,"start_column":0,"end_column":1,"docstring":"ListPayrollCycles lists payroll_cycle rows through the store.","signature":"(ctx context.Context) ([]PayrollCycleRow, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:f5fda95d052fb685f72d11db016c53d3","kind":"method","name":"GetDryRun","qualified_name":"RunPayrollCycleRequest::GetDryRun","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":33,"end_line":38,"start_column":0,"end_column":1,"docstring":null,"signature":"() bool","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"bool"}
 {"id":"method:fd95c33dd58bbddc5221ee4ced0bbcd3","kind":"method","name":"RunCycle","qualified_name":"Service::RunCycle","file_path":"internal/usecase/payroll/cycle.go","language":"go","start_line":56,"end_line":74,"start_column":0,"end_column":1,"docstring":"RunCycle is the public entry point used by the HTTP handler. It loads the\ncycle, guards its state, and delegates the actual work to runPayrollCycleAll.","signature":"(ctx context.Context, cycleID string, opts RunOptions) (RunResult, error)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"RunResult"}
 {"id":"method:ff7a7eea8969534c02484b666f0ef39b","kind":"method","name":"String","qualified_name":"PayrollCycle::String","file_path":"internal/gen/payrollpb/payroll.pb.go","language":"go","start_line":125,"end_line":125,"start_column":0,"end_column":80,"docstring":null,"signature":"() string","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"string"}
@@ -592,8 +592,8 @@
 {"source":"function:13c7c9632913a7b5c4cb3853ae46f74a","target":"function:d82ab6b26c7b41b587b8d940d1c57034","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"scanPayslip\"}","line":71,"col":8,"provenance":null}
 {"source":"function:13c7c9632913a7b5c4cb3853ae46f74a","target":"struct:6c93a0c367bc4b0f4392bc71266af6f6","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipUpdateRequest\"}","line":65,"col":67,"provenance":null}
 {"source":"function:13c7c9632913a7b5c4cb3853ae46f74a","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":65,"col":90,"provenance":null}
-{"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"interface:a2c04a6e9d1203f224eb044d73e38f03","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Clock\"}","line":50,"col":51,"provenance":null}
-{"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"struct:33239c589ef83d64d5f6e73c2e021ee6","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.8,\"resolvedBy\":\"framework\",\"refName\":\"Store\"}","line":50,"col":36,"provenance":null}
+{"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"interface:a2c04a6e9d1203f224eb044d73e38f03","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Clock\"}","line":50,"col":51,"provenance":null}
+{"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"struct:33239c589ef83d64d5f6e73c2e021ee6","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Store\"}","line":50,"col":36,"provenance":null}
 {"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"struct:d40c8ed73128048826648f1ac8c1bc35","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Service\"}","line":51,"col":9,"provenance":null}
 {"source":"function:1de2380afa5ea252aaabed82c8149f04","target":"struct:d40c8ed73128048826648f1ac8c1bc35","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Service\"}","line":50,"col":59,"provenance":null}
 {"source":"function:209f5fe0d451b33db0d6395638a62fe8","target":"struct:19321b921e8669d1052268136951cb96","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycleRow\"}","line":111,"col":37,"provenance":null}
@@ -633,15 +633,15 @@
 {"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"function:2f7a92e2ac264db827c2eedf3fe7c448","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"earlierOf\"}","line":16,"col":66,"provenance":null}
 {"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"function:9ce32ae86fd8d01bb45dfcd56982a11b","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"calendarDays\"}","line":12,"col":11,"provenance":null}
 {"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"function:9ce32ae86fd8d01bb45dfcd56982a11b","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"calendarDays\"}","line":16,"col":12,"provenance":null}
-{"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":11,"col":77,"provenance":null}
-{"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"struct:b3960082884fafd52356f38f6551082f","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Contract\"}","line":11,"col":53,"provenance":null}
+{"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":11,"col":77,"provenance":null}
+{"source":"function:80943211ed2b432c66489bcda8e6d0a4","target":"struct:b3960082884fafd52356f38f6551082f","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Contract\"}","line":11,"col":53,"provenance":null}
 {"source":"function:81328c12525c00ff7d9778f2e988eab3","target":"struct:44ba5408fc435805ad63b792fae78895","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"EmployeeRow\"}","line":65,"col":78,"provenance":null}
 {"source":"function:82bd498c77e3b6ab5b76ae283f737fde","target":"function:680f46cf762a57779b8a8dbe6de8c989","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"scanContract\"}","line":42,"col":8,"provenance":null}
 {"source":"function:82bd498c77e3b6ab5b76ae283f737fde","target":"struct:8ae9f91523a30c90667e8f5ba09c3fc1","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"ContractRow\"}","line":39,"col":81,"provenance":null}
 {"source":"function:82bd498c77e3b6ab5b76ae283f737fde","target":"struct:cb7da9d97cf09a07df5635a95a92dec6","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"ContractCreateRequest\"}","line":39,"col":57,"provenance":null}
 {"source":"function:840b0285a601a69c58d31e483b0ab2c8","target":"struct:141301eeb403e252d3f06decd0665c41","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"TimesheetRow\"}","line":52,"col":79,"provenance":null}
-{"source":"function:852fbd5b1a3434558ad769f0855ecfae","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Line\"}","line":142,"col":29,"provenance":null}
-{"source":"function:852fbd5b1a3434558ad769f0855ecfae","target":"type_alias:ef3b795cc61dfe835d31042c3fa65786","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"LineKind\"}","line":142,"col":48,"provenance":null}
+{"source":"function:852fbd5b1a3434558ad769f0855ecfae","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Line\"}","line":142,"col":29,"provenance":null}
+{"source":"function:852fbd5b1a3434558ad769f0855ecfae","target":"type_alias:ef3b795cc61dfe835d31042c3fa65786","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"LineKind\"}","line":142,"col":48,"provenance":null}
 {"source":"function:90eb51f51a3d9a397d4a53f26f2019aa","target":"function:03a41d6c149ff7b81fd46b0c79fe7ce4","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"httpapi.NewRouter\"}","line":23,"col":11,"provenance":null}
 {"source":"function:90eb51f51a3d9a397d4a53f26f2019aa","target":"function:1de2380afa5ea252aaabed82c8149f04","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.NewService\"}","line":22,"col":8,"provenance":null}
 {"source":"function:90eb51f51a3d9a397d4a53f26f2019aa","target":"function:a2d9b9035f29c64480f1644da96bc32f","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payslipstore.New\"}","line":21,"col":10,"provenance":null}
@@ -659,16 +659,16 @@
 {"source":"function:b3b725a56ce5377ac34ef157db4d1170","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":39,"col":20,"provenance":null}
 {"source":"function:b50e5df611274d41388f746ef35951e0","target":"struct:cd1ed508e3b308169888959466534fa8","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollHandler\"}","line":17,"col":9,"provenance":null}
 {"source":"function:b50e5df611274d41388f746ef35951e0","target":"struct:cd1ed508e3b308169888959466534fa8","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollHandler\"}","line":16,"col":46,"provenance":null}
-{"source":"function:b50e5df611274d41388f746ef35951e0","target":"struct:d40c8ed73128048826648f1ac8c1bc35","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Service\"}","line":16,"col":36,"provenance":null}
+{"source":"function:b50e5df611274d41388f746ef35951e0","target":"struct:d40c8ed73128048826648f1ac8c1bc35","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Service\"}","line":16,"col":36,"provenance":null}
 {"source":"function:b89f64f70418e754ec4cd1fef07bbf86","target":"function:209f5fe0d451b33db0d6395638a62fe8","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"scanPayrollCycle\"}","line":48,"col":8,"provenance":null}
 {"source":"function:b89f64f70418e754ec4cd1fef07bbf86","target":"struct:19321b921e8669d1052268136951cb96","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycleRow\"}","line":46,"col":66,"provenance":null}
 {"source":"function:be35e9b1f03a5492d14e3bf3cc5dc87b","target":"struct:1d9ef6577e54226fc62ba69e632f38af","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipCreateRequest\"}","line":112,"col":22,"provenance":null}
 {"source":"function:be35e9b1f03a5492d14e3bf3cc5dc87b","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":113,"col":8,"provenance":null}
 {"source":"function:be35e9b1f03a5492d14e3bf3cc5dc87b","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":112,"col":44,"provenance":null}
 {"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"function:80943211ed2b432c66489bcda8e6d0a4","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"prorateSalary\"}","line":31,"col":8,"provenance":null}
-{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":27,"col":57,"provenance":null}
-{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":27,"col":74,"provenance":null}
-{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:6ee2c8b983ba47afa67ded3413cb1af3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Allowance\"}","line":27,"col":32,"provenance":null}
+{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":27,"col":57,"provenance":null}
+{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":27,"col":74,"provenance":null}
+{"source":"function:c304f28b41560a488fa25f4c0bdf4c46","target":"struct:6ee2c8b983ba47afa67ded3413cb1af3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Allowance\"}","line":27,"col":32,"provenance":null}
 {"source":"function:c6392c858f3b95686ef12895ec918b6e","target":"function:0e6d6dd34d39c0ac54c9a7084b8d8ca8","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"scanEmployee\"}","line":41,"col":8,"provenance":null}
 {"source":"function:c6392c858f3b95686ef12895ec918b6e","target":"struct:44ba5408fc435805ad63b792fae78895","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"EmployeeRow\"}","line":39,"col":81,"provenance":null}
 {"source":"function:c6392c858f3b95686ef12895ec918b6e","target":"struct:4a3333b074def20052f1b934c5233047","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"EmployeeCreateRequest\"}","line":39,"col":57,"provenance":null}
@@ -689,8 +689,8 @@
 {"source":"interface:a2c04a6e9d1203f224eb044d73e38f03","target":"method:d73f595573e869571a14f1606df5c296","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"method:1b4f96e5a5a8b2784487acc4f7134ff7","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"e.UnpaidLeaveCoversWindow\"}","line":155,"col":5,"provenance":null}
 {"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"method:75bdf0b5152e4d85c947a608505c15c1","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"s.store.EmployeesForCycle\"}","line":137,"col":13,"provenance":null}
-{"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":136,"col":63,"provenance":null}
-{"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":136,"col":98,"provenance":null}
+{"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":136,"col":63,"provenance":null}
+{"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":136,"col":98,"provenance":null}
 {"source":"method:01c8a961c1fdfb54ea0c32614f905acc","target":"struct:9448af57d2265ea84ce5114c823184ac","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunOptions\"}","line":136,"col":75,"provenance":null}
 {"source":"method:069338e91f3b3bc0a6b434212386e59b","target":"function:0709805de829555a8b769b387496185d","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"DeletePayslip\"}","line":61,"col":8,"provenance":null}
 {"source":"method:0f882862f60ecd98b79db60e64ec66eb","target":"function:2b593a9d67adcbcc2f8157621f1b08f4","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"CreatePayrollCycle\"}","line":71,"col":8,"provenance":null}
@@ -701,13 +701,13 @@
 {"source":"method:16a61da8990e9e8548eaba76a0d96d9f","target":"method:64fce125a13481bd9c53202505ebb26f","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"GetPayrollCycle\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:79\"}","line":67,"col":null,"provenance":"heuristic"}
 {"source":"method:18a9696cad4179d634834650c0684f0c","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":37,"col":72,"provenance":null}
 {"source":"method:18a9696cad4179d634834650c0684f0c","target":"struct:e66f442bcf28c3bd0a3f42fbacb69b2a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleResponse\"}","line":37,"col":123,"provenance":null}
-{"source":"method:24e3292f2546abebcb9d371572f38e20","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":50,"col":76,"provenance":null}
+{"source":"method:24e3292f2546abebcb9d371572f38e20","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Payslip\"}","line":50,"col":76,"provenance":null}
 {"source":"method:2eb01c123ced28db3096d2168949061f","target":"method:412163f69abf5ae22adf9b9141ba79e2","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"mustEmbedUnimplementedPayrollServiceServer\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:87\"}","line":69,"col":null,"provenance":"heuristic"}
 {"source":"method:3367319bda79cdcf1fefc366ce7322ac","target":"struct:d541b867b240edf388feab5ff2002afd","kind":"instantiates","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":102,"col":41,"provenance":null}
 {"source":"method:3708105303f9a5feb2601fa8f3fe731e","target":"function:5e2796c1fbc4081e6b6f6a4307fe4bc0","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"key\"}","line":45,"col":12,"provenance":null}
-{"source":"method:3708105303f9a5feb2601fa8f3fe731e","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":36,"col":57,"provenance":null}
+{"source":"method:3708105303f9a5feb2601fa8f3fe731e","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Payslip\"}","line":36,"col":57,"provenance":null}
 {"source":"method:3af34007f72fd40aebe0e4504e8228ae","target":"method:24e3292f2546abebcb9d371572f38e20","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"s.store.ListByCycle\"}","line":206,"col":15,"provenance":null}
-{"source":"method:3af34007f72fd40aebe0e4504e8228ae","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":205,"col":83,"provenance":null}
+{"source":"method:3af34007f72fd40aebe0e4504e8228ae","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Payslip\"}","line":205,"col":83,"provenance":null}
 {"source":"method:3f9811f3a17dc661bfba3de069234279","target":"struct:e66f442bcf28c3bd0a3f42fbacb69b2a","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleResponse\"}","line":69,"col":57,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"function:852fbd5b1a3434558ad769f0855ecfae","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"sumKind\"}","line":59,"col":19,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"function:852fbd5b1a3434558ad769f0855ecfae","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"sumKind\"}","line":79,"col":23,"provenance":null}
@@ -716,28 +716,28 @@
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"method:83f3b7afb07d631d545c5f12a344383b","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"s.overtimeCents\"}","line":43,"col":16,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"method:d4c880f819795f197c94de3201fb709e","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"s.basePayCents\"}","line":38,"col":9,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"method:dd6580e3209a7f4efedb099a9bd5576d","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"d.AmountFor\"}","line":62,"col":12,"provenance":null}
-{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":19,"col":15,"provenance":null}
+{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":19,"col":15,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Line\"}","line":39,"col":33,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Line\"}","line":44,"col":34,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Line\"}","line":54,"col":34,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Line\"}","line":66,"col":34,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:51160f165aa24865c9ffd701638e08de","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Line\"}","line":75,"col":33,"provenance":null}
-{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":20,"col":18,"provenance":null}
-{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":21,"col":19,"provenance":null}
+{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":20,"col":18,"provenance":null}
+{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":21,"col":19,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Payslip\"}","line":24,"col":9,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Payslip\"}","line":27,"col":9,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Payslip\"}","line":30,"col":9,"provenance":null}
 {"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Payslip\"}","line":73,"col":9,"provenance":null}
-{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":22,"col":11,"provenance":null}
+{"source":"method:41899a297d23af6d3d2da3506b936eec","target":"struct:f1c05936f2b11591d1f90efa9d981fa7","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Payslip\"}","line":22,"col":11,"provenance":null}
 {"source":"method:4275e437d50514e430b25f9c11363ddf","target":"method:64fce125a13481bd9c53202505ebb26f","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"GetPayrollCycle\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:79\"}","line":24,"col":null,"provenance":"heuristic"}
 {"source":"method:4275e437d50514e430b25f9c11363ddf","target":"method:e0490e3e69744ec0d57d332d3bda8c60","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"GetPayrollCycle\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:46\"}","line":24,"col":null,"provenance":"heuristic"}
-{"source":"method:4a3dff65c0d488ecc09cf9edabe95d42","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":119,"col":37,"provenance":null}
+{"source":"method:4a3dff65c0d488ecc09cf9edabe95d42","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":119,"col":37,"provenance":null}
 {"source":"method:4df364d0c37da3d10e39207b87a94ca8","target":"method:b90cd7088a55c9068e12a8120b256e13","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"RunPayrollCycle\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:75\"}","line":66,"col":null,"provenance":"heuristic"}
 {"source":"method:4f0ac2154c360ad1c55284c03d1f0c73","target":"struct:13bfc2acbe1de6557e9a28c0be484ffa","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.8,\"resolvedBy\":\"framework\",\"refName\":\"Store\"}","line":85,"col":49,"provenance":null}
 {"source":"method:4f57884a5e57e13884848a959e466e9d","target":"function:63f3bd99966467470cbabcb097ad36dd","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"ListPayslipsByCycle\"}","line":66,"col":8,"provenance":null}
 {"source":"method:4f57884a5e57e13884848a959e466e9d","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":65,"col":76,"provenance":null}
 {"source":"method:578c07e761ce9e31fb80ec2ae5ee7713","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":47,"col":56,"provenance":null}
-{"source":"method:59c25996edd43745355454c918ca737d","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":78,"col":61,"provenance":null}
+{"source":"method:59c25996edd43745355454c918ca737d","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":78,"col":61,"provenance":null}
 {"source":"method:64fce125a13481bd9c53202505ebb26f","target":"struct:3d4fd5cb833f90205ff1d82443698813","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycle\"}","line":79,"col":101,"provenance":null}
 {"source":"method:64fce125a13481bd9c53202505ebb26f","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":79,"col":75,"provenance":null}
 {"source":"method:68acffbff0c2b5a4b3846a2cb887e3d0","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":83,"col":72,"provenance":null}
@@ -749,17 +749,17 @@
 {"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"method:ed702f7226c3efff6b07f6f5afd73bf8","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"s.closeCycle\"}","line":121,"col":12,"provenance":null}
 {"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:09a019d5ab5eefb1f1bc3b25ad95d81c","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunResult\"}","line":87,"col":11,"provenance":null}
 {"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:09a019d5ab5eefb1f1bc3b25ad95d81c","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunResult\"}","line":86,"col":3,"provenance":null}
-{"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":83,"col":15,"provenance":null}
-{"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":84,"col":18,"provenance":null}
+{"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":83,"col":15,"provenance":null}
+{"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":84,"col":18,"provenance":null}
 {"source":"method:6cf9498c0d766de9682085ddb6e0a655","target":"struct:9448af57d2265ea84ce5114c823184ac","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunOptions\"}","line":85,"col":6,"provenance":null}
 {"source":"method:6e0fe8d0272ee955601347cf37b5a383","target":"function:4ebe28bcc1b041576b79ad26309dd0b1","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"writeJSON\"}","line":85,"col":1,"provenance":null}
 {"source":"method:6e0fe8d0272ee955601347cf37b5a383","target":"function:ec95f80b7e074efca14308b96f0fae41","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"httpError\"}","line":82,"col":2,"provenance":null}
 {"source":"method:6e0fe8d0272ee955601347cf37b5a383","target":"method:3af34007f72fd40aebe0e4504e8228ae","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"h.svc.PayslipsForCycle\"}","line":80,"col":15,"provenance":null}
 {"source":"method:72b795cb8a990681705170df3b9beacd","target":"function:b89f64f70418e754ec4cd1fef07bbf86","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"GetPayrollCycle\"}","line":76,"col":8,"provenance":null}
 {"source":"method:72b795cb8a990681705170df3b9beacd","target":"struct:19321b921e8669d1052268136951cb96","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycleRow\"}","line":75,"col":65,"provenance":null}
-{"source":"method:75bdf0b5152e4d85c947a608505c15c1","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":88,"col":82,"provenance":null}
-{"source":"method:83f3b7afb07d631d545c5f12a344383b","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":106,"col":42,"provenance":null}
-{"source":"method:83f3b7afb07d631d545c5f12a344383b","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":106,"col":63,"provenance":null}
+{"source":"method:75bdf0b5152e4d85c947a608505c15c1","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":88,"col":82,"provenance":null}
+{"source":"method:83f3b7afb07d631d545c5f12a344383b","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":106,"col":42,"provenance":null}
+{"source":"method:83f3b7afb07d631d545c5f12a344383b","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":106,"col":63,"provenance":null}
 {"source":"method:84b624c4861c4c33658499d7a4d48d3b","target":"function:4ebe28bcc1b041576b79ad26309dd0b1","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"writeJSON\"}","line":62,"col":1,"provenance":null}
 {"source":"method:84b624c4861c4c33658499d7a4d48d3b","target":"function:ec95f80b7e074efca14308b96f0fae41","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"httpError\"}","line":37,"col":2,"provenance":null}
 {"source":"method:84b624c4861c4c33658499d7a4d48d3b","target":"function:ec95f80b7e074efca14308b96f0fae41","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"httpError\"}","line":44,"col":3,"provenance":null}
@@ -788,12 +788,12 @@
 {"source":"method:a1cfcb03fa859746d05499b8e1b91979","target":"function:5e2796c1fbc4081e6b6f6a4307fe4bc0","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"key\"}","line":103,"col":20,"provenance":null}
 {"source":"method:a1cfcb03fa859746d05499b8e1b91979","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Timesheet\"}","line":105,"col":9,"provenance":null}
 {"source":"method:a1cfcb03fa859746d05499b8e1b91979","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Timesheet\"}","line":99,"col":9,"provenance":null}
-{"source":"method:a1cfcb03fa859746d05499b8e1b91979","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":97,"col":84,"provenance":null}
+{"source":"method:a1cfcb03fa859746d05499b8e1b91979","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":97,"col":84,"provenance":null}
 {"source":"method:a235478f8389c36b95d45a62664c4557","target":"method:68acffbff0c2b5a4b3846a2cb887e3d0","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"ListPayslips\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:83\"}","line":68,"col":null,"provenance":"heuristic"}
 {"source":"method:a51e3df6f33aff769f591399d86eb5af","target":"method:68acffbff0c2b5a4b3846a2cb887e3d0","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"ListPayslips\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:83\"}","line":25,"col":null,"provenance":"heuristic"}
 {"source":"method:a51e3df6f33aff769f591399d86eb5af","target":"method:c481d719be40f20f63e077521f87b89b","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"ListPayslips\",\"registeredAt\":\"internal/gen/payrollpb/payroll_grpc.pb.go:55\"}","line":25,"col":null,"provenance":"heuristic"}
 {"source":"method:abcc0b4bca6145184f692d4019641c7f","target":"method:d14d0b12675b711f5f90a392b7b297aa","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"s.loadCycle\"}","line":201,"col":8,"provenance":null}
-{"source":"method:abcc0b4bca6145184f692d4019641c7f","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":200,"col":70,"provenance":null}
+{"source":"method:abcc0b4bca6145184f692d4019641c7f","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":200,"col":70,"provenance":null}
 {"source":"method:b27d090751d2cb16edf0e5b79bf229a6","target":"function:9a1275209a1a60e56b21de5aba04f222","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"GetPayslip\"}","line":51,"col":8,"provenance":null}
 {"source":"method:b27d090751d2cb16edf0e5b79bf229a6","target":"struct:eed7116b6261c410c79b06f6b3a3aebe","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayslipRow\"}","line":50,"col":60,"provenance":null}
 {"source":"method:b7b7504326d93c240db9e8bcb37454e5","target":"struct:3d4fd5cb833f90205ff1d82443698813","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycle\"}","line":124,"col":46,"provenance":null}
@@ -802,34 +802,34 @@
 {"source":"method:c481d719be40f20f63e077521f87b89b","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":55,"col":69,"provenance":null}
 {"source":"method:c481d719be40f20f63e077521f87b89b","target":"struct:e66f442bcf28c3bd0a3f42fbacb69b2a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleResponse\"}","line":55,"col":120,"provenance":null}
 {"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"function:5e2796c1fbc4081e6b6f6a4307fe4bc0","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"key\"}","line":117,"col":11,"provenance":null}
-{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":111,"col":35,"provenance":null}
-{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":111,"col":62,"provenance":null}
-{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":111,"col":89,"provenance":null}
+{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":111,"col":35,"provenance":null}
+{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":111,"col":62,"provenance":null}
+{"source":"method:c51ef8827ea4d4e2fac8c8e0b7dce61d","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":111,"col":89,"provenance":null}
 {"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"method:a1cfcb03fa859746d05499b8e1b91979","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"s.store.Timesheet\"}","line":166,"col":12,"provenance":null}
 {"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"method:b32c3975c878ce8570b17cb4638c5055","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"e.Contract.PeriodUnits\"}","line":180,"col":15,"provenance":null}
-{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":165,"col":66,"provenance":null}
-{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":165,"col":83,"provenance":null}
+{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":165,"col":66,"provenance":null}
+{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":165,"col":83,"provenance":null}
 {"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Timesheet\"}","line":168,"col":9,"provenance":null}
 {"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Timesheet\"}","line":176,"col":9,"provenance":null}
 {"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Timesheet\"}","line":183,"col":8,"provenance":null}
-{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":165,"col":102,"provenance":null}
+{"source":"method:cfa86e7d9aaf8dee7a94b8d5c7717017","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":165,"col":102,"provenance":null}
 {"source":"method:d14d0b12675b711f5f90a392b7b297aa","target":"method:e5d8405d7063593214cc4d16d2bbec81","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"s.store.Cycle\"}","line":190,"col":8,"provenance":null}
 {"source":"method:d14d0b12675b711f5f90a392b7b297aa","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Cycle\"}","line":188,"col":9,"provenance":null}
-{"source":"method:d14d0b12675b711f5f90a392b7b297aa","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":186,"col":74,"provenance":null}
+{"source":"method:d14d0b12675b711f5f90a392b7b297aa","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":186,"col":74,"provenance":null}
 {"source":"method:d4c880f819795f197c94de3201fb709e","target":"function:80943211ed2b432c66489bcda8e6d0a4","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"prorateSalary\"}","line":96,"col":9,"provenance":null}
-{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":92,"col":65,"provenance":null}
-{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Employee\"}","line":92,"col":41,"provenance":null}
-{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Timesheet\"}","line":92,"col":83,"provenance":null}
+{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":92,"col":65,"provenance":null}
+{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:62563918fc7ed271ca7e2c7b11f2c17a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Employee\"}","line":92,"col":41,"provenance":null}
+{"source":"method:d4c880f819795f197c94de3201fb709e","target":"struct:e0ae7fcd0d04a65b1a2a768c40e373d3","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Timesheet\"}","line":92,"col":83,"provenance":null}
 {"source":"method:d73f595573e869571a14f1606df5c296","target":"method:69ac55ca7f86919d7f4ed769540cd552","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"Now\",\"registeredAt\":\"internal/platform/clock/clock.go:13\"}","line":7,"col":null,"provenance":"heuristic"}
 {"source":"method:d73f595573e869571a14f1606df5c296","target":"method:a68d11d25279e217ec83342d95b172f6","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"Now\",\"registeredAt\":\"internal/platform/clock/clock.go:18\"}","line":7,"col":null,"provenance":"heuristic"}
 {"source":"method:e0490e3e69744ec0d57d332d3bda8c60","target":"struct:3d4fd5cb833f90205ff1d82443698813","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycle\"}","line":46,"col":123,"provenance":null}
 {"source":"method:e0490e3e69744ec0d57d332d3bda8c60","target":"struct:4325013490f7f7a77604146f5e38c292","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"RunPayrollCycleRequest\"}","line":46,"col":72,"provenance":null}
 {"source":"method:e5d8405d7063593214cc4d16d2bbec81","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Cycle\"}","line":67,"col":9,"provenance":null}
 {"source":"method:e5d8405d7063593214cc4d16d2bbec81","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"payroll.Cycle\"}","line":73,"col":9,"provenance":null}
-{"source":"method:e5d8405d7063593214cc4d16d2bbec81","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":65,"col":68,"provenance":null}
+{"source":"method:e5d8405d7063593214cc4d16d2bbec81","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":65,"col":68,"provenance":null}
 {"source":"method:eba91430ad280a0c070af5c64e79d2d0","target":"struct:d541b867b240edf388feab5ff2002afd","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Payslip\"}","line":62,"col":51,"provenance":null}
 {"source":"method:ed702f7226c3efff6b07f6f5afd73bf8","target":"method:59c25996edd43745355454c918ca737d","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"instance-method\",\"refName\":\"s.store.SaveCycle\"}","line":196,"col":8,"provenance":null}
-{"source":"method:ed702f7226c3efff6b07f6f5afd73bf8","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"framework\":\"go\",\"confidence\":0.7,\"resolvedBy\":\"framework\",\"refName\":\"Cycle\"}","line":193,"col":64,"provenance":null}
+{"source":"method:ed702f7226c3efff6b07f6f5afd73bf8","target":"struct:4831ac24c172065fee6e46751021f7ba","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Cycle\"}","line":193,"col":64,"provenance":null}
 {"source":"method:ee60f0f8c18e9fd703205c637e5b5f8d","target":"function:c68d01c236174f79631f8e8222523fa4","kind":"calls","metadata":"{\"confidence\":0.7,\"resolvedBy\":\"exact-match\",\"refName\":\"ListPayrollCycles\"}","line":81,"col":8,"provenance":null}
 {"source":"method:ee60f0f8c18e9fd703205c637e5b5f8d","target":"struct:19321b921e8669d1052268136951cb96","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"PayrollCycleRow\"}","line":80,"col":58,"provenance":null}
 {"source":"method:fd95c33dd58bbddc5221ee4ced0bbcd3","target":"method:01c8a961c1fdfb54ea0c32614f905acc","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"s.rosterFor\"}","line":65,"col":16,"provenance":null}
diff --git a/__tests__/fixtures/golden/torture-multilang.dump b/__tests__/fixtures/golden/torture-multilang.dump
index 47f082b226..68c8f6a74b 100644
--- a/__tests__/fixtures/golden/torture-multilang.dump
+++ b/__tests__/fixtures/golden/torture-multilang.dump
@@ -1,4 +1,4 @@
-== nodes (1487)
+== nodes (1523)
 {"id":"class:0083dc18baa2b629e8572db20ba2b464","kind":"class","name":"Widget","qualified_name":"Widget","file_path":"torture.cpp","language":"cpp","start_line":98,"end_line":104,"start_column":0,"end_column":1,"docstring":"UE-macro shapes — every one below is recovered by the hoisted preParse\n(export macro, reflection markup, inline specifier, API member prefix).","signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:00e4c67aff13a714886744f6829e0cea","kind":"class","name":"Cfg","qualified_name":"Cfg","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":60,"end_line":62,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"class","name":"Widget","qualified_name":"Widget","file_path":"TortureMini.dart","language":"dart","start_line":34,"end_line":52,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -14,6 +14,7 @@
 {"id":"class:1092bade09d1c725d7704d87d0bc625f","kind":"class","name":"RichIntS","qualified_name":"RichIntS","file_path":"torture.scala","language":"scala","start_line":119,"end_line":121,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:129f932b07791059905bc786775e5dff","kind":"class","name":"Array","qualified_name":"Array","file_path":"torture.swift","language":"swift","start_line":66,"end_line":68,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:12b0fc1a5b8916f4876df49d6cd78ad7","kind":"class","name":"Builder","qualified_name":"Builder","file_path":"torture.swift","language":"swift","start_line":62,"end_line":64,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:12b8092ee33506020a2ef69ffb0c942f","kind":"class","name":"ListX","qualified_name":"ListX","file_path":"TortureReadsTypes.dart","language":"dart","start_line":10,"end_line":12,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:184d52a70ca25ab02246ba53448afd84","kind":"class","name":"Square","qualified_name":"Square","file_path":"torture.scala","language":"scala","start_line":88,"end_line":88,"start_column":0,"end_column":26,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:185f6260a8d5b738c53be0accb2a4e19","kind":"class","name":"Widget","qualified_name":"app::Widget","file_path":"torture-macros-ctors.cpp","language":"cpp","start_line":17,"end_line":26,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:1d0256477d1f6afcc95bae5017a7b7e6","kind":"class","name":"LocalCls","qualified_name":"factory::LocalCls","file_path":"torture.R","language":"r","start_line":124,"end_line":124,"start_column":11,"end_column":75,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -37,6 +38,7 @@
 {"id":"class:3a28eaf257060c9ca775bebcb90ced61","kind":"class","name":"MixB","qualified_name":"MixB","file_path":"torture.dart","language":"dart","start_line":179,"end_line":181,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:409ca96fc582e5084ccbb6c861537442","kind":"class","name":"Bare","qualified_name":"Bare","file_path":"torture.rb","language":"ruby","start_line":36,"end_line":36,"start_column":0,"end_column":15,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:40ba5f950ab3c448fb944e41327f6130","kind":"class","name":"QualClass","qualified_name":"QualClass","file_path":"torture.R","language":"r","start_line":118,"end_line":118,"start_column":0,"end_column":50,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:4153f97369d1da3a6904d21acc03a599","kind":"class","name":"Holder","qualified_name":"Holder","file_path":"TortureReadsTypes.dart","language":"dart","start_line":28,"end_line":49,"start_column":0,"end_column":1,"docstring":"Field declarations: instance, nullable, generic, static, late, prefixed,\nfunction-typed, record-typed, untyped with a generic initializer.","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:4cc0425446f472c0e4e9753dc27b8c07","kind":"class","name":"ActualFile","qualified_name":"com.example.torture::ActualFile","file_path":"torture.kt","language":"kotlin","start_line":174,"end_line":176,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":"[\"actual\"]","type_parameters":null,"return_type":null}
 {"id":"class:4df2c7657f7690146e6546cf5549bca1","kind":"class","name":"LocalClass","qualified_name":"CallSites::localHost::LocalClass","file_path":"torture.scala","language":"scala","start_line":157,"end_line":157,"start_column":4,"end_column":42,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"class","name":"Holder","qualified_name":"Holder","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":21,"end_line":35,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -88,12 +90,14 @@
 {"id":"class:a05b852b967a5bc3ff44512f23d3082f","kind":"class","name":"AbsS","qualified_name":"AbsS","file_path":"torture.scala","language":"scala","start_line":75,"end_line":78,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:a3135617416a7d51f8ef08aca5a444fa","kind":"class","name":"NoInherit","qualified_name":"NoInherit","file_path":"torture.R","language":"r","start_line":122,"end_line":122,"start_column":13,"end_column":56,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:a689d35e6a3cf7ce25db3ca75198b4e9","kind":"class","name":"WidgetT2","qualified_name":"WidgetT2","file_path":"torture.dart","language":"dart","start_line":153,"end_line":156,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:a7406d8c57660dbb4fa7f571dbcdae30","kind":"class","name":"Scored","qualified_name":"Scored","file_path":"TortureReadsTypes.dart","language":"dart","start_line":22,"end_line":24,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:a7b34ad56c9fc903425f501a0cf34383","kind":"class","name":"Box","qualified_name":"Box","file_path":"torture.cpp","language":"cpp","start_line":59,"end_line":66,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:a943b56b8518b75c9e40c82c8acdb80a","kind":"class","name":"String","qualified_name":"String","file_path":"torture.dart","language":"dart","start_line":191,"end_line":193,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:aa93f2fb34fb01e00f7efa8898241570","kind":"class","name":"Bodied","qualified_name":"Torture.Scoped::Bodied","file_path":"TortureFileScoped.cs","language":"csharp","start_line":16,"end_line":19,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:ad42e3cb1196fbd466fd6b651ed235a6","kind":"class","name":"Mix1","qualified_name":"Mix1","file_path":"TortureMini.dart","language":"dart","start_line":54,"end_line":56,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:addcf598d6e590538ddf583221f35a77","kind":"class","name":"BaseService","qualified_name":"BaseService","file_path":"torture.tsx","language":"tsx","start_line":24,"end_line":55,"start_column":7,"end_column":1,"docstring":"Class docs.\nMulti-line.","signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:b094eaef50b2d6fb45fe274ef3100088","kind":"class","name":"QualPriv","qualified_name":"QualPriv","file_path":"TortureMisc.scala","language":"scala","start_line":12,"end_line":12,"start_column":0,"end_column":25,"docstring":null,"signature":null,"visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:b5b796de9cfabee820637f77a1f1927a","kind":"class","name":"Family","qualified_name":"Family","file_path":"TortureReadsTypes.dart","language":"dart","start_line":73,"end_line":75,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:b74055dd58ac82aa4c357b1047a56c12","kind":"class","name":"Empty","qualified_name":"Torture.Scoped::Empty","file_path":"TortureFileScoped.cs","language":"csharp","start_line":14,"end_line":14,"start_column":0,"end_column":20,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:bebe24ff9125ec6a73f4198121232160","kind":"class","name":"MarkdownPaths","qualified_name":"com.example.torture::MarkdownPaths","file_path":"Torture.java","language":"java","start_line":137,"end_line":149,"start_column":0,"end_column":1,"docstring":"Markdown path references: code -> documentation edges. Every shape the\nnormalizer branches on, so the two arms have to agree about the rejections\n(URL, escape above the root) as well as the emissions.","signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:bffea141603f5cf7b8a051fd743d61ba","kind":"class","name":"Base","qualified_name":"Base","file_path":"TortureMini.dart","language":"dart","start_line":76,"end_line":76,"start_column":0,"end_column":22,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -103,6 +107,7 @@
 {"id":"class:c4ed77533cd6f14e451fe7962f484e20","kind":"class","name":"<Runnable$anon@27>","qualified_name":"com.example.torture::TortureService::fieldAnonClass::<Runnable$anon@27>","file_path":"Torture.java","language":"java","start_line":27,"end_line":32,"start_column":42,"end_column":3,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:c4f0e331afcf14097a6eeb00f18dc59b","kind":"class","name":"AbstractT","qualified_name":"AbstractT","file_path":"torture.dart","language":"dart","start_line":164,"end_line":167,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","kind":"class","name":"TortureClass","qualified_name":"Torture.Alpha::TortureClass","file_path":"Torture.cs","language":"csharp","start_line":18,"end_line":151,"start_column":4,"end_column":5,"docstring":"<summary>Doc line.</summary>\n<remarks>Second doc line over an attribute.</remarks>","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:c69c6543c54ab7a0b458fb438bff134b","kind":"class","name":"Map","qualified_name":"Map","file_path":"TortureReadsTypes.dart","language":"dart","start_line":18,"end_line":20,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:c8152170cab61b2f6b9a42767e69dc2b","kind":"class","name":"CircleT","qualified_name":"CircleT","file_path":"torture.dart","language":"dart","start_line":171,"end_line":171,"start_column":0,"end_column":31,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:cbfbe4bcce1afae91632ad45c072d862","kind":"class","name":"A::B::C","qualified_name":"A::B::C","file_path":"torture.rb","language":"ruby","start_line":38,"end_line":40,"start_column":0,"end_column":3,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:cef28fda15c7702f8b1441177fbb8e99","kind":"class","name":"Reader","qualified_name":"Reader","file_path":"TortureVref.scala","language":"scala","start_line":8,"end_line":16,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -128,14 +133,18 @@
 {"id":"class:eff354b462890a050c18d4864aa003d6","kind":"class","name":"Stack","qualified_name":"Stack","file_path":"torture.R","language":"r","start_line":95,"end_line":109,"start_column":9,"end_column":4,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:f3cffc9c9f0e874254eeb3f1d5991355","kind":"class","name":"LombokBean","qualified_name":"com.example.torture::LombokBean","file_path":"Torture.java","language":"java","start_line":108,"end_line":117,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:f8b6f1cf76adb83fb455575fe0dbb4b1","kind":"class","name":"CurryCall","qualified_name":"CurryCall","file_path":"TortureMisc.scala","language":"scala","start_line":15,"end_line":22,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"class","name":"Config","qualified_name":"Config","file_path":"TortureReadsTypes.dart","language":"dart","start_line":77,"end_line":81,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:fa355652331eee519e97b9ef15a61b2d","kind":"class","name":"WidgetT","qualified_name":"WidgetT","file_path":"torture.dart","language":"dart","start_line":113,"end_line":151,"start_column":0,"end_column":1,"docstring":"Class doc.","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:fb8b7ad04b69b1df82188d572b8f3cbd","kind":"class","name":"PrefixedX","qualified_name":"PrefixedX","file_path":"TortureReadsTypes.dart","language":"dart","start_line":14,"end_line":16,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"class:fbcd58714fb59bfafc8917bb8907a34b","kind":"class","name":"ExprSuper","qualified_name":"ExprSuper","file_path":"torture.rb","language":"ruby","start_line":42,"end_line":43,"start_column":0,"end_column":3,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"class:fd45ec038bce9c1fca7887867994d28e","kind":"class","name":"ReportX","qualified_name":"ReportX","file_path":"TortureReadsTypes.dart","language":"dart","start_line":6,"end_line":8,"start_column":0,"end_column":1,"docstring":"The type an extension is `on`: plain, generic, prefixed, nullable.","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"component:2ed8df0bdd16021144df84367a0b7e23","kind":"component","name":"Wrapped","qualified_name":"Wrapped","file_path":"torture.tsx","language":"tsx","start_line":125,"end_line":125,"start_column":13,"end_column":52,"docstring":null,"signature":"= React.memo(ImportedComponent)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"component:500757642dd2d7ebb7eeb4bc286950a1","kind":"component","name":"MemoRow","qualified_name":"MemoRow","file_path":"torture.tsx","language":"tsx","start_line":121,"end_line":123,"start_column":13,"end_column":2,"docstring":null,"signature":"= memo(function Row(props: RowProps) {\n  return <tr className={props.cls}>{props.children}</tr>;\n})","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"component:7481b0bd84a22478679ecbebc3d262fb","kind":"component","name":"Button","qualified_name":"Button","file_path":"torture.tsx","language":"tsx","start_line":113,"end_line":119,"start_column":13,"end_column":2,"docstring":"React components (#841).","signature":"= forwardRef((props: ButtonProps, ref) => {\n  const [state, setState] = useStateAlias(0);\n  useEffect(...","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"component:9b34603afaf6b09ea4b08e8f5c68be84","kind":"component","name":"Styled","qualified_name":"Styled","file_path":"torture.tsx","language":"tsx","start_line":126,"end_line":128,"start_column":13,"end_column":1,"docstring":null,"signature":"= styled.button`\n  color: red;\n`","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:00ed2d037813bb192ee6f3b06ccd77d2","kind":"constant","name":"DOCED","qualified_name":"DOCED","file_path":"TortureVrefDart.dart","language":"dart","start_line":46,"end_line":46,"start_column":6,"end_column":15,"docstring":null,"signature":"= 1","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:027c429f02116e6725f83e648b4778cf","kind":"constant","name":"API_BASE","qualified_name":"com.example.torture::TortureService::API_BASE","file_path":"Torture.java","language":"java","start_line":21,"end_line":21,"start_column":30,"end_column":63,"docstring":null,"signature":"String API_BASE","visibility":"private","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:030c0c1a5b7a383bafdd1693b847ff66","kind":"constant","name":"reportProvider","qualified_name":"reportProvider","file_path":"TortureReadsTypes.dart","language":"dart","start_line":69,"end_line":69,"start_column":6,"end_column":48,"docstring":null,"signature":"= Family","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:03320f874a822ca1aea30366ce873563","kind":"constant","name":"md_queried","qualified_name":"md_queried","file_path":"torture.c","language":"c","start_line":180,"end_line":180,"start_column":18,"end_column":54,"docstring":null,"signature":"= \"./notes.md?raw=1#top\"","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:03a7deca3c8e64b747972d99b0c1bcdc","kind":"constant","name":"get","qualified_name":"HTTPMethod::get","file_path":"torture.swift","language":"swift","start_line":41,"end_line":41,"start_column":2,"end_column":46,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:0558b57204d51fcce0a73629df252447","kind":"constant","name":"MAX_ITEMS","qualified_name":"MAX_ITEMS","file_path":"torture.go","language":"go","start_line":9,"end_line":9,"start_column":6,"end_column":21,"docstring":null,"signature":"= 128","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -150,6 +159,7 @@
 {"id":"constant:16c406d162af190333c10c16862053b0","kind":"constant","name":"md_guide","qualified_name":"md_guide","file_path":"torture.c","language":"c","start_line":175,"end_line":175,"start_column":18,"end_column":56,"docstring":"Markdown path references: code -> documentation edges. Every shape the\n   normalizer branches on, so the two arms have to agree about the rejections\n   (URL, escape above the root) as well as the emissions.","signature":"= \"../docs/guide.md#install\"","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:190c7c86b148186ed38f0157f9c3aebe","kind":"constant","name":"SHARED_TABLE","qualified_name":"Config::SHARED_TABLE","file_path":"TortureVref.scala","language":"scala","start_line":4,"end_line":4,"start_column":2,"end_column":34,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:1c0f55f1f253b65ec125b507b77e4a5c","kind":"constant","name":"widgetApi","qualified_name":"widgetApi","file_path":"torture.tsx","language":"tsx","start_line":169,"end_line":182,"start_column":13,"end_column":2,"docstring":"RTK Query.","signature":"= createApi({\n  reducerPath: 'widgets',\n  endpoints: (build) => ({\n    getWidget: build.query({\n      ...","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:1d780ceba0f753b7c3c7fd7c16cd2ebd","kind":"constant","name":"top","qualified_name":"Grade::top","file_path":"TortureReadsTypes.dart","language":"dart","start_line":57,"end_line":57,"start_column":21,"end_column":34,"docstring":null,"signature":"= Grade","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:20c1adca9b006cfdbef3b2a842e8bb6d","kind":"constant","name":"Bare","qualified_name":"Torture.Markdown::MarkdownPaths::Bare","file_path":"Torture.cs","language":"csharp","start_line":191,"end_line":191,"start_column":28,"end_column":46,"docstring":null,"signature":"string Bare","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:236c639ef8d468b8c5f0edbe3c511fe6","kind":"constant","name":"TWO_IN_ONE","qualified_name":"TWO_IN_ONE","file_path":"torture.tsx","language":"tsx","start_line":225,"end_line":225,"start_column":6,"end_column":48,"docstring":null,"signature":"= 'see a.md and also sub/b.mdx'","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:2473fbfe8d2893986c919a78a4a7903b","kind":"constant","name":"mutations","qualified_name":"mutations","file_path":"torture.js","language":"javascript","start_line":54,"end_line":58,"start_column":6,"end_column":1,"docstring":"Vuex module shape (store-file signals: mutations + actions + getters).","signature":"= {\n  SET_USER(state, user) {\n    state.user = user;\n  },\n}","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -169,6 +179,7 @@
 {"id":"constant:328d7d9dc18366338bbbc21b302f4616","kind":"constant","name":"A.CONST","qualified_name":"A.CONST","file_path":"torture.R","language":"r","start_line":25,"end_line":25,"start_column":0,"end_column":13,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:33f910c46b7ceee638d2e27597b6efe9","kind":"constant","name":"mdRemote","qualified_name":"MarkdownPaths::mdRemote","file_path":"torture.scala","language":"scala","start_line":187,"end_line":187,"start_column":2,"end_column":48,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:342374b797067fd348d243baa5d427dc","kind":"constant","name":"topLazy","qualified_name":"topLazy","file_path":"torture.scala","language":"scala","start_line":36,"end_line":36,"start_column":0,"end_column":28,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:37538675d8cf7487a68e75423fac3308","kind":"constant","name":"none","qualified_name":"Holder::none","file_path":"TortureReadsTypes.dart","language":"dart","start_line":33,"end_line":33,"start_column":28,"end_column":45,"docstring":null,"signature":"= <Report>[]","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:38ff4361a0ae094e720d67addf493513","kind":"constant","name":"MAX","qualified_name":"MAX","file_path":"torture-macros.c","language":"c","start_line":6,"end_line":7,"start_column":0,"end_column":0,"docstring":null,"signature":"#define MAX(a, b) ((a) > (b) ? (a) : (b))","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:39c1ce7b46688c18fe85c3a1739df949","kind":"constant","name":"mdRemote","qualified_name":"mdRemote","file_path":"torture.swift","language":"swift","start_line":222,"end_line":222,"start_column":0,"end_column":46,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:3c38de0e0ed3e748396ac32a56feb99b","kind":"constant","name":"extracted","qualified_name":"extracted","file_path":"torture.scala","language":"scala","start_line":38,"end_line":38,"start_column":0,"end_column":31,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -230,6 +241,7 @@
 {"id":"constant:89dc76979e4805108a9a7c1f1779f400","kind":"constant","name":"aliasFn","qualified_name":"aliasFn","file_path":"torture.tsx","language":"tsx","start_line":203,"end_line":203,"start_column":6,"end_column":24,"docstring":null,"signature":"= topLevel","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:8c40c7aa0ee817d211362e5149ec2220","kind":"constant","name":"DEFAULT_SIZE","qualified_name":"WidgetS::DEFAULT_SIZE","file_path":"torture.scala","language":"scala","start_line":66,"end_line":66,"start_column":2,"end_column":23,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:8cc8e73594e568ebf734697ba06cdd08","kind":"constant","name":"sharedInst","qualified_name":"WidgetT::sharedInst","file_path":"torture.dart","language":"dart","start_line":116,"end_line":116,"start_column":15,"end_column":38,"docstring":null,"signature":"= WidgetT","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:8d5b7c0112ba1bd860a9b742a094954c","kind":"constant","name":"handler","qualified_name":"handler","file_path":"TortureReadsTypes.dart","language":"dart","start_line":71,"end_line":71,"start_column":6,"end_column":37,"docstring":null,"signature":"= (Report r) => r.score","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:9094965c27fc1c253476c66075eb8df3","kind":"constant","name":"REMOTE","qualified_name":"com.example.torture::MarkdownPaths::REMOTE","file_path":"Torture.java","language":"java","start_line":142,"end_line":142,"start_column":22,"end_column":62,"docstring":null,"signature":"String REMOTE","visibility":null,"is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:90ff2b973c8733cb433a85de5fb3561f","kind":"constant","name":"mdTwoInOne","qualified_name":"mdTwoInOne","file_path":"torture.dart","language":"dart","start_line":242,"end_line":242,"start_column":6,"end_column":48,"docstring":null,"signature":"= 'see a.md and also sub/b.mdx'","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:918bdd1cc2ff2b2cd79d7560e2a8d3e4","kind":"constant","name":"aliasStatic","qualified_name":"K::aliasStatic","file_path":"TortureFnrefDart.dart","language":"dart","start_line":17,"end_line":17,"start_column":15,"end_column":36,"docstring":null,"signature":"= aliased","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -265,6 +277,7 @@
 {"id":"constant:b88e9d23d2e8e5e79a944902c181bb40","kind":"constant","name":"initSam","qualified_name":"com.example.torture::initSam","file_path":"torture.kt","language":"kotlin","start_line":54,"end_line":54,"start_column":0,"end_column":35,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:ba67e5b1afe88bad27550035d21afd9e","kind":"constant","name":"memoCache","qualified_name":"memoCache","file_path":"torture.tsx","language":"tsx","start_line":129,"end_line":129,"start_column":6,"end_column":36,"docstring":null,"signature":"= memo(computeThing)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:bbefb11d3b9821ad30964edca510796b","kind":"constant","name":"listStored","qualified_name":"H2::listStored","file_path":"TortureFnref.scala","language":"scala","start_line":26,"end_line":26,"start_column":2,"end_column":30,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:bc99115ab2732b88425e23aeb159d283","kind":"constant","name":"empty","qualified_name":"empty","file_path":"TortureReadsTypes.dart","language":"dart","start_line":70,"end_line":70,"start_column":6,"end_column":24,"docstring":null,"signature":"= <Report>[]","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:be2d569b38cb0ca16159261ae6c0b825","kind":"constant","name":"multiB","qualified_name":"multiB","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":5,"end_line":5,"start_column":18,"end_column":28,"docstring":null,"signature":"= 2","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:bef377144a3181450076fd95db44147f","kind":"constant","name":"initObject","qualified_name":"com.example.torture::initObject","file_path":"torture.kt","language":"kotlin","start_line":55,"end_line":59,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:c057da8498024829f0eb66b810eb9b72","kind":"constant","name":"count","qualified_name":"Config::count","file_path":"TortureVref.scala","language":"scala","start_line":5,"end_line":5,"start_column":2,"end_column":15,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -277,6 +290,7 @@
 {"id":"constant:cd439da2915cf1b9f5786bccc9d44181","kind":"constant","name":"GUIDE","qualified_name":"GUIDE","file_path":"torture.tsx","language":"tsx","start_line":219,"end_line":219,"start_column":6,"end_column":40,"docstring":"Markdown path references: code -> documentation edges. Every shape the\nnormalizer branches on, so the two arms have to agree about the rejections\n(URL, escape above the root) as well as the emissions.","signature":"= '../docs/guide.md#install'","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:cdfcaff122e516211a30907e8726cffd","kind":"constant","name":"mdQueried","qualified_name":"mdQueried","file_path":"torture.swift","language":"swift","start_line":223,"end_line":223,"start_column":0,"end_column":38,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:ce115b27746b5ef3c1e4991d2e9113f0","kind":"constant","name":"AnonClassHolder","qualified_name":"AnonClassHolder","file_path":"torture.tsx","language":"tsx","start_line":108,"end_line":110,"start_column":6,"end_column":1,"docstring":null,"signature":"= class {\n  method() {}\n}","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"constant:cf5aaa64e9d0f2840dff763fee34a693","kind":"constant","name":"fallback","qualified_name":"Holder::fallback","file_path":"TortureReadsTypes.dart","language":"dart","start_line":32,"end_line":32,"start_column":22,"end_column":42,"docstring":null,"signature":"= Report","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:cffd5acd8d3a2aa530667598f7b17b51","kind":"constant","name":"md_remote","qualified_name":"md_remote","file_path":"torture.c","language":"c","start_line":179,"end_line":179,"start_column":18,"end_column":62,"docstring":null,"signature":"= \"https://example.com/remote.md\"","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:d1cf0b3084a3fce687e6d043ee49a78d","kind":"constant","name":"RIGHT.CONST","qualified_name":"RIGHT.CONST","file_path":"torture.R","language":"r","start_line":30,"end_line":30,"start_column":0,"end_column":18,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:d297eac18c8200ae09409106b9e7d994","kind":"constant","name":"mdGuide","qualified_name":"mdGuide","file_path":"torture.dart","language":"dart","start_line":236,"end_line":236,"start_column":6,"end_column":42,"docstring":null,"signature":"= '../docs/guide.md#install'","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -306,6 +320,7 @@
 {"id":"constant:fed560d89726ef0ad5e091f881319eab","kind":"constant","name":"tableTop","qualified_name":"tableTop","file_path":"TortureFnrefDart.dart","language":"dart","start_line":12,"end_line":12,"start_column":6,"end_column":25,"docstring":null,"signature":"= [listed]","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum:1128d72c1fefa71e49101b448055e477","kind":"enum","name":"Direction","qualified_name":"Direction","file_path":"torture.tsx","language":"tsx","start_line":72,"end_line":76,"start_column":7,"end_column":1,"docstring":null,"signature":null,"visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum:17acc88a5112f35e068a0eed30bf9761","kind":"enum","name":"Shape","qualified_name":"Shape","file_path":"torture.rs","language":"rust","start_line":32,"end_line":36,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"enum:185db2f09770db6e298b5452894a6826","kind":"enum","name":"Grade","qualified_name":"Grade","file_path":"TortureReadsTypes.dart","language":"dart","start_line":51,"end_line":59,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum:1bea39061b126572ffb641ee6a98eab8","kind":"enum","name":"AFError","qualified_name":"AFError","file_path":"torture.swift","language":"swift","start_line":44,"end_line":50,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum:1ef1af150f3eeb70f32dc6bc8f0bcf06","kind":"enum","name":"E2","qualified_name":"E2","file_path":"TortureVrefDart.dart","language":"dart","start_line":49,"end_line":49,"start_column":0,"end_column":13,"docstring":"Doc on enum.","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum:2301fa8d1a0b010b91450d59386b4020","kind":"enum","name":"Http","qualified_name":"Http","file_path":"torture.scala","language":"scala","start_line":96,"end_line":100,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -381,6 +396,8 @@
 {"id":"enum_member:e9e2f8c6a90379aff1856df15c542477","kind":"enum_member","name":"a","qualified_name":"E2::a","file_path":"TortureVrefDart.dart","language":"dart","start_line":49,"end_line":49,"start_column":10,"end_column":11,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum_member:ee9626da4221d02fc27e05d3d511baa6","kind":"enum_member","name":"on","qualified_name":"Flag::on","file_path":"TortureCtors.dart","language":"dart","start_line":29,"end_line":29,"start_column":12,"end_column":14,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum_member:f0308e8b86fffb5f60aef07b338ae64a","kind":"enum_member","name":"Earth","qualified_name":"Planet::Earth","file_path":"torture.scala","language":"scala","start_line":103,"end_line":103,"start_column":7,"end_column":32,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"enum_member:f2caf0f3eea3fa73f2cffde65f69ebca","kind":"enum_member","name":"b","qualified_name":"Grade::b","file_path":"TortureReadsTypes.dart","language":"dart","start_line":53,"end_line":53,"start_column":2,"end_column":9,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"enum_member:f7578cc20dffcf6ba3743ddcdadbd871","kind":"enum_member","name":"a","qualified_name":"Grade::a","file_path":"TortureReadsTypes.dart","language":"dart","start_line":52,"end_line":52,"start_column":2,"end_column":9,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum_member:fb8f2e100e4cd5ff76e6734c9da15ed7","kind":"enum_member","name":"explicitlyCancelled","qualified_name":"AFError::explicitlyCancelled","file_path":"torture.swift","language":"swift","start_line":46,"end_line":46,"start_column":2,"end_column":48,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"enum_member:fea7a2ada0f627a5fffa2bd0283b215b","kind":"enum_member","name":"LEGACY_B","qualified_name":"Legacy::LEGACY_B","file_path":"torture.cpp","language":"cpp","start_line":90,"end_line":90,"start_column":24,"end_column":32,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"field:083fea866073b5984cff14ffa32265b2","kind":"field","name":"mutable","qualified_name":"WidgetS::mutable","file_path":"torture.scala","language":"scala","start_line":44,"end_line":44,"start_column":2,"end_column":17,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -464,6 +481,7 @@
 {"id":"file:TortureMini.dart","kind":"file","name":"TortureMini.dart","qualified_name":"TortureMini.dart","file_path":"TortureMini.dart","language":"dart","start_line":1,"end_line":78,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:TortureMisc.scala","kind":"file","name":"TortureMisc.scala","qualified_name":"TortureMisc.scala","file_path":"TortureMisc.scala","language":"scala","start_line":1,"end_line":30,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:TortureModule.module","kind":"file","name":"TortureModule.module","qualified_name":"TortureModule.module","file_path":"TortureModule.module","language":"php","start_line":1,"end_line":12,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"file:TortureReadsTypes.dart","kind":"file","name":"TortureReadsTypes.dart","qualified_name":"TortureReadsTypes.dart","file_path":"TortureReadsTypes.dart","language":"dart","start_line":1,"end_line":132,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:TortureScript.kts","kind":"file","name":"TortureScript.kts","qualified_name":"TortureScript.kts","file_path":"TortureScript.kts","language":"kotlin","start_line":1,"end_line":5,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:TortureScript.sc","kind":"file","name":"TortureScript.sc","qualified_name":"TortureScript.sc","file_path":"TortureScript.sc","language":"scala","start_line":1,"end_line":5,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:TortureSigs.dart","kind":"file","name":"TortureSigs.dart","qualified_name":"TortureSigs.dart","file_path":"TortureSigs.dart","language":"dart","start_line":1,"end_line":43,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -494,12 +512,13 @@
 {"id":"function:00765ec56fe71745c9d59a36a20c8d9e","kind":"function","name":"NestedHandlers","qualified_name":"NestedHandlers","file_path":"torture.tsx","language":"tsx","start_line":245,"end_line":252,"start_column":7,"end_column":1,"docstring":"- const-bound functions inside a body (#1669) -----------------------------","signature":"({ items, onPick }: { items: string[]; onPick: (a: unknown, b: unknown) => void })","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:00b2d8219547c7844062cc5b8250525f","kind":"function","name":"multiRet","qualified_name":"multiRet","file_path":"torture.luau","language":"luau","start_line":22,"end_line":24,"start_column":0,"end_column":3,"docstring":null,"signature":"(): (number, string)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:014e5ac4509fb26b0b2a1c00f6183b50","kind":"function","name":"genericDef","qualified_name":"genericDef","file_path":"torture.scala","language":"scala","start_line":18,"end_line":18,"start_column":0,"end_column":54,"docstring":null,"signature":"[A: Numeric, B <: BoundT]: B","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"B"}
-{"id":"function:01bcb742f299ec5ccc188b8a5f1937b5","kind":"function","name":"create","qualified_name":"create","file_path":"torture.tsx","language":"tsx","start_line":146,"end_line":148,"start_column":10,"end_column":3,"docstring":null,"signature":"(input: CreateInput)","visibility":null,"is_exported":1,"is_async":1,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:01bcb742f299ec5ccc188b8a5f1937b5","kind":"function","name":"create","qualified_name":"actionsMap::create","file_path":"torture.tsx","language":"tsx","start_line":146,"end_line":148,"start_column":10,"end_column":3,"docstring":null,"signature":"(input: CreateInput)","visibility":null,"is_exported":1,"is_async":1,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:0499cc5aef87518260d547d716f829ce","kind":"function","name":"getWidget","qualified_name":"getWidget","file_path":"torture.tsx","language":"tsx","start_line":173,"end_line":173,"start_column":13,"end_column":44,"docstring":null,"signature":"(id: string)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:04a85402edcdb9f51e099ea510476ccf","kind":"function","name":"run","qualified_name":"com.example.torture::initObject::run","file_path":"torture.kt","language":"kotlin","start_line":56,"end_line":58,"start_column":4,"end_column":5,"docstring":null,"signature":"()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:05bd0201aeabe1c81ea0141ab10b271b","kind":"function","name":"computed_string","qualified_name":"computed_string","file_path":"docstrings.py","language":"python","start_line":74,"end_line":76,"start_column":0,"end_column":12,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:071bd15751854933bac820b5850a2641","kind":"function","name":"<+>","qualified_name":"<+>","file_path":"torture.swift","language":"swift","start_line":131,"end_line":131,"start_column":0,"end_column":56,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:08bb60eead5364c3bf26d67ebca2639d","kind":"function","name":"lambdas","qualified_name":"lambdas","file_path":"TortureSigs.dart","language":"dart","start_line":21,"end_line":28,"start_column":0,"end_column":26,"docstring":null,"signature":"void (List<int> xs)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:09bc8c99cfea997f2b613b053cdeacc9","kind":"function","name":"onSave","qualified_name":"handlerMap::onSave","file_path":"torture.js","language":"javascript","start_line":80,"end_line":80,"start_column":29,"end_column":55,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:0a0fd41add7ee911e628516232e13b88","kind":"function","name":"mustImpl","qualified_name":"AbstractT::mustImpl","file_path":"torture.dart","language":"dart","start_line":165,"end_line":165,"start_column":2,"end_column":26,"docstring":null,"signature":"void (WidgetT w)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:0a7d399fea99589f69b513c46d78afb4","kind":"function","name":"cb_a","qualified_name":"cb_a","file_path":"torture.rs","language":"rust","start_line":235,"end_line":235,"start_column":0,"end_column":12,"docstring":null,"signature":"()","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:0aa0f690f342ae80a20985c7f14eab2e","kind":"function","name":"whereClause","qualified_name":"com.example.torture::whereClause","file_path":"torture.kt","language":"kotlin","start_line":274,"end_line":274,"start_column":0,"end_column":54,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
@@ -522,10 +541,12 @@
 {"id":"function:16e7773d0267cca9529c1c7e89948222","kind":"function","name":"assignOnly","qualified_name":"assignOnly","file_path":"TortureVrefDart.dart","language":"dart","start_line":32,"end_line":34,"start_column":0,"end_column":17,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:1762c7fa1f3cd4e18196d93c05883108","kind":"function","name":"cbA","qualified_name":"cbA","file_path":"torture.swift","language":"swift","start_line":111,"end_line":111,"start_column":0,"end_column":13,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:178c6f5073dbe3085b9a39b8c2723861","kind":"function","name":"describe","qualified_name":"describe","file_path":"torture.R","language":"r","start_line":78,"end_line":78,"start_column":0,"end_column":65,"docstring":null,"signature":"(obj)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:17dec1e0fa812cc39e6fe41decdff8ce","kind":"function","name":"onSave","qualified_name":"handlerMap::onSave","file_path":"torture.js","language":"javascript","start_line":91,"end_line":91,"start_column":29,"end_column":55,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:1932b46aef9b5a9c946962703eaf2c1c","kind":"function","name":"localWithNew","qualified_name":"localWithNew","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":14,"end_line":17,"start_column":2,"end_column":20,"docstring":null,"signature":"int ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"function:197783ccd4e0addc08a46e60af554114","kind":"function","name":"pragged","qualified_name":"pragged","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":58,"end_line":58,"start_column":0,"end_column":14,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:19a0e59e96f62184134d9ca1af9b25c5","kind":"function","name":"reads","qualified_name":"reads","file_path":"TortureReadsTypes.dart","language":"dart","start_line":83,"end_line":106,"start_column":0,"end_column":39,"docstring":null,"signature":"int (Holder h, Grade g, Report? r)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"function:1d4452f87de36ad763fb591620a03727","kind":"function","name":"pkgHelper","qualified_name":"pkgHelper","file_path":"torture.scala","language":"scala","start_line":175,"end_line":175,"start_column":2,"end_column":26,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
-{"id":"function:1e88e4e4512fb430843aefcd401baa63","kind":"function","name":"update","qualified_name":"update","file_path":"torture.tsx","language":"tsx","start_line":149,"end_line":151,"start_column":2,"end_column":3,"docstring":null,"signature":"(input: UpdateInput)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:1e88e4e4512fb430843aefcd401baa63","kind":"function","name":"update","qualified_name":"actionsMap::update","file_path":"torture.tsx","language":"tsx","start_line":149,"end_line":151,"start_column":2,"end_column":3,"docstring":null,"signature":"(input: UpdateInput)","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:1f9113c1936c681d582e2e8de8a47736","kind":"function","name":"optionals","qualified_name":"optionals","file_path":"torture.dart","language":"dart","start_line":57,"end_line":57,"start_column":0,"end_column":41,"docstring":null,"signature":"void ([int pos = 0, WidgetT? w])","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:1ff8eb433358524f81c9fa301bb39b42","kind":"function","name":"inner","qualified_name":"nester::inner","file_path":"torture.R","language":"r","start_line":34,"end_line":37,"start_column":2,"end_column":3,"docstring":null,"signature":"(y)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:20c85c2670ea905ab78b990c87f94b32","kind":"function","name":"inner","qualified_name":"topLevel::inner","file_path":"torture.tsx","language":"tsx","start_line":92,"end_line":92,"start_column":16,"end_column":34,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -540,6 +561,7 @@
 {"id":"function:25ffa07c15bde4ba9c80922e52dae992","kind":"function","name":"scope","qualified_name":"scope","file_path":"ScalaCompanions.scala","language":"scala","start_line":18,"end_line":23,"start_column":0,"end_column":1,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"function:262df8cc0bb3d2bff4ad563022b44561","kind":"function","name":"onFire","qualified_name":"onFire","file_path":"torture.swift","language":"swift","start_line":109,"end_line":109,"start_column":0,"end_column":16,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:263f56e3e6367eb43aae31be2fb8db54","kind":"function","name":"blockDoc","qualified_name":"blockDoc","file_path":"TortureCtors.dart","language":"dart","start_line":2,"end_line":2,"start_column":0,"end_column":15,"docstring":"Block dartdoc for blockDoc.","signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:26ac3e78238b037efdce6f5fac049878","kind":"function","name":"types","qualified_name":"types","file_path":"TortureReadsTypes.dart","language":"dart","start_line":108,"end_line":131,"start_column":0,"end_column":22,"docstring":null,"signature":"Object (Object o)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Object"}
 {"id":"function:26b615a9ff4f6e3b7dccb22db3b14487","kind":"function","name":"actualThing","qualified_name":"com.example.torture::actualThing","file_path":"torture.kt","language":"kotlin","start_line":38,"end_line":38,"start_column":0,"end_column":33,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":"[\"actual\"]","type_parameters":null,"return_type":"Int"}
 {"id":"function:29c45ab6685a5a716164b34bb4223347","kind":"function","name":"handleClear","qualified_name":"NestedHandlers::handleClear","file_path":"torture.tsx","language":"tsx","start_line":246,"end_line":246,"start_column":22,"end_column":51,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:2a061aa5ac1dfa9fdd967ac7db7575a9","kind":"function","name":"shadowed_read","qualified_name":"shadowed_read","file_path":"torture.rs","language":"rust","start_line":267,"end_line":270,"start_column":0,"end_column":1,"docstring":null,"signature":"()","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -556,6 +578,7 @@
 {"id":"function:39329e3ed919e959c06a8c0eb791ad7f","kind":"function","name":"defaults","qualified_name":"com.example.torture::defaults","file_path":"torture.kt","language":"kotlin","start_line":247,"end_line":247,"start_column":0,"end_column":52,"docstring":null,"signature":"(a: Int = compute(), b: String = \"x\")","visibility":"public","is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:3b5974da24c560449effd9d014e81123","kind":"function","name":"optional","qualified_name":"optional","file_path":"TortureSigs.dart","language":"dart","start_line":6,"end_line":6,"start_column":0,"end_column":37,"docstring":null,"signature":"void ([int b = 0, Widget? w])","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:3c52494613752935da8b768c848425c2","kind":"function","name":"annotated","qualified_name":"annotated","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":52,"end_line":52,"start_column":0,"end_column":16,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:40126a800d9910002cd20fdc95dc22eb","kind":"function","name":"nested","qualified_name":"nested","file_path":"TortureReadsTypes.dart","language":"dart","start_line":101,"end_line":104,"start_column":2,"end_column":22,"docstring":null,"signature":"int (Holder y)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"function:40681981ccd23a62a48a19249619c28f","kind":"function","name":"concatenated_format","qualified_name":"concatenated_format","file_path":"docstrings.py","language":"python","start_line":65,"end_line":67,"start_column":0,"end_column":12,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:41b11ed8c88957320d6c274f434f17d5","kind":"function","name":"lam","qualified_name":"lam","file_path":"torture.R","language":"r","start_line":16,"end_line":16,"start_column":0,"end_column":17,"docstring":null,"signature":"(x)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:434fc66cc90ef59c01466d52e147b60a","kind":"function","name":"taker","qualified_name":"taker","file_path":"TortureFnrefDart.dart","language":"dart","start_line":22,"end_line":26,"start_column":0,"end_column":12,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -671,7 +694,7 @@
 {"id":"function:9880cd7d8361fedda327ff0eb3eb37df","kind":"function","name":"legacyHelper","qualified_name":"legacyHelper","file_path":"torture.js","language":"javascript","start_line":9,"end_line":11,"start_column":0,"end_column":1,"docstring":"Legacy prototype-style helper.","signature":"(a, b)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:98bf96b561ade91813110052d434ed31","kind":"function","name":"area","qualified_name":"area","file_path":"torture.R","language":"r","start_line":185,"end_line":185,"start_column":0,"end_column":34,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:9b928da996be2cd2784c6bade755a4b5","kind":"function","name":"params","qualified_name":"params","file_path":"TortureSigs.dart","language":"dart","start_line":5,"end_line":5,"start_column":0,"end_column":63,"docstring":null,"signature":"void ({int? a, required Widget child, String note = 'x'})","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"function:9c6b1a068cb18a0a7ace98d373174dd9","kind":"function","name":"SET_USER","qualified_name":"SET_USER","file_path":"torture.js","language":"javascript","start_line":55,"end_line":57,"start_column":2,"end_column":3,"docstring":null,"signature":"(state, user)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:9c6b1a068cb18a0a7ace98d373174dd9","kind":"function","name":"SET_USER","qualified_name":"mutations::SET_USER","file_path":"torture.js","language":"javascript","start_line":55,"end_line":57,"start_column":2,"end_column":3,"docstring":null,"signature":"(state, user)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:9d0b5cf639ecbd60bfec25961cf971c9","kind":"function","name":"fnRefExtras","qualified_name":"fnRefExtras","file_path":"torture.swift","language":"swift","start_line":205,"end_line":210,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:9e3562bbb17ae055c07f19c4cf7a017f","kind":"function","name":"mdLoad","qualified_name":"mdLoad","file_path":"torture.swift","language":"swift","start_line":226,"end_line":228,"start_column":0,"end_column":1,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:9e4b2ec4bd1b887f3b4e4bd8bcf6b222","kind":"function","name":"nested_string","qualified_name":"nested_string","file_path":"docstrings.py","language":"python","start_line":95,"end_line":98,"start_column":0,"end_column":12,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -718,7 +741,7 @@
 {"id":"function:c5f2650f3438ad1d15934604a4b4687a","kind":"function","name":"reset","qualified_name":"reset","file_path":"torture.tsx","language":"tsx","start_line":162,"end_line":162,"start_column":13,"end_column":38,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:c6a04d99ed58fba74ba3acfdb71cce14","kind":"function","name":"mapped","qualified_name":"mapped","file_path":"TortureFnrefDart.dart","language":"dart","start_line":3,"end_line":3,"start_column":0,"end_column":13,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:c902e65a264d72fa50c19042aba09e00","kind":"function","name":"reads","qualified_name":"reads","file_path":"torture.go","language":"go","start_line":59,"end_line":61,"start_column":0,"end_column":1,"docstring":null,"signature":"() int","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
-{"id":"function:c97d0d5969167c7958098f13defe9e08","kind":"function","name":"loadUser","qualified_name":"loadUser","file_path":"torture.js","language":"javascript","start_line":60,"end_line":63,"start_column":2,"end_column":3,"docstring":null,"signature":"({ commit }, id)","visibility":null,"is_exported":0,"is_async":1,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"function:c97d0d5969167c7958098f13defe9e08","kind":"function","name":"loadUser","qualified_name":"actions::loadUser","file_path":"torture.js","language":"javascript","start_line":60,"end_line":63,"start_column":2,"end_column":3,"docstring":null,"signature":"({ commit }, id)","visibility":null,"is_exported":0,"is_async":1,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:c9d81b20158326ba20ea1f0fa623d6c2","kind":"function","name":"after_unicode","qualified_name":"after_unicode","file_path":"torture.luau","language":"luau","start_line":60,"end_line":60,"start_column":0,"end_column":28,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:ca2a58bf9e2fe349053607e85964f54f","kind":"function","name":"params","qualified_name":"params","file_path":"torture.dart","language":"dart","start_line":56,"end_line":56,"start_column":0,"end_column":68,"docstring":null,"signature":"void ({int? named, required WidgetT child, String note = 'x'})","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"function:ca44325ee884ced19dd402cc3e104bc4","kind":"function","name":"builderRet","qualified_name":"builderRet","file_path":"torture.swift","language":"swift","start_line":159,"end_line":159,"start_column":0,"end_column":48,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Builder"}
@@ -811,9 +834,11 @@
 {"id":"import:1ad47f5036bb3218aae8320b3a04147b","kind":"import","name":"TortureKit","qualified_name":"TortureKit","file_path":"torture.swift","language":"swift","start_line":213,"end_line":213,"start_column":0,"end_column":27,"docstring":null,"signature":"@testable import TortureKit","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:1bb9139cc33ad8d8c9e84f960ccd8ec8","kind":"import","name":"com.example.other.OtherClass","qualified_name":"com.example.torture::com.example.other.OtherClass","file_path":"Torture.java","language":"java","start_line":12,"end_line":12,"start_column":0,"end_column":36,"docstring":null,"signature":"import com.example.other.OtherClass;","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:1d1d85b7f18e49012c7ebda155ba360b","kind":"import","name":"collections","qualified_name":"collections","file_path":"torture.py","language":"python","start_line":4,"end_line":4,"start_column":0,"end_column":48,"docstring":null,"signature":"from collections import OrderedDict, defaultdict","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"import:257c713f4b7c95fbd46562b2b32c61e0","kind":"import","name":"package:app/model.dart","qualified_name":"package:app/model.dart","file_path":"TortureReadsTypes.dart","language":"dart","start_line":3,"end_line":3,"start_column":0,"end_column":32,"docstring":null,"signature":"import 'package:app/model.dart';","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:29c3cc32eeee07c3c2b96bf6f1b275d2","kind":"import","name":"./side-effect","qualified_name":"./side-effect","file_path":"torture.tsx","language":"tsx","start_line":7,"end_line":7,"start_column":0,"end_column":23,"docstring":null,"signature":"import './side-effect';","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:2ee5c0c674cdd86640a278af131eb539","kind":"import","name":"mypkg.handlers","qualified_name":"mypkg.handlers","file_path":"torture.py","language":"python","start_line":6,"end_line":6,"start_column":0,"end_column":36,"docstring":null,"signature":"from mypkg.handlers import target_cb","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:3507f565c67e2ebfd3296d7d9b2393da","kind":"import","name":"Darwin.FILE","qualified_name":"Darwin.FILE","file_path":"torture.swift","language":"swift","start_line":212,"end_line":212,"start_column":0,"end_column":24,"docstring":null,"signature":"import class Darwin.FILE","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"import:391f5cb302fdbbce4e955fc4f7d484a8","kind":"import","name":"package:app/model.dart","qualified_name":"package:app/model.dart","file_path":"TortureReadsTypes.dart","language":"dart","start_line":2,"end_line":2,"start_column":0,"end_column":37,"docstring":null,"signature":"import 'package:app/model.dart' as m;","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:3a2b101b1ce6198fe7edad7f2397cf5a","kind":"import","name":"helpers.R","qualified_name":"helpers.R","file_path":"torture.R","language":"r","start_line":60,"end_line":60,"start_column":0,"end_column":19,"docstring":null,"signature":"source(\"helpers.R\")","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:3dfa953a218bdfb127cccc4a7430c101","kind":"import","name":".relative","qualified_name":".relative","file_path":"torture.py","language":"python","start_line":5,"end_line":5,"start_column":0,"end_column":27,"docstring":null,"signature":"from .relative import thing","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"import:4413f5e46241edba8bd7755ce1bb78c8","kind":"import","name":"a","qualified_name":"a","file_path":"torture.rs","language":"rust","start_line":7,"end_line":7,"start_column":0,"end_column":19,"docstring":null,"signature":"use a::{b::{c, d}};","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -912,6 +937,7 @@
 {"id":"method:08409ee77511a69da8f6417c2412a279","kind":"method","name":"lm","qualified_name":"CallSites::localHost::LocalClass::lm","file_path":"torture.scala","language":"scala","start_line":157,"end_line":157,"start_column":23,"end_column":40,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:0843076b0b3cc6a4287f1bbbb3ec931d","kind":"method","name":"dup","qualified_name":"Container::dup","file_path":"torture.rs","language":"rust","start_line":158,"end_line":160,"start_column":4,"end_column":5,"docstring":null,"signature":"(&self) -> T","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"T"}
 {"id":"method:0ac88699b2078c0d56b6b4eab58cee0e","kind":"method","name":"gamma","qualified_name":"H2::gamma","file_path":"TortureFnref.scala","language":"scala","start_line":18,"end_line":18,"start_column":2,"end_column":24,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
+{"id":"method:0b2c376e9c02768528bfd80dc00f83f0","kind":"method","name":"present","qualified_name":"PrefixedX::present","file_path":"TortureReadsTypes.dart","language":"dart","start_line":15,"end_line":15,"start_column":2,"end_column":18,"docstring":null,"signature":"bool","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"bool"}
 {"id":"method:0ec4c9be7a25d20b240e7ce2a69c73f9","kind":"method","name":"outline","qualified_name":"com.example.torture::Drawable::outline","file_path":"torture.kt","language":"kotlin","start_line":113,"end_line":113,"start_column":4,"end_column":26,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:0f8219cd061509e88edd9e3dbc9bc5b8","kind":"method","name":"draw","qualified_name":"com.example.torture::Drawable::draw","file_path":"torture.kt","language":"kotlin","start_line":112,"end_line":112,"start_column":4,"end_column":14,"docstring":null,"signature":"()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:10b093045f5c10d7e356c1a7ee0b298e","kind":"method","name":"toString","qualified_name":"com.example.torture::LombokBean::toString","file_path":"Torture.java","language":"java","start_line":109,"end_line":109,"start_column":6,"end_column":16,"docstring":"Lombok-generated (@Data)","signature":"String toString()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":"[\"lombok\"]","type_parameters":null,"return_type":null}
@@ -991,6 +1017,7 @@
 {"id":"method:3b1cb571f833b38e29e2b07a5203ff27","kind":"method","name":"Reader2","qualified_name":"Torture.Alpha::TortureClass::Reader2","file_path":"Torture.cs","language":"csharp","start_line":150,"end_line":150,"start_column":8,"end_column":54,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:3c07f9d951a0babeab2fca55b0d61641","kind":"method","name":"builder","qualified_name":"com.example.torture::LombokBuilderBean::builder","file_path":"Torture.java","language":"java","start_line":122,"end_line":122,"start_column":6,"end_column":23,"docstring":"Lombok-generated (@Builder)","signature":"static LombokBuilderBean.LombokBuilderBeanBuilder builder()","visibility":"public","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":"[\"lombok\"]","type_parameters":null,"return_type":"LombokBuilderBeanBuilder"}
 {"id":"method:3c1ef2bb8932e71bb8cd70805321f3d9","kind":"method","name":"wire","qualified_name":"Handlers::wire","file_path":"TortureFnref.scala","language":"scala","start_line":4,"end_line":11,"start_column":2,"end_column":3,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
+{"id":"method:3cd2c40504f4b1126de8a947755f0ef3","kind":"method","name":"first","qualified_name":"Holder::first","file_path":"TortureReadsTypes.dart","language":"dart","start_line":43,"end_line":43,"start_column":2,"end_column":18,"docstring":null,"signature":"Report","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Report"}
 {"id":"method:3d1787adb831782b4a90413dd941412b","kind":"method","name":"draw","qualified_name":"DelegatedImpl::draw","file_path":"torture.scala","language":"scala","start_line":93,"end_line":93,"start_column":2,"end_column":29,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
 {"id":"method:3e0eaf75fa55d6bb243377f25e7b18b2","kind":"method","name":"size","qualified_name":"Stack::size","file_path":"torture.R","language":"r","start_line":108,"end_line":108,"start_column":4,"end_column":43,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:3ebd8c2e49a2f6efdd1ad6abc288756c","kind":"method","name":"impl","qualified_name":"com.example.torture::AbstractK::impl","file_path":"torture.kt","language":"kotlin","start_line":94,"end_line":94,"start_column":4,"end_column":28,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
@@ -1004,6 +1031,7 @@
 {"id":"method:44905846518cffb09fc9166f8d106c68","kind":"method","name":"onChange","qualified_name":"com.example.torture::TortureService::Listener::onChange","file_path":"Torture.java","language":"java","start_line":104,"end_line":104,"start_column":4,"end_column":38,"docstring":null,"signature":"void (TortureService svc)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:45400ba48a97635cce6f677b0bc5c7d5","kind":"method","name":"direct","qualified_name":"FieldDelegator::direct","file_path":"torture.tsx","language":"tsx","start_line":233,"end_line":233,"start_column":2,"end_column":54,"docstring":null,"signature":"(): void","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:469630de3eb535387238283632ec438a","kind":"method","name":"mixGetter","qualified_name":"MixB::mixGetter","file_path":"torture.dart","language":"dart","start_line":180,"end_line":180,"start_column":2,"end_column":19,"docstring":null,"signature":"int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
+{"id":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"method","name":"label","qualified_name":"Grade::label","file_path":"TortureReadsTypes.dart","language":"dart","start_line":58,"end_line":58,"start_column":2,"end_column":18,"docstring":null,"signature":"String","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"String"}
 {"id":"method:49582b3391af850e6cbf9949cb271324","kind":"method","name":"Sum","qualified_name":"Torture.Alpha::TortureClass::Sum","file_path":"Torture.cs","language":"csharp","start_line":64,"end_line":64,"start_column":8,"end_column":43,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:497e633467f4ecfd06e7b01406b32d51","kind":"method","name":"save!","qualified_name":"Documented::save!","file_path":"torture.rb","language":"ruby","start_line":90,"end_line":90,"start_column":2,"end_column":16,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:49ef12db2b51cf77b001a38cd46fe1a5","kind":"method","name":"value","qualified_name":"TraitFirst::value","file_path":"ScalaCompanions.scala","language":"scala","start_line":8,"end_line":8,"start_column":2,"end_column":22,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
@@ -1015,11 +1043,13 @@
 {"id":"method:4bb5d05814447fac91ff47e4a0bbed53","kind":"method","name":"afteré","qualified_name":"Uni::afteré","file_path":"TortureMisc.scala","language":"scala","start_line":28,"end_line":28,"start_column":2,"end_column":35,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:4bbb7b395c5b43df152ebd75735c92d8","kind":"method","name":"settle","qualified_name":"Ledger::settle","file_path":"docstrings.py","language":"python","start_line":27,"end_line":31,"start_column":4,"end_column":16,"docstring":"Method comment.\n\nSettle the ledger.","signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:4c12c220b173bf69f6acfffb5e4686de","kind":"method","name":"size","qualified_name":"BaseService::size","file_path":"torture.tsx","language":"tsx","start_line":48,"end_line":50,"start_column":2,"end_column":3,"docstring":null,"signature":"(): number","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:4da489ebd8c02fe5877b587c9b2c8b67","kind":"method","name":"bump","qualified_name":"Scored::bump","file_path":"TortureReadsTypes.dart","language":"dart","start_line":23,"end_line":23,"start_column":2,"end_column":12,"docstring":null,"signature":"int ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"method:4ded2dad46105109fea4dc9008086e45","kind":"method","name":"Single","qualified_name":"Torture.Alpha::TortureClass::Single","file_path":"Torture.cs","language":"csharp","start_line":141,"end_line":141,"start_column":8,"end_column":53,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Task"}
 {"id":"method:4e2dcce2a08ccc87afdd0c6b45fe1771","kind":"method","name":"compute","qualified_name":"com.example.torture::TortureService::compute","file_path":"Torture.java","language":"java","start_line":66,"end_line":66,"start_column":2,"end_column":34,"docstring":null,"signature":"void ()","visibility":"private","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:4edc73b268e7bca2ee297f68aa3b5a32","kind":"method","name":"this","qualified_name":"WidgetS::this","file_path":"torture.scala","language":"scala","start_line":48,"end_line":48,"start_column":2,"end_column":27,"docstring":null,"signature":"()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:4eff5ea8a786b81000bb90e60507d9ef","kind":"method","name":"make","qualified_name":"Widget::make","file_path":"TortureMini.dart","language":"dart","start_line":47,"end_line":47,"start_column":2,"end_column":22,"docstring":null,"signature":"Widget ()","visibility":"public","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Widget"}
 {"id":"method:4fcd52c7c720267b0a4cf6b9515e3e1f","kind":"method","name":"caller","qualified_name":"Action::caller","file_path":"TortureCtors.dart","language":"dart","start_line":21,"end_line":26,"start_column":2,"end_column":15,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:50009f5bae9675f86354f88f05674b16","kind":"method","name":"high","qualified_name":"ReportX::high","file_path":"TortureReadsTypes.dart","language":"dart","start_line":7,"end_line":7,"start_column":2,"end_column":15,"docstring":null,"signature":"bool","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"bool"}
 {"id":"method:5066dc69ba3ae94e164d9fc751bbc008","kind":"method","name":"request","qualified_name":"Session::request","file_path":"torture.swift","language":"swift","start_line":22,"end_line":30,"start_column":2,"end_column":3,"docstring":"method doc","signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"DataRequest"}
 {"id":"method:50795ff0a13bebd8320c09d5fe8e2698","kind":"method","name":"Compute","qualified_name":"Torture.Alpha::TortureClass::Compute","file_path":"Torture.cs","language":"csharp","start_line":71,"end_line":71,"start_column":8,"end_column":55,"docstring":null,"signature":null,"visibility":"private","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:51799b32d3d9fffc601ddaa5e68cd56a","kind":"method","name":"cbTarget","qualified_name":"NamedArgs::cbTarget","file_path":"TortureGiven.scala","language":"scala","start_line":22,"end_line":22,"start_column":2,"end_column":27,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
@@ -1072,6 +1102,7 @@
 {"id":"method:7c3c56551ade35afe1db77ac0a366e73","kind":"method","name":"over","qualified_name":"com.example.torture::OpenBase::over","file_path":"torture.kt","language":"kotlin","start_line":98,"end_line":98,"start_column":4,"end_column":22,"docstring":null,"signature":"()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:7d23fed280253ae0540584261ccad3be","kind":"method","name":"PP","qualified_name":"Torture.Alpha::TortureClass::PP","file_path":"Torture.cs","language":"csharp","start_line":60,"end_line":60,"start_column":8,"end_column":39,"docstring":null,"signature":null,"visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:7d5eac3e4b8be20f0d31544fbeb06f59","kind":"method","name":"on_stop","qualified_name":"M.callbacks::on_stop","file_path":"torture.lua","language":"lua","start_line":75,"end_line":77,"start_column":15,"end_column":4,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:7d5ee6ac8b49ce375f19dc27d0484e80","kind":"method","name":"load","qualified_name":"Config::load","file_path":"TortureReadsTypes.dart","language":"dart","start_line":80,"end_line":80,"start_column":2,"end_column":13,"docstring":null,"signature":"void ()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:7e714128b5b3c81a4e4f571a142197ba","kind":"method","name":"Widget","qualified_name":"app::Widget::Widget","file_path":"torture-macros-ctors.cpp","language":"cpp","start_line":28,"end_line":28,"start_column":0,"end_column":41,"docstring":null,"signature":"()","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:7fe7437d650d086d067a7cc00ec38cca","kind":"method","name":"hint","qualified_name":"Render::hint","file_path":"torture.rs","language":"rust","start_line":43,"end_line":45,"start_column":4,"end_column":5,"docstring":null,"signature":"(&self) -> Size","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Size"}
 {"id":"method:80200e91146fd1e5e21c07e28e5de064","kind":"method","name":"TortureClass","qualified_name":"Torture.Alpha::TortureClass::TortureClass","file_path":"Torture.cs","language":"csharp","start_line":54,"end_line":54,"start_column":8,"end_column":75,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -1085,6 +1116,7 @@
 {"id":"method:8483571327ac38d3149266645da49b87","kind":"method","name":"wire","qualified_name":"H2::wire","file_path":"TortureFnref.scala","language":"scala","start_line":20,"end_line":25,"start_column":2,"end_column":3,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
 {"id":"method:84b1066798bf4890531cf6d4cd0b61b2","kind":"method","name":"make","qualified_name":"AFError::make","file_path":"torture.swift","language":"swift","start_line":49,"end_line":49,"start_column":2,"end_column":56,"docstring":null,"signature":null,"visibility":"internal","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"AFError"}
 {"id":"method:8548d1a1ae6a218367c89732ef65fd41","kind":"method","name":"instance","qualified_name":"ObjectFirst::instance","file_path":"ScalaCompanions.scala","language":"scala","start_line":5,"end_line":5,"start_column":2,"end_column":25,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
+{"id":"method:85900113e22446c44e33f53abe4c7c18","kind":"method","name":"instance","qualified_name":"Config::instance","file_path":"TortureReadsTypes.dart","language":"dart","start_line":78,"end_line":78,"start_column":2,"end_column":28,"docstring":null,"signature":"Config","visibility":"public","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Config"}
 {"id":"method:87061ec6d836f4168578a67c784dad64","kind":"method","name":"mdLoad","qualified_name":"MarkdownPaths::mdLoad","file_path":"torture.scala","language":"scala","start_line":191,"end_line":191,"start_column":2,"end_column":59,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
 {"id":"method:87219976feb420ee1a686ba7a6e03a5e","kind":"method","name":"build","qualified_name":"Documented::build","file_path":"torture.rb","language":"ruby","start_line":79,"end_line":81,"start_column":2,"end_column":5,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:88bfea3c2c3d7faeeffc2b9cb2cba9f9","kind":"method","name":"Hook","qualified_name":"Torture.Alpha::PartialHost::Hook","file_path":"Torture.cs","language":"csharp","start_line":156,"end_line":156,"start_column":39,"end_column":62,"docstring":null,"signature":null,"visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -1166,6 +1198,7 @@
 {"id":"method:c110125aafb6f55fd4ab1f21a2cf37cb","kind":"method","name":"twice","qualified_name":"RichIntS::twice","file_path":"torture.scala","language":"scala","start_line":120,"end_line":120,"start_column":2,"end_column":24,"docstring":null,"signature":": Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:c19898b8b84cce6cc2b80007d1b6f588","kind":"method","name":"from","qualified_name":"FileSource::from","file_path":"torture.rs","language":"rust","start_line":172,"end_line":174,"start_column":4,"end_column":5,"docstring":null,"signature":"(n: u32) -> Self","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"self"}
 {"id":"method:c226448f9903a610ae764b0916837387","kind":"method","name":"color","qualified_name":"App\\Services::Suit::color","file_path":"torture.php","language":"php","start_line":204,"end_line":207,"start_column":4,"end_column":5,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:c229dd8ed310e44c2174e38f3c041371","kind":"method","name":"read","qualified_name":"Holder::read","file_path":"TortureReadsTypes.dart","language":"dart","start_line":45,"end_line":48,"start_column":2,"end_column":30,"docstring":null,"signature":"int (Holder h, Report r)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"method:c23fa4bf093e39adb2380b0956f5768b","kind":"method","name":"getToString","qualified_name":"com.example.torture::LombokBean::getToString","file_path":"Torture.java","language":"java","start_line":114,"end_line":114,"start_column":17,"end_column":25,"docstring":"Lombok-generated (@Data)","signature":"String getToString()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":"[\"lombok\"]","type_parameters":null,"return_type":"String"}
 {"id":"method:c258a0b05b483c359d1bcdc264fb10b8","kind":"method","name":"TargetCb","qualified_name":"Torture.Alpha::TortureClass::TargetCb","file_path":"Torture.cs","language":"csharp","start_line":70,"end_line":70,"start_column":8,"end_column":47,"docstring":null,"signature":null,"visibility":"private","is_exported":0,"is_async":0,"is_static":1,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:c2941fd36a5272d8c67bd8435f681fb0","kind":"method","name":"target_cb","qualified_name":"Documented::target_cb","file_path":"torture.rb","language":"ruby","start_line":115,"end_line":115,"start_column":2,"end_column":20,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -1199,6 +1232,7 @@
 {"id":"method:dfc92724bc8e56ce4fffe93fa68a9d43","kind":"method","name":"<anonymous>","qualified_name":"WidgetT::<anonymous>","file_path":"torture.dart","language":"dart","start_line":143,"end_line":143,"start_column":2,"end_column":31,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:dfcda32ca1d2265926bb0271ff5de7e6","kind":"method","name":"create","qualified_name":"ObjectFirst::create","file_path":"ScalaCompanions.scala","language":"scala","start_line":2,"end_line":2,"start_column":2,"end_column":45,"docstring":null,"signature":"(): ObjectFirst","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"ObjectFirst"}
 {"id":"method:e05bd15d7804605167b8fadd29a26f6b","kind":"method","name":"push","qualified_name":"FieldDelegator::push","file_path":"torture.tsx","language":"tsx","start_line":232,"end_line":232,"start_column":2,"end_column":81,"docstring":null,"signature":"(msg: string): void","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:e0a8a040d70ccfd94ca5a46979094dae","kind":"method","name":"size2","qualified_name":"Map::size2","file_path":"TortureReadsTypes.dart","language":"dart","start_line":19,"end_line":19,"start_column":2,"end_column":15,"docstring":null,"signature":"int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"method:e13588704c75e83833678ebaf5efcf3a","kind":"method","name":"pm","qualified_name":"Late::pm","file_path":"torture.R","language":"r","start_line":139,"end_line":139,"start_column":16,"end_column":40,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:e1784780370a76048ebe0d56ffbd60d1","kind":"method","name":"stm","qualified_name":"SelfTyped::stm","file_path":"TortureMisc.scala","language":"scala","start_line":5,"end_line":5,"start_column":2,"end_column":20,"docstring":null,"signature":"(): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:e20a7ba4db91a5635fcd83cfeb744be8","kind":"method","name":"other","qualified_name":"Holder::other","file_path":"TortureDoubleWalk.dart","language":"dart","start_line":26,"end_line":26,"start_column":2,"end_column":16,"docstring":null,"signature":"()","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Holder"}
@@ -1229,7 +1263,9 @@
 {"id":"method:f3482e937ba1d2aedef0d9ec82048058","kind":"method","name":"unionRet","qualified_name":"App\\Services::Documented::unionRet","file_path":"torture.php","language":"php","start_line":74,"end_line":77,"start_column":4,"end_column":5,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:f3fde874549b91346944936e21f1c607","kind":"method","name":"bare_protected_is_invisible_so_still_public","qualified_name":"Documented::bare_protected_is_invisible_so_still_public","file_path":"torture.rb","language":"ruby","start_line":113,"end_line":113,"start_column":2,"end_column":54,"docstring":null,"signature":null,"visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:f73f31bd6cc45134433935ad6eaae9f9","kind":"method","name":"Widget","qualified_name":"app::Widget::Widget","file_path":"torture-macros-ctors.cpp","language":"cpp","start_line":21,"end_line":21,"start_column":2,"end_column":51,"docstring":null,"signature":"(int a, int b = 2)","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
+{"id":"method:f93cac5b4e9fd958cce4400d8a1fb21a","kind":"method","name":"total","qualified_name":"ListX::total","file_path":"TortureReadsTypes.dart","language":"dart","start_line":11,"end_line":11,"start_column":2,"end_column":15,"docstring":null,"signature":"int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"int"}
 {"id":"method:fb3814b6e956f06c3746e1758bfb591d","kind":"method","name":"draw","qualified_name":"Drawable::draw","file_path":"torture.scala","language":"scala","start_line":81,"end_line":81,"start_column":2,"end_column":18,"docstring":null,"signature":"(): Unit","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Unit"}
+{"id":"method:fbb2a0dca224ce63879bc13f1b316257","kind":"method","name":"name","qualified_name":"Config::name","file_path":"TortureReadsTypes.dart","language":"dart","start_line":79,"end_line":79,"start_column":2,"end_column":17,"docstring":null,"signature":"String","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"String"}
 {"id":"method:fbe990aa0f9630ab6f709c19c88d51da","kind":"method","name":"__init__","qualified_name":"Service::__init__","file_path":"torture.py","language":"python","start_line":16,"end_line":19,"start_column":4,"end_column":24,"docstring":null,"signature":"(self, registry)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"method:fc1ea66db1e4dc356f13473bb45874aa","kind":"method","name":"compareTo","qualified_name":"com.example.torture::SubK::compareTo","file_path":"torture.kt","language":"kotlin","start_line":103,"end_line":103,"start_column":4,"end_column":48,"docstring":null,"signature":"(other: SubK): Int","visibility":"public","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":"Int"}
 {"id":"method:fc93d61b2caa73e9feea003464e6332d","kind":"method","name":"render","qualified_name":"Widget::render","file_path":"torture.rs","language":"rust","start_line":57,"end_line":59,"start_column":4,"end_column":5,"docstring":null,"signature":"(&self)","visibility":"private","is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -1486,7 +1522,7 @@
 {"id":"variable:fb450996c12f335b36201ead67a34f64","kind":"variable","name":"INIT_MAP","qualified_name":"INIT_MAP","file_path":"torture.py","language":"python","start_line":54,"end_line":54,"start_column":0,"end_column":26,"docstring":null,"signature":"= {\"a\": helper()}","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"variable:feb330d554c5d0caaa8978323a006e52","kind":"variable","name":"MD_BARE","qualified_name":"MD_BARE","file_path":"torture.rb","language":"ruby","start_line":238,"end_line":238,"start_column":0,"end_column":21,"docstring":null,"signature":"= 'README.md'","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"variable:fedacda34e94b85718ac655a74368326","kind":"variable","name":"okG","qualified_name":"okG","file_path":"torture.lua","language":"lua","start_line":12,"end_line":12,"start_column":6,"end_column":9,"docstring":null,"signature":"= pcall(require, \"app.guarded\")","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-== edges (1915)
+== edges (1994)
 {"source":"class:0083dc18baa2b629e8572db20ba2b464","target":"class:25244cbdbe3e9bc720df9fc4d54fac0a","kind":"extends","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"app::Config\"}","line":98,"col":35,"provenance":null}
 {"source":"class:0083dc18baa2b629e8572db20ba2b464","target":"method:0795ac46f5bef3826c20039a05014ebc","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:0083dc18baa2b629e8572db20ba2b464","target":"method:35a476809e2727e80d7f2c8c404180b2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1521,6 +1557,7 @@
 {"source":"class:1092bade09d1c725d7704d87d0bc625f","target":"method:c110125aafb6f55fd4ab1f21a2cf37cb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:129f932b07791059905bc786775e5dff","target":"method:846b59388a77b469427475c32a0d11a3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:12b0fc1a5b8916f4876df49d6cd78ad7","target":"method:2482c6a39c7a71c514ac4eda10980efa","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:12b8092ee33506020a2ef69ffb0c942f","target":"method:f93cac5b4e9fd958cce4400d8a1fb21a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:184d52a70ca25ab02246ba53448afd84","target":"trait:09af11c47861285a512e31fce265f12b","kind":"extends","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Shape\"}","line":88,"col":21,"provenance":null}
 {"source":"class:185f6260a8d5b738c53be0accb2a4e19","target":"method:2ea1f4137a11a0863dc001320a6553d4","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:185f6260a8d5b738c53be0accb2a4e19","target":"method:56abbc29e06f18840ab8e081a5955345","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1563,13 +1600,18 @@
 {"source":"class:326854f65c2a15980f69f2865639f179","target":"method:ec83fe16ac1870d3e893570e44255c4f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:326854f65c2a15980f69f2865639f179","target":"method:f3fde874549b91346944936e21f1c607","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:326854f65c2a15980f69f2865639f179","target":"variable:6adfcec1106f14a610956b32cf60e621","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:356c00d566162a90b9ef8d47f4558821","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":58,"col":23,"provenance":null}
 {"source":"class:356c00d566162a90b9ef8d47f4558821","target":"method:212bbb3d2db529e2eb6e8fdd590a7e89","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:3855a6c5c93ad351ca38fee0e60e9a15","target":"method:5e9c7099c858cf0ee99178536643e9dd","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:3a28eaf257060c9ca775bebcb90ced61","target":"class:eef9d737bd923993abd33de93479edb9","kind":"implements","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"DrawT\"}","line":179,"col":22,"provenance":null}
 {"source":"class:3a28eaf257060c9ca775bebcb90ced61","target":"method:469630de3eb535387238283632ec438a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:4153f97369d1da3a6904d21acc03a599","target":"constant:37538675d8cf7487a68e75423fac3308","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:4153f97369d1da3a6904d21acc03a599","target":"constant:cf5aaa64e9d0f2840dff763fee34a693","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:4153f97369d1da3a6904d21acc03a599","target":"method:3cd2c40504f4b1126de8a947755f0ef3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:4153f97369d1da3a6904d21acc03a599","target":"method:c229dd8ed310e44c2174e38f3c041371","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:4cc0425446f472c0e4e9753dc27b8c07","target":"method:b59d7afe66f3dcd485cc389d4cbc3f7e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:4df2c7657f7690146e6546cf5549bca1","target":"method:08409ee77511a69da8f6417c2412a279","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"class:508cb01a02b2ec3d871fa137a11a8863","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":28,"col":14,"provenance":null}
+{"source":"class:508cb01a02b2ec3d871fa137a11a8863","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":28,"col":14,"provenance":null}
 {"source":"class:508cb01a02b2ec3d871fa137a11a8863","target":"function:90dfd31b38bce7c624f55e473d86606e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:508cb01a02b2ec3d871fa137a11a8863","target":"method:033ac2ba34fbab2bc8e4448a87dd89ce","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:508cb01a02b2ec3d871fa137a11a8863","target":"method:e20a7ba4db91a5635fcd83cfeb744be8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1623,6 +1665,7 @@
 {"source":"class:65d5c81c60b7d34bc7538930f2e979ac","target":"method:3d1787adb831782b4a90413dd941412b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:65d5c81c60b7d34bc7538930f2e979ac","target":"trait:f91851c14912462ae9592cb13a51f3b1","kind":"extends","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Drawable\"}","line":92,"col":41,"provenance":null}
 {"source":"class:66085d60d16ebfd037ddd1bd9273a82e","target":"method:6915f37555573a844fad9f0204da57bc","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:6b651502aee682b15d27b25366e9addd","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":183,"col":24,"provenance":null}
 {"source":"class:6b651502aee682b15d27b25366e9addd","target":"method:90c9a17ee7d5f156fad1f6019f35abf7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:6b651502aee682b15d27b25366e9addd","target":"method:c5ebc8a6035cefc1d6ad34e086d7a66f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:6de82f58f1030c4395eed748ad033d4a","target":"method:6d7307466b96d91d4250060ab9832404","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1722,6 +1765,7 @@
 {"source":"class:a05b852b967a5bc3ff44512f23d3082f","target":"method:ff133c26e7e7d636b77122b6c9a5cd98","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:a689d35e6a3cf7ce25db3ca75198b4e9","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"extends","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":153,"col":23,"provenance":null}
 {"source":"class:a689d35e6a3cf7ce25db3ca75198b4e9","target":"method:e56906659412f1f464fdd82d5518f5de","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:a7406d8c57660dbb4fa7f571dbcdae30","target":"method:4da489ebd8c02fe5877b587c9b2c8b67","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:a7b34ad56c9fc903425f501a0cf34383","target":"class:0939ad4dcc3f8b9686a6f2915ddc27f6","kind":"extends","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Base\"}","line":59,"col":19,"provenance":null}
 {"source":"class:a7b34ad56c9fc903425f501a0cf34383","target":"method:ca8bb20195aa616a66dba20985a35fe8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:a7b34ad56c9fc903425f501a0cf34383","target":"method:d768a3f8cc0fe5ab53663ca7efd83d5f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1792,7 +1836,6 @@
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:b02eab5f6eaac34cea7b2d8b5f76f0bf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:b0857dfe91cdb9b6241e743372a66cdf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:c258a0b05b483c359d1bcdc264fb10b8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:c258a0b05b483c359d1bcdc264fb10b8","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"TargetCb\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":31,"col":50,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:c95640784c29e17ce4cab5df21da11a4","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:e3a8fd81bee3f156fa7af9c4f66a1329","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"method:e3a8fd81bee3f156fa7af9c4f66a1329","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"HandleThing\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":45,"col":27,"provenance":null}
@@ -1804,6 +1847,7 @@
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"property:65b1321e5f5780223e85efa4869b2dc1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"property:89ba9c99acdc22d8540e5b4d3d113086","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","target":"property:b907b8e69e94f2fd52096df43b482b7b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:c69c6543c54ab7a0b458fb438bff134b","target":"method:e0a8a040d70ccfd94ca5a46979094dae","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:c8152170cab61b2f6b9a42767e69dc2b","target":"class:d826bd49186de137733cb469dcb4790f","kind":"extends","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"ShapeT\"}","line":171,"col":22,"provenance":null}
 {"source":"class:cbfbe4bcce1afae91632ad45c072d862","target":"method:447f4e484b5e4bdfd326e287d5616783","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:cef28fda15c7702f8b1441177fbb8e99","target":"method:2a13119ec1710ee8164bbfce63828d72","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1853,6 +1897,9 @@
 {"source":"class:f3cffc9c9f0e874254eeb3f1d5991355","target":"method:d256def55123d395291c9558611c5d00","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:f3cffc9c9f0e874254eeb3f1d5991355","target":"method:ddb060d6aff7b30b2ec58ad67c7db95a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:f8b6f1cf76adb83fb455575fe0dbb4b1","target":"method:6a4e21b6c6d90666a239ba82af310544","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:f8e582f520a44132c2813d50c7bfdca0","target":"method:7d5ee6ac8b49ce375f19dc27d0484e80","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:f8e582f520a44132c2813d50c7bfdca0","target":"method:85900113e22446c44e33f53abe4c7c18","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:f8e582f520a44132c2813d50c7bfdca0","target":"method:fbb2a0dca224ce63879bc13f1b316257","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"class:3a28eaf257060c9ca775bebcb90ced61","kind":"implements","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"MixB\"}","line":114,"col":39,"provenance":null}
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"class:80c517945226d2adf9a4e539931fa2b7","kind":"implements","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"MixA\"}","line":114,"col":33,"provenance":null}
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"class:e5944900904dc14294b70173f1c1efa9","kind":"extends","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"BaseT\"}","line":114,"col":22,"provenance":null}
@@ -1872,15 +1919,23 @@
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"method:dbedc27f10579fd7567f0cbda93fb625","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"method:dfc92724bc8e56ce4fffe93fa68a9d43","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:fa355652331eee519e97b9ef15a61b2d","target":"method:e721803e0b4da8cdc52d9c909006f907","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:fb8b7ad04b69b1df82188d572b8f3cbd","target":"method:0b2c376e9c02768528bfd80dc00f83f0","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"class:fd45ec038bce9c1fca7887867994d28e","target":"method:50009f5bae9675f86354f88f05674b16","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"constant:123256b71396a225b330e3b55bea89a6","target":"constant:e75db0b69c824ca669e58e103a593bbd","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"constant:15f84901ff87cded61f155103e042937","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
+{"source":"constant:15f84901ff87cded61f155103e042937","target":"function:17dec1e0fa812cc39e6fe41decdff8ce","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"constant:2473fbfe8d2893986c919a78a4a7903b","target":"function:9c6b1a068cb18a0a7ace98d373174dd9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"constant:24ff749e7e0b74dc051099e855860b0e","target":"class:c2dfee99ca5361d8de7ae7de6858d0bf","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetK\",\"refKind\":\"calls\"}","line":49,"col":27,"provenance":null}
 {"source":"constant:2ae565e022daebc1e27ec2ec6f991d63","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"constant:2c9b8b9f0fc59dd9b622aa94a370dd2e","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
+{"source":"constant:2c9b8b9f0fc59dd9b622aa94a370dd2e","target":"function:09bc8c99cfea997f2b613b053cdeacc9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"constant:4ebb21380c0cb66bc94e2c5f2845e3df","target":"function:979bff7c3a085aa9a472f40b9f28b55c","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"topLevel\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":200,"col":27,"provenance":null}
 {"source":"constant:506c9329529fa57334ca3b32d6d35f33","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"constant:50a159fca69ad0a9d7ec617a78f84113","target":"constant:e400c32e94629da31bbd3b0d7f36ed66","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"constant:636d3b935593bea7be50c7de2223d0b8","target":"class:c2dfee99ca5361d8de7ae7de6858d0bf","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetK\",\"refKind\":\"calls\"}","line":83,"col":21,"provenance":null}
+{"source":"constant:6686ddc565c2b54fb5c65110bbf1ffeb","target":"function:c97d0d5969167c7958098f13defe9e08","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"constant:7aa3a747ae01bf6a1dd64495f3237ef0","target":"function:01bcb742f299ec5ccc188b8a5f1937b5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"constant:7aa3a747ae01bf6a1dd64495f3237ef0","target":"function:1e88e4e4512fb430843aefcd401baa63","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"constant:98916fa0752fd55f03013b3b21a20814","target":"function:5b434632abf9fbeb07e0a630ec66d9d3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"caller\"}","line":53,"col":31,"provenance":null}
 {"source":"constant:b88e9d23d2e8e5e79a944902c181bb40","target":"function:5b434632abf9fbeb07e0a630ec66d9d3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"caller\"}","line":54,"col":25,"provenance":null}
 {"source":"constant:bbefb11d3b9821ad30964edca510796b","target":"method:e6d61456bc02617e3b7dcad6aa4e8517","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"delta\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":26,"col":24,"provenance":null}
@@ -1892,6 +1947,10 @@
 {"source":"enum:17acc88a5112f35e068a0eed30bf9761","target":"enum_member:0e3904a0b597a2bc7b7c817ce48fd3ec","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"enum:17acc88a5112f35e068a0eed30bf9761","target":"enum_member:1bda4bbb176b36d0d3af0f4179f51dde","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"enum:17acc88a5112f35e068a0eed30bf9761","target":"enum_member:cfbac78df5628da4b4b0bd8697397ba3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"enum:185db2f09770db6e298b5452894a6826","target":"constant:1d780ceba0f753b7c3c7fd7c16cd2ebd","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"enum:185db2f09770db6e298b5452894a6826","target":"enum_member:f2caf0f3eea3fa73f2cffde65f69ebca","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"enum:185db2f09770db6e298b5452894a6826","target":"enum_member:f7578cc20dffcf6ba3743ddcdadbd871","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"enum:185db2f09770db6e298b5452894a6826","target":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"enum:1bea39061b126572ffb641ee6a98eab8","target":"enum_member:46968634b306fc0b82eab61099ef1ecf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"enum:1bea39061b126572ffb641ee6a98eab8","target":"enum_member:d4c10b3b5d571f5424ed73030c053433","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"enum:1bea39061b126572ffb641ee6a98eab8","target":"enum_member:fb8f2e100e4cd5ff76e6734c9da15ed7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -1967,6 +2026,7 @@
 {"source":"enum_member:9c49047d290adb33b13405848e75c8a9","target":"method:384f80034454bc14e1da78fe6b3d7fe8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"field:9b8892c2103e8d26a2d169b562508cad","target":"method:830203603e74b357be75b6353bc5377e","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"helper\"}","line":26,"col":45,"provenance":null}
 {"source":"field:aad418c7800fdc96bf64e4ae2e8fbbbf","target":"class:c4ed77533cd6f14e451fe7962f484e20","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"field:f55a20c13201bd32369db7de5edde8d0","target":"method:c258a0b05b483c359d1bcdc264fb10b8","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"TargetCb\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":31,"col":50,"provenance":null}
 {"source":"file:ScalaCompanions.scala","target":"class:732f40a08bad7780ec21fd2cecf39a1f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:ScalaCompanions.scala","target":"function:25ffa07c15bde4ba9c80922e52dae992","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:ScalaCompanions.scala","target":"module:2e6745c0540c4440974994e84f20e21f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2002,7 +2062,7 @@
 {"source":"file:TortureDocs.scala","target":"function:b2796746ed44ab5bef76be2c9278aac2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureDoubleWalk.dart","target":"class:00e4c67aff13a714886744f6829e0cea","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureDoubleWalk.dart","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:TortureDoubleWalk.dart","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
+{"source":"file:TortureDoubleWalk.dart","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
 {"source":"file:TortureDoubleWalk.dart","target":"class:91b0e22506cdf7057991491a229a935a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureDoubleWalk.dart","target":"constant:9773ec6a808b74df235322de86667f4b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureDoubleWalk.dart","target":"constant:b856b01947367087fe9201022f432145","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2085,6 +2145,27 @@
 {"source":"file:TortureMisc.scala","target":"trait:ca2deab8f9a47105663c9a7c93f6f5b1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureModule.module","target":"constant:ab9a69defebf29e9e42d83281a6bd3f4","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureModule.module","target":"function:8e3f1d5949de2e2522e6970c3fe41389","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:12b8092ee33506020a2ef69ffb0c942f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":121,"col":14,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:a7406d8c57660dbb4fa7f571dbcdae30","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:b5b796de9cfabee820637f77a1f1927a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:c69c6543c54ab7a0b458fb438bff134b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:fb8b7ad04b69b1df82188d572b8f3cbd","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"class:fd45ec038bce9c1fca7887867994d28e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"constant:030c0c1a5b7a383bafdd1693b847ff66","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"constant:8d5b7c0112ba1bd860a9b742a094954c","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"constant:bc99115ab2732b88425e23aeb159d283","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"enum:185db2f09770db6e298b5452894a6826","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"function:19a0e59e96f62184134d9ca1af9b25c5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"function:26ac3e78238b037efdce6f5fac049878","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"function:40126a800d9910002cd20fdc95dc22eb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"import:257c713f4b7c95fbd46562b2b32c61e0","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"import:391f5cb302fdbbce4e955fc4f7d484a8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"import:391f5cb302fdbbce4e955fc4f7d484a8","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"package:app/model.dart\"}","line":2,"col":0,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"import:391f5cb302fdbbce4e955fc4f7d484a8","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"package:app/model.dart\"}","line":3,"col":0,"provenance":null}
+{"source":"file:TortureReadsTypes.dart","target":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"label\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":130,"col":59,"provenance":null}
 {"source":"file:TortureScript.kts","target":"constant:cbfd8ab7d071c783f0637adc41e7c3f2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:TortureScript.kts","target":"function:4a3975d8df3fa9f9bb36bbc8b911c5c7","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"scripted\"}","line":4,"col":0,"provenance":null}
 {"source":"file:TortureScript.kts","target":"function:4a3975d8df3fa9f9bb36bbc8b911c5c7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2419,8 +2500,6 @@
 {"source":"file:torture.js","target":"function:74ce6558d97f39bc8983f664f43cd1e0","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.js","target":"function:89eb62cab0f7db165c4b2be1bc315229","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.js","target":"function:9880cd7d8361fedda327ff0eb3eb37df","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.js","target":"function:9c6b1a068cb18a0a7ace98d373174dd9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.js","target":"function:c97d0d5969167c7958098f13defe9e08","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.js","target":"function:d6218e84934f1b87a8e3b9a46d44010a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.js","target":"function:e0d43eb7157ab1edf231fcda49c6c6e8","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"hiddenInner\"}","line":46,"col":2,"provenance":null}
 {"source":"file:torture.js","target":"function:e0d43eb7157ab1edf231fcda49c6c6e8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2781,9 +2860,7 @@
 {"source":"file:torture.tsx","target":"constant:d5e3d0dfe995031d68d68c2a96841bbe","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"enum:1128d72c1fefa71e49101b448055e477","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:00765ec56fe71745c9d59a36a20c8d9e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"function:01bcb742f299ec5ccc188b8a5f1937b5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:0499cc5aef87518260d547d716f829ce","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"function:1e88e4e4512fb430843aefcd401baa63","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:452af9ab50e94846870ef417047aa76b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:789aa380e6cdaa4d23fe1c4da366e785","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:89b5279cd19a084e8974e1c0985c27d9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2818,18 +2895,40 @@
 {"source":"function:04a85402edcdb9f51e099ea510476ccf","target":"function:5b434632abf9fbeb07e0a630ec66d9d3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"caller\"}","line":57,"col":8,"provenance":null}
 {"source":"function:071bd15751854933bac820b5850a2641","target":"class:89a6327dc2e1da4b990c740c891aaa96","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Session\"}","line":131,"col":41,"provenance":null}
 {"source":"function:08bb60eead5364c3bf26d67ebca2639d","target":"method:a7bb2d169f4639f007c84fb337802e83","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"a\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":24,"col":11,"provenance":null}
+{"source":"function:09bc8c99cfea997f2b613b053cdeacc9","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"function:0a0fd41add7ee911e628516232e13b88","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":165,"col":16,"provenance":null}
 {"source":"function:0ee9c05170d819c3032465e6e84710b8","target":"constant:98a7f8125065894cb5ec63674045beb3","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
+{"source":"function:0f620fa18b10178b2f19c93a79ca33eb","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":31,"col":11,"provenance":null}
+{"source":"function:0f620fa18b10178b2f19c93a79ca33eb","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":34,"col":17,"provenance":null}
+{"source":"function:0f620fa18b10178b2f19c93a79ca33eb","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":35,"col":16,"provenance":null}
+{"source":"function:0f620fa18b10178b2f19c93a79ca33eb","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":36,"col":23,"provenance":null}
 {"source":"function:1003795ce01f45de4377d5de08061ef2","target":"class:1d0256477d1f6afcc95bae5017a7b7e6","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:1116b32a328c7f5fd04a16f5e6445a4a","target":"function:ee2e7cc2a6bf9bd51f97e8edc7b5012f","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"trailing\"}","line":243,"col":4,"provenance":null}
 {"source":"function:1116b32a328c7f5fd04a16f5e6445a4a","target":"function:ee2e7cc2a6bf9bd51f97e8edc7b5012f","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"trailing\"}","line":244,"col":4,"provenance":null}
-{"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
+{"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
 {"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"function:1932b46aef9b5a9c946962703eaf2c1c","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"localWithNew\"}","line":18,"col":14,"provenance":null}
 {"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"function:1932b46aef9b5a9c946962703eaf2c1c","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"function:21ca45d9f9601839f9b8698f898ae7d9","kind":"calls","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"localFn\"}","line":13,"col":9,"provenance":null}
 {"source":"function:112bb390a54043c8ee6b3ee94ba6c956","target":"function:21ca45d9f9601839f9b8698f898ae7d9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:1144fd3aac9231a341249e5320f6e942","target":"method:dbc683708e8c0217a76edc711cab984f","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"Widget.create\"}","line":50,"col":9,"provenance":null}
-{"source":"function:1932b46aef9b5a9c946962703eaf2c1c","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
+{"source":"function:17dec1e0fa812cc39e6fe41decdff8ce","target":"constant:61fd2650fddb0e3d5a7d5e67210d4c60","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
+{"source":"function:1932b46aef9b5a9c946962703eaf2c1c","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":15,"col":14,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":100,"col":14,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":83,"col":10,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\"}","line":87,"col":12,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\"}","line":92,"col":2,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"enum:185db2f09770db6e298b5452894a6826","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Grade\"}","line":83,"col":20,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"enum:185db2f09770db6e298b5452894a6826","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Grade\"}","line":88,"col":12,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"function:40126a800d9910002cd20fdc95dc22eb","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"nested\"}","line":105,"col":15,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"function:40126a800d9910002cd20fdc95dc22eb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:3cd2c40504f4b1126de8a947755f0ef3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"h.first\",\"refKind\":\"references\"}","line":85,"col":14,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:3cd2c40504f4b1126de8a947755f0ef3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"x.first\",\"refKind\":\"references\"}","line":100,"col":29,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"g.label\",\"refKind\":\"references\"}","line":89,"col":14,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"g.label\",\"refKind\":\"references\"}","line":99,"col":24,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:7d5ee6ac8b49ce375f19dc27d0484e80","kind":"calls","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"load\"}","line":92,"col":22,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:85900113e22446c44e33f53abe4c7c18","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"Config.instance\",\"refKind\":\"references\"}","line":87,"col":19,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:85900113e22446c44e33f53abe4c7c18","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"Config.instance\",\"refKind\":\"references\"}","line":92,"col":9,"provenance":null}
+{"source":"function:19a0e59e96f62184134d9ca1af9b25c5","target":"method:c229dd8ed310e44c2174e38f3c041371","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"instance-method\",\"refName\":\"h.read\"}","line":91,"col":8,"provenance":null}
 {"source":"function:1f9113c1936c681d582e2e8de8a47736","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":57,"col":29,"provenance":null}
 {"source":"function:1ff8eb433358524f81c9fa301bb39b42","target":"function:df2774b45646f4acb1867fa96cb169c6","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"innermost\"}","line":36,"col":4,"provenance":null}
 {"source":"function:1ff8eb433358524f81c9fa301bb39b42","target":"function:df2774b45646f4acb1867fa96cb169c6","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -2844,11 +2943,17 @@
 {"source":"function:24b796590d26da68a2429579e2f10a68","target":"method:84b1066798bf4890531cf6d4cd0b61b2","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"make\"}","line":169,"col":2,"provenance":null}
 {"source":"function:25ffa07c15bde4ba9c80922e52dae992","target":"method:9f69ad6ed915b053eadd3e76c6447de5","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"qualified-name\",\"refName\":\"Local.localMethod\"}","line":22,"col":2,"provenance":null}
 {"source":"function:25ffa07c15bde4ba9c80922e52dae992","target":"module:eabfa14f52f071291e8764cfaa007cd9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"function:26ac3e78238b037efdce6f5fac049878","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":121,"col":14,"provenance":null}
+{"source":"function:26ac3e78238b037efdce6f5fac049878","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":116,"col":12,"provenance":null}
+{"source":"function:26ac3e78238b037efdce6f5fac049878","target":"class:b5b796de9cfabee820637f77a1f1927a","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Family\",\"refKind\":\"calls\"}","line":118,"col":18,"provenance":null}
+{"source":"function:26ac3e78238b037efdce6f5fac049878","target":"class:b5b796de9cfabee820637f77a1f1927a","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Family\",\"refKind\":\"calls\"}","line":122,"col":24,"provenance":null}
+{"source":"function:26ac3e78238b037efdce6f5fac049878","target":"method:47bf6f0e13bbe1e2d647208346774b79","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"label\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":130,"col":59,"provenance":null}
 {"source":"function:31667d19df8f0e5cd5dfb03fb205a8d7","target":"function:112bb390a54043c8ee6b3ee94ba6c956","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"hostFn\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":78,"col":28,"provenance":null}
 {"source":"function:31667d19df8f0e5cd5dfb03fb205a8d7","target":"function:e8964fc209b38be74dcb7f6cf9f22ab8","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"seedValue\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":76,"col":11,"provenance":null}
 {"source":"function:37c390abd50c0167008655a9d88fe073","target":"function:6f1b9bec32998e16cfe282d768bf4888","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"topFn\"}","line":50,"col":9,"provenance":null}
 {"source":"function:38d7bae04a29fa8be9d0997ef3ccb42e","target":"constant:c16c1270c8b36ef2a45b0ab1edf2c720","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"function:3b5974da24c560449effd9d014e81123","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":6,"col":26,"provenance":null}
+{"source":"function:40126a800d9910002cd20fdc95dc22eb","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":101,"col":13,"provenance":null}
 {"source":"function:434fc66cc90ef59c01466d52e147b60a","target":"function:148b2a64a4ad451870ce9e7de7c95bfc","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"positional\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":25,"col":7,"provenance":null}
 {"source":"function:452af9ab50e94846870ef417047aa76b","target":"function:dd54d7d1bdb0ef2012631716e516c4a7","kind":"calls","metadata":"{\"synthesizedBy\":\"rtk-query\",\"via\":\"updateWidget\",\"registeredAt\":\"torture.tsx:184\"}","line":184,"col":null,"provenance":"heuristic"}
 {"source":"function:4c142f94bfc81f2dbaeb53322f651474","target":"function:a8c2c8f513bc437341958e1e409a8797","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"shadowed_reader\"}","line":128,"col":12,"provenance":null}
@@ -2882,12 +2987,11 @@
 {"source":"function:67d932bdf3c34d2917376709a0ecbac1","target":"method:c7043263906772fe28e231a57964c1b2","kind":"calls","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"load\"}","line":38,"col":18,"provenance":null}
 {"source":"function:692077921d04b315880bc35a0bc872a9","target":"function:d2fae347c5c9176a3642fc94640462a6","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"inner\"}","line":40,"col":11,"provenance":null}
 {"source":"function:692077921d04b315880bc35a0bc872a9","target":"function:d2fae347c5c9176a3642fc94640462a6","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"function:6a85d882c5450f2f3d882a290ae08fc8","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\",\"refKind\":\"calls\"}","line":39,"col":7,"provenance":null}
+{"source":"function:6a85d882c5450f2f3d882a290ae08fc8","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\",\"refKind\":\"calls\"}","line":39,"col":7,"provenance":null}
 {"source":"function:72926d28d8630ec83d6f5314cb2888c6","target":"function:64514e020343f839129de60fb3d0e82a","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"cb_a\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":82,"col":19,"provenance":null}
 {"source":"function:72926d28d8630ec83d6f5314cb2888c6","target":"function:fcd5e95c35b0d729f302762b3d2c7201","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"cb_b\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":83,"col":18,"provenance":null}
 {"source":"function:73eee5ec6b1c94268a4d9c40ef7f662f","target":"constant:e400c32e94629da31bbd3b0d7f36ed66","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"function:776ddd2f0dd066bab2295c09c8685d6a","target":"struct:0c309a8ed6f33456724d94ba73599e04","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":211,"col":12,"provenance":null}
-{"source":"function:776ddd2f0dd066bab2295c09c8685d6a","target":"struct:0c309a8ed6f33456724d94ba73599e04","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":216,"col":12,"provenance":null}
 {"source":"function:776ddd2f0dd066bab2295c09c8685d6a","target":"struct:0c309a8ed6f33456724d94ba73599e04","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":226,"col":10,"provenance":null}
 {"source":"function:776ddd2f0dd066bab2295c09c8685d6a","target":"struct:8dd22c4fc56baeba045e9bf82329d7eb","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Deep\"}","line":214,"col":15,"provenance":null}
 {"source":"function:776ddd2f0dd066bab2295c09c8685d6a","target":"struct:8dd22c4fc56baeba045e9bf82329d7eb","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Deep\"}","line":229,"col":15,"provenance":null}
@@ -2940,12 +3044,18 @@
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\",\"refKind\":\"calls\"}","line":74,"col":20,"provenance":null}
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":75,"col":13,"provenance":null}
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":79,"col":2,"provenance":null}
+{"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":90,"col":11,"provenance":null}
+{"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":93,"col":20,"provenance":null}
+{"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":94,"col":14,"provenance":null}
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"function:de3e7760a8bf304d54651b74e6589aa3","kind":"calls","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"localFn\"}","line":89,"col":9,"provenance":null}
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"function:de3e7760a8bf304d54651b74e6589aa3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:a1998a5fcada0a95b1aebb30d3f1222c","target":"method:2ec7b72739446515eb6fa0e9a847d996","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"qualified-name\",\"refName\":\"WidgetT.named\"}","line":79,"col":15,"provenance":null}
 {"source":"function:a8c2c8f513bc437341958e1e409a8797","target":"constant:45e137b8b2d4a1ce1d78ca783676e501","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"function:ab6308c2c4505606bd271827551f5081","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\",\"refKind\":\"calls\"}","line":22,"col":19,"provenance":null}
 {"source":"function:ab6308c2c4505606bd271827551f5081","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":23,"col":13,"provenance":null}
+{"source":"function:ab6308c2c4505606bd271827551f5081","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\"}","line":18,"col":2,"provenance":null}
+{"source":"function:ab6308c2c4505606bd271827551f5081","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\"}","line":19,"col":2,"provenance":null}
+{"source":"function:ab6308c2c4505606bd271827551f5081","target":"method:7d5ee6ac8b49ce375f19dc27d0484e80","kind":"calls","metadata":"{\"confidence\":0.85,\"resolvedBy\":\"qualified-name\",\"refName\":\"Config.load\"}","line":19,"col":13,"provenance":null}
 {"source":"function:ae77b9f848fb3b2cb309ca8e5667e81b","target":"function:0499cc5aef87518260d547d716f829ce","kind":"calls","metadata":"{\"synthesizedBy\":\"rtk-query\",\"via\":\"getWidget\",\"registeredAt\":\"torture.tsx:184\"}","line":184,"col":null,"provenance":"heuristic"}
 {"source":"function:b06c2d27fa49d5e97af860ffe032fbdd","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":49,"col":34,"provenance":null}
 {"source":"function:b06c2d27fa49d5e97af860ffe032fbdd","target":"class:fa355652331eee519e97b9ef15a61b2d","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"WidgetT\"}","line":49,"col":5,"provenance":null}
@@ -3100,6 +3210,8 @@
 {"source":"method:8483571327ac38d3149266645da49b87","target":"method:7231bc149b5bd7a542e2abad6e64605f","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"alpha\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":21,"col":17,"provenance":null}
 {"source":"method:8483571327ac38d3149266645da49b87","target":"method:77f181371bcfbbcf69325e830e407276","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"beta\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":22,"col":13,"provenance":null}
 {"source":"method:84b1066798bf4890531cf6d4cd0b61b2","target":"enum:1bea39061b126572ffb641ee6a98eab8","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"AFError\"}","line":49,"col":24,"provenance":null}
+{"source":"method:85900113e22446c44e33f53abe4c7c18","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\",\"refKind\":\"calls\"}","line":78,"col":38,"provenance":null}
+{"source":"method:85900113e22446c44e33f53abe4c7c18","target":"class:f8e582f520a44132c2813d50c7bfdca0","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Config\"}","line":78,"col":9,"provenance":null}
 {"source":"method:88f81485281dcc709b31f0d85a31de3b","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\",\"refKind\":\"calls\"}","line":51,"col":32,"provenance":null}
 {"source":"method:88f81485281dcc709b31f0d85a31de3b","target":"class:01a3945fa12793f1af9ac531aedcc8cd","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Widget\"}","line":51,"col":13,"provenance":null}
 {"source":"method:8ce5cf7b5413599d7a690c53b25e19f4","target":"method:4a6c7edee173aa89a12ddfe3decea41b","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"helper_count\"}","line":24,"col":33,"provenance":null}
@@ -3140,6 +3252,8 @@
 {"source":"method:bdff2ed091815c4e1268e7ac0a575bb0","target":"constant:f3f2f36c072cdfa3d41c0be651e605ce","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"method:c19898b8b84cce6cc2b80007d1b6f588","target":"struct:8af466b07dba0b708a3b1922902ab00a","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"FileSource\"}","line":173,"col":8,"provenance":null}
 {"source":"method:c19898b8b84cce6cc2b80007d1b6f588","target":"struct:8af466b07dba0b708a3b1922902ab00a","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"qualified-name\",\"refName\":\"Self\"}","line":172,"col":23,"provenance":null}
+{"source":"method:c229dd8ed310e44c2174e38f3c041371","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\",\"refKind\":\"calls\"}","line":46,"col":24,"provenance":null}
+{"source":"method:c229dd8ed310e44c2174e38f3c041371","target":"class:4153f97369d1da3a6904d21acc03a599","kind":"references","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":45,"col":11,"provenance":null}
 {"source":"method:c5ebc8a6035cefc1d6ad34e086d7a66f","target":"method:2e4aeb10e475574338a751e4d0356a88","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"render\"}","line":185,"col":10,"provenance":null}
 {"source":"method:ca160b191e7fb257769f213a8450ab4c","target":"function:a07d8ba50e32351d67a5892444ec6842","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"clamp_value\"}","line":29,"col":53,"provenance":null}
 {"source":"method:d089517f99bdd42860ded999d09f17da","target":"constant:7af11b36e8d4ddbbdc72a75e5d163a1f","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
@@ -3160,7 +3274,7 @@
 {"source":"method:ec47a62d06708c1f02fc28a967649234","target":"class:63dc577067a8afeda1988d7d6845f698","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Table\"}","line":13,"col":8,"provenance":null}
 {"source":"method:ec47a62d06708c1f02fc28a967649234","target":"constant:d511ceb61ad27511c413ca485ac10dc1","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
 {"source":"method:f141417138453a1e069cb41778364534","target":"constant:8c40c7aa0ee817d211362e5149ec2220","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
-{"source":"method:f19b0653b3199dcdafc81fb0184920f4","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":28,"col":14,"provenance":null}
+{"source":"method:f19b0653b3199dcdafc81fb0184920f4","target":"class:508cb01a02b2ec3d871fa137a11a8863","kind":"instantiates","metadata":"{\"confidence\":0.4,\"resolvedBy\":\"exact-match\",\"refName\":\"Holder\"}","line":28,"col":14,"provenance":null}
 {"source":"method:f19b0653b3199dcdafc81fb0184920f4","target":"function:90dfd31b38bce7c624f55e473d86606e","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"methodLocal\"}","line":32,"col":15,"provenance":null}
 {"source":"method:f19b0653b3199dcdafc81fb0184920f4","target":"function:90dfd31b38bce7c624f55e473d86606e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"method:fb3814b6e956f06c3746e1758bfb591d","target":"method:3d1787adb831782b4a90413dd941412b","kind":"calls","metadata":"{\"synthesizedBy\":\"interface-impl\",\"via\":\"draw\",\"registeredAt\":\"torture.scala:93\"}","line":81,"col":null,"provenance":"heuristic"}
@@ -3342,6 +3456,7 @@
 {"source":"namespace:ef7fefe9d27ae48c94786cc9970c3f0d","target":"import:d01aa110302e3842ac3db1f01e44fd49","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"namespace:ef7fefe9d27ae48c94786cc9970c3f0d","target":"interface:99971b764b215730f05d3e4892162ca7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"namespace:ef7fefe9d27ae48c94786cc9970c3f0d","target":"interface:fa3f5e7c386fbbd874e9de21b328cc5c","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"property:20f555c9e314ec2302940348c2df150c","target":"method:e3a8fd81bee3f156fa7af9c4f66a1329","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"HandleThing\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":40,"col":51,"provenance":null}
 {"source":"property:87ad97102df5cdb838029cb7b90572b8","target":"interface:a05baa699fc9324830859524f09604c9","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Shape\"}","line":69,"col":16,"provenance":null}
 {"source":"property:8d77cc83911330cefc977b743058ac83","target":"class:0ea6b25874f3f2740efdf3fe3093b554","kind":"instantiates","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"FieldDelegator\"}","line":238,"col":12,"provenance":null}
 {"source":"struct:08acded06d18f155491d1e66e44ba80b","target":"method:8e3b4ccb2740ca14891dcbe0d6503ef2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -3402,7 +3517,7 @@
 {"source":"variable:36e608fb368763b7f8a74a69f477cec7","target":"function:692077921d04b315880bc35a0bc872a9","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"view\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":49,"col":24,"provenance":null}
 {"source":"variable:6b7262d2883839c6f601126f4dd59e9b","target":"function:d8f9c30c4ee99a9302a150e8eed67acf","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"TargetCb\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":14,"col":9,"provenance":null}
 {"source":"variable:788d75a828c79f9847e0be0e2b73a196","target":"variable:8fef25ea8abe486ee94190ed47c3644b","kind":"references","metadata":"{\"valueRef\":true}","line":null,"col":null,"provenance":null}
-== refs (1301)
+== refs (1406)
 {"from_node_id":"class:01a3945fa12793f1af9ac531aedcc8cd","reference_name":"Mix2","reference_kind":"implements","line":34,"col":37,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"Mix2"}
 {"from_node_id":"class:01a3945fa12793f1af9ac531aedcc8cd","reference_name":"Paint","reference_kind":"implements","line":34,"col":59,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"Paint"}
 {"from_node_id":"class:066eb79e83cf3105cebd14593747068f","reference_name":"BaseService","reference_kind":"extends","line":13,"col":14,"candidates":null,"file_path":"torture.py","language":"python","status":"failed","name_tail":"BaseService"}
@@ -3412,6 +3527,8 @@
 {"from_node_id":"class:06e4921c695628f0cdb67d431f40fde0","reference_name":"Sys.ICloneable","reference_kind":"extends","line":153,"col":46,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"ICloneable"}
 {"from_node_id":"class:079e3c8dd01180f1887be97d173d1580","reference_name":"com","reference_kind":"extends","line":107,"col":23,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"com"}
 {"from_node_id":"class:0eb19db87d2d3627533601b89d35a295","reference_name":"BaseAccount","reference_kind":"extends","line":86,"col":13,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"BaseAccount"}
+{"from_node_id":"class:12b8092ee33506020a2ef69ffb0c942f","reference_name":"List","reference_kind":"references","line":10,"col":37,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"class:12b8092ee33506020a2ef69ffb0c942f","reference_name":"T","reference_kind":"references","line":10,"col":42,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"T"}
 {"from_node_id":"class:254935e2ae91f81b8a7691679e76b074","reference_name":"mkY","reference_kind":"calls","line":71,"col":37,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"mkY"}
 {"from_node_id":"class:2e5a7f348e94db94f799455a4250889f","reference_name":"logInit","reference_kind":"calls","line":14,"col":2,"candidates":null,"file_path":"TortureGiven.scala","language":"scala","status":"failed","name_tail":"logInit"}
 {"from_node_id":"class:2e5a7f348e94db94f799455a4250889f","reference_name":"require","reference_kind":"calls","line":13,"col":2,"candidates":null,"file_path":"TortureGiven.scala","language":"scala","status":"failed","name_tail":"require"}
@@ -3431,6 +3548,20 @@
 {"from_node_id":"class:326854f65c2a15980f69f2865639f179","reference_name":"this.wrap_it","reference_kind":"function_ref","line":72,"col":16,"candidates":null,"file_path":"torture.rb","language":"ruby","status":"failed","name_tail":"wrap_it"}
 {"from_node_id":"class:3855a6c5c93ad351ca38fee0e60e9a15","reference_name":"BaseI","reference_kind":"extends","line":9,"col":24,"candidates":null,"file_path":"TortureIndent.scala","language":"scala","status":"failed","name_tail":"BaseI"}
 {"from_node_id":"class:40ba5f950ab3c448fb944e41327f6130","reference_name":"QBase","reference_kind":"extends","line":118,"col":42,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"QBase"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"List","reference_kind":"references","line":31,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"List","reference_kind":"references","line":33,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"List","reference_kind":"references","line":38,"col":20,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Map","reference_kind":"references","line":38,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Map"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":29,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":30,"col":2,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":31,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":32,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":33,"col":20,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":34,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":35,"col":22,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":36,"col":3,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":37,"col":23,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"class:4153f97369d1da3a6904d21acc03a599","reference_name":"Report","reference_kind":"references","line":38,"col":25,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"class:54c0d1e485f298b4f9827706f928657f","reference_name":"BaseW","reference_kind":"extends","line":42,"col":69,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"BaseW"}
 {"from_node_id":"class:54c0d1e485f298b4f9827706f928657f","reference_name":"Ordered","reference_kind":"extends","line":42,"col":100,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"Ordered"}
 {"from_node_id":"class:594b551daf02d1f8f97af43b2a5bfd56","reference_name":"Comparable","reference_kind":"extends","line":101,"col":44,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"Comparable"}
@@ -3498,6 +3629,8 @@
 {"from_node_id":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","reference_name":"Score","reference_kind":"calls","line":50,"col":69,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Score"}
 {"from_node_id":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","reference_name":"Unregister","reference_kind":"calls","line":46,"col":21,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Unregister"}
 {"from_node_id":"class:c5612d8a0e4cc01ff1ebb6299d21d6b3","reference_name":"Widget","reference_kind":"extends","line":19,"col":32,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Widget"}
+{"from_node_id":"class:c69c6543c54ab7a0b458fb438bff134b","reference_name":"Map","reference_kind":"references","line":18,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Map"}
+{"from_node_id":"class:c69c6543c54ab7a0b458fb438bff134b","reference_name":"Report","reference_kind":"references","line":18,"col":25,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"class:cf8bad734e91e79fb7c91d19629af923","reference_name":"compute","reference_kind":"calls","line":303,"col":23,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"compute"}
 {"from_node_id":"class:cf8bad734e91e79fb7c91d19629af923","reference_name":"makePair","reference_kind":"calls","line":301,"col":27,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"makePair"}
 {"from_node_id":"class:cf8bad734e91e79fb7c91d19629af923","reference_name":"register","reference_kind":"calls","line":304,"col":8,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"register"}
@@ -3512,15 +3645,17 @@
 {"from_node_id":"class:f3cffc9c9f0e874254eeb3f1d5991355","reference_name":"Data","reference_kind":"decorates","line":108,"col":0,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"Data"}
 {"from_node_id":"class:fa355652331eee519e97b9ef15a61b2d","reference_name":"HolderT","reference_kind":"instantiates","line":145,"col":14,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"HolderT"}
 {"from_node_id":"class:fa355652331eee519e97b9ef15a61b2d","reference_name":"immutable","reference_kind":"decorates","line":113,"col":0,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"immutable"}
+{"from_node_id":"class:fb8b7ad04b69b1df82188d572b8f3cbd","reference_name":"Report","reference_kind":"references","line":14,"col":25,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"class:fbcd58714fb59bfafc8917bb8907a34b","reference_name":"Struct.new(:a)","reference_kind":"extends","line":42,"col":18,"candidates":null,"file_path":"torture.rb","language":"ruby","status":"failed","name_tail":"a)"}
+{"from_node_id":"class:fd45ec038bce9c1fca7887867994d28e","reference_name":"Report","reference_kind":"references","line":6,"col":21,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"component:7481b0bd84a22478679ecbebc3d262fb","reference_name":"setState","reference_kind":"calls","line":118,"col":46,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"setState"}
 {"from_node_id":"component:7481b0bd84a22478679ecbebc3d262fb","reference_name":"trackRender","reference_kind":"calls","line":116,"col":4,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"trackRender"}
 {"from_node_id":"component:7481b0bd84a22478679ecbebc3d262fb","reference_name":"useEffect","reference_kind":"calls","line":115,"col":2,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"useEffect"}
 {"from_node_id":"component:7481b0bd84a22478679ecbebc3d262fb","reference_name":"useStateAlias","reference_kind":"calls","line":114,"col":28,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"useStateAlias"}
+{"from_node_id":"constant:030c0c1a5b7a383bafdd1693b847ff66","reference_name":"Report","reference_kind":"references","line":69,"col":30,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"constant:0d769d307193815f098b9b0b5fbefe77","reference_name":"a.md","reference_kind":"references","line":189,"col":24,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:0d769d307193815f098b9b0b5fbefe77","reference_name":"sub/b.mdx","reference_kind":"references","line":189,"col":38,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"mdx"}
 {"from_node_id":"constant:15f84901ff87cded61f155103e042937","reference_name":"loadConfig","reference_kind":"calls","line":91,"col":65,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"loadConfig"}
-{"from_node_id":"constant:15f84901ff87cded61f155103e042937","reference_name":"persist","reference_kind":"calls","line":91,"col":35,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
 {"from_node_id":"constant:190c7c86b148186ed38f0157f9c3aebe","reference_name":"Map","reference_kind":"calls","line":4,"col":21,"candidates":null,"file_path":"TortureVref.scala","language":"scala","status":"failed","name_tail":"Map"}
 {"from_node_id":"constant:20c1adca9b006cfdbef3b2a842e8bb6d","reference_name":"README.md","reference_kind":"references","line":191,"col":36,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:236c639ef8d468b8c5f0edbe3c511fe6","reference_name":"a.md","reference_kind":"references","line":225,"col":24,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"md"}
@@ -3529,11 +3664,11 @@
 {"from_node_id":"constant:2ae565e022daebc1e27ec2ec6f991d63","reference_name":"persist","reference_kind":"calls","line":81,"col":24,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
 {"from_node_id":"constant:2bb83d75d5c26493f735f88d54196889","reference_name":"example.com/remote.md","reference_kind":"references","line":223,"col":22,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:2c9b8b9f0fc59dd9b622aa94a370dd2e","reference_name":"loadConfig","reference_kind":"calls","line":80,"col":65,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"loadConfig"}
-{"from_node_id":"constant:2c9b8b9f0fc59dd9b622aa94a370dd2e","reference_name":"persist","reference_kind":"calls","line":80,"col":35,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
 {"from_node_id":"constant:2fb5597adb8d74ddf363fc76403671b1","reference_name":"notes.md#top","reference_kind":"references","line":195,"col":39,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"md#top"}
 {"from_node_id":"constant:3009d9f471eb7762bd124804705edd04","reference_name":"docs/rooted.md","reference_kind":"references","line":140,"col":32,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:33f910c46b7ceee638d2e27597b6efe9","reference_name":"example.com/remote.md","reference_kind":"references","line":187,"col":24,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:342374b797067fd348d243baa5d427dc","reference_name":"compute","reference_kind":"calls","line":36,"col":19,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"compute"}
+{"from_node_id":"constant:37538675d8cf7487a68e75423fac3308","reference_name":"Report","reference_kind":"references","line":33,"col":36,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"constant:3c38de0e0ed3e748396ac32a56feb99b","reference_name":"Option","reference_kind":"calls","line":38,"col":22,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"Option"}
 {"from_node_id":"constant:414592809f0c65f5ad4aabfee42415ce","reference_name":"DefaultThing","reference_kind":"function_ref","line":201,"col":31,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"DefaultThing"}
 {"from_node_id":"constant:414592809f0c65f5ad4aabfee42415ce","reference_name":"helperFn","reference_kind":"function_ref","line":201,"col":21,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"helperFn"}
@@ -3553,6 +3688,7 @@
 {"from_node_id":"constant:72a8c16d222a91fd63387b8e91e84692","reference_name":"docs/rooted.md","reference_kind":"references","line":281,"col":16,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:7da4836f633252abd079cf61390f496c","reference_name":"notes.md#top","reference_kind":"references","line":284,"col":17,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"md#top"}
 {"from_node_id":"constant:7fab581a17cbf8b49300b7d3c531a7b3","reference_name":"notes.md#top","reference_kind":"references","line":224,"col":17,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"md#top"}
+{"from_node_id":"constant:8d5b7c0112ba1bd860a9b742a094954c","reference_name":"Report","reference_kind":"references","line":71,"col":17,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"constant:9094965c27fc1c253476c66075eb8df3","reference_name":"example.com/remote.md","reference_kind":"references","line":142,"col":38,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:91ebf034ebc4447c5457d0b572231ae8","reference_name":"docs/rooted.md","reference_kind":"references","line":185,"col":18,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:9d99c4353a441bb15265d3940df538f6","reference_name":"example.com/remote.md","reference_kind":"references","line":283,"col":22,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"md"}
@@ -3566,11 +3702,14 @@
 {"from_node_id":"constant:b88e9d23d2e8e5e79a944902c181bb40","reference_name":"Runnable","reference_kind":"calls","line":54,"col":14,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"Runnable"}
 {"from_node_id":"constant:ba67e5b1afe88bad27550035d21afd9e","reference_name":"memo","reference_kind":"calls","line":129,"col":18,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"memo"}
 {"from_node_id":"constant:bbefb11d3b9821ad30964edca510796b","reference_name":"List","reference_kind":"calls","line":26,"col":19,"candidates":null,"file_path":"TortureFnref.scala","language":"scala","status":"failed","name_tail":"List"}
+{"from_node_id":"constant:bc99115ab2732b88425e23aeb159d283","reference_name":"Report","reference_kind":"references","line":70,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"constant:c197bfb22abab59cfdc47e54de25015e","reference_name":"notes.md#top","reference_kind":"references","line":188,"col":19,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"md#top"}
 {"from_node_id":"constant:d797d33211e7d974d31ada081051cdc6","reference_name":"loadConfig","reference_kind":"calls","line":79,"col":20,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"loadConfig"}
 {"from_node_id":"constant:df995faec9b02592a89041c7b6e7e09a","reference_name":"a.md","reference_kind":"references","line":144,"col":40,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"md"}
 {"from_node_id":"constant:df995faec9b02592a89041c7b6e7e09a","reference_name":"sub/b.mdx","reference_kind":"references","line":144,"col":54,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"mdx"}
 {"from_node_id":"constant:fcb85d08e560bb97a5a04042c6c88b55","reference_name":"docs/rooted.md","reference_kind":"references","line":192,"col":38,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"md"}
+{"from_node_id":"enum:185db2f09770db6e298b5452894a6826","reference_name":"Grade","reference_kind":"references","line":57,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Grade"}
+{"from_node_id":"enum:185db2f09770db6e298b5452894a6826","reference_name":"Report","reference_kind":"references","line":56,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"enum:1bea39061b126572ffb641ee6a98eab8","reference_name":"CustomStringConvertible","reference_kind":"extends","line":44,"col":21,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"CustomStringConvertible"}
 {"from_node_id":"enum:1bea39061b126572ffb641ee6a98eab8","reference_name":"Error","reference_kind":"extends","line":44,"col":14,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Error"}
 {"from_node_id":"enum:62b26973d47047974a3723ff3d5d23ee","reference_name":"Int","reference_kind":"extends","line":116,"col":17,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Int"}
@@ -3596,6 +3735,7 @@
 {"from_node_id":"field:aad418c7800fdc96bf64e4ae2e8fbbbf","reference_name":"Runnable","reference_kind":"instantiates","line":27,"col":42,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"Runnable"}
 {"from_node_id":"field:aad418c7800fdc96bf64e4ae2e8fbbbf","reference_name":"Runnable","reference_kind":"references","line":27,"col":16,"candidates":null,"file_path":"Torture.java","language":"java","status":"failed","name_tail":"Runnable"}
 {"from_node_id":"field:f55a20c13201bd32369db7de5edde8d0","reference_name":"Action","reference_kind":"references","line":31,"col":21,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Action"}
+{"from_node_id":"field:f55a20c13201bd32369db7de5edde8d0","reference_name":"List","reference_kind":"instantiates","line":31,"col":42,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"List"}
 {"from_node_id":"field:f55a20c13201bd32369db7de5edde8d0","reference_name":"List","reference_kind":"references","line":31,"col":16,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"List"}
 {"from_node_id":"field:ff5d8f1e89169ffa0d4d1902eb2302b1","reference_name":"compute","reference_kind":"calls","line":293,"col":34,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"compute"}
 {"from_node_id":"field:ff5d8f1e89169ffa0d4d1902eb2302b1","reference_name":"draw","reference_kind":"calls","line":294,"col":17,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"draw"}
@@ -3608,6 +3748,13 @@
 {"from_node_id":"file:TortureMini.dart","reference_name":"dart:async","reference_kind":"imports","line":1,"col":0,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"async"}
 {"from_node_id":"file:TortureMisc.scala","reference_name":"a","reference_kind":"imports","line":25,"col":0,"candidates":null,"file_path":"TortureMisc.scala","language":"scala","status":"failed","name_tail":"a"}
 {"from_node_id":"file:TortureMisc.scala","reference_name":"single","reference_kind":"imports","line":24,"col":0,"candidates":null,"file_path":"TortureMisc.scala","language":"scala","status":"failed","name_tail":"single"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"List","reference_kind":"references","line":64,"col":0,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":63,"col":0,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":64,"col":5,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":65,"col":14,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":66,"col":1,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":67,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"file:TortureReadsTypes.dart","reference_name":"Report","reference_kind":"references","line":68,"col":25,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
 {"from_node_id":"file:TortureScript.kts","reference_name":"println","reference_kind":"calls","line":2,"col":0,"candidates":null,"file_path":"TortureScript.kts","language":"kotlin","status":"failed","name_tail":"println"}
 {"from_node_id":"file:TortureScript.sc","reference_name":"println","reference_kind":"calls","line":3,"col":0,"candidates":null,"file_path":"TortureScript.sc","language":"scala","status":"failed","name_tail":"println"}
 {"from_node_id":"file:TortureScript.sc","reference_name":"runTop","reference_kind":"calls","line":4,"col":0,"candidates":null,"file_path":"TortureScript.sc","language":"scala","status":"failed","name_tail":"runTop"}
@@ -3694,6 +3841,7 @@
 {"from_node_id":"file:torture.js","reference_name":"EventEmitter","reference_kind":"imports","line":5,"col":9,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"EventEmitter"}
 {"from_node_id":"file:torture.js","reference_name":"node:events","reference_kind":"imports","line":5,"col":0,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"events"}
 {"from_node_id":"file:torture.js","reference_name":"persist","reference_kind":"calls","line":86,"col":26,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
+{"from_node_id":"file:torture.js","reference_name":"require","reference_kind":"calls","line":6,"col":22,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"require"}
 {"from_node_id":"file:torture.lua","reference_name":"Child","reference_kind":"imports","line":8,"col":17,"candidates":null,"file_path":"torture.lua","language":"lua","status":"failed","name_tail":"Child"}
 {"from_node_id":"file:torture.lua","reference_name":"core.util.log","reference_kind":"calls","line":90,"col":0,"candidates":null,"file_path":"torture.lua","language":"lua","status":"failed","name_tail":"log"}
 {"from_node_id":"file:torture.lua","reference_name":"f2","reference_kind":"calls","line":92,"col":0,"candidates":null,"file_path":"torture.lua","language":"lua","status":"failed","name_tail":"f2"}
@@ -3789,6 +3937,7 @@
 {"from_node_id":"function:08bb60eead5364c3bf26d67ebca2639d","reference_name":"use","reference_kind":"calls","line":22,"col":23,"candidates":null,"file_path":"TortureSigs.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:08bb60eead5364c3bf26d67ebca2639d","reference_name":"xs.forEach","reference_kind":"calls","line":22,"col":12,"candidates":null,"file_path":"TortureSigs.dart","language":"dart","status":"failed","name_tail":"forEach"}
 {"from_node_id":"function:08bb60eead5364c3bf26d67ebca2639d","reference_name":"xs.map","reference_kind":"calls","line":27,"col":8,"candidates":null,"file_path":"TortureSigs.dart","language":"dart","status":"failed","name_tail":"map"}
+{"from_node_id":"function:09bc8c99cfea997f2b613b053cdeacc9","reference_name":"persist","reference_kind":"calls","line":80,"col":35,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
 {"from_node_id":"function:0de344286ef5d117cc0e4de7b71092f1","reference_name":"select","reference_kind":"calls","line":24,"col":8,"candidates":null,"file_path":"torture.lua","language":"lua","status":"failed","name_tail":"select"}
 {"from_node_id":"function:0f2100f205cfad2b7709d99a570648a7","reference_name":"Error","reference_kind":"references","line":194,"col":55,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"Error"}
 {"from_node_id":"function:0f2100f205cfad2b7709d99a570648a7","reference_name":"Response","reference_kind":"references","line":194,"col":45,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"Response"}
@@ -3801,12 +3950,33 @@
 {"from_node_id":"function:0f620fa18b10178b2f19c93a79ca33eb","reference_name":"use","reference_kind":"calls","line":32,"col":7,"candidates":null,"file_path":"TortureSigs.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:1116b32a328c7f5fd04a16f5e6445a4a","reference_name":"trailing()","reference_kind":"calls","line":244,"col":4,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"trailing()"}
 {"from_node_id":"function:112bb390a54043c8ee6b3ee94ba6c956","reference_name":"inner","reference_kind":"calls","line":11,"col":9,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"inner"}
+{"from_node_id":"function:112bb390a54043c8ee6b3ee94ba6c956","reference_name":"w.n","reference_kind":"references","line":16,"col":13,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"n"}
 {"from_node_id":"function:11c7b584c938a133a0a90b82afcafbd9","reference_name":"emit","reference_kind":"calls","line":60,"col":6,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"emit"}
 {"from_node_id":"function:15790b08cab7e8d7cb5b8a474d94c359","reference_name":"draw","reference_kind":"calls","line":253,"col":4,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"draw"}
 {"from_node_id":"function:1591d6baa7249cbfb88bb162e736cb3e","reference_name":"docs/deep/nested.markdown","reference_kind":"references","line":217,"col":32,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"markdown"}
 {"from_node_id":"function:1591d6baa7249cbfb88bb162e736cb3e","reference_name":"load_doc","reference_kind":"calls","line":217,"col":22,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"load_doc"}
 {"from_node_id":"function:178c6f5073dbe3085b9a39b8c2723861","reference_name":"standardGeneric","reference_kind":"calls","line":78,"col":37,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"standardGeneric"}
+{"from_node_id":"function:17dec1e0fa812cc39e6fe41decdff8ce","reference_name":"persist","reference_kind":"calls","line":91,"col":35,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"persist"}
+{"from_node_id":"function:1932b46aef9b5a9c946962703eaf2c1c","reference_name":"w.n","reference_kind":"references","line":16,"col":13,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"n"}
+{"from_node_id":"function:1932b46aef9b5a9c946962703eaf2c1c","reference_name":"w.n","reference_kind":"references","line":16,"col":13,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"n"}
 {"from_node_id":"function:197783ccd4e0addc08a46e60af554114","reference_name":"pragma","reference_kind":"decorates","line":57,"col":0,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"pragma"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"Grade.top","reference_kind":"references","line":88,"col":18,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"top"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"List","reference_kind":"references","line":102,"col":10,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"Report","reference_kind":"references","line":102,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"Report","reference_kind":"references","line":83,"col":29,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"a.score","reference_kind":"references","line":105,"col":38,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"score"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"c.name","reference_kind":"references","line":105,"col":60,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"name"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"cb","reference_kind":"calls","line":105,"col":23,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"cb"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"d.index","reference_kind":"references","line":105,"col":76,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"index"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"e.length","reference_kind":"references","line":105,"col":86,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"length"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"h.count","reference_kind":"references","line":99,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"count"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"h.report","reference_kind":"references","line":91,"col":14,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"report"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"h.report","reference_kind":"references","line":93,"col":14,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"report"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"print","reference_kind":"calls","line":99,"col":7,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"print"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"r.score","reference_kind":"references","line":86,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"score"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"rs.length","reference_kind":"references","line":103,"col":24,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"length"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"y.all","reference_kind":"references","line":102,"col":30,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"all"}
+{"from_node_id":"function:19a0e59e96f62184134d9ca1af9b25c5","reference_name":"y.count","reference_kind":"references","line":103,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"count"}
 {"from_node_id":"function:1e88e4e4512fb430843aefcd401baa63","reference_name":"UpdateInput","reference_kind":"references","line":149,"col":16,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"UpdateInput"}
 {"from_node_id":"function:1e88e4e4512fb430843aefcd401baa63","reference_name":"persistExisting","reference_kind":"calls","line":150,"col":11,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"persistExisting"}
 {"from_node_id":"function:20c85c2670ea905ab78b990c87f94b32","reference_name":"reallyDeep","reference_kind":"calls","line":92,"col":22,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"reallyDeep"}
@@ -3836,6 +4006,29 @@
 {"from_node_id":"function:24b796590d26da68a2429579e2f10a68","reference_name":"m[1]","reference_kind":"calls","line":169,"col":2,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"m[1]"}
 {"from_node_id":"function:24b796590d26da68a2429579e2f10a68","reference_name":"thrower","reference_kind":"calls","line":171,"col":7,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"thrower"}
 {"from_node_id":"function:24b796590d26da68a2429579e2f10a68","reference_name":"trimmed","reference_kind":"calls","line":163,"col":2,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"trimmed"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"FormatException","reference_kind":"references","line":128,"col":7,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"FormatException"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Future","reference_kind":"references","line":117,"col":12,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Future"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"List","reference_kind":"references","line":112,"col":2,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Map","reference_kind":"references","line":113,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Map"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Object","reference_kind":"references","line":108,"col":0,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Object"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Object","reference_kind":"references","line":108,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Object"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"calls","line":119,"col":21,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"calls","line":120,"col":16,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":111,"col":28,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":111,"col":8,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":112,"col":21,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":112,"col":7,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":113,"col":20,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":114,"col":14,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":115,"col":11,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":117,"col":19,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":118,"col":19,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":118,"col":29,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":122,"col":25,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"Report","reference_kind":"references","line":124,"col":29,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"StateError","reference_kind":"calls","line":126,"col":20,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"StateError"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"StateError","reference_kind":"references","line":127,"col":7,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"StateError"}
+{"from_node_id":"function:26ac3e78238b037efdce6f5fac049878","reference_name":"again.score","reference_kind":"references","line":124,"col":69,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"score"}
 {"from_node_id":"function:29c45ab6685a5a716164b34bb4223347","reference_name":"onPick","reference_kind":"calls","line":246,"col":30,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"onPick"}
 {"from_node_id":"function:2c1f148bae5ae49626fb0d60fd19fdd1","reference_name":"parseLabel","reference_kind":"calls","line":248,"col":29,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"parseLabel"}
 {"from_node_id":"function:31667d19df8f0e5cd5dfb03fb205a8d7","reference_name":"reg2","reference_kind":"calls","line":80,"col":6,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"reg2"}
@@ -3843,6 +4036,16 @@
 {"from_node_id":"function:33b106031d5d73f4a78ba89e261b883e","reference_name":"directiveCall","reference_kind":"calls","line":187,"col":25,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"directiveCall"}
 {"from_node_id":"function:38d7bae04a29fa8be9d0997ef3ccb42e","reference_name":"use","reference_kind":"calls","line":23,"col":5,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:3c52494613752935da8b768c848425c2","reference_name":"deprecated","reference_kind":"decorates","line":51,"col":0,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"deprecated"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"List","reference_kind":"references","line":102,"col":10,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"List","reference_kind":"references","line":102,"col":10,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"List"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"Report","reference_kind":"references","line":102,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"Report","reference_kind":"references","line":102,"col":15,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"rs.length","reference_kind":"references","line":103,"col":24,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"length"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"rs.length","reference_kind":"references","line":103,"col":24,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"length"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"y.all","reference_kind":"references","line":102,"col":30,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"all"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"y.all","reference_kind":"references","line":102,"col":30,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"all"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"y.count","reference_kind":"references","line":103,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"count"}
+{"from_node_id":"function:40126a800d9910002cd20fdc95dc22eb","reference_name":"y.count","reference_kind":"references","line":103,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"count"}
 {"from_node_id":"function:434fc66cc90ef59c01466d52e147b60a","reference_name":"reg","reference_kind":"calls","line":23,"col":5,"candidates":null,"file_path":"TortureFnrefDart.dart","language":"dart","status":"failed","name_tail":"reg"}
 {"from_node_id":"function:434fc66cc90ef59c01466d52e147b60a","reference_name":"reg2","reference_kind":"calls","line":24,"col":6,"candidates":null,"file_path":"TortureFnrefDart.dart","language":"dart","status":"failed","name_tail":"reg2"}
 {"from_node_id":"function:434fc66cc90ef59c01466d52e147b60a","reference_name":"reg3","reference_kind":"calls","line":25,"col":6,"candidates":null,"file_path":"TortureFnrefDart.dart","language":"dart","status":"failed","name_tail":"reg3"}
@@ -3921,6 +4124,7 @@
 {"from_node_id":"function:6587eb6d3ce9f83526f39edb278e0edb","reference_name":"Void","reference_kind":"references","line":155,"col":18,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Void"}
 {"from_node_id":"function:6587eb6d3ce9f83526f39edb278e0edb","reference_name":"noop","reference_kind":"calls","line":155,"col":25,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"noop"}
 {"from_node_id":"function:665cf0a83ba254ea3108f02ed3ef2308","reference_name":"Iterable","reference_kind":"references","line":42,"col":0,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"Iterable"}
+{"from_node_id":"function:67d932bdf3c34d2917376709a0ecbac1","reference_name":"util.Config","reference_kind":"references","line":38,"col":7,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"Config"}
 {"from_node_id":"function:67d932bdf3c34d2917376709a0ecbac1","reference_name":"util.helper","reference_kind":"calls","line":37,"col":13,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"helper"}
 {"from_node_id":"function:681cc6feeb95207524e5b8defc0314e5","reference_name":"docs/deep/nested.markdown","reference_kind":"references","line":245,"col":11,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"markdown"}
 {"from_node_id":"function:681cc6feeb95207524e5b8defc0314e5","reference_name":"loadDoc","reference_kind":"calls","line":245,"col":9,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"loadDoc"}
@@ -3959,6 +4163,7 @@
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"helper","reference_kind":"calls","line":222,"col":4,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"helper"}
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"helper","reference_kind":"calls","line":225,"col":4,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"helper"}
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"helper::<u32>","reference_kind":"calls","line":224,"col":12,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"<u32>"}
+{"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"m::Widget","reference_kind":"instantiates","line":216,"col":12,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"Widget"}
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"m::helper2","reference_kind":"calls","line":223,"col":4,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"helper2"}
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"make_name","reference_kind":"calls","line":213,"col":14,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"make_name"}
 {"from_node_id":"function:776ddd2f0dd066bab2295c09c8685d6a","reference_name":"n2","reference_kind":"calls","line":228,"col":14,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"n2"}
@@ -3982,6 +4187,7 @@
 {"from_node_id":"function:80c7293664161116a029e8aa43f2becf","reference_name":"Color","reference_kind":"references","line":178,"col":10,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Color"}
 {"from_node_id":"function:80c7293664161116a029e8aa43f2becf","reference_name":"Deep","reference_kind":"references","line":181,"col":10,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Deep"}
 {"from_node_id":"function:80c7293664161116a029e8aa43f2becf","reference_name":"UserModel","reference_kind":"references","line":180,"col":10,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"UserModel"}
+{"from_node_id":"function:81ba5a98d0931cbf162f4338fae53766","reference_name":"Cfg.retries","reference_kind":"references","line":65,"col":10,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"retries"}
 {"from_node_id":"function:81ba5a98d0931cbf162f4338fae53766","reference_name":"print","reference_kind":"calls","line":67,"col":7,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"print"}
 {"from_node_id":"function:81ba5a98d0931cbf162f4338fae53766","reference_name":"use","reference_kind":"calls","line":65,"col":5,"candidates":null,"file_path":"TortureDoubleWalk.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:893e190d6be04144b7ebe001bdd3cdba","reference_name":"forward","reference_kind":"calls","line":108,"col":9,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"forward"}
@@ -4035,7 +4241,9 @@
 {"from_node_id":"function:94e47546d3d7e830b92f97eb2a289d01","reference_name":"use_ptr","reference_kind":"calls","line":136,"col":2,"candidates":null,"file_path":"torture.c","language":"c","status":"failed","name_tail":"use_ptr"}
 {"from_node_id":"function:94e47546d3d7e830b92f97eb2a289d01","reference_name":"va_arg","reference_kind":"calls","line":134,"col":18,"candidates":null,"file_path":"torture.c","language":"c","status":"failed","name_tail":"va_arg"}
 {"from_node_id":"function:94e47546d3d7e830b92f97eb2a289d01","reference_name":"va_arg","reference_kind":"calls","line":135,"col":10,"candidates":null,"file_path":"torture.c","language":"c","status":"failed","name_tail":"va_arg"}
+{"from_node_id":"function:973ef3de44975d37a59ae5993585dcb8","reference_name":"Flag.on","reference_kind":"references","line":32,"col":17,"candidates":null,"file_path":"TortureCtors.dart","language":"dart","status":"failed","name_tail":"on"}
 {"from_node_id":"function:973ef3de44975d37a59ae5993585dcb8","reference_name":"use","reference_kind":"calls","line":35,"col":9,"candidates":null,"file_path":"TortureCtors.dart","language":"dart","status":"failed","name_tail":"use"}
+{"from_node_id":"function:975ff1961c427064617a254938d60cd1","reference_name":"ColorT.red","reference_kind":"references","line":217,"col":19,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"red"}
 {"from_node_id":"function:975ff1961c427064617a254938d60cd1","reference_name":"Object","reference_kind":"references","line":216,"col":17,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"Object"}
 {"from_node_id":"function:975ff1961c427064617a254938d60cd1","reference_name":"use","reference_kind":"calls","line":220,"col":9,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:975ff1961c427064617a254938d60cd1","reference_name":"use","reference_kind":"calls","line":225,"col":5,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"use"}
@@ -4050,6 +4258,7 @@
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"ConfigT","reference_kind":"references","line":70,"col":2,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"ConfigT"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"ConfigT","reference_kind":"references","line":71,"col":2,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"ConfigT"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"ConfigT.load","reference_kind":"calls","line":70,"col":14,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"load"}
+{"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"ConfigT.setting","reference_kind":"references","line":71,"col":10,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"setting"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"EdgeInsetsT.all","reference_kind":"calls","line":76,"col":6,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"all"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"FactoryT","reference_kind":"references","line":77,"col":2,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"FactoryT"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"FactoryT.create","reference_kind":"calls","line":77,"col":17,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"create"}
@@ -4067,6 +4276,7 @@
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"lower","reference_kind":"calls","line":78,"col":7,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"lower"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"obj.method","reference_kind":"calls","line":68,"col":12,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"method"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"pad","reference_kind":"calls","line":76,"col":5,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"pad"}
+{"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"this_like.deep","reference_kind":"references","line":69,"col":12,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"deep"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"toList","reference_kind":"calls","line":80,"col":29,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"toList"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"use","reference_kind":"calls","line":81,"col":23,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"use","reference_kind":"calls","line":91,"col":7,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"use"}
@@ -4074,9 +4284,7 @@
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"xs.forEach","reference_kind":"calls","line":81,"col":12,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"forEach"}
 {"from_node_id":"function:a1998a5fcada0a95b1aebb30d3f1222c","reference_name":"xs.map","reference_kind":"calls","line":80,"col":8,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"map"}
 {"from_node_id":"function:a946d3f4be94fcb7a892061e107ac66a","reference_name":"deprecated","reference_kind":"decorates","line":20,"col":0,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"deprecated"}
-{"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"Config","reference_kind":"references","line":18,"col":2,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"Config"}
-{"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"Config","reference_kind":"references","line":19,"col":2,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"Config"}
-{"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"Config.load","reference_kind":"calls","line":19,"col":13,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"load"}
+{"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"Config.setting","reference_kind":"references","line":18,"col":9,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"setting"}
 {"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"EdgeInsets","reference_kind":"references","line":24,"col":12,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"EdgeInsets"}
 {"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"EdgeInsets.all","reference_kind":"calls","line":24,"col":26,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"all"}
 {"from_node_id":"function:ab6308c2c4505606bd271827551f5081","reference_name":"Foo","reference_kind":"references","line":25,"col":2,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"Foo"}
@@ -4287,6 +4495,8 @@
 {"from_node_id":"method:3c1ef2bb8932e71bb8cd70805321f3d9","reference_name":"register","reference_kind":"calls","line":10,"col":4,"candidates":null,"file_path":"TortureFnref.scala","language":"scala","status":"failed","name_tail":"register"}
 {"from_node_id":"method:3c1ef2bb8932e71bb8cd70805321f3d9","reference_name":"register","reference_kind":"calls","line":5,"col":4,"candidates":null,"file_path":"TortureFnref.scala","language":"scala","status":"failed","name_tail":"register"}
 {"from_node_id":"method:3c1ef2bb8932e71bb8cd70805321f3d9","reference_name":"registerEta","reference_kind":"calls","line":6,"col":4,"candidates":null,"file_path":"TortureFnref.scala","language":"scala","status":"failed","name_tail":"registerEta"}
+{"from_node_id":"method:3cd2c40504f4b1126de8a947755f0ef3","reference_name":"Report","reference_kind":"references","line":43,"col":2,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"method:3cd2c40504f4b1126de8a947755f0ef3","reference_name":"all.first","reference_kind":"references","line":43,"col":26,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"first"}
 {"from_node_id":"method:3d1787adb831782b4a90413dd941412b","reference_name":"d.draw","reference_kind":"calls","line":93,"col":21,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"draw"}
 {"from_node_id":"method:3e0eaf75fa55d6bb243377f25e7b18b2","reference_name":"length","reference_kind":"calls","line":108,"col":22,"candidates":null,"file_path":"torture.R","language":"r","status":"failed","name_tail":"length"}
 {"from_node_id":"method:406f43474d5bd0472fe7702b818cc821","reference_name":"Kernel","reference_kind":"references","line":186,"col":4,"candidates":null,"file_path":"torture.rb","language":"ruby","status":"failed","name_tail":"Kernel"}
@@ -4373,6 +4583,7 @@
 {"from_node_id":"method:87061ec6d836f4168578a67c784dad64","reference_name":"docs/deep/nested.markdown","reference_kind":"references","line":191,"col":32,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"markdown"}
 {"from_node_id":"method:87061ec6d836f4168578a67c784dad64","reference_name":"loadDoc","reference_kind":"calls","line":191,"col":23,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"loadDoc"}
 {"from_node_id":"method:87219976feb420ee1a686ba7a6e03a5e","reference_name":"helper_build","reference_kind":"calls","line":80,"col":4,"candidates":null,"file_path":"torture.rb","language":"ruby","status":"failed","name_tail":"helper_build"}
+{"from_node_id":"method:88f81485281dcc709b31f0d85a31de3b","reference_name":"o.size","reference_kind":"references","line":51,"col":42,"candidates":null,"file_path":"TortureMini.dart","language":"dart","status":"failed","name_tail":"size"}
 {"from_node_id":"method:8d1fd5f33fcd0da75336879f96ff1396","reference_name":"HolderT","reference_kind":"instantiates","line":145,"col":14,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"HolderT"}
 {"from_node_id":"method:8d1fd5f33fcd0da75336879f96ff1396","reference_name":"use","reference_kind":"calls","line":146,"col":7,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"method:8de06c1f794344d73447f7ad87e039d6","reference_name":"cmpHelper","reference_kind":"calls","line":3,"col":39,"candidates":null,"file_path":"TortureGiven.scala","language":"scala","status":"failed","name_tail":"cmpHelper"}
@@ -4519,6 +4730,11 @@
 {"from_node_id":"method:b9f48c19c78ddbfc77ee5cf8f1a6f183","reference_name":"register","reference_kind":"calls","line":59,"col":4,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"register"}
 {"from_node_id":"method:bf79e82e64a3df305e219d034086b2b0","reference_name":"T","reference_kind":"references","line":111,"col":23,"candidates":null,"file_path":"torture.rs","language":"rust","status":"failed","name_tail":"T"}
 {"from_node_id":"method:c226448f9903a610ae764b0916837387","reference_name":"enum_color","reference_kind":"calls","line":206,"col":15,"candidates":null,"file_path":"torture.php","language":"php","status":"failed","name_tail":"enum_color"}
+{"from_node_id":"method:c229dd8ed310e44c2174e38f3c041371","reference_name":"Report","reference_kind":"references","line":45,"col":21,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"Report"}
+{"from_node_id":"method:c229dd8ed310e44c2174e38f3c041371","reference_name":"h.maybe","reference_kind":"references","line":47,"col":59,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"maybe"}
+{"from_node_id":"method:c229dd8ed310e44c2174e38f3c041371","reference_name":"h.report","reference_kind":"references","line":47,"col":13,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"report"}
+{"from_node_id":"method:c229dd8ed310e44c2174e38f3c041371","reference_name":"local.all","reference_kind":"references","line":47,"col":34,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"all"}
+{"from_node_id":"method:c229dd8ed310e44c2174e38f3c041371","reference_name":"r.score","reference_kind":"references","line":47,"col":49,"candidates":null,"file_path":"TortureReadsTypes.dart","language":"dart","status":"failed","name_tail":"score"}
 {"from_node_id":"method:c4753283cb00222b85753fe532e410ce","reference_name":"T","reference_kind":"references","line":44,"col":29,"candidates":null,"file_path":"torture.go","language":"go","status":"failed","name_tail":"T"}
 {"from_node_id":"method:c4753283cb00222b85753fe532e410ce","reference_name":"append","reference_kind":"calls","line":45,"col":11,"candidates":null,"file_path":"torture.go","language":"go","status":"failed","name_tail":"append"}
 {"from_node_id":"method:c4753283cb00222b85753fe532e410ce","reference_name":"s.items","reference_kind":"function_ref","line":45,"col":20,"candidates":null,"file_path":"torture.go","language":"go","status":"failed","name_tail":"items"}
@@ -4548,6 +4764,7 @@
 {"from_node_id":"method:dd439e569e5643b7eab01af84e7b86a4","reference_name":"register","reference_kind":"calls","line":29,"col":4,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"register"}
 {"from_node_id":"method:dd439e569e5643b7eab01af84e7b86a4","reference_name":"super","reference_kind":"calls","line":27,"col":4,"candidates":null,"file_path":"torture.js","language":"javascript","status":"failed","name_tail":"super"}
 {"from_node_id":"method:de718159205cba9b0d17647ac71f8f2a","reference_name":"draw","reference_kind":"calls","line":77,"col":8,"candidates":null,"file_path":"torture.kt","language":"kotlin","status":"failed","name_tail":"draw"}
+{"from_node_id":"method:dfc92724bc8e56ce4fffe93fa68a9d43","reference_name":"o.size","reference_kind":"references","line":143,"col":52,"candidates":null,"file_path":"torture.dart","language":"dart","status":"failed","name_tail":"size"}
 {"from_node_id":"method:e05bd15d7804605167b8fadd29a26f6b","reference_name":"this.items.push","reference_kind":"calls","line":232,"col":28,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"push"}
 {"from_node_id":"method:e05bd15d7804605167b8fadd29a26f6b","reference_name":"this.mailer.send","reference_kind":"calls","line":232,"col":50,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"send"}
 {"from_node_id":"method:e05bd15d7804605167b8fadd29a26f6b","reference_name":"this.mailer.send().trim","reference_kind":"calls","line":232,"col":50,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"trim"}
@@ -4563,6 +4780,7 @@
 {"from_node_id":"method:ea9d3d2b24e0b1e6559d12766186eb52","reference_name":"self.registry.lookup","reference_kind":"calls","line":26,"col":14,"candidates":null,"file_path":"torture.py","language":"python","status":"failed","name_tail":"lookup"}
 {"from_node_id":"method:ec3b82565a2eb916f10a964766960a86","reference_name":"listeners.forEach","reference_kind":"calls","line":53,"col":4,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"forEach","failure_reason":"unknown-receiver"}
 {"from_node_id":"method:ec3b82565a2eb916f10a964766960a86","reference_name":"unregister","reference_kind":"calls","line":53,"col":29,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"unregister"}
+{"from_node_id":"method:ec47a62d06708c1f02fc28a967649234","reference_name":"Table.COL_LIMIT","reference_kind":"references","line":13,"col":14,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"COL_LIMIT"}
 {"from_node_id":"method:ec47a62d06708c1f02fc28a967649234","reference_name":"log","reference_kind":"calls","line":14,"col":7,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"log"}
 {"from_node_id":"method:ec47a62d06708c1f02fc28a967649234","reference_name":"use","reference_kind":"calls","line":12,"col":7,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"use"}
 {"from_node_id":"method:ec47a62d06708c1f02fc28a967649234","reference_name":"use","reference_kind":"calls","line":13,"col":7,"candidates":null,"file_path":"TortureVrefDart.dart","language":"dart","status":"failed","name_tail":"use"}
@@ -4624,10 +4842,12 @@
 {"from_node_id":"property:13da6cd7fb88d8425ef100ac799b81ef","reference_name":"Text","reference_kind":"calls","line":122,"col":33,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Text"}
 {"from_node_id":"property:13da6cd7fb88d8425ef100ac799b81ef","reference_name":"VStack","reference_kind":"calls","line":122,"col":24,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"VStack"}
 {"from_node_id":"property:20f555c9e314ec2302940348c2df150c","reference_name":"Action","reference_kind":"references","line":40,"col":15,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Action"}
+{"from_node_id":"property:20f555c9e314ec2302940348c2df150c","reference_name":"Register","reference_kind":"calls","line":40,"col":42,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Register"}
 {"from_node_id":"property:2eba142ae17bb518a27a2345a0cc2620","reference_name":"Lookup","reference_kind":"calls","line":39,"col":45,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Lookup"}
 {"from_node_id":"property:2eba142ae17bb518a27a2345a0cc2620","reference_name":"Store","reference_kind":"calls","line":39,"col":64,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Store"}
 {"from_node_id":"property:36d0b68644ae5cbe11d8a493727a8a5a","reference_name":"Set","reference_kind":"instantiates","line":239,"col":11,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"Set"}
 {"from_node_id":"property:3f76120a6d12e45f619241f30c648d15","reference_name":"renderDescription","reference_kind":"calls","line":48,"col":28,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"renderDescription"}
+{"from_node_id":"property:42cbcdbb0dffcc35a50326fe730508ab","reference_name":"Widget","reference_kind":"instantiates","line":38,"col":38,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Widget"}
 {"from_node_id":"property:42cbcdbb0dffcc35a50326fe730508ab","reference_name":"Widget","reference_kind":"references","line":38,"col":15,"candidates":null,"file_path":"Torture.cs","language":"csharp","status":"failed","name_tail":"Widget"}
 {"from_node_id":"property:5adda8060392b1c87de026284998ff38","reference_name":"check","reference_kind":"calls","line":18,"col":34,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"check"}
 {"from_node_id":"property:81d2ec3c339327a8b0a34fc6d17cecac","reference_name":"Config","reference_kind":"references","line":26,"col":38,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"Config"}
@@ -4704,7 +4924,7 @@
 {"from_node_id":"variable:f90ca95a6ecd4291f24e8cc99492595f","reference_name":"notes.md#top","reference_kind":"references","line":70,"col":20,"candidates":null,"file_path":"torture.luau","language":"luau","status":"failed","name_tail":"md#top"}
 {"from_node_id":"variable:fb450996c12f335b36201ead67a34f64","reference_name":"helper","reference_kind":"calls","line":54,"col":17,"candidates":null,"file_path":"torture.py","language":"python","status":"failed","name_tail":"helper"}
 {"from_node_id":"variable:feb330d554c5d0caaa8978323a006e52","reference_name":"README.md","reference_kind":"references","line":238,"col":11,"candidates":null,"file_path":"torture.rb","language":"ruby","status":"failed","name_tail":"md"}
-== bindings (791)
+== bindings (793)
 {"file_path":"Torture.java","name":"<Runnable$anon@27>","kind":"local","node_id":"class:c4ed77533cd6f14e451fe7962f484e20","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":27,"scope_end":32,"storage":null,"line":27}
 {"file_path":"Torture.java","name":"<Runnable$anon@42>","kind":"local","node_id":"class:66085d60d16ebfd037ddd1bd9273a82e","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":36,"scope_end":48,"storage":null,"line":42}
 {"file_path":"Torture.java","name":"API_BASE","kind":"local","node_id":"constant:027c429f02116e6725f83e648b4778cf","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":16,"scope_end":106,"storage":null,"line":21}
@@ -5069,6 +5289,8 @@
 {"file_path":"torture.js","name":"loadUser","kind":"decl","node_id":"function:c97d0d5969167c7958098f13defe9e08","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":1,"scope_end":111,"storage":null,"line":60}
 {"file_path":"torture.js","name":"makeWidget","kind":"decl","node_id":"function:1144fd3aac9231a341249e5320f6e942","target_spec":null,"target_name":null,"exported_as":"makeWidget","export_form":"cjs","scope_start":1,"scope_end":111,"storage":null,"line":49}
 {"file_path":"torture.js","name":"mutations","kind":"decl","node_id":"constant:2473fbfe8d2893986c919a78a4a7903b","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":1,"scope_end":111,"storage":null,"line":54}
+{"file_path":"torture.js","name":"onSave","kind":"decl","node_id":"function:09bc8c99cfea997f2b613b053cdeacc9","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":1,"scope_end":111,"storage":null,"line":80}
+{"file_path":"torture.js","name":"onSave","kind":"decl","node_id":"function:17dec1e0fa812cc39e6fe41decdff8ce","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":1,"scope_end":111,"storage":null,"line":91}
 {"file_path":"torture.js","name":"onTick","kind":"local","node_id":"method:2bb5bc1d26d448e27c9c5b94d36a1051","target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":15,"scope_end":39,"storage":null,"line":19}
 {"file_path":"torture.js","name":"opts","kind":"param","node_id":null,"target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":26,"scope_end":30,"storage":null,"line":26}
 {"file_path":"torture.js","name":"opts","kind":"param","node_id":null,"target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":36,"scope_end":38,"storage":null,"line":36}
@@ -5496,7 +5718,7 @@
 {"file_path":"torture.tsx","name":"x","kind":"param","node_id":null,"target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":104,"scope_end":106,"storage":null,"line":104}
 {"file_path":"torture.tsx","name":"x","kind":"param","node_id":null,"target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":241,"scope_end":241,"storage":null,"line":241}
 {"file_path":"torture.tsx","name":"x","kind":"param","node_id":null,"target_spec":null,"target_name":null,"exported_as":null,"export_form":null,"scope_start":248,"scope_end":248,"storage":null,"line":248}
-== files (42)
+== files (43)
 {"path":"ScalaCompanions.scala","language":"scala","node_count":15}
 {"path":"Torture.cs","language":"csharp","node_count":82}
 {"path":"Torture.java","language":"java","node_count":75}
@@ -5513,6 +5735,7 @@
 {"path":"TortureMini.dart","language":"dart","node_count":34}
 {"path":"TortureMisc.scala","language":"scala","node_count":24}
 {"path":"TortureModule.module","language":"php","node_count":3}
+{"path":"TortureReadsTypes.dart","language":"dart","node_count":35}
 {"path":"TortureScript.kts","language":"kotlin","node_count":3}
 {"path":"TortureScript.sc","language":"scala","node_count":3}
 {"path":"TortureSigs.dart","language":"dart","node_count":14}
@@ -5528,7 +5751,7 @@
 {"path":"torture.dart","language":"dart","node_count":92}
 {"path":"torture.go","language":"go","node_count":26}
 {"path":"torture.hpp","language":"cpp","node_count":5}
-{"path":"torture.js","language":"javascript","node_count":30}
+{"path":"torture.js","language":"javascript","node_count":32}
 {"path":"torture.kt","language":"kotlin","node_count":117}
 {"path":"torture.lua","language":"lua","node_count":51}
 {"path":"torture.luau","language":"luau","node_count":28}
diff --git a/__tests__/fixtures/golden/vue-sfc.dump b/__tests__/fixtures/golden/vue-sfc.dump
index d359ad5660..d655cf4376 100644
--- a/__tests__/fixtures/golden/vue-sfc.dump
+++ b/__tests__/fixtures/golden/vue-sfc.dump
@@ -41,7 +41,7 @@
 {"id":"route:src/router/index.ts:5:/:vue","kind":"route","name":"/","qualified_name":"src/router/index.ts::route:/","file_path":"src/router/index.ts","language":"typescript","start_line":5,"end_line":5,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"route:src/router/index.ts:6:/login:vue","kind":"route","name":"/login","qualified_name":"src/router/index.ts::route:/login","file_path":"src/router/index.ts","language":"typescript","start_line":6,"end_line":6,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"route:src/router/index.ts:7:/profile/:username:vue","kind":"route","name":"/profile/:username","qualified_name":"src/router/index.ts::route:/profile/:username","file_path":"src/router/index.ts","language":"typescript","start_line":7,"end_line":7,"start_column":0,"end_column":0,"docstring":null,"signature":null,"visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-== edges (63)
+== edges (65)
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"component:4adc8e1e4bb22917b580e3d56a1ea521","kind":"calls","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":10,"col":15,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"component:a2b972002bba2cab19e7c5b8376f5608","kind":"calls","metadata":"{\"synthesizedBy\":\"jsx-render\",\"via\":\"TheHeader\"}","line":1,"col":null,"provenance":"heuristic"}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"component:a2b972002bba2cab19e7c5b8376f5608","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"TheHeader\"}","line":2,"col":21,"provenance":null}
@@ -60,6 +60,7 @@
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"import:e479f74976640946cd942a1c120728fd","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"import:e725b097897b9381f422d2cc6a84390d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:51ec8fb32fb2e5eb0334651e5437dbb3","target":"method:714c8d0d55d742be8fb59cfdaeecefc2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"component:a2b972002bba2cab19e7c5b8376f5608","target":"constant:a9f2e86d1d4a623601d625c820f6d4f8","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"emit\"}","line":2,"col":43,"provenance":null}
 {"source":"component:a2b972002bba2cab19e7c5b8376f5608","target":"constant:a9f2e86d1d4a623601d625c820f6d4f8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:a2b972002bba2cab19e7c5b8376f5608","target":"route:src/router/index.ts:6:/login:vue","kind":"navigates","metadata":"{\"synthesizedBy\":\"vue-router-link\",\"href\":\"/login\",\"navMethod\":\"link\",\"registeredAt\":\"src/components/TheHeader.vue:2\"}","line":2,"col":null,"provenance":"heuristic"}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"component:bb25dfa092c88625d329317b0410e2cf","kind":"calls","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":9,"col":15,"provenance":null}
@@ -73,6 +74,7 @@
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"import:cb1810af8536de8faf29efc9265c1557","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"import:f38ceaeccfd0e13483a209bbc3005ae3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"route:src/router/index.ts:5:/:vue","kind":"navigates","metadata":"{\"synthesizedBy\":\"vue-router-link\",\"href\":\"home\",\"navMethod\":\"link\",\"by\":\"name\",\"registeredAt\":\"src/views/Login.vue:2\"}","line":2,"col":null,"provenance":"heuristic"}
+{"source":"component:d243da7dd7c0285f73fbc46926de4830","target":"function:cbf5b3b6d9cf6f3f971b79716cb24ec1","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"cellClass\"}","line":2,"col":56,"provenance":null}
 {"source":"component:d243da7dd7c0285f73fbc46926de4830","target":"function:cbf5b3b6d9cf6f3f971b79716cb24ec1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"constant:cc53d30032c6a64950637c56908b7d0b","target":"component:4adc8e1e4bb22917b580e3d56a1ea521","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/views/Home.vue\"}","line":5,"col":48,"provenance":null}
 {"source":"constant:cc53d30032c6a64950637c56908b7d0b","target":"component:51ec8fb32fb2e5eb0334651e5437dbb3","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/views/Profile.vue\"}","line":7,"col":68,"provenance":null}
diff --git a/__tests__/fixtures/kernel-parity/TortureReadsTypes.dart b/__tests__/fixtures/kernel-parity/TortureReadsTypes.dart
new file mode 100644
index 0000000000..c84e34e551
--- /dev/null
+++ b/__tests__/fixtures/kernel-parity/TortureReadsTypes.dart
@@ -0,0 +1,131 @@
+// Getter reads (#2338) and type positions outside signatures (#2327).
+import 'package:app/model.dart' as m;
+import 'package:app/model.dart';
+
+// The type an extension is `on`: plain, generic, prefixed, nullable.
+extension ReportX on Report {
+  bool get high => score > 5;
+}
+
+extension ListX<T extends Report> on List<T> {
+  int get total => length;
+}
+
+extension PrefixedX on m.Report? {
+  bool get present => this != null;
+}
+
+extension on Map<String, Report> {
+  int get size2 => length;
+}
+
+mixin Scored on Report {
+  int bump() => score + 1;
+}
+
+// Field declarations: instance, nullable, generic, static, late, prefixed,
+// function-typed, record-typed, untyped with a generic initializer.
+class Holder {
+  final Report report;
+  Report? maybe;
+  final List<Report> all = [];
+  static final Report fallback = Report(0);
+  static const List<Report> none = <Report>[];
+  late final m.Report prefixed;
+  final void Function(Report r)? onTap = null;
+  (Report, int)? pair;
+  var untyped = Family<Report?, String>();
+  final Map<String, List<Report>> byKey = {};
+  int count = 0, other = 1;
+
+  Holder(this.report);
+
+  Report get first => all.first;
+
+  int read(Holder h, Report r) {
+    final local = Holder(r);
+    return h.report.score + local.all.length + r.score + h.maybe!.score;
+  }
+}
+
+enum Grade {
+  a(null),
+  b(null);
+
+  const Grade(this.best);
+  final Report? best;
+  static const Grade top = Grade.a;
+  String get label => name;
+}
+
+// Top-level variables: typed, generic, function-typed, record-typed,
+// untyped with generic initializers, constants.
+Report? current;
+List<Report> history = [];
+void Function(Report)? listener;
+(Report, String) tagged = (Report(1), 'x');
+var plain = <Report>[];
+var counts = Map<String, Report>();
+final reportProvider = Family<Report?, String>();
+const empty = <Report>[];
+final handler = (Report r) => r.score;
+
+class Family<T, A> {
+  const Family();
+}
+
+class Config {
+  static Config get instance => Config();
+  String get name => 'cfg';
+  void load() {}
+}
+
+int reads(Holder h, Grade g, Report? r) {
+  // Plain and conditional reads, a static getter, an enum value.
+  final a = h.first;
+  final b = r?.score;
+  final c = Config.instance;
+  final d = Grade.top;
+  final e = g.label;
+  // Calls are not reads; the head of a chain is.
+  h.read(h, h.report);
+  Config.instance.load();
+  final f = h.report.score;
+  // Cascades, assignments and compound assignments are not reads.
+  h..maybe;
+  h.maybe = null;
+  h.count += 1;
+  // Reads inside interpolation, arguments, closures and nested functions.
+  print('${h.count} ${g.label}');
+  final cb = (Holder x) => x.first;
+  int nested(Holder y) {
+    final List<Report> rs = y.all;
+    return y.count + rs.length;
+  }
+  return nested(h) + cb(h).score + (a.score) + (b ?? 0) + c.name.length + d.index + e.length + f;
+}
+
+Object types(Object o) {
+  // Local types, generic arguments, casts, type tests, catch types,
+  // collection literals; constructor calls stay calls.
+  final Report local = o as Report;
+  List<Report> xs = <Report>[local];
+  final Map<String, Report> byName = {'a': local};
+  final ys = <Report>{};
+  if (o is Report) {}
+  if (o is! Holder) {}
+  final f = Future<Report?>.value(null);
+  final g = Family<Report, m.Report>();
+  final made = Report(1);
+  final built = const Report(2);
+  final old = new Holder(local);
+  final generic = Family<Report, int>();
+  // Positions after multi-byte text are UTF-16 columns on both arms.
+  final label = 'é😀'; final Report? again = local; final n = again?.score;
+  try {
+    throw StateError('x');
+  } on StateError catch (_) {
+  } on FormatException {
+  }
+  return [xs, byName, ys, f, g, made, built, old, generic, label, n];
+}
diff --git a/__tests__/go-nested-module.test.ts b/__tests__/go-nested-module.test.ts
new file mode 100644
index 0000000000..52c28536df
--- /dev/null
+++ b/__tests__/go-nested-module.test.ts
@@ -0,0 +1,355 @@
+/**
+ * Go modules whose `go.mod` is not at the project root (#2322).
+ *
+ * A Go backend kept next to a frontend (`server/go.mod`, `web/package.json`),
+ * or several modules side by side — etcd's root module beside `server/go.mod`
+ * and `client/v3/go.mod`: each module's import paths start with its own
+ * module path, and name a directory under that module's root. Only the
+ * project-root `go.mod` used to be read, so with the module in `svc/` both
+ * `store.New()` and `s.db.CreateItem()` lost their callers. An import path
+ * belongs to the module declaring the longest prefix of it, and a name
+ * written through a package is that package's — never a same-named symbol of
+ * another package. A root-level `go.mod` resolves exactly as before.
+ */
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+const STORE = `package store
+
+type Manager struct{}
+
+func New() *Manager { return &Manager{} }
+
+func (m *Manager) CreateItem(name string) error { return nil }
+`;
+
+const CLOCK = `package clock
+
+func Now() int { return 0 }
+`;
+
+// The issue's service, plus a call into a package outside `internal/`.
+const service = (mod: string) => `package domain
+
+import (
+	"${mod}/internal/store"
+	"${mod}/pkg/clock"
+)
+
+type Service struct {
+	db *store.Manager
+}
+
+func NewService() *Service {
+	return &Service{db: store.New()}
+}
+
+func (s *Service) AddItem(name string) error {
+	return s.db.CreateItem(name)
+}
+
+func Stamp() int {
+	return clock.Now()
+}
+`;
+
+const projects: Array<{ root: string; cg: CodeGraph }> = [];
+
+async function indexProject(files: Record<string, string>): Promise<CodeGraph> {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-go-nested-mod-'));
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  const cg = await CodeGraph.init(root, { index: true });
+  projects.push({ root, cg });
+  return cg;
+}
+
+afterAll(() => {
+  for (const { root, cg } of projects) {
+    cg.close();
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+/** `file::qualifiedName` of every `kind` target of the symbol `name` in `file`. */
+function targets(cg: CodeGraph, file: string, name: string, kind = 'calls'): string[] {
+  const fn = cg.getNodesInFile(file).find((n) => n.name === name);
+  expect(fn, `${name} in ${file}`).toBeDefined();
+  return cg
+    .getOutgoingEdges(fn!.id)
+    .filter((e) => e.kind === kind)
+    .map((e) => cg.getNode(e.target)!)
+    .map((n) => `${n.filePath.replace(/\\/g, '/')}::${n.qualifiedName}`)
+    .sort();
+}
+
+describe('Go module in a subdirectory (#2322)', () => {
+  let cg: CodeGraph;
+  beforeAll(async () => {
+    cg = await indexProject({
+      'svc/go.mod': 'module example.com/app/svc\n\ngo 1.22\n',
+      'svc/internal/store/store.go': STORE,
+      'svc/pkg/clock/clock.go': CLOCK,
+      'svc/internal/domain/service.go': service('example.com/app/svc'),
+      'web/package.json': '{ "name": "web" }\n',
+    });
+  });
+
+  it('resolves a package-qualified call into the module', () => {
+    expect(targets(cg, 'svc/internal/domain/service.go', 'NewService')).toEqual([
+      'svc/internal/store/store.go::New',
+    ]);
+    expect(targets(cg, 'svc/internal/domain/service.go', 'Stamp')).toEqual([
+      'svc/pkg/clock/clock.go::Now',
+    ]);
+  });
+
+  it('resolves a call through a struct field typed with a package of the module', () => {
+    expect(targets(cg, 'svc/internal/domain/service.go', 'AddItem')).toEqual([
+      'svc/internal/store/store.go::Manager::CreateItem',
+    ]);
+  });
+});
+
+describe('Go modules side by side (#2322)', () => {
+  let cg: CodeGraph;
+  beforeAll(async () => {
+    cg = await indexProject({
+      // etcd's shape: a root module, and a sibling whose path is not under it.
+      'go.mod': 'module example.com/etcd/v3\n\ngo 1.22\n',
+      'etcdutl/main.go': `package main
+
+import "example.com/etcd/server/v3/storage/wal"
+
+func main() {
+	wal.OpenForRead("dir")
+}
+`,
+      'server/go.mod': 'module example.com/etcd/server/v3\n\ngo 1.22\n',
+      'server/storage/wal/wal.go': 'package wal\n\nfunc OpenForRead(dir string) error { return nil }\n',
+      'server/api/api.go': 'package api\n\nfunc Start() int { return 1 }\n',
+      'server/cmd/main.go': `package main
+
+import (
+	"example.com/etcd/server/v3/api"
+	"example.com/tools/lint"
+)
+
+type App struct {
+	linter *lint.Linter
+}
+
+func main() {
+	api.Start()
+	lint.Run()
+}
+
+func (a *App) check() {
+	a.linter.Check()
+}
+`,
+      'server/cmd/ext.go': `package main
+
+import (
+	"example.com/toolsx/api"
+)
+
+func external() {
+	api.Start()
+}
+`,
+      'tools/go.mod': 'module example.com/tools\n\ngo 1.22\n',
+      'tools/api/api.go': 'package api\n\nfunc Start() int { return 2 }\n',
+      'tools/lint/lint.go': `package lint
+
+type Linter struct{}
+
+func Run() {}
+
+func (l *Linter) Check() {}
+`,
+      'tools/gen/gen.go': `package main
+
+import "example.com/tools/api"
+
+func generate() {
+	api.Start()
+}
+`,
+    });
+  });
+
+  it('resolves an import of a sibling module whose path is not under the root module', () => {
+    expect(targets(cg, 'etcdutl/main.go', 'main')).toEqual(['server/storage/wal/wal.go::OpenForRead']);
+  });
+
+  it("resolves each module's import into that module's own package", () => {
+    expect(targets(cg, 'tools/gen/gen.go', 'generate')).toEqual(['tools/api/api.go::Start']);
+    expect(targets(cg, 'server/cmd/main.go', 'main')).toEqual([
+      'server/api/api.go::Start',
+      'tools/lint/lint.go::Run',
+    ]);
+  });
+
+  it("follows a struct field typed with the other module's package", () => {
+    expect(targets(cg, 'server/cmd/main.go', 'check')).toEqual(['tools/lint/lint.go::Linter::Check']);
+  });
+
+  it('leaves an import that only shares a prefix with a module path unresolved', () => {
+    expect(targets(cg, 'server/cmd/ext.go', 'external')).toEqual([]);
+  });
+});
+
+describe('Names written through a package of a nested module (#2322)', () => {
+  let cg: CodeGraph;
+  beforeAll(async () => {
+    cg = await indexProject({
+      'src/go.mod': 'module example.com/harbor/src\n\ngo 1.22\n',
+      'src/jobservice/job/op.go': 'package job\n\ntype OPCommand string\n',
+      // A result type spelled like the method that returns it.
+      'src/jobservice/impl/context.go': `package impl
+
+import "example.com/harbor/src/jobservice/job"
+
+type Context struct{}
+
+func (c *Context) OPCommand() (job.OPCommand, bool) {
+	return "", false
+}
+`,
+      'src/pkg/artifact/manager.go': `package artifact
+
+type Manager interface {
+	Count() int64
+}
+`,
+      // A caching wrapper delegating to the same-named type of another package.
+      'src/pkg/cached/redis/manager.go': `package redis
+
+import "example.com/harbor/src/pkg/artifact"
+
+type Manager struct {
+	delegator artifact.Manager
+}
+
+func (m *Manager) Count() int64 {
+	return m.delegator.Count()
+}
+`,
+      // A test fixture claiming the real module's path. The go tool ignores
+      // testdata, so it never answers another module's import of that path.
+      'internal/testdata/stub/go.mod': 'module example.com/harbor/src\n\ngo 1.22\n',
+      'internal/testdata/stub/pkg/artifact/manager.go': `package artifact
+
+type Manager interface {
+	Count() int64
+}
+`,
+      'tools/go.mod': 'module example.com/harbor/tools\n\ngo 1.22\n',
+      'tools/report/report.go': `package report
+
+import "example.com/harbor/src/pkg/artifact"
+
+type Reporter struct {
+	mgr artifact.Manager
+}
+
+func (r *Reporter) Total() int64 {
+	return r.mgr.Count()
+}
+`,
+    });
+  });
+
+  it('a type reference lands on the named package’s type, not a same-named method', () => {
+    expect(targets(cg, 'src/jobservice/impl/context.go', 'OPCommand', 'references')).toEqual([
+      'src/jobservice/job/op.go::OPCommand',
+    ]);
+  });
+
+  it('a field typed with another package’s same-named type reaches that type, not the caller itself', () => {
+    expect(targets(cg, 'src/pkg/cached/redis/manager.go', 'Count')).toEqual([
+      'src/pkg/artifact/manager.go::Manager::Count',
+    ]);
+  });
+
+  it('a module under testdata never answers for the module it imitates', () => {
+    expect(targets(cg, 'tools/report/report.go', 'Total')).toEqual([
+      'src/pkg/artifact/manager.go::Manager::Count',
+    ]);
+  });
+});
+
+describe('Two Go modules declaring the same path (#2322)', () => {
+  let cg: CodeGraph;
+  beforeAll(async () => {
+    const files: Record<string, string> = {};
+    for (const copy of ['v1', 'v2']) {
+      files[`${copy}/go.mod`] = 'module example.com/app/svc\n\ngo 1.22\n';
+      files[`${copy}/internal/store/store.go`] = STORE;
+      files[`${copy}/pkg/clock/clock.go`] = CLOCK;
+      files[`${copy}/internal/domain/service.go`] = service('example.com/app/svc');
+    }
+    cg = await indexProject(files);
+  });
+
+  it("resolves each copy's imports into its own module", () => {
+    for (const copy of ['v1', 'v2']) {
+      expect(targets(cg, `${copy}/internal/domain/service.go`, 'NewService')).toEqual([
+        `${copy}/internal/store/store.go::New`,
+      ]);
+      expect(targets(cg, `${copy}/internal/domain/service.go`, 'Stamp')).toEqual([
+        `${copy}/pkg/clock/clock.go::Now`,
+      ]);
+    }
+  });
+});
+
+describe('Go module at the project root', () => {
+  let cg: CodeGraph;
+  beforeAll(async () => {
+    cg = await indexProject({
+      'go.mod': 'module example.com/app/svc\n\ngo 1.22\n',
+      'internal/store/store.go': STORE,
+      'pkg/clock/clock.go': CLOCK,
+      'internal/domain/service.go': service('example.com/app/svc'),
+    });
+  });
+
+  it('resolves exactly as before', () => {
+    expect(targets(cg, 'internal/domain/service.go', 'NewService')).toEqual(['internal/store/store.go::New']);
+    expect(targets(cg, 'internal/domain/service.go', 'Stamp')).toEqual(['pkg/clock/clock.go::Now']);
+    expect(targets(cg, 'internal/domain/service.go', 'AddItem')).toEqual([
+      'internal/store/store.go::Manager::CreateItem',
+    ]);
+  });
+});
+
+
+describe('Go module declarations between resolution passes', () => {
+  it('refreshes renamed, removed and newly nested module paths during sync', async () => {
+    const main = (module: string) => `package main\nimport "${module}/p"\nfunc run() { p.Call() }\n`;
+    const cg = await indexProject({
+      'go.mod': 'module example.com/root\n',
+      'svc/go.mod': 'module example.com/svc\n',
+      'svc/p/p.go': 'package p\nfunc Call() {}\n',
+      'main.go': main('example.com/svc'),
+    });
+    const root = projects.find(project => project.cg === cg)!.root;
+    const expected = ['svc/p/p.go::Call'];
+    expect(targets(cg, 'main.go', 'run')).toEqual(expected);
+    for (const module of ['example.com/renamed', null, 'example.com/added']) {
+      const modFile = path.join(root, 'svc/go.mod');
+      if (module) fs.writeFileSync(modFile, `module ${module}\n`);
+      else fs.unlinkSync(modFile);
+      fs.writeFileSync(path.join(root, 'main.go'), main(module ?? 'example.com/root/svc'));
+      await cg.sync();
+      expect(targets(cg, 'main.go', 'run'), `module transition ${module}`).toEqual(expected);
+    }
+  });
+});
diff --git a/__tests__/go-package-call-chain.test.ts b/__tests__/go-package-call-chain.test.ts
index bbdee9531c..27fcdb896e 100644
--- a/__tests__/go-package-call-chain.test.ts
+++ b/__tests__/go-package-call-chain.test.ts
@@ -80,3 +80,60 @@ describe('Go pkg.New().Method() follows the imported function result type', () =
     expect(methods(out)).toEqual([]);
   });
 });
+
+
+describe('Go factory results retain their declaration package', () => {
+  const packages = {
+    'go.mod': 'module example.com/m\n\ngo 1.21\n',
+    'other/type.go': 'package other\ntype Widget struct{}\nfunc (w *Widget) Bar() {}\n',
+    'decoy/type.go': 'package decoy\ntype Widget struct{}\nfunc (w *Widget) Bar() {}\n',
+  };
+  it.each(['*alias.Widget', '(value *alias.Widget, err error)'])('places a package factory result %s using its own imports', async (result) => {
+    const out = await callees({
+      ...packages,
+      'factory/new.go': `package factory
+import alias "example.com/m/other"
+type Widget struct{}
+func (w *Widget) Bar() {}
+func New() ${result} { panic("fixture") }
+`,
+      'caller/main.go': `package caller
+import (
+  "example.com/m/factory"
+  alias "example.com/m/decoy"
+)
+type Widget struct{}
+func (w *Widget) Bar() {}
+func caller() { factory.New().Bar() }
+`,
+    }, 'caller');
+    expect(methods(out)).toEqual(['method:Widget::Bar@other/type.go']);
+  });
+  it('places a bare factory from a sibling file using the declaration imports', async () => {
+    const out = await callees({
+      ...packages,
+      'caller/new.go': 'package caller\nimport alias "example.com/m/other"\nfunc New() *alias.Widget { return nil }\n',
+      'caller/main.go': 'package caller\nimport alias "example.com/m/decoy"\nfunc caller() { New().Bar() }\n',
+    }, 'caller');
+    expect(methods(out)).toEqual(['method:Widget::Bar@other/type.go']);
+  });
+  it('does not borrow a package factory for a shadowing function parameter', async () => {
+    const out = await callees({
+      ...packages,
+      'caller/new.go': 'package caller\nimport alias "example.com/m/other"\nfunc New() *alias.Widget { return nil }\n',
+      'caller/main.go': 'package caller\nfunc caller(New func() any) { New().Bar() }\n',
+    }, 'caller');
+    expect(methods(out)).toEqual([]);
+  });
+  it.each(['[]alias.Widget', 'map[string]alias.Widget'])('does not use element methods for a collection result %s', async (result) => {
+    const out = await callees({
+      ...packages,
+      'factory/new.go': `package factory
+import alias "example.com/m/other"
+func New() ${result} { return nil }
+`,
+      'caller/main.go': 'package caller\nimport "example.com/m/factory"\nfunc caller() { factory.New().Bar() }\n',
+    }, 'caller');
+    expect(methods(out)).toEqual([]);
+  });
+});
diff --git a/__tests__/go-unexported-receiver.test.ts b/__tests__/go-unexported-receiver.test.ts
new file mode 100644
index 0000000000..dca097d928
--- /dev/null
+++ b/__tests__/go-unexported-receiver.test.ts
@@ -0,0 +1,140 @@
+/**
+ * Go calls through a method receiver of an unexported type (#2323).
+ *
+ * `func (s *server) Create()` is the idiomatic shape of gRPC and HTTP
+ * handlers, but only a PascalCase typed parameter used to give a receiver its
+ * type, so `s.service.AddItem()` — and every other call through `s` — lost its
+ * edge. Unexported names repeat across packages (each package may have its
+ * own `server`), so a receiver's type is its own package's: a same-named type
+ * elsewhere, with the same method or the same field, is never the target.
+ */
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-go-unexported-recv-'));
+  const files: Record<string, string> = {
+    'go.mod': 'module example.com/app\n\ngo 1.22\n',
+    'internal/domain/service.go': `package domain
+
+type Service struct{}
+
+func (s *Service) AddItem(name string) error { return nil }
+
+func (s *Service) Count() int { return 0 }
+`,
+    // The issue's handler, plus calls on the receiver itself, through a type
+    // it embeds and through a field of an unexported type.
+    'internal/handlers/server.go': `package handlers
+
+import "example.com/app/internal/domain"
+
+type server struct {
+	BaseAPI
+	service *domain.Service
+	store   *store
+}
+
+func (s *server) Create(name string) error {
+	s.store.Put(name)
+	s.Close()
+	s.SendError()
+	return s.service.AddItem(name)
+}
+
+type cache[T any] struct {
+	service *domain.Service
+}
+
+func (c *cache[T]) Size() int {
+	return c.service.Count()
+}
+`,
+    'internal/handlers/store.go': `package handlers
+
+type store struct{}
+
+func (st *store) Put(name string) {}
+
+func (s *server) Close() {}
+`,
+    'internal/handlers/base.go': `package handlers
+
+type BaseAPI struct{}
+
+func (b *BaseAPI) SendError() {}
+`,
+    // Another package declaring the same unexported names: never a target.
+    'internal/admin/server.go': `package admin
+
+type server struct {
+	BaseAPI
+	store *store
+}
+
+type store struct{}
+
+func (st *store) Put(name string) {}
+
+func (s *server) Close() {}
+
+type BaseAPI struct{}
+
+func (b *BaseAPI) SendError() {}
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `file::qualifiedName` of every symbol the function `name` in `file` calls. */
+function callTargets(file: string, name: string): string[] {
+  const fn = cg.getNodesInFile(file).find((n) => n.name === name);
+  expect(fn, `${name} in ${file}`).toBeDefined();
+  return cg
+    .getOutgoingEdges(fn!.id)
+    .filter((e) => e.kind === 'calls')
+    .map((e) => cg.getNode(e.target)!)
+    .map((n) => `${n.filePath.replace(/\\/g, '/')}::${n.qualifiedName}`)
+    .sort();
+}
+
+describe('Go calls through an unexported method receiver (#2323)', () => {
+  it('resolves a call through a field of the receiver', () => {
+    expect(callTargets('internal/handlers/server.go', 'Create')).toContain(
+      'internal/domain/service.go::Service::AddItem'
+    );
+  });
+
+  it('resolves a generic receiver past its type parameters', () => {
+    expect(callTargets('internal/handlers/server.go', 'Size')).toEqual([
+      'internal/domain/service.go::Service::Count',
+    ]);
+  });
+
+  it("resolves every call within the receiver's own package, never a same-named type's in another", () => {
+    expect(callTargets('internal/handlers/server.go', 'Create')).toEqual([
+      'internal/domain/service.go::Service::AddItem',
+      'internal/handlers/base.go::BaseAPI::SendError',
+      'internal/handlers/store.go::server::Close',
+      'internal/handlers/store.go::store::Put',
+    ]);
+    for (const decoy of cg.getNodesInFile('internal/admin/server.go').filter((n) => n.kind === 'method')) {
+      expect(cg.getIncomingEdges(decoy.id).filter((e) => e.kind === 'calls'), decoy.qualifiedName).toEqual([]);
+    }
+  });
+});
diff --git a/__tests__/integration/full-pipeline.test.ts b/__tests__/integration/full-pipeline.test.ts
index fc3aab2e70..6a2fca222f 100644
--- a/__tests__/integration/full-pipeline.test.ts
+++ b/__tests__/integration/full-pipeline.test.ts
@@ -15,7 +15,7 @@
  * crawl).
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
@@ -402,4 +402,52 @@ Run the setup command.
       cg.destroy();
     }
   });
+  it('reports durationMs for the whole run, resolution and linking included (#2334)', async () => {
+    // The CLI summary printed the orchestrator's time — extraction alone —
+    // beside the totals of the whole run, so slow resolution never showed.
+    generateSyntheticProject(tempDir, 10);
+    const cg = await CodeGraph.init(tempDir, {
+      config: { include: ['**/*.ts'], exclude: [] },
+    });
+    const internals = cg as unknown as {
+      orchestrator: Record<'indexAll' | 'sync', (...args: unknown[]) => Promise<{ durationMs: number }>>;
+      resolver: { resolveDeferredThisMemberRefs: () => Promise<number> };
+    };
+    // What the orchestrator measured; and a linking pass that takes a known while.
+    let extraction = -1;
+    const measure = (method: 'indexAll' | 'sync') => {
+      const original = internals.orchestrator[method].bind(internals.orchestrator);
+      vi.spyOn(internals.orchestrator, method).mockImplementation(async (...args: unknown[]) => {
+        const result = await original(...args);
+        extraction = result.durationMs;
+        return result;
+      });
+    };
+    const LINKING_MS = 250;
+    const linking = internals.resolver.resolveDeferredThisMemberRefs.bind(internals.resolver);
+    vi.spyOn(internals.resolver, 'resolveDeferredThisMemberRefs').mockImplementation(async () => {
+      const until = Date.now() + LINKING_MS;
+      while (Date.now() < until) await new Promise((r) => setTimeout(r, 10));
+      return linking();
+    });
+
+    try {
+      measure('indexAll');
+      const indexed = await cg.indexAll();
+      expect(extraction).toBeGreaterThanOrEqual(0);
+      expect(indexed.durationMs).toBeGreaterThanOrEqual(extraction + LINKING_MS);
+
+      // Likewise a sync that re-resolves a changed file.
+      fs.appendFileSync(path.join(tempDir, 'src', 'index.ts'), 'export function again(): number { return entry(); }\n');
+      extraction = -1;
+      measure('sync');
+      const synced = await cg.sync();
+      expect(synced.filesModified).toBe(1);
+      expect(extraction).toBeGreaterThanOrEqual(0);
+      expect(synced.durationMs).toBeGreaterThanOrEqual(extraction + LINKING_MS);
+    } finally {
+      vi.restoreAllMocks();
+      cg.destroy();
+    }
+  }, 30_000);
 });
diff --git a/__tests__/js-builtin-method-calls.test.ts b/__tests__/js-builtin-method-calls.test.ts
index d2d1f8f4c7..d850f3fdff 100644
--- a/__tests__/js-builtin-method-calls.test.ts
+++ b/__tests__/js-builtin-method-calls.test.ts
@@ -108,8 +108,8 @@ ${typed ? 'export function typed(cart: Cart) { cart.map(); }' : ''}
     for (const name of ['tidy', 'cached', 'unknownCache', 'literalArray', 'literalString']) expect(callees(name), name).toEqual([]);
     expect(callees('constructed')).toContain('Cart::add');
     expect(callees('imported')).toContain('Cart::bind');
-    expect(callees('objectLiteral')).toEqual(['map']);
-    expect(callees('localLiteral')).toEqual(['map']);
+    expect(callees('objectLiteral')).toEqual(['api::map']);
+    expect(callees('localLiteral')).toEqual(['local::map']);
     if (typed) expect(callees('typed')).toEqual(['Cart::map']);
     const self = cg.getNodesByKind('method').find(n => n.qualifiedName === 'Cart::self')!;
     expect(cg.getCallees(self.id).map(c => c.node.qualifiedName)).toEqual(['Cart::add']);
diff --git a/__tests__/js-object-literal-members.test.ts b/__tests__/js-object-literal-members.test.ts
new file mode 100644
index 0000000000..d55721a314
--- /dev/null
+++ b/__tests__/js-object-literal-members.test.ts
@@ -0,0 +1,320 @@
+/**
+ * A named object literal owns its function members (#2300). Members used to
+ * become nodes only when the object was an `export const`; a plain `const`, an
+ * object inside an IIFE and one hung on a path (`window.WS = {…}`) produced
+ * none, so script-tag JavaScript was nearly invisible and the calls inside a
+ * member were credited to the enclosing constant (or lost).
+ *
+ * Now each member is a `function` node qualified under its owner
+ * (`store::shorthand`, `window.WS::wsM`), the calls written in it are its own,
+ * and the calls that reach it — `App.init()`, `window.App.init()`, a sibling's
+ * `this.render()`, `App.utils.pad()`, a classic script's `WS.wsM()` from
+ * another file — resolve to it. A bare `init()` never does.
+ */
+
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+import { getKernel, resetKernelForTests } from '../src/extraction/kernel';
+
+const kernelBuilt = fs.existsSync(path.join(__dirname, '../codegraph-kernel/prebuilds',
+  `${process.platform}-${process.arch}`, 'codegraph-kernel.node'));
+
+describe.each(['native', 'generic'].filter((backend) => backend === 'generic' || kernelBuilt))(
+  'object-literal members (%s, #2300)', (backend) => {
+  let dir: string;
+  let cg: CodeGraph | undefined;
+
+  beforeEach(() => {
+    vi.stubEnv('CODEGRAPH_KERNEL', backend === 'generic' ? '0' : '1');
+    vi.stubEnv('CODEGRAPH_KERNEL_LANGS', 'all');
+    resetKernelForTests();
+    if (backend === 'native') expect(getKernel()).not.toBeNull();
+    dir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-2300-'));
+  });
+
+  afterEach(() => {
+    cg?.close();
+    cg = undefined;
+    fs.rmSync(dir, { recursive: true, force: true });
+    vi.unstubAllEnvs();
+    resetKernelForTests();
+  });
+
+  async function index(files: Record<string, string>): Promise<CodeGraph> {
+    for (const [rel, body] of Object.entries(files)) {
+      fs.mkdirSync(path.dirname(path.join(dir, rel)), { recursive: true });
+      fs.writeFileSync(path.join(dir, rel), body);
+    }
+    cg = await CodeGraph.init(dir, { index: true });
+    return cg;
+  }
+
+  /** The one node with this qualified name (in `file`, when several share it). */
+  function node(g: CodeGraph, qualifiedName: string, file?: string) {
+    const found = g.getNodesByQualifiedName(qualifiedName).filter((n) => !file || n.filePath === file);
+    expect(found, qualifiedName).toHaveLength(1);
+    return found[0]!;
+  }
+  /** The qualified names at the other end of a node's `calls` edges. */
+  const calls = (g: CodeGraph, id: string, direction: 'in' | 'out') =>
+    (direction === 'in' ? g.getIncomingEdges(id) : g.getOutgoingEdges(id))
+      .filter((e) => e.kind === 'calls')
+      .map((e) => g.getNode(direction === 'in' ? e.source : e.target)!.qualifiedName)
+      .sort();
+  const callers = (g: CodeGraph, qn: string, file?: string) => calls(g, node(g, qn, file).id, 'in');
+  const callees = (g: CodeGraph, qn: string, file?: string) => calls(g, node(g, qn, file).id, 'out');
+
+  it('gives every container shape from the issue its members, and the calls in a member to that member', async () => {
+    const g = await index({
+      'src/a_export.ts': 'export const objTsExp = { tsExpM() { return 1; }, tsExpProp: () => 1 };\n',
+      'src/b_plain.ts': 'const objTsPlain = { tsPlainM() { return 1; }, tsPlainProp: () => 1 };\n',
+      'src/c_export.js': 'export const objJsExp = { jsExpM() { return 1; }, jsExpProp: () => 1 };\n',
+      'src/d_plain.js': 'const objJsPlain = { jsPlainM() { return 1; }, jsPlainProp: () => 1 };\n',
+      'src/e_iife.js': [
+        '(function () {',
+        '  const objIife = { iifeM() { return 1; } };',
+        '  window.WS = { wsM() { return objIife.iifeM(); } };',
+        '})();',
+        '',
+      ].join('\n'),
+      'src/f_calls.js': [
+        'function helper() { return 2; }',
+        'var store = { shorthand() { return helper(); } };',
+        'function useStore() { return store.shorthand(); }',
+        'window.api = { load() { return store.shorthand(); } };',
+        'function viaWindow() { return window.WS.wsM(); }',
+        'function viaGlobal() { return WS.wsM(); }',
+        '',
+      ].join('\n'),
+    });
+
+    for (const qn of [
+      'objTsExp::tsExpM', 'objTsExp::tsExpProp', 'objTsPlain::tsPlainM', 'objTsPlain::tsPlainProp',
+      'objJsExp::jsExpM', 'objJsExp::jsExpProp', 'objJsPlain::jsPlainM', 'objJsPlain::jsPlainProp',
+      'objIife::iifeM', 'window.WS::wsM', 'store::shorthand', 'window.api::load',
+    ]) {
+      expect(node(g, qn).kind, qn).toBe('function');
+    }
+    // The member belongs to its owner, and `window.WS` is the global `WS`.
+    const plain = node(g, 'objTsPlain');
+    expect(g.getOutgoingEdges(plain.id).filter((e) => e.kind === 'contains').map((e) => g.getNode(e.target)!.name).sort())
+      .toEqual(['tsPlainM', 'tsPlainProp']);
+    expect(g.getNodesByName('WS').map((n) => `${n.kind} ${n.qualifiedName}`)).toEqual(['variable window.WS']);
+    // An exported literal's members stay exported, a plain one's do not.
+    expect(node(g, 'objTsExp::tsExpM').isExported).toBe(true);
+    expect(node(g, 'objTsPlain::tsPlainM').isExported).toBeFalsy();
+
+    // The call inside a member is the member's, not the constant's.
+    expect(callers(g, 'helper')).toEqual(['store::shorthand']);
+    expect(callers(g, 'objIife::iifeM')).toEqual(['window.WS::wsM']);
+    expect(callers(g, 'store::shorthand')).toEqual(['useStore', 'window.api::load']);
+    // `window.WS.wsM()`, and `WS.wsM()` from another classic script.
+    expect(callers(g, 'window.WS::wsM')).toEqual(['viaGlobal', 'viaWindow']);
+  });
+
+  it('resolves through the object the call names — never by the bare name', async () => {
+    const g = await index({
+      'app.js': [
+        'function init() { return "global"; }',
+        'var App = {',
+        '  init: function () { this.render(); helpers.fmt(); },',
+        '  render: function () { return 1; },',
+        '};',
+        'var helpers = { fmt() { return 2; } };',
+        'App.utils = { pad(s) { return s; } };',
+        'function boot() { App.init(); App.utils.pad("x"); init(); }',
+        'dw_page = { start() { App.render(); } };',
+        '',
+      ].join('\n'),
+      'page.js': [
+        'function main() { App.init(); window.App.render(); dw_page.start(); App.utils.pad("y"); }',
+        'function shadow(App) { return App.init(); }',
+        'function bare() { return render(); }',
+        '',
+      ].join('\n'),
+    });
+
+    expect(callees(g, 'boot')).toEqual(['App.utils::pad', 'App::init', 'init']);
+    expect(callees(g, 'App::init')).toEqual(['App::render', 'helpers::fmt']);
+    expect(callees(g, 'dw_page::start')).toEqual(['App::render']);
+    // Another script reaches the page's globals; a parameter of the same name does not.
+    expect(callees(g, 'main')).toEqual(['App.utils::pad', 'App::init', 'App::render', 'dw_page::start']);
+    expect(callees(g, 'shadow')).toEqual([]);
+    // `render()` alone is not `App.render`, and `init()` stays the global function.
+    expect(callees(g, 'bare')).toEqual([]);
+    expect(callers(g, 'init')).toEqual(['boot']);
+  });
+
+  it('never takes an object hung on a path, or one local to an IIFE, for a name elsewhere', async () => {
+    const g = await index({
+      // A Svelte project, where `$count` reads the store `count` — in a `.svelte` component.
+      'package.json': '{ "dependencies": { "svelte": "^4.0.0" } }\n',
+      'lib.js': [
+        '$.event.special.swipe = { setup: function () { return 1; } };',
+        'todos.model = { add: function () { return 2; } };',
+        '(function () { var n = { touch: function () { return 3; } }; n.touch(); })();',
+        '',
+      ].join('\n'),
+      'widget.js': [
+        'var Widget = {',
+        '  drag: function () { this.swipe(1); },',
+        '  make: function () { return new this.model(); },',
+        '};',
+        '',
+      ].join('\n'),
+      // Two compiled scripts, each with its own `$n`.
+      'gwt1.js': 'function $n(a) { this.a = a; }\nfunction make1() { return new $n(1); }\n',
+      'gwt2.js': 'function $n(a) { this.a = a; }\nfunction make2() { return new $n(2); }\n',
+    });
+    const edges = (qn: string) => g.getOutgoingEdges(node(g, qn).id).filter((e) => e.kind !== 'contains')
+      .map((e) => `${e.kind} ${g.getNode(e.target)!.qualifiedName} ${g.getNode(e.target)!.filePath}`);
+    // `this.swipe()` and `new this.model()` are not the objects at `$.event.special.swipe` and `todos.model`.
+    expect(edges('Widget::drag')).toEqual([]);
+    expect(edges('Widget::make')).toEqual([]);
+    // A plain script's `$n` is its own function, not a store read of the IIFE's `n`.
+    expect(edges('make1')).toEqual(['instantiates $n gwt1.js']);
+    expect(edges('make2')).toEqual(['instantiates $n gwt2.js']);
+  });
+
+  it('keeps each IIFE and function its own literal, and a module its private ones', async () => {
+    const g = await index({
+      'iife.js': [
+        '(function () { const Api = { run() { left(); } }; Api.run(); })();',
+        '(function () { const Api = { run() { right(); } }; Api.run(); })();',
+        'function left() {}',
+        'function right() {}',
+        'function outside() { return Api.run(); }',
+        'function a() { const local = { go() { left(); } }; local.go(); }',
+        'function b() { const local = { go() { right(); } }; local.go(); }',
+        '',
+      ].join('\n'),
+      'mod.js': 'import { x } from "./x.js";\nconst Local = { run() { return x; } };\nexport function useLocal() { return Local.run(); }\n',
+      'other.js': 'import { y } from "./y.js";\nexport function nope() { return Local.run(y); }\n',
+    });
+
+    const [first, second] = g.getNodesByQualifiedName('Api::run').sort((p, q) => p.startLine - q.startLine);
+    expect(calls(g, first!.id, 'out')).toEqual(['left']);
+    expect(calls(g, second!.id, 'out')).toEqual(['right']);
+    // Each IIFE's `Api.run()` reaches its own literal (the file runs both).
+    expect(calls(g, first!.id, 'in')).toEqual(['iife.js']);
+    expect(calls(g, second!.id, 'in')).toEqual(['iife.js']);
+    // Outside both IIFEs, `Api` is neither of them — not even as a value read.
+    expect(callees(g, 'outside')).toEqual([]);
+    expect(g.getOutgoingEdges(node(g, 'outside').id).filter((e) => e.kind !== 'contains')).toEqual([]);
+    expect(callees(g, 'a')).toEqual(['a::local::go']);
+    expect(callees(g, 'b')).toEqual(['b::local::go']);
+    expect(callees(g, 'useLocal')).toEqual(['Local::run']);
+    expect(callees(g, 'nope')).toEqual([]);
+  });
+
+  it('gives arrow members and values the `this` of the method around the literal', async () => {
+    const g = await index({
+      'app.ts': [
+        'class Emitter { on(cb: () => void) { return cb; } }',
+        'export class App {',
+        '  private emitter = new Emitter();',
+        '  updateScene() { return 1; }',
+        '  createApi() {',
+        '    const api = {',
+        '      updateScene: this.updateScene,',
+        '      onChange: (cb: () => void) => this.emitter.on(cb),',
+        '      refresh: () => this.updateScene(),',
+        '      own() { return this.refresh(); },',
+        '    };',
+        '    return api;',
+        '  }',
+        '}',
+        '',
+      ].join('\n'),
+    });
+    // A value in a method's literal is that method's own reference, as before.
+    const createApi = node(g, 'App::createApi');
+    expect(g.getOutgoingEdges(createApi.id).filter((e) => e.kind === 'references')
+      .map((e) => g.getNode(e.target)!.qualifiedName)).toContain('App::updateScene');
+    // An arrow member's `this` is the class instance…
+    expect(callees(g, 'App::createApi::api::onChange')).toEqual(['Emitter::on']);
+    expect(callees(g, 'App::createApi::api::refresh')).toEqual(['App::updateScene']);
+    // …an object's own method's `this` is the object.
+    expect(callees(g, 'App::createApi::api::own')).toEqual(['App::createApi::api::refresh']);
+  });
+
+  it('keeps a cross-file member edge through edits of the defining script', async () => {
+    const g = await index({
+      'ns.js': 'window.WS = { a() { return 1; }, wsM() { return 2; } };\n',
+      'use.js': 'function viaGlobal() { return WS.wsM(); }\n',
+    });
+    expect(callers(g, 'window.WS::wsM')).toEqual(['viaGlobal']);
+    fs.writeFileSync(path.join(dir, 'ns.js'), '// moved\nwindow.WS = {\n  wsM() { return 3; },\n};\n');
+    await g.sync();
+    expect(callers(g, 'window.WS::wsM')).toEqual(['viaGlobal']);
+    fs.writeFileSync(path.join(dir, 'ns.js'), 'window.WS = { renamed() { return 4; } };\n');
+    await g.sync();
+    expect(g.getNodesByQualifiedName('window.WS::wsM')).toEqual([]);
+    expect(callees(g, 'viaGlobal')).toEqual([]);
+  }, 30_000);
+
+  it('reaches an imported literal and a binding destructured off one', async () => {
+    const g = await index({
+      'api.js': [
+        'export const api = { get() { return 1; }, post() { return 2; } };',
+        'const { post } = api;',
+        'export function b() { return post(); }',
+        'export function c() { return get(); }',
+        '',
+      ].join('\n'),
+      'use.js': [
+        'import { api } from "./api.js";',
+        'export function a() { return api.get(); }',
+        '',
+      ].join('\n'),
+    });
+    expect(callees(g, 'a')).toEqual(['api::get']);
+    expect(callees(g, 'b')).toEqual(['api::post']);
+    // `get` was never destructured: a bare `get()` is not `api.get`.
+    expect(callees(g, 'c')).toEqual([]);
+  });
+
+  it('leaves CommonJS exports, prototypes, call arguments, data and minified bundles as they were', async () => {
+    const g = await index({
+      'shapes.js': [
+        'module.exports = { cjs() { return 1; } };',
+        'Foo.prototype = { proto() { return 1; } };',
+        'consume({ ephemeral() { return 1; } });',
+        'const data = { a: 1, b: [1, 2] };',
+        'this.state = { onThis() { return 1; } };',
+        '',
+      ].join('\n'),
+      'vendor/lib.min.js': 'var a={b:function(){return 1},c:function(){return 2}};window.L={d:function(){return a.b()}};\n',
+      // A bundle not named so: its lines are what gives it away.
+      'dist/bundle.js': `${'var q={b:function(){return r(1,2)},c:function(s){return s}};window.M={d:function(){return q.b()}};'.repeat(60)}\n`.repeat(2),
+      'iife.js': '(function () { var e; if (!e) { e = { getItem: function () { return 1; } }; } })();\n',
+    });
+    // …and a plain name reassigned inside a function (a bundle's `e = {…}`) is a local.
+    for (const name of ['cjs', 'proto', 'ephemeral', 'onThis', 'b', 'c', 'd', 'getItem']) {
+      expect(g.getNodesByName(name), name).toEqual([]);
+    }
+    expect(node(g, 'data').kind).toBe('constant');
+  });
+
+  it('keeps a <script setup> literal\'s members under their owner', async () => {
+    const g = await index({
+      'Panel.vue': [
+        '<template><button @click="save">Save</button></template>',
+        '<script setup>',
+        'const handlers = { onSave() { persist(); } };',
+        'function persist() {}',
+        'function save() { handlers.onSave(); }',
+        '</script>',
+        '',
+      ].join('\n'),
+    });
+    const owner = node(g, 'handlers');
+    const member = node(g, 'handlers::onSave');
+    expect(g.getIncomingEdges(member.id).filter((e) => e.kind === 'contains').map((e) => e.source)).toEqual([owner.id]);
+    expect(callees(g, 'handlers::onSave')).toEqual(['persist']);
+    expect(callees(g, 'save')).toEqual(['handlers::onSave']);
+  });
+});
diff --git a/__tests__/js-resolution-work.test.ts b/__tests__/js-resolution-work.test.ts
new file mode 100644
index 0000000000..d7bbad1a7f
--- /dev/null
+++ b/__tests__/js-resolution-work.test.ts
@@ -0,0 +1,65 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+
+// Native graph regressions from upstream #2332/#2334.
+// TypeScript spies do not observe the Rust resolver; these make no cost claim.
+describe('JS resolution graph (#2334)', () => {
+  let tmpDir: string | undefined;
+  let cg: CodeGraph | undefined;
+
+  afterEach(() => {
+    cg?.close();
+    cg = undefined;
+    if (tmpDir) fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5 });
+    tmpDir = undefined;
+  });
+
+  async function index(files: Record<string, string>): Promise<CodeGraph> {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-js-work-'));
+    for (const [file, content] of Object.entries(files)) {
+      fs.mkdirSync(path.dirname(path.join(tmpDir, file)), { recursive: true });
+      fs.writeFileSync(path.join(tmpDir, file), content);
+    }
+    cg = CodeGraph.initSync(tmpDir);
+    await cg.indexAll();
+    return cg;
+  }
+
+
+  const callers = (graph: CodeGraph, file: string, name: string) => {
+    const target = graph.getNodesByName(name).find((n) => n.filePath === file && n.kind === 'function')!;
+    return [...new Set(graph.getIncomingEdges(target.id).filter((e) => e.kind === 'calls')
+      .map((e) => graph.getNode(e.source)?.name))];
+  };
+
+  it('resolves a destructured factory call inside division expressions', async () => {
+    const CALLS = 40;
+    const app = `import { useAuth } from './auth';\n` +
+      `const { login } = useAuth();\n` +
+      Array.from({ length: CALLS }, (_, i) => `function step${i}() { return ${i}; }\n`).join('') +
+      `export function run() {\n` +
+      Array.from({ length: CALLS }, (_, i) => `  step${i}();\n`).join('') +
+      // A division the blanking reads as a regex literal around the call.
+      `  return (${CALLS}) / login() / 2;\n}\n`;
+    const graph = await index({
+      'auth.js': 'export function useAuth() {\n  function login() {\n    return 1;\n  }\n  return { login };\n}\n',
+      'app.js': app,
+    });
+    // The call through the destructured name reaches the function the hook returns.
+    expect(callers(graph, 'auth.js', 'login')).toEqual(['run']);
+    expect(callers(graph, 'app.js', 'step7')).toEqual(['run']);
+  });
+
+  it("resolves repeated bare calls in one function", async () => {
+    const LINES = 40;
+    const host = `export function host() {\n` +
+      Array.from({ length: LINES }, (_, i) => `  helper(${i});\n`).join('') + `}\n`;
+    const graph = await index({ 'lib.js': `export function helper(n) {\n  return n;\n}\n${host}` });
+    // Each call resolved, so each asked whether `host` binds `helper` itself.
+    expect(callers(graph, 'lib.js', 'helper')).toEqual(['host']);
+  });
+});
diff --git a/__tests__/mcp-daemon.test.ts b/__tests__/mcp-daemon.test.ts
index 6e4bd0eeab..03600002a5 100644
--- a/__tests__/mcp-daemon.test.ts
+++ b/__tests__/mcp-daemon.test.ts
@@ -309,9 +309,17 @@ describe('Shared MCP daemon (issue #411)', () => {
     });
     servers.push(server);
     sendInitialize(server.child, `file://${tempDir}`, 1);
-    await waitFor(() => findResponse(server.stdout, 1), 10000);
-    await waitFor(() => server.stderr.some((l) => l.includes('Attached to shared daemon')), 10000);
-    const pid = await waitFor(() => readLockPid(realRoot), 10000);
+    const startupFailure = (error: unknown): never => {
+      throw new Error(`${(error as Error).message}`
+        + `\nproxy exit=${server.child.exitCode} signal=${server.child.signalCode}`
+        + `\nstdout:\n${server.stdout.join('\n')}`
+        + `\nstderr:\n${server.stderr.join('\n')}`
+        + `\ndaemon.log:\n${readDaemonLog(realRoot)}`, { cause: error });
+    };
+    await waitFor(() => findResponse(server.stdout, 1), 10000, 25, 'initialize response').catch(startupFailure);
+    await waitFor(() => server.stderr.some((l) => l.includes('Attached to shared daemon')),
+      10000, 25, 'daemon attach log').catch(startupFailure);
+    const pid = await waitFor(() => readLockPid(realRoot), 10000, 25, 'daemon pidfile').catch(startupFailure);
     const raw = net.connect(getDaemonSocketPath(realRoot));
     try {
       await new Promise<void>((resolve, reject) => {
diff --git a/__tests__/python-resolution-work.test.ts b/__tests__/python-resolution-work.test.ts
new file mode 100644
index 0000000000..3b25e2bbc8
--- /dev/null
+++ b/__tests__/python-resolution-work.test.ts
@@ -0,0 +1,62 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+
+// Native graph regressions from upstream #2332/#2334.
+// TypeScript spies do not observe the Rust resolver; these make no cost claim.
+describe('Python resolution graph (#2332)', () => {
+  let tmpDir: string | undefined;
+  let cg: CodeGraph | undefined;
+
+  afterEach(() => {
+    cg?.close();
+    cg = undefined;
+    if (tmpDir) fs.rmSync(tmpDir, { recursive: true, force: true, maxRetries: 5 });
+    tmpDir = undefined;
+  });
+
+  async function index(files: Record<string, string>) {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-py-work-'));
+    for (const [file, content] of Object.entries(files)) {
+      fs.mkdirSync(path.dirname(path.join(tmpDir, file)), { recursive: true });
+      fs.writeFileSync(path.join(tmpDir, file), content);
+    }
+    cg = CodeGraph.initSync(tmpDir);
+    await cg.indexAll();
+    return cg;
+  }
+
+  it('resolves repeated global method values and excludes a locally rebound helper', async () => {
+    const SCALE = 16;
+    const conns = Array.from({ length: SCALE }, (_, i) => `conn${i}`);
+    const files: Record<string, string> = {
+      // Globals typed by their own module's writes: each one's type also
+      // depends on what every other module writes to it.
+      'store.py': 'class Store:\n    def fetch(self, ids):\n        return ids\n',
+      'settings.py': `from store import Store\n${conns.map(c => `${c} = None\n`).join('')}\n` +
+        `def init():\n    global ${conns.join(', ')}\n${conns.map(c => `    ${c} = Store()\n`).join('')}`,
+      'consumer.py': `import settings\n${conns.map((c, i) => `\ndef cb${i}(pool):\n    pool.submit(settings.${c}.fetch)\n`).join('')}`,
+      // A bare call in every function: each asks whether its function binds the name.
+      'helpers.py': 'def helper():\n    return 1\n',
+      'callers.py': Array.from({ length: SCALE }, (_, i) => `def f${i}():\n    return helper()\n\n`).join('') +
+        'def shadowed(make):\n    helper = make()\n    return helper()\n',
+    };
+    // Files no reference touches.
+    const fillers = Array.from({ length: 20 }, (_, i) => `pkg/filler${i}.py`);
+    fillers.forEach((file, i) => { files[file] = `def filler${i}(x):\n    return x + ${i}\n`; });
+    const graph = await index(files);
+
+    // Both paths ran: every global's method value reached Store.fetch, and the
+    // function that binds `helper` itself calls its own value.
+    const fetch = graph.getNodesByName('fetch').find(n => n.qualifiedName === 'Store::fetch')!;
+    expect(graph.getIncomingEdges(fetch.id).filter(e => e.metadata?.fnRef === true)
+      .map(e => graph.getNode(e.source)?.name).sort()).toEqual(conns.map((_, i) => `cb${i}`).sort());
+    const helper = graph.getNodesByName('helper').find(n => n.kind === 'function')!;
+    expect(graph.getIncomingEdges(helper.id).filter(e => e.kind === 'calls')
+      .map(e => graph.getNode(e.source)?.name).sort()).toEqual(Array.from({ length: SCALE }, (_, i) => `f${i}`).sort());
+  });
+
+});
diff --git a/__tests__/receiver-inference-scope.test.ts b/__tests__/receiver-inference-scope.test.ts
index 07453e4b16..d45da69e3e 100644
--- a/__tests__/receiver-inference-scope.test.ts
+++ b/__tests__/receiver-inference-scope.test.ts
@@ -186,3 +186,44 @@ class Child(${bases}):
     expect(edges('inherited', 'references')).toEqual(['11:Store::fetch']);
   });
 });
+
+describe('Go method values keep package and promotion scope', () => {
+  it('uses the caller package type despite a same-named type in another package', async () => {
+    await project({
+      'main.go': 'package main\ntype Store struct{}\nfunc (s Store) Ping() {}\nfunc caller() { _ = Store.Ping }\n',
+      'other/store.go': 'package other\ntype Store struct{}\nfunc (s Store) Ping() {}\n',
+    });
+    expect(edges('caller', 'references')).toEqual(['4:Store::Ping']);
+    const caller = graph!.getNodesByKind('function').find(n => n.name === 'caller')!;
+    expect(graph!.getOutgoingEdges(caller.id).filter(e => e.kind === 'references')
+      .map(e => graph!.getNode(e.target)!.filePath)).toEqual(['main.go']);
+  });
+
+  it.each([
+    ['two owners', 'type Left struct{}\nfunc (s Left) Ping() {}\ntype Right struct{}\nfunc (s Right) Ping() {}\ntype Store struct { Left; Right }', []],
+    ['diamond', 'type Base struct{}\nfunc (s Base) Ping() {}\ntype Left struct{ Base }\ntype Right struct{ Base }\ntype Store struct { Left; Right }', []],
+    ['shallower owner', 'type Base struct{}\nfunc (s Base) Ping() {}\ntype Left struct{}\nfunc (s Left) Ping() {}\ntype Right struct{ Base }\ntype Store struct { Left; Right }', ['Left::Ping']],
+    ['cycle', 'type Left struct { *Store }\ntype Store struct { *Left }', []],
+    ['anonymous field before embed', 'type Base struct{}\nfunc (s Base) Ping() {}\ntype Store struct { Field struct { Base }; Base }', ['Base::Ping']],
+  ])('keeps promoted method values unambiguous for %s', async (_label, declarations, targets) => {
+    await project({ 'main.go': `package main\n${declarations}\nfunc caller(s Store) { _ = s.Ping }\n` });
+    const caller = graph!.getNodesByKind('function').find(n => n.name === 'caller')!;
+    expect(graph!.getOutgoingEdges(caller.id).filter(e => e.kind === 'references')
+      .map(e => graph!.getNode(e.target)!.qualifiedName).sort()).toEqual([...targets, 'Store'].sort());
+  });
+
+  it.each(['calls', 'references'] as const)('keeps a typed receiver shadowing an imported alias for %s', async (kind) => {
+    await project({
+      'main.go': `package main
+import "fmt"
+type Printer struct{}
+func (s Printer) Println() {}
+func caller(fmt Printer) { ${kind === 'calls' ? 'fmt.Println()' : '_ = fmt.Println'} }
+func unknown(fmt any) { ${kind === 'calls' ? 'fmt.Println()' : '_ = fmt.Println'} }
+`,
+    });
+    expect(edges('caller', kind)).toEqual(kind === 'calls'
+      ? ['5:Printer::Println'] : ['5:Printer', '5:Printer::Println']);
+    expect(edges('unknown', kind)).toEqual([]);
+  });
+});
diff --git a/__tests__/route-inline-handler-calls.test.ts b/__tests__/route-inline-handler-calls.test.ts
index dc7519a6e0..9a006a937a 100644
--- a/__tests__/route-inline-handler-calls.test.ts
+++ b/__tests__/route-inline-handler-calls.test.ts
@@ -70,6 +70,6 @@ describe('inline route handler calls', () => {
   });
 
   it('reach the service a member call names', () => {
-    expect(routeCalls('/users/:id')).toContain('src/services.ts: lookup');
+    expect(routeCalls('/users/:id')).toContain('src/services.ts: userService::lookup');
   });
 });
diff --git a/__tests__/rust-enum-variant-reference.test.ts b/__tests__/rust-enum-variant-reference.test.ts
new file mode 100644
index 0000000000..8d2daf820e
--- /dev/null
+++ b/__tests__/rust-enum-variant-reference.test.ts
@@ -0,0 +1,348 @@
+/**
+ * A Rust enum used only through its variants is a dependency of the code that
+ * uses them (#2328). `mode::Mode::A` in an expression, `Mode::B => …` in a
+ * `match`, a `Mode::C(x)` / `Mode::D { .. }` pattern and `Self::A` in the
+ * enum's impl reference the enum that declares the variant — the same
+ * `references` edge a type annotation (`fn takes(_m: Mode)`) produces. Nothing
+ * else read through a path does: not an associated const or function
+ * (`Limits::MAX`, `Mode::new()`), not a standard-library enum's variant.
+ */
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { CodeGraph } from '../src';
+
+let root: string;
+let cg: CodeGraph | undefined;
+beforeEach(() => { root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-rust-variant-ref-')); });
+afterEach(() => { cg?.close(); cg = undefined; fs.rmSync(root, { recursive: true, force: true }); });
+
+async function index(files: Record<string, string>) {
+  fs.mkdirSync(path.join(root, 'src'));
+  fs.writeFileSync(path.join(root, 'Cargo.toml'), '[package]\nname = "repro"\nversion = "0.1.0"\nedition = "2021"\n');
+  for (const [file, text] of Object.entries(files)) fs.writeFileSync(path.join(root, 'src', file), text);
+  cg = await CodeGraph.init(root, { index: true });
+}
+
+/** The enum named `name` declared in `src/<file>`. */
+function enumIn(file: string, name = 'Mode') {
+  const node = cg!.getNodesByKind('enum').find((n) => n.filePath === `src/${file}` && n.name === name);
+  expect(node, `enum ${name} in ${file}`).toBeDefined();
+  return node!;
+}
+
+/** `file:name` of every symbol with a `references` edge to the node. */
+function referencers(nodeId: string): string[] {
+  const names = cg!.getIncomingEdges(nodeId)
+    .filter((e) => e.kind === 'references')
+    .map((e) => cg!.getNode(e.source)!)
+    .map((n) => `${n.filePath.replace(/^src\//, '')}:${n.name}`);
+  return [...new Set(names)].sort();
+}
+
+const MODE = `pub enum Mode {
+    A,
+    B,
+    C(u8),
+    D { x: u8 },
+}
+
+pub fn takes(_m: Mode) {}
+
+pub fn current() -> Mode { Mode::B }
+`;
+
+describe('Rust enum variant paths reference their enum (#2328)', () => {
+  it('the issue: a variant path in an expression and in match arms, through the module', async () => {
+    await index({
+      'mode.rs': MODE,
+      'variant_use.rs': `use crate::mode;
+
+pub fn code(flag: bool) -> u8 {
+    let m = if flag { mode::Mode::A } else { mode::Mode::B };
+    match m {
+        mode::Mode::A => 1,
+        mode::Mode::B => 2,
+        _ => 3,
+    }
+}
+`,
+      'main.rs': `mod mode;
+mod variant_use;
+
+fn main() {
+    mode::takes(mode::Mode::A);
+    let _ = variant_use::code(true);
+}
+`,
+    });
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['main.rs:main', 'mode.rs:current', 'mode.rs:takes', 'variant_use.rs:code']);
+  });
+
+  it('a bare `Mode::A` after `use crate::mode::Mode;`', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod bare;\n',
+      'mode.rs': MODE,
+      'bare.rs': `use crate::mode::{self, Mode};
+
+pub fn pick() -> u8 {
+    let _m = Mode::B;
+    0
+}
+
+pub fn score() -> u8 {
+    match mode::current() {
+        Mode::A => 1,
+        _ => 0,
+    }
+}
+`,
+    });
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['bare.rs:pick', 'bare.rs:score', 'mode.rs:current', 'mode.rs:takes']);
+    const pick = cg!.getNodesByKind('function').find((n) => n.name === 'pick')!;
+    const at = cg!.getOutgoingEdges(pick.id).filter((e) => e.kind === 'references').map((e) => `${e.line}:${e.column}`);
+    expect(at).toEqual(['4:13']);
+  });
+
+  it('tuple and struct variant patterns, and a variant read as a value', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod pat;\n',
+      'mode.rs': MODE,
+      'pat.rs': `use crate::mode::{self, Mode};
+
+pub fn tuple() -> u8 {
+    match mode::current() {
+        Mode::C(x) => x,
+        _ => 0,
+    }
+}
+
+pub fn structure() -> u8 {
+    if let crate::mode::Mode::D { x } = mode::current() { x } else { 0 }
+}
+
+pub fn ctor_value(xs: Vec<u8>) -> usize {
+    xs.into_iter().map(Mode::C).count()
+}
+`,
+    });
+    expect(referencers(enumIn('mode.rs').id)).toEqual([
+      'mode.rs:current', 'mode.rs:takes', 'pat.rs:ctor_value', 'pat.rs:structure', 'pat.rs:tuple',
+    ]);
+  });
+
+  it('constructing a tuple or struct variant stays linked to the variant itself', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod build;\n',
+      'mode.rs': MODE,
+      'build.rs': `use crate::mode::Mode;
+
+pub fn build() {
+    let _c = Mode::C(3);
+    let _d = Mode::D { x: 2 };
+}
+`,
+    });
+    const build = cg!.getNodesByKind('function').find((n) => n.name === 'build')!;
+    const out = cg!.getOutgoingEdges(build.id).map((e) => `${e.kind}:${cg!.getNode(e.target)!.qualifiedName}`).sort();
+    expect(out).toEqual(['calls:Mode::C', 'instantiates:Mode::D']);
+  });
+
+  it('`Self::A` inside `impl Mode`, in the enum\'s file and in another one', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod ops;\n',
+      'mode.rs': `${MODE}
+impl Mode {
+    pub fn flip(&self) -> u8 {
+        match self {
+            Self::A => 1,
+            _ => 0,
+        }
+    }
+}
+`,
+      'ops.rs': `use crate::mode::Mode;
+
+impl Mode {
+    pub fn is_b(&self) -> bool {
+        if let Self::B = self { true } else { false }
+    }
+}
+`,
+    });
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['mode.rs:current', 'mode.rs:flip', 'mode.rs:takes', 'ops.rs:is_b']);
+  });
+
+  it('a variant imported by name and used bare has no path to read the enum from', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod other;\npub mod glob;\n',
+      'mode.rs': MODE,
+      'other.rs': 'pub enum Mode {\n    A,\n    Z,\n}\n',
+      'glob.rs': `use crate::mode::Mode::*;
+
+pub fn bare(m: u8) -> u8 {
+    match m {
+        0 => { let _ = A; 1 }
+        _ => 0,
+    }
+}
+`,
+    });
+    // Out of scope (#2328 is about paths): a bare name gives no receiver, and
+    // it must never land on the other module's same-named enum either.
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['mode.rs:current', 'mode.rs:takes']);
+    expect(referencers(enumIn('other.rs').id)).toEqual([]);
+  });
+
+  it('the path picks the type that declares the variant, never a same-named type without it', async () => {
+    await index({
+      'lib.rs': 'pub mod matching;\npub mod other;\npub mod user;\n',
+      'matching.rs': 'pub enum Match {\n    None,\n    Ignore,\n}\n',
+      'other.rs': 'pub struct Match;\n',
+      'user.rs': `use crate::matching::Match;
+
+pub enum ColorChoice {
+    Auto,
+    Ansi,
+}
+
+pub fn first() -> u8 {
+    let _m = Match::None;
+    0
+}
+
+pub fn color() -> u8 {
+    let _c = termcolor::ColorChoice::AlwaysAnsi;
+    0
+}
+`,
+    });
+    expect(referencers(enumIn('matching.rs', 'Match').id)).toEqual(['user.rs:first']);
+    const struct = cg!.getNodesByKind('struct').find((n) => n.filePath === 'src/other.rs')!;
+    expect(referencers(struct.id)).toEqual([]);
+    // `termcolor`'s ColorChoice, not the file's own enum, which has no `AlwaysAnsi`.
+    expect(referencers(enumIn('user.rs', 'ColorChoice').id)).toEqual([]);
+  });
+
+  it('an associated const or function read through a type is not a variant path', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod limits;\npub mod user;\n',
+      'mode.rs': `${MODE}
+impl Mode {
+    pub const ALL: [u8; 2] = [0, 1];
+    pub fn count() -> usize { Self::ALL.len() }
+}
+`,
+      'limits.rs': 'pub struct Limits;\n\nimpl Limits {\n    pub const MAX: u8 = 3;\n    pub fn new() -> Self { Limits }\n}\n',
+      'user.rs': `use crate::limits::Limits;
+use crate::mode::Mode;
+
+pub fn cap() -> u8 {
+    Limits::MAX
+}
+
+pub fn all() -> usize {
+    Mode::ALL.len()
+}
+
+pub fn make() {
+    let _l = Limits::new();
+    let _f = Limits::new;
+}
+`,
+    });
+    // Only variants: the enum's own `count` and every reader of `Mode::ALL` /
+    // `Limits::MAX` stay off, and `Limits::new` links the function, not the type.
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['mode.rs:current', 'mode.rs:takes']);
+    const limits = cg!.getNodesByKind('struct').find((n) => n.name === 'Limits')!;
+    // The fork also resolves the constructor's `-> Self` annotation.
+    expect(referencers(limits.id)).toEqual(['limits.rs:new']);
+    const make = cg!.getNodesByKind('function').find((n) => n.name === 'make')!;
+    expect(cg!.getOutgoingEdges(make.id).map((e) => `${e.kind}:${cg!.getNode(e.target)!.qualifiedName}`)).toEqual(['calls:Limits::new']);
+  });
+
+  it('std and prelude enums never reach a same-named project enum', async () => {
+    await index({
+      'lib.rs': 'pub mod shapes;\npub mod user;\n',
+      'shapes.rs': `pub enum Ordering {
+    Less,
+    Greater,
+}
+
+pub enum Option {
+    Some,
+    None,
+}
+`,
+      'user.rs': `use std::cmp::{self, Ordering};
+
+pub fn sorted(a: u8, b: u8) -> bool {
+    a.cmp(&b) == Ordering::Less || b.cmp(&a) == cmp::Ordering::Greater || a.cmp(&b) != std::cmp::Ordering::Less
+}
+
+pub fn first(o: Option<u8>) -> u8 {
+    match o {
+        Option::Some(x) => x,
+        Option::None => 0,
+    }
+}
+
+pub fn bare(o: Option<u8>, r: Result<u8, ()>) -> u8 {
+    match (o, r) {
+        (Some(x), Ok(_)) => x,
+        (None, Err(())) => 0,
+        _ => 1,
+    }
+}
+`,
+    });
+    expect(referencers(enumIn('shapes.rs', 'Ordering').id)).toEqual([]);
+    expect(referencers(enumIn('shapes.rs', 'Option').id)).toEqual([]);
+    for (const variant of cg!.getNodesByKind('enum_member')) {
+      expect(cg!.getIncomingEdges(variant.id).filter((e) => e.kind !== 'contains'), variant.qualifiedName).toEqual([]);
+    }
+  });
+
+  it('a module path, an associated function and a same-named enum elsewhere are not references to the enum', async () => {
+    await index({
+      'lib.rs': 'pub mod mode;\npub mod other;\npub mod util;\npub mod paths;\n',
+      'mode.rs': `${MODE}
+impl Mode {
+    pub fn new() -> Mode { Mode::A }
+}
+`,
+      'other.rs': 'pub enum Mode {\n    A,\n    Z,\n}\n',
+      'util.rs': 'pub fn take(x: u8) -> u8 { x }\n',
+      'paths.rs': `use crate::mode;
+use crate::other;
+use crate::util;
+
+pub fn via_module() -> u8 {
+    util::take(3)
+}
+
+pub fn via_ctor() {
+    let _m = mode::Mode::new();
+}
+
+pub fn via_other() -> u8 {
+    match other::Mode::A {
+        other::Mode::Z => 1,
+        _ => 0,
+    }
+}
+
+pub fn via_mode() {
+    let _m = mode::Mode::A;
+}
+`,
+    });
+    const viaModule = cg!.getNodesByKind('function').find((n) => n.name === 'via_module')!;
+    expect(cg!.getOutgoingEdges(viaModule.id).filter((e) => e.kind === 'references')).toEqual([]);
+    expect(referencers(enumIn('other.rs').id)).toEqual(['paths.rs:via_other']);
+    // `new`'s own `Mode::A` and return type; `via_ctor` calls an associated
+    // function, which links the function, not the enum.
+    expect(referencers(enumIn('mode.rs').id)).toEqual(['mode.rs:current', 'mode.rs:new', 'mode.rs:takes', 'paths.rs:via_mode']);
+  });
+});
diff --git a/__tests__/rust-route-handler-line.test.ts b/__tests__/rust-route-handler-line.test.ts
new file mode 100644
index 0000000000..41e4749fd5
--- /dev/null
+++ b/__tests__/rust-route-handler-line.test.ts
@@ -0,0 +1,208 @@
+/**
+ * A Rust route's handler reference sits on the line its handler is written
+ * on (#2326). rustfmt wraps a long `.route(` call, putting the handler on a
+ * line below `.route(`; the Rust scope gate reads the reference's line to see
+ * how the name is written (`handlers::f` names the `handlers` module), so a
+ * reference left on the `.route(` line never found the name there and the
+ * edge was dropped — as it was when the line wrote the handler's name
+ * elsewhere too (`/login` in the path, `delete(` as the method router), which
+ * the gate read as a bare use. A call inside a closure handler's body is not a method
+ * router: `cache.get(keys::session_key)` is not a `GET` route handled by
+ * `session_key`. Nor is an Actix resource's chain longer than the call it is
+ * an argument of: the App-level `.route(..)` after it is not its method.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+import { rustResolver } from '../src/resolution/frameworks/rust';
+
+const MAIN_RS = `mod actix_app;
+mod handlers;
+mod keys;
+use axum::{routing::{delete, get, post}, Router};
+use crate::handlers::used_handler;
+
+pub fn app() -> Router {
+    Router::new()
+        .route("/single", get(handlers::single_line_handler))
+        .route(
+            "/multi",
+            get(handlers::multi_line_handler),
+        )
+        .route(
+            "/deep",
+            get(
+                handlers::deep_line_handler,
+            ),
+        )
+        .route(
+            "/items",
+            get(handlers::list_items)
+                .post(handlers::create_item)
+                .delete(handlers::delete_item),
+        )
+        .route(
+            "/used",
+            post(used_handler),
+        )
+        .route(
+            "/other",
+            get(metrics::render_handler),
+        )
+        .route("/login", post(handlers::login))
+        .route("/account", delete(handlers::delete))
+        .route("/closure-inline", get(|| async { cache().get(keys::session_key) }))
+        .route(
+            "/closure",
+            get(|| async move {
+                cache().get(keys::session_key)
+            }),
+        )
+}
+`;
+
+const ACTIX_RS = `use actix_web::{web, App};
+use crate::handlers;
+
+pub fn actix() {
+    App::new()
+        .service(
+            web::resource("/index/with/a/rather/long/path/{id}")
+                .to(handlers::actix_index),
+        )
+        .service(
+            web::resource("/user/{id}")
+                .route(
+                    web::get()
+                        .to(handlers::actix_get_user),
+                ),
+        )
+        .route(
+            "/hey",
+            web::get().to(handlers::actix_hello),
+        );
+}
+`;
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-rust-route-line-'));
+  const files: Record<string, string> = {
+    'Cargo.toml': '[package]\nname = "repro"\nversion = "0.1.0"\nedition = "2021"\n\n[dependencies]\naxum = "0.7"\nactix-web = "4"\nmetrics = "0.23"\n',
+    'src/main.rs': MAIN_RS,
+    'src/actix_app.rs': ACTIX_RS,
+    'src/handlers/mod.rs': `pub async fn single_line_handler() {}
+pub async fn multi_line_handler() {}
+pub async fn deep_line_handler() {}
+pub async fn list_items() {}
+pub async fn create_item() {}
+pub async fn delete_item() {}
+pub async fn used_handler() {}
+pub async fn render_handler() {}
+pub async fn login() {}
+pub async fn delete() {}
+pub async fn actix_index() {}
+pub async fn actix_get_user() {}
+pub async fn actix_hello() {}
+`,
+    'src/keys.rs': 'pub fn session_key() -> &\'static str { "s" }\n',
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `METHOD /path -> file:handler` for every route -> function `references` edge out of a file's routes. */
+const routeEdges = (file: string): string[] => {
+  const routes = cg.getNodesInFile(file).filter((n) => n.kind === 'route');
+  return cg.getOutgoingEdgesFrom(routes.map((r) => r.id), ['references'])
+    .map((e) => `${cg.getNode(e.source)!.name} -> ${cg.getNode(e.target)!.filePath}:${cg.getNode(e.target)!.name}`)
+    .sort();
+};
+
+describe('Axum: a handler written below `.route(` is linked to its route (#2326)', () => {
+  it('links a single-line route, as before', () => {
+    expect(routeEdges('src/main.rs')).toContain('GET /single -> src/handlers/mod.rs:single_line_handler');
+  });
+
+  it('links a rustfmt-wrapped route', () => {
+    expect(routeEdges('src/main.rs')).toContain('GET /multi -> src/handlers/mod.rs:multi_line_handler');
+  });
+
+  it('links a handler wrapped below its method router too', () => {
+    expect(routeEdges('src/main.rs')).toContain('GET /deep -> src/handlers/mod.rs:deep_line_handler');
+  });
+
+  it('links every method of a chain wrapped over several lines', () => {
+    expect(routeEdges('src/main.rs')).toEqual(expect.arrayContaining([
+      'GET /items -> src/handlers/mod.rs:list_items',
+      'POST /items -> src/handlers/mod.rs:create_item',
+      'DELETE /items -> src/handlers/mod.rs:delete_item',
+    ]));
+  });
+
+  it('links a wrapped handler named through a `use`', () => {
+    expect(routeEdges('src/main.rs')).toContain('POST /used -> src/handlers/mod.rs:used_handler');
+  });
+
+  it('does not link a wrapped handler another module names to a same-named one', () => {
+    expect(routeEdges('src/main.rs').filter((e) => e.includes('render_handler'))).toEqual([]);
+  });
+
+  it('links a single-line route whose line also writes the handler name elsewhere', () => {
+    // `/login` in the path, `delete(` as the method router: neither is how the handler is named.
+    expect(routeEdges('src/main.rs')).toEqual(expect.arrayContaining([
+      'POST /login -> src/handlers/mod.rs:login',
+      'DELETE /account -> src/handlers/mod.rs:delete',
+    ]));
+  });
+
+  it('never reads a call inside a closure handler as a route', () => {
+    expect(routeEdges('src/main.rs').filter((e) => e.includes('closure'))).toEqual([]);
+    const routes = cg.getNodesInFile('src/main.rs').filter((n) => n.kind === 'route').map((n) => n.name);
+    expect(routes.filter((n) => n.includes('closure'))).toEqual([]);
+  });
+
+  it('keeps the route on the `.route(` line and puts the reference on the handler', () => {
+    const { nodes, references } = rustResolver.extract!('src/main.rs', MAIN_RS);
+    const lines = MAIN_RS.split('\n');
+    const lineOf = (text: string) => lines.findIndex((l) => l.includes(text)) + 1;
+    const multi = nodes.find((n) => n.name === 'GET /multi')!;
+    expect(multi.startLine).toBe(lineOf('"/multi"') - 1);
+    const ref = references.find((r) => r.referenceName === 'multi_line_handler')!;
+    expect(ref.line).toBe(lineOf('handlers::multi_line_handler'));
+    expect(lines[ref.line - 1]!.startsWith('multi_line_handler', ref.column)).toBe(true);
+    const single = references.find((r) => r.referenceName === 'single_line_handler')!;
+    expect(single.line).toBe(nodes.find((n) => n.name === 'GET /single')!.startLine);
+  });
+});
+
+describe('Actix: a handler written below its route is linked to it (#2326)', () => {
+  it('links a wrapped `web::resource(..).to(handler)`', () => {
+    expect(routeEdges('src/actix_app.rs')).toContain('ANY /index/with/a/rather/long/path/{id} -> src/handlers/mod.rs:actix_index');
+  });
+
+  it('links a wrapped `web::get().to(handler)` inside `.route(`', () => {
+    expect(routeEdges('src/actix_app.rs')).toContain('GET /user/{id} -> src/handlers/mod.rs:actix_get_user');
+  });
+
+  it('links a wrapped App-level `.route("/path", web::get().to(handler))`', () => {
+    expect(routeEdges('src/actix_app.rs')).toContain('GET /hey -> src/handlers/mod.rs:actix_hello');
+  });
+
+  it('does not read the App-level route after a `.service(..)` into its resource', () => {
+    expect(routeEdges('src/actix_app.rs').filter((e) => e.startsWith('GET /user/{id}')))
+      .toEqual(['GET /user/{id} -> src/handlers/mod.rs:actix_get_user']);
+  });
+});
diff --git a/__tests__/telemetry-services.test.ts b/__tests__/telemetry-services.test.ts
new file mode 100644
index 0000000000..657681cc78
--- /dev/null
+++ b/__tests__/telemetry-services.test.ts
@@ -0,0 +1,438 @@
+/**
+ * The self-hosted telemetry services — `telemetry-worker/` (ingest + nightly rollup)
+ * and `telemetry-dashboard/` (the read API) — run against the checked-in D1
+ * migrations in an in-memory node:sqlite database (#2333).
+ *
+ * D1 is SQLite, so every statement here is the SQL production runs. The one stand-in
+ * is a thin adapter giving node:sqlite D1's prepare/bind/first/all/run/batch shape,
+ * with `batch()` as one transaction the way D1 runs it. No wrangler, no workerd, no
+ * network: the end-to-end versions of these checks are the packages' own smoke
+ * suites (`npm run smoke`, `smoke:rollup`, `smoke:cutover`, `smoke:api`), which boot
+ * `wrangler dev`.
+ *
+ *   npx vitest run __tests__/telemetry-services.test.ts
+ */
+
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import * as fs from 'fs';
+import * as path from 'path';
+import worker from '../telemetry-worker/src/index';
+import { runNightly } from '../telemetry-worker/src/rollup';
+import { handleApi } from '../telemetry-dashboard/src/api';
+
+let nodeSqlite: typeof import('node:sqlite') | null = null;
+try {
+  nodeSqlite = require('node:sqlite') as typeof import('node:sqlite');
+} catch {
+  /* Node < 22.5 — skipped below */
+}
+
+const MIGRATIONS = path.join(__dirname, '..', 'telemetry-worker', 'migrations');
+const MINUTE = 60_000;
+/** Cloudflare ends a Cron Trigger invocation after 15 minutes of wall-clock time. */
+const CRON_LIMIT_MS = 15 * MINUTE;
+
+type Row = Record<string, unknown>;
+
+// ---------------------------------------------------------------------------
+// D1 over node:sqlite
+// ---------------------------------------------------------------------------
+
+/** Binds integral numbers as INTEGER, as D1 does (node:sqlite would bind them as REAL). */
+const bindable = (v: unknown): unknown => (typeof v === 'number' && Number.isInteger(v) ? BigInt(v) : v);
+
+class SqliteD1Statement {
+  constructor(
+    private readonly d1: SqliteD1,
+    readonly sql: string,
+    private readonly params: unknown[] = [],
+  ) {}
+
+  bind(...params: unknown[]): SqliteD1Statement {
+    return new SqliteD1Statement(this.d1, this.sql, params);
+  }
+
+  execute(): { success: true; results: Row[]; meta: { changes: number } } {
+    this.d1.onStatement?.(this.sql);
+    const stmt = this.d1.db.prepare(this.sql);
+    const params = this.params.map(bindable) as never[];
+    if (/^\s*(SELECT|WITH)\b/i.test(this.sql)) {
+      return { success: true, results: stmt.all(...params) as Row[], meta: { changes: 0 } };
+    }
+    const info = stmt.run(...params);
+    return { success: true, results: [], meta: { changes: Number(info.changes) } };
+  }
+
+  async first<T>(): Promise<T | null> {
+    return (this.execute().results[0] as T | undefined) ?? null;
+  }
+
+  async all(): Promise<ReturnType<SqliteD1Statement['execute']>> {
+    return this.execute();
+  }
+
+  async run(): Promise<ReturnType<SqliteD1Statement['execute']>> {
+    return this.execute();
+  }
+}
+
+class SqliteD1 {
+  /** Runs before every statement — the cron tests use it to model elapsed wall-clock time. */
+  onStatement: ((sql: string) => void) | null = null;
+
+  constructor(readonly db: import('node:sqlite').DatabaseSync) {}
+
+  prepare(sql: string): SqliteD1Statement {
+    return new SqliteD1Statement(this, sql);
+  }
+
+  async batch(statements: SqliteD1Statement[]): Promise<ReturnType<SqliteD1Statement['execute']>[]> {
+    this.db.exec('BEGIN');
+    try {
+      const results = statements.map((s) => s.execute());
+      this.db.exec('COMMIT');
+      return results;
+    } catch (err) {
+      this.db.exec('ROLLBACK');
+      throw err;
+    }
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Harness
+// ---------------------------------------------------------------------------
+
+describe.skipIf(!nodeSqlite)('telemetry services against the D1 schema (#2333)', () => {
+  let db: import('node:sqlite').DatabaseSync;
+  let d1: SqliteD1;
+  let env: never;
+  let logged: Row[];
+
+  const at = (iso: string): void => {
+    vi.setSystemTime(new Date(iso));
+  };
+
+  const one = (sql: string, ...params: unknown[]): Row | undefined =>
+    db.prepare(sql).get(...(params.map(bindable) as never[])) as Row | undefined;
+
+  /** POST /v1/events the way a client does, then wait for the off-response-path write. */
+  async function post(machineId: string, events: Row[]): Promise<number> {
+    const body = JSON.stringify({
+      machine_id: machineId,
+      codegraph_version: '1.6.2',
+      os: 'linux',
+      arch: 'x64',
+      node_major: 22,
+      ci: false,
+      schema_version: 2,
+      events,
+    });
+    const pending: Promise<unknown>[] = [];
+    const request = new Request('https://telemetry.test/v1/events', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json', 'content-length': String(Buffer.byteLength(body)) },
+      body,
+    });
+    const ctx = { waitUntil: (p: Promise<unknown>) => void pending.push(p), passThroughOnException: () => {} };
+    const response = await worker.fetch(request as never, env, ctx as never);
+    await Promise.all(pending);
+    return response.status;
+  }
+
+  /** GET one dashboard endpoint, as the signed-in page does. */
+  async function api(pathAndQuery: string): Promise<Row> {
+    const result = await handleApi(env, new URL(`https://stats.test${pathAndQuery}`));
+    expect(result.status ?? 200).toBe(200);
+    return result.body as Row;
+  }
+
+  /**
+   * One cron invocation at `iso`. `chunkMs` is the wall-clock time each legacy-usage
+   * fold chunk is charged; a statement that starts after Cloudflare's 15-minute limit
+   * throws, the way the runtime ends the invocation there.
+   */
+  async function nightly(iso: string, chunkMs = 0): Promise<{ latestStartMs: number; summary: Row | undefined }> {
+    at(iso);
+    const started = Date.now();
+    let latestStartMs = 0;
+    d1.onStatement = (sql) => {
+      const elapsed = Date.now() - started;
+      if (elapsed > CRON_LIMIT_MS) {
+        throw new Error(`statement started ${elapsed / MINUTE} min into the cron run — past the 15-minute limit`);
+      }
+      latestStartMs = Math.max(latestStartMs, elapsed);
+      if (/INSERT INTO usage_daily/.test(sql) && /FROM events/.test(sql)) vi.setSystemTime(Date.now() + chunkMs);
+    };
+    const before = logged.length;
+    try {
+      await runNightly(env, Date.parse(iso));
+    } finally {
+      d1.onStatement = null;
+    }
+    const summary = logged.slice(before).find((line) => line.msg === 'nightly rollup');
+    return { latestStartMs, summary };
+  }
+
+  beforeEach(() => {
+    vi.useFakeTimers({ toFake: ['Date'] });
+    db = new nodeSqlite!.DatabaseSync(':memory:');
+    for (const file of fs.readdirSync(MIGRATIONS).filter((f) => f.endsWith('.sql')).sort()) {
+      db.exec(fs.readFileSync(path.join(MIGRATIONS, file), 'utf8'));
+    }
+    d1 = new SqliteD1(db);
+    env = {
+      DB: d1,
+      RETENTION_DAYS: 90,
+      MACHINE_RATE_LIMITER: { limit: async () => ({ success: true }) },
+      ADMIN_RATE_LIMITER: { limit: async () => ({ success: true }) },
+    } as never;
+    logged = [];
+    const capture = (line: unknown): void => {
+      try {
+        logged.push(JSON.parse(String(line)) as Row);
+      } catch {
+        /* not one of the worker's JSON lines */
+      }
+    };
+    vi.spyOn(console, 'log').mockImplementation(capture);
+    vi.spyOn(console, 'error').mockImplementation(capture);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+    db.close();
+  });
+
+  const M1 = '00000000-0000-4000-8000-000000000001';
+  const M2 = '00000000-0000-4000-8000-000000000002';
+  const M3 = '00000000-0000-4000-8000-000000000003';
+  const install = (ts: string): Row => ({ event: 'install', ts, props: { scope: 'local', kind: 'fresh' } });
+  const index = (ts: string): Row => ({ event: 'index', ts, props: { languages: ['typescript'] } });
+  const usage = (day: string, count: number): Row => ({
+    event: 'usage_rollup',
+    ts: `${day}T12:00:00.000Z`,
+    props: { kind: 'mcp_tool', name: 'codegraph_explore', count, client_name: 'Claude Code' },
+  });
+
+  // -------------------------------------------------------------------------
+  // 1. Activation counts an index run that uploads late
+  // -------------------------------------------------------------------------
+
+  describe('a late index upload', () => {
+    it('counts toward activation even when it arrives after the nightly run stopped revisiting its day', async () => {
+      // Sep 25: the machine installs. Its index run fails to upload and stays in the
+      // client's queue, keeping its original timestamp.
+      at('2026-09-25T15:00:00Z');
+      expect(await post(M1, [install('2026-09-25T14:00:00Z')])).toBe(204);
+      await nightly('2026-09-26T00:30:00Z');
+
+      // Oct 3: the queued index run finally goes out — eight days late, inside the
+      // 30 days ingest accepts, but long past the three days each nightly run re-rolls.
+      at('2026-10-03T10:00:00Z');
+      expect(await post(M1, [index('2026-09-25T14:05:00Z')])).toBe(204);
+      // Someone else's activity, so the rollup's coverage moves past the cohort's window.
+      expect(await post(M2, [install('2026-10-03T09:00:00Z')])).toBe(204);
+      await nightly('2026-10-04T00:30:00Z');
+
+      at('2026-10-04T08:00:00Z');
+      const funnel = await api('/api/activation?from=2026-09-25&to=2026-09-25&window=7');
+      expect(funnel).toMatchObject({ installs: 1, activated: 1, dropped: 0, covered_through: '2026-10-03' });
+      expect(one('SELECT first_day, first_index_day FROM machine_first_seen WHERE machine_id = ?', M1)).toEqual({
+        first_day: '2026-09-25',
+        first_index_day: '2026-09-25',
+      });
+    });
+
+    it('is applied as it is stored, and only ever moves the first index day earlier', async () => {
+      const firstSeen = (machineId: string): Row | undefined =>
+        one('SELECT first_day, first_index_day FROM machine_first_seen WHERE machine_id = ?', machineId);
+
+      at('2026-10-03T10:00:00Z');
+      // A batch without an index run says nothing about indexing.
+      expect(await post(M1, [install('2026-10-02T10:00:00Z')])).toBe(204);
+      expect(await post(M1, [usage('2026-10-01', 4)])).toBe(204);
+      expect(firstSeen(M1)).toEqual({ first_day: '2026-10-01', first_index_day: null });
+
+      // The earliest index run in a batch wins, with no rollup involved.
+      expect(await post(M1, [index('2026-10-03T09:00:00Z'), index('2026-10-02T11:00:00Z')])).toBe(204);
+      expect(firstSeen(M1)).toEqual({ first_day: '2026-10-01', first_index_day: '2026-10-02' });
+
+      // A later index run leaves it alone; a backdated one lowers it, and first_day with it.
+      expect(await post(M1, [index('2026-10-03T09:30:00Z')])).toBe(204);
+      expect(firstSeen(M1)).toEqual({ first_day: '2026-10-01', first_index_day: '2026-10-02' });
+      expect(await post(M1, [index('2026-09-20T08:00:00Z')])).toBe(204);
+      expect(firstSeen(M1)).toEqual({ first_day: '2026-09-20', first_index_day: '2026-09-20' });
+
+      // A machine whose very first batch carries an index run.
+      expect(await post(M2, [install('2026-10-03T08:00:00Z'), index('2026-10-03T08:01:00Z')])).toBe(204);
+      expect(firstSeen(M2)).toEqual({ first_day: '2026-10-03', first_index_day: '2026-10-03' });
+
+      // The nightly rollup agrees with what ingest already wrote.
+      await nightly('2026-10-04T00:30:00Z');
+      expect(firstSeen(M1)).toEqual({ first_day: '2026-09-20', first_index_day: '2026-09-20' });
+      expect(firstSeen(M2)).toEqual({ first_day: '2026-10-03', first_index_day: '2026-10-03' });
+    });
+  });
+
+  // -------------------------------------------------------------------------
+  // 2. Usage-only days are not a stalled ingest
+  // -------------------------------------------------------------------------
+
+  describe('the stalled-ingest flag', () => {
+    it('counts usage counters as ingest that is still storing', async () => {
+      // The last lifecycle event is Sep 25; after that only usage counters arrive.
+      at('2026-09-25T15:00:00Z');
+      expect(await post(M1, [install('2026-09-25T14:00:00Z')])).toBe(204);
+      // Clients upload a day's counters only once it is over: Oct 3's arrive on Oct 4.
+      at('2026-10-04T06:00:00Z');
+      expect(await post(M2, [usage('2026-10-03', 12)])).toBe(204);
+
+      at('2026-10-04T08:00:00Z');
+      const meta = await api('/api/meta');
+      expect(meta).toMatchObject({ latest_raw_day: '2026-09-25', latest_ingest_day: '2026-10-03', ingest_stalled: false });
+
+      // Just past midnight nobody has sent Oct 4's counters yet; that is not a stall.
+      at('2026-10-05T00:10:00Z');
+      expect(await api('/api/meta')).toMatchObject({ ingest_stalled: false });
+
+      // A whole day later with nothing stored at all, it is — and the banner date is
+      // the last day anything was stored, not the last lifecycle event.
+      at('2026-10-06T08:00:00Z');
+      expect(await api('/api/meta')).toMatchObject({ latest_ingest_day: '2026-10-03', ingest_stalled: true });
+    });
+
+    it('still reports a stall when nothing at all has arrived, and not on an empty database', async () => {
+      at('2026-10-04T08:00:00Z');
+      expect(await api('/api/meta')).toMatchObject({ latest_ingest_day: null, ingest_stalled: false });
+
+      at('2026-09-25T15:00:00Z');
+      expect(await post(M1, [install('2026-09-25T14:00:00Z')])).toBe(204);
+      at('2026-10-04T08:00:00Z');
+      expect(await api('/api/meta')).toMatchObject({ latest_ingest_day: '2026-09-25', ingest_stalled: true });
+
+      // A lifecycle event from yesterday is fresh, as before.
+      expect(await post(M1, [index('2026-10-03T22:00:00Z')])).toBe(204);
+      expect(await api('/api/meta')).toMatchObject({ latest_ingest_day: '2026-10-03', ingest_stalled: false });
+    });
+  });
+
+  // -------------------------------------------------------------------------
+  // 3. A long catch-up stays inside the cron's wall-clock limit, and the purge runs
+  // -------------------------------------------------------------------------
+
+  describe('the nightly run under a catch-up backlog', () => {
+    /** The rollup folds legacy usage rows 50,000 per transaction (rollup.ts, LEGACY_CHUNK_ROWS). */
+    const CHUNK_ROWS = 50_000;
+    /**
+     * Each fold chunk is charged 4 minutes, so a backlog of legacy-heavy days costs
+     * several minutes apiece, as it did in production. The six missed days below hold
+     * seven chunks: 28 minutes of folding, against a 15-minute limit.
+     */
+    const CHUNK_MS = 4 * MINUTE;
+    const NIGHT_1 = '2026-10-05T00:30:00Z';
+    /** Missed days, newest first — the order catch-up takes them in. Sep 21 needs two chunks. */
+    const MISSED = ['2026-09-23', '2026-09-22', '2026-09-21', '2026-09-20', '2026-09-19', '2026-09-18'];
+    const LEGACY_ROWS: Record<string, number> = Object.fromEntries(
+      MISSED.map((day) => [day, day === '2026-09-21' ? CHUNK_ROWS + 3 : 3]),
+    );
+    const PAST_WINDOW = '2026-06-01';
+
+    /** Legacy rows as they were stored before migrations/0003: one `events` row per upload, count 1. */
+    function seedLegacyDay(day: string, rows: number): void {
+      db.prepare(
+        `WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < ?1)
+         INSERT INTO events (received_at, ts, day, event, machine_id, codegraph_version, os, arch,
+                             node_major, ci, schema_version, props)
+         SELECT ?2 || 'T13:00:00.000Z', ?2 || 'T12:00:00.000Z', ?2, 'usage_rollup',
+                '00000000-0000-4000-8000-00000000010' || ((i - 1) % 5), '1.5.0', 'linux', 'x64', 22, 0, 1,
+                '{"kind":"mcp_tool","name":"codegraph_explore","count":1,"error_count":0,"client_name":"Claude Code"}'
+           FROM n`,
+      ).run(BigInt(rows), day);
+      for (let m = 0; m < Math.min(rows, 5); m++) {
+        const machine = `00000000-0000-4000-8000-00000000010${m}`;
+        db.prepare('INSERT INTO machine_days (machine_id, day, prod) VALUES (?, ?, 1)').run(machine, day);
+        db.prepare(
+          `INSERT INTO machine_first_seen (machine_id, first_day) VALUES (?, ?)
+             ON CONFLICT (machine_id) DO UPDATE SET first_day = min(first_day, excluded.first_day)`,
+        ).run(machine, day);
+      }
+    }
+
+    /** Where each seeded usage count sits right now, and whether the day has been rolled up. */
+    function ledger(day: string) {
+      const folded = Number(one('SELECT coalesce(sum(count), 0) AS n FROM usage_daily WHERE day = ?', day)?.n);
+      const unfolded = Number(
+        one(
+          `SELECT coalesce(sum(json_extract(props, '$.count')), 0) AS n FROM events
+            WHERE day = ? AND event = 'usage_rollup'`,
+          day,
+        )?.n,
+      );
+      const rolledUsage = one(`SELECT count FROM daily_event_counts WHERE day = ? AND event = 'usage_rollup'`, day);
+      const rolledUp = one('SELECT machines FROM daily_machines WHERE day = ?', day) !== undefined;
+      return { folded, unfolded, rolledUsage: rolledUsage ? Number(rolledUsage.count) : null, rolledUp };
+    }
+
+    function expectConsistent(): void {
+      for (const day of MISSED) {
+        const l = ledger(day);
+        // Nothing lost and nothing counted twice, however far the fold got.
+        expect(l.folded + l.unfolded, day).toBe(LEGACY_ROWS[day]);
+        if (l.rolledUp) {
+          expect(l, day).toMatchObject({ unfolded: 0, rolledUsage: LEGACY_ROWS[day] });
+        } else {
+          // A day whose fold did not finish gets no rollup at all, so it stays "missed".
+          expect(l.rolledUsage, day).toBeNull();
+        }
+      }
+    }
+
+    beforeEach(() => {
+      for (const day of MISSED) seedLegacyDay(day, LEGACY_ROWS[day]!);
+      // Past the 90-day window: the purge must take these.
+      db.prepare(
+        `INSERT INTO events (received_at, ts, day, event, machine_id, props)
+         VALUES ('2026-06-01T10:00:00.000Z', NULL, ?1, 'install', ?2, '{}')`,
+      ).run(PAST_WINDOW, M3);
+      db.prepare(
+        `INSERT INTO usage_daily (day, machine_id, kind, name, count) VALUES (?, ?, 'cli_command', 'index', 2)`,
+      ).run(PAST_WINDOW, M3);
+    });
+
+    it('purges on schedule, stops before the limit, and resumes the backlog the next nights', async () => {
+      // The three days the run re-rolls every night have ordinary, current traffic.
+      at('2026-10-04T12:00:00Z');
+      expect(await post(M1, [install('2026-10-04T11:00:00Z'), usage('2026-10-03', 5)])).toBe(204);
+      expect(await post(M2, [index('2026-10-02T11:00:00Z')])).toBe(204);
+
+      const first = await nightly(NIGHT_1, CHUNK_MS);
+      expect(first.latestStartMs).toBeLessThanOrEqual(CRON_LIMIT_MS);
+      // The purge ran, and the summary line was written.
+      expect(one('SELECT count(*) AS n FROM events WHERE day < ?', '2026-07-07')?.n).toBe(0);
+      expect(one('SELECT count(*) AS n FROM usage_daily WHERE day < ?', '2026-07-07')?.n).toBe(0);
+      expect(first.summary).toMatchObject({ purged: 1, usage_purged: 1, failed: 0 });
+      // Tonight's regular days were rolled up first.
+      for (const day of ['2026-10-04', '2026-10-03', '2026-10-02']) {
+        expect(one('SELECT machines FROM daily_machines WHERE day = ?', day), day).toEqual({ machines: 1 });
+      }
+      // The backlog did not fit: Sep 21 was left part-folded and un-rolled, the rest untouched.
+      expect(ledger('2026-09-21')).toMatchObject({ folded: CHUNK_ROWS, unfolded: 3, rolledUp: false });
+      expect(MISSED.filter((day) => !ledger(day).rolledUp)).toEqual(MISSED.slice(2));
+      expect(first.summary).toMatchObject({ caught_up: 2, deferred: 4 });
+      expectConsistent();
+
+      // The next nights pick up exactly where this one stopped.
+      let nights = 1;
+      for (let day = 6; MISSED.some((d) => !ledger(d).rolledUp) && nights < 5; day++, nights++) {
+        const night = await nightly(`2026-10-0${day}T00:30:00Z`, CHUNK_MS);
+        expect(night.latestStartMs).toBeLessThanOrEqual(CRON_LIMIT_MS);
+        expect(night.summary).toMatchObject({ failed: 0 });
+        expectConsistent();
+      }
+      expect(nights).toBe(3);
+      for (const day of MISSED) expect(ledger(day), day).toMatchObject({ unfolded: 0, rolledUp: true });
+    });
+  });
+});
diff --git a/__tests__/ts-this-field-call.test.ts b/__tests__/ts-this-field-call.test.ts
index fba43e6b7a..4760bce493 100644
--- a/__tests__/ts-this-field-call.test.ts
+++ b/__tests__/ts-this-field-call.test.ts
@@ -114,9 +114,10 @@ describe('this.<field>.<method>() (#1496)', () => {
   });
 
   it('resolves a field typed `typeof <objectLiteral>` onto the literal\'s member', () => {
-    // The members are bare-named functions inside the constant's extent (#1573).
-    expect(calleesOf('Keeper::settings')).toEqual(['getSettings']);
-    expect(calleesOf('Keeper::get')).toEqual(['get']);
+    // The members are functions inside the constant's extent (#1573), qualified
+    // under it (#2300).
+    expect(calleesOf('Keeper::settings')).toEqual(['DraftHubStorage::getSettings']);
+    expect(calleesOf('Keeper::get')).toEqual(['DraftHubStorage::get']);
     const self = cg.getCallers(method('Keeper::get').id).some(({ node }) => node.id === method('Keeper::get').id);
     expect(self).toBe(false);
   });
diff --git a/__tests__/ui-server.test.ts b/__tests__/ui-server.test.ts
index 525b54aaf9..361d374fbd 100644
--- a/__tests__/ui-server.test.ts
+++ b/__tests__/ui-server.test.ts
@@ -23,12 +23,14 @@ import {
   openBrowser,
   cacheControlFor,
   contentTypeFor,
+  describeBindFailure,
   isAllowedHost,
   isAllowedOrigin,
   isSafeRequestPath,
   PathRefusalError,
   resolveProjectFile,
   resolveStaticAsset,
+  shouldTryNextPort,
   startUiServer,
   type UiServerHandle,
 } from '../src/ui-server';
@@ -76,6 +78,31 @@ function request(
   });
 }
 
+/** A failed `listen()` as node reports it. */
+function bindError(code: string, port: number): NodeJS.ErrnoException {
+  return Object.assign(new Error(`listen ${code}: 127.0.0.1:${port}`), { code, syscall: 'listen' });
+}
+
+/**
+ * Make `listen()` on `refused` fail with EACCES, the way Windows refuses a port
+ * another program holds exclusively or one inside a reserved range, without
+ * needing either on the machine running the test (#2299). Every other port is
+ * a real bind.
+ */
+function refuseListenOn(...refused: number[]): { mockRestore(): void } {
+  const realListen = http.Server.prototype.listen;
+  return vi
+    .spyOn(http.Server.prototype, 'listen')
+    .mockImplementation(function (this: http.Server, ...args: unknown[]) {
+      const port = args[0];
+      if (typeof port === 'number' && refused.includes(port)) {
+        process.nextTick(() => this.emit('error', bindError('EACCES', port)));
+        return this;
+      }
+      return (realListen as (...a: unknown[]) => http.Server).apply(this, args);
+    });
+}
+
 describe('codegraph ui server', () => {
   let tempDir: string;
   let viewerDir: string;
@@ -205,6 +232,50 @@ describe('codegraph ui server', () => {
         await new Promise<void>((resolve) => blocker.close(() => resolve()));
       }
     });
+
+    /**
+     * #2299: on Windows a port another program holds exclusively, or one in a
+     * reserved range, fails with EACCES rather than EADDRINUSE, and the walk
+     * used to stop there. Port N is really taken, N+1 is refused, so the server
+     * has to land beyond both. N+1 is an ephemeral port, above 1023, so this
+     * holds on every platform.
+     */
+    it('falls back past a port refused with EACCES', async () => {
+      const blocker = http.createServer(() => {});
+      await new Promise<void>((resolve) => blocker.listen(0, '127.0.0.1', resolve));
+      const taken = (blocker.address() as { port: number }).port;
+      const refusal = refuseListenOn(taken + 1);
+
+      try {
+        const second = await startUiServer({ projectRoot, viewerDir, port: taken });
+        try {
+          expect(second.port).toBeGreaterThan(taken + 1);
+          // …and it actually works on the port it landed on.
+          const res = await request(second.port, '/');
+          expect(res.status).toBe(200);
+        } finally {
+          await second.close();
+        }
+      } finally {
+        refusal.mockRestore();
+        await new Promise<void>((resolve) => blocker.close(() => resolve()));
+      }
+    });
+
+    it('blames a refused pinned port on what refused it, not on privileged ports', async () => {
+      // The port from the report: nowhere near 1024.
+      const refusal = refuseListenOn(49912);
+      try {
+        const failure = startUiServer({ projectRoot, viewerDir, port: 49912, portFallback: false });
+        await expect(failure).rejects.toThrow(/49912/);
+        const message = await failure.catch((err: Error) => err.message);
+        expect(message).not.toMatch(/below 1024|elevated privileges/);
+        expect(message).not.toMatch(/already in use/);
+        expect(message).toMatch(/refused/);
+      } finally {
+        refusal.mockRestore();
+      }
+    });
   });
 
   describe('Host allowlist (DNS rebinding)', () => {
@@ -545,6 +616,93 @@ describe('security helpers', () => {
   });
 });
 
+/**
+ * What a bind failure means depends on the platform (#2299): Windows has no
+ * privileged ports and refuses a taken or reserved one with EACCES, while
+ * elsewhere EACCES below 1024 is the privileged-port rule. The platform is a
+ * parameter, so every host checks every platform's answer.
+ */
+describe('port fallback on each platform', () => {
+  const LIST_RESERVED = 'netsh int ipv4 show excludedportrange protocol=tcp';
+
+  it('moves past a port in use everywhere, and past EACCES on Windows at any port', () => {
+    for (const platform of ['win32', 'linux', 'darwin'] as const) {
+      expect(shouldTryNextPort('EADDRINUSE', 80, platform), platform).toBe(true);
+      expect(shouldTryNextPort('EADDRINUSE', 4747, platform), platform).toBe(true);
+    }
+    expect(shouldTryNextPort('EACCES', 49912, 'win32')).toBe(true);
+    // Windows has no privileged-port rule: a low port is held, not forbidden.
+    expect(shouldTryNextPort('EACCES', 80, 'win32')).toBe(true);
+  });
+
+  it('stops at EACCES below 1024 elsewhere, where the next port needs the same privilege', () => {
+    expect(shouldTryNextPort('EACCES', 80, 'linux')).toBe(false);
+    expect(shouldTryNextPort('EACCES', 1023, 'darwin')).toBe(false);
+    // From 1024 up the refusal is about that port, and the next may be allowed.
+    expect(shouldTryNextPort('EACCES', 1024, 'linux')).toBe(true);
+    expect(shouldTryNextPort('EACCES', 4747, 'darwin')).toBe(true);
+  });
+
+  it('never moves past any other failure', () => {
+    for (const platform of ['win32', 'linux'] as const) {
+      expect(shouldTryNextPort('EADDRNOTAVAIL', 4747, platform), platform).toBe(false);
+      expect(shouldTryNextPort('EPERM', 4747, platform), platform).toBe(false);
+      expect(shouldTryNextPort(undefined, 4747, platform), platform).toBe(false);
+    }
+  });
+
+  it('says why Windows refused a pinned port, without the POSIX privileged-port story', () => {
+    for (const port of [49912, 80]) {
+      const message = describeBindFailure(bindError('EACCES', port), port, { port, fallback: false }, 'win32').message;
+      expect(message).toMatch(
+        new RegExp(`^Windows refused port ${port}: another program holds it, or it is in a reserved range`)
+      );
+      expect(message).toContain(LIST_RESERVED);
+      expect(message).toContain('omit --port');
+      expect(message).not.toMatch(/below 1024|elevated privileges/);
+    }
+  });
+
+  it('keeps the privileged-port explanation off Windows, and only below 1024', () => {
+    for (const fallback of [false, true]) {
+      const message = describeBindFailure(bindError('EACCES', 80), 80, { port: 80, fallback }, 'linux').message;
+      expect(message).toBe(
+        'Not allowed to listen on port 80. Ports below 1024 usually need elevated privileges — pick a higher one with --port.'
+      );
+    }
+    const high = describeBindFailure(bindError('EACCES', 4747), 4747, { port: 4747, fallback: false }, 'darwin').message;
+    expect(high).toMatch(/^Not allowed to listen on port 4747: the system refused permission\./);
+    expect(high).not.toMatch(/below 1024|elevated privileges|Windows|netsh/);
+  });
+
+  it('says a walk that ran out met refusals, not only ports in use', () => {
+    const walk = { port: 4747, fallback: true };
+    const inUse = bindError('EADDRINUSE', 4766);
+    const refused = bindError('EACCES', 4766);
+
+    // Nothing refused: the message it always gave.
+    expect(describeBindFailure(inUse, 4766, walk, 'win32').message).toBe(
+      'Ports 4747–4766 are all in use. Free one, or pick another with --port.'
+    );
+    const windows = describeBindFailure(refused, 4766, walk, 'win32').message;
+    expect(windows).toMatch(/^Ports 4747–4766 are all in use or reserved/);
+    expect(windows).toContain(LIST_RESERVED);
+    // An earlier port was refused even though the last one was only in use.
+    expect(describeBindFailure(inUse, 4766, walk, 'win32', true).message).toBe(windows);
+    const posix = describeBindFailure(refused, 4766, walk, 'linux').message;
+    expect(posix).toMatch(/^Ports 4747–4766 are all in use or not allowed\./);
+    expect(posix).not.toMatch(/reserved|netsh/);
+  });
+
+  it('leaves the pinned in-use message and other failures as they were', () => {
+    expect(
+      describeBindFailure(bindError('EADDRINUSE', 8080), 8080, { port: 8080, fallback: false }, 'win32').message
+    ).toBe('Port 8080 is already in use. Pick another with --port, or omit --port to let CodeGraph find a free one.');
+    const other = bindError('EADDRNOTAVAIL', 4747);
+    expect(describeBindFailure(other, 4747, { port: 4747, fallback: true }, 'linux')).toBe(other);
+  });
+});
+
 describe('browserOpenCommand', () => {
   it('does not spawn a browser when CODEGRAPH_BROWSER=none', () => {
     const spawn = vi.spyOn(childProcess, 'spawn').mockImplementation(() => {
diff --git a/__tests__/upstream-native-scope-regressions.test.ts b/__tests__/upstream-native-scope-regressions.test.ts
new file mode 100644
index 0000000000..13da563774
--- /dev/null
+++ b/__tests__/upstream-native-scope-regressions.test.ts
@@ -0,0 +1,118 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import { CodeGraph } from '../src';
+import { vueTemplateCalls } from '../src/extraction/vue-template-calls';
+
+let root: string | undefined;
+let graph: CodeGraph | undefined;
+afterEach(() => {
+  graph?.close();
+  graph = undefined;
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+  root = undefined;
+});
+async function project(files: Record<string, string>) {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-native-scope-'));
+  for (const [file, source] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, file)), { recursive: true });
+    fs.writeFileSync(path.join(root, file), source);
+  }
+  graph = await CodeGraph.init(root, { index: true });
+}
+function calls(name: string) {
+  const from = [...graph!.getNodesByKind('function'), ...graph!.getNodesByKind('method')]
+    .find(node => node.name === name)!;
+  expect(from).toBeDefined();
+  return graph!.getOutgoingEdges(from.id).filter(edge => edge.kind === 'calls')
+    .map(edge => graph!.getNode(edge.target)!)
+    .map(node => `${node.filePath}:${node.qualifiedName}`).sort();
+}
+
+describe('upstream ports preserve declaration scope', () => {
+  it('does not borrow a same-file global host object through a shadowing parameter', async () => {
+    await project({ 'main.js': 'window.WS = { wsM() {} };\nfunction shadow(window) { return window.WS.wsM(); }\nfunction known() { return window.WS.wsM(); }\n' });
+    expect(calls('shadow')).toEqual([]);
+    expect(calls('known')).toEqual(['main.js:window.WS::wsM']);
+  });
+  it('keeps a path-assigned object in the scope of its local root', async () => {
+    await project({ 'main.js': 'function a() { const App = {}; App.utils = { pad() {} }; App.utils.pad(); }\nfunction b() { App.utils.pad(); }\n' });
+    expect(calls('b')).toEqual([]);
+    expect(calls('a')).toEqual(['main.js:App.utils::pad']);
+  });
+  it.each([['window', false], ['window', true], ['{ window }', false], ['{ window }', true]] as const)('does not publish an object assigned through a local host parameter %s (same file %s)', async (parameter, sameFile) => {
+    const declaration = `function define(${parameter}) { window.WS = { wsM() {} }; }\n`;
+    const consumer = 'function outside() { window.WS.wsM(); WS.wsM(); }\n';
+    await project(sameFile ? { 'main.js': declaration + consumer } : { 'ns.js': declaration, 'use.js': consumer });
+    expect(calls('outside')).toEqual([]);
+  });
+  it.each([false, true])('does not publish a path assigned through a destructured root (same file %s)', async sameFile => {
+    const declaration = 'var App = {}; function define({ App }) { App.utils = { pad() {} }; }\n';
+    const consumer = 'function outside() { App.utils.pad(); }\n';
+    await project(sameFile ? { 'main.js': declaration + consumer } : { 'ns.js': declaration, 'use.js': consumer });
+    expect(calls('outside')).toEqual([]);
+  });
+  it.each([false, true])('keeps a loop-owned path out of global consumers (same file %s)', async sameFile => {
+    const declaration = 'var App = {}; for (const App of apps) { App.utils = { pad() {} }; }\n';
+    const consumer = 'function outside() { App.utils.pad(); }\n';
+    await project(sameFile ? { 'main.js': declaration + consumer } : { 'ns.js': declaration, 'use.js': consumer });
+    expect(calls('outside')).toEqual([]);
+  });
+  it.each(['main.js', 'Page.vue', 'Page.svelte', 'Page.astro'].flatMap(file => [false, true].map(multiline => ({ file, multiline }))))('keeps a destructured member inside its declaring function in $file (multiline $multiline)', async ({ file, multiline }) => {
+    const code = "const label = '日本🙂'; const api = { post() {} }; function local() { const { post } = api; return post(); } function outside() { return post(); }\n";
+    const script = multiline ? code.replace('; function local()', ';\nfunction local()') : code;
+    const source = file.endsWith('.vue') ? `<template><p>日本🙂</p></template>\n<script setup>\n${script}</script>`
+      : file.endsWith('.svelte') ? `<p>日本🙂</p>\n<script>\n${script}</script>`
+      : file.endsWith('.astro') ? `---\n${script}---\n` : script;
+    await project({ [file]: source });
+    expect(calls('local')).toEqual([`${file}:api::post`]);
+    expect(calls('outside')).toEqual([]);
+  });
+  it('binds a destructure source at its declaration rather than a later captured call', async () => {
+    await project({ 'main.js': 'const api = { post() {} };\nfunction shadow(api) { const { post } = api; return post(); }\nfunction capture() { const { post } = api; function captured(api) { return post(); } return captured(); }\n' });
+    expect(calls('shadow')).toEqual([]);
+    expect(calls('captured')).toEqual(['main.js:api::post']);
+  });
+  it('retains a call through a parameter-owned path after its literal assignment', async () => {
+    await project({ 'main.js': 'var App = {}; function define({ App }) { App.utils = { pad() {} }; App.utils.pad(); } function outside() { App.utils.pad(); }\n' });
+    expect(calls('define')).toEqual(['main.js:App.utils::pad']);
+    expect(calls('outside')).toEqual([]);
+  });
+  it('distinguishes a path root parameter from a global root on the same line', async () => {
+    await project({ 'main.js': 'var App = {}; function define() { App.utils = { pad() {} }; } function use(App) { App.utils.pad(); }\n' });
+    expect(calls('use')).toEqual([]);
+  });
+  it.each([
+    ['items.map(format => format()) && format()', ['items.map', 'format']],
+    ['(function(format) { return format(); })(cb) + format()', ['format']],
+    ['items.map(format => { return format(); }) && format()', ['items.map', 'format']],
+    ['items.map(({ key: format }) => format()) && key()', ['items.map', 'key']],
+  ] as const)('keeps callback parameters local to their expression body: %s', (expression, expected) => {
+    expect(vueTemplateCalls(`<template><p>{{ ${expression} }}</p></template>`).map(call => call.name)).toEqual(expected);
+  });
+  it('binds a renamed Vue slot value without binding its property key', () => {
+    const source = '<template><Row #default="{ row: item }">{{ row() }} {{ item() }}</Row></template>';
+    expect(vueTemplateCalls(source).map(call => call.name)).toEqual(['row']);
+  });
+  it.each([false, true])('does not borrow another VB project member when inheritance is %s', async (inherited) => {
+    const vbproj = '<Project Sdk="Microsoft.NET.Sdk"><PropertyGroup></PropertyGroup></Project>\n';
+    await project({
+      'A/A.vbproj': vbproj,
+      'B/B.vbproj': vbproj,
+      'A/Service.vb': `Public Class Service\n${inherited ? ' Inherits BaseA\n' : ''}End Class\nPublic Class BaseA\n Public Sub Ping()\n End Sub\nEnd Class\n`,
+      'B/Service.vb': 'Public Class Service\n Public Sub Ping()\n End Sub\nEnd Class\n',
+      'A/Main.vb': 'Public Class Main\n Public Sub Run(s As Service)\n s.Ping()\n End Sub\nEnd Class\n',
+    });
+    expect(calls('Run')).toEqual(inherited ? ['A/Service.vb:BaseA::Ping'] : []);
+  });
+  it('does not read a Dart getter when assigning its setter', async () => {
+    await project({ 'lib/main.dart': 'class Box { int get area => 1; set area(int value) {} }\nvoid write(Box x) { x.area = 4; }\nint read(Box x) => x.area;\n' });
+    expect(calls('write')).toEqual([]);
+    expect(calls('read')).toEqual(['lib/main.dart:Box::area']);
+  });
+  it('evaluates a Vue loop source before binding the loop alias', () => {
+    const source = '<template><li v-for="rowsFor in rowsFor(user)">{{ rowsFor() }}</li></template>';
+    expect(vueTemplateCalls(source).map(call => call.name)).toEqual(['rowsFor']);
+  });
+});
diff --git a/__tests__/vbnet-bare-member-scope.test.ts b/__tests__/vbnet-bare-member-scope.test.ts
new file mode 100644
index 0000000000..a2601671b1
--- /dev/null
+++ b/__tests__/vbnet-bare-member-scope.test.ts
@@ -0,0 +1,100 @@
+/**
+ * A VB.NET call with no receiver — or with `Me` / `MyClass` / `MyBase`,
+ * which the extractor drops — is a member of the type it is written in, of a
+ * type around it, or of one they inherit; a `Module`'s members are reached
+ * from anywhere. Never another class's same-named member, however near its
+ * file: SCrawler's `{ToString()}` in the Instagram `UserData` (which
+ * `Inherits UserDataBase`) went to a nearby structure's `ToString`.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vb-bare-'));
+  const files: Record<string, string> = {
+    'API/Base/UserDataBase.vb': `Namespace API.Base
+    Friend MustInherit Class UserDataBase
+        Public Overrides Function ToString() As String
+            Return "user"
+        End Function
+        Protected Sub Refresh()
+        End Sub
+    End Class
+End Namespace
+`,
+    'API/Instagram/MediaItem.vb': `Namespace API.Instagram
+    Friend Class MediaItem
+        Public Overrides Function ToString() As String
+            Return "media"
+        End Function
+        Friend Sub Refresh()
+        End Sub
+    End Class
+End Namespace
+`,
+    'API/Instagram/UserData.vb': `Namespace API.Instagram
+    Friend Class UserData : Inherits API.Base.UserDataBase
+        Friend Sub SetTagsLimit()
+            Dim aStr$ = $"Enter the number of posts from user {ToString()}"
+            Me.Refresh()
+            Log(aStr)
+        End Sub
+        Private Class Counter
+            Friend Sub Tick()
+                Report()
+            End Sub
+        End Class
+        Private Shared Sub Report()
+        End Sub
+    End Class
+End Namespace
+`,
+    'Tools/Logger.vb': `Public Module Logger
+    Public Sub Log(ByVal Text As String)
+    End Sub
+End Module
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `Owner::member` of every call edge out of one method. */
+function callsOf(file: string, qualifiedName: string): string[] {
+  const from = cg.getNodesInFile(file).find((n) => n.qualifiedName === qualifiedName)!;
+  return cg
+    .getOutgoingEdgesFrom([from.id])
+    .filter((e) => e.kind === 'calls')
+    .map((e) => cg.getNode(e.target)!.qualifiedName)
+    .sort();
+}
+
+describe('VB.NET receiver-less calls', () => {
+  it('reach the members the class inherits, not a nearer class’s, and a module’s', () => {
+    expect(callsOf('API/Instagram/UserData.vb', 'API.Instagram::UserData::SetTagsLimit')).toEqual([
+      'API.Base::UserDataBase::Refresh',
+      'API.Base::UserDataBase::ToString',
+      'Logger::Log',
+    ]);
+  });
+
+  it('reach a member of the class around a nested one', () => {
+    expect(callsOf('API/Instagram/UserData.vb', 'API.Instagram::UserData::Counter::Tick')).toEqual([
+      'API.Instagram::UserData::Report',
+    ]);
+  });
+});
diff --git a/__tests__/vbnet-member-access.test.ts b/__tests__/vbnet-member-access.test.ts
index 8b3186a87b..e558f9360d 100644
--- a/__tests__/vbnet-member-access.test.ts
+++ b/__tests__/vbnet-member-access.test.ts
@@ -7,6 +7,12 @@
  * (`GetService(Of Notifier).Notify()`). SCrawler's designer code sent
  * `New System.Drawing.Size(…)` to a nested enum's `Size` case 713 times and
  * `Controls.Add(…)` to a collection class's `Add` 547 times.
+ *
+ * The name read is the one the reference starts at (or after) — in
+ * `Me.Size = New System.Drawing.Size(…)` that is `System.Drawing.Size`, not
+ * `Me.Size` — and a type is one its written qualifier names: staxrip's
+ * designer `New System.Drawing.Point(…)` went to a nested `Point` class 550
+ * times. A type nested in a class is named bare only inside it.
  */
 import { describe, it, expect, afterAll, beforeAll } from 'vitest';
 import * as fs from 'fs';
@@ -76,6 +82,24 @@ End Class
     Private Sub Refresh()
     End Sub
 End Class
+`,
+    'UI/ButtonEx.vb': `Public Class ButtonEx
+    Public Class SymbolDrawer
+        Public Class Point
+        End Class
+        Public Sub Draw()
+            Dim p As New Point()
+        End Sub
+    End Class
+End Class
+`,
+    'Forms/AppsForm.vb': `Public Class AppsForm
+    Private Sub InitializeComponent()
+        Me.Size = New System.Drawing.Size(315, 205)
+        Me.ToolStrip.Location = New System.Drawing.Point(473, 10)
+        Me.lDescription.Location = New Point(4, 285)
+    End Sub
+End Class
 `,
   };
   for (const [rel, content] of Object.entries(files)) {
@@ -115,4 +139,15 @@ describe('VB.NET member access', () => {
       .map((e) => cg.getNode(e.target)!.qualifiedName);
     expect(trusted).not.toContain('Logger::Log');
   });
+
+  it('reads the name the reference starts at, and a type its qualifier names', () => {
+    const targetsOf = (file: string) => cg
+      .getOutgoingEdgesFrom(cg.getNodesInFile(file).map((n) => n.id))
+      .filter((e) => e.kind === 'calls' || e.kind === 'instantiates')
+      .map((e) => `${e.kind} ${cg.getNode(e.target)!.qualifiedName}`)
+      .sort();
+    // `Me.Size = New System.Drawing.Size(…)`, `New System.Drawing.Point(…)`, `New Point(…)` outside ButtonEx.
+    expect(targetsOf('Forms/AppsForm.vb')).toEqual([]);
+    expect(targetsOf('UI/ButtonEx.vb')).toEqual(['instantiates ButtonEx::SymbolDrawer::Point']);
+  });
 });
diff --git a/__tests__/vbnet-project-ties.test.ts b/__tests__/vbnet-project-ties.test.ts
new file mode 100644
index 0000000000..9d8e2fcc0e
--- /dev/null
+++ b/__tests__/vbnet-project-ties.test.ts
@@ -0,0 +1,143 @@
+/**
+ * A VB.NET solution often carries the same type in two projects: staxrip's
+ * main app and its separate AutoCrop tool (its own AutoCrop.vbproj) each
+ * declare `ColorHSL`, `FrameServerFactory` and `DirectFrameServer`. A call
+ * in the main app means its own project's copy — about 90 calls such as
+ * `_backColor.AddLuminance(0.025)` went to the AutoCrop copy, whichever was
+ * indexed first. Between equally good guesses, the caller's project decides,
+ * then the nearer directory; when neither does, there is no guess.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+const VBPROJ = `<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+  </PropertyGroup>
+</Project>
+`;
+
+const COLOR_HSL = `Public Class ColorHSL
+    Public Sub New(ByVal h As Double, ByVal s As Double, ByVal l As Double, ByVal a As Double)
+    End Sub
+    Public Function AddLuminance(ByVal offset As Single) As ColorHSL
+        Return Me
+    End Function
+End Class
+`;
+
+const FRAME_SERVER_FACTORY = `Public Class FrameServerFactory
+    Public Shared Function Create(ByVal path As String) As Object
+        Return Nothing
+    End Function
+End Class
+`;
+
+const HELPER = `Public Class Helper
+    Public Sub Run()
+    End Sub
+End Class
+`;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vb-ties-'));
+  const files: Record<string, string> = {
+    'Source/StaxRip.vbproj': VBPROJ,
+    'Source/Tools/AutoCrop/AutoCrop.vbproj': VBPROJ,
+    'Source/Tools/AutoCrop/Main.vb': COLOR_HSL + FRAME_SERVER_FACTORY,
+    'Source/UI/ColorHSL.vb': COLOR_HSL,
+    'Source/Video/FrameServer.vb': FRAME_SERVER_FACTORY,
+    'Source/General/ThemeManager.vb': `Public Class ThemeManager
+    Public Sub Apply(ByVal palette As Object)
+        Dim _backColor As ColorHSL = New ColorHSL(0, 0.01, 0.1, 1)
+        Dim _controlBackColor As ColorHSL = _backColor.AddLuminance(0.025)
+        For Each backgroundColor In palette
+            backgroundColor.AddLuminance(-0.1)
+        Next
+        Dim server = FrameServerFactory.Create("video.mkv")
+    End Sub
+End Class
+`,
+    'Source/UI/TipProvider.vb': `Public Class TipProvider
+    Public Sub SetTip(ByVal text As String)
+    End Sub
+    Public Sub SetTip(ByVal text As String, ByVal title As String)
+    End Sub
+End Class
+`,
+    'Source/General/Tips.vb': `Public Class Tips
+    Public Sub Apply(ByVal providers As Object)
+        For Each tipProvider In providers
+            tipProvider.SetTip("x")
+        Next
+    End Sub
+End Class
+`,
+    'Plugins/A/A.vbproj': VBPROJ,
+    'Plugins/A/Helper.vb': HELPER,
+    'Plugins/B/B.vbproj': VBPROJ,
+    'Plugins/B/Helper.vb': HELPER,
+    'App/App.vbproj': VBPROJ,
+    'App/Main.vb': `Public Class Main
+    Public Sub Start(ByVal helpers As Object)
+        For Each runHelper In helpers
+            runHelper.Run()
+        Next
+    End Sub
+End Class
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `Owner::member @ file` of every call / instantiation edge out of a file. */
+function targetsFrom(file: string, kind: 'calls' | 'instantiates'): string[] {
+  const ids = cg.getNodesInFile(file).map((n) => n.id);
+  return cg
+    .getOutgoingEdgesFrom(ids)
+    .filter((e) => e.kind === kind)
+    .map((e) => {
+      const target = cg.getNode(e.target)!;
+      return `${target.qualifiedName} @ ${target.filePath}`;
+    })
+    .sort();
+}
+
+describe('VB.NET duplicate types across projects', () => {
+  it('resolve a call to the caller’s own project’s copy', () => {
+    expect(targetsFrom('Source/General/ThemeManager.vb', 'calls')).toEqual([
+      'ColorHSL::AddLuminance @ Source/UI/ColorHSL.vb',
+      'ColorHSL::AddLuminance @ Source/UI/ColorHSL.vb',
+      'FrameServerFactory::Create @ Source/Video/FrameServer.vb',
+    ]);
+  });
+
+  it('resolve a construction to the caller’s own project’s copy', () => {
+    expect(targetsFrom('Source/General/ThemeManager.vb', 'instantiates')).toEqual([
+      'ColorHSL @ Source/UI/ColorHSL.vb',
+    ]);
+  });
+
+  it('make no guess between copies nothing tells apart', () => {
+    expect(targetsFrom('App/Main.vb', 'calls')).toEqual([]);
+  });
+
+  it('take one type’s overloads as one guess, not a tie', () => {
+    expect(targetsFrom('Source/General/Tips.vb', 'calls')).toEqual(['TipProvider::SetTip @ Source/UI/TipProvider.vb']);
+  });
+});
diff --git a/__tests__/vbnet-receiver-types.test.ts b/__tests__/vbnet-receiver-types.test.ts
new file mode 100644
index 0000000000..0a81309747
--- /dev/null
+++ b/__tests__/vbnet-receiver-types.test.ts
@@ -0,0 +1,465 @@
+/**
+ * A VB.NET call through a local, a parameter, a field or a property is a call
+ * on the type it is declared with — `Dim x As T`, `ByVal x As T`,
+ * `x As New T`, `Private File As SFile`, `Property File As SFile`, a type
+ * character (`Dim name$`), or what `Dim x = obj.GetString(…)` returns —
+ * never a guess at a same-named method of some project class. Keywords are
+ * matched without regard to case. A declared type the project does not define
+ * means nothing of the project's, except an extension method declared for it.
+ *
+ * - SCrawler's `ThumbnailFile.Delete(SFO.File, …)` on an `SFile` (from the
+ *   external PersonalUtilities library) went to a nested `TempFileConversion`
+ *   class's `Delete`, `GroupFile.Delete()` to a download group's,
+ *   `UserUpdatedEventHandlers.Add(e)` on a `List(Of …)` to `UserDataBind.Add`
+ *   and `TotalSize.CompareTo(…)` on a `Double` to a plugin's `VSize.CompareTo`;
+ * - staxrip's `timestampFontColorValue.ToColor(…)`, a String from
+ *   `settings.GetString(…)`, went to a `ColorHSL.ToColor()` instead of the
+ *   String extension `StringExtensions.ToColor`.
+ *
+ * The type a name means is the one VB.NET's lookup finds where it is written:
+ * the namespaces around it (SCrawler declares a `SiteSettings` and an `M3U8`
+ * per site namespace), a base class's nested types, the file's `Imports`
+ * aliases, and the type arguments a subclass gives its base. The declared
+ * type wins over whatever is assigned later, a `For Each` variable is an
+ * element of what it loops over, and an interface a class implements lends
+ * it no members to read bare.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vb-receiver-'));
+  const files: Record<string, string> = {
+    'Download/Groups/DownloadGroup.vb': `Namespace DownloadObjects.Groups
+    Friend Class DownloadGroup
+        Friend Sub Delete()
+        End Sub
+    End Class
+End Namespace
+`,
+    'YouTube/Objects/YouTubeMediaContainerBase.vb': `Namespace API.YouTube.Objects
+    Public MustInherit Class YouTubeMediaContainerBase
+        Public ReadOnly Property ThumbnailFile As SFile
+        Private Class TempFileConversion
+            Friend Sub Delete(ByVal Mode As Integer)
+            End Sub
+        End Class
+    End Class
+End Namespace
+`,
+    'Download/Groups/DownloadGroupCollection.vb': `Namespace DownloadObjects.Groups
+    Friend Class DownloadGroupCollection
+        Private ReadOnly GroupFile As SFile = "Settings\\Groups.xml"
+        Friend Sub Update()
+            GroupFile.Delete()
+        End Sub
+        Friend Sub Reset(byval groupFile as SFile)
+            groupFile.Delete()
+        End Sub
+    End Class
+End Namespace
+`,
+    'Hosts/DownloadableMediaHost.vb': `Namespace Hosts
+    Friend Class DownloadableMediaHost : Inherits API.YouTube.Objects.YouTubeMediaContainerBase
+        Friend Sub Clean()
+            ThumbnailFile.Delete(1)
+        End Sub
+    End Class
+End Namespace
+`,
+    'API/UserDataBind.vb': `Namespace API
+    Friend Class UserDataBind
+        Friend Sub Add(ByVal User As Object)
+        End Sub
+    End Class
+End Namespace
+`,
+    'API/Base/UserDataBase.vb': `Namespace API.Base
+    Friend MustInherit Class UserDataBase
+        Private ReadOnly UserUpdatedEventHandlers As List(Of UserUpdatedEventHandler)
+        Friend Sub AddUpdateHandler(ByVal e As UserUpdatedEventHandler)
+            UserUpdatedEventHandlers.Add(e)
+        End Sub
+        Friend Sub Download()
+        End Sub
+    End Class
+End Namespace
+`,
+    'API/Instagram/UserData.vb': `Namespace API.Instagram
+    Friend Class UserData : Inherits API.Base.UserDataBase
+    End Class
+End Namespace
+`,
+    'API/Instagram/Downloader.vb': `Namespace API.Instagram
+    Friend Class Downloader
+        Friend Sub Run(ByVal u As UserData)
+            u.Download()
+        End Sub
+    End Class
+End Namespace
+`,
+    'Plugin/UserData.vb': `Friend Class VSize
+    Public Function CompareTo(ByVal Other As VSize) As Integer
+        Return 0
+    End Function
+End Class
+`,
+    'Editors/UsersInfoForm.vb': `Friend Class UsersInfoForm
+    Private NotInheritable Class UserOpt
+        Friend Property TotalSize As Double = 0
+        Friend Function CompareTo(ByVal Other As UserOpt) As Integer
+            Return TotalSize.CompareTo(Other.TotalSize) * -1
+        End Function
+    End Class
+End Class
+`,
+    'UI/ColorHSL.vb': `Public Class ColorHSL
+    Public Sub New(ByVal h As Double, ByVal s As Double, ByVal l As Double, ByVal a As Double)
+    End Sub
+    Public Function AddLuminance(ByVal offset As Single) As ColorHSL
+        Return Me
+    End Function
+    Public Function ToColor() As Integer
+        Return 0
+    End Function
+End Class
+`,
+    'UI/BackColorAdjuster.vb': `Public Class BackColorAdjuster
+    Public Function AddLuminance(ByVal offset As Single) As Integer
+        Return 0
+    End Function
+End Class
+`,
+    'UI/ThemeManager.vb': `Public Class ThemeManager
+    Public Sub Apply()
+        Dim _backColor As ColorHSL = New ColorHSL(0, 0.01, 0.1, 1)
+        Dim _controlBackColor As ColorHSL = _backColor.AddLuminance(0.025)
+    End Sub
+End Class
+`,
+    'UI/Popup.vb': `Public Class Popup
+    Public Sub Show()
+    End Sub
+End Class
+`,
+    'UI/MainForm.vb': `Public Class MainForm
+    Inherits Form
+
+    Public Sub OpenSettings()
+        Dim settingsForm As New MainForm
+        settingsForm.Show()
+    End Sub
+End Class
+`,
+    'General/Extensions.vb': `Imports System.Runtime.CompilerServices
+
+Module StringExtensions
+    <Extension>
+    Function ToColor(ByVal str As String, Optional ByVal defaultColor As Integer = 0) As Integer
+        Return 0
+    End Function
+    <Extension>
+    Function Join(ByVal instance As IEnumerable(Of String), ByVal delimiter As String) As String
+        Return ""
+    End Function
+    <Extension>
+    Function Sort(Of T)(ByVal instance As IEnumerable(Of T)) As IEnumerable(Of T)
+        Return instance
+    End Function
+End Module
+`,
+    'General/ObjectStorage.vb': `Public Class ObjectStorage
+    Public Function GetString(ByVal key As String, Optional ByVal defaultValue As String = Nothing) As String
+        Return defaultValue
+    End Function
+End Class
+`,
+    'General/Thumbnailer.vb': `Public Class Thumbnailer
+    Public Sub Run(ByVal settings As ObjectStorage)
+        Dim timestampFontColorValue = settings.GetString("TimestampFontColor", "#fff")
+        Dim timestampFontColor = timestampFontColorValue.ToColor(1)
+        Dim colorText As String = "#000"
+        Dim outline = colorText.ToColor()
+        Dim name$ = "x"
+        Dim named = name.ToColor()
+    End Sub
+End Class
+`,
+    'General/Lists.vb': `Public Class Lists
+    Public Sub Run()
+        Dim names As New List(Of String)
+        names.Sort()
+        Dim joined = names.Join(", ")
+    End Sub
+End Class
+`,
+    'Base/DownDetector.vb': `Namespace API.Base
+    Friend NotInheritable Class DownDetector
+        Friend MustInherit Class Checker(Of T)
+            Protected ReadOnly Property Source As T
+        End Class
+    End Class
+End Namespace
+`,
+    'Sites/Bluesky/SiteSettings.vb': `Namespace API.Bluesky
+    Friend Class SiteSettings
+        Friend Function IsMyUser(ByVal url As String) As Boolean
+            Return False
+        End Function
+        Friend Function AvailableTrueValue() As Boolean
+            Return False
+        End Function
+    End Class
+    Friend NotInheritable Class M3U8
+        Friend Shared Sub Download(ByVal url As String)
+        End Sub
+    End Class
+End Namespace
+`,
+    'Sites/Reddit/SiteSettings.vb': `Namespace API.Reddit
+    Friend Class SiteSettings
+        Friend Function IsMyUser(ByVal url As String) As Boolean
+            Return True
+        End Function
+        Friend Function AvailableTrueValue() As Boolean
+            Return True
+        End Function
+        Private Class MyDownDetector : Inherits API.Base.DownDetector.Checker(Of SiteSettings)
+            Friend Sub Check()
+                Source.AvailableTrueValue()
+            End Sub
+        End Class
+    End Class
+    Friend NotInheritable Class M3U8
+        Friend Shared Sub Download(ByVal url As String)
+        End Sub
+    End Class
+End Namespace
+`,
+    'Sites/Reddit/UserData.vb': `Namespace API.Reddit
+    Friend Class UserData
+        Private ReadOnly Property MySettings As SiteSettings
+        Friend Sub Check(ByVal url As String)
+            MySettings.IsMyUser(url)
+            M3U8.Download(url)
+        End Sub
+    End Class
+End Namespace
+`,
+    'Encoding/VideoEncoder.vb': `Public MustInherit Class VideoEncoder
+    Public Class MenuList
+        Public Sub Add(ByVal text As String)
+        End Sub
+    End Class
+End Class
+Public Class BatchEncoder
+    Inherits VideoEncoder
+    Public Function GetMenu() As Object
+        Dim ret As New MenuList
+        ret.Add("Codec Configuration")
+        Return ret
+    End Function
+End Class
+`,
+    'YouTube/YouTubeFunctions.vb': `Friend Interface IContainer
+    Sub Parse()
+End Interface
+Friend Class Channel : Implements IContainer
+    Friend Sub Parse() Implements IContainer.Parse
+    End Sub
+End Class
+Friend Module YouTubeFunctions
+    Friend Sub Load()
+        Dim item As IContainer
+        item = New Channel
+        item.Parse()
+    End Sub
+End Module
+`,
+    'UI/Labels.vb': `Public Class LabelUI
+    Public Function AddLabel(ByVal text As String) As Object
+        Return Nothing
+    End Function
+End Class
+Public Class SimpleUI
+    Public Function AddLabel(ByVal text As String) As Object
+        Return Nothing
+    End Function
+    Public Function AddLabel(ByVal text As String, ByVal width As Integer) As Object
+        Return Nothing
+    End Function
+End Class
+Public Class SimpleSettingsForm
+    Friend WithEvents SimpleUI As SimpleUI
+End Class
+`,
+    'UI/AudioForm.vb': `Public Class AudioForm
+    Public Sub ShowAdvanced()
+        Using form As New SimpleSettingsForm()
+            Dim ui = form.SimpleUI
+            ui.AddLabel("EBU R128")
+        End Using
+    End Sub
+End Class
+`,
+    'UI/Theme.vb': `Public Class ButtonLabel
+    Public Sub ApplyTheme()
+    End Sub
+End Class
+Public Class ToggleButtonLabel
+    Public Sub ApplyTheme()
+    End Sub
+End Class
+Public Class ThemeApplier
+    Public Sub Apply(ByVal controls As Object)
+        For Each control In controls.OfType(Of ToggleButtonLabel)
+            control.ApplyTheme()
+        Next
+    End Sub
+    Public Sub ApplyAll(ByVal labels As List(Of ToggleButtonLabel))
+        For Each label In labels
+            label.ApplyTheme()
+        Next
+    End Sub
+End Class
+`,
+    'Download/TDownloader.vb': `Namespace App.Download
+    Friend Class TDownloader
+        Friend Class Job
+            Friend Sub Start()
+            End Sub
+        End Class
+    End Class
+    Friend Class Worker
+        Friend Sub Start()
+        End Sub
+    End Class
+End Namespace
+`,
+    'Download/DownloadProgress.vb': `Imports TDJob = App.Download.TDownloader.Job
+
+Namespace App.Download
+    Friend Class DownloadProgress
+        Friend ReadOnly Property Worker As TDJob
+        Friend Sub Run()
+            Worker.Start()
+        End Sub
+    End Class
+End Namespace
+`,
+    'Plugin/IPluginContentProvider.vb': `Namespace Plugin
+    Public Interface ISiteSettings
+    End Interface
+    Public Interface IPluginContentProvider
+        Property Settings As ISiteSettings
+    End Interface
+End Namespace
+`,
+    'MainMod.vb': `Friend Module MainMod
+    Friend Settings As SettingsCLS
+End Module
+`,
+    'SettingsCLS.vb': `Friend Class SettingsCLS
+    Friend Sub UpdateUsersList()
+    End Sub
+End Class
+`,
+    'API/Base/UserDataProvider.vb': `Namespace API.Base
+    Friend MustInherit Class UserDataProvider : Implements Plugin.IPluginContentProvider
+        Friend Property MySettings As Plugin.ISiteSettings Implements Plugin.IPluginContentProvider.Settings
+        Friend Sub Delete()
+            Settings.UpdateUsersList()
+        End Sub
+    End Class
+End Namespace
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `Owner::member` of every call edge out of a file. */
+function callsFrom(file: string): string[] {
+  const ids = cg.getNodesInFile(file).map((n) => n.id);
+  return cg
+    .getOutgoingEdgesFrom(ids)
+    .filter((e) => e.kind === 'calls')
+    .map((e) => cg.getNode(e.target)!.qualifiedName)
+    .sort();
+}
+
+describe('VB.NET calls through declared receivers', () => {
+  it('reach nothing of the project on a type it does not define', () => {
+    expect(callsFrom('Download/Groups/DownloadGroupCollection.vb')).toEqual([]);
+    expect(callsFrom('Hosts/DownloadableMediaHost.vb')).toEqual([]);
+    expect(callsFrom('API/Base/UserDataBase.vb')).toEqual([]);
+  });
+
+  it('reach nothing of the project on a VB.NET built-in type', () => {
+    expect(callsFrom('Editors/UsersInfoForm.vb')).toEqual([]);
+  });
+
+  it('reach the declared type’s own method, or the one it inherits', () => {
+    expect(callsFrom('UI/ThemeManager.vb')).toEqual(['ColorHSL::AddLuminance']);
+    expect(callsFrom('API/Instagram/Downloader.vb')).toEqual(['API.Base::UserDataBase::Download']);
+  });
+
+  it('reach nothing of the project for a method the declared type inherits from outside it', () => {
+    expect(callsFrom('UI/MainForm.vb')).toEqual([]);
+  });
+
+  it('reach an extension method declared for the type, through what a call returns too', () => {
+    expect(callsFrom('General/Thumbnailer.vb')).toEqual([
+      'ObjectStorage::GetString',
+      'StringExtensions::ToColor',
+      'StringExtensions::ToColor',
+      'StringExtensions::ToColor',
+    ]);
+  });
+
+  it('reach a .NET type’s own method before an extension of that name, and an extension it lacks', () => {
+    // `List(Of T)` has its own `Sort()`, but no `Join`.
+    expect(callsFrom('General/Lists.vb')).toEqual(['StringExtensions::Join']);
+  });
+
+  it('name the type their declaration’s namespace sees, through a base class’s type argument too', () => {
+    // SCrawler declares a `SiteSettings` and an `M3U8` in each site's namespace.
+    expect(callsFrom('Sites/Reddit/UserData.vb')).toEqual([
+      'API.Reddit::M3U8::Download',
+      'API.Reddit::SiteSettings::IsMyUser',
+    ]);
+    // `Inherits DownDetector.Checker(Of SiteSettings)` makes its `Source As T` a SiteSettings.
+    expect(callsFrom('Sites/Reddit/SiteSettings.vb')).toEqual(['API.Reddit::SiteSettings::AvailableTrueValue']);
+    // A type nested in a base class is named bare in a subclass: staxrip's `Dim ret As New MenuList`.
+    expect(callsFrom('Encoding/VideoEncoder.vb')).toEqual(['VideoEncoder::MenuList::Add']);
+  });
+
+  it('take the declared type over what is assigned, and an import alias for what it names', () => {
+    expect(callsFrom('YouTube/YouTubeFunctions.vb')).toEqual(['IContainer::Parse']);
+    expect(callsFrom('Download/DownloadProgress.vb')).toEqual(['App.Download::TDownloader::Job::Start']);
+  });
+
+  it('read a field through what a call returns, and a loop variable through what it loops over', () => {
+    expect(callsFrom('UI/AudioForm.vb')).toEqual(['SimpleUI::AddLabel']);
+    // `For Each control In controls.OfType(Of ToggleButtonLabel)`, `For Each label In labels` over a `List(Of ToggleButtonLabel)`.
+    expect(callsFrom('UI/Theme.vb')).toEqual(['ToggleButtonLabel::ApplyTheme', 'ToggleButtonLabel::ApplyTheme']);
+  });
+
+  it('see a module’s field, not the property of an interface the class implements', () => {
+    expect(callsFrom('API/Base/UserDataProvider.vb')).toEqual(['SettingsCLS::UpdateUsersList']);
+  });
+});
diff --git a/__tests__/vbnet-shared-member-refs.test.ts b/__tests__/vbnet-shared-member-refs.test.ts
new file mode 100644
index 0000000000..bbcfa77ffe
--- /dev/null
+++ b/__tests__/vbnet-shared-member-refs.test.ts
@@ -0,0 +1,218 @@
+/**
+ * VB.NET: a value read or written through a type or module name —
+ * `AppSession.SessionId`, `AppSession.CurrentUser = "demo"`, `Logger.Level`,
+ * `Mode.Fast` — is a use of the member and of the type (#2305). Before, only
+ * calls linked, so `codegraph callers` on a Shared field or property, and on
+ * the class itself, came back empty.
+ *
+ * The name is looked up as VB.NET does, without regard to case: a local, a
+ * parameter or a field of that name holds a value, and links nothing here (a
+ * member typed as its own name's type, `Property Settings As Settings`, reads
+ * that type's members either way); a type is the one the namespaces around
+ * the read, its `Imports` and aliases see — SCrawler declares a
+ * `SiteSettings` in every site's namespace. A method named without
+ * parentheses is called, unless `AddressOf` only names it, and an index into
+ * a Shared field (`AppSession.Items(0)`), which VB.NET writes as a call, reads
+ * the field.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+const files: Record<string, string> = {
+  // The issue's three files.
+  'AppSession.vb': `Public Class AppSession
+    Public Shared SessionId As Guid = Guid.NewGuid()
+    Public Shared Property CurrentUser As String
+    Public Shared Items As New List(Of String)
+    Public Shared Function GetGreeting() As String
+        Return "Hello " & CurrentUser
+    End Function
+    Public Shared Sub OnTick(ByVal sender As Object, ByVal e As EventArgs)
+    End Sub
+    Public Shared Function Describe() As String
+        Return AppSession.CurrentUser
+    End Function
+End Class
+`,
+  'Consumer.vb': `Public Class Consumer
+    Public Sub Run()
+        Dim id As Guid = AppSession.SessionId
+        AppSession.CurrentUser = "demo"
+        Console.WriteLine(AppSession.GetGreeting())
+    End Sub
+End Class
+`,
+  'Consumer2.vb': `Public Class Consumer2
+    Public Function Describe() As String
+        Return AppSession.CurrentUser & AppSession.SessionId.ToString()
+    End Function
+End Class
+`,
+  'OtherSession.vb': `Public Class OtherSession
+    Public Shared SessionId As Guid = Guid.NewGuid()
+    Public Property Size As Integer
+End Class
+`,
+  'Size.vb': `Public Class Size
+End Class
+`,
+  'Logger.vb': `Public Module Logger
+    Public Level As Integer
+End Module
+`,
+  'Mode.vb': `Public Enum Mode
+    Fast
+    Slow
+End Enum
+`,
+  'Form1.vb': `Public Class Form1
+    Private Panel1 As Panel
+    Public Sub Setup()
+        Logger.Level = 3
+        Dim a = Panel1.Size
+        Me.Panel1.Size = New System.Drawing.Size(1, 2)
+        Dim speed = Mode.Fast
+        Dim greeting = AppSession.GetGreeting
+        AddHandler Timer1.Tick, AddressOf AppSession.OnTick
+        Dim first = AppSession.Items(0)
+        Dim empty = String.Empty
+    End Sub
+    Public Sub Shadowed(ByVal appSession As OtherSession)
+        Dim id = AppSession.SessionId
+    End Sub
+End Class
+`,
+  // A type declared in each site's namespace, and one read through an import alias.
+  'Sites/Reddit/SiteSettings.vb': `Namespace API.Reddit
+    Friend Class SiteSettings
+        Friend Const Header As String = "r"
+    End Class
+    Friend Class UserData
+        Friend Function Key() As String
+            Return SiteSettings.Header
+        End Function
+    End Class
+End Namespace
+`,
+  'Sites/Twitter/SiteSettings.vb': `Namespace API.Twitter
+    Friend Class SiteSettings
+        Friend Const Header As String = "t"
+    End Class
+    Friend Class UserData
+        Friend Function Key() As String
+            Return SiteSettings.Header
+        End Function
+    End Class
+End Namespace
+`,
+  'Sites/Facebook/UserData.vb': `Imports RS = API.Reddit.SiteSettings
+Namespace API.Facebook
+    Friend Class UserData
+        Friend Function Key() As String
+            Return RS.Header
+        End Function
+    End Class
+End Namespace
+`,
+  // A property typed as the type of its own name; a property initializer.
+  'Settings.vb': `Public Class Settings
+    Public Property Theme As String
+End Class
+`,
+  'Window.vb': `Public Class Window
+    Public Property Settings As Settings
+    Public Property Title As String = AppSession.CurrentUser
+    Public Function CurrentTheme() As String
+        Return Settings.Theme
+    End Function
+End Class
+`,
+  // CRLF line endings and multibyte text before the read.
+  'Weird.vb': [
+    'Public Class Weird',
+    '    Public Sub Go()',
+    '        Dim s = "SessionId éééé 😀" & AppSession.SessionId',
+    '    End Sub',
+    'End Class',
+    '',
+  ].join('\r\n'),
+};
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vb-shared-'));
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+function nodeId(qualifiedName: string): string {
+  const found = cg.getNodesInFiles(Object.keys(files)).filter((n) => n.qualifiedName === qualifiedName);
+  if (found.length !== 1) throw new Error(`${found.length} nodes named ${qualifiedName}`);
+  return found[0]!.id;
+}
+
+/** The qualified names of what links to `qualifiedName` with an edge of `kind`. */
+function linkedFrom(qualifiedName: string, kind: 'references' | 'calls'): string[] {
+  return cg
+    .getIncomingEdgesTo([nodeId(qualifiedName)], [kind])
+    .map((e) => cg.getNode(e.source)!.qualifiedName)
+    .sort();
+}
+
+describe('VB.NET Shared members read through their type (#2305)', () => {
+  it('link a Shared field and property to the methods that read or write them', () => {
+    expect(linkedFrom('AppSession::SessionId', 'references')).toEqual(['Consumer2::Describe', 'Consumer::Run', 'Weird::Go']);
+    expect(linkedFrom('AppSession::CurrentUser', 'references'))
+      .toEqual(['AppSession::Describe', 'Consumer2::Describe', 'Consumer::Run', 'Window::Title']);
+  });
+
+  it('link the class to the code outside it that reads through it', () => {
+    expect(linkedFrom('AppSession', 'references'))
+      .toEqual(['Consumer2::Describe', 'Consumer2::Describe', 'Consumer::Run', 'Consumer::Run', 'Form1::Setup', 'Weird::Go', 'Window::Title']);
+    expect(cg.getCallers(nodeId('AppSession')).map((c) => c.node.qualifiedName).sort())
+      .toEqual(['Consumer2::Describe', 'Consumer::Run', 'Form1::Setup', 'Weird::Go', 'Window::Title']);
+  });
+
+  it('keep the call to a Shared method, and call one named without parentheses', () => {
+    expect(linkedFrom('AppSession::GetGreeting', 'calls')).toEqual(['Consumer::Run', 'Form1::Setup']);
+    expect(linkedFrom('AppSession::OnTick', 'references')).toEqual(['Form1::Setup']);
+    expect(linkedFrom('AppSession::OnTick', 'calls')).toEqual([]);
+  });
+
+  it('read a Shared field indexed like a call, a Module variable and an Enum value', () => {
+    expect(linkedFrom('AppSession::Items', 'references')).toEqual(['Form1::Setup']);
+    expect(linkedFrom('Logger::Level', 'references')).toEqual(['Form1::Setup']);
+    expect(linkedFrom('Mode::Fast', 'references')).toEqual(['Form1::Setup']);
+    expect(linkedFrom('Mode', 'references')).toEqual(['Form1::Setup']);
+  });
+
+  it('link nothing through a local, parameter or field, whatever its case', () => {
+    expect(linkedFrom('OtherSession::SessionId', 'references')).toEqual([]);
+    expect(linkedFrom('OtherSession::Size', 'references')).toEqual([]);
+    expect(linkedFrom('Size', 'references')).toEqual([]);
+    expect(linkedFrom('OtherSession', 'references')).toEqual([]);
+  });
+
+  it('read the type the namespaces and imports around the read see', () => {
+    expect(linkedFrom('API.Reddit::SiteSettings::Header', 'references'))
+      .toEqual(['API.Facebook::UserData::Key', 'API.Reddit::UserData::Key']);
+    expect(linkedFrom('API.Twitter::SiteSettings::Header', 'references')).toEqual(['API.Twitter::UserData::Key']);
+  });
+
+  it('read through a member typed as the type of its own name', () => {
+    expect(linkedFrom('Settings::Theme', 'references')).toEqual(['Window::CurrentTheme']);
+  });
+});
diff --git a/__tests__/vbnet-std-methods.test.ts b/__tests__/vbnet-std-methods.test.ts
new file mode 100644
index 0000000000..8c29b1e775
--- /dev/null
+++ b/__tests__/vbnet-std-methods.test.ts
@@ -0,0 +1,75 @@
+/**
+ * VB.NET runs on the same .NET base library as C#, so a call such as
+ * `x.Contains(…)`, `x.Add(…)` or `x.Dispose()` on a receiver whose type is not
+ * known is far more likely the library's method than the one project method
+ * that happens to share the name. As in C#, such a guess is kept only when the
+ * receiver is named after the method's owner. staxrip's
+ * `SupportedInput.Contains(ret)` — a String array — went to `VideoScript`'s
+ * `Contains`.
+ */
+import { describe, it, expect, afterAll, beforeAll } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vb-std-'));
+  const files: Record<string, string> = {
+    'Video/VideoScript.vb': `Public Class VideoScript
+    Public Function Contains(ByVal value As String) As Boolean
+        Return False
+    End Function
+End Class
+`,
+    'Audio/AudioProfile.vb': `Public Class AudioProfile
+    Public Function IsInputSupported(ByVal inputs As Object, ByVal ext As String) As Boolean
+        For Each supported In inputs
+            If supported.Contains(ext) Then Return True
+        Next
+        Return False
+    End Function
+
+    Public Function HasScript(ByVal scripts As Object, ByVal name As String) As Boolean
+        For Each script In scripts
+            If script.Contains(name) Then Return True
+        Next
+        Return False
+    End Function
+End Class
+`,
+  };
+  for (const [rel, content] of Object.entries(files)) {
+    fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+    fs.writeFileSync(path.join(root, rel), content);
+  }
+  cg = await CodeGraph.init(root, { index: true });
+});
+
+afterAll(() => {
+  cg?.close();
+  if (root) fs.rmSync(root, { recursive: true, force: true });
+});
+
+/** `Owner::member` of every call edge out of one method. */
+function callsOf(qualifiedName: string): string[] {
+  const from = cg.getNodesInFile('Audio/AudioProfile.vb').find((n) => n.qualifiedName === qualifiedName)!;
+  return cg
+    .getOutgoingEdgesFrom([from.id])
+    .filter((e) => e.kind === 'calls')
+    .map((e) => cg.getNode(e.target)!.qualifiedName)
+    .sort();
+}
+
+describe('VB.NET standard-library method names', () => {
+  it('are not a project method on a receiver that does not name its owner', () => {
+    expect(callsOf('AudioProfile::IsInputSupported')).toEqual([]);
+  });
+
+  it('still reach the project method when the receiver names its owner', () => {
+    expect(callsOf('AudioProfile::HasScript')).toEqual(['VideoScript::Contains']);
+  });
+});
diff --git a/__tests__/vue-store-extraction.test.ts b/__tests__/vue-store-extraction.test.ts
index 9fc2f9edaf..2354e6318e 100644
--- a/__tests__/vue-store-extraction.test.ts
+++ b/__tests__/vue-store-extraction.test.ts
@@ -10,7 +10,8 @@
  *   - Pinia options: `defineStore({ actions: {…}, getters: {…} })`.
  *   - Pinia setup: `defineStore('id', () => { const foo = …; return { foo } })`.
  * And the precision gate: a non-exported `const actions = {…}` in a file that
- * isn't a Vue store contributes nothing.
+ * isn't a Vue store is not treated as one. (Its members are nodes anyway, as
+ * every named object literal's are since #2300 — `actions::doThing`.)
  */
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
 import * as fs from 'node:fs';
@@ -111,9 +112,11 @@ export const useChatStore = defineStore('chat', () => {
     cg.close?.();
   });
 
-  it('does not extract a non-exported `const actions = {…}` outside a Vue store file', async () => {
+  it('does not treat a non-exported `const actions = {…}` outside a Vue store file as a store', async () => {
     // A plain module that happens to hold a non-exported `const actions` object of
     // functions, but lacks any second Vue-store signal — the gate must not fire.
+    // The literal's members are its own nodes (#2300), and nothing reads the
+    // dynamic `actions[key]()` as a call to one of them.
     fs.writeFileSync(
       path.join(dir, 'commands.js'),
       `const actions = {
@@ -128,10 +131,15 @@ export function run(key) { return actions[key](); }
     await cg.indexAll();
     const db = (cg as any).db.db;
 
-    expect(db.prepare(`SELECT count(*) c FROM nodes WHERE name = 'doThing'`).get().c).toBe(0);
-    expect(db.prepare(`SELECT count(*) c FROM nodes WHERE name = 'doOther'`).get().c).toBe(0);
-    // The real exported function is still extracted normally.
-    expect(db.prepare(`SELECT count(*) c FROM nodes WHERE name = 'run' AND kind='function'`).get().c).toBeGreaterThan(0);
+    expect(db.prepare(`SELECT kind, qualified_name FROM nodes WHERE name IN ('doThing', 'doOther') ORDER BY qualified_name`).all())
+      .toEqual([
+        { kind: 'function', qualified_name: 'actions::doOther' },
+        { kind: 'function', qualified_name: 'actions::doThing' },
+      ]);
+    // The real exported function is still extracted normally, and calls nothing.
+    const run = cg.getNodesByQualifiedName('run');
+    expect(run.map((n) => n.kind)).toEqual(['function']);
+    expect(cg.getOutgoingEdges(run[0]!.id).filter((e) => e.kind === 'calls')).toEqual([]);
 
     cg.close?.();
   });
diff --git a/__tests__/vue-template-calls.test.ts b/__tests__/vue-template-calls.test.ts
new file mode 100644
index 0000000000..9be0b7a30c
--- /dev/null
+++ b/__tests__/vue-template-calls.test.ts
@@ -0,0 +1,278 @@
+/**
+ * A call is a call wherever a Vue component writes it (#2340): in the
+ * `<template>` (`{{ useBar(link) }}`, `:to="useBar(link.location)"`,
+ * `@click="save(item)"`), and in a destructuring declaration at module or
+ * `<script setup>` scope (`const { a } = useFoo(1)`). Neither used to record
+ * one, so `callers` on a Nuxt composable missed most of the components using
+ * it. (`src/extraction/vue-template-calls.ts`, wired in `vue-extractor.ts`;
+ * the destructuring walk is in `tree-sitter.ts` extractVariable and the
+ * kernel's `tsjs/extractors.rs`.)
+ */
+import { describe, it, expect, afterEach } from 'vitest';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { CodeGraph } from '../src';
+import { vueTemplateCalls } from '../src/extraction/vue-template-calls';
+
+const names = (source: string) => vueTemplateCalls(source).map((c) => c.name);
+
+describe('vueTemplateCalls', () => {
+  it('finds calls in interpolations, bindings, directives and handlers, at their offsets', () => {
+    const source = `<template>
+  <NuxtLink :to="useBar(link.location)" v-if="canShow(link)">{{ useBar(link) }}</NuxtLink>
+  <li v-for="row in rowsFor(user)" v-show="visible()" v-my-dir="setup(1)">{{ label(row) }}</li>
+  <button @click="save(item)" v-on:keyup.enter="submit()" @input="onInput">go</button>
+  <Comp :style="{ color: tint() }" :title="\`#\${index(n)}\`" @change="(v) => update(v)" />
+</template>
+`;
+    const calls = vueTemplateCalls(source);
+    expect(calls.map((c) => c.name)).toEqual([
+      'useBar', 'canShow', 'useBar',
+      'rowsFor', 'visible', 'setup', 'label',
+      'save', 'submit',
+      'tint', 'index', 'update',
+    ]);
+    // Offsets point at the callee in the SFC source.
+    for (const c of calls) expect(source.slice(c.offset, c.offset + c.name.length)).toBe(c.name);
+  });
+
+  it('names a member call by its path, as a script call is named', () => {
+    expect(names(`<template>
+  <p @click="store.fetchUsers()" :a="user?.profile?.load()" :b="fn?.(1)">{{ props.format(v) }}</p>
+  <p :c="list[0].go()" :d="make().then(x => x.done())">{{ (a as B).run() }}</p>
+</template>`)).toEqual(['store.fetchUsers', 'user.profile.load', 'fn', 'props.format', 'make']);
+  });
+
+  it('skips names the template binds: v-for aliases and slot props in their subtree, arrow and function parameters', () => {
+    expect(names(`<template>
+  <ul>
+    <li v-for="(item, i) in items" :key="item.id" @click="item.select(i)">
+      {{ item.label() }} {{ format(item) }}
+      <Row #default="{ row, toggle }">{{ toggle(row) }} {{ rowLabel(row) }}</Row>
+    </li>
+  </ul>
+  <Comp :cb="function (x) { return x.go() }" :keys="(k) => k.trim()" @done="cb => cb()" />
+  <p>{{ toggle() }} {{ item() }}</p>
+</template>`)).toEqual(['format', 'rowLabel', 'toggle', 'item']);
+  });
+
+  it('skips what is never project code: strings, Vue template globals, $-helpers, keywords, new, object methods', () => {
+    expect(names(`<template>
+  <p :title="$t('x')" :class="'a(b)'">{{ Math.max(a(), 1) }} {{ JSON.stringify(c) }} {{ $route.query.x }}</p>
+  <p v-if="typeof x === 'function' && /f(o)/.test(s)">{{ new Date(stamp()).getTime() }} {{ "no()" }}</p>
+  <Chart :options="{ formatter(v) { return fmt(v) } }" @click="$emit('close')" />
+</template>`)).toEqual(['a', 'stamp', 'fmt']);
+  });
+
+  it.each(['&quot;', '&#34;', '&#x22;', '&apos;'])('decodes %s before reading an attribute string', quote => {
+    const source = `<template><p :class="${quote}a(b)${quote} + real()"/></template>`;
+    expect(vueTemplateCalls(source)).toEqual([{ name: 'real', offset: source.indexOf('real()') }]);
+  });
+
+  it('retains source offsets through encoded operators and identifiers', () => {
+    const source = '<template><p @click="left() &amp;&amp; &#102;oo()" v-for="item in rows&lpar;&rpar;">{{ item() }}</p></template>';
+    expect(vueTemplateCalls(source)).toEqual([
+      { name: 'left', offset: source.indexOf('left()') },
+      { name: 'foo', offset: source.indexOf('&#102;') },
+      { name: 'rows', offset: source.indexOf('rows&lpar;') },
+    ]);
+  });
+
+  it.each([
+    ['{ formatter(fmt) { return fmt() } } + fmt()', ['fmt']],
+    ['{ formatter({ key: fmt }) { return fmt() } } + key()', ['key']],
+    ['{ formatter(v) { return formatter(v) } }', ['formatter']],
+    ['(() => { const format = () => 0; return format(); })() + format()', ['format']],
+    ['(() => { try { work() } catch (format) { format(); } })() + format()', ['work', 'format']],
+    ['(() => { for (const format of rows) format(); })() + format()', ['format']],
+    ['(() => { class Format { static run() {} } return Format.run(); })() + Format.run()', ['Format.run']],
+  ] as const)('keeps method parameters and local declarations in their scope: %s', (expression, expected) => {
+    expect(names(`<template><p>{{ ${expression} }}</p></template>`)).toEqual(expected);
+  });
+
+  it('reads a CRLF file the same way', () => {
+    const lf = '<template>\n  <p\n    :title="label(\n      item)"\n  >{{ useBar(x) }}</p>\n</template>\n';
+    const crlf = lf.replace(/\n/g, '\r\n');
+    expect(names(crlf)).toEqual(['label', 'useBar']);
+    for (const c of vueTemplateCalls(crlf)) expect(crlf.slice(c.offset, c.offset + c.name.length)).toBe(c.name);
+  });
+
+  it('reads only the root template, and only what Vue compiles', () => {
+    expect(names(`<template>
+  <!-- {{ commented() }} -->
+  <div v-pre>{{ raw() }} <span :x="raw()"></span></div>
+  <template v-if="cond()"><span>{{ inner() }}</span></template>
+  <p data-x="plain(1)">{{ after() }}</p>
+</template>
+<script setup>
+const x = scriptCall()
+</script>
+<i18n>{ "en": { "a": "{{ notTemplate() }}" } }</i18n>`)).toEqual(['cond', 'inner', 'after']);
+    expect(names('<template lang="pug">\ndiv {{ pug() }}\n</template>')).toEqual([]);
+    expect(names('<script setup>\nconst a = b()\n</script>')).toEqual([]);
+  });
+});
+
+describe('calls written in Vue components, indexed (#2340)', () => {
+  let root = '';
+  let cg: CodeGraph | undefined;
+
+  afterEach(() => {
+    cg?.close();
+    cg = undefined;
+    if (root) fs.rmSync(root, { recursive: true, force: true });
+    root = '';
+  });
+
+  function write(files: Record<string, string>): void {
+    root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-vue-calls-'));
+    for (const [rel, content] of Object.entries(files)) {
+      fs.mkdirSync(path.dirname(path.join(root, rel)), { recursive: true });
+      fs.writeFileSync(path.join(root, rel), content);
+    }
+  }
+
+  function callersOf(name: string, file: string): string[] {
+    const target = cg!.getNodesInFile(file).find((n) => n.name === name && (n.kind === 'function' || n.kind === 'method'));
+    expect(target, `${name} in ${file}`).toBeDefined();
+    return cg!.getCallers(target!.id).map(({ node }) => `${node.filePath}:${node.kind}`).sort();
+  }
+
+  it("finds every caller in the issue's repro", async () => {
+    write({
+      'package.json': JSON.stringify({ name: 'nuxt-app', dependencies: { nuxt: '^4.0.0' } }),
+      'composables/useFoo.ts': 'export function useFoo(n: number) { return { a: n }; }\n',
+      'composables/useBar.ts': 'export function useBar(x: unknown) { return String(x); }\n',
+      'components/A.vue': '<script setup lang="ts">\nconst { a } = useFoo(1)\n</script>\n',
+      'components/F.vue': '<script setup lang="ts">\nconst [b] = useFoo(1)\n</script>\n',
+      'components/B.vue': '<script setup lang="ts">\nconst x = useFoo(1)\n</script>\n',
+      'components/H.vue': '<template><div>{{ useBar(link) }}</div></template>\n',
+      'components/I.vue': '<template><NuxtLink :to="useBar(link.location)">x</NuxtLink></template>\n',
+      'G.ts': 'const { a } = useFoo(1)\nexport const g = a\n',
+      'D.ts': 'export function probe() { const { a } = useFoo(1); return a }\n',
+    });
+    cg = await CodeGraph.init(root, { index: true });
+
+    expect(callersOf('useFoo', 'composables/useFoo.ts')).toEqual([
+      'D.ts:function', // inside a function: already found
+      'G.ts:file', // module scope: the file is the caller
+      'components/A.vue:component',
+      'components/B.vue:component',
+      'components/F.vue:component',
+    ]);
+    expect(callersOf('useBar', 'composables/useBar.ts')).toEqual([
+      'components/H.vue:component',
+      'components/I.vue:component',
+    ]);
+  });
+
+  it('links a template call to an imported helper, a script-setup function and an Options API method', async () => {
+    write({
+      'utils/format.ts': 'export function formatPrice(n: number) { return `$${n}`; }\n',
+      'other/format.ts': 'export function formatPrice(n: number) { return n; }\n',
+      'components/Setup.vue': `<template>
+  <p>{{ formatPrice(item.price) }}</p>
+  <button @click="save(item)">save</button>
+</template>
+
+<script setup lang="ts">
+import { formatPrice } from '../utils/format';
+const props = defineProps<{ item: { price: number } }>();
+function save(item: unknown) { return item; }
+</script>
+`,
+      'components/Options.vue': `<template>
+  <p>{{ total(items) }}</p>
+  <button @click="submit(form)">send</button>
+</template>
+
+<script>
+export default {
+  methods: {
+    total(items) { return items.length },
+    submit(form) { return form }
+  }
+}
+</script>
+`,
+    });
+    cg = await CodeGraph.init(root, { index: true });
+
+    const edgesFrom = (file: string) => {
+      const comp = cg!.getNodesInFile(file).find((n) => n.kind === 'component')!;
+      return cg!.getOutgoingEdges(comp.id)
+        .filter((e) => e.kind === 'calls')
+        .map((e) => {
+          const t = cg!.getNode(e.target)!;
+          return `${t.name}@${t.filePath}:${e.line}`;
+        })
+        .sort();
+    };
+    // The import decides which `formatPrice`; each edge is on its template line.
+    expect(edgesFrom('components/Setup.vue')).toEqual([
+      'formatPrice@utils/format.ts:2',
+      'save@components/Setup.vue:3',
+    ]);
+    // A template calls the component's own methods without `this.`.
+    expect(edgesFrom('components/Options.vue')).toEqual([
+      'submit@components/Options.vue:3',
+      'total@components/Options.vue:2',
+    ]);
+  });
+
+  it("calls a component's own function even where Nuxt auto-imports one of that name", async () => {
+    write({
+      'package.json': JSON.stringify({ name: 'nuxt-app', dependencies: { nuxt: '^4.0.0' } }),
+      'pages/lists.vue': `<template>
+  <button @click="clearError(true)">x</button>
+</template>
+
+<script setup lang="ts">
+function clearError(focus: boolean) { return focus; }
+onDeactivated(() => clearError(false));
+</script>
+`,
+    });
+    cg = await CodeGraph.init(root, { index: true });
+
+    const nodes = cg.getNodesInFile('pages/lists.vue');
+    const comp = nodes.find((n) => n.kind === 'component')!;
+    const own = nodes.find((n) => n.kind === 'function' && n.name === 'clearError')!;
+    const calls = cg.getOutgoingEdges(comp.id).filter((e) => e.kind === 'calls');
+    // Both calls are the local function's — not Nuxt's `clearError`, which
+    // the framework rule used to answer with an edge from the component to itself.
+    expect(calls.filter((e) => e.target === own.id).map((e) => e.line).sort()).toEqual([2, 7]);
+    expect(calls.filter((e) => e.target === comp.id)).toEqual([]);
+  });
+
+  it('keeps a bare handler linked, and binds a handler expression only through its own call', async () => {
+    write({
+      'lib/bus.ts': 'export class Bus {\n  emit(event: string) { return event; }\n}\n',
+      'components/Dialog.vue': `<template>
+  <button @click="close">x</button>
+  <button @click="emit('cancel')">cancel</button>
+  <button @click="open = !open">toggle</button>
+</template>
+
+<script setup lang="ts">
+const emit = defineEmits(['cancel']);
+let open = false;
+function close() { open = false; }
+</script>
+`,
+    });
+    cg = await CodeGraph.init(root, { index: true });
+
+    const comp = cg.getNodesInFile('components/Dialog.vue').find((n) => n.kind === 'component')!;
+    const targets = cg.getOutgoingEdges(comp.id)
+      .filter((e) => e.kind === 'calls')
+      .map((e) => cg!.getNode(e.target)!)
+      .map((n) => `${n.kind}:${n.name}`);
+    // `@click="close"` is still the handler it names.
+    expect(targets).toContain('function:close');
+    // `emit('cancel')` is the component's `defineEmits` binding, and `open =
+    // !open` calls nothing: neither reaches Bus.emit.
+    expect(targets).not.toContain('method:emit');
+  });
+});
diff --git a/codegraph-kernel/src/csharp/mod.rs b/codegraph-kernel/src/csharp/mod.rs
index f97b5192e6..a4addcce9e 100644
--- a/codegraph-kernel/src/csharp/mod.rs
+++ b/codegraph-kernel/src/csharp/mod.rs
@@ -348,7 +348,9 @@ impl<'t> Walker<'t> {
                     let bodies = property_bodies(node);
                     if !bodies.is_empty() {
                         self.stack.push(Scope { row, kind: "property", name });
+                        let declared = node.child_by_field_name("type");
                         for body in &bodies {
+                            self.extract_target_typed_new(Some(*body), declared);
                             self.visit_for_calls_and_structure(*body);
                         }
                         self.stack.pop();
@@ -360,8 +362,8 @@ impl<'t> Walker<'t> {
             self.scan_fn_ref_subtree(node, 0, &walked);
             skip_children = true;
         } else if kind == "field_declaration" && self.inside_class_like() {
-            self.extract_field(node);
-            self.scan_fn_ref_subtree(node, 0, &[]);
+            let walked = self.extract_field(node);
+            self.scan_fn_ref_subtree(node, 0, &walked);
             skip_children = true;
         } else if kind == "local_declaration_statement" && !self.inside_class_like() {
             // Top-level statements: extractVariable's generic fallback finds no
@@ -612,9 +614,49 @@ impl<'t> Walker<'t> {
         Some((row, name))
     }
 
+    fn extract_target_typed_new(&mut self, value: Option<Node<'t>>, declared: Option<Node<'t>>) {
+        let Some(value) = value else { return };
+        if value.kind() != "implicit_object_creation_expression" || self.stack.is_empty() {
+            return;
+        }
+        let Some(class_name) = declared.and_then(|t| self.class_type_name(t)) else { return };
+        let from = self.top_row();
+        self.push_ref_at(from, &class_name, crate::buffers::EDGE_INSTANTIATES, value);
+    }
+
+    /// csharpClassTypeName (tree-sitter.ts) — the class a declared type
+    /// names, preserving qualification: `List<Foo>` → List, `Ns.Foo` →
+    /// Ns.Foo, `global::Foo` → global::Foo, `Foo?` → Foo. Predefined, array, tuple and pointer
+    /// types name no class.
+    fn class_type_name(&self, node: Node) -> Option<String> {
+        match node.kind() {
+            "identifier" => {
+                let text = self.text(node);
+                (!text.is_empty()).then(|| text.to_string())
+            }
+            "generic_name" => {
+                let ident = (0..node.named_child_count())
+                    .filter_map(|i| node.named_child(i))
+                    .find(|c| c.kind() == "identifier")?;
+                self.class_type_name(ident)
+            }
+            "qualified_name" => Some(format!("{}.{}",
+                self.class_type_name(node.child_by_field_name("qualifier")?)?,
+                self.class_type_name(node.child_by_field_name("name")?)?)),
+            "alias_qualified_name" => {
+                let alias = self.text(node.child_by_field_name("alias")?);
+                let name = self.class_type_name(node.child_by_field_name("name")?)?;
+                Some(format!("{alias}::{name}"))
+            }
+            "nullable_type" => self.class_type_name(node.child_by_field_name("type")?),
+            _ => None,
+        }
+    }
+
     /// extractField (2046) — field_declaration; each declarator becomes a
     /// field/constant node anchored at the DECLARATOR.
-    fn extract_field(&mut self, node: Node<'t>) {
+    fn extract_field(&mut self, node: Node<'t>) -> Vec<usize> {
+        let mut walked = Vec::new();
         let docstring = preceding_docstring(node, self.src);
         let visibility = Some(self.visibility_of(node));
         let is_static = Some(self.is_static(node));
@@ -679,6 +721,12 @@ impl<'t> Walker<'t> {
                     // The ladder skips a field's children, so the declarator's
                     // string literals are reached here, owned by the field.
                     self.markdown_refs_from_subtree(decl, row);
+                    self.stack.push(Scope { row, kind: field_kind, name });
+                    let declared = var_decl.and_then(|vd| vd.child_by_field_name("type"));
+                    self.extract_target_typed_new(decl.named_child(decl.named_child_count().saturating_sub(1)), declared);
+                    self.visit_for_calls_and_structure(decl);
+                    self.stack.pop();
+                    walked.push(decl.id());
                 }
             }
         } else {
@@ -700,6 +748,7 @@ impl<'t> Walker<'t> {
                 }
             }
         }
+        walked
     }
 
     /// extractMethod (1737) — method_declaration + constructor_declaration.
@@ -855,9 +904,7 @@ fn property_bodies(node: Node) -> Vec<Node> {
         }
     }
     if let Some(value) = node.child_by_field_name("value") {
-        if value.kind() == "arrow_expression_clause" {
-            bodies.push(value);
-        }
+        bodies.push(value);
     }
     bodies
 }
diff --git a/codegraph-kernel/src/dart/mod.rs b/codegraph-kernel/src/dart/mod.rs
index 6e3f70eb9f..81679a43f0 100644
--- a/codegraph-kernel/src/dart/mod.rs
+++ b/codegraph-kernel/src/dart/mod.rs
@@ -469,12 +469,61 @@ impl<'t> Walker<'t> {
                     }
                 });
                 let name = self.text(name_node).to_string();
-                self.create_node("constant", &name, node, Extra { signature, ..Default::default() });
+                let constant = self.create_node("constant", &name, node, Extra { signature, ..Default::default() });
+                // The types its initializer names are the constant's (#2327).
+                if let Some(constant) = constant {
+                    let mut value = name_node.next_named_sibling();
+                    while let Some(v) = value {
+                        self.type_refs_dart(v, constant);
+                        value = v.next_named_sibling();
+                    }
+                }
             }
             self.scan_fn_ref_subtree(node, 0);
             return;
         }
 
+        // A field's declared type and initializer types are its class's (Dart
+        // fields mint no nodes); a top-level variable's are the file's (#2327).
+        // The visitNode hook's `declaration` / `program` rows (dart.ts).
+        // (Parent lookups walk down from the root, so only the node kinds that
+        // can be these positions ask for theirs.)
+        if node.kind() == "declaration" {
+            let in_body = node
+                .parent()
+                .map(|p| matches!(p.kind(), "class_body" | "extension_body" | "enum_body"))
+                .unwrap_or(false);
+            let mut cursor = node.walk();
+            let kids: Vec<Node<'t>> = node.named_children(&mut cursor).collect();
+            let is_field = in_body
+                && kids
+                    .iter()
+                    .any(|c| matches!(c.kind(), "initialized_identifier_list" | "static_final_declaration_list"));
+            if is_field {
+                let owner = self.top_row();
+                for child in kids {
+                    match child.kind() {
+                        "initialized_identifier_list" => self.initializer_type_refs_dart(child, owner),
+                        "static_final_declaration_list" => {}
+                        _ => self.type_refs_dart(child, owner),
+                    }
+                }
+            }
+        } else {
+            let top_level_type =
+                matches!(node.kind(), "type_identifier" | "type_arguments" | "function_type" | "record_type");
+            if (top_level_type || node.kind() == "initialized_identifier_list")
+                && node.parent().map(|p| p.kind() == "program").unwrap_or(false)
+            {
+                let owner = self.top_row();
+                if top_level_type {
+                    self.type_refs_dart(node, owner);
+                } else {
+                    self.initializer_type_refs_dart(node, owner);
+                }
+            }
+        }
+
         // maybeCaptureFnRefs (:990) — the double-walk fn-ref twin source.
         self.maybe_capture_fn_refs(node);
         let md_owner = self.top_row();
@@ -845,6 +894,14 @@ impl<'t> Walker<'t> {
     // --- extractInheritance — the dart rows (:5368-5393, :5437-5459) ------
 
     fn extract_inheritance(&mut self, node: Node<'t>, class_row: u32) {
+        // The type an extension is `on` — a `references` edge (#2327).
+        if node.kind() == "extension_declaration" {
+            let mut oc = node.walk();
+            let on_types: Vec<Node<'t>> = node.children_by_field_name("class", &mut oc).collect();
+            for on_type in on_types {
+                self.type_refs_dart(on_type, class_row);
+            }
+        }
         let mut cursor = node.walk();
         let kids: Vec<Node<'t>> = node.named_children(&mut cursor).collect();
         for child in kids {
@@ -941,6 +998,100 @@ impl<'t> Walker<'t> {
         }
     }
 
+    // --- type positions outside signatures (#2327; dart.ts pushDartTypeRefs) ---
+
+    /// isDartTypeName (dart.ts) — UpperCamelCase (`/^[_$]*[A-Z]/`: lowercase
+    /// is a built-in or an error-recovery artifact), not a built-in, not an
+    /// import prefix (`p` in `p.Foo`), not the class a `new`/`const`
+    /// constructor call names.
+    fn is_type_name_dart(&self, node: Node<'t>) -> bool {
+        let text = self.text(node);
+        let upper = text
+            .trim_start_matches(&['_', '$'][..])
+            .chars()
+            .next()
+            .map(|c| c.is_ascii_uppercase())
+            .unwrap_or(false);
+        if !upper || is_builtin_type(text) {
+            return false;
+        }
+        if node.next_sibling().map(|s| s.kind() == ".").unwrap_or(false) {
+            return false;
+        }
+        !node
+            .parent()
+            .map(|p| matches!(p.kind(), "new_expression" | "const_object_expression"))
+            .unwrap_or(false)
+    }
+
+    /// pushDartTypeRefs (dart.ts) — every type named inside `node`.
+    fn type_refs_dart(&mut self, node: Node<'t>, from_row: u32) {
+        stack_guard!();
+        if node.kind() == "type_identifier" {
+            if self.is_type_name_dart(node) {
+                let name = self.text(node).to_string();
+                self.push_ref_at(from_row, &name, crate::buffers::EDGE_REFERENCES, node);
+            }
+            return;
+        }
+        let mut cursor = node.walk();
+        let kids: Vec<Node<'t>> = node.named_children(&mut cursor).collect();
+        for c in kids {
+            self.type_refs_dart(c, from_row);
+        }
+    }
+
+    /// pushDartInitializerTypeRefs (dart.ts) — each `initialized_identifier`'s
+    /// value (every named child after its name).
+    fn initializer_type_refs_dart(&mut self, list: Node<'t>, from_row: u32) {
+        let mut cursor = list.walk();
+        let entries: Vec<Node<'t>> = list.named_children(&mut cursor).collect();
+        for entry in entries {
+            if entry.kind() != "initialized_identifier" {
+                continue;
+            }
+            let mut ec = entry.walk();
+            let parts: Vec<Node<'t>> = entry.named_children(&mut ec).skip(1).collect();
+            for part in parts {
+                self.type_refs_dart(part, from_row);
+            }
+        }
+    }
+
+    /// dartMemberRead (dart.ts) — `x.area` / `x?.area` not followed by a call's
+    /// argument part, receiver a plain name: a `references` ref `x.area` on
+    /// `area`, which the resolver links to a getter only (#2338).
+    fn extract_member_read(&mut self, node: Node<'t>) {
+        if node.kind() != "selector" {
+            return;
+        }
+        let mut cursor = node.walk();
+        let accessor = node.named_children(&mut cursor).find(|c| {
+            matches!(c.kind(), "unconditional_assignable_selector" | "conditional_assignable_selector")
+        });
+        let member = accessor.and_then(|a| {
+            let mut ac = a.walk();
+            let found = a.named_children(&mut ac).find(|c| c.kind() == "identifier");
+            found
+        });
+        let Some(member) = member else { return };
+        let Some(receiver) = node.prev_named_sibling() else { return };
+        if receiver.kind() != "identifier" {
+            return;
+        }
+        if let Some(next) = node.next_named_sibling() {
+            if next.kind() == "selector" {
+                let mut nc = next.walk();
+                if next.named_children(&mut nc).any(|c| c.kind() == "argument_part") {
+                    return;
+                }
+            }
+        }
+        let name = format!("{}.{}", self.text(receiver), self.text(member));
+        let reader = self.top_row();
+        self.push_ref_at(reader, &name, crate::buffers::EDGE_REFERENCES, member);
+    }
+
     // --- visitFunctionBody (:5129-5286) — dart rows -----------------------
 
     fn visit_body(&mut self, node: Node<'t>) {
@@ -962,6 +1113,14 @@ impl<'t> Walker<'t> {
 
         self.extract_static_member_ref(node);
 
+        // A getter read `x.area` (#2338); a type the body names (#2327).
+        self.extract_member_read(node);
+        if kind == "type_identifier" && self.is_type_name_dart(node) {
+            let name = self.text(node).to_string();
+            let owner = self.top_row();
+            self.push_ref_at(owner, &name, crate::buffers::EDGE_REFERENCES, node);
+        }
+
         if kind == "function_signature" {
             // Nested named functions (:5245) — extractFunction walks the
             // nested body itself; the enclosing walker ALSO revisits the
diff --git a/codegraph-kernel/src/go/mod.rs b/codegraph-kernel/src/go/mod.rs
index e34e495fb5..f9880e5029 100644
--- a/codegraph-kernel/src/go/mod.rs
+++ b/codegraph-kernel/src/go/mod.rs
@@ -38,11 +38,6 @@ fn go_two_hop_re() -> &'static Regex {
     static RE: OnceLock<Regex> = OnceLock::new();
     RE.get_or_init(|| Regex::new(r"^[A-Za-z_][0-9A-Za-z_]*\.[A-Za-z_][0-9A-Za-z_]*$").unwrap())
 }
-fn bracket_args_re() -> &'static Regex {
-    static RE: OnceLock<Regex> = OnceLock::new();
-    RE.get_or_init(|| Regex::new(r"\[[^\]]*\]").unwrap())
-}
-
 // Grouped var declarations wrap their specs in var_spec_list; constants and
 // ungrouped declarations expose specs directly. Share that grammar boundary
 // between symbol extraction and binding collection.
@@ -252,22 +247,22 @@ impl<'t> Walker<'t> {
         if result.kind() == "parameter_list" {
             let first = named_kids(result)
                 .find(|c| c.kind() == "parameter_declaration")?;
-            result = first.child_by_field_name("type").unwrap_or(first);
+            result = first.child_by_field_name("type")?;
         }
         if result.kind() == "pointer_type" {
-            result = named_kids(result)
-                .find(|c| matches!(c.kind(), "type_identifier" | "qualified_type" | "generic_type"))
-                .unwrap_or(result);
+            result = named_kids(result).find(|c| {
+                matches!(c.kind(), "type_identifier" | "qualified_type" | "generic_type")
+            })?;
         }
-        let text = self.text(result).trim();
-        let text = text.strip_prefix('*').unwrap_or(text);
-        let text = crate::textutil::generic_args_re().replace_all(text, "");
-        let text = bracket_args_re().replace_all(&text, "");
-        let last = text.rsplit('.').next().unwrap_or("").trim().to_string();
-        if last.is_empty() || !crate::textutil::ascii_ident_re().is_match(&last) {
+        if !matches!(result.kind(), "type_identifier" | "qualified_type" | "generic_type") {
             return None;
         }
-        Some(last)
+        let text = self.text(result).trim();
+        let base = text.split_once('[').map_or(text, |(base, _)| base).trim();
+        let valid = base.split('.').all(|part| {
+            !part.is_empty() && crate::textutil::ascii_ident_re().is_match(part)
+        });
+        (valid && base.split('.').count() <= 2).then(|| base.to_string())
     }
 
     /// goExtractor.getReceiverType: the regex over the receiver's text.
diff --git a/codegraph-kernel/src/resolve/affix.rs b/codegraph-kernel/src/resolve/affix.rs
index f1e9dd512d..0ded5a48cf 100644
--- a/codegraph-kernel/src/resolve/affix.rs
+++ b/codegraph-kernel/src/resolve/affix.rs
@@ -290,6 +290,7 @@ pub(super) static RECEIVER_TYPE_PATTERNS: LazyLock<HashMap<&'static str, Vec<Rec
             rp("", r"\s+\*?([a-z_][A-Za-z0-9_]*\.[A-Z][A-Za-z0-9_]*)(?:\s*[,)]|\s*$)", true, false, false, 0),
             both(r"\s*:=\s*&?([A-Za-z_][A-Za-z0-9_.]*)\s*\{", b":", 0),
             rp(r"(?-u:\b)var\s+", r"\s+\*?([A-Za-z_][A-Za-z0-9_.]*)", false, false, false, 0),
+            rp(r"(?:^|[(,])\s*", r"\s+\*?([a-z_][A-Za-z0-9_]*)\s*(?:\[[^\]]*\])?\s*(?:[,)]|$)", false, false, false, 0),
             rp("", r"\s+\*?([A-Z][A-Za-z0-9_.]*)", true, false, false, 0),
         ],
     );
diff --git a/codegraph-kernel/src/resolve/bound.rs b/codegraph-kernel/src/resolve/bound.rs
index 60a1fdd10a..113dad32cd 100644
--- a/codegraph-kernel/src/resolve/bound.rs
+++ b/codegraph-kernel/src/resolve/bound.rs
@@ -235,6 +235,19 @@ impl KernelResolver {
         method: &str,
         site: &ResolveRefIn,
     ) -> Res<Option<KCand>> {
+        if site.language == "go" {
+            let Some((name, dir)) = self.go_type_package(ty, &site.file_path)? else { return Ok(None); };
+            return Ok(self.go_method_in_package(&name, method, &dir, site)?
+                .map(|mut candidate| {
+                    candidate.confidence = 0.9;
+                    candidate.resolved_by = "instance-method";
+                    candidate
+                }));
+        }
+if site.language == "dart" && site.reference_kind == "calls" {
+    return Ok(self.dart_member_of(ty, method, site, false)?
+        .map(|(node, _)| KCand { node, confidence: 0.9, resolved_by: "instance-method" }));
+}
         let owner = match self.resolve_bound_type(ty, site, 0)? {
             Some(o) => o,
             None => return Ok(None),
@@ -1154,7 +1167,16 @@ impl KernelResolver {
         resolved_by: &'static str,
         preferred_fqn: Option<&str>,
     ) -> Res<Option<KCand>> {
-        self.resolve_method_on_type_at(type_name, method, r, confidence, resolved_by, preferred_fqn, 0, false)
+        if r.language == "go" {
+            let Some((name, dir)) = self.go_type_package(type_name, &r.file_path)? else { return Ok(None); };
+            return Ok(self.go_method_in_package(&name, method, &dir, r)?
+                .map(|candidate| KCand { node: candidate.node, confidence, resolved_by }));
+        }
+let found = self.resolve_method_on_type_at(type_name, method, r, confidence, resolved_by, preferred_fqn, 0, false)?;
+if found.is_some() || r.language != "dart" { return Ok(found); }
+Ok(self.dart_member_of(type_name, method, r, false)?
+    .filter(|(_, via_extension)| *via_extension)
+    .map(|(node, _)| KCand { node, confidence, resolved_by }))
     }
 
     /// resolve_method_on_type for a PHP or Ruby type named by its fully
diff --git a/codegraph-kernel/src/resolve/call_shape.rs b/codegraph-kernel/src/resolve/call_shape.rs
index 37e0479c04..aaa03dcb61 100644
--- a/codegraph-kernel/src/resolve/call_shape.rs
+++ b/codegraph-kernel/src/resolve/call_shape.rs
@@ -150,6 +150,7 @@ pub(super) fn receiver_link(receiver: &str) -> &str {
 }
 
 pub(super) fn is_std_method(language: &str, name: &str) -> bool {
+    if language == "vbnet" { return CSHARP_STD_METHODS.iter().any(|m| m.eq_ignore_ascii_case(name)); }
     match language {
         "rust" => RUST_STD_METHODS, "go" => GO_STD_METHODS,
         "kotlin" => KOTLIN_STD_METHODS, "csharp" => CSHARP_STD_METHODS, "dart" => DART_STD_METHODS,
diff --git a/codegraph-kernel/src/resolve/dart_fields.rs b/codegraph-kernel/src/resolve/dart_fields.rs
new file mode 100644
index 0000000000..04fe8d3aec
--- /dev/null
+++ b/codegraph-kernel/src/resolve/dart_fields.rs
@@ -0,0 +1,105 @@
+//! Fields shadow inherited getters and extension getters without creating call edges.
+use super::*;
+
+impl KernelResolver {
+    pub(super) fn dart_field_depth(&mut self, type_name: &str, name: &str, r: &ResolveRefIn) -> Res<Option<u32>> {
+        let mut queue: VecDeque<_> = self.dart_visible_declarations(type_name, &r.file_path)?.into_iter()
+            .map(|declaration| (declaration, 0u32)).collect();
+        let mut seen = HashSet::new();
+        while seen.len() < 40 {
+            let Some((declaration, depth)) = queue.pop_front() else { break };
+            if !seen.insert(declaration.id.clone()) { continue; }
+            if self.dart_declares_field(&declaration, name, r) { return Ok(Some(depth)); }
+            for parent in self.dart_head_of(&declaration).supers {
+                queue.extend(self.dart_visible_declarations(&parent, &declaration.file_path)?.into_iter()
+                    .map(|declaration| (declaration, depth + 1)));
+            }
+        }
+        Ok(None)
+    }
+
+    fn dart_visible_declarations(&mut self, name: &str, file: &str) -> Res<Vec<Arc<KNode>>> {
+        let declarations: Vec<_> = self.nodes_by_name(name)?.iter()
+            .filter(|n| n.language == "dart" && matches!(n.kind.as_str(), "class" | "enum" | "interface"))
+            .cloned().collect();
+        let local: Vec<_> = declarations.iter().filter(|n| n.file_path == file).cloned().collect();
+        if !local.is_empty() { return Ok(local); }
+        let mut visible = HashSet::new();
+        let mut queue = VecDeque::from([file.to_string()]);
+        while visible.len() < 40 {
+            let Some(library) = queue.pop_front() else { break };
+            if !visible.insert(library.clone()) { continue; }
+            let imports: Vec<_> = self.nodes_in_file(&library)?.iter()
+                .filter(|n| n.language == "dart" && n.kind == "import").cloned().collect();
+            for import in imports {
+                let signature = import.signature.as_deref().unwrap_or("");
+                if library != file && !signature.trim_start().starts_with("export ") { continue; }
+                if re!(r"\bas\s+[A-Za-z_$]").is_match(signature) { continue; }
+                if let Some(show) = re!(r"\bshow\s+([^;]+)").captures(signature) {
+                    if !show[1].split(',').any(|item| item.trim() == name) { continue; }
+                }
+                if re!(r"\bhide\s+([^;]+)").captures(signature)
+                    .is_some_and(|hide| hide[1].split(',').any(|item| item.trim() == name)) { continue; }
+                let target = if let Some(package) = import.name.strip_prefix("package:") {
+                    let Some((package, path)) = package.split_once('/') else { continue };
+                    let mut directory = pos_dirname(&library).to_string();
+                    let mut target = None;
+                    loop {
+                        let manifest = if directory.is_empty() { "pubspec.yaml".to_string() }
+                            else { format!("{directory}/pubspec.yaml") };
+                        if let Some(source) = self.read_file(&manifest) {
+                            if re!(r#"(?m)^name:\s*['\"]?([A-Za-z0-9_]+)"#).captures(source.text())
+                                .is_some_and(|found| &found[1] == package) {
+                                let candidate = if directory.is_empty() { format!("lib/{path}") }
+                                    else { format!("{directory}/lib/{path}") };
+                                target = self.probe_extensions(&candidate, "dart");
+                            }
+                            break;
+                        }
+                        if directory.is_empty() { break; }
+                        directory = pos_dirname(&directory).to_string();
+                    }
+                    target
+                } else if import.name.contains(':') { None }
+                else {
+                    let directory = pos_resolve(&self.project_root, pos_dirname(&library));
+                    self.resolve_relative_import(&import.name, &directory, "dart")?
+                };
+                if let Some(target) = target {
+                    queue.push_back(target);
+                }
+            }
+        }
+        Ok(declarations.into_iter().filter(|n| visible.contains(&n.file_path)).collect())
+    }
+
+    fn dart_declares_field(&mut self, declaration: &KNode, name: &str, r: &ResolveRefIn) -> bool {
+        let Some(source) = self.read_file(&declaration.file_path) else { return false };
+        if !self.dart_fields_memo.get(&declaration.id).is_some_and(|(old, _)| Rc::ptr_eq(old, &source)) {
+            let site = ResolveRefIn { column: declaration.start_column, ..r.clone().at(declaration) };
+            let Some(tree) = self.parsed_tree(&source, &site) else { return false };
+            let point = ((declaration.start_line - 1).max(0) as usize, declaration.start_column.max(0) as usize);
+            let mut node = super::iteration::descendant_for_position(tree.root_node(), source.text(), point);
+            while !matches!(node.kind(), "class_definition" | "enum_declaration") {
+                let Some(parent) = node.parent() else { return false };
+                node = parent;
+            }
+            let mut fields = HashSet::new();
+            if let Some(body) = super::iteration::named_children(node).into_iter()
+                .find(|n| matches!(n.kind(), "class_body" | "enum_body")) {
+                for member in super::iteration::named_children(body).into_iter().filter(|n| n.kind() == "declaration") {
+                    for list in super::iteration::named_children(member).into_iter()
+                        .filter(|n| matches!(n.kind(), "initialized_identifier_list" | "static_final_declaration_list")) {
+                        for entry in super::iteration::named_children(list) {
+                            if let Some(identifier) = super::iteration::named_children(entry).into_iter().find(|n| n.kind() == "identifier") {
+                                fields.insert(source.text()[identifier.start_byte()..identifier.end_byte()].to_string());
+                            }
+                        }
+                    }
+                }
+            }
+            self.dart_fields_memo.insert(declaration.id.clone(), (source, fields));
+        }
+        self.dart_fields_memo.get(&declaration.id).is_some_and(|(_, fields)| fields.contains(name))
+    }
+}
diff --git a/codegraph-kernel/src/resolve/fields.rs b/codegraph-kernel/src/resolve/fields.rs
index 22c17883c1..f02091c5db 100644
--- a/codegraph-kernel/src/resolve/fields.rs
+++ b/codegraph-kernel/src/resolve/fields.rs
@@ -16,9 +16,10 @@ impl KernelResolver {
             return Ok(None);
         }
         let (base, field) = (segs[0], segs[1]);
-        let Some(base_type) = self.infer_local_receiver_type(base, r, false)? else {
+        let Some(base_type) = self.infer_local_receiver_type(base, r, true)? else {
             return Ok(None);
         };
+        let Some((base_type, base_dir)) = self.go_type_package(&base_type, &r.file_path)? else { return Ok(None); };
         // `\bFIELD\s+\*?\[?\]?TYPE`
         static FIELD_TYPE: LazyLock<Affix> =
             LazyLock::new(|| Affix::new("", r"\s+\*?\[?\]?([A-Za-z_][A-Za-z0-9_.]*)", true, false, false));
@@ -26,7 +27,7 @@ impl KernelResolver {
             self.nodes_by_name(&base_type)?
                 .iter()
                 .filter(|n| {
-                    matches!(n.kind.as_str(), "struct" | "class") && n.language == "go"
+                    matches!(n.kind.as_str(), "struct" | "class") && n.language == "go" && pos_dirname(&n.file_path) == base_dir
                 })
                 .cloned()
                 .collect(),
@@ -77,19 +78,25 @@ impl KernelResolver {
     /// `None` when `pkg` is no import there or names a package outside the
     /// module.
     pub(super) fn go_imported_package_dir(&mut self, file_path: &str, pkg: &str) -> Res<Option<String>> {
-        let Some(mod_path) = self.go_module_path.clone() else {
-            return Ok(None);
-        };
-        let source = self
-            .import_mappings(file_path)?
-            .iter()
-            .find(|i| i.local_name == pkg)
-            .map(|imp| imp.source.clone());
-        Ok(match source {
-            Some(src) if src == mod_path => Some(String::new()),
-            Some(src) if src.starts_with(&format!("{}/", mod_path)) => Some(src[mod_path.len() + 1..].to_string()),
-            _ => None,
-        })
+        let source = self.import_mappings(file_path)?.iter()
+            .find(|i| i.local_name == pkg).map(|i| i.source.clone());
+        Ok(source.and_then(|src| self.go_package_dir(&src, file_path)))
+    }
+
+    pub(super) fn go_package_dir(&self, import_path: &str, from_file: &str) -> Option<String> {
+        let own = self.go_modules.iter().filter(|m| m.dir.is_empty() || from_file.starts_with(&format!("{}/", m.dir)))
+            .max_by_key(|m| m.dir.len());
+        let mut best: Option<&KernelGoModule> = None;
+        for m in &self.go_modules {
+            let hidden = m.dir.split('/').any(|d| d == "testdata" || d.starts_with(['.', '_']));
+            let is_own = own.is_some_and(|o| std::ptr::eq(o, m));
+            if hidden && !is_own { continue; }
+            if import_path != m.module_path && !import_path.starts_with(&format!("{}/", m.module_path)) { continue; }
+            if best.is_none_or(|b| m.module_path.len() > b.module_path.len() || (m.module_path.len() == b.module_path.len() && is_own)) { best = Some(m); }
+        }
+        let m = best?;
+        let rest = import_path.strip_prefix(&m.module_path)?.trim_start_matches('/');
+        Some(if m.dir.is_empty() { rest.to_string() } else if rest.is_empty() { m.dir.clone() } else { format!("{}/{rest}", m.dir) })
     }
 
     /// `Type::method` among Go methods declared in `pkg_dir`: a Go method
@@ -116,18 +123,123 @@ impl KernelResolver {
             })
             .cloned()
             .collect();
-        if named.is_empty() {
-            return self.resolve_method_on_type(type_name, method, r, 0.85, "instance-method", None);
-        }
         let in_pkg: Vec<Arc<KNode>> =
             named.into_iter().filter(|m| pos_dirname(&m.file_path) == pkg_dir).collect();
-        if in_pkg.is_empty() || (r.reference_kind == "function_ref" && in_pkg.len() != 1) {
-            return Ok(None);
-        }
+        if in_pkg.is_empty() { return self.go_promoted_method(type_name, method, pkg_dir, r); }
+        if r.reference_kind == "function_ref" && in_pkg.len() != 1 { return Ok(None); }
         let ordered = prefer_call_site_file(in_pkg, &r.file_path);
         Ok(Some(KCand { node: ordered[0].clone(), confidence: 0.85, resolved_by: "instance-method" }))
     }
 
+    pub(super) fn go_type_package(
+        &mut self,
+        raw: &str,
+        file: &str,
+    ) -> Res<Option<(String, String)>> {
+        let raw = raw.trim();
+        let raw = raw.strip_prefix('&').unwrap_or(raw).trim();
+        let Some(hit) = re!(
+            r"^\*?([A-Za-z_]\w*(?:\.[A-Za-z_]\w*)?)(?:\[[\s\S]*\])?$"
+        ).captures(raw) else { return Ok(None) };
+        let named = &hit[1];
+        if let Some((pkg, name)) = named.split_once('.') {
+            return Ok(self.go_imported_package_dir(file, pkg)?
+                .map(|dir| (name.to_string(), dir)));
+        }
+        Ok(Some((named.to_string(), pos_dirname(file).to_string())))
+    }
+
+    pub(super) fn go_method_on_declared_type(
+        &mut self,
+        raw: &str,
+        decl_file: &str,
+        method: &str,
+        r: &ResolveRefIn,
+    ) -> Res<Option<KCand>> {
+        let Some((ty, dir)) = self.go_type_package(raw, decl_file)? else {
+            return Ok(None);
+        };
+        self.go_method_in_package(&ty, method, &dir, r)
+    }
+
+    fn go_embedded_types(&mut self, ty: &str, dir: &str) -> Res<Vec<(String, String)>> {
+        let owners: Vec<_> = self.nodes_by_name(ty)?.iter()
+            .filter(|n| n.language == "go" && matches!(n.kind.as_str(), "struct" | "interface" | "type_alias")
+                && pos_dirname(&n.file_path) == dir).cloned().collect();
+        let mut out = Vec::new();
+        for owner in owners {
+            let Some(lines) = self.read_file(&owner.file_path) else { continue };
+            let text = lines.iter().skip((owner.start_line - 1).max(0) as usize)
+                .take((owner.end_line - owner.start_line + 1).max(0) as usize)
+                .map(|line| strip_line_comments(line)).collect::<Vec<_>>().join("\n");
+            let Some(body) = text.split_once('{').map(|(_, b)| b.rsplit_once('}').map_or(b, |(b, _)| b)) else { continue };
+            // Hide nested anonymous struct/interface bodies while preserving declaration separators.
+            let mut depth = 0usize;
+            let mut flat = String::new();
+            for ch in body.chars() {
+                match ch {
+                    '{' => depth += 1,
+                    '}' => depth = depth.saturating_sub(1),
+                    '\n' => flat.push(ch),
+                    _ if depth == 0 => flat.push(ch),
+                    _ => (),
+                }
+            }
+            for line in flat.split(['\n', ';']) {
+                let Some(hit) = re!(r"^\s*\*?([A-Za-z_]\w*(?:\.[A-Za-z_]\w*)?)(?:\[[^\]]*\])?\s*(?:`[^`]*`)?\s*$").captures(line) else { continue };
+                if let Some(base) = self.go_type_package(&hit[1], &owner.file_path)? { out.push(base); }
+            }
+        }
+        Ok(out)
+    }
+
+    fn go_promoted_method(
+        &mut self,
+        ty: &str,
+        method: &str,
+        dir: &str,
+        r: &ResolveRefIn,
+    ) -> Res<Option<KCand>> {
+        // Each path gets its own visited set. Shared bases reached by two paths
+        // must still contribute two candidates for ambiguity detection.
+        let mut initial = HashSet::new();
+        initial.insert((dir.to_string(), ty.to_string()));
+        let mut level = vec![(ty.to_string(), dir.to_string(), initial)];
+        for _depth in 0..4 {
+            let mut next = Vec::new();
+            let mut hits = Vec::new();
+            for (owner, package, visited) in level {
+                for (base, base_dir) in self.go_embedded_types(&owner, &package)? {
+                    if visited.contains(&(base_dir.clone(), base.clone())) { continue; }
+                    let mut path = visited.clone();
+                    path.insert((base_dir.clone(), base.clone()));
+                    let want = format!("{base}::{method}");
+                    let members: Vec<_> = self.nodes_by_name(method)?.iter()
+                        .filter(|n| n.language == "go" && n.kind == "method"
+                            && (n.qualified_name == want
+                                || n.qualified_name.ends_with(&format!("::{want}")))
+                            && pos_dirname(&n.file_path) == base_dir)
+                        .cloned().collect();
+                    hits.extend(members);
+                    next.push((base, base_dir, path));
+                }
+            }
+            if !hits.is_empty() {
+                if r.reference_kind == "function_ref" && hits.len() != 1 {
+                    return Ok(None);
+                }
+                let ordered = prefer_call_site_file(hits, &r.file_path);
+                return Ok(Some(KCand {
+                    node: ordered[0].clone(), confidence: 0.85,
+                    resolved_by: "instance-method",
+                }));
+            }
+            if next.is_empty() { break; }
+            level = next;
+        }
+        Ok(None)
+    }
+
     /// matchTsFieldCall restricted to the boundOwner path (br:fieldchain) —
     /// the unbound owners-by-name branch only runs for `this.`-rooted refs,
     /// which isBindingReceiverCall excludes before this arm.
@@ -702,6 +814,7 @@ impl KernelResolver {
         let Some(caller) = self.node_by_id(&r.from_node_id)? else {
             return Ok(None);
         };
+        let caller = self.this_scope_caller(caller)?;
         let Some(sep) = caller.qualified_name.rfind("::") else {
             return Ok(None);
         };
diff --git a/codegraph-kernel/src/resolve/imports.rs b/codegraph-kernel/src/resolve/imports.rs
index 061fd4930a..90ee3abb1c 100644
--- a/codegraph-kernel/src/resolve/imports.rs
+++ b/codegraph-kernel/src/resolve/imports.rs
@@ -61,11 +61,7 @@ impl KernelResolver {
             if import_path.starts_with('.') {
                 return false;
             }
-            if let Some(mod_path) = &self.go_module_path {
-                if import_path == mod_path || import_path.starts_with(&format!("{}/", mod_path)) {
-                    return false;
-                }
-            }
+            if self.go_package_dir(import_path, from_file).is_some() { return false; }
             if import_path.contains("/internal/") {
                 return false;
             }
@@ -1293,45 +1289,21 @@ impl KernelResolver {
         r: &ResolveRefIn,
         imports: &[KImport],
     ) -> Res<Option<KCand>> {
-        let Some(mod_path) = self.go_module_path.clone() else {
-            return Ok(None);
-        };
-        let Some(dot) = r.reference_name.find('.') else {
-            return Ok(None);
-        };
-        if dot == 0 {
-            return Ok(None);
-        }
-        let receiver = &r.reference_name[..dot];
-        let member_name = &r.reference_name[dot + 1..];
-        if member_name.is_empty() {
-            return Ok(None);
-        }
-        for imp in imports.iter() {
-            if imp.local_name != receiver {
-                continue;
-            }
-            if imp.source != mod_path && !imp.source.starts_with(&format!("{}/", mod_path)) {
-                continue;
-            }
-            let pkg_dir = if imp.source == mod_path {
-                String::new()
-            } else {
-                imp.source[mod_path.len() + 1..].to_string()
-            };
-            for node in self.nodes_by_name(member_name)?.iter() {
-                if node.language != "go" || !node.is_exported {
-                    continue;
-                }
-                let fp = &node.file_path;
-                let file_dir = fp.rfind('/').map(|i| &fp[..i]).unwrap_or("");
-                if file_dir == pkg_dir {
-                    return Ok(Some(KCand {
-                        node: node.clone(),
-                        confidence: 0.9,
-                        resolved_by: "import",
-                    }));
-                }
+        let proven = self.go_ref_qualifier(r)?;
+        let (receiver, member_name) = if let Some((receiver, member)) = r.reference_name.split_once('.') {
+            (receiver.to_string(), member)
+        } else if let Some(imp) = proven { (imp.local_name, r.reference_name.as_str()) }
+        else { return Ok(None); };
+        if member_name.is_empty() || self.is_shadowed_import(&receiver, r)? { return Ok(None); }
+        for imp in imports {
+            if imp.local_name != receiver { continue; }
+            let Some(pkg_dir) = self.go_package_dir(&imp.source, &r.file_path) else { continue };
+            let nodes: Vec<_> = self.nodes_by_name(member_name)?.iter()
+                .filter(|n| n.language == "go" && n.is_exported && n.kind != "method"
+                    && !n.qualified_name.contains("::") && pos_dirname(&n.file_path) == pkg_dir)
+                .cloned().collect();
+            if let [node] = nodes.as_slice() {
+                return Ok(Some(KCand { node: node.clone(), confidence: 0.9, resolved_by: "import" }));
             }
         }
         Ok(None)
diff --git a/codegraph-kernel/src/resolve/js_object_facts_upstream.rs b/codegraph-kernel/src/resolve/js_object_facts_upstream.rs
new file mode 100644
index 0000000000..f4fa488a1d
--- /dev/null
+++ b/codegraph-kernel/src/resolve/js_object_facts_upstream.rs
@@ -0,0 +1,263 @@
+//! File facts for f40db4b9 object-path resolution.
+use super::awaited::{blank_string_contents, strip_ts_comments};
+use super::*;
+use tree_sitter::{Point, Tree};
+
+struct DestructureSite {
+    scope: Option<(Point, Point)>,
+    line: i64,
+    column: i64,
+    root: String,
+}
+type DestructureScopes = HashMap<String, HashMap<String, Vec<DestructureSite>>>;
+
+type BindingRanges = RefCell<HashMap<String, Rc<Vec<(i64, i64)>>>>;
+
+pub(super) struct JsObjectFacts {
+    pub source: Rc<SourceFile>,
+    code: String,
+    byte_units: Vec<usize>,
+    line_starts: Vec<usize>,
+    byte_line_starts: Vec<usize>,
+    events: Vec<usize>,
+    open: Vec<Option<usize>>,
+    close: HashMap<usize, usize>,
+    length: usize,
+    bindings: BindingRanges,
+    function_bindings: RefCell<HashMap<(i64,i64,String),bool>>,
+    destructured: OnceCell<DestructureScopes>,
+    classic: OnceCell<bool>,
+}
+
+impl JsObjectFacts {
+    pub fn new(source: Rc<SourceFile>) -> Self {
+        let code = blank_string_contents(&strip_ts_comments(source.text()));
+        let mut byte_units = vec![0; code.len() + 1];
+        let mut units = 0;
+        for (at, ch) in code.char_indices() {
+            for slot in &mut byte_units[at..at + ch.len_utf8()] {
+                *slot = units;
+            }
+            units += ch.len_utf16();
+            byte_units[at + ch.len_utf8()] = units;
+        }
+        let mut line_starts = vec![0];
+        let mut byte_line_starts = vec![0];
+        byte_line_starts.extend(code.match_indices('\n').map(|(at,_)| at + 1));
+        let mut events = Vec::new();
+        let mut open = Vec::new();
+        let mut close = HashMap::new();
+        let mut stack = Vec::new();
+        for (at, ch) in code.encode_utf16().enumerate() {
+            match ch {
+                10 => line_starts.push(at + 1),
+                123 => {
+                    stack.push(at);
+                    events.push(at);
+                    open.push(stack.last().copied());
+                }
+                125 => {
+                    if let Some(start) = stack.pop() { close.insert(start, at); }
+                    events.push(at);
+                    open.push(stack.last().copied());
+                }
+                _ => {}
+            }
+        }
+        Self {
+            source, code, byte_units, line_starts, byte_line_starts, events, open, close,
+            length: units, bindings: RefCell::new(HashMap::new()),
+            function_bindings: RefCell::new(HashMap::new()),
+            destructured: OnceCell::new(), classic: OnceCell::new(),
+        }
+    }
+
+    pub fn offset(&self, line: i64, column: i64) -> usize {
+        self.line_starts.get((line - 1).max(0) as usize).copied()
+            .unwrap_or(self.length).saturating_add(column.max(0) as usize)
+    }
+
+    pub fn block_at(&self, offset: usize) -> Option<(usize, usize)> {
+        let count = self.events.partition_point(|at| *at < offset);
+        let start = count.checked_sub(1).and_then(|i| self.open[i])?;
+        Some((start, self.close.get(&start).copied().unwrap_or(self.length)))
+    }
+
+    fn block_of_byte(&self, at: usize) -> (i64, i64) {
+        self.block_at(self.byte_units[at]).map(|(a,b)| (a as i64,b as i64))
+            .unwrap_or((-1,self.length as i64))
+    }
+
+    fn body_after(&self, start: usize, end: usize) -> (i64, i64) {
+        let opener = if self.code.as_bytes().get(end.saturating_sub(1)) == Some(&b'{') {
+            Some(end - 1)
+        } else {
+            let tail = &self.code[end..];
+            let skipped = tail.len() - tail.trim_start().len();
+            (self.code.as_bytes().get(end + skipped) == Some(&b'{')).then_some(end + skipped)
+        };
+        if let Some(at) = opener {
+            let unit = self.byte_units[at];
+            return (unit as i64,self.close.get(&unit).copied().unwrap_or(self.length) as i64);
+        }
+        (self.byte_units[start] as i64,self.block_of_byte(start).1)
+    }
+
+    pub fn binding_scopes(&self, name: &str) -> Rc<Vec<(i64,i64)>> {
+        if let Some(hit) = self.bindings.borrow().get(name) { return hit.clone(); }
+        let mut scopes = Vec::new();
+        if self.code.contains(name) {
+            let n = regex::escape(name);
+            // Rust regex has no lookaround. These patterns consume the left
+            // boundary; the right boundary is captured, not a name suffix.
+            let decl = format!(r"(?:^|[^\w$])(?P<binding>(?:const|let|var)\s+(?:{n}(?:[^\w$]|$)|[{{\[][^;=]*?[}}\]]))");
+            let function = format!(r"(?:^|[^\w$])(?P<binding>(?:function|class)\s+{n}(?:[^\w$]|$))");
+            for pattern in [decl,function] {
+                if let Ok(re) = KernelResolver::cached_regex(&pattern) {
+                    for caps in re.captures_iter(&self.code) {
+                        let binding = caps.name("binding").unwrap();
+                        if KernelResolver::cached_regex(&format!(r"(?:^|[^\w$]){n}(?:[^\w$]|$)"))
+                            .is_ok_and(|re| re.is_match(binding.as_str())) {
+                            scopes.push(self.block_of_byte(binding.start()));
+                        }
+                    }
+                }
+            }
+            let parameter = parameter_pattern(&n);
+            if let Ok(re) = KernelResolver::cached_regex(&parameter) {
+                for m in re.find_iter(&self.code) { scopes.push(self.body_after(m.start(),m.end())); }
+            }
+            let arrow = format!(r"(?:^|[^\w$.]){n}\s*=>");
+            if let Ok(re) = KernelResolver::cached_regex(&arrow) {
+                for m in re.find_iter(&self.code) { scopes.push(self.body_after(m.start(),m.end())); }
+            }
+        }
+        let scopes = Rc::new(scopes);
+        self.bindings.borrow_mut().insert(name.to_string(),scopes.clone());
+        scopes
+    }
+
+    pub fn binds_at(&self, name: &str, r: &ResolveRefIn) -> bool {
+        let at = self.offset(r.line,r.column) as i64;
+        self.binding_scopes(name).iter().any(|(a,b)| at > *a && at < *b)
+    }
+
+    // Upstream's holderScopeAt checks the written caller, not every visible
+    // binding. Keep its function-local test separate from binds_at.
+    pub fn function_binds(&self, name: &str, caller: &KNode, r: &ResolveRefIn) -> bool {
+        let key = (caller.start_line,r.line,name.to_string());
+        if let Some(hit) = self.function_bindings.borrow().get(&key) { return *hit; }
+        let lo = self.byte_line_starts.get((caller.start_line - 1).max(0) as usize)
+            .copied().unwrap_or(self.code.len());
+        let hi = self.byte_line_starts.get(r.line.max(0) as usize)
+            .copied().unwrap_or(self.code.len());
+        let text = self.code.get(lo..hi).unwrap_or("");
+        let n = regex::escape(name);
+        let decl = format!(r"(?:^|[^\w$])(?:const|let|var)\s+{n}(?:[^\w$]|$)");
+        let declared = KernelResolver::cached_regex(&decl).is_ok_and(|re| {
+            re.find_iter(text).any(|m| {
+                // The consumed right boundary may be whitespace. Inspect
+                // from the end of the name, then reject destructuring tails.
+                let raw = m.as_str();
+                let Some(at) = raw.rfind(name) else { return false };
+                !raw[at + name.len()..].trim_start().starts_with([',',']','}'])
+                    && !text[m.end()..].trim_start().starts_with([',',']','}'])
+            })
+        });
+        let parameter = parameter_pattern(&n).replace("(?::[^=;{]*)?","(?::[^=;{}()\n]*)?");
+        let bound = declared || KernelResolver::cached_regex(&parameter).is_ok_and(|re| {
+            re.find_iter(text).any(|m| {
+                !re!(r"(?:^|[^\w$])(?:if|while|for|switch|with)\s*$")
+                    .is_match(&text[..m.start()])
+            })
+        });
+        self.function_bindings.borrow_mut().insert(key,bound);
+        bound
+    }
+
+    pub fn destructure_sites(&self, path: &str, member: &str, r: &ResolveRefIn, tree: &Tree) -> Vec<(i64, i64, String)> {
+        self.destructured.get_or_init(|| {
+            let mut paths = DestructureScopes::new();
+            let re = re!(r"\{([^{}]*)\}\s*=\s*((?:(?:window|globalThis)\s*\.\s*)?[A-Za-z_$][\w$]*(?:\s*\.\s*[A-Za-z_$][\w$]*)*)");
+            for caps in re.captures_iter(&self.code) {
+                let at = caps.get(0).unwrap().start();
+                let row = self.byte_line_starts.partition_point(|start| *start <= at).saturating_sub(1);
+                let units = self.byte_units[at].saturating_sub(self.line_starts[row]);
+                let Some(line) = self.source.get(row) else { continue };
+                let point = Point::new(row, super::names::js_unit_to_byte(line, units));
+                let mut ancestor = tree.root_node().descendant_for_point_range(point, point);
+                let mut declaration = None;
+                while let Some(node) = ancestor {
+                    if node.kind() == "variable_declarator" {
+                        if node.child_by_field_name("name").is_some_and(|pattern|
+                            pattern.kind() == "object_pattern" && pattern.start_position() <= point && point < pattern.end_position()) {
+                            declaration = Some(node);
+                        }
+                        break;
+                    }
+                    ancestor = node.parent();
+                }
+                let Some(declaration) = declaration else { continue };
+                let scope = super::js_scope_upstream::binding_scope(declaration);
+                let rhs = caps.get(2).unwrap();
+                // Equivalent to upstream's two negative lookaheads, without
+                // permitting regex backtracking to shorten the path.
+                let tail = &self.code[rhs.end()..];
+                if tail.chars().next().is_some_and(|ch| ch.is_alphanumeric() || ch == '_' || ch == '$')
+                    || tail.trim_start().starts_with(['.','(','[']) { continue; }
+                let mut path: String = rhs.as_str().chars().filter(|ch| !ch.is_whitespace()).collect();
+                let root = path.split('.').next().unwrap_or("").to_string();
+                let rhs_row = self.byte_line_starts.partition_point(|start| *start <= rhs.start()).saturating_sub(1);
+                let rhs_column = self.byte_units[rhs.start()].saturating_sub(self.line_starts[rhs_row]) as i64;
+                for prefix in ["window.","globalThis."] {
+                    if let Some(rest) = path.strip_prefix(prefix) { path = rest.to_string(); break; }
+                }
+                for item in caps[1].split(',') {
+                    let item = item.trim();
+                    let mut pair = item.split(':');
+                    let key = pair.next().unwrap_or("").split('=').next().unwrap_or("").trim();
+                    let local = pair.next().map(|s| s.split('=').next().unwrap_or("").trim()).unwrap_or(key);
+                    // An explicit alias is permitted only when key == local.
+                    if key == local && re!(r"^[A-Za-z_$][\w$]*$").is_match(key) {
+                        paths.entry(path.clone()).or_default().entry(key.to_string()).or_default().push(DestructureSite { scope, line: rhs_row as i64 + 1, column: rhs_column, root: root.clone() });
+                    }
+                }
+            }
+            paths
+        }).get(path).and_then(|keys| keys.get(member)).map_or_else(Vec::new, |sites| {
+            let Some(line) = self.source.get((r.line - 1).max(0) as usize) else { return Vec::new() };
+            let point = Point::new((r.line - 1).max(0) as usize,
+                super::names::js_unit_to_byte(line, r.column.max(0) as usize));
+            sites.iter().filter(|site| site.scope.is_none_or(|(start, end)| point >= start && point < end))
+                .map(|site| (site.line, site.column, site.root.clone())).collect()
+        })
+    }
+
+    pub fn classic(&self, path: &str) -> bool {
+        *self.classic.get_or_init(|| {
+            !re!(r"(?i)\.[mc]js$").is_match(path)
+                && !re!(r"\bmodule\.exports\b|\bexports\s*[.\[]").is_match(self.source.text())
+                && !re!(r#"(?m)^[ \t]*import[\s{*'"]"#).is_match(&self.code)
+                && !re!(r"(?m)^[ \t]*export[\s{*]|^[ \t]*declare\s+global\b").is_match(&self.code)
+                && !re!(r"(?:^|[^\w$.])require\s*\(").is_match(&self.code)
+        })
+    }
+}
+
+fn parameter_pattern(n: &str) -> String {
+    // Port of localBindingPatterns.param. Explicit non-name boundary after
+    // the selected parameter replaces JS's \b without lookaround.
+    format!(r"\(\s*(?:(?:\.\.\.)?[\w$]+(?:\s*(?:\?\s*)?:[^,()]+|\s*=[^,()]+|\s*),\s*)*{n}(?:\s*\??\s*:[^,()]*)?(?:\s*=[^,()]*)?(?:\s*,\s*[^()]*)?\)\s*(?::[^=;{{]*)?(?:=>|\{{)")
+}
+
+impl KernelResolver {
+    pub(super) fn js_object_facts(&mut self, path: &str) -> Option<Rc<JsObjectFacts>> {
+        let source = self.read_file(path)?;
+        let cached = self.js_objects.files.get(path)
+            .filter(|facts| Rc::ptr_eq(&facts.source,&source)).cloned();
+        let facts = cached.unwrap_or_else(|| Rc::new(JsObjectFacts::new(source)));
+        // put refreshes LRU insertion order and retains only 32 files.
+        self.js_objects.files.put(path.to_string(),facts.clone());
+        Some(facts)
+    }
+}
diff --git a/codegraph-kernel/src/resolve/js_objects_upstream.rs b/codegraph-kernel/src/resolve/js_objects_upstream.rs
new file mode 100644
index 0000000000..bec6322e45
--- /dev/null
+++ b/codegraph-kernel/src/resolve/js_objects_upstream.rs
@@ -0,0 +1,346 @@
+//! Native f40db4b9 named-object matching.
+use super::*;
+use super::js_object_facts_upstream::JsObjectFacts;
+
+pub(super) struct JsObjects {
+    pub files: Lru<Rc<JsObjectFacts>>,
+    owners: HashMap<String,Option<Arc<KNode>>>,
+    this_callers: HashMap<String,Arc<KNode>>,
+    globals: HashMap<String,bool>,
+}
+
+impl Default for JsObjects {
+    fn default() -> Self {
+        Self { files: Lru::new(32), owners: HashMap::new(),
+            this_callers: HashMap::new(), globals: HashMap::new() }
+    }
+}
+
+impl JsObjects {
+    pub fn clear(&mut self) { *self = Self::default(); }
+}
+
+pub(super) enum ObjectPathMatch {
+    NoHolder,
+    Refused,
+    Found(KCand),
+}
+
+pub(super) fn last_segment(n: &KNode) -> &str {
+    n.qualified_name.rsplit("::").next().unwrap_or(&n.qualified_name)
+}
+
+pub(super) fn holder_path(n: &KNode) -> &str {
+    let last = last_segment(n);
+    if !last.contains('.') { return &n.name; }
+    last.strip_prefix("window.").or_else(|| last.strip_prefix("globalThis.")).unwrap_or(last)
+}
+
+pub(super) fn path_holder(n: &KNode) -> bool { last_segment(n).contains('.') }
+fn global_host(n: &KNode) -> bool {
+    last_segment(n).starts_with("window.") || last_segment(n).starts_with("globalThis.")
+}
+
+pub(super) fn literal_owner(n: &KNode) -> bool {
+    matches!(n.kind.as_str(),"constant" | "variable") && is_js_family(&n.language)
+        && n.signature.as_deref().is_some_and(|s| re!(r"^=\s*(?:(?:Object\.(?:freeze|seal)\s*)?\(\s*)*\{").is_match(s))
+}
+
+fn range_within(n: &KNode,p: &KNode) -> bool {
+    (n.start_line,n.start_column) >= (p.start_line,p.start_column)
+        && (n.end_line,n.end_column) <= (p.end_line,p.end_column)
+}
+
+fn position_within(r: &ResolveRefIn,n: &KNode) -> bool {
+    (r.line,r.column) >= (n.start_line,n.start_column)
+        && (r.line,r.column) < (n.end_line,n.end_column)
+}
+
+impl KernelResolver {
+    fn js_object_parent(&mut self,n: &KNode) -> Res<Option<Arc<KNode>>> {
+        let Some(cut) = n.qualified_name.rfind("::").filter(|cut| *cut > 0) else { return Ok(None) };
+        Ok(self.nodes_by_qualified_name(&n.qualified_name[..cut])?.iter()
+            .find(|p| p.file_path == n.file_path && p.id != n.id && range_within(n,p)).cloned())
+    }
+
+    fn js_member_owner(&mut self,n: &KNode) -> Res<Option<Arc<KNode>>> {
+        if n.kind != "function" || !is_js_family(&n.language) { return Ok(None); }
+        if let Some(hit) = self.js_objects.owners.get(&n.id) { return Ok(hit.clone()); }
+        let hit = self.js_object_parent(n)?.filter(|p| literal_owner(p));
+        self.js_objects.owners.insert(n.id.clone(),hit.clone());
+        Ok(hit)
+    }
+
+    fn js_arrow_member(&mut self,n: &KNode) -> bool {
+        self.read_file(&n.file_path).and_then(|src| {
+            src.get((n.start_line - 1).max(0) as usize).map(|line| {
+                re!(r"^(?:async\s*)?(?:[(<]|[A-Za-z_$][\w$]*\s*=>)")
+                    .is_match(js_slice(line,n.start_column.max(0) as usize))
+            })
+        }).unwrap_or(false)
+    }
+
+    pub(super) fn this_scope_caller(&mut self,caller: Arc<KNode>) -> Res<Arc<KNode>> {
+        if !is_js_family(&caller.language) { return Ok(caller); }
+        if let Some(hit) = self.js_objects.this_callers.get(&caller.id) { return Ok(hit.clone()); }
+        let mut current = caller.clone();
+        for _ in 0..8 {
+            let owner = if literal_owner(&current) { Some(current.clone()) }
+                else if self.js_arrow_member(&current) { self.js_member_owner(&current)? }
+                else { None };
+            let Some(owner) = owner else { break };
+            let Some(parent) = self.js_object_parent(&owner)? else { break };
+            current = parent;
+        }
+        self.js_objects.this_callers.insert(caller.id.clone(),current.clone());
+        Ok(current)
+    }
+
+    fn this_object(&mut self,caller: Arc<KNode>) -> Res<Option<Arc<KNode>>> {
+        let scope = self.this_scope_caller(caller)?;
+        let owner = self.js_member_owner(&scope)?;
+        Ok(if self.js_arrow_member(&scope) { None } else { owner })
+    }
+
+    fn js_holder_scope(&mut self,n: &KNode,r: &ResolveRefIn,via_global: bool) -> Res<Option<i64>> {
+        if global_host(n) && !via_global && !self.js_global_holder(n)? { return Ok(None); }
+        let root = if via_global && global_host(n) { last_segment(n).split('.').next().unwrap_or("") }
+            else { holder_path(n).split('.').next().unwrap_or("") };
+        if path_holder(n) {
+            let site = ResolveRefIn { column: n.start_column, ..r.clone().at(n).naming(root, "references") };
+            if self.js_root_binding_scope(&site, root) != self.js_root_binding_scope(r, root) { return Ok(None); }
+        }
+        let mut depth = -1;
+        {
+            if let Some(facts) = self.js_object_facts(&n.file_path) {
+                let declared = facts.offset(n.start_line, n.start_column) as i64;
+                let at = facts.offset(r.line, r.column) as i64;
+                let scopes = facts.binding_scopes(root);
+                let binding_at = |position| scopes.iter()
+                    .filter(|(start, end)| position > *start && position < *end)
+                    .max_by_key(|(start, _)| *start).copied();
+                if binding_at(declared) != binding_at(at) { return Ok(None); }
+            }
+        }
+        if path_holder(n) && !global_host(n) {
+            if let Some(facts) = self.js_object_facts(&n.file_path) {
+                let declared = facts.offset(n.start_line, n.start_column) as i64;
+                let at = facts.offset(r.line, r.column) as i64;
+                for (start, end) in facts.binding_scopes(root).iter() {
+                    if declared > *start && declared < *end {
+                        if at <= *start || at >= *end { return Ok(None); }
+                        depth = depth.max(*start);
+                    }
+                }
+            }
+        }
+        if !path_holder(n) && matches!(n.language.as_str(),"javascript" | "jsx" | "typescript" | "tsx") {
+            if let Some(facts) = self.js_object_facts(&n.file_path) {
+                if let Some((start,end)) = facts.block_at(facts.offset(n.start_line,n.start_column)) {
+                    let at = facts.offset(r.line,r.column);
+                    if at <= start || at >= end { return Ok(None); }
+                    depth = start as i64;
+                }
+            }
+        }
+        if !via_global {
+            if let Some(caller) = self.node_by_id(&r.from_node_id)? {
+                if matches!(caller.kind.as_str(),"function" | "method")
+                    && caller.start_line <= r.line && caller.end_line >= r.line
+                    && self.js_object_facts(&r.file_path).is_some_and(|f| f.function_binds(root,&caller,r))
+                    && !(n.file_path == r.file_path && n.start_line >= caller.start_line && n.start_line <= caller.end_line) {
+                    return Ok(None);
+                }
+            }
+        }
+        Ok(Some(depth))
+    }
+
+    fn js_global_holder(&mut self,n: &KNode) -> Res<bool> {
+        if let Some(hit) = self.js_objects.globals.get(&n.id) { return Ok(*hit); }
+        // A false seed breaks recursive path/root cycles.
+        self.js_objects.globals.insert(n.id.clone(),false);
+        let root = if global_host(n) { last_segment(n).split('.').next().unwrap_or("") }
+            else { holder_path(n).split('.').next().unwrap_or("") };
+        let site = ResolveRefIn { row_id: None, from_node_id: n.id.clone(),
+            reference_name: root.to_string(), reference_kind: "references".to_string(),
+            line: n.start_line, column: n.start_column, candidates: None,
+            file_path: n.file_path.clone(), language: n.language.clone(), failure_reason: None };
+        if self.js_root_binding_scope(&site, root).is_some() { return Ok(false); }
+        let global = if global_host(n) {
+            let host = root;
+            self.js_object_facts(&n.file_path).is_some_and(|facts| {
+                let declared = facts.offset(n.start_line, n.start_column) as i64;
+                !facts.binding_scopes(host).iter().any(|(start, end)| declared > *start && declared < *end)
+            })
+        }
+            else if !matches!(n.language.as_str(),"javascript" | "jsx" | "typescript" | "tsx") { false }
+            else if let Some(facts) = self.js_object_facts(&n.file_path) {
+                if !facts.classic(&n.file_path) { false }
+                else if !path_holder(n) { facts.block_at(facts.offset(n.start_line,n.start_column)).is_none() }
+                else {
+                    let root = holder_path(n).split('.').next().unwrap_or("");
+                    let declared = facts.offset(n.start_line, n.start_column) as i64;
+                    if facts.binding_scopes(root).iter().any(|(start, end)|
+                        *start >= 0 && declared > *start && declared < *end) {
+                        return Ok(false);
+                    }
+                    let roots: Vec<_> = self.nodes_by_name(root)?.iter().filter(|p| {
+                        p.id != n.id && matches!(p.kind.as_str(),"constant" | "variable")
+                            && is_js_family(&p.language) && holder_path(p) == root
+                    }).cloned().collect();
+                    let mut found = false;
+                    for root in roots { if self.js_global_holder(&root)? { found = true; break; } }
+                    found
+                }
+            } else { false };
+        self.js_objects.globals.insert(n.id.clone(),global);
+        Ok(global)
+    }
+
+    fn js_hit_holder(&mut self,n: &KNode,member: &str,r: &ResolveRefIn) -> Res<Option<KCand>> {
+        if let Some(hit) = self.resolve_object_literal_member(n,member,r,0.85,"instance-method")? {
+            return Ok(Some(hit));
+        }
+        self.resolve_object_literal_binding(n,member,r)
+    }
+
+    pub(super) fn resolve_object_path_member(&mut self,path: &str,member: &str,r: &ResolveRefIn,host: Option<&str>) -> Res<ObjectPathMatch> {
+        if host.is_some_and(|name| self.js_object_facts(&r.file_path)
+            .is_some_and(|facts| facts.binds_at(name, r))) {
+            return Ok(ObjectPathMatch::Refused);
+        }
+        let tail = path.rsplit('.').next().unwrap_or(path);
+        let named: Vec<_> = self.nodes_by_name(tail)?.iter().filter(|n| {
+            literal_owner(n) && same_language_family(&n.language,&r.language) && holder_path(n) == path
+        }).cloned().collect();
+        if named.is_empty() { return Ok(ObjectPathMatch::NoHolder); }
+        let mut local = Vec::new();
+        for n in named.iter().filter(|n| n.file_path == r.file_path) {
+            if let Some(depth) = self.js_holder_scope(n,r,host.is_some())? { local.push((n.clone(),depth)); }
+        }
+        // Stable sort preserves upstream first-hit order at equal depth.
+        local.sort_by_key(|(_,depth)| std::cmp::Reverse(*depth));
+        if let Some((_,nearest)) = local.first() {
+            let nearest = *nearest;
+            for (n,_) in local.iter().filter(|(_,depth)| *depth == nearest) {
+                if let Some(hit) = self.js_hit_holder(n,member,r)? { return Ok(ObjectPathMatch::Found(hit)); }
+            }
+            return Ok(ObjectPathMatch::Refused);
+        }
+        if self.js_parameter_binds(r, host.unwrap_or(path.split('.').next().unwrap_or(path))) {
+            return Ok(ObjectPathMatch::Refused);
+        }
+        let mut hits = Vec::new();
+        for n in named.iter().filter(|n| n.file_path != r.file_path && literal_owner(n)) {
+            if self.js_global_holder(n)? {
+                if let Some(hit) = self.js_hit_holder(n,member,r)? { hits.push((n.clone(),hit)); }
+            }
+        }
+        if hits.is_empty() { return Ok(ObjectPathMatch::Refused); }
+        let root = path.split('.').next().unwrap_or(path);
+        let imported = host.is_none() && self.import_mappings(&r.file_path)?.iter().any(|m| m.local_name == root);
+        let bound = self.js_object_facts(&r.file_path).is_some_and(|f| f.binds_at(host.unwrap_or(root),r));
+        if imported || bound { return Ok(ObjectPathMatch::Refused); }
+        let targets: HashSet<_> = hits.iter().map(|(_,hit)| hit.node.id.clone()).collect();
+        if targets.len() == 1 {
+            let (_,mut hit) = hits.remove(0); hit.confidence = 0.8;
+            return Ok(ObjectPathMatch::Found(hit));
+        }
+        let dir = r.file_path.rfind('/').map_or("",|at| &r.file_path[..at + 1]);
+        let mut nearby: Vec<_> = hits.into_iter().filter(|(n,_)| {
+            n.file_path.strip_prefix(dir).is_some_and(|rest| !rest.contains('/'))
+        }).collect();
+        let targets: HashSet<_> = nearby.iter().map(|(_,hit)| hit.node.id.clone()).collect();
+        if targets.len() != 1 { return Ok(ObjectPathMatch::Refused); }
+        let (_,mut hit) = nearby.remove(0); hit.confidence = 0.75;
+        Ok(ObjectPathMatch::Found(hit))
+    }
+
+    pub(super) fn match_object_path_call(&mut self,r: &ResolveRefIn) -> Res<Option<KCand>> {
+        if r.reference_kind != "calls" || !is_js_family(&r.language) { return Ok(None); }
+        let Some((path,member)) = r.reference_name.rsplit_once('.') else { return Ok(None) };
+        let (host,path) = if let Some(rest) = path.strip_prefix("window.") { (Some("window"),rest) }
+            else if let Some(rest) = path.strip_prefix("globalThis.") { (Some("globalThis"),rest) }
+            else { (None,path) };
+        if path.is_empty() { return Ok(None); }
+        let root = path.split('.').next().unwrap_or(path);
+        if host.is_none() && self.import_mappings(&r.file_path)?.iter().any(|m| m.local_name == root) {
+            return Ok(None);
+        }
+        Ok(match self.resolve_object_path_member(path,member,r,host)? {
+            ObjectPathMatch::Found(hit) => Some(hit), _ => None,
+        })
+    }
+
+    pub(super) fn match_collapsed_object_call(&mut self,r: &ResolveRefIn) -> Res<Option<KCand>> {
+        if r.reference_kind != "calls" || !is_js_family(&r.language)
+            || !re!(r"^[A-Za-z_$][\w$]*$").is_match(&r.reference_name) { return Ok(None); }
+        if let Some(src) = self.read_file(&r.file_path) {
+            if let Some(line) = src.get((r.line - 1).max(0) as usize) {
+                if js_slice(line,r.column.max(0) as usize).strip_prefix(r.reference_name.as_str())
+                    .is_some_and(|rest| re!(r"^\s*\(").is_match(rest)) { return Ok(None); }
+            }
+        }
+        let Some((_,receiver)) = self.bare_call_receiver(r)? else { return Ok(None) };
+        if receiver.trim() == "this" {
+            if let Some(caller) = self.node_by_id(&r.from_node_id)? {
+                if let Some(owner) = self.this_object(caller)? {
+                    return self.resolve_object_literal_member(&owner,&r.reference_name,r,0.85,"instance-method");
+                }
+            }
+            return Ok(None);
+        }
+        let Some(caps) = re!(r"(?:^|[^\w$.])(window|globalThis)\s*\??\.\s*([A-Za-z_$][\w$]*(?:\s*\??\.\s*[A-Za-z_$][\w$]*)*)$").captures(&receiver) else { return Ok(None) };
+        let path: String = caps[2].chars().filter(|ch| !ch.is_whitespace() && *ch != '?').collect();
+        Ok(match self.resolve_object_path_member(&path,&r.reference_name,r,Some(&caps[1]))? {
+            ObjectPathMatch::Found(hit) => Some(hit), _ => None,
+        })
+    }
+
+    pub(super) fn object_member_reachable_by_name(&mut self,n: &KNode,r: &ResolveRefIn) -> Res<bool> {
+        let Some(owner) = self.js_member_owner(n)? else { return Ok(true) };
+        if r.file_path == n.file_path {
+            let written_this = r.reference_kind == "calls" && position_within(r,&owner)
+                && self.bare_call_receiver(r)?.is_some_and(|(_,head)| head.trim() == "this");
+            if written_this {
+                if let Some(caller) = self.node_by_id(&r.from_node_id)? {
+                    if self.this_object(caller)?.is_some_and(|p| p.id == owner.id) { return Ok(true); }
+                }
+            }
+            if position_within(r,n) {
+                let pattern = format!(r"^(?:async\s+)?function\s*\*?\s*{}(?:[^\w$]|$)",regex::escape(&n.name));
+                if let Some(src) = self.read_file(&n.file_path) {
+                    if src.get((n.start_line - 1).max(0) as usize).is_some_and(|line| {
+                        Self::cached_regex(&pattern).is_ok_and(|re| re.is_match(js_slice(line,n.start_column.max(0) as usize)))
+                    }) { return Ok(true); }
+                }
+            }
+        }
+        self.js_destructured_object_member(n, r)
+    }
+
+    /// A scoped destructure can call an object member declared outside its caller.
+    pub(super) fn js_destructured_object_member(&mut self, n: &KNode, r: &ResolveRefIn) -> Res<bool> {
+        let Some(owner) = self.js_member_owner(n)? else { return Ok(false) };
+        let Some(source) = self.read_file(&r.file_path) else { return Ok(false) };
+        let Some(tree) = self.js_binding_tree(&source, r) else { return Ok(false) };
+        let Some(facts) = self.js_object_facts(&r.file_path) else { return Ok(false) };
+        for (line, column, root) in facts.destructure_sites(holder_path(&owner), &n.name, r, &tree) {
+            // The captured member keeps the RHS binding at its declaration.
+            let site = ResolveRefIn { line, column, ..r.clone() };
+            let rhs_scope = self.js_root_binding_scope(&site, &root);
+            if owner.file_path == r.file_path {
+                let owner_root = if global_host(&owner) { last_segment(&owner) }
+                    else { holder_path(&owner) }.split('.').next().unwrap_or("");
+                if owner_root != root {
+                    if rhs_scope.is_none() && self.js_global_holder(&owner)? { return Ok(true); }
+                    continue;
+                }
+                let declaration = ResolveRefIn { column: owner.start_column, ..r.clone().at(&owner) };
+                if self.js_root_binding_scope(&declaration, owner_root) == rhs_scope { return Ok(true); }
+            } else if rhs_scope.is_none() && self.js_global_holder(&owner)? { return Ok(true); }
+        }
+        Ok(false)
+    }
+}
diff --git a/codegraph-kernel/src/resolve/js_scope_upstream.rs b/codegraph-kernel/src/resolve/js_scope_upstream.rs
index 3e79af2a4b..f6ffd037b7 100644
--- a/codegraph-kernel/src/resolve/js_scope_upstream.rs
+++ b/codegraph-kernel/src/resolve/js_scope_upstream.rs
@@ -13,11 +13,15 @@ struct JsBindingFact {
     scope: Option<(Point, Point)>,
 }
 
-fn binding_scope(node: Node<'_>) -> Option<(Point, Point)> {
-    let function_scoped = node.kind() == "variable_declarator"
-        && node
-            .parent()
-            .is_some_and(|p| p.kind() == "variable_declaration");
+pub(super) fn binding_scope(node: Node<'_>) -> Option<(Point, Point)> {
+    let loop_kind = (node.kind() == "for_in_statement")
+        .then(|| node.child_by_field_name("kind")).flatten();
+    if loop_kind.is_some_and(|kind| kind.kind() != "var") {
+        return Some((node.start_position(), node.end_position()));
+    }
+    let function_scoped = loop_kind.is_some_and(|kind| kind.kind() == "var")
+        || (node.kind() == "variable_declarator" && node.parent()
+            .is_some_and(|p| p.kind() == "variable_declaration"));
     let mut current = node.parent();
     while let Some(scope) = current {
         let lexical = matches!(
@@ -46,6 +50,68 @@ fn visible(scope: Option<(Point, Point)>, point: Point) -> bool {
 }
 
 impl KernelResolver {
+    /// Parse embedded scripts with the original file's byte and line positions.
+    pub(super) fn js_binding_tree(&mut self, source: &Rc<SourceFile>, r: &ResolveRefIn) -> Option<Rc<tree_sitter::Tree>> {
+        if !is_sfc_language(&r.language) {
+            return self.parsed_tree(source, r);
+        }
+        let key = format!("sfc-script\0{}\0{}", r.language, r.file_path);
+        if let Some((cached, tree)) = self.tree_cache.get(&key) {
+            if Rc::ptr_eq(cached, source) { return tree.clone(); }
+        }
+        // The extractors use these same script tags and Astro line fences.
+        // Mask each non-script byte while preserving newlines and UTF-8 offsets.
+        let text = source.text();
+        let mut bytes: Vec<u8> = text.bytes().map(|b| if matches!(b, b'\r' | b'\n') { b } else { b' ' }).collect();
+        for capture in re!(r"<script(?:\s[^>]*)?>([\s\S]*?)</script>").captures_iter(text) {
+            if let Some(content) = capture.get(1) {
+                bytes[content.start()..content.end()].copy_from_slice(content.as_str().as_bytes());
+            }
+        }
+        if r.language == "astro" {
+            let mut offset = 0;
+            let mut start = None;
+            for line in text.split_inclusive('\n') {
+                if let Some(from) = start {
+                    if line.trim() == "---" {
+                        bytes[from..offset].copy_from_slice(&text.as_bytes()[from..offset]);
+                        break;
+                    }
+                } else if !line.trim().is_empty() {
+                    if line.trim() != "---" { break; }
+                    start = Some(offset + line.len());
+                }
+                offset += line.len();
+            }
+        }
+        let script = String::from_utf8(bytes).ok()?;
+        let tree = crate::tree::parse_with_cached_parser(&script, "typescript").ok().map(Rc::new);
+        self.tree_cache.put(key, (source.clone(), tree.clone()));
+        tree
+    }
+    /// Parameter patterns bind names only within their enclosing function.
+    pub(super) fn js_parameter_binds(&mut self, r: &ResolveRefIn, name: &str) -> bool {
+        self.js_parameter_scope(r, name).is_some()
+    }
+
+    pub(super) fn js_parameter_scope(&mut self, r: &ResolveRefIn, name: &str) -> Option<(Point, Point)> {
+        let source = self.read_file(&r.file_path)?;
+        let tree = self.js_binding_tree(&source, r)?;
+        let line = source.get((r.line - 1).max(0) as usize)?;
+        let point = Point::new((r.line - 1).max(0) as usize,
+            super::names::js_unit_to_byte(line, r.column.max(0) as usize));
+        let mut current = tree.root_node().descendant_for_point_range(point, point);
+        while let Some(node) = current {
+            let parameters = node.child_by_field_name("parameters")
+                .or_else(|| node.child_by_field_name("parameter"));
+            if parameters.is_some_and(|p| destructured_binding_property(p, name, source.text()).is_some()) {
+                return Some((node.start_position(), node.end_position()));
+            }
+            current = node.parent();
+        }
+        None
+    }
+
     pub(super) fn js_typed_destructured_member(
         &mut self,
         r: &ResolveRefIn,
@@ -62,7 +128,7 @@ impl KernelResolver {
         let Some(source) = self.read_file(&r.file_path) else {
             return Ok(None);
         };
-        let Some(tree) = self.parsed_tree(&source, r) else {
+        let Some(tree) = self.js_binding_tree(&source, r) else {
             return Ok(None);
         };
         let Some(line) = source.get((r.line - 1).max(0) as usize) else {
@@ -196,7 +262,7 @@ impl KernelResolver {
             return false;
         };
         let site = r.clone().at(member);
-        let Some(tree) = self.parsed_tree(&source, &site) else {
+        let Some(tree) = self.js_binding_tree(&source, &site) else {
             return false;
         };
         let Some(line) = source.get((member.start_line - 1).max(0) as usize) else {
@@ -232,7 +298,7 @@ impl KernelResolver {
             return None;
         }
         let source = self.read_file(&n.file_path)?;
-        let tree = self.parsed_tree(&source, r)?;
+        let tree = self.js_binding_tree(&source, r)?;
         let line = source.get((r.line - 1).max(0) as usize)?;
         let point = Point::new(
             (r.line - 1).max(0) as usize,
@@ -278,18 +344,28 @@ impl KernelResolver {
         if self.resolve_via_import(r).ok().flatten().is_some() {
             return false;
         }
-        let Some(source) = self.read_file(&r.file_path) else {
-            return false;
-        };
+        let Some((key, point)) = self.js_binding_index(r) else { return false };
+        self.upstream_js_bindings
+            .get(&key)
+            .and_then(|index| index.by_name.get(&r.reference_name))
+            .is_some_and(|facts| {
+                facts.iter().any(|fact| {
+                    caller.is_none_or(|f| {
+                        fact.start.row >= (f.start_line - 1).max(0) as usize
+                            && fact.end.row < f.end_line.max(0) as usize
+                    }) && visible(fact.scope, point)
+                })
+            })
+    }
+    fn js_binding_index(&mut self, r: &ResolveRefIn) -> Option<(String, Point)> {
+        let source = self.read_file(&r.file_path)?;
         let key = format!("{}\0{}", r.language, r.file_path);
         if !self
             .upstream_js_bindings
             .get(&key)
             .is_some_and(|index| Rc::ptr_eq(&index.source, &source))
         {
-            let Some(tree) = self.parsed_tree(&source, r) else {
-                return false;
-            };
+            let tree = self.js_binding_tree(&source, r)?;
             let mut by_name: HashMap<String, Vec<JsBindingFact>> = HashMap::new();
             let mut queue = vec![tree.root_node()];
             while let Some(node) = queue.pop() {
@@ -319,8 +395,12 @@ impl KernelResolver {
                             });
                     }
                 }
-                if node.kind() == "variable_declarator" {
-                    if let Some(pattern) = node.child_by_field_name("name") {
+                let pattern = if node.kind() == "variable_declarator" {
+                    node.child_by_field_name("name")
+                } else if node.kind() == "for_in_statement" && node.child_by_field_name("kind").is_some() {
+                    node.child_by_field_name("left")
+                } else { None };
+                if let Some(pattern) = pattern {
                         let mut names = vec![pattern];
                         let scope = binding_scope(node);
                         while let Some(name) = names.pop() {
@@ -354,7 +434,6 @@ impl KernelResolver {
                                 names.extend(super::iteration::named_children(name));
                             }
                         }
-                    }
                 }
                 queue.extend(super::iteration::named_children(node));
             }
@@ -366,25 +445,23 @@ impl KernelResolver {
                 },
             );
         }
-        let Some(line) = source.get((r.line - 1).max(0) as usize) else {
-            return false;
-        };
+        let line = source.get((r.line - 1).max(0) as usize)?;
         let point = Point::new(
             (r.line - 1).max(0) as usize,
             super::names::js_unit_to_byte(line, r.column.max(0) as usize),
         );
-        self.upstream_js_bindings
-            .get(&key)
-            .and_then(|index| index.by_name.get(&r.reference_name))
-            .is_some_and(|facts| {
-                facts.iter().any(|fact| {
-                    caller.is_none_or(|f| {
-                        fact.start.row >= (f.start_line - 1).max(0) as usize
-                            && fact.end.row < f.end_line.max(0) as usize
-                    }) && visible(fact.scope, point)
-                })
-            })
+        Some((key, point))
     }
+
+    pub(super) fn js_root_binding_scope(&mut self, r: &ResolveRefIn, name: &str) -> Option<(Point, Point)> {
+        let parameter = self.js_parameter_scope(r, name);
+        let (key, point) = self.js_binding_index(r)?;
+        self.upstream_js_bindings.get(&key).and_then(|index| index.by_name.get(name))
+            .into_iter().flatten().filter_map(|fact| fact.scope)
+            .filter(|scope| visible(Some(*scope), point)).chain(parameter)
+            .max_by_key(|(start, _)| *start)
+    }
+
 }
 
 fn destructured_binding_property(
@@ -393,6 +470,10 @@ fn destructured_binding_property(
     text: &str,
 ) -> Option<Option<String>> {
     match pattern.kind() {
+        "required_parameter" | "optional_parameter" => {
+            destructured_binding_property(pattern.child_by_field_name("pattern")
+                .or_else(|| pattern.child_by_field_name("name"))?, name, text)
+        }
         "shorthand_property_identifier_pattern"
             if &text[pattern.start_byte()..pattern.end_byte()] == name =>
         {
@@ -415,7 +496,7 @@ fn destructured_binding_property(
             destructured_binding_property(pattern.child_by_field_name("left")?, name, text)
                 .map(|_| None)
         }
-        "object_pattern" | "array_pattern" | "rest_pattern" => {
+        "object_pattern" | "array_pattern" | "rest_pattern" | "formal_parameters" => {
             super::iteration::named_children(pattern)
                 .into_iter()
                 .find_map(|child| {
diff --git a/codegraph-kernel/src/resolve/lang_scope.rs b/codegraph-kernel/src/resolve/lang_scope.rs
index b9985c5664..55d38500ef 100644
--- a/codegraph-kernel/src/resolve/lang_scope.rs
+++ b/codegraph-kernel/src/resolve/lang_scope.rs
@@ -94,8 +94,8 @@ fn ends_with_member_dot(before: &str) -> bool {
 
 /// The Dart type declaration head: the supertypes it names, and whether it is
 /// an `extension` (whose one supertype is the type it extends).
-struct DartHead {
-    supers: Vec<String>,
+pub(super) struct DartHead {
+    pub(super) supers: Vec<String>,
     extension: bool,
 }
 
@@ -448,7 +448,7 @@ impl KernelResolver {
 
     /// dartHeadOf: a declaration's head read from source up to its body, with
     /// comments and type arguments dropped first.
-    fn dart_head_of(&mut self, decl: &KNode) -> DartHead {
+    pub(super) fn dart_head_of(&mut self, decl: &KNode) -> DartHead {
         let Some(lines) = self.read_file(&decl.file_path) else { return DartHead { supers: Vec::new(), extension: false } };
         let from = (decl.start_line - 1).max(0) as usize;
         let to = (decl.end_line.min(decl.start_line + 40).max(0) as usize).min(lines.len());
@@ -776,3 +776,156 @@ impl KernelResolver {
         }
     }
 }
+
+pub(super) fn is_dart_member_read(r: &ResolveRefIn) -> bool {
+    r.language == "dart" && r.reference_kind == "references"
+        && re!(r"^[A-Za-z_$][A-Za-z0-9_$]*\.[A-Za-z_$][A-Za-z0-9_$]*$")
+            .is_match(&r.reference_name)
+}
+
+impl KernelResolver {
+    fn dart_lineage(&mut self, type_name: &str) -> Res<Rc<HashMap<String, u32>>> {
+        if let Some(hit) = self.dart_lineage_memo.get(type_name) { return Ok(hit.clone()); }
+        let mut queue = VecDeque::from([(type_name.to_string(), 0u32)]);
+        let mut depths = HashMap::new();
+        while depths.len() < 40 {
+            let Some((name, depth)) = queue.pop_front() else { break };
+            if depths.contains_key(&name) { continue; }
+            depths.insert(name.clone(), depth);
+            for sup in self.dart_supertypes_of(&name)?.iter() {
+                queue.push_back((sup.clone(), depth + 1));
+            }
+        }
+        let depths = Rc::new(depths);
+        self.dart_lineage_memo.insert(type_name.to_string(), depths.clone());
+        Ok(depths)
+    }
+
+    fn dart_extension_owner(&mut self, member: &KNode) -> Res<Option<(Vec<String>, bool)>> {
+        if let Some(hit) = self.dart_extension_owner_memo.get(&member.id) { return Ok(hit.clone()); }
+        let found = if let Some(cut) = member.qualified_name.rfind("::") {
+            let qn = &member.qualified_name[..cut];
+            let owner = self.nodes_in_file(&member.file_path)?.iter().find(|n|
+                n.qualified_name == qn && n.kind == "class"
+                && n.start_line <= member.start_line && n.end_line >= member.start_line
+            ).cloned();
+            if let Some(owner) = owner {
+                let head = self.dart_head_of(&owner);
+                if head.extension {
+                    // An unnamed extension is `extension on T`; a named one is
+                    // `extension Name<T> on T`. Extension types are excluded by dart_head_of.
+                    let named = self.read_file(&owner.file_path).is_some_and(|lines| {
+                        let from = (owner.start_line - 1).max(0) as usize;
+                        let to = (owner.start_line + 5).max(0) as usize;
+                        let text = lines.iter().skip(from).take(to.saturating_sub(from)).cloned().collect::<Vec<_>>().join("\n");
+                        let text = re!(r"/\*(?s:.)*?\*/|//[^\n]*").replace_all(&text, " ");
+                        re!(r"(?-u:\b)extension\s+([A-Za-z_$][A-Za-z0-9_$]*)")
+                            .captures(&text).is_some_and(|m| &m[1] != "on" && &m[1] != "type")
+                    });
+                    Some((head.supers, named))
+                } else { None }
+            } else { None }
+        } else { None };
+        self.dart_extension_owner_memo.insert(member.id.clone(), found.clone());
+        Ok(found)
+    }
+
+    fn is_dart_getter(&mut self, n: &KNode) -> bool {
+        if n.language != "dart" || n.kind != "method" { return false; }
+        if let Some(hit) = self.dart_getter_memo.get(&n.id) { return *hit; }
+        let getter = self.read_file(&n.file_path).is_some_and(|lines| {
+            let first = lines.get((n.start_line - 1).max(0) as usize).map(String::as_str).unwrap_or("");
+            let next = lines.get(n.start_line.max(0) as usize).map(String::as_str).unwrap_or("");
+            let head = format!("{} {}", super::names::js_slice(first, n.start_column.max(0) as usize), next);
+            Self::cached_regex(&format!(r"^[^={{;]*?(?-u:\b)get\s+{}(?:$|[^A-Za-z0-9_$])", regex::escape(&n.name)))
+                .ok().is_some_and(|pattern| pattern.is_match(&head))
+        });
+        self.dart_getter_memo.insert(n.id.clone(), getter);
+        getter
+    }
+
+    /// Returns the member and whether an extension supplies it.
+    pub(super) fn dart_member_of(&mut self, type_name: &str, name: &str,
+        r: &ResolveRefIn, getters_only: bool) -> Res<Option<(Arc<KNode>, bool)>> {
+        let lineage = self.dart_lineage(type_name)?;
+        let candidates: Vec<_> = self.nodes_by_name(name)?.iter().cloned().collect();
+        let mut best: Option<(Arc<KNode>, u32)> = None;
+        for n in candidates {
+            if n.language != "dart" || !is_dart_member(&n)
+                || (getters_only && !self.is_dart_getter(&n)) { continue; }
+            let rank = if let Some((on, named)) = self.dart_extension_owner(&n)? {
+                if !named && n.file_path != r.file_path { continue; }
+                let Some(depth) = on.iter().filter_map(|t| lineage.get(t)).min() else { continue };
+                DART_EXTENSION_RANK + *depth
+            } else {
+                let owner = n.qualified_name.rsplit_once("::").map(|(o, _)| o.rsplit("::").next().unwrap_or(o)).unwrap_or("");
+                let Some(depth) = lineage.get(owner) else { continue };
+                *depth
+            };
+            let replace = best.as_ref().is_none_or(|(old, old_rank)| {
+                rank < *old_rank || (rank == *old_rank && (
+                    (n.file_path == r.file_path && old.file_path != r.file_path)
+                    || (old.file_path != r.file_path && n.file_path != r.file_path
+                        && super::names::compute_path_proximity(&r.file_path, &n.file_path)
+                            > super::names::compute_path_proximity(&r.file_path, &old.file_path))
+                ))
+            });
+            if replace { best = Some((n, rank)); }
+        }
+        if getters_only {
+            if let Some(depth) = self.dart_field_depth(type_name, name, r)? {
+                if best.as_ref().is_some_and(|(_, rank)| depth <= *rank) { return Ok(None); }
+            }
+        }
+        Ok(best.map(|(n, rank)| (n, rank >= DART_EXTENSION_RANK)))
+    }
+
+    /// Dart fields have no graph nodes. Reuse the source-backed member scan.
+    pub(super) fn infer_dart_field_receiver_type(&mut self, receiver: &str, r: &ResolveRefIn) -> Res<Option<String>> {
+        if r.language != "dart" || !re!(r"^[A-Za-z_$][A-Za-z0-9_$]*$").is_match(receiver) { return Ok(None); }
+        let nodes = self.nodes_in_file(&r.file_path)?;
+        let cls = nodes.iter().filter(|n| n.language == "dart" && is_dart_type_kind(&n.kind)
+            && n.start_line <= r.line && n.end_line >= r.line).max_by_key(|n| n.start_line).cloned();
+        let Some(cls) = cls else { return Ok(None) };
+        // An untyped local/parameter must not revive an enclosing field.
+        if let Some(f) = nodes.iter().filter(|n| n.language == "dart" && matches!(n.kind.as_str(), "method" | "function")
+            && n.start_line <= r.line && n.end_line >= r.line).max_by_key(|n| n.start_line) {
+            if let Some(lines) = self.read_file(&f.file_path) {
+                let body = lines.iter().skip((f.start_line - 1).max(0) as usize)
+                    .take((r.line - f.start_line + 1).max(0) as usize).cloned().collect::<Vec<_>>().join("\n");
+                let pattern = Self::cached_regex(&format!(r"(?-u:\b)(?:var|final|dynamic)\s+{}(?:$|[^A-Za-z0-9_$])", regex::escape(receiver)))?;
+                if pattern.is_match(&body) { return Ok(None); }
+            }
+        }
+        let mut queue = VecDeque::from([cls]);
+        let mut seen = HashSet::new();
+        while seen.len() < 8 {
+            let Some(decl) = queue.pop_front() else { break };
+            if !seen.insert(decl.id.clone()) { continue; }
+            if let Some(ty) = self.declared_member_type(&decl, receiver)? { return Ok(Some(ty)); }
+            for sup in self.dart_head_of(&decl).supers {
+                queue.extend(self.nodes_by_name(&sup)?.iter().filter(|n| n.language == "dart" && is_dart_type_kind(&n.kind)).cloned());
+            }
+        }
+        Ok(None)
+    }
+
+    pub(super) fn match_dart_member_read(&mut self, r: &ResolveRefIn) -> Res<Option<KCand>> {
+        let Some((receiver, member)) = r.reference_name.split_once('.') else { return Ok(None) };
+        let candidates: Vec<_> = self.nodes_by_name(member)?.iter().cloned().collect();
+        if !candidates.iter().any(|n| self.is_dart_getter(n)) { return Ok(None); }
+        let names = self.nodes_by_name(receiver)?;
+        let project_type = receiver.starts_with(|c: char| c.is_ascii_uppercase())
+            && names.iter().any(|n| n.language == "dart" && is_dart_type_kind(&n.kind));
+        let ty = if project_type { Some(receiver.to_string()) } else {
+            match self.infer_local_receiver_type(receiver, r, false)? {
+                Some(ty) => Some(ty),
+                None => self.infer_dart_field_receiver_type(receiver, r)?,
+            }
+        };
+        let Some(ty) = ty else { return Ok(None) };
+        Ok(self.dart_member_of(&ty, member, r, true)?.map(|(node, _)| KCand {
+            node, confidence: 0.9, resolved_by: "instance-method",
+        }))
+    }
+}
diff --git a/codegraph-kernel/src/resolve/language_type_scope.rs b/codegraph-kernel/src/resolve/language_type_scope.rs
index 7fb1e669cd..df7a17f770 100644
--- a/codegraph-kernel/src/resolve/language_type_scope.rs
+++ b/codegraph-kernel/src/resolve/language_type_scope.rs
@@ -410,7 +410,7 @@ impl KernelResolver {
         }))
     }
 
-    fn csharp_namespaces_at(&mut self, r: &ResolveRefIn) -> Option<Vec<String>> {
+    pub(super) fn csharp_namespaces_at(&mut self, r: &ResolveRefIn) -> Option<Vec<String>> {
         let source = self.read_file(&r.file_path)?;
         let tree = self.parsed_tree(&source, r)?;
         let mut node = super::iteration::descendant_for_position(
diff --git a/codegraph-kernel/src/resolve/member_fn_ref.rs b/codegraph-kernel/src/resolve/member_fn_ref.rs
index 7b7377aef1..9ed8018e95 100644
--- a/codegraph-kernel/src/resolve/member_fn_ref.rs
+++ b/codegraph-kernel/src/resolve/member_fn_ref.rs
@@ -49,28 +49,21 @@ impl KernelResolver {
             let typed = if receiver.contains('.') {
                 Some(self.match_go_field_chain_call(receiver, member, r)?)
             } else if let Some(raw) = self.infer_local_receiver_type(receiver, r, true)? {
-                let raw = raw.trim_start_matches(['*', '&']);
-                if raw.contains('.') {
-                    // `pkg.Type` names that package's type, which only its
-                    // import can place; an external package has none here.
-                    Some(self.match_bound_type_member(raw, member, r)?)
-                } else if let Some(ty) = self.normalize_inferred_type_name(raw)? {
-                    Some(self.resolve_method_on_type(&ty, member, r, 0.9, "function-ref", None)?)
-                } else {
-                    Some(None)
-                }
+                Some(self.go_method_on_declared_type(&raw, &r.file_path, member, r)?)
             } else {
-                let types = self
-                    .nodes_by_name(receiver)?
-                    .iter()
-                    .filter(|n| n.language == "go" && (n.kind == "struct" || n.kind == "interface"))
+                let dir = pos_dirname(&r.file_path);
+                let types = self.nodes_by_name(receiver)?.iter()
+                    .filter(|n| n.language == "go"
+                        && matches!(n.kind.as_str(), "struct" | "interface" | "type_alias")
+                        && !n.qualified_name.contains("::") && pos_dirname(&n.file_path) == dir)
                     .count();
                 match types {
                     0 => None,
-                    1 => Some(self.resolve_method_on_type(receiver, member, r, 0.9, "function-ref", None)?),
+                    1 => Some(self.go_method_in_package(receiver, member, dir, r)?),
                     _ => Some(None),
                 }
             };
+
             // No name-only fallback for Go: struct fields aren't nodes, so a
             // field read (`c.Errors`) would match any same-named method.
             return match typed {
@@ -178,7 +171,7 @@ impl KernelResolver {
 
     /// Is `name` bound at `r` by something other than its import (a
     /// parameter, a local)? Files without binding rows keep the import.
-    fn is_shadowed_import(&mut self, name: &str, r: &ResolveRefIn) -> Res<bool> {
+    pub(super) fn is_shadowed_import(&mut self, name: &str, r: &ResolveRefIn) -> Res<bool> {
         let rows = self.bindings(&r.file_path)?;
         Ok(innermost_binding(&rows, name, Some(r.line)).is_some_and(|b| b.kind != "import"))
     }
diff --git a/codegraph-kernel/src/resolve/member_scope.rs b/codegraph-kernel/src/resolve/member_scope.rs
index d26a374788..e3e8caf569 100644
--- a/codegraph-kernel/src/resolve/member_scope.rs
+++ b/codegraph-kernel/src/resolve/member_scope.rs
@@ -84,13 +84,15 @@ pub(super) struct MemberSite {
     vb_receiver: Option<String>,
     /// VB.NET: the receiver is a service locator's `(Of T)` type argument.
     vb_type_arg: bool,
+    vb_scoped: bool,
+    vb_unqualified: bool,
     csharp_bare: bool,
     objc_shape: Option<ObjcShape>,
 }
 
 impl MemberSite {
     pub(super) fn is_judged(&self) -> bool {
-        self.vb_receiver.is_some() || self.csharp_bare || self.objc_shape.is_some()
+        self.vb_receiver.is_some() || self.vb_scoped || self.vb_unqualified || self.csharp_bare || self.objc_shape.is_some()
     }
 }
 
@@ -113,7 +115,9 @@ impl KernelResolver {
             && re!(r"^[A-Za-z_][A-Za-z0-9_]*:*(?:[A-Za-z0-9_]+:)*$").is_match(&r.reference_name))
         .then(|| self.objc_call_shape(r))
         .flatten();
-        MemberSite { vb_receiver, vb_type_arg, csharp_bare, objc_shape }
+        let vb_unqualified = r.language == "vbnet" && word && vb_receiver.is_none() && matches!(r.reference_kind.as_str(), "calls" | "instantiates");
+        let vb_scoped = r.language == "vbnet" && r.reference_kind == "calls" && word && (vb_receiver.is_none() || vb_receiver.as_ref().is_some_and(|v| re!(r"(?i)^(Me|MyClass|MyBase)$").is_match(v)));
+        MemberSite { vb_receiver, vb_type_arg, vb_scoped, vb_unqualified, csharp_bare, objc_shape }
     }
 
     /// Whether the member rules let `n` stand for the name at `site`.
@@ -123,6 +127,11 @@ impl KernelResolver {
                 return Ok(false);
             }
         }
+        if let Some(receiver) = &site.vb_receiver {
+            if !self.vb_qualified_by(n, receiver, r) { return Ok(false); }
+        }
+        if site.vb_scoped && !self.vb_member_in_scope(n, r)? { return Ok(false); }
+        if site.vb_unqualified && !self.vb_nested_in_scope(n, r)? { return Ok(false); }
         if site.csharp_bare && !self.is_csharp_member_in_scope(n, r)? {
             return Ok(false);
         }
@@ -191,7 +200,7 @@ impl KernelResolver {
         let start = if names::js_slice(&lower, column).starts_with(&name) {
             Some(names::js_unit_to_byte(&lower, column))
         } else {
-            word_occurrences(&lower, &name, false).next()
+            word_occurrences(&lower, &name, false).find(|at| *at >= names::js_unit_to_byte(&lower, column))
         }?;
         let before = &line[..start];
         let dot = re!(r"([A-Za-z0-9_.()]*?)\s*\.\s*$").captures(before)?;
diff --git a/codegraph-kernel/src/resolve/method_call.rs b/codegraph-kernel/src/resolve/method_call.rs
index f061bca34e..aa958d02d8 100644
--- a/codegraph-kernel/src/resolve/method_call.rs
+++ b/codegraph-kernel/src/resolve/method_call.rs
@@ -716,6 +716,9 @@ impl KernelResolver {
                 probe!(r, "mc:infer-local", self.infer_local_receiver_type(&object_or_class, &site, true)?)
             };
             if inferred.is_none() { if let Some(verdict)=self.python_fixture_member(&object_or_class,&method_name,r)? { return Ok(verdict); } }
+if inferred.is_none() && r.language == "dart" {
+    inferred = self.infer_dart_field_receiver_type(&object_or_class, r)?;
+}
             if inferred.is_none() { inferred = self.infer_declared_member_receiver_type(&object_or_class, r)?; }
             if inferred.is_none() && r.language == "go" {
                 if let Some(c) = self.match_go_factory_receiver(&object_or_class, &method_name, r)? {
@@ -777,40 +780,11 @@ impl KernelResolver {
         }
 
         // mc-literal — OBJECT_LITERAL_LANGUAGES is the ESM set.
-        if dotted
-            && !object_or_class.contains('.')
-            && is_object_literal_language(&r.language)
-        {
-            let holders: Vec<Arc<KNode>> = prefer_call_site_file(
-                self.nodes_by_name(&object_or_class)?
-                    .iter()
-                    .filter(|n| {
-                        matches!(n.kind.as_str(), "constant" | "variable")
-                            && n.file_path == r.file_path
-                    })
-                    .cloned()
-                    .collect(),
-                &r.file_path,
-            );
-            for holder in holders {
-                // `binding?.nodeId !== holder.id` — an absent binding or
-                // node_id skips every holder, exactly like TS.
-                let bound_id = binding.as_ref().and_then(|b| b.node_id.as_deref());
-                if bound_id != Some(holder.id.as_str()) {
-                    continue;
-                }
-                if let Some(hit) = self.resolve_object_literal_member(
-                    &holder,
-                    &method_name,
-                    r,
-                    0.85,
-                    "instance-method",
-                )? {
-                    return Ok(Some(hit));
-                }
-                if let Some(hit) = self.resolve_object_literal_binding(&holder, &method_name, r)? {
-                    return Ok(Some(hit));
-                }
+        if dotted && !object_or_class.contains('.') && is_object_literal_language(&r.language) {
+            match self.resolve_object_path_member(&object_or_class,&method_name,r,None)? {
+                js_objects_upstream::ObjectPathMatch::Found(hit) => return Ok(Some(hit)),
+                js_objects_upstream::ObjectPathMatch::Refused => return Ok(None),
+                js_objects_upstream::ObjectPathMatch::NoHolder => {}
             }
         }
 
@@ -866,7 +840,7 @@ impl KernelResolver {
             let inferred = if r.language == "cpp" {
                 self.infer_cpp_receiver_type(&object_or_class, r, 0, false)?
             } else {
-                self.infer_local_receiver_type(&object_or_class, r, false)?
+                self.infer_local_receiver_type(&object_or_class, r, r.language == "go")?
             };
             // guarded/gofactory/iteration are evidence-gated in TS and
             // never run here; mc-await still does.
@@ -874,6 +848,9 @@ impl KernelResolver {
                 self.infer_declared_member_receiver_type(&format!("this.{object_or_class}"), r)?
             } else { inferred };
             if inferred.is_none() { if let Some(verdict)=self.python_fixture_member(&object_or_class,&method_name,r)? { return Ok(verdict); } }
+if inferred.is_none() && r.language == "dart" {
+    inferred = self.infer_dart_field_receiver_type(&object_or_class, r)?;
+}
             if inferred.is_none() { inferred = self.infer_declared_member_receiver_type(&object_or_class, r)?; }
             let mut awaited_file: Option<String> = None;
             if inferred.is_none() && is_esm_family(&r.language) {
@@ -1011,34 +988,11 @@ impl KernelResolver {
         // Object-literal namespace receiver — same-file const/variable
         // holders; under requireReceiverEvidence=false there is no binding
         // filter — every holder gets its object-literal member scan.
-        if dotted
-            && !object_or_class.contains('.')
-            && is_object_literal_language(&r.language)
-        {
-            let holders = prefer_call_site_file(
-                self.nodes_by_name(&object_or_class)?
-                    .iter()
-                    .filter(|n| {
-                        matches!(n.kind.as_str(), "constant" | "variable")
-                            && n.file_path == r.file_path
-                    })
-                    .cloned()
-                    .collect(),
-                &r.file_path,
-            );
-            for holder in &holders {
-                if let Some(hit) = self.resolve_object_literal_member(
-                    holder,
-                    &method_name,
-                    r,
-                    0.85,
-                    "instance-method",
-                )? {
-                    return Ok(Some(hit));
-                }
-                if let Some(hit) = self.resolve_object_literal_binding(holder, &method_name, r)? {
-                    return Ok(Some(hit));
-                }
+        if dotted && !object_or_class.contains('.') && is_object_literal_language(&r.language) {
+            match self.resolve_object_path_member(&object_or_class,&method_name,r,None)? {
+                js_objects_upstream::ObjectPathMatch::Found(hit) => return Ok(Some(hit)),
+                js_objects_upstream::ObjectPathMatch::Refused => return Ok(None),
+                js_objects_upstream::ObjectPathMatch::NoHolder => {}
             }
         }
 
@@ -1210,6 +1164,7 @@ impl KernelResolver {
                 let ordered = prefer_call_site_file(target.clone(), &r.file_path);
                 let mut best: Option<Arc<KNode>> = None;
                 let mut best_score = 0i64;
+                let mut tied = Vec::new();
                 for m in &ordered {
                     let owner = m.qualified_name.rsplit_once("::").map(|(p, _)| p.rsplit([':', '.']).next().unwrap_or("")).unwrap_or("");
                     let class_words = split_camel_case(owner);
@@ -1230,8 +1185,11 @@ impl KernelResolver {
                     if score > best_score {
                         best_score = score;
                         best = Some(m.clone());
-                    }
+                        tied.clear();
+                        tied.push(m.clone());
+                    } else if score == best_score { tied.push(m.clone()); }
                 }
+                if r.language == "vbnet" && best_score >= 2 && tied.len() > 1 { best = self.vb_break_tie(tied, r); }
                 if let Some(bm) = best {
                     if best_score >= 2 && (bm.id != r.from_node_id || self.same_owner_receiver_proven(&bm,r)) {
                         return Ok(Some(KCand {
@@ -1349,6 +1307,7 @@ impl KernelResolver {
         resolved_by: &'static str,
     ) -> Res<Option<KCand>> {
         let candidates = prefer_call_site_file(self.nodes_by_name(class_name)?.iter().cloned().collect(), &r.file_path);
+        let candidates = if r.language == "vbnet" { self.vb_prefer(candidates, r) } else { candidates };
         let type_ref=r.clone().naming(class_name,"references");
         let mut visible=Vec::new();for c in candidates {if self.language_type_visible(&c,&type_ref)? {visible.push(c);}}
         let candidates=visible;
diff --git a/codegraph-kernel/src/resolve/mod.rs b/codegraph-kernel/src/resolve/mod.rs
index a836f2e21f..34501f19cb 100644
--- a/codegraph-kernel/src/resolve/mod.rs
+++ b/codegraph-kernel/src/resolve/mod.rs
@@ -105,6 +105,12 @@ pub struct KernelWorkspaceIn {
     pub local_link_names: Option<Vec<String>>,
 }
 
+#[napi(object)]
+pub struct KernelGoModule {
+    pub module_path: String,
+    pub dir: String,
+}
+
 #[napi(object)]
 pub struct KernelResolverConfig {
     pub db_path: String,
@@ -113,7 +119,7 @@ pub struct KernelResolverConfig {
     /// Deepest `dir` first, as path-aliases.ts orders them.
     pub scoped_aliases: Option<Vec<KernelScopedAliasIn>>,
     pub workspaces: Option<KernelWorkspaceIn>,
-    pub go_module_path: Option<String>,
+    pub go_modules: Option<Vec<KernelGoModule>>,
     /// Already-resolved compile_commands include dirs (may be empty →
     /// the kernel applies the same hardcoded fallback as the TS path).
     pub cpp_include_dirs: Option<Vec<String>>,
@@ -200,6 +206,8 @@ pub struct KernelCandidateOut {
 #[napi(object)]
 pub struct ResolveOutcome {
     pub status: String,
+    pub edge_kind: Option<String>,
+    pub also_target_node_ids: Option<Vec<String>>,
     pub target_node_id: Option<String>,
     pub confidence: Option<f64>,
     pub resolved_by: Option<String>,
@@ -217,6 +225,8 @@ impl ResolveOutcome {
     fn unresolved() -> Self {
         ResolveOutcome {
             status: "unresolved".into(),
+            edge_kind: None,
+            also_target_node_ids: None,
             target_node_id: None,
             confidence: None,
             resolved_by: None,
@@ -265,6 +275,8 @@ impl ResolveOutcome {
     fn resolved(target: &KNode, confidence: f64, by: &str, is_final: bool, cands: Option<Vec<KernelCandidateOut>>) -> Self {
         ResolveOutcome {
             status: "resolved".into(),
+            edge_kind: None,
+            also_target_node_ids: None,
             target_node_id: Some(target.id.clone()),
             confidence: Some(confidence),
             resolved_by: Some(by.to_string()),
@@ -511,14 +523,18 @@ mod name_scope;
 mod language_type_scope;
 mod resolver_upstream;
 mod js_scope_upstream;
+mod js_objects_upstream;
+mod js_object_facts_upstream;
 mod overloads_upstream;
 mod scala_type_scope;
 mod swift_type_scope;
 mod kotlin_type_scope;
 mod php_scope;
 mod lang_scope;
+mod dart_fields;
 mod lua_alias;
 mod member_scope;
+mod vbnet;
 mod receivers;
 mod bound;
 mod fields;
@@ -566,7 +582,7 @@ pub struct KernelResolver {
     aliases: Option<KernelAliasMapIn>,
     scoped_aliases: Vec<KernelScopedAliasIn>,
     workspaces: Option<WorkspaceK>,
-    go_module_path: Option<String>,
+    go_modules: Vec<KernelGoModule>,
     cpp_include_dirs: Vec<String>,
     node_builtins: HashSet<String>,
     frameworks_active: bool,
@@ -602,7 +618,13 @@ pub struct KernelResolver {
     /// phpSupertypeQns, by declaration id.
     php_supers_memo: HashMap<String, Rc<Vec<String>>>,
     /// dartSupertypesOf, by type name.
+    vb: vbnet::VbMemo,
+    js_objects: js_objects_upstream::JsObjects,
     dart_supers_memo: HashMap<String, Rc<Vec<String>>>,
+    dart_lineage_memo: HashMap<String, Rc<HashMap<String, u32>>>,
+    dart_getter_memo: HashMap<String, bool>,
+    dart_fields_memo: HashMap<String, (Rc<SourceFile>, HashSet<String>)>,
+    dart_extension_owner_memo: HashMap<String, Option<(Vec<String>, bool)>>,
     /// dartHierarchyAt, by call site (file, line).
     dart_hierarchy_memo: HashMap<(String, i64), Rc<HashMap<String, u32>>>,
     /// Kotlin supertypes named in a type's head, by type name.
@@ -781,7 +803,7 @@ impl KernelResolver {
             aliases: config.aliases,
             scoped_aliases: config.scoped_aliases.unwrap_or_default(),
             workspaces,
-            go_module_path: config.go_module_path,
+            go_modules: config.go_modules.unwrap_or_default(),
             cpp_include_dirs,
             node_builtins: config.node_builtin_specifiers.into_iter().collect(),
             frameworks_active: config.frameworks_active,
@@ -802,7 +824,13 @@ impl KernelResolver {
             rust_trait_memo: HashMap::new(),
             java_supers_memo: HashMap::new(),
             php_supers_memo: HashMap::new(),
+            vb: vbnet::VbMemo::default(),
+            js_objects: Default::default(),
             dart_supers_memo: HashMap::new(),
+            dart_lineage_memo: HashMap::new(),
+            dart_getter_memo: HashMap::new(),
+            dart_fields_memo: HashMap::new(),
+            dart_extension_owner_memo: HashMap::new(),
             dart_hierarchy_memo: HashMap::new(),
             declared_member_memo: HashMap::new(),
             declared_member_lines: HashMap::new(),
@@ -877,6 +905,8 @@ impl KernelResolver {
         self.file_cache.clear();
         self.tree_cache.clear();
         self.bindings_cache.clear();
+        self.js_objects.clear();
+        self.vb = Default::default();
     }
 
     /// Give the conn up: a live-db conn is parked for reuse, never closed —
@@ -1248,7 +1278,7 @@ mod tests {
              start_line INTEGER NOT NULL, end_line INTEGER NOT NULL, start_column INTEGER NOT NULL, \
              end_column INTEGER NOT NULL, signature TEXT, visibility TEXT, \
              is_exported INTEGER NOT NULL DEFAULT 0, return_type TEXT, type_parameters TEXT, decorators TEXT, \
-             is_async INTEGER NOT NULL DEFAULT 0); \
+             is_async INTEGER NOT NULL DEFAULT 0, is_static INTEGER NOT NULL DEFAULT 0); \
              CREATE INDEX idx_nodes_name ON nodes(name); \
              CREATE INDEX idx_nodes_qualified_name ON nodes(qualified_name); \
              CREATE INDEX idx_nodes_file_path ON nodes(file_path); \
@@ -1388,6 +1418,7 @@ mod tests {
                 r"(?-u:\b)R\s+\*?([a-z_][A-Za-z0-9_]*\.[A-Z][A-Za-z0-9_]*)(?:\s*[,)]|\s*$)",
                 r"(?-u:\b)R(?-u:\b)\s*:=\s*&?([A-Za-z_][A-Za-z0-9_.]*)\s*\{",
                 r"(?-u:\b)var\s+R\s+\*?([A-Za-z_][A-Za-z0-9_.]*)",
+                r"(?:^|[(,])\s*R\s+\*?([a-z_][A-Za-z0-9_]*)\s*(?:\[[^\]]*\])?\s*(?:[,)]|$)",
                 r"(?-u:\b)R\s+\*?([A-Z][A-Za-z0-9_.]*)",
             ]),
             ("php", &[
diff --git a/codegraph-kernel/src/resolve/name_scope.rs b/codegraph-kernel/src/resolve/name_scope.rs
index 624a104891..8e7f1738df 100644
--- a/codegraph-kernel/src/resolve/name_scope.rs
+++ b/codegraph-kernel/src/resolve/name_scope.rs
@@ -187,7 +187,7 @@ fn rust_glob_covers(uses: &RustScopeUses, candidate: &KNode, r: &ResolveRefIn) -
 /// A property, a method (a constructor is one), an enum case or a field
 /// shares a type's name, not its meaning.
 pub(super) fn can_name_in_type_position(n: &KNode) -> bool {
-    !matches!(n.kind.as_str(), "property" | "method" | "enum_member" | "field")
+    !matches!(n.kind.as_str(), "property" | "method" | "enum_member" | "field" | "constant")
 }
 
 /// A bare Rust reference name — the ones the scope filter applies to.
@@ -252,6 +252,21 @@ impl KernelResolver {
     /// the prelude's unless the file defines it or imports a project item of
     /// that name.
     pub(super) fn is_rust_name_in_scope(&mut self, candidate: &KNode, r: &ResolveRefIn) -> bool {
+        if r.language == "rust" && r.reference_kind == "references" {
+            if let Some(lines) = self.read_file(&r.file_path) {
+                if let Some(line) = lines.get((r.line - 1).max(0) as usize) {
+                    let at = js_slice(line, r.column.max(0) as usize);
+                    let via_self = r.reference_name != "Self" && re!(r"^Self\s*::").is_match(at);
+                    let named = at.strip_prefix(&r.reference_name).is_some_and(|tail| !tail.starts_with(|c: char| c.is_ascii_alphanumeric() || c == '_'));
+                    if via_self || named {
+                        if let Some(hit) = re!(r"^\w+\s*::\s*([A-Z]\w*)").captures(at) {
+                            let variant = hit[1].to_string();
+                            if !self.declares_rust_variant(candidate, &variant) { return false; }
+                        }
+                    }
+                }
+            }
+        }
         if let Some(visible) = self.rust_upstream_name_visible(candidate, r) { return visible; }
         let name = r.reference_name.as_str();
         // Bare in the SOURCE: the index keeps `crate::error::Result` by its
@@ -561,3 +576,11 @@ mod tests {
         assert_eq!(rust_module_name("lib.rs"), "lib");
     }
 }
+
+impl KernelResolver {
+    fn declares_rust_variant(&self, n: &KNode, variant: &str) -> bool {
+        if n.kind != "enum" { return false; }
+        let qualified = format!("{}::{}", n.qualified_name, variant);
+        self.nodes_in_file(&n.file_path).is_ok_and(|nodes| nodes.iter().any(|m| m.kind == "enum_member" && m.qualified_name == qualified))
+    }
+}
diff --git a/codegraph-kernel/src/resolve/names.rs b/codegraph-kernel/src/resolve/names.rs
index 99b79a3605..5c1eed26d4 100644
--- a/codegraph-kernel/src/resolve/names.rs
+++ b/codegraph-kernel/src/resolve/names.rs
@@ -93,6 +93,12 @@ impl KernelResolver {
     /// (`case class B()` in a test method), or a method of such a type —
     /// declared inside a function is reachable only from inside it.
     pub(super) fn is_lexically_reachable(&mut self, candidate: &KNode, r: &ResolveRefIn) -> Res<bool> {
+        let bare = re!(r"^[A-Za-z_$][\w$]*$").is_match(&r.reference_name);
+        if candidate.kind == "function" && bare && !self.object_member_reachable_by_name(candidate,r)? { return Ok(false); }
+        if bare && js_objects_upstream::path_holder(candidate) && js_objects_upstream::literal_owner(candidate) {
+            let last = js_objects_upstream::last_segment(candidate);
+            if !last.starts_with("window.") && !last.starts_with("globalThis.") { return Ok(false); }
+        }
         if self.js_declaration_reachable(candidate, r) == Some(false) { return Ok(false); }
         if matches!(candidate.kind.as_str(), "variable" | "constant") || (candidate.kind == "field" && candidate.language == "scala") {
             if !self.scala_block_reachable(candidate, r) { return Ok(false); }
@@ -270,7 +276,16 @@ impl KernelResolver {
 
     /// isVisibleAcrossFiles (name-matcher.ts).
     pub(super) fn is_visible_across_files(&mut self, candidate: &KNode, r: &ResolveRefIn) -> Res<bool> {
-        if candidate.language == "go" && self.go_external_qualified(r)? { return Ok(false); }
+        if candidate.language == "go" {
+            if self.go_external_qualified(r)? { return Ok(false); }
+            if let Some(imp) = self.go_ref_qualifier(r)? {
+                if let Some(dir) = self.go_package_dir(&imp.source, &r.file_path) {
+                    if candidate.kind == "method" || candidate.qualified_name.contains("::")
+                        || pos_dirname(&candidate.file_path) != dir { return Ok(false); }
+                }
+            }
+        }
+
         if !self.language_type_visible(candidate,r)? { return Ok(false); }
         if candidate.file_path == r.file_path {
             return Ok(true);
@@ -534,7 +549,7 @@ impl KernelResolver {
     }
 
     /// findBestMatch (name-matcher.ts) — strict `>` first-max scoring.
-    pub(super) fn find_best_match(&self, r: &ResolveRefIn, candidates: &[Arc<KNode>]) -> Option<Arc<KNode>> {
+    pub(super) fn find_best_match(&mut self, r: &ResolveRefIn, candidates: &[Arc<KNode>]) -> Option<Arc<KNode>> {
         let mut best_score = -1f64;
         let mut best: Option<Arc<KNode>> = None;
         let mut ref_dirs: Vec<String> =
@@ -549,6 +564,7 @@ impl KernelResolver {
             if candidate.file_path == r.file_path {
                 score += 100.0;
             }
+            if r.language == "vbnet" && self.vb_same_project(&candidate.file_path, &r.file_path) { score += 80.0; }
             score += path_proximity_from_dirs(&ref_dirs, &candidate.file_path) as f64;
             if candidate.language == r.language {
                 score += 50.0;
@@ -1067,6 +1083,7 @@ impl KernelResolver {
             && super::lua_alias::is_global(&r.reference_name)
             && !self.nodes_in_file(&r.file_path)?.iter().any(|n| n.name == r.reference_name && n.kind == "function") { return Ok(None); }
         if let Some(alias) = self.csharp_alias_type_target(r)? { return Ok(Some(alias)); }
+        if let Some(c) = self.match_collapsed_object_call(r)? { return Ok(Some(c)); }
         if let Some(c) = self.match_by_exact_name(r)? {
             return Ok(Some(c));
         }
@@ -1188,7 +1205,26 @@ impl KernelResolver {
                 .collect()
         };
 
-        let candidates = keep_for_ref(&self.nodes_by_qualified_name(&r.reference_name)?);
+        let candidates = if r.language == "csharp" && r.reference_kind == "instantiates" {
+            // Relative qualification searches enclosing namespaces before the global namespace.
+            let absolute = r.reference_name.strip_prefix("global::");
+            let spelling = absolute.unwrap_or(&r.reference_name);
+            let leaf = spelling.rsplit([':', '.']).next().unwrap_or("");
+            let nodes = self.nodes_by_name(leaf)?;
+            let mut namespace = if absolute.is_some() { String::new() }
+                else { self.csharp_namespaces_at(r).unwrap_or_default().join(".") };
+            let mut found = Vec::new();
+            loop {
+                let qualified = if namespace.is_empty() { spelling.to_string() }
+                    else { format!("{namespace}.{spelling}") };
+                found.extend(nodes.iter().filter(|n| n.language == "csharp"
+                    && matches!(n.kind.as_str(), "class" | "struct" | "record")
+                    && n.qualified_name.replace("::", ".") == qualified).cloned());
+                if !found.is_empty() || namespace.is_empty() { break; }
+                namespace = namespace.rsplit_once('.').map_or("", |(parent, _)| parent).to_string();
+            }
+            found
+        } else { keep_for_ref(&self.nodes_by_qualified_name(&r.reference_name)?) };
         if candidates.len() == 1 {
             return Ok(Some(KCand {
                 node: candidates[0].clone(),
diff --git a/codegraph-kernel/src/resolve/node_table.rs b/codegraph-kernel/src/resolve/node_table.rs
index cf06198bbd..5eb8f1ce7d 100644
--- a/codegraph-kernel/src/resolve/node_table.rs
+++ b/codegraph-kernel/src/resolve/node_table.rs
@@ -29,6 +29,7 @@ pub(super) struct KNode {
     pub(super) decorators: Option<Vec<String>>,
     /// `async` function or method: its call yields a Promise.
     pub(super) is_async: bool,
+    pub(super) is_static: bool,
 }
 
 impl KNode {
@@ -55,6 +56,7 @@ impl KNode {
             type_parameters: raw_tps.as_deref().and_then(parse_json_string_array),
             decorators: raw_decs.as_deref().and_then(parse_json_string_array),
             is_async: row.get::<_, Option<i64>>(16)?.unwrap_or(0) != 0,
+            is_static: row.get::<_, Option<i64>>(17)?.unwrap_or(0) != 0,
         })
     }
 }
@@ -559,4 +561,4 @@ pub(super) struct WorkspaceK {
 pub(super) const NODE_COLS: &str = "id, kind, name, qualified_name, file_path, language, \
                          start_line, end_line, start_column, end_column, \
                          signature, visibility, is_exported, return_type, \
-                         type_parameters, decorators, is_async";
+                         type_parameters, decorators, is_async, is_static";
diff --git a/codegraph-kernel/src/resolve/overloads_upstream.rs b/codegraph-kernel/src/resolve/overloads_upstream.rs
index 134b44eac7..808e4d363f 100644
--- a/codegraph-kernel/src/resolve/overloads_upstream.rs
+++ b/codegraph-kernel/src/resolve/overloads_upstream.rs
@@ -905,7 +905,7 @@ impl KernelResolver {
     /// on, read from the call site (`this.container.classList` for
     /// `this.container.classList.toggle()`); None for a call written bare or
     /// not found.
-    fn bare_call_receiver(&mut self, r: &ResolveRefIn) -> Res<Option<(Rc<SourceFile>, String)>> {
+    pub(super) fn bare_call_receiver(&mut self, r: &ResolveRefIn) -> Res<Option<(Rc<SourceFile>, String)>> {
         if !re!(r"^[A-Za-z_$][\w$]*$").is_match(&r.reference_name) {
             return Ok(None);
         }
diff --git a/codegraph-kernel/src/resolve/pipeline.rs b/codegraph-kernel/src/resolve/pipeline.rs
index 262cfb4452..23fc4c5c69 100644
--- a/codegraph-kernel/src/resolve/pipeline.rs
+++ b/codegraph-kernel/src/resolve/pipeline.rs
@@ -243,6 +243,15 @@ impl KernelResolver {
     }
 
     pub(super) fn resolve_nonbare_ref(&mut self, r: &ResolveRefIn) -> Res<ResolveOutcome> {
+if super::lang_scope::is_dart_member_read(r) {
+    let Some(candidate) = self.match_dart_member_read(r)? else {
+        return Ok(ResolveOutcome::unresolved());
+    };
+    let mut outcome = self.finish_pre_framework(r, candidate)?;
+    // Parent adds this outcome field and its JS transport.
+    outcome.edge_kind = Some("calls".to_string());
+    return Ok(outcome);
+}
         if self.is_built_in_or_external(r) {
             return Ok(ResolveOutcome::unresolved());
         }
@@ -358,9 +367,15 @@ impl KernelResolver {
         if let Some(outcome) = self.resolve_php_imported_static(r)? {
             return Ok(outcome);
         }
+        // A classic-script object can be declared in another file without an import.
+        // Imported roots retain the binding resolver's authority.
+        if let Some(c) = self.match_object_path_call(r)? {
+            if let Some(c) = self.gate_language(Some(c), r) { return self.finish(r, c, None, true); }
+        }
         // matchBoundReceiverCall — claimed refs are terminal either way.
-        let namespace_chain = is_unresolved_js_member_call(r) && self.import_mappings(&r.file_path)?.iter()
-            .any(|m| m.is_namespace && m.local_name == r.reference_name.split('.').next().unwrap_or(""));
+        let namespace_chain = is_unresolved_js_member_call(r)
+            && self.import_mappings(&r.file_path)?.iter().any(|m| m.is_namespace
+                && m.local_name == r.reference_name.split('.').next().unwrap_or(""));
         if is_binding_receiver_call(r) && !namespace_chain && !self.is_component_receiver_out_of_scope(r)? {
             match probe!(r, "bound_receiver_claim", self.bound_receiver_claim(r)?) {
                 None => {
@@ -401,6 +416,11 @@ impl KernelResolver {
                     }
                 }
             }
+            if !namespace {
+                if let Some(c) = self.match_object_path_call(r)? {
+                    if let Some(c) = self.gate_language(Some(c),r) { return self.finish(r,c,None,true); }
+                }
+            }
             return Ok(ResolveOutcome::unresolved());
         }
         // A TS/JS/Python `x().y` call names the root's import, not the
@@ -718,6 +738,7 @@ impl KernelResolver {
 
     /// The per-ref pipeline: the Rust `::`-path arm, then one route.
     pub(super) fn resolve_ref(&mut self, r: &ResolveRefIn) -> Res<ResolveOutcome> {
+        if let Some(outcome) = self.resolve_vb_explicit(r)? { return Ok(outcome); }
         // Rust pure-`::` path refs (`crate::m::Item`, `a::b::c`): TS
         // resolves them through resolveViaImport's module-file arm, which
         // needs no bindings rows — run it ahead of the eligibility gate.
@@ -905,6 +926,10 @@ impl KernelResolver {
         if winner.node.id == r.from_node_id && is_inheritance_ref(&r.reference_kind) {
             let Some(other) = self.other_supertype_named(r)? else { return Ok(ResolveOutcome::unresolved()); }; winner=other;
         }
+if r.language == "dart" && r.reference_kind == "references"
+    && winner.node.id == r.from_node_id {
+    return Ok(ResolveOutcome::unresolved());
+}
         winner=self.retarget_overload(winner,r)?;
         if r.reference_kind == "calls" {
             // memberName = the last `.` segment — `Cls::member` and bare
@@ -1024,7 +1049,7 @@ impl KernelResolver {
 
     /// finish for an arm resolveOneInner evaluates before the framework loop:
     /// its verdict must not be overturned by a framework hit.
-    fn finish_pre_framework(&mut self, r: &ResolveRefIn, c: KCand) -> Res<ResolveOutcome> {
+    pub(super) fn finish_pre_framework(&mut self, r: &ResolveRefIn, c: KCand) -> Res<ResolveOutcome> {
         let mut out = self.finish(r, c, None, true)?;
         out.pre_framework = true;
         Ok(out)
diff --git a/codegraph-kernel/src/resolve/prefilter.rs b/codegraph-kernel/src/resolve/prefilter.rs
index b5da21a3cb..6db000138c 100644
--- a/codegraph-kernel/src/resolve/prefilter.rs
+++ b/codegraph-kernel/src/resolve/prefilter.rs
@@ -49,7 +49,8 @@ impl KernelResolver {
         // owns `pkg.member` names (isBindingReceiverCall, index.ts).
         if r.language == "go" && !is_binding_receiver_call(r) {
             if let Some(dot) = name.find('.') {
-                if dot > 0 && GO_STDLIB_PACKAGES.contains(&name[..dot]) {
+                if dot > 0 && GO_STDLIB_PACKAGES.contains(&name[..dot])
+                    && !self.is_shadowed_import(&name[..dot], r).unwrap_or(false) {
                     return true;
                 }
             }
diff --git a/codegraph-kernel/src/resolve/python_globals.rs b/codegraph-kernel/src/resolve/python_globals.rs
index 1f8b1caaac..f231189358 100644
--- a/codegraph-kernel/src/resolve/python_globals.rs
+++ b/codegraph-kernel/src/resolve/python_globals.rs
@@ -279,9 +279,8 @@ impl KernelResolver {
         if let Some(hit) = self.py_globals.classes.get(&global.id) {
             return Ok(hit.clone());
         }
-        let external = self.python_external_writes(global)?;
-        let mut writes = external.writes.clone();
-        let mut known = !external.unknown && !self.python_dynamic_global_write(&global.name, &global.file_path)?;
+        let mut writes = Vec::new();
+        let mut known = !self.python_dynamic_global_write(&global.name, &global.file_path)?;
         if known {
             for b in self.python_global_bindings(&global.name, &global.file_path)?.iter() {
                 let PyBinding::Assign { ty, value, line } = b else {
@@ -307,6 +306,11 @@ impl KernelResolver {
                 writes.push((constructor, global.file_path.clone(), *line));
             }
         }
+        if known {
+            let external = self.python_external_writes(global)?;
+            known = !external.unknown;
+            writes.extend(external.writes.iter().cloned());
+        }
         let mut classes: Vec<Arc<KNode>> = Vec::new();
         if known {
             for (ty, file, line) in writes {
diff --git a/codegraph-kernel/src/resolve/receivers.rs b/codegraph-kernel/src/resolve/receivers.rs
index d10d4e305c..7f13fd2403 100644
--- a/codegraph-kernel/src/resolve/receivers.rs
+++ b/codegraph-kernel/src/resolve/receivers.rs
@@ -839,24 +839,32 @@ impl KernelResolver {
     /// literal spells its result type, `var f = func(…) *T { … }` (also
     /// wrapped in `sync.OnceValue(…)`): `T` as written, and the variable,
     /// whose file's imports place a `pkg.T`.
-    fn go_func_value_result_type(&mut self, name: &str, r: &ResolveRefIn) -> Res<Option<(String, Arc<KNode>)>> {
-        let dir = pos_dirname(&r.file_path);
-        let values: Vec<Arc<KNode>> = self
-            .nodes_by_name(name)?
-            .iter()
-            .filter(|n| n.language == "go" && n.kind == "variable" && pos_dirname(&n.file_path) == dir)
-            .cloned()
-            .collect();
-        let [value] = values.as_slice() else { return Ok(None) };
-        let literal = re!(
-            r"^=\s*(?:sync\.OnceValue\s*\(\s*)?func\s*\((?:[^()]|\([^()]*\))*\)\s*\*?([A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)?)\s*\{"
-        );
-        Ok(value
-            .signature
-            .as_deref()
-            .and_then(|sig| literal.captures(sig))
-            .map(|c| (c[1].to_string(), value.clone())))
+fn go_bare_result(
+    &mut self,
+    name: &str,
+    r: &ResolveRefIn,
+) -> Res<Option<(String, Arc<KNode>)>> {
+    let rows = self.bindings(&r.file_path)?;
+    if let Some(binding) = innermost_binding(&rows, name, Some(r.line)) {
+        if binding.kind != "decl" {
+            return Ok(None);
+        }
+        if let Some(id) = binding.node_id.as_deref() {
+            let Some(node) = self.node_by_id(id)? else { return Ok(None) };
+            return Ok(go_result_from_node(&node).map(|ty| (ty, node)));
+        }
+        return Ok(None);
     }
+    let dir = pos_dirname(&r.file_path);
+    let nodes: Vec<_> = self.nodes_by_name(name)?.iter()
+        .filter(|n| n.language == "go"
+            && matches!(n.kind.as_str(), "function" | "variable" | "constant")
+            && !n.qualified_name.contains("::")
+            && pos_dirname(&n.file_path) == dir)
+        .cloned().collect();
+    let [node] = nodes.as_slice() else { return Ok(None) };
+    Ok(go_result_from_node(node).map(|ty| (ty, node.clone())))
+}
 
     /// cppClassExists — an aggregate type with this last `::` segment exists.
     pub(super) fn cpp_class_exists(&mut self, name: &str, r: &ResolveRefIn) -> Res<bool> {
@@ -952,23 +960,8 @@ impl KernelResolver {
         let last_dot = inner.rfind('.');
         if last_dot.is_none() || last_dot == Some(0) {
             if r.language == "go" {
-                let Some(ret) = self.lookup_callee_return_type(inner, r)? else {
-                    // A function value whose literal gives no result type
-                    // says nothing about what `m` is called on.
-                    return match self.go_func_value_result_type(inner, r)? {
-                        Some((ty, value)) => self.match_bound_type_member(&ty, method, &r.clone().at(&value)),
-                        None => Ok(None),
-                    };
-                };
-                let fqn = self.imported_fqn_of(&ret, r)?;
-                return self.resolve_method_on_type(
-                    &ret,
-                    method,
-                    r,
-                    0.85,
-                    "instance-method",
-                    fqn.as_deref(),
-                );
+                let Some((raw, callee)) = self.go_bare_result(inner, r)? else { return Ok(None); };
+                return self.go_method_on_declared_type(&raw, &callee.file_path, method, r);
             }
             if !CONSTRUCTS_VIA_BARE_CALL.contains(r.language.as_str())
                 || !inner.as_bytes()[0].is_ascii_uppercase()
@@ -1030,20 +1023,21 @@ impl KernelResolver {
         method: &str,
         r: &ResolveRefIn,
     ) -> Res<Option<KCand>> {
-        if pkg.contains('.') {
+        if pkg.contains('.') || self.is_shadowed_import(pkg, r)? {
             return Ok(None);
         }
-        let Some(pkg_dir) = self.go_imported_package_dir(&r.file_path, pkg)? else {
+        let Some(dir) = self.go_imported_package_dir(&r.file_path, pkg)? else {
             return Ok(None);
         };
-        let ret = self.nodes_by_name(func)?.iter().find_map(|n| {
-            (n.kind == "function" && n.language == "go" && pos_dirname(&n.file_path) == pkg_dir)
-                .then(|| n.return_type.clone())
-                .flatten()
-                .filter(|t| !t.is_empty())
-        });
-        let Some(ret) = ret else { return Ok(None) };
-        self.go_method_in_package(&ret, method, &pkg_dir, r)
+        let nodes: Vec<_> = self.nodes_by_name(func)?.iter()
+            .filter(|n| n.language == "go" && n.is_exported
+                && matches!(n.kind.as_str(), "function" | "variable" | "constant")
+                && !n.qualified_name.contains("::")
+                && pos_dirname(&n.file_path) == dir)
+            .cloned().collect();
+        let [callee] = nodes.as_slice() else { return Ok(None) };
+        let Some(raw) = go_result_from_node(callee) else { return Ok(None) };
+        self.go_method_on_declared_type(&raw, &callee.file_path, method, r)
     }
 
     /// resolveJvmImport (import-resolver.ts) — `imports`-kind java/kotlin FQN
@@ -1171,3 +1165,17 @@ pub(super) fn pick_closest_jvm_candidate(candidates: &[Arc<KNode>], from_path: &
     }
     best.clone()
 }
+
+fn go_result_from_node(node: &KNode) -> Option<String> {
+    if node.kind == "function" {
+        return node.return_type.clone().filter(|ty| !ty.is_empty());
+    }
+    if !matches!(node.kind.as_str(), "variable" | "constant") {
+        return None;
+    }
+    let literal = re!(
+        r"^=\s*(?:sync\.OnceValue\s*\(\s*)?func\s*\((?:[^()]|\([^()]*\))*\)\s*(\*?[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)?(?:\[[^\]]*\])?)\s*\{"
+    );
+    literal.captures(node.signature.as_deref()?)
+        .map(|hit| hit[1].to_string())
+}
diff --git a/codegraph-kernel/src/resolve/resolver_upstream.rs b/codegraph-kernel/src/resolve/resolver_upstream.rs
index dba5cb8bf9..7cad33312c 100644
--- a/codegraph-kernel/src/resolve/resolver_upstream.rs
+++ b/codegraph-kernel/src/resolve/resolver_upstream.rs
@@ -506,7 +506,7 @@ impl KernelResolver {
         if !local {
             return Ok(false);
         }
-        if self
+        if self.js_destructured_object_member(n, r)? || self
             .js_typed_destructured_member(r)?
             .is_some_and(|member| member.id == n.id)
         {
@@ -515,46 +515,45 @@ impl KernelResolver {
         Ok(n.file_path != r.file_path || n.start_line < f.start_line || n.start_line > f.end_line)
     }
 
-    pub(super) fn go_external_qualified(&mut self, r: &ResolveRefIn) -> Res<bool> {
+    pub(super) fn go_ref_qualifier(&mut self, r: &ResolveRefIn) -> Res<Option<KImport>> {
         if r.language != "go" || r.reference_kind == "imports" {
-            return Ok(false);
+            return Ok(None);
         }
-        let name = r
-            .reference_name
-            .rsplit('.')
-            .next()
-            .unwrap_or(&r.reference_name);
-        let Some(lines) = self.read_file(&r.file_path) else {
-            return Ok(false);
-        };
+        let name = r.reference_name.rsplit('.').next().unwrap_or(&r.reference_name);
+        if !re!(r"^[A-Za-z_]\w*$").is_match(name) {
+            return Ok(None);
+        }
+        let Some(lines) = self.read_file(&r.file_path) else { return Ok(None) };
         let Some(line) = lines.get((r.line - 1).max(0) as usize) else {
-            return Ok(false);
+            return Ok(None);
         };
-        let at = super::names::js_unit_to_byte(line, r.column.max(0) as usize).min(line.len());
+        let at = super::names::js_unit_to_byte(line, r.column.max(0) as usize)
+            .min(line.len());
         let root = if line[at..].starts_with(name) {
             re!(r"(?:^|[^\w.])([A-Za-z_]\w*)\.$")
-                .captures(&line[..at])
-                .map(|m| m[1].to_string())
+                .captures(&line[..at]).map(|hit| hit[1].to_string())
         } else {
-            let re = Self::cached_regex(&format!(
-                r"(?:^|[^\w.])([A-Za-z_]\w*)\.{}\b",
-                regex::escape(name)
+            let bare = Self::cached_regex(&format!(
+                r"(?:^|[^\w.]){}\b", regex::escape(name)
             ))?;
-            re.captures(line).map(|m| m[1].to_string())
-        };
-        let Some(root) = root else {
-            return Ok(false);
+            if bare.is_match(line) { return Ok(None); }
+            let qualified = Self::cached_regex(&format!(
+                r"(?:^|[^\w.])([A-Za-z_]\w*)\.{}\b", regex::escape(name)
+            ))?;
+            qualified.captures(line).map(|hit| hit[1].to_string())
         };
-        let imports = self.import_mappings(&r.file_path)?;
-        let Some(imp) = imports.iter().find(|m| m.local_name == root) else {
+        let Some(root) = root else { return Ok(None) };
+        if self.is_shadowed_import(&root, r)? { return Ok(None); }
+        Ok(self.import_mappings(&r.file_path)?.iter()
+            .find(|imp| imp.local_name == root).cloned())
+    }
+
+    pub(super) fn go_external_qualified(&mut self, r: &ResolveRefIn) -> Res<bool> {
+        if r.language != "go" || r.reference_kind == "imports" {
             return Ok(false);
-        };
-        Ok(!imp.source.starts_with('.')
-            && !imp.source.contains("/internal/")
-            && !self
-                .go_module_path
-                .as_ref()
-                .is_some_and(|m| imp.source == *m || imp.source.starts_with(&format!("{m}/"))))
+        }
+        let Some(imp) = self.go_ref_qualifier(r)? else { return Ok(false); };
+        Ok(!imp.source.starts_with('.') && !imp.source.contains("/internal/") && self.go_package_dir(&imp.source, &r.file_path).is_none())
     }
 
     pub(super) fn python_fixture_type(
@@ -665,7 +664,8 @@ impl KernelResolver {
             name = regex::escape(name)
         ))
         .ok()?;
-        let path = if line[at..].starts_with(name) {
+        let via_self = r.reference_kind == "references" && name != "Self" && re!(r"^Self\s*::").is_match(&line[at..]);
+        let path = if via_self { None } else if line[at..].starts_with(name) {
             re!(r"((?:[A-Za-z_]\w*\s*::\s*)+)$")
                 .captures(&line[..at])
                 .map(|m| m[1].to_string())
diff --git a/codegraph-kernel/src/resolve/tables.rs b/codegraph-kernel/src/resolve/tables.rs
index c5390a3c38..2cc5deed86 100644
--- a/codegraph-kernel/src/resolve/tables.rs
+++ b/codegraph-kernel/src/resolve/tables.rs
@@ -593,7 +593,7 @@ pub(super) fn is_static_member_container(kind: &str) -> bool {
 /// OBJECT_LITERAL_LANGUAGES (name-matcher.ts): object literals declare
 /// callable members.
 pub(super) fn is_object_literal_language(lang: &str) -> bool {
-    matches!(lang, "typescript" | "tsx" | "javascript" | "jsx" | "arkts")
+    matches!(lang, "typescript" | "tsx" | "javascript" | "jsx" | "arkts" | "vue" | "svelte" | "astro")
 }
 
 /// splitCamelCase — receiver/class word split for matchMethodCall's
diff --git a/codegraph-kernel/src/resolve/this_member.rs b/codegraph-kernel/src/resolve/this_member.rs
index d0c284b710..58321a35fc 100644
--- a/codegraph-kernel/src/resolve/this_member.rs
+++ b/codegraph-kernel/src/resolve/this_member.rs
@@ -44,6 +44,7 @@ impl KernelResolver {
         let Some(from) = self.node_by_id(&r.from_node_id)? else {
             return Ok(ThisMember::Miss);
         };
+        let from = self.this_scope_caller(from)?;
         // A class-body hook (Ruby `before_action :x`) attributes to the class
         // node itself; a member strips its own segment.
         let class_prefix = if is_supertype_bearing_kind(&from.kind) || from.kind == "module" {
@@ -83,6 +84,7 @@ impl KernelResolver {
         let Some(from) = self.node_by_id(&r.from_node_id)? else {
             return Ok(None);
         };
+        let from = self.this_scope_caller(from)?;
         if member.is_empty() {
             return Ok(None);
         }
diff --git a/codegraph-kernel/src/resolve/vbnet/calls.rs b/codegraph-kernel/src/resolve/vbnet/calls.rs
new file mode 100644
index 0000000000..8ea6c810ac
--- /dev/null
+++ b/codegraph-kernel/src/resolve/vbnet/calls.rs
@@ -0,0 +1,368 @@
+use super::*;
+
+impl KernelResolver {
+    pub(in crate::resolve) fn vb_read_through(
+        &mut self,
+        member: Arc<KNode>,
+        owners: &[Arc<KNode>],
+        r: &ResolveRefIn,
+        confidence: f64,
+        edge_kind: Option<&str>,
+    ) -> Res<Option<VbHit>> {
+        if member.id == r.from_node_id {
+            return Ok(None);
+        }
+        let Some(owner) = owners
+            .iter()
+            .find(|o| o.file_path == member.file_path)
+            .or_else(|| owners.first())
+        else {
+            return Ok(None);
+        };
+        let from = self
+            .node_by_id(&r.from_node_id)?
+            .map(|n| n.qualified_name.to_ascii_lowercase());
+        let own = owner.qualified_name.to_ascii_lowercase();
+        let inside = owner.id == r.from_node_id
+            || from.is_some_and(|from| from == own || from.starts_with(&format!("{own}::")));
+        Ok(Some(VbHit {
+            candidate: KCand {
+                node: member,
+                confidence,
+                resolved_by: "qualified-name",
+            },
+            edge_kind: edge_kind.map(str::to_string),
+            also: if inside {
+                vec![]
+            } else {
+                vec![owner.id.clone()]
+            },
+        }))
+    }
+    pub(in crate::resolve) fn vb_shared_read(
+        &mut self,
+        receiver: &str,
+        member: &str,
+        r: &ResolveRefIn,
+    ) -> Res<Option<VbHit>> {
+        let bound = self.vb_receiver_type(receiver, r, 0)?;
+        let written = match bound {
+            None => vb_simple(receiver, r),
+            Some(Some(t)) if !t.array && t.name.eq_ignore_ascii_case(receiver) => t,
+            _ => return Ok(None),
+        };
+        let (owners, ambiguous) = self.vb_types_at(&written, true)?;
+        if ambiguous || owners.is_empty() {
+            return Ok(None);
+        }
+        let member = member.trim_matches(['[', ']']);
+        let found = self
+            .vb_member_on(&owners, member, r, true, None, true)?
+            .or(self.vb_member_on(&owners, &format!("[{member}]"), r, true, None, true)?);
+        let Some(mut found) = found else {
+            return Ok(None);
+        };
+        if !found.node.is_static {
+            if let Some(shared) = self
+                .nodes_by_qualified_name(&found.node.qualified_name)?
+                .iter()
+                .find(|n| {
+                    n.is_static && n.file_path == found.node.file_path && n.id != r.from_node_id
+                })
+            {
+                found.node = shared.clone();
+            }
+        }
+        if found.node.kind == "method" {
+            let line = self
+                .read_file(&r.file_path)
+                .and_then(|f| f.get((r.line - 1).max(0) as usize).cloned())
+                .unwrap_or_default();
+            let before = super::names::js_prefix(&line, r.column.max(0) as usize);
+            let named = re!(r"(?i)\b(?:AddressOf\s+|NameOf\s*\(\s*)$").is_match(before);
+            return Ok(Some(VbHit {
+                candidate: KCand {
+                    node: found.node,
+                    confidence: 0.85,
+                    resolved_by: "qualified-name",
+                },
+                edge_kind: (!named).then(|| "calls".into()),
+                also: vec![],
+            }));
+        }
+        self.vb_read_through(found.node, &owners, r, 0.9, None)
+    }
+    // None = no proven type/owner, so ordinary matching may continue.
+    // Some(None) = a proven receiver/owner has no project target, so stop.
+    pub(in crate::resolve) fn vb_typed_call(
+        &mut self,
+        receiver: &str,
+        member: &str,
+        r: &ResolveRefIn,
+    ) -> Res<Option<Option<VbHit>>> {
+        if !re!(r"^[A-Za-z_]\w*$").is_match(receiver) {
+            return Ok(None);
+        }
+        let bound = self.vb_receiver_type(receiver, r, 0)?;
+        if bound.is_none() {
+            let (owners, ambiguous) = self.vb_types_at(&vb_simple(receiver, r), false)?;
+            if owners.is_empty() {
+                return Ok(None);
+            }
+            if ambiguous {
+                return Ok(Some(None));
+            }
+            if let Some(found) = self.vb_member_on(&owners, member, r, false, None, false)? {
+                return Ok(Some(Some(VbHit {
+                    candidate: KCand {
+                        node: found.node,
+                        confidence: 0.85,
+                        resolved_by: "qualified-name",
+                    },
+                    edge_kind: None,
+                    also: vec![],
+                })));
+            }
+            let indexed = self.vb_member_on(&owners, member, r, true, None, false)?;
+            return match indexed {
+                Some(found) => self
+                    .vb_read_through(found.node, &owners, r, 0.85, Some("references"))
+                    .map(Some),
+                None => Ok(Some(None)),
+            };
+        }
+        let Some(t) = bound.flatten() else {
+            return Ok(None);
+        };
+        if vb_key(&t) == "object" {
+            return Ok(None);
+        }
+        let Some(owners) = self.vb_owners(&t)? else {
+            return Ok(Some(None));
+        };
+        if let Some(found) = self.vb_member_on(&owners, member, r, false, Some(&t), false)? {
+            return Ok(Some(Some(VbHit {
+                candidate: KCand {
+                    node: found.node,
+                    confidence: 0.9,
+                    resolved_by: "instance-method",
+                },
+                edge_kind: None,
+                also: vec![],
+            })));
+        }
+        let extension = self.vb_extension_for(&t, &owners, member, r)?;
+        Ok(Some(extension.map(|candidate| VbHit {
+            candidate,
+            edge_kind: None,
+            also: vec![],
+        })))
+    }
+    pub(in crate::resolve) fn vb_site_receiver(&mut self, r: &ResolveRefIn) -> Option<String> {
+        let lines = self.read_file(&r.file_path)?;
+        let line = lines.get((r.line - 1).max(0) as usize)?;
+        let member = r.reference_name.rsplit('.').next()?.to_ascii_lowercase();
+        if !re!(r"^\w+$").is_match(&member) {
+            return None;
+        }
+        let lower = line.to_ascii_lowercase();
+        let byte = super::names::js_unit_to_byte(line, r.column.max(0) as usize).min(line.len());
+        let start = if lower[byte..].starts_with(&member) {
+            Some(byte)
+        } else {
+            let re = Self::cached_regex(&format!(r"(?i)\b{}\b", regex::escape(&member))).ok()?;
+            re.find_at(&lower, byte).map(|m| m.start()) // never the earlier same-named property before New
+        }?;
+        let before = &line[..start];
+        if let Some(m) = re!(r"(?i)\(\s*Of\s+([A-Za-z0-9_.]+)\s*\)\s*\.\s*$").captures(before) {
+            return Some(m[1].to_string());
+        }
+        let m = re!(r"([A-Za-z0-9_.()]*?)\s*\.\s*$").captures(before)?;
+        Some(re!(r"\([^()]*\)").replace_all(&m[1], "").into_owned())
+    }
+    pub(in crate::resolve) fn resolve_vb_explicit(&mut self, r: &ResolveRefIn) -> Res<Option<ResolveOutcome>> {
+        if r.language != "vbnet" {
+            return Ok(None);
+        }
+        let hit = if r.reference_kind == "references" {
+            let Some(m) =
+                re!(r"^([A-Za-z_]\w*)\.(\[?[A-Za-z_]\w*\]?)$").captures(&r.reference_name)
+            else {
+                return Ok(None);
+            };
+            Some(self.vb_shared_read(&m[1], &m[2], r)?)
+        } else if r.reference_kind == "calls" {
+            let Some(receiver) = self.vb_site_receiver(r) else {
+                return Ok(None);
+            };
+            if re!(r"(?i)^(Me|MyClass|MyBase)$").is_match(&receiver) {
+                return Ok(None);
+            }
+            let member = r
+                .reference_name
+                .rsplit('.')
+                .next()
+                .unwrap_or(&r.reference_name);
+            self.vb_typed_call(&receiver, member, r)?
+        } else {
+            None
+        };
+        let Some(hit) = hit else { return Ok(None) };
+        let Some(hit) = hit else {
+            return Ok(Some(ResolveOutcome::unresolved()));
+        };
+        let target = hit.candidate.node.id.clone();
+        let mut out = self.finish_pre_framework(r, hit.candidate)?;
+        if out.status == "resolved" && out.target_node_id.as_deref() == Some(target.as_str()) {
+            out.edge_kind = hit.edge_kind;
+            if !hit.also.is_empty() {
+                out.also_target_node_ids = Some(hit.also);
+            }
+        }
+        Ok(Some(out))
+    }
+    pub(in crate::resolve) fn vb_scope_owners(&mut self, r: &ResolveRefIn) -> Res<Option<HashSet<String>>> {
+        let around = self.vb_around(&r.file_path, r.line)?;
+        if around.is_empty() {
+            return Ok(None);
+        }
+        let mut names = HashSet::new();
+        for owner in around {
+            for ancestor in self.vb_ancestry(&owner)? {
+                names.insert(ancestor.node.name.to_ascii_lowercase());
+            }
+        }
+        Ok(Some(names))
+    }
+    pub(in crate::resolve) fn vb_member_in_scope(&mut self, n: &KNode, r: &ResolveRefIn) -> Res<bool> {
+        if n.language != "vbnet" || !vb_member_kind(&n.kind) {
+            return Ok(true);
+        }
+        let Some(qn) = vb_parent_qn(n) else {
+            return Ok(true);
+        };
+        let Some(owners) = self.vb_scope_owners(r)? else {
+            return Ok(true);
+        };
+        let owner = vb_segments(qn).pop().unwrap_or_default();
+        if owners.contains(&owner)
+            || self
+                .vb_header(&r.file_path)
+                .imports
+                .iter()
+                .any(|i| i.rsplit('.').next() == Some(owner.as_str()))
+        {
+            return Ok(true);
+        }
+        for parent in self.nodes_by_qualified_name(qn)?.iter() {
+            if self.vb_module(parent) {
+                return Ok(true);
+            }
+        }
+        Ok(false)
+    }
+    pub(in crate::resolve) fn vb_nested_in_scope(&mut self, n: &KNode, r: &ResolveRefIn) -> Res<bool> {
+        if n.language != "vbnet" || !vb_like_kind(&n.kind) {
+            return Ok(true);
+        }
+        let Some(parent) = self.vb_enclosing(n)? else {
+            return Ok(true);
+        };
+        let Some(owners) = self.vb_scope_owners(r)? else {
+            return Ok(true);
+        };
+        if owners.contains(&parent.name.to_ascii_lowercase()) {
+            return Ok(true);
+        }
+        let h = self.vb_header(&r.file_path);
+        if h.imports.iter().any(|i| {
+            i.rsplit('.')
+                .next()
+                .is_some_and(|v| v.eq_ignore_ascii_case(&parent.name))
+        }) {
+            return Ok(true);
+        }
+        if let Some(alias) = h.aliases.get(&r.reference_name.to_ascii_lowercase()) {
+            let full = self.vb_full(n);
+            if alias.name.eq_ignore_ascii_case(&n.name)
+                && (alias.qualifier.is_empty()
+                    || vb_tail(&full[..full.len() - 1], &alias.qualifier))
+            {
+                return Ok(true);
+            }
+        }
+        Ok(false)
+    }
+    pub(in crate::resolve) fn vb_qualified_by(&mut self, n: &KNode, qualifier: &str, r: &ResolveRefIn) -> bool {
+        if n.language != "vbnet" || !vb_like_kind(&n.kind) {
+            return true;
+        }
+        let Some(written) = vb_type(&format!("{qualifier}.{}", n.name), &r.file_path, r.line)
+        else {
+            return true;
+        };
+        let written = self.vb_unalias(&written);
+        let full = self.vb_full(n);
+        written.qualifier.is_empty() || vb_tail(&full[..full.len() - 1], &written.qualifier)
+    }
+    pub(in crate::resolve) fn vb_break_tie(
+        &mut self,
+        tied: Vec<Arc<KNode>>,
+        r: &ResolveRefIn,
+    ) -> Option<Arc<KNode>> {
+        let mut seen = HashSet::new();
+        let distinct: Vec<_> = tied
+            .into_iter()
+            .filter(|n| {
+                seen.insert((
+                    self.vb_project(&n.file_path),
+                    n.qualified_name.to_ascii_lowercase(),
+                ))
+            })
+            .collect();
+        if distinct.len() == 1 {
+            return distinct.into_iter().next();
+        }
+        let mut pool: Vec<_> = distinct
+            .iter()
+            .filter(|n| n.file_path == r.file_path)
+            .cloned()
+            .collect();
+        if pool.is_empty() {
+            pool = distinct
+                .iter()
+                .filter(|n| self.vb_same_project(&n.file_path, &r.file_path))
+                .cloned()
+                .collect();
+            if pool.is_empty() {
+                pool = distinct;
+            }
+        }
+        if pool.len() == 1 {
+            return pool.into_iter().next();
+        }
+        let shared = |file: &str| {
+            r.file_path
+                .split('/')
+                .rev()
+                .skip(1)
+                .collect::<Vec<_>>()
+                .into_iter()
+                .rev()
+                .zip(
+                    file.split('/')
+                        .rev()
+                        .skip(1)
+                        .collect::<Vec<_>>()
+                        .into_iter()
+                        .rev(),
+                )
+                .take_while(|(a, b)| a == b)
+                .count()
+        };
+        let best = pool.iter().map(|n| shared(&n.file_path)).max()?;
+        let mut winners = pool.into_iter().filter(|n| shared(&n.file_path) == best);
+        let first = winners.next()?;
+        winners.next().is_none().then_some(first)
+    }
+}
diff --git a/codegraph-kernel/src/resolve/vbnet/mod.rs b/codegraph-kernel/src/resolve/vbnet/mod.rs
new file mode 100644
index 0000000000..9dc69d9ab0
--- /dev/null
+++ b/codegraph-kernel/src/resolve/vbnet/mod.rs
@@ -0,0 +1,7 @@
+mod types;
+mod receivers;
+mod calls;
+
+use super::*;
+use types::*;
+pub(super) use types::VbMemo;
diff --git a/codegraph-kernel/src/resolve/vbnet/receivers.rs b/codegraph-kernel/src/resolve/vbnet/receivers.rs
new file mode 100644
index 0000000000..6a453118c8
--- /dev/null
+++ b/codegraph-kernel/src/resolve/vbnet/receivers.rs
@@ -0,0 +1,702 @@
+use super::*;
+
+impl KernelResolver {
+    pub(in crate::resolve) fn vb_binding_on(
+        &self,
+        code: &str,
+        name: &str,
+        file: &str,
+        line: i64,
+    ) -> Res<Option<VbBinding>> {
+        if !re!(r"(?i)\b(?:As|Dim|Static|Const|For|Each|Function|Sub|Catch|Using|From|Let|Aggregate)\b|\w[$%&!#@]").is_match(code){return Ok(None);}
+        let name = regex::escape(name);
+        let pattern = Self::cached_regex(&format!(
+            r"(?i)(?:^|[^\w.])({name})(\s*\([\s\d,]*\))?\s*\??\s+As\s+(New\s+)?"
+        ))?;
+        for m in pattern.captures_iter(code) {
+            let start = m.get(1).unwrap().start();
+            if re!(r"(?i)\b(?:Function|Sub|Property|Event|Operator|Declare|Delegate|Class|Structure|Module|Interface|Enum|Namespace)\s+$").is_match(&code[..start]){continue;}
+            let value = vb_type(&code[m.get(0).unwrap().end()..], file, line).map(|mut t| {
+                if m.get(3).is_some() {
+                    t.array = false;
+                } else {
+                    t.array |= m.get(2).is_some();
+                }
+                t
+            });
+            return Ok(Some(
+                value.map(VbBinding::Type).unwrap_or(VbBinding::Unknown),
+            ));
+        }
+        let listed = Self::cached_regex(&format!(
+            r"(?i)\b(?:Dim|Static)\s+(?:[A-Za-z_]\w*\s*,\s*)*{name}\s*,[\w\s,]*?\bAs\s+"
+        ))?;
+        if let Some(m) = listed.find(code) {
+            return Ok(Some(
+                vb_type(&code[m.end()..], file, line)
+                    .map(VbBinding::Type)
+                    .unwrap_or(VbBinding::Unknown),
+            ));
+        }
+        let character = Self::cached_regex(&format!(
+            r"(?i)(?:\b(?:Dim|Static|Const|ByVal|ByRef|Optional|ParamArray|Each|For|Using|Private|Public|Friend|Protected|Shared|ReadOnly|WithEvents)\s+|[,(]\s*){name}([$%&!#@])(\s*\([\s\d,]*\))?"
+        ))?;
+        if let Some(m) = character.captures(code) {
+            let kind = match &m[1] {
+                "$" => "String",
+                "%" => "Integer",
+                "&" => "Long",
+                "!" => "Single",
+                "#" => "Double",
+                _ => "Decimal",
+            };
+            let mut t = vb_type(kind, file, line).unwrap();
+            t.array = m.get(2).is_some();
+            return Ok(Some(VbBinding::Type(t)));
+        }
+        let inferred =
+            Self::cached_regex(&format!(r"(?i)\b(?:Dim|Static|Const|Using)\s+{name}\s*="))?;
+        if let Some(m) = inferred.find(code) {
+            if !code[m.end()..].starts_with('=') {
+                return Ok(Some(self.vb_value_binding(&code[m.end()..], file, line)));
+            }
+        }
+        let each = Self::cached_regex(&format!(r"(?i)\bFor\s+Each\s+{name}\s+In\s+(.+)$"))?;
+        if let Some(m) = each.captures(code) {
+            let expr = m[1].trim();
+            if let Some(m) = re!(r"(?i)\.\s*(?:OfType|Cast)\s*\(\s*Of\s+").find(expr) {
+                if re!(r"^[^()]*\)\s*(?:\(\s*\))?\s*$").is_match(&expr[m.end()..]) {
+                    if let Some(t) = vb_type(&expr[m.end()..], file, line) {
+                        return Ok(Some(VbBinding::Type(t)));
+                    }
+                }
+            }
+            return Ok(Some(if re!(r"^[A-Za-z_]\w*$").is_match(expr) {
+                VbBinding::Each(expr.into())
+            } else {
+                VbBinding::Unknown
+            }));
+        }
+        let loose = Self::cached_regex(&format!(
+            r"(?i)\bFor\s+(?:Each\s+)?{name}\b|\b(?:From|Aggregate)\s+{name}\s+In\b|\bLet\s+{name}\s*=|\bCatch\s+{name}\b|\b(?:Function|Sub)\s*\((?:[^()]*,)?\s*(?:ByVal\s+|ByRef\s+)?{name}\s*[,)]"
+        ))?;
+        Ok(loose.is_match(code).then_some(VbBinding::Unknown))
+    }
+    pub(in crate::resolve) fn vb_value_binding(&self, expr: &str, file: &str, line: i64) -> VbBinding {
+        let expr = expr.split(" :").next().unwrap_or(expr).trim();
+        if let Some(m) = re!(r"(?i)^New\s+").find(expr) {
+            return vb_type(&expr[m.end()..], file, line)
+                .map(|mut t| {
+                    t.array = false;
+                    VbBinding::Type(t)
+                })
+                .unwrap_or(VbBinding::Unknown);
+        }
+        if let Some(m) = re!(r"(?i)^(?:DirectCast|TryCast|CType)\s*\(").find(expr) {
+            let open = m.end() - 1;
+            if let Some(close) = vb_close(expr, open) {
+                let args = vb_args(&expr[open + 1..close]);
+                if args.len() == 2 {
+                    return vb_type(&args[1], file, line)
+                        .map(VbBinding::Type)
+                        .unwrap_or(VbBinding::Unknown);
+                }
+            }
+            return VbBinding::Unknown;
+        }
+        if expr.starts_with("\"\"") || expr.starts_with("$\"\"") {
+            return VbBinding::Type(vb_type("String", file, line).unwrap());
+        }
+        if let Some(m) = re!(r"(?i)^(C[A-Za-z]+)\s*\(").captures(expr) {
+            let ty = match m[1].to_ascii_lowercase().as_str() {
+                "cbool" => "Boolean",
+                "cbyte" => "Byte",
+                "cchar" => "Char",
+                "cdate" => "Date",
+                "cdbl" => "Double",
+                "cdec" => "Decimal",
+                "cint" => "Integer",
+                "clng" => "Long",
+                "cobj" => "Object",
+                "csbyte" => "SByte",
+                "cshort" => "Short",
+                "csng" => "Single",
+                "cstr" => "String",
+                "cuint" => "UInteger",
+                "culng" => "ULong",
+                "cushort" => "UShort",
+                _ => "",
+            };
+            if !ty.is_empty() {
+                return VbBinding::Type(vb_type(ty, file, line).unwrap());
+            }
+        }
+        if let Some(m) = re!(r"^(?:([A-Za-z_]\w*)\s*\.\s*)?([A-Za-z_]\w*)\s*").captures(expr) {
+            let rest = &expr[m.get(0).unwrap().end()..];
+            let rest = if rest.starts_with('(') {
+                vb_close(rest, 0)
+                    .map(|close| rest[close + 1..].trim())
+                    .unwrap_or("unclosed")
+            } else {
+                rest
+            };
+            if rest.is_empty() {
+                return VbBinding::Call(m.get(1).map(|m| m.as_str().into()), m[2].into());
+            }
+        }
+        VbBinding::Unknown
+    }
+    pub(in crate::resolve) fn vb_scope_start(&self, r: &ResolveRefIn) -> Res<i64> {
+        if let Some(from) = self.node_by_id(&r.from_node_id)? {
+            if from.file_path == r.file_path
+                && from.start_line <= r.line
+                && from.end_line >= r.line
+                && matches!(
+                    from.kind.as_str(),
+                    "method" | "function" | "property" | "field"
+                )
+            {
+                return Ok(from.start_line);
+            }
+        }
+        Ok(self
+            .nodes_in_file(&r.file_path)?
+            .iter()
+            .filter(|n| {
+                matches!(n.kind.as_str(), "method" | "function" | "property")
+                    && n.start_line <= r.line
+                    && n.end_line >= r.line
+            })
+            .map(|n| n.start_line)
+            .max()
+            .unwrap_or(r.line))
+    }
+    pub(in crate::resolve) fn vb_declared_type(&mut self, n: &KNode, returns: bool) -> Res<Option<VbType>> {
+        let code = self
+            .vb_lines(&n.file_path)
+            .iter()
+            .skip((n.start_line - 1).max(0) as usize)
+            .take(if returns { 7 } else { 3 })
+            .cloned()
+            .collect::<Vec<_>>()
+            .join(" ");
+        let pattern = Self::cached_regex(&format!(
+            r"(?i)\b(Function|Property|Sub)\s+{}\b",
+            regex::escape(&n.name)
+        ))?;
+        if let Some(m) = pattern.captures(&code) {
+            if m[1].eq_ignore_ascii_case("Sub") {
+                return Ok(None);
+            }
+            let mut at = m.get(0).unwrap().end();
+            for _ in 0..2 {
+                if let Some(open) = re!(r"^\s*\(").find(&code[at..]) {
+                    let Some(close) = vb_close(&code, at + open.end() - 1) else {
+                        return Ok(None);
+                    };
+                    at = close + 1;
+                } else {
+                    break;
+                }
+            }
+            if let Some(m) = re!(r"(?i)^\s*As\s+(New\s+)?").captures(&code[at..]) {
+                let mut ty = vb_type(
+                    &code[at + m.get(0).unwrap().end()..],
+                    &n.file_path,
+                    n.start_line,
+                );
+                if m.get(1).is_some() {
+                    if let Some(t) = &mut ty {
+                        t.array = false;
+                    }
+                }
+                return Ok(ty);
+            }
+            return Ok(None);
+        }
+        if let Some(VbBinding::Type(t)) =
+            self.vb_binding_on(&code, &n.name, &n.file_path, n.start_line)?
+        {
+            return Ok(Some(t));
+        }
+        let init = Self::cached_regex(&format!(r"(?i)(?:^|[^\w.]){}\s*=", regex::escape(&n.name)))?;
+        if let Some(m) = init.find(&code) {
+            if let VbBinding::Type(t) =
+                self.vb_value_binding(&code[m.end()..], &n.file_path, n.start_line)
+            {
+                return Ok(Some(t));
+            }
+        }
+        Ok(None)
+    }
+    pub(in crate::resolve) fn vb_resolve_param(
+        &mut self,
+        t: Option<VbType>,
+        owner: Option<&KNode>,
+    ) -> Res<Option<VbType>> {
+        let Some(t) = t else { return Ok(None) };
+        if t.array || vb_builtin(&t) || !t.qualifier.is_empty() {
+            return Ok(Some(t));
+        }
+        let mut declarations = Vec::new();
+        if let Some(owner) = owner.filter(|o| o.kind == "method") {
+            declarations.push(Arc::new(owner.clone()));
+        }
+        declarations.extend(self.vb_around(&t.file, t.line)?);
+        for decl in declarations {
+            for (p, constraint) in self.vb_params(&decl)? {
+                if p == t.name {
+                    return Ok(constraint);
+                }
+            }
+        }
+        Ok(Some(t))
+    }
+    pub(in crate::resolve) fn vb_member_type(&mut self, m: &VbMember) -> Res<Option<VbType>> {
+        let ty = self.vb_declared_type(&m.node, m.node.kind == "method")?;
+        let substituted = ty.as_ref().map(|t| vb_substitute(t, &m.args));
+        // A supplied generic argument is already sited at its use, and must not be replaced by the declaration's parameter constraint.
+        if ty
+            .as_ref()
+            .is_some_and(|t| t.qualifier.is_empty() && !t.array && m.args.contains_key(&t.name))
+        {
+            return Ok(substituted);
+        }
+        self.vb_resolve_param(substituted, Some(&m.node))
+    }
+    pub(in crate::resolve) fn vb_module_members(&mut self, name: &str, r: &ResolveRefIn) -> Res<Vec<Arc<KNode>>> {
+        let mut out = Vec::new();
+        for n in self.nodes_by_lower_name(name)?.iter() {
+            if n.language != "vbnet" {
+                continue;
+            }
+            let Some(qn) = vb_parent_qn(n) else { continue };
+            for owner in self.nodes_by_qualified_name(qn)?.iter() {
+                if self.vb_module(owner) {
+                    out.push(n.clone());
+                    break;
+                }
+            }
+        }
+        Ok(self.vb_prefer(out, r))
+    }
+    pub(in crate::resolve) fn vb_receiver_type(
+        &mut self,
+        name: &str,
+        r: &ResolveRefIn,
+        depth: usize,
+    ) -> Res<Option<Option<VbType>>> {
+        if depth > 2 {
+            return Ok(Some(None));
+        }
+        let start = self.vb_scope_start(r)?;
+        let lines = self.vb_lines(&r.file_path);
+        let mut local = None;
+        for i in (start.max(1) as usize - 1..(r.line.max(0) as usize).min(lines.len())).rev() {
+            if let Some(b) = self.vb_binding_on(&lines[i], name, &r.file_path, i as i64 + 1)? {
+                local = Some((b, i as i64 + 1));
+                break;
+            }
+        }
+        if let Some((b, line)) = local {
+            let mut site = r.clone();
+            site.line = line;
+            let ty = match b {
+                VbBinding::Type(t) => {
+                    let owner = self.node_by_id(&r.from_node_id)?;
+                    self.vb_resolve_param(Some(t), owner.as_deref())?
+                }
+                VbBinding::Call(receiver, member) => {
+                    self.vb_call_type(receiver.as_deref(), &member, &site, depth)?
+                }
+                VbBinding::Each(collection) => {
+                    let collection = self
+                        .vb_receiver_type(&collection, &site, depth + 1)?
+                        .flatten();
+                    collection.and_then(|mut t|{
+                    if t.array{t.array=false;Some(t)}else if re!(r"(?i)^(List|IList|IEnumerable|ICollection|IReadOnlyList|IReadOnlyCollection|HashSet|SortedSet|Queue|Stack|LinkedList|ObservableCollection|Collection|ReadOnlyCollection|BindingList|ConcurrentBag|ConcurrentQueue|ConcurrentStack|BlockingCollection)$").is_match(&t.name)&&t.args.len()==1&&t.args[0].name!="?"{Some(t.args.remove(0))}else{None}})
+                }
+                VbBinding::Unknown => None,
+            };
+            return Ok(Some(ty));
+        }
+        for owner in self.vb_around(&r.file_path, r.line)? {
+            for ancestor in self.vb_ancestry(&owner)? {
+                if let Some(node) = self
+                    .vb_members(&ancestor.node, name)?
+                    .into_iter()
+                    .find(|n| vb_value_kind(&n.kind) || n.kind == "method")
+                {
+                    return self
+                        .vb_member_type(&VbMember {
+                            node,
+                            args: ancestor.args,
+                        })
+                        .map(Some);
+                }
+            }
+        }
+        if let Some(node) = self
+            .vb_module_members(name, r)?
+            .into_iter()
+            .find(|n| vb_value_kind(&n.kind) || n.kind == "method")
+        {
+            return self
+                .vb_member_type(&VbMember {
+                    node,
+                    args: HashMap::new(),
+                })
+                .map(Some);
+        }
+        Ok(None)
+    }
+    pub(in crate::resolve) fn vb_owners(&mut self, t: &VbType) -> Res<Option<Vec<Arc<KNode>>>> {
+        if t.array || vb_builtin(t) {
+            return Ok(Some(vec![]));
+        }
+        let (owners, ambiguous) = self.vb_types_at(t, false)?;
+        Ok((!ambiguous).then_some(owners))
+    }
+    pub(in crate::resolve) fn vb_call_type(
+        &mut self,
+        receiver: Option<&str>,
+        member: &str,
+        r: &ResolveRefIn,
+        depth: usize,
+    ) -> Res<Option<VbType>> {
+        let own = receiver.is_none()
+            || receiver.is_some_and(|v| re!(r"(?i)^(Me|MyClass|MyBase)$").is_match(v));
+        let found = if own {
+            let owners = self.vb_around(&r.file_path, r.line)?;
+            let owners = &owners[..owners.len().min(1)];
+            let mut found = self.vb_member_on(owners, member, r, true, None, false)?;
+            if found.is_none() && receiver.is_none() {
+                found = self
+                    .vb_module_members(member, r)?
+                    .into_iter()
+                    .find(|n| n.kind == "method" || vb_value_kind(&n.kind))
+                    .map(|node| VbMember {
+                        node,
+                        args: HashMap::new(),
+                    });
+            }
+            found
+        } else {
+            let receiver = receiver.unwrap();
+            let bound = self.vb_receiver_type(receiver, r, depth + 1)?;
+            let ty = match bound {
+                None => Some(vb_simple(receiver, r)),
+                Some(t) => t,
+            };
+            if let Some(t) = ty {
+                if let Some(owners) = self.vb_owners(&t)? {
+                    self.vb_member_on(&owners, member, r, true, Some(&t), false)?
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        };
+        match found {
+            Some(m) => self.vb_member_type(&m),
+            None => Ok(None),
+        }
+    }
+    pub(in crate::resolve) fn vb_extension_param(&mut self, n: &KNode) -> Res<Option<Option<VbType>>> {
+        if n.language != "vbnet" || n.kind != "method" {
+            return Ok(None);
+        }
+        let code = self
+            .vb_lines(&n.file_path)
+            .iter()
+            .skip((n.start_line - 2).max(0) as usize)
+            .take(8)
+            .cloned()
+            .collect::<Vec<_>>()
+            .join(" ");
+        let decl = Self::cached_regex(&format!(
+            r"(?i)\b(?:Function|Sub)\s+{}\b",
+            regex::escape(&n.name)
+        ))?;
+        let Some(head) = decl.find(&code) else {
+            return Ok(None);
+        };
+        let attr=re!(r"(?i)((?:<[^<>]*>\s*)+)(?:(?:Public|Friend|Private|Protected|Shared|Overloads|Async|Iterator)\s+)*$").captures(&code[..head.start()]);
+        if !attr.is_some_and(|m| re!(r"(?i)\bExtension(?:Attribute)?\b").is_match(&m[1])) {
+            return Ok(None);
+        }
+        let mut at = head.end();
+        if re!(r"(?i)^\s*\(\s*Of\b").is_match(&code[at..]) {
+            let open = at + code[at..].find('(').unwrap();
+            let Some(close) = vb_close(&code, open) else {
+                return Ok(None);
+            };
+            at = close + 1;
+        }
+        let Some(open) = code[at..].find('(').map(|i| i + at) else {
+            return Ok(None);
+        };
+        let Some(close) = vb_close(&code, open) else {
+            return Ok(None);
+        };
+        let params = vb_args(&code[open + 1..close]);
+        let Some(first) = params.first() else {
+            return Ok(None);
+        };
+        let first = re!(r"<[^<>]*>").replace_all(first, "");
+        let Some(as_clause) = re!(r"(?i)\bAs\s+").find(&first) else {
+            return Ok(None);
+        };
+        let Some(t) = vb_type(&first[as_clause.end()..], &n.file_path, n.start_line) else {
+            return Ok(None);
+        };
+        let generic = self.vb_params(n)?.iter().any(|(p, _)| p == &t.name) && !t.array;
+        Ok(Some((!generic).then_some(t)))
+    }
+}
+
+impl KernelResolver {
+    pub(in crate::resolve) fn vb_extension_for(
+        &mut self,
+        t: &VbType,
+        owners: &[Arc<KNode>],
+        method: &str,
+        r: &ResolveRefIn,
+    ) -> Res<Option<KCand>> {
+        let instance = if owners.is_empty() {
+            vb_bcl_methods(t)
+        } else {
+            None
+        }; // static helper described below
+        if instance.is_some_and(|methods| methods.contains(&method.to_ascii_lowercase().as_str())) {
+            return Ok(None);
+        }
+        let mut extensions = Vec::new();
+        for n in self.nodes_by_lower_name(method)?.iter() {
+            if let Some(param) = self.vb_extension_param(n)? {
+                extensions.push((n.clone(), param));
+            }
+        }
+        let mut names = HashSet::from([t.name.to_ascii_lowercase()]);
+        let mut open = owners.is_empty() && !vb_builtin(t) && !t.array;
+        for owner in owners {
+            for ancestor in self.vb_ancestry(owner)? {
+                names.insert(ancestor.node.name.to_ascii_lowercase());
+                for (sup, implemented) in self.vb_supers(&ancestor.node)? {
+                    names.insert(vb_key(&sup));
+                    let (found, _) = self.vb_types_at(&sup, false)?;
+                    if found.is_empty() {
+                        open = true;
+                    } else if implemented {
+                        for n in found {
+                            for parent in self.vb_ancestry(&n)? {
+                                names.insert(parent.node.name.to_ascii_lowercase());
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        let exact: Vec<_> = extensions
+            .iter()
+            .filter(|(_, p)| {
+                p.as_ref().is_some_and(|p| {
+                    vb_key(p) == vb_key(t) || (!p.array && !t.array && names.contains(&vb_key(p)))
+                })
+            })
+            .map(|(n, _)| n.clone())
+            .collect();
+        if let Some(node) = self.vb_prefer(exact, r).into_iter().next() {
+            return Ok(Some(KCand {
+                node,
+                confidence: 0.85,
+                resolved_by: "instance-method",
+            }));
+        }
+        let loose: Vec<_> = extensions
+            .into_iter()
+            .filter(|(_, p)| p.as_ref().is_none_or(|p| vb_may_extend(t, open, p)))
+            .collect();
+        if loose.len() == 1
+            && (instance.is_some() || !super::call_shape::is_std_method("vbnet", method))
+        {
+            return Ok(Some(KCand {
+                node: loose[0].0.clone(),
+                confidence: 0.7,
+                resolved_by: "instance-method",
+            }));
+        }
+        Ok(None)
+    }
+}
+pub(in crate::resolve) fn vb_may_extend(t: &VbType, open: bool, param: &VbType) -> bool {
+    if vb_key(param) == "object" {
+        return true;
+    }
+    if param.array != t.array {
+        return t.array
+            && re!(
+                r"(?i)^(IEnumerable|IList|ICollection|IReadOnlyList|IReadOnlyCollection|Array)$"
+            )
+            .is_match(&param.name);
+    }
+    if vb_builtin(param) {
+        return false;
+    }
+    if vb_builtin(t) {
+        return param.interface_spelling;
+    }
+    open
+}
+
+pub(in crate::resolve) fn vb_bcl_methods(t: &VbType) -> Option<&'static [&'static str]> {
+    match if t.array { "[]".to_string() } else { vb_key(t) }.as_str() {
+        "string" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "clone",
+            "compareto",
+            "contains",
+            "copyto",
+            "endswith",
+            "getenumerator",
+            "gettypecode",
+            "indexof",
+            "indexofany",
+            "insert",
+            "isnormalized",
+            "lastindexof",
+            "lastindexofany",
+            "normalize",
+            "padleft",
+            "padright",
+            "remove",
+            "replace",
+            "split",
+            "startswith",
+            "substring",
+            "tochararray",
+            "tolower",
+            "tolowerinvariant",
+            "toupper",
+            "toupperinvariant",
+            "trim",
+            "trimend",
+            "trimstart",
+        ]),
+        "stringbuilder" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "append",
+            "appendformat",
+            "appendjoin",
+            "appendline",
+            "clear",
+            "copyto",
+            "ensurecapacity",
+            "getchunks",
+            "insert",
+            "remove",
+            "replace",
+        ]),
+        "list" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "add",
+            "addrange",
+            "asreadonly",
+            "binarysearch",
+            "clear",
+            "contains",
+            "convertall",
+            "copyto",
+            "exists",
+            "find",
+            "findall",
+            "findindex",
+            "findlast",
+            "findlastindex",
+            "foreach",
+            "getenumerator",
+            "getrange",
+            "indexof",
+            "insert",
+            "insertrange",
+            "lastindexof",
+            "remove",
+            "removeall",
+            "removeat",
+            "removerange",
+            "reverse",
+            "sort",
+            "toarray",
+            "trimexcess",
+            "trueforall",
+        ]),
+        "dictionary" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "add",
+            "clear",
+            "containskey",
+            "containsvalue",
+            "ensurecapacity",
+            "getenumerator",
+            "remove",
+            "trimexcess",
+            "tryadd",
+            "trygetvalue",
+        ]),
+        "hashset" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "add",
+            "clear",
+            "contains",
+            "copyto",
+            "exceptwith",
+            "getenumerator",
+            "intersectwith",
+            "ispropersubsetof",
+            "ispropersupersetof",
+            "issubsetof",
+            "issupersetof",
+            "overlaps",
+            "remove",
+            "removewhere",
+            "setequals",
+            "symmetricexceptwith",
+            "trimexcess",
+            "trygetvalue",
+            "unionwith",
+        ]),
+        "[]" => Some(&[
+            "tostring",
+            "equals",
+            "gethashcode",
+            "gettype",
+            "clone",
+            "copyto",
+            "getenumerator",
+            "getlength",
+            "getlonglength",
+            "getlowerbound",
+            "getupperbound",
+            "getvalue",
+            "initialize",
+            "setvalue",
+        ]),
+        _ => None,
+    }
+}
diff --git a/codegraph-kernel/src/resolve/vbnet/types.rs b/codegraph-kernel/src/resolve/vbnet/types.rs
new file mode 100644
index 0000000000..0ae355bc18
--- /dev/null
+++ b/codegraph-kernel/src/resolve/vbnet/types.rs
@@ -0,0 +1,733 @@
+use super::*;
+
+#[derive(Clone, Debug)]
+pub(in crate::resolve) struct VbType {
+    pub(in crate::resolve) name: String,
+    pub(in crate::resolve) interface_spelling: bool,
+    pub(in crate::resolve) qualifier: Vec<String>,
+    pub(in crate::resolve) args: Vec<VbType>,
+    pub(in crate::resolve) array: bool,
+    pub(in crate::resolve) file: String,
+    pub(in crate::resolve) line: i64,
+}
+#[derive(Clone)]
+pub(in crate::resolve) struct VbAncestor {
+    pub(in crate::resolve) node: Arc<KNode>,
+    pub(in crate::resolve) args: HashMap<String, VbType>,
+}
+#[derive(Clone, Default)]
+pub(in crate::resolve) struct VbHeader {
+    pub(in crate::resolve) root: Vec<String>,
+    pub(in crate::resolve) imports: Vec<String>,
+    pub(in crate::resolve) aliases: HashMap<String, VbType>,
+}
+#[derive(Default)]
+pub(in crate::resolve) struct VbMemo {
+    pub(in crate::resolve) code: HashMap<String, Rc<Vec<String>>>,
+    pub(in crate::resolve) projects: HashMap<String, Option<String>>,
+    pub(in crate::resolve) headers: HashMap<String, Rc<VbHeader>>,
+}
+#[derive(Clone)]
+pub(in crate::resolve) enum VbBinding {
+    Type(VbType),
+    Call(Option<String>, String),
+    Each(String),
+    Unknown,
+}
+#[derive(Clone)]
+pub(in crate::resolve) struct VbMember {
+    pub(in crate::resolve) node: Arc<KNode>,
+    pub(in crate::resolve) args: HashMap<String, VbType>,
+}
+pub(in crate::resolve) struct VbHit {
+    pub(in crate::resolve) candidate: KCand,
+    pub(in crate::resolve) edge_kind: Option<String>,
+    pub(in crate::resolve) also: Vec<String>,
+}
+
+pub(in crate::resolve) type VbTypes = (Vec<Arc<KNode>>, bool); // owners, ambiguous
+pub(in crate::resolve) fn vb_type_kind(k: &str) -> bool {
+    matches!(k, "class" | "struct" | "interface")
+}
+pub(in crate::resolve) fn vb_like_kind(k: &str) -> bool {
+    vb_type_kind(k) || matches!(k, "enum" | "type_alias")
+}
+pub(in crate::resolve) fn vb_value_kind(k: &str) -> bool {
+    matches!(k, "field" | "property" | "constant" | "variable")
+}
+pub(in crate::resolve) fn vb_member_kind(k: &str) -> bool {
+    vb_value_kind(k) || matches!(k, "method" | "enum_member")
+}
+pub(in crate::resolve) fn vb_key(t: &VbType) -> String {
+    let lower = t.name.to_ascii_lowercase();
+    let name = match lower.as_str() {
+        "int16" => "short",
+        "int32" => "integer",
+        "int64" => "long",
+        "uint16" => "ushort",
+        "uint32" => "uinteger",
+        "uint64" => "ulong",
+        "datetime" => "date",
+        _ => &lower,
+    };
+    format!("{}{}", name, if t.array { "[]" } else { "" })
+}
+pub(in crate::resolve) fn vb_builtin(t: &VbType) -> bool {
+    !t.array
+        && matches!(
+            vb_key(t).as_str(),
+            "boolean"
+                | "byte"
+                | "char"
+                | "date"
+                | "decimal"
+                | "double"
+                | "integer"
+                | "long"
+                | "object"
+                | "sbyte"
+                | "short"
+                | "single"
+                | "string"
+                | "uinteger"
+                | "ulong"
+                | "ushort"
+        )
+}
+pub(in crate::resolve) fn vb_close(text: &str, open: usize) -> Option<usize> {
+    let mut depth = 0;
+    for (i, b) in text.as_bytes().iter().enumerate().skip(open) {
+        if *b == b'(' {
+            depth += 1;
+        } else if *b == b')' {
+            depth -= 1;
+            if depth == 0 {
+                return Some(i);
+            }
+        }
+    }
+    None
+}
+pub(in crate::resolve) fn vb_args(text: &str) -> Vec<String> {
+    let mut depth = 0;
+    let mut start = 0;
+    let mut out = Vec::new();
+    for (i, ch) in text.char_indices() {
+        match ch {
+            '(' | '{' => depth += 1,
+            ')' | '}' => depth -= 1,
+            ',' if depth == 0 => {
+                out.push(text[start..i].trim().to_string());
+                start = i + 1;
+            }
+            _ => {}
+        }
+    }
+    out.push(text[start..].trim().to_string());
+    out
+}
+pub(in crate::resolve) fn vb_type(raw: &str, file: &str, line: i64) -> Option<VbType> {
+    let head = re!(r"^\s*([A-Za-z_][A-Za-z0-9_.]*)").captures(raw)?;
+    let mut parts: Vec<String> = head[1].split('.').map(str::to_ascii_lowercase).collect();
+    if parts.first().is_some_and(|p| p == "global") {
+        parts.remove(0);
+    }
+    let name = parts.pop()?;
+    if matches!(
+        name.as_str(),
+        "new" | "of" | "as" | "in" | "out" | "from" | "with"
+    ) {
+        return None;
+    }
+    let mut at = head.get(0)?.end();
+    let mut args = Vec::new();
+    if re!(r"(?i)^\s*\(\s*Of\b").is_match(&raw[at..]) {
+        let open = at + raw[at..].find('(')?;
+        let close = vb_close(raw, open)?;
+        for arg in vb_args(&raw[open + 1..close]) {
+            let arg = re!(r"(?i)^Of\s+").replace(&arg, "");
+            args.push(vb_type(&arg, file, line).unwrap_or(VbType {
+                name: "?".into(),
+                interface_spelling: false,
+                qualifier: vec![],
+                args: vec![],
+                array: false,
+                file: file.into(),
+                line,
+            }));
+        }
+        at = close + 1;
+    }
+    Some(VbType {
+        name,
+        interface_spelling: head[1]
+            .rsplit('.')
+            .next()
+            .is_some_and(vb_interface_spelling),
+        qualifier: parts,
+        args,
+        array: re!(r"^\s*\??\s*\(\s*,*\s*\)").is_match(&raw[at..]),
+        file: file.into(),
+        line,
+    })
+}
+pub(in crate::resolve) fn vb_interface_spelling(name: &str) -> bool {
+    let mut chars = name.chars();
+    chars.next() == Some('I') && chars.next().is_some_and(|c| c.is_ascii_uppercase())
+}
+pub(in crate::resolve) fn vb_simple(name: &str, r: &ResolveRefIn) -> VbType {
+    VbType {
+        name: name.to_ascii_lowercase(),
+        interface_spelling: vb_interface_spelling(name),
+        qualifier: vec![],
+        args: vec![],
+        array: false,
+        file: r.file_path.clone(),
+        line: r.line,
+    }
+}
+pub(in crate::resolve) fn vb_substitute(t: &VbType, args: &HashMap<String, VbType>) -> VbType {
+    if !t.array && t.qualifier.is_empty() {
+        if let Some(t) = args.get(&t.name.to_ascii_lowercase()) {
+            return t.clone();
+        }
+    }
+    t.clone()
+}
+pub(in crate::resolve) fn vb_clean(raw: &str) -> String {
+    let mut chars = raw.chars().peekable();
+    let mut out = String::new();
+    while let Some(c) = chars.next() {
+        match c {
+            '\'' | '‘' | '’' | '\r' => break,
+            '"' => {
+                out.push_str("\"\"");
+                while let Some(c) = chars.next() {
+                    if c == '"' {
+                        if chars.peek() == Some(&'"') {
+                            chars.next();
+                        } else {
+                            break;
+                        }
+                    }
+                }
+            }
+            _ => out.push(c),
+        }
+    }
+    out
+}
+pub(in crate::resolve) fn vb_segments(qn: &str) -> Vec<String> {
+    qn.replace("::", ".")
+        .split('.')
+        .map(str::to_ascii_lowercase)
+        .collect()
+}
+pub(in crate::resolve) fn vb_parent_qn(n: &KNode) -> Option<&str> {
+    n.qualified_name.rsplit_once("::").map(|(owner, _)| owner)
+}
+pub(in crate::resolve) fn vb_tail(full: &[String], tail: &[String]) -> bool {
+    full.len() >= tail.len() && full[full.len() - tail.len()..] == *tail
+}
+
+impl KernelResolver {
+    pub(in crate::resolve) fn vb_lines(&mut self, file: &str) -> Rc<Vec<String>> {
+        if let Some(hit) = self.vb.code.get(file) {
+            return hit.clone();
+        }
+        let out = Rc::new(
+            self.read_file(file)
+                .map_or_else(Vec::new, |f| f.iter().map(|l| vb_clean(l)).collect()),
+        );
+        if self.vb.code.len() >= 1024 {
+            self.vb.code.clear();
+        }
+        self.vb.code.insert(file.into(), out.clone());
+        out
+    }
+    pub(in crate::resolve) fn vb_project(&mut self, file: &str) -> Option<String> {
+        let mut dir = pos_dirname(file).to_string();
+        if dir == "." {
+            dir.clear();
+        }
+        let mut walked = Vec::new();
+        let answer = loop {
+            if let Some(hit) = self.vb.projects.get(&dir) {
+                break hit.clone();
+            }
+            walked.push(dir.clone());
+            let abs = std::path::Path::new(&self.project_root).join(&dir);
+            let found = std::fs::read_dir(abs)
+                .ok()
+                .into_iter()
+                .flatten()
+                .filter_map(|entry| entry.ok())
+                .any(|e| {
+                    e.file_name()
+                        .to_string_lossy()
+                        .to_ascii_lowercase()
+                        .ends_with(".vbproj")
+                });
+            if found {
+                break Some(dir.clone());
+            }
+            if dir.is_empty() {
+                break None;
+            }
+            dir = dir
+                .rsplit_once('/')
+                .map_or(String::new(), |(p, _)| p.to_string());
+        };
+        if self.vb.projects.len() >= 4096 {
+            self.vb.projects.clear();
+        }
+        for d in walked {
+            self.vb.projects.insert(d, answer.clone());
+        }
+        answer
+    }
+    pub(in crate::resolve) fn vb_same_project(&mut self, a: &str, b: &str) -> bool {
+        let project = self.vb_project(a);
+        project.is_some() && project == self.vb_project(b)
+    }
+    pub(in crate::resolve) fn vb_header(&mut self, file: &str) -> Rc<VbHeader> {
+        if let Some(hit) = self.vb.headers.get(file) {
+            return hit.clone();
+        }
+        let mut h = VbHeader::default();
+        if let Some(dir) = self.vb_project(file) {
+            let abs = std::path::Path::new(&self.project_root).join(dir);
+            let project = std::fs::read_dir(&abs)
+                .ok()
+                .into_iter()
+                .flatten()
+                .filter_map(|entry| entry.ok())
+                .find(|e| {
+                    e.file_name()
+                        .to_string_lossy()
+                        .to_ascii_lowercase()
+                        .ends_with(".vbproj")
+                });
+            if let Some(project) = project {
+                let project_path = project.path();
+                let relative = project_path.strip_prefix(&self.project_root).ok()
+                    .map(|p| p.to_string_lossy().replace('\\', "/"));
+                if let Some(source) = relative.and_then(|p| self.read_file(&p)) {
+                    let text = source.text();
+                    let root = re!(r"(?i)<RootNamespace>\s*([\w.]*)\s*</RootNamespace>")
+                        .captures(text)
+                        .map(|m| m[1].to_string())
+                        .unwrap_or_else(|| {
+                            project
+                                .file_name()
+                                .to_string_lossy()
+                                .trim_end_matches(".vbproj")
+                                .into()
+                        });
+                    h.root = root
+                        .split('.')
+                        .filter(|s| !s.is_empty())
+                        .map(str::to_ascii_lowercase)
+                        .collect();
+                    for m in re!(r#"(?i)<Import\s+Include\s*=\s*"([\w.]+)""#).captures_iter(text) {
+                        h.imports.push(m[1].to_ascii_lowercase());
+                    }
+                }
+            }
+        }
+        for l in self.vb_lines(file).iter() {
+            if re!(r"(?i)^\s*(?:Namespace|Module|Class|Structure|Interface|Enum|Delegate|Public|Friend|Private|Protected|Partial|NotInheritable|MustInherit)\b").is_match(l){break;}
+            if let Some(m) = re!(r"(?i)^\s*Imports\s+([A-Za-z_]\w*)\s*=\s*(.+)$").captures(l) {
+                if let Some(t) = vb_type(&m[2], file, 0) {
+                    h.aliases.insert(m[1].to_ascii_lowercase(), t);
+                }
+            } else if let Some(m) = re!(r"(?i)^\s*Imports\s+([\w.]+)\s*$").captures(l) {
+                h.imports.push(
+                    m[1].to_ascii_lowercase()
+                        .trim_start_matches("global.")
+                        .into(),
+                );
+            }
+        }
+        let out = Rc::new(h);
+        if self.vb.headers.len() >= 1024 {
+            self.vb.headers.clear();
+        }
+        self.vb.headers.insert(file.into(), out.clone());
+        out
+    }
+    pub(in crate::resolve) fn vb_unalias(&mut self, t: &VbType) -> VbType {
+        let h = self.vb_header(&t.file);
+        let mut out = t.clone();
+        if t.qualifier.is_empty() {
+            if let Some(alias) = h.aliases.get(&t.name) {
+                out.name = alias.name.clone();
+                out.qualifier = alias.qualifier.clone();
+            }
+        } else if let Some(alias) = h.aliases.get(&t.qualifier[0]) {
+            out.qualifier = alias.qualifier.clone();
+            out.qualifier.push(alias.name.clone());
+            out.qualifier.extend_from_slice(&t.qualifier[1..]);
+        }
+        out
+    }
+    pub(in crate::resolve) fn vb_full(&mut self, n: &KNode) -> Vec<String> {
+        let mut full = self.vb_header(&n.file_path).root.clone();
+        full.extend(vb_segments(&n.qualified_name));
+        full
+    }
+    pub(in crate::resolve) fn vb_around(&self, file: &str, line: i64) -> Res<Vec<Arc<KNode>>> {
+        let mut out: Vec<_> = self
+            .nodes_in_file(file)?
+            .iter()
+            .filter(|n| {
+                n.language == "vbnet"
+                    && vb_type_kind(&n.kind)
+                    && n.start_line <= line
+                    && n.end_line >= line
+            })
+            .cloned()
+            .collect();
+        out.sort_by_key(|n| std::cmp::Reverse(n.start_line));
+        Ok(out)
+    }
+    pub(in crate::resolve) fn vb_module(&mut self, n: &KNode) -> bool {
+        n.kind == "class"
+            && self
+                .vb_lines(&n.file_path)
+                .iter()
+                .skip((n.start_line - 1).max(0) as usize)
+                .take(3)
+                .any(|l| {
+                    re!(r"(?i)^\s*(?:<[^>]*>\s*)*(?:(?:Public|Friend|Private|Partial)\s+)*Module\s")
+                        .is_match(l)
+                })
+    }
+    pub(in crate::resolve) fn vb_enclosing(&mut self, n: &KNode) -> Res<Option<Arc<KNode>>> {
+        let Some(qn) = vb_parent_qn(n) else {
+            return Ok(None);
+        };
+        for p in self.nodes_by_qualified_name(qn)?.iter() {
+            if p.language == "vbnet" && vb_type_kind(&p.kind)
+                && self.vb_declaration_project(p, n) && !self.vb_module(p) {
+                return Ok(Some(p.clone()));
+            }
+        }
+        Ok(None)
+    }
+    pub(in crate::resolve) fn vb_supers(&mut self, n: &KNode) -> Res<Vec<(VbType, bool)>> {
+        let parts: Vec<_> = self
+            .nodes_by_qualified_name(&n.qualified_name)?
+            .iter()
+            .filter(|p| p.language == "vbnet" && vb_type_kind(&p.kind))
+            .cloned()
+            .collect();
+        let mut out = Vec::new();
+        for part in parts {
+            if !self.vb_declaration_project(&part, n) { continue; }
+            let lines = self.vb_lines(&part.file_path);
+            'scan: for l in lines
+                .iter()
+                .skip((part.start_line - 1).max(0) as usize)
+                .take((part.end_line - part.start_line + 1).clamp(0, 13) as usize)
+            {
+                for statement in l.split(':') {
+                    let s = statement.trim();
+                    if s.is_empty()
+                        || s.starts_with('#')
+                        || re!(r"^<.*>$").is_match(s)
+                        || re!(r"(?i)\b(?:Class|Structure|Interface|Module)\s+[A-Za-z_]")
+                            .is_match(s)
+                    {
+                        continue;
+                    }
+                    let Some(m) = re!(r"(?i)^(Inherits|Implements)\s+(.+)$").captures(s) else {
+                        break 'scan;
+                    };
+                    for raw in vb_args(&m[2]) {
+                        if let Some(t) = vb_type(&raw, &part.file_path, part.start_line) {
+                            out.push((t, m[1].eq_ignore_ascii_case("Implements")));
+                        }
+                    }
+                }
+            }
+        }
+        Ok(out)
+    }
+    pub(in crate::resolve) fn vb_base_names(&mut self, file: &str, line: i64) -> Res<HashSet<String>> {
+        let mut names = HashSet::new();
+        let mut queue = self.vb_around(file, line)?;
+        for _ in 0..5 {
+            let mut next = Vec::new();
+            for n in queue {
+                if !names.insert(n.name.to_ascii_lowercase()) {
+                    continue;
+                }
+                for (sup, implemented) in self.vb_supers(&n)? {
+                    if !implemented {
+                        next.extend(
+                            self.nodes_by_lower_name(&sup.name)?
+                                .iter()
+                                .filter(|n| n.language == "vbnet" && vb_type_kind(&n.kind))
+                                .cloned(),
+                        );
+                    }
+                }
+            }
+            if next.is_empty() {
+                break;
+            }
+            queue = next;
+        }
+        Ok(names)
+    }
+    pub(in crate::resolve) fn vb_types_at(&mut self, written: &VbType, with_enum: bool) -> Res<VbTypes> {
+        let t = self.vb_unalias(written);
+        let mut candidates = Vec::new();
+        for n in self.nodes_by_lower_name(&t.name)?.iter() {
+            if n.language != "vbnet" || !(vb_type_kind(&n.kind) || (with_enum && n.kind == "enum"))
+            {
+                continue;
+            }
+            let full = self.vb_full(n);
+            if t.qualifier.is_empty() || vb_tail(&full[..full.len() - 1], &t.qualifier) {
+                candidates.push(n.clone());
+            }
+        }
+        let around = self.vb_around(&t.file, t.line)?;
+        let site = around.first();
+        let site_path = match site {
+            Some(n) => self.vb_full(n),
+            None => self.vb_header(&t.file).root.clone(),
+        };
+        let mut tier = Vec::new();
+        let mut best = None;
+        for n in &candidates {
+            let full = self.vb_full(n);
+            let container = &full[..full.len() - 1];
+            if site_path.starts_with(container) {
+                if best.is_none_or(|b| container.len() > b) {
+                    tier.clear();
+                    best = Some(container.len());
+                }
+                if best == Some(container.len()) {
+                    tier.push(n.clone());
+                }
+            }
+        }
+        if tier.is_empty() && t.qualifier.is_empty() {
+            let bases = self.vb_base_names(&t.file, t.line)?;
+            for n in &candidates {
+                if self
+                    .vb_enclosing(n)?
+                    .is_some_and(|p| bases.contains(&p.name.to_ascii_lowercase()))
+                {
+                    tier.push(n.clone());
+                }
+            }
+        }
+        if tier.is_empty() {
+            let imports = self.vb_header(&t.file).imports.clone();
+            for n in &candidates {
+                let full = self.vb_full(n);
+                if imports.contains(&full[..full.len() - 1].join(".")) {
+                    tier.push(n.clone());
+                }
+            }
+        }
+        if tier.is_empty() {
+            for n in &candidates {
+                if !t.qualifier.is_empty() || self.vb_enclosing(n)?.is_none() {
+                    tier.push(n.clone());
+                }
+            }
+        }
+        let mut own = Vec::new();
+        for n in &tier {
+            if self.vb_same_project(&n.file_path, &t.file) {
+                own.push(n.clone());
+            }
+        }
+        if !own.is_empty() {
+            tier = own;
+        }
+        let mut distinct = HashSet::new();
+        for n in &tier {
+            distinct.insert((
+                self.vb_project(&n.file_path),
+                n.qualified_name.to_ascii_lowercase(),
+            ));
+        }
+        tier.sort_by_key(|n| n.file_path != t.file);
+        Ok((tier, distinct.len() > 1))
+    }
+    pub(in crate::resolve) fn vb_params(&mut self, n: &KNode) -> Res<Vec<(String, Option<VbType>)>> {
+        let code = self
+            .vb_lines(&n.file_path)
+            .iter()
+            .skip((n.start_line - 1).max(0) as usize)
+            .take(3)
+            .cloned()
+            .collect::<Vec<_>>()
+            .join(" ");
+        let re = Self::cached_regex(&format!(
+            r"(?i)\b(?:Class|Structure|Interface|Module|Function|Sub)\s+{}\s*",
+            regex::escape(&n.name)
+        ))?;
+        let Some(m) = re.find(&code) else {
+            return Ok(vec![]);
+        };
+        let rest = &code[m.end()..];
+        if !re!(r"(?i)^\(\s*Of\b").is_match(rest) {
+            return Ok(vec![]);
+        }
+        let Some(close) = vb_close(rest, 0) else {
+            return Ok(vec![]);
+        };
+        let mut out = Vec::new();
+        for p in vb_args(&rest[1..close]) {
+            if let Some(m) =
+                re!(r"(?i)^(?:Of\s+)?(?:In\s+|Out\s+)?([A-Za-z_]\w*)(?:\s+As\s+(.+))?$")
+                    .captures(&p)
+            {
+                let raw = m
+                    .get(2)
+                    .map(|m| m.as_str())
+                    .unwrap_or("")
+                    .trim_matches(['{', '}']);
+                let constraint = raw
+                    .split(',')
+                    .map(str::trim)
+                    .find(|s| !s.is_empty() && !re!(r"(?i)^(New|Class|Structure)$").is_match(s))
+                    .and_then(|s| vb_type(s, &n.file_path, n.start_line));
+                out.push((m[1].to_ascii_lowercase(), constraint));
+            }
+        }
+        Ok(out)
+    }
+    pub(in crate::resolve) fn vb_ancestry(&mut self, n: &Arc<KNode>) -> Res<Vec<VbAncestor>> {
+        let mut queue = VecDeque::from([VbAncestor {
+            node: n.clone(),
+            args: HashMap::new(),
+        }]);
+        let mut out = Vec::new();
+        let mut seen = HashSet::new();
+        while let Some(current) = queue.pop_front() {
+            if out.len() >= 16 {
+                break;
+            }
+            if !seen.insert(current.node.qualified_name.to_ascii_lowercase()) {
+                continue;
+            }
+            let supers = self.vb_supers(&current.node)?;
+            for (sup, implemented) in supers {
+                if implemented {
+                    continue;
+                }
+                let (owners, ambiguous) = self.vb_types_at(&sup, false)?;
+                if ambiguous {
+                    continue;
+                }
+                for base in owners {
+                    let params = self.vb_params(&base)?;
+                    let args = params
+                        .iter()
+                        .enumerate()
+                        .filter_map(|(i, (p, _))| {
+                            sup.args
+                                .get(i)
+                                .map(|t| (p.clone(), vb_substitute(t, &current.args)))
+                        })
+                        .collect();
+                    queue.push_back(VbAncestor { node: base, args });
+                }
+            }
+            out.push(current);
+        }
+        Ok(out)
+    }
+    fn vb_declaration_project(&mut self, part: &KNode, owner: &KNode) -> bool {
+        part.file_path == owner.file_path
+            || self.vb_project(&part.file_path) == self.vb_project(&owner.file_path)
+    }
+    pub(in crate::resolve) fn vb_members(&mut self, owner: &KNode, name: &str) -> Res<Vec<Arc<KNode>>> {
+        let qn = format!("{}::{}", owner.qualified_name, name).to_ascii_lowercase();
+        let candidates: Vec<_> = self.nodes_by_lower_name(name)?.iter()
+            .filter(|n| n.language == "vbnet" && n.qualified_name.to_ascii_lowercase() == qn)
+            .cloned().collect();
+        Ok(candidates.into_iter().filter(|n| self.vb_declaration_project(n, owner)).collect())
+    }
+    pub(in crate::resolve) fn vb_prefer(
+        &mut self,
+        nodes: Vec<Arc<KNode>>,
+        r: &ResolveRefIn,
+    ) -> Vec<Arc<KNode>> {
+        let mut same = Vec::new();
+        let mut own = Vec::new();
+        let mut rest = Vec::new();
+        for n in nodes {
+            if n.file_path == r.file_path {
+                same.push(n);
+            } else if self.vb_same_project(&n.file_path, &r.file_path) {
+                own.push(n);
+            } else {
+                rest.push(n);
+            }
+        }
+        same.extend(own);
+        same.extend(rest);
+        same
+    }
+    pub(in crate::resolve) fn vb_member_on(
+        &mut self,
+        owners: &[Arc<KNode>],
+        name: &str,
+        r: &ResolveRefIn,
+        values: bool,
+        typed: Option<&VbType>,
+        reads: bool,
+    ) -> Res<Option<VbMember>> {
+        for level in [0, 1] {
+            for owner in self.vb_prefer(owners.to_vec(), r) {
+                let given: HashMap<_, _> = self
+                    .vb_params(&owner)?
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(i, (p, _))| {
+                        typed
+                            .and_then(|t| t.args.get(i))
+                            .map(|t| (p.clone(), t.clone()))
+                    })
+                    .collect();
+                for (i, ancestor) in self.vb_ancestry(&owner)?.into_iter().enumerate() {
+                    if (level == 0) != (i == 0) {
+                        continue;
+                    }
+                    let candidates = self
+                        .vb_members(&ancestor.node, name)?
+                        .into_iter()
+                        .filter(|n| {
+                            n.kind == "method"
+                                || (values && vb_value_kind(&n.kind))
+                                || (reads && (n.kind == "enum_member" || vb_like_kind(&n.kind)))
+                        })
+                        .filter(|n| !reads || n.id != r.from_node_id)
+                        .collect();
+                    if let Some(node) = self.vb_prefer(candidates, r).into_iter().next() {
+                        let args = if level == 0 {
+                            given.clone()
+                        } else {
+                            ancestor
+                                .args
+                                .iter()
+                                .map(|(p, t)| (p.clone(), vb_substitute(t, &given)))
+                                .collect()
+                        };
+                        return Ok(Some(VbMember { node, args }));
+                    }
+                }
+            }
+        }
+        Ok(None)
+    }
+}
diff --git a/codegraph-kernel/src/rustlang/mod.rs b/codegraph-kernel/src/rustlang/mod.rs
index 43d6cc7afe..753898adbe 100644
--- a/codegraph-kernel/src/rustlang/mod.rs
+++ b/codegraph-kernel/src/rustlang/mod.rs
@@ -388,7 +388,7 @@ impl<'t> Walker<'t> {
         let name = self.extract_name(node);
         if name == "<anonymous>" {
             if let Some(body) = node.child_by_field_name("body") {
-                self.visit_for_calls_and_structure(body);
+                self.visit_for_calls_and_structure(body, None);
             }
             return;
         }
@@ -446,7 +446,7 @@ impl<'t> Walker<'t> {
         self.extract_type_annotations(node, row);
         self.stack.push(Scope { row, kind, name });
         if let Some(body) = node.child_by_field_name("body") {
-            self.visit_for_calls_and_structure(body);
+            self.visit_for_calls_and_structure(body, None);
         }
         self.stack.pop();
     }
@@ -584,10 +584,10 @@ impl<'t> Walker<'t> {
             match declared {
                 Some((row, name)) => {
                     self.stack.push(Scope { row, kind: "variable", name });
-                    self.visit_for_calls_and_structure(value);
+                    self.visit_for_calls_and_structure(value, None);
                     self.stack.pop();
                 }
-                None => self.visit_for_calls_and_structure(value),
+                None => self.visit_for_calls_and_structure(value, None),
             }
         }
     }
@@ -707,10 +707,8 @@ impl<'t> Walker<'t> {
         }
     }
 
-    /// extractInstantiation — struct_expression via the GENERIC path: strip
-    /// from the first `<`, keep the trailing `::`/`.` segment (JS slice
-    /// semantics: slice(lastDot+1) after a `::` leaves one `:`, then ONE
-    /// leading `[:.]` is stripped).
+    /// Retain the Rust constructor path so an enum variant keeps its owner.
+    /// Generic arguments do not participate in declaration lookup.
     fn extract_instantiation(&mut self, node: Node<'t>) {
         let ctor = node
             .child_by_field_name("constructor")
@@ -719,11 +717,12 @@ impl<'t> Walker<'t> {
             .or_else(|| node.named_child(0));
         let Some(ctor) = ctor else { return };
 
-        let class_name = crate::textutil::strip_generic_and_qualifier(self.text(ctor));
+        let class_name = crate::textutil::generic_args_re().replace_all(self.text(ctor), "");
+        let class_name = class_name.trim().trim_end_matches("::");
 
         if !class_name.is_empty() {
             let from = self.top_row();
-            self.push_ref_at(from, &class_name, crate::buffers::EDGE_INSTANTIATES, node);
+            self.push_ref_at(from, class_name, crate::buffers::EDGE_INSTANTIATES, node);
         }
     }
 
@@ -879,7 +878,9 @@ impl<'t> Walker<'t> {
     // --- visitFunctionBody -----------------------------------------------------
 
 
-    fn visit_for_calls_and_structure(&mut self, node: Node<'t>) {
+    /// `parent` is `node`'s parent, handed down by the walk (None at a body's
+    /// root): `Node::parent()` walks down from the tree's root on every call.
+    fn visit_for_calls_and_structure(&mut self, node: Node<'t>, parent: Option<Node<'t>>) {
         stack_guard!();
         let kind = node.kind();
         self.maybe_capture_fn_refs(node);
@@ -896,6 +897,7 @@ impl<'t> Walker<'t> {
         } else if kind == "struct_expression" {
             self.extract_instantiation(node);
         }
+        self.extract_static_member_ref(node, parent);
 
         // Nested NAMED fns become their own nodes (a nested fn inside an impl
         // method walks up to the impl and indexes as a METHOD).
@@ -932,7 +934,65 @@ impl<'t> Walker<'t> {
         }
 
         for c in named_kids(node) {
-            self.visit_for_calls_and_structure(c);
+            self.visit_for_calls_and_structure(c, Some(node));
+        }
+    }
+
+    /// extractStaticMemberRef — the rust branch (#2328): an enum variant
+    /// written as a path (`Mode::A`, `mode::Mode::B`, a `Mode::C(x)` /
+    /// `Mode::D { .. }` pattern, `Self::A` in an impl) references the receiver
+    /// — the segment before the member, at the place it is written; the
+    /// resolver keeps it only on an enum that declares the member. A lowercase
+    /// receiver (module) or member (fn), a call's callee or a struct literal's
+    /// name (both already linked to their member), a path's prefix and a `use`
+    /// tree emit nothing. Mirrored byte-for-byte — change both.
+    fn extract_static_member_ref(&mut self, node: Node<'t>, parent: Option<Node<'t>>) {
+        let kind = node.kind();
+        if (kind != "scoped_identifier" && kind != "scoped_type_identifier") || self.stack.is_empty() {
+            return;
+        }
+        // Looked up only at a body's root (a `const X: M = M::A;` value).
+        let Some(parent) = parent.or_else(|| node.parent()) else { return };
+        let member_path = if kind == "scoped_identifier" {
+            !matches!(
+                parent.kind(),
+                "scoped_identifier"
+                    | "scoped_type_identifier"
+                    | "use_declaration"
+                    | "use_list"
+                    | "scoped_use_list"
+                    | "use_as_clause"
+                    | "use_wildcard"
+            )
+        } else {
+            parent.kind() == "struct_pattern"
+        };
+        if !member_path {
+            return;
+        }
+        if parent.kind() == "call_expression"
+            && parent.child_by_field_name("function").map(|f| f.start_byte()) == Some(node.start_byte())
+        {
+            return;
+        }
+        let Some(member) = node.child_by_field_name("name") else { return };
+        let mut recv = node.child_by_field_name("path");
+        if let Some(r) = recv {
+            if r.kind() == "scoped_identifier" {
+                recv = r.child_by_field_name("name");
+            }
+        }
+        let Some(recv) = recv else { return };
+        if recv.kind() != "identifier" || !self.text(member).starts_with(|c: char| c.is_ascii_uppercase()) {
+            return;
+        }
+        let mut text = self.text(recv).to_string();
+        if text == "Self" {
+            text = self.receiver_type_of(node).unwrap_or_default();
+        }
+        if util::capitalized_re().is_match(&text) {
+            let owner = self.top_row();
+            self.push_ref_at(owner, &text, crate::buffers::EDGE_REFERENCES, recv);
         }
     }
 
diff --git a/codegraph-kernel/src/textutil.rs b/codegraph-kernel/src/textutil.rs
index 98b3482e08..dc5546fc2a 100644
--- a/codegraph-kernel/src/textutil.rs
+++ b/codegraph-kernel/src/textutil.rs
@@ -56,7 +56,7 @@ pub fn is_generated_file(file_path: &str) -> bool {
             r"\.pb\.[jt]s$",
             r"_pb\.[jt]s$",
             r"_grpc_pb\.[jt]s$",
-            r"\.min\.m?js$",
+            r"[.-]min\.m?js$",
             r"_pb2(_grpc)?\.py$",
             r"_pb2\.pyi$",
             r"\.pb\.(cc|h)$",
@@ -79,6 +79,56 @@ pub fn is_generated_file(file_path: &str) -> bool {
     patterns.iter().any(|p| p.is_match(file_path))
 }
 
+// isMinifiedContent's WEBPACK_RUNTIME (`\b` ASCII, as in JS).
+re!(webpack_runtime, r"(?-u:\b)function __webpack_require__\s*\(");
+
+/// isMinifiedContent (src/extraction/generated-detection.ts): a `.js` / `.mjs`
+/// / `.cjs` file of at least 4000 UTF-16 units whose text sits mostly on lines
+/// of 1000 units or more, dense with `;{}(),` — or that carries a webpack
+/// runtime. Lengths are counted in UTF-16 units, as the JS string ops count
+/// them, so both extractors agree on every file.
+pub fn is_minified_content(file_path: &str, content: &str) -> bool {
+    const LINE: usize = 1000;
+    let lower = file_path.to_ascii_lowercase();
+    if !(lower.ends_with(".js") || lower.ends_with(".mjs") || lower.ends_with(".cjs")) {
+        return false;
+    }
+    // UTF-16 units never outnumber UTF-8 bytes: a short file is out at once.
+    if content.len() < 4 * LINE {
+        return false;
+    }
+    let total = content.encode_utf16().count();
+    if total < 4 * LINE {
+        return false;
+    }
+    if webpack_runtime().is_match(content) {
+        return true;
+    }
+    let (mut long, mut punctuation) = (0usize, 0usize);
+    let (mut line_len, mut line_punct) = (0usize, 0usize);
+    for unit in content.encode_utf16() {
+        if unit == 10 {
+            if line_len >= LINE {
+                long += line_len;
+                punctuation += line_punct;
+            }
+            line_len = 0;
+            line_punct = 0;
+            continue;
+        }
+        line_len += 1;
+        // ; { } ( ) ,
+        if matches!(unit, 59 | 123 | 125 | 40 | 41 | 44) {
+            line_punct += 1;
+        }
+    }
+    if line_len >= LINE {
+        long += line_len;
+        punctuation += line_punct;
+    }
+    long as f64 >= total as f64 * 0.5 && punctuation as f64 >= long as f64 * 0.03
+}
+
 /// Byte offsets of each line start, for UTF-16 column conversion.
 pub fn line_starts(src: &str) -> Vec<usize> {
     let mut out = vec![0usize];
diff --git a/codegraph-kernel/src/tsjs/extractors.rs b/codegraph-kernel/src/tsjs/extractors.rs
index e48e6a3b67..6998871c3f 100644
--- a/codegraph-kernel/src/tsjs/extractors.rs
+++ b/codegraph-kernel/src/tsjs/extractors.rs
@@ -6,8 +6,8 @@
 use crate::walker::named_kids;
 use crate::textutil as util;
 use super::{
-    body_of, is_react_hoc,
-    is_vue_collection_name, Extra, Scope, Walker,
+    body_of, is_host_global_root, is_object_member_function,
+    is_react_hoc, is_static_object_key, is_vue_collection_name, Extra, Scope, Walker,
 };
 use tree_sitter::Node;
 
@@ -377,6 +377,11 @@ impl<'t> Walker<'t> {
                 {
                     self.extract_factory_binding_nodes(name_node, value.unwrap(), kind, is_exported);
                 }
+                // The initializer (and any default in the pattern) still runs:
+                // walk the declarator as a function body walks it, with the
+                // enclosing scope on the stack (#2340). Mirrors
+                // TreeSitterExtractor.extractVariable.
+                self.visit_for_calls_and_structure(child);
                 continue;
             }
             let name = self.text(name_node).to_string();
@@ -424,6 +429,19 @@ impl<'t> Walker<'t> {
             );
             if let Some(row) = var_row {
                 self.extract_variable_type_annotation(child, row);
+
+            }
+
+            // A named object literal owns its function members, exported or
+            // not (#2300): `const api = { load() {…} }` gives `api::load`. The
+            // rest of the literal is walked under the owner (#693). Mirrors
+            // the ownedObject branch of TreeSitterExtractor.extractVariable.
+            if let (Some(row), Some(obj)) = (var_row, self.owned_object_value(value)) {
+                self.extract_owned_object_members(obj, row, kind, &name, true, false);
+                continue;
+            }
+
+            if let Some(row) = var_row {
                 // The declarator's walk stops here (visit_node skips a
                 // variable's children), so the initializer's string literals
                 // are reached from this side, owned by the declared symbol.
@@ -511,6 +529,187 @@ impl<'t> Walker<'t> {
         }
     }
 
+    /// ownsObjectLiterals: a generated or minified bundle — named so or not —
+    /// keeps the old shape. (Every tsjs variant is TS/JS, so only that check
+    /// remains; it is computed once per file.)
+    fn owns_object_literals(&self) -> bool {
+        self.owns_objects
+    }
+
+    /// ownedMemberFunction: the function an owned literal's member becomes,
+    /// named by its static key — `load() {…}`, `load: () => {…}`,
+    /// `load: function () {…}`, `load: function* () {…}`. None for every other
+    /// member (a computed key, a value, a shorthand, a spread).
+    fn owned_member_function(&self, member: Node<'t>) -> Option<(Node<'t>, String)> {
+        if member.kind() == "method_definition" {
+            let key = member.child_by_field_name("name")?;
+            if !is_static_object_key(key.kind()) {
+                return None;
+            }
+            return Some((member, util::object_key_name(self.text(key))));
+        }
+        if member.kind() != "pair" {
+            return None;
+        }
+        let key = member.child_by_field_name("key")?;
+        let value = member.child_by_field_name("value")?;
+        if !is_static_object_key(key.kind()) || !is_object_member_function(value.kind()) {
+            return None;
+        }
+        Some((value, util::object_key_name(self.text(key))))
+    }
+
+    /// ownedObjectValue: `value` when it is an object literal owning at least
+    /// one function member.
+    pub(super) fn owned_object_value(&self, value: Option<Node<'t>>) -> Option<Node<'t>> {
+        let value = value?;
+        if !matches!(value.kind(), "object" | "object_expression") || !self.owns_object_literals() {
+            return None;
+        }
+        for i in 0..value.named_child_count() {
+            if let Some(member) = value.named_child(i) {
+                if self.owned_member_function(member).is_some() {
+                    return Some(value);
+                }
+            }
+        }
+        None
+    }
+
+    /// Put an owner on the stack — on top of the file alone for one on the
+    /// global object — returning what was set aside for leave_owner.
+    fn enter_owner(&mut self, row: u32, kind: &'static str, name: &str, global: bool) -> Vec<Scope> {
+        let rest = if global { self.stack.split_off(1) } else { Vec::new() };
+        self.stack.push(Scope { row, kind, name: name.to_string() });
+        rest
+    }
+
+    fn leave_owner(&mut self, rest: Vec<Scope>) {
+        self.stack.pop();
+        self.stack.extend(rest);
+    }
+
+    /// extractOwnedObjectMembers: each function member becomes its own node,
+    /// qualified under the owner (at file scope for one on the global object).
+    /// Every other member runs where the literal is written: under the owner
+    /// for a module-scope declaration (`values_under_owner`, #693), under the
+    /// enclosing scope for a local or an assignment. The literal's shorthand
+    /// members go to the function-as-value capture the same way.
+    fn extract_owned_object_members(&mut self, obj: Node<'t>, row: u32, kind: &'static str, name: &str, values_under_owner: bool, global: bool) {
+        let held = values_under_owner.then(|| self.enter_owner(row, kind, name, global));
+        self.maybe_capture_fn_refs(obj);
+        for i in 0..obj.named_child_count() {
+            let Some(member) = obj.named_child(i) else { continue };
+            if let Some((func, member_name)) = self.owned_member_function(member) {
+                if values_under_owner {
+                    self.extract_function(func, Some(member_name));
+                } else {
+                    let rest = self.enter_owner(row, kind, name, global);
+                    self.extract_function(func, Some(member_name));
+                    self.leave_owner(rest);
+                }
+            } else {
+                self.visit_for_calls_and_structure(member);
+            }
+        }
+        if let Some(rest) = held {
+            self.leave_owner(rest);
+        }
+    }
+
+    /// extractLocalObjectOwner: `const api = { load() {…} }` in a function body
+    /// or an IIFE gets the node a module-scope declaration would, with its
+    /// members under it. False when the declarator holds no owned literal.
+    pub(super) fn extract_local_object_owner(&mut self, declarator: Node<'t>) -> bool {
+        let Some(name_node) = declarator.child_by_field_name("name") else { return false };
+        if name_node.kind() != "identifier" {
+            return false;
+        }
+        let Some(obj) = self.owned_object_value(declarator.child_by_field_name("value")) else {
+            return false;
+        };
+        let is_const = declarator.parent().map(|d| self.is_const_decl(d)).unwrap_or(false);
+        let kind: &'static str = if is_const { "constant" } else { "variable" };
+        let name = self.text(name_node).to_string();
+        // A local: never the target of another scope's value read.
+        let extra = Extra {
+            docstring: crate::docstring::preceding_docstring(declarator, self.src),
+            signature: Some(util::init_signature(self.text(obj))),
+            is_exported: Some(false),
+            not_value_target: true,
+            ..Extra::default()
+        };
+        let Some(row) = self.create_node(kind, &name, declarator, extra) else { return false };
+        self.extract_variable_type_annotation(declarator, row);
+        self.extract_owned_object_members(obj, row, kind, &name, false, false);
+        true
+    }
+
+    /// extractAssignedObjectOwner: `window.App = {…}` / `App.utils = {…}` /
+    /// `dw_page = {…}`. A plain identifier target is qualified like a
+    /// declaration. A path's owner is named by its last link and qualified by
+    /// the path as written, and so are its members (`window.App::init`); a
+    /// path on the global object is global wherever it is written, so it is
+    /// contained by the file. False (nothing extracted) for any other assignment.
+    pub(super) fn extract_assigned_object_owner(&mut self, node: Node<'t>, module_level: bool) -> bool {
+        let Some(obj) = self.owned_object_value(node.child_by_field_name("right")) else { return false };
+        let Some(path) = self.object_owner_path(node.child_by_field_name("left")) else { return false };
+        // A plain name assigned at module level is a global (`dw_page = {…}`);
+        // in a function it is a local being reassigned.
+        if path.len() == 1 && !module_level {
+            return false;
+        }
+        let qualified_name = (path.len() > 1).then(|| path.join("."));
+        let global = path.len() > 1 && is_host_global_root(&path[0]);
+        let rest = if global { self.stack.split_off(1) } else { Vec::new() };
+        let statement = node.parent().filter(|p| p.kind() == "expression_statement").unwrap_or(node);
+        let name = path.last().cloned().unwrap_or_default();
+        // `App.utils` is read as `App.utils`, never as a bare `utils`.
+        let extra = Extra {
+            docstring: crate::docstring::preceding_docstring(statement, self.src),
+            signature: Some(util::init_signature(self.text(obj))),
+            is_exported: Some(false),
+            qualified_name: qualified_name.clone(),
+            not_value_target: !(path.len() == 1 || global),
+            ..Extra::default()
+        };
+        let row = self.create_node("variable", &name, node, extra);
+        self.stack.extend(rest);
+        let Some(row) = row else { return false };
+        if let Some(qualified_name) = qualified_name {
+            self.object_path_owners.insert(row, qualified_name);
+        }
+        self.extract_owned_object_members(obj, row, "variable", &name, false, global);
+        true
+    }
+
+    /// objectOwnerPath: an assignment target's links written as plain names
+    /// (`dw_page` → [dw_page], `App.utils.dom` → [App, utils, dom]), or None
+    /// for anything else — `this.x`, `a[k]`, a call, CommonJS's
+    /// `module.exports` / `exports.x`, or a prototype.
+    fn object_owner_path(&self, left: Option<Node<'t>>) -> Option<Vec<String>> {
+        let mut path: Vec<String> = Vec::new();
+        let mut cur = left?;
+        while cur.kind() == "member_expression" {
+            let property = cur.child_by_field_name("property")?;
+            if property.kind() != "property_identifier" {
+                return None;
+            }
+            path.push(self.text(property).to_string());
+            cur = cur.child_by_field_name("object")?;
+        }
+        if cur.kind() != "identifier" {
+            return None;
+        }
+        let root = self.text(cur);
+        if root == "module" || root == "exports" || path.iter().any(|p| p == "prototype") {
+            return None;
+        }
+        path.push(root.to_string());
+        path.reverse();
+        Some(path)
+    }
+
     // --- object-literal / store helpers -------------------------------------------------
 
     // --- extractTypeAlias + members (#359, #634) -------------------------------------
diff --git a/codegraph-kernel/src/tsjs/fnref.rs b/codegraph-kernel/src/tsjs/fnref.rs
index 227140a212..b66140bb49 100644
--- a/codegraph-kernel/src/tsjs/fnref.rs
+++ b/codegraph-kernel/src/tsjs/fnref.rs
@@ -113,12 +113,12 @@ fn normalize<'t>(node: Node<'t>, src: &str) -> Vec<(String, Node<'t>)> {
 }
 
 impl<'t> Walker<'t> {
-    pub(super) fn capture_value_ref_scope(&mut self, kind: &'static str, name: &str, row: u32, node: Node<'t>) {
+    pub(super) fn capture_value_ref_scope(&mut self, kind: &'static str, name: &str, row: u32, node: Node<'t>, value_target: bool) {
         if !self.variant.value_refs() {
             return;
         }
         let target_kind_ok = kind == "constant" || kind == "variable";
-        if target_kind_ok
+        if value_target && target_kind_ok
             && util::utf16_len(name) >= 3
             && util::has_upper_or_underscore().is_match(name)
         {
diff --git a/codegraph-kernel/src/tsjs/mod.rs b/codegraph-kernel/src/tsjs/mod.rs
index 1d8ce98c20..fec52f56ef 100644
--- a/codegraph-kernel/src/tsjs/mod.rs
+++ b/codegraph-kernel/src/tsjs/mod.rs
@@ -17,7 +17,7 @@ mod frameworks;
 mod extractors;
 mod fnref;
 use crate::walker::named_kids;
-use crate::walker::{Scope, ValueScope, scope_qualified_name};
+use crate::walker::{Scope, ValueScope};
 use crate::textutil::{is_builtin_type, is_literal_receiver};
 use crate::textutil as util;
 
@@ -130,6 +130,24 @@ fn is_vue_collection_name(name: &str) -> bool {
     matches!(name, "actions" | "mutations" | "getters")
 }
 
+/// OBJECT_MEMBER_FUNCTION_TYPES (tree-sitter.ts, #2300): the function values an
+/// owned object literal's member can hold.
+fn is_object_member_function(kind: &str) -> bool {
+    matches!(kind, "arrow_function" | "function_expression" | "generator_function")
+}
+
+/// STATIC_OBJECT_KEY_TYPES (tree-sitter.ts, #2300): keys that name a member — a
+/// computed `[expr]` key names nothing static.
+fn is_static_object_key(kind: &str) -> bool {
+    matches!(kind, "property_identifier" | "string" | "number")
+}
+
+/// HOST_GLOBAL_ROOTS (tree-sitter.ts, #2300): `window.App = {…}` defines the
+/// global `App`. (`self` is usually `var self = this` in page code, not the global.)
+fn is_host_global_root(name: &str) -> bool {
+    matches!(name, "window" | "globalThis")
+}
+
 
 /// Extra node properties, per-extract-site (mirrors createNode's `extra`).
 #[derive(Default)]
@@ -141,6 +159,9 @@ struct Extra {
     is_async: Option<bool>,
     is_static: Option<bool>,
     qualified_name: Option<String>,
+    /// Never a value-read target: a local, or an object hung on a dotted path
+    /// (createNode's `valueTarget = false`, #2300).
+    not_value_target: bool,
 }
 
 
@@ -191,6 +212,12 @@ struct Walker<'t> {
     /// `exports.x = function () {}` / `module.exports.x = () => …`: (x, line),
     /// consumed by the AST-only decl pass (the walker names such nodes itself).
     cjs_fn_exports: Vec<(String, u32)>,
+    /// An object literal hung on a path (`window.App = {…}`) is qualified by
+    /// the path, and so is what it holds (#2300): row → that qualified name.
+    /// Mirrors TreeSitterExtractor.objectPathOwners.
+    object_path_owners: HashMap<u32, String>,
+    /// ownsObjectLiterals: false for a generated or minified bundle (#2300).
+    owns_objects: bool,
 }
 
 
@@ -244,6 +271,8 @@ impl<'t> Walker<'t> {
             fs_value_counts: HashMap::new(),
             value_scopes: Vec::new(),
             vue_store_file: None,
+            object_path_owners: HashMap::new(),
+            owns_objects: !util::is_generated_file(file_path) && !util::is_minified_content(file_path, source),
             md_ref_keys: HashSet::new(),
             later_exports: HashMap::new(),
             import_decls: HashMap::new(),
@@ -298,6 +327,7 @@ impl<'t> Walker<'t> {
         let start_line = self.line_of(node);
         let column = self.col_of(node);
         let id = self.node_id_allocator.generate(self.file_path, kind, name, start_line, column);
+        let value_target = !extra.not_value_target;
 
         // endLine body extension: resolveBody only (TS/JS: function-valued
         // class fields whose body nests in the arrow / HOF-wrapped arrow).
@@ -312,7 +342,27 @@ impl<'t> Walker<'t> {
             }
         }
 
-        let qualified = extra.qualified_name.unwrap_or_else(|| scope_qualified_name(&self.stack, name));
+        let qualified = extra.qualified_name.unwrap_or_else(|| {
+            let mut parts: Vec<&str> = Vec::new();
+            for s in &self.stack {
+                // A path-hung object literal qualifies what it holds by its
+                // path (`window.App::init`), which carries its own scope.
+                if let Some(path) = self.object_path_owners.get(&s.row) {
+                    parts.clear();
+                    parts.push(path);
+                    continue;
+                }
+                if s.kind != "file" {
+                    parts.push(&s.name);
+                }
+            }
+            let mut qn = parts.join("::");
+            if !qn.is_empty() {
+                qn.push_str("::");
+            }
+            qn.push_str(name);
+            qn
+        });
 
         let mut flags = BoolFlags::default();
         if let Some(v) = extra.is_exported {
@@ -358,7 +408,7 @@ impl<'t> Walker<'t> {
             self.defined_fn_names.insert(name.to_string());
         }
         self.emit_decl_binding(kind, name, row, node, extra.is_exported == Some(true));
-        self.capture_value_ref_scope(kind, name, row, node);
+        self.capture_value_ref_scope(kind, name, row, node, value_target);
         Some(row)
     }
 
@@ -382,6 +432,12 @@ impl<'t> Walker<'t> {
         let owner = self.top_row();
         self.markdown_refs_from_string(node, owner);
 
+        // `window.App = {…}` / `App.utils = {…}`: the object's functions are
+        // the path's members (#2300). Its whole subtree is handled there.
+        if kind == "assignment_expression" && self.extract_assigned_object_owner(node, true) {
+            return;
+        }
+
         if is_function_type(kind) {
             // (the isInsideClassLike + methodTypes overlap is Python/Ruby-only)
             self.extract_function(node, None);
@@ -466,6 +522,16 @@ impl<'t> Walker<'t> {
         let kind = node.kind();
         self.maybe_capture_fn_refs(node);
 
+        // A named object literal in a body (an IIFE's `const App = {…}`) owns
+        // its function members as one at module scope does, and so does
+        // `window.App = {…}` written in here (#2300). Each handles its subtree.
+        if kind == "variable_declarator" && self.extract_local_object_owner(node) {
+            return;
+        }
+        if kind == "assignment_expression" && self.extract_assigned_object_owner(node, false) {
+            return;
+        }
+
         if kind == "call_expression" {
             self.extract_call(node);
         } else if kind == "new_expression" {
diff --git a/docs/design/chained-call-resolution.md b/docs/design/chained-call-resolution.md
index 9fa34a6e68..0024af2e1c 100644
--- a/docs/design/chained-call-resolution.md
+++ b/docs/design/chained-call-resolution.md
@@ -24,7 +24,7 @@ name-matched the bare method (`bar`), so in 7 of 9 languages it silently attache
 
 1. **Capture the factory's declared return type** — a per-language `getReturnType`
    hook writes `nodes.return_type` (schema v5). `*Foo`→`Foo`, `List<Bar>`→`List`,
-   `pkg.Foo`→`Foo`, `-> Self` / `: self` / `this.type` → the declaring type.
+   Go `pkg.Foo` retains its package in the declaration file; `-> Self` / `: self` / `this.type` → the declaring type.
 2. **Preserve the chained receiver at extraction** — `tree-sitter.ts` (or a bespoke
    extractor) encodes `Foo.getInstance().bar()` as the marker string
    `Foo.getInstance().bar` (the `().` marker never appears in an ordinary ref). A
diff --git a/docs/design/csharp-kernel-port-checklist.md b/docs/design/csharp-kernel-port-checklist.md
index 663889de2a..9b09ddc0ee 100644
--- a/docs/design/csharp-kernel-port-checklist.md
+++ b/docs/design/csharp-kernel-port-checklist.md
@@ -234,8 +234,8 @@ all PRESERVE):
 | `enum_declaration` | enumTypes:1064 → extractEnum:1914 | body `enum_member_declaration_list` required (bodiless → no node); extractInheritance sees `base_list` → **the underlying type `: byte` emits an `extends` ref named `byte`** (quirk, §inheritance); `enum_member_declaration` children → extractEnumMembers:1958 — `name` field path: ONE `enum_member` node per member, positioned at the member node (attributes included in its span), values/attributes ignored; non-member children (preproc_*, comment) → visitNode (no-op) |
 | `method_declaration` | methodTypes:1027 → extractMethod:1737 | classifyMethodNode absent → always extractMethod. Gate 1747 passes via class-like (a method_declaration outside a type does not occur in non-erroring C# — top-level `void M(){}` parses as local_function_statement, probed); bodyless interface/partial signatures mint nodes with no body walk; **expression-bodied methods have `body: arrow_expression_clause` (a real body FIELD, probed) → walked** |
 | `constructor_declaration` | methodTypes → extractMethod | name field = the class-name identifier → **method node named like the class**; returnType undefined; **`constructor_initializer` (`: base(args)` / `: this(args)`) is a sibling of the body field → NEVER walked → calls inside initializer args are LOST** (probed); expression-bodied ctor body = arrow_expression_clause → walked |
-| `property_declaration` (inside class-like) | propertyTypes:1075 → extractProperty:1986 | property node, then **propertyBodies — each accessor's `body` (`get { … }`, `set => …`) and an expression-bodied `=> expr` `value:` — walked by visitFunctionBody with the property pushed** (calls, instantiates, static reads and fn-ref candidates attribute to the property; changed 2026-10-04, previously never walked), then scanFnRefSubtree (capture-only, attributed to the class) over the rest — **the `= initializer` stays unwalked** — skipping the walked bodies, + skipChildren. §property below |
-| `field_declaration` (inside class-like) | fieldTypes:1084 → extractField:2046 | field/constant nodes per declarator + scanFnRefSubtree + skipChildren → **field initializers emit no calls/instantiates/static-member refs** (fn-ref candidates only). §field below |
+| `property_declaration` (inside class-like) | propertyTypes:1075 → extractProperty:1986 | property node, then **propertyBodies — each accessor's `body` (`get { … }`, `set => …`), then the `value:` (an expression body's `=> expr` or an `= initializer`) — walked by visitFunctionBody with the property pushed** (calls, instantiates, static reads and fn-ref candidates attribute to the property; accessor/arrow bodies changed 2026-10-04, `= initializer` 2026-10-05 — previously never walked); a target-typed `= new()` value instantiates the declared type (extractTargetTypedNew); then scanFnRefSubtree (capture-only, attributed to the class) over the rest (attributes, type) skipping the walked bodies, + skipChildren. §property below |
+| `field_declaration` (inside class-like) | fieldTypes:1084 → extractField:2046 | field/constant nodes per declarator, **each declarator walked whole by visitFunctionBody with its field pushed** (its `= initializer`: calls, instantiates, static reads, fn-ref candidates incl. varinit attribute to the field; changed 2026-10-05, previously never walked); a target-typed `= new()` instantiates the declared type; then scanFnRefSubtree (capture-only, attributed to the class) skipping the walked declarators, + skipChildren. §field below |
 | `local_declaration_statement` | variableTypes:1098 (only reachable at top level — global statements; body locals go through visitFunctionBody instead) | not class-like → extractVariable:2538 → **generic fallback (2863-2881) finds no direct `identifier`/`variable_declarator` children (the declarator nests inside `variable_declaration`, probed) → ZERO nodes minted**; isClassScopeConstantAssignment (1508) needs node.type `assignment` → never true. skipChildren=true + scanFnRefSubtree → **a top-level `var builder = WebApplication.CreateBuilder(args);` produces NO node, NO calls ref, NO instantiates** — only fn-ref candidates. PRESERVE |
 | `using_directive` | importTypes:1209 → extractImport:3170 | hook (§config) → import node + ONE generic `imports` ref {fromNodeId: nodeStack top (namespace node if present, else file), referenceName: moduleName, line/col of the directive}; **no per-binding emitter** (the TS/py/rust/php/ruby ladder at 3197-3234 excludes csharp) |
 | `invocation_expression` (top level — global statements) | callTypes:1248 → extractCall:3684 | fires with caller = file/namespace node; children still visited (no skipChildren) so nested invocations recurse |
@@ -306,9 +306,10 @@ for C#) or bare `name`. QUIRKS (probed, PRESERVE):
   children [modifier, predefined_type, identifier, **arrow_expression_clause
   (`value:` field)**] → typeNode = predefined_type → signature `"int Computed"`;
   the arrow clause is a property body (walked as the property, below).
-- `{ get; } = new();` initializers: the `value:` implicit_object_creation is
-  NOT a body → no refs, no instantiates (candidates-only scan, attributed to
-  the class); the accessor_list is excluded from the type scan.
+- `{ get; } = new();` initializers: the `value:` is the
+  implicit_object_creation_expression itself (no type child) → walked as a
+  body, and extractTargetTypedNew emits `instantiates` named for the
+  declared `type` (below); the accessor_list is excluded from the type scan.
 
 Then extractDecoratorsFor (no-op) and **extractTypeAnnotations (2037) →
 extractCsharpTypeRefs** — the `type` field IS walked for refs (so `public
@@ -316,10 +317,22 @@ List<Foo> Items` emits references `List` + `Foo` even though the signature
 kept the raw text). The returned node is pushed while propertyBodies
 (tree-sitter.ts; csharp/mod.rs `property_bodies`) are walked: every
 `accessor_declaration`'s `body` field (block or arrow_expression_clause, in
-accessor order), then the property's `value:` when it is an
-arrow_expression_clause. The fn-ref scan that follows skips those subtrees
-by node id, so a candidate is captured once — from the property when it sits
-in a body, from the class when it sits in an initializer. (The
+accessor order), then the property's `value:` whatever it is (an
+arrow_expression_clause or an `= initializer` expression). Each body is
+preceded by **extractTargetTypedNew(body, `type` field)** (csharp.rs
+`extract_target_typed_new`): when the body IS an
+`implicit_object_creation_expression` it emits ONE `instantiates` ref from
+the property at the `new()`'s position, named by csharpClassTypeName
+(csharp.rs `class_type_name`): `identifier` → its text; `generic_name` → its
+identifier (`List<Foo>` → `List`); `qualified_name` / `alias_qualified_name`
+→ recurse into the `name` field (`Ns.Foo<T>` → `Foo`, `global::Foo` →
+`Foo`, `Outer<int>.Inner` → `Inner`); `nullable_type` → recurse into `type`
+(`Foo?` → `Foo`); anything else (predefined/array/tuple/pointer) → nothing.
+Only a `new()` that IS the value counts — `(new())`, `c ? new() : null` and
+nested `new()`s emit nothing. The fn-ref scan that follows skips the walked
+bodies by node id, so a candidate is captured once — from the property; only
+what is left (attribute arguments, e.g. `[Attr(Make(H))]` → `H` from the
+class) is the class's. Attributes are never walked for calls. (The
 classifyMethodNode initializer-walk path at 1031-1047 is TS-only.)
 
 ### extractField (2046) — field_declaration
@@ -342,6 +355,23 @@ classifyMethodNode initializer-walk path at 1031-1047 is TS-only.)
   the variable_declaration's `type` field (5905-5909) → **multi-declarator
   fields (`Foo A, B;`) emit the type refs ONCE PER DECLARATOR**, each from its
   own field node.
+- Then, per created field node (changed 2026-10-05 — initializers used to
+  emit nothing but fn-ref candidates, attributed to the class): push the
+  field, **extractTargetTypedNew(the declarator's LAST named child, the
+  variable_declaration's `type` field)** (§property above — a target-typed
+  `private readonly List<Foo> _items = new();` instantiates `List`), then
+  **visitFunctionBody(the whole declarator)**, pop. The C# declarator has no
+  `value` field — the initializer is its last, unnamed child (probed:
+  [name, expression]; a fixed buffer is [name, bracketed_argument_list]) —
+  so the declarator is walked whole, like VB.NET's: maybeCaptureFnRefs fires
+  on it first (varinit: `Del d = Handler;` → candidate `Handler` FROM THE
+  FIELD), then the name (inert) and the initializer — calls, instantiates,
+  static reads (`Defaults.Name` → `Defaults`) and lambda bodies (no halt:
+  `Func<int,int> f = x => Compute(x)` → the field calls `Compute`) attribute
+  to the field. extractField returns the walked declarator ids and the
+  dispatcher's scanFnRefSubtree skips them, so each candidate is captured
+  once, by the field. (Java's walk of its `value` field reports nothing back
+  — its class-level scan still captures those candidates too, unchanged.)
 - docstring/visibility/isStatic computed once from the outer declaration,
   shared by all declarators. The PHP property_element and bare-fallback
   branches (2078-2154) are unreachable for C#.
@@ -425,16 +455,20 @@ statements at top level) AND visitFunctionBody:5145. QUIRKS, PRESERVE:
 **`implicit_object_creation_expression` (`new()`) and
 `anonymous_object_creation_expression` (`new { X = 1 }`) and
 `array_creation_expression` (`new Widget[10]`) are NOT in INSTANTIATION_KINDS
-→ no instantiates refs** (target-typed `new()` — everywhere in modern C# — is
-invisible); object/collection initializer args and `new[] { Mk() }` contents
-still recurse to their own calls. Top-level `var w = new Widget();` emits
-nothing at all (§local_declaration_statement).
+→ no instantiates refs** (a target-typed `new()` in a body — `Widget c =
+new();`, an argument, a return — is invisible); the one exception is a
+`new()` that IS a field's or property's initializer, which
+extractTargetTypedNew names for the declared type (§property, §field).
+Object/collection initializer args and `new[] { Mk() }` contents still
+recurse to their own calls. Top-level `var w = new Widget();` emits nothing
+at all (§local_declaration_statement).
 
 ### extractStaticMemberRef (4750) — csharp ∈ STATIC_MEMBER_LANGS (345)
 
 Called for EVERY node in visitFunctionBody (5218) — body walker only (never
-visitNode, so class-level field initializers and top-level statements emit no
-static refs). Node gate: MEMBER_ACCESS_TYPES (323) contains
+visitNode, so top-level statements emit no static refs; field and property
+initializers ARE body-walked, so `= Defaults.Name` reads attribute to the
+member). Node gate: MEMBER_ACCESS_TYPES (323) contains
 `member_access_expression`. Skip when the access IS a call's callee (4772-4779:
 parent ∈ callTypes && callee.startIndex === node.startIndex — so
 `Console.WriteLine(…)`'s access is skipped but `DoThing(Constants.MAX)`'s
@@ -621,14 +655,17 @@ layers: `argument`→null (descend named children). special:
   nothing (not idTypes/special).
 - Capture fires from visitNode:990, visitFunctionBody:5137, and
   scanFnRefSubtree (property/field/variable declarations + top-level
-  statements, depth ≤12, capture-only). **scanFnRefSubtree's halt list
-  (tree-sitter.ts:606-612) includes the literal type `lambda_expression` —
-  which IS C#'s lambda node** — so at depth>0 the scan STOPS at a lambda in a
-  field/property initializer (`Action A = () => Register(H);` yields no
-  candidates from inside the lambda), while `anonymous_method_expression`
-  (`delegate() { … }`) is NOT in the list and is scanned through. Method-BODY
-  lambdas are unaffected (visitFunctionBody recursion has no halt — capture
-  fires per node).
+  statements, depth ≤12, capture-only — skipping the subtrees the body
+  walker already went through: property bodies/initializers and field
+  declarators, whose candidates are the member's). **scanFnRefSubtree's halt
+  list (tree-sitter.ts:606-612) includes the literal type `lambda_expression`
+  — which IS C#'s lambda node** — so at depth>0 the scan STOPS at a lambda it
+  reaches (a top-level statement's), while `anonymous_method_expression`
+  (`delegate() { … }`) is NOT in the list and is scanned through. Body-walked
+  lambdas — methods, accessors, and since 2026-10-05 field/property
+  initializers (`Action A = () => Register(H);` → candidate `H` from `A`) —
+  are unaffected (visitFunctionBody recursion has no halt — capture fires per
+  node).
 - Flush gate (flushFnRefCandidates:639): generated-file skip; `this.`-prefixed
   names skip the gate (C# never produces them — its this-forms are bare);
   otherwise name ∈ definedHere ∪ importedNames. **definedHere = same-file
@@ -762,10 +799,14 @@ AspNetCore refs / Program.cs / Startup.cs / controller-source scan.
   `struct Fwd;` (NO node); interface with bodyless method + property +
   default-impl arrow method; enum with `: byte` (extends `byte` quirk),
   attributed member, valued members; const + static-readonly (→ `constant`)
-  + multi-declarator + instance fields (signatures `Type name`);
+  + multi-declarator + instance fields (signatures `Type name`), field
+  initializers (→ the field: `= new() { TargetCb }` instantiates the declared
+  `List` and the list candidate is the field's);
   `protected internal` (→ protected); property shapes: predefined-type,
   bare-identifier type (signature loses type), generic type, expression-bodied
-  (`=>` calls → the property), `{ get; } = new();` (initializer LOST),
+  (`=>` calls → the property), `{ get; } = new();` (→ the property,
+  instantiates the declared `Widget`), `{ get; } = () => Register(H)` (the
+  lambda's call and candidate → the property),
   accessor bodies with calls (→ the property);
   event_field_declaration + event_declaration with add/remove bodies (no
   nodes; accessor calls → class); operator + conversion operator + indexer +
@@ -779,7 +820,7 @@ AspNetCore refs / Program.cs / Startup.cs / controller-source scan.
   `Foo.Create(1).Bar()` (re-encode + inner both) + `GetThing().Bar()`,
   `(myDel)(x)` (conv regex → `myDel`), `nameof(Widget)` (calls ref `nameof`);
   `new Widget(…) { … }` (instantiates + initializer calls) + `new Ns.Foo<T>()`
-  (strip both) + `new()` / `new { }` / `new Widget[10]` (all NOTHING);
+  (strip both) + body `new()` / `new { }` / `new Widget[10]` (all NOTHING);
   static value reads (`ReadType.ReadAsDouble` → `ReadType`; `Outer.Inner.DEEP`
   → `Outer`; skip-as-callee; lowercase skip); type refs: params
   (nullable/array/tuple-element/generic/qualified/`dynamic`), returns
@@ -792,7 +833,8 @@ AspNetCore refs / Program.cs / Startup.cs / controller-source scan.
   function + trailing `partial class Program`; fn-refs: `Register(HandleThing)`,
   `Register(this.HandleThing)` (bare name), `Register(C.StaticHandler)`
   (nothing), `Click += OnClick`, initializer_expression list, varinit
-  (`Action g = () => …` no candidate; `Del d = Handler;` candidate),
+  (`Action g = () => …` no candidate; `Del d = Handler;` candidate — from
+  the method for a local, from the field for a field initializer),
   `this.x = x` param-storage skip; value-refs: const target + reader methods +
   a `var MaxItems = …` local shadow (prune) + `static readonly` multi-target;
   preprocessor: `#region`/`#endregion`/`#pragma`/`#nullable`/`#define`
diff --git a/docs/design/framework-coverage.md b/docs/design/framework-coverage.md
index 3a4e174aa8..402462e23a 100644
--- a/docs/design/framework-coverage.md
+++ b/docs/design/framework-coverage.md
@@ -429,6 +429,12 @@ seam preserves literal metadata and rebases binding scopes and lines to full-fil
 positions. `sfc-component-owns-script.test.ts` covers hierarchy and execution
 ownership.
 
+### Vue template calls and Rust handler positions
+
+Vue interpolation, directive and event expressions link to visible script bindings. Template-local names and v-pre regions stay excluded; script and component ownership remain distinct. Named object literals in component scripts retain their own function members.
+
+Axum and Actix route handlers may appear below the route registration line or inside nested call arguments. Handler references keep the actual argument position. Actix scoped paths and per-resource registrations retain their existing prefix rules.
+
 ### Rails resource action filters
 
 `frameworks/ruby.ts` reads literal `only:` and `except:` action filters for both
diff --git a/docs/design/rust-lang-kernel-port-checklist.md b/docs/design/rust-lang-kernel-port-checklist.md
index 6b44e6ed9c..605013a9e8 100644
--- a/docs/design/rust-lang-kernel-port-checklist.md
+++ b/docs/design/rust-lang-kernel-port-checklist.md
@@ -370,12 +370,19 @@ while `Vec`/`Option`/`Box`/`Self` are NOT. QUIRKS, PRESERVE:
 - property_signature/method_signature branch (1283) — TS-only node types,
   never rust.
 
-### Static-member refs, cpp-isms — NOT rust
-
-`rust` ∉ STATIC_MEMBER_LANGS (345) → extractStaticMemberRef no-ops (its call
-in the body walker at 5218 must be a no-op in the walker too — cheap early
-return). namespacePrefix, cppLocalFnPtrs, stack-construction, operator calls,
-template strip: all c/cpp-gated, none apply.
+### Static-member refs (rust since #2328); cpp-isms — NOT rust
+
+`rust` ∈ STATIC_MEMBER_LANGS since #2328, with its own branch in
+extractStaticMemberRef (body walker only; the kernel's
+`extract_static_member_ref`, called at the same point of the walk): a
+`scoped_identifier` whose member is capitalized — unless it is a call's
+callee, the prefix of a longer path or part of a `use` tree — and a
+`struct_pattern`'s `scoped_type_identifier` emit one `references` ref named by
+the receiver (the segment before the member; `Self` → the impl's type via
+getReceiverType, nothing inside a trait), positioned at the receiver. The
+resolver keeps it only on an enum that declares the member as a variant.
+namespacePrefix, cppLocalFnPtrs, stack-construction, operator calls, template
+strip: all c/cpp-gated, none apply.
 
 ### Docstrings (tree-sitter-helpers.ts:95)
 
diff --git a/docs/design/telemetry.md b/docs/design/telemetry.md
index 530600d93c..bf5deed9cc 100644
--- a/docs/design/telemetry.md
+++ b/docs/design/telemetry.md
@@ -232,9 +232,9 @@ Full documentation is [`telemetry-dashboard/README.md`](../../telemetry-dashboar
   `telemetry-worker/scripts/smoke-cutover.sh` exists to cover — a mismatch there is silent,
   showing up as a panel that reads zero forever rather than as an error.
 - **Reads rollups, not raw events**, so a chart stays correct for days whose raw rows have
-  been purged. `/api/activation` is the one exception — "did this machine ever run an index"
-  is not a daily aggregate — so it reads raw `events` and is bounded by the retention window,
-  which it reports as `raw_events_from`.
+  been purged. The activation funnel's "did this machine ever run an index" is not a daily
+  aggregate, so it reads `machine_first_seen.first_index_day` instead, which the ingest Worker
+  lowers as each index event is stored and the nightly cron re-derives from raw `events`.
 - **Auth is a shared password and a signed cookie**, sized for exactly two people:
   `ADMIN_PASSWORD` + `SESSION_SECRET` as Worker secrets, constant-time compare, HMAC-signed
   cookie with no session store, everything except `/login` and `robots.txt` gated. Rotating
diff --git a/docs/viewer-launch-changelog.md b/docs/viewer-launch-changelog.md
index c9b0de1476..5b05fcd4e3 100644
--- a/docs/viewer-launch-changelog.md
+++ b/docs/viewer-launch-changelog.md
@@ -205,6 +205,8 @@ These describe `codegraph ui` and its screens. They were taken out of `## [Unrel
 
 - A viewer trail now holds up to 64 hops everywhere — the trail bar, saved trails and "Read as flow". Thanks @inth3shadows for the report and @danusha2345. (#1976)
 
+- **`codegraph ui` on Windows moves on from a port another program holds.** Windows refuses a port that another program keeps for itself, or one inside a range it reserves, with a different error than a port that is simply in use, so the viewer gave up at the first such port instead of trying the next one, and blamed ports below 1024 needing elevated privileges — a rule Windows doesn't have. It now moves on to the next free port, and when none is left, or the port you pinned with `--port` is refused, it says what Windows did and how to list the reserved ranges. Thanks @ijbranch for the report and @sx4im. (#2299)
+
 ## Entries whose graph and `codegraph_explore` half already shipped
 
 The release notes carry a reworded version of each of these. Keep only the viewer half at launch.
diff --git a/package-lock.json b/package-lock.json
index 3fb045394b..b178281341 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
       "dependencies": {
         "@clack/prompts": "^1.3.0",
         "commander": "^14.0.2",
+        "entities": "6.0.1",
         "fast-string-width": "^3.0.2",
         "fast-wrap-ansi": "^0.2.0",
         "ignore": "^7.0.5",
@@ -35,8 +36,8 @@
         "vitest": "^2.1.9"
       },
       "engines": {
-        "node": ">=22.13.0",
-        "bun": ">=1.4.0"
+        "bun": ">=1.4.0",
+        "node": ">=22.13.0"
       }
     },
     "node_modules/@asamuzakjp/css-color": {
@@ -1953,7 +1954,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
       "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
-      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
diff --git a/package.json b/package.json
index 3a960bee72..19dba3939c 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
   "dependencies": {
     "@clack/prompts": "^1.3.0",
     "commander": "^14.0.2",
+    "entities": "6.0.1",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",
     "ignore": "^7.0.5",
diff --git a/site/src/content/docs/guides/framework-routes.md b/site/src/content/docs/guides/framework-routes.md
index 3c408220d7..e6fdbde330 100644
--- a/site/src/content/docs/guides/framework-routes.md
+++ b/site/src/content/docs/guides/framework-routes.md
@@ -87,3 +87,5 @@ React Router `<Link to>` and `navigate` can read destinations returned by a rout
 Inline HTTP handler calls retain simple member receivers. Framework name conventions prefer visible declarations in the calling file, then the applicable package or directory; they exclude unrelated nested types and test-local declarations. React and Express naming conventions require imports to reach another file. NestJS provider lookup also supports convention siblings in the same directory. Vue/React conventions apply to script references, and Astro component conventions apply to `.astro` markup.
 
 Express treats the last registration argument as the handler, excluding a trailing comma. Inline arrow and function-expression handlers contribute their body calls, including when passed through a wrapper call. An inline middleware before a named handler does not replace that handler.
+
+Axum and Actix handler links use the handler argument position, including multiline and nested registrations. Actix scope prefixes remain part of the route path.
diff --git a/site/src/content/docs/reference/languages.md b/site/src/content/docs/reference/languages.md
index 929196a485..e105984460 100644
--- a/site/src/content/docs/reference/languages.md
+++ b/site/src/content/docs/reference/languages.md
@@ -7,6 +7,14 @@ Language support is automatic from the file extension — there's nothing to con
 
 C# property accessors and expression-bodied properties contribute calls and references owned by the property. VB.NET member bodies and field initializers also contribute their calls and references.
 
+C# field and property initializers retain their calls and references under the member that owns them. Target-typed `new()` resolves relative declared types through enclosing namespaces and honors `global::` qualification without requiring a redundant `using`. VB.NET resolves typed receivers, enclosing and inherited members, and Shared member reads without choosing unrelated project declarations.
+
+Go imports follow the nearest indexed module and the longest matching module path, including module changes during incremental sync. Unexported receivers and embedded methods stay in their declaring package. Dart getter reads become calls only when the receiver type reaches that getter and no nearer field in the visible class hierarchy overrides it; enum extensions and type-position references participate in resolution. Rust enum-variant values retain their enum references.
+
+Named JavaScript and TypeScript object literals own their function members, including local objects and classic-script global assignments. Member calls follow the visible object; loop-local objects stay within their scope. Destructured member calls resolve across lines while preserving the source binding at the destructure declaration; unrelated bare names stay unresolved. Vue template expressions contribute calls to script bindings while preserving component ownership. Encoded attribute expressions retain their original source positions, and template-local bindings stay within their scope.
+
+A COBOL copybook named in an explore query prioritizes its indexed source and lists its COPY and EXEC SQL INCLUDE sites. Missing indexed source is reported explicitly.
+
 | Language | Extensions | Status |
 |---|---|---|
 | TypeScript | `.ts`, `.tsx` | Full support |
diff --git a/site/src/content/docs/reference/mcp-server.md b/site/src/content/docs/reference/mcp-server.md
index 5cda110fd0..7d0f787344 100644
--- a/site/src/content/docs/reference/mcp-server.md
+++ b/site/src/content/docs/reference/mcp-server.md
@@ -59,6 +59,10 @@ CODEGRAPH_MCP_TOOLS=explore,sessions,node,search,callers
 
 Each also has a CLI equivalent (`codegraph node` / `query` / `callers` / `callees` / `impact` / `files` / `status`) for scripts and non-MCP harnesses.
 
+## Copybooks
+
+A named COBOL copybook prioritizes its indexed source and lists COPY and EXEC SQL INCLUDE sites. If no source is indexed, the result says so.
+
 ## How agents should use it
 
 CodeGraph *is* the pre-built search index. For "how does X work?", architecture, a flow ("how does X reach Y"), or where-is-X questions — and while editing code — an agent should answer with `codegraph_explore` and stop, typically with **zero file reads**, rather than re-deriving the answer with `grep` + `Read`. A direct CodeGraph answer is one to a few calls; a grep/read exploration is dozens.
diff --git a/src/codegraph.ts b/src/codegraph.ts
index 440bcef493..1dd5d07b30 100644
--- a/src/codegraph.ts
+++ b/src/codegraph.ts
@@ -47,6 +47,7 @@ import type {
 } from './extraction';
 import type { ReferenceResolver, ResolutionResult } from './resolution';
 import { GraphTraverser, GraphQueryManager } from './graph';
+import { findNamedCopybooks, type NamedCopybook } from './graph/cobol-copybooks';
 import { ContextBuilder, createContextBuilder } from './context';
 import { Mutex, FileLock } from './utils';
 import { logWarn } from './errors';
@@ -2616,6 +2617,11 @@ export class CodeGraph {
     return this.contextBuilder.getCode(nodeId);
   }
 
+  /** Indexed source and include sites for copybooks named in the query. */
+  findNamedCopybooks(query: string): NamedCopybook[] {
+    return findNamedCopybooks(this.queries, query);
+  }
+
   /**
    * Find relevant subgraph for a query
    *
diff --git a/src/context/index.ts b/src/context/index.ts
index fb4732e02d..4263b1abc2 100644
--- a/src/context/index.ts
+++ b/src/context/index.ts
@@ -27,6 +27,14 @@ import { logDebug } from '../errors';
 import { validatePathWithinRoot, isConfigLeafNode } from '../utils';
 import { isTestFile, extractSearchTerms, scorePathRelevance, getStemVariants, isDistinctiveIdentifier } from '../search/query-utils';
 import { LOW_CONFIDENCE_MARKER } from './markers';
+import { findNamedCopybooks, isCopybookInclude } from '../graph/cobol-copybooks';
+
+/**
+ * Most top-level declarations of one copybook that become entry points — its
+ * record layouts, or the first paragraphs of a procedure copybook. The rest of
+ * the copybook is one hop away (explore pins the whole file).
+ */
+const MAX_COPYBOOK_DECLARATION_ENTRIES = 3;
 
 /**
  * Extract likely symbol names from a natural language query
@@ -656,13 +664,32 @@ export class ContextBuilder {
       }
     }
 
+    // Step 2d: COBOL copybook members (#2342). `COPY CVACT01Y` / `EXEC SQL
+    // INCLUDE MYCOPYBOOK` are `import` nodes, which the default kind filter
+    // drops — so a query naming a copybook found nothing at all, though the
+    // include statement and the copybook are exactly what it asks for. Gathered
+    // apart from the kind-filtered channels and admitted ahead of them below,
+    // like an exact filename. Honors an explicit kind filter that leaves
+    // imports out.
+    const allowsIncludes = options.nodeKinds === undefined
+      || options.nodeKinds.length === 0
+      || options.nodeKinds.includes('import');
+    const copybooks = allowsIncludes
+      ? this.findCopybookEntries(query, options.nodeKinds)
+      : { entries: [], members: new Set<string>() };
+
     // Step 3: Run text search for natural language term matching
     // This catches file-name and node-name matches that semantic search may miss,
     // which is critical for template-heavy codebases (e.g., Liquid/Shopify themes)
     // where file names are the primary identifiers.
     let textResults: SearchResult[] = [];
     try {
-      const searchTerms = extractSearchTerms(query);
+      // A copybook member Step 2d resolved is not searched again as text: its
+      // only FTS hits are the import nodes this channel excludes, so the search
+      // fell through to the fuzzy fallback and returned whatever program name
+      // sat within edit distance (`CVACT01Y` → `CBACT01C`).
+      const searchTerms = extractSearchTerms(query)
+        .filter((term) => !copybooks.members.has(term.toUpperCase()));
       if (searchTerms.length > 0) {
         // Search each term individually to get broader coverage,
         // then boost results that match multiple terms
@@ -1063,6 +1090,30 @@ export class ContextBuilder {
       ];
     }
 
+    // A named copybook leads too: its own declarations, then its include
+    // statements. When the query also matched other things, the copybook takes
+    // at most half the entry slots so they are not capped away.
+    const copybookIds = new Set(copybooks.entries.map((r) => r.node.id));
+    const leafEntryIds = new Set<string>();
+    if (copybooks.entries.length > 0) {
+      const matchedElsewhere = new Set(filteredResults.map((r) => r.node.id));
+      const others = filteredResults.filter((r) => !copybookIds.has(r.node.id));
+      // Include statements in a file the rest of the query also matched come
+      // first ("COACTUPC CVACT01Y" wants COACTUPC's COPY, not the first one by
+      // path). Stable, so the declarations stay ahead of every include.
+      const otherFiles = new Set(others.map((r) => r.node.filePath));
+      const rank = (r: SearchResult): number =>
+        !isCopybookInclude(r.node) ? 0 : otherFiles.has(r.node.filePath) ? 1 : 2;
+      const ordered = [...copybooks.entries].sort((a, b) => rank(a) - rank(b));
+      const kept = others.length > 0 ? ordered.slice(0, Math.ceil(opts.searchLimit / 2)) : ordered;
+      // The copybook's own entries are not walked: an include statement has
+      // nothing to walk but the program around it, and a record layout's
+      // neighbourhood is whichever program happens to MOVE into it — walking
+      // either spent the answer on unrelated paragraphs of an including program.
+      for (const r of kept) if (!matchedElsewhere.has(r.node.id)) leafEntryIds.add(r.node.id);
+      filteredResults = [...kept, ...others];
+    }
+
     // Cap entry points so traversal budget isn't spread too thin.
     // With 36 entry points and maxNodes=120, each gets only 3 nodes — useless.
     // Cap to searchLimit so each entry point gets a meaningful traversal budget.
@@ -1085,6 +1136,8 @@ export class ContextBuilder {
         symbolsFromQuery.filter(isDistinctiveIdentifier).map(s => s.toLowerCase())
       );
       const anyStrong = filteredResults.some(r => {
+        // A copybook the query named is an exact identifier match, not prose.
+        if (copybookIds.has(r.node.id)) return true;
         if (distinctive.has(r.node.name.toLowerCase())) return true;
         const nameLower = r.node.name.toLowerCase();
         const dirSegs = path.dirname(r.node.filePath).toLowerCase().split('/');
@@ -1164,6 +1217,7 @@ export class ContextBuilder {
 
     // Traverse from each entry point
     for (const result of filteredResults) {
+      if (leafEntryIds.has(result.node.id)) continue;
       const traversalResult = this.traverser.traverseBFS(result.node.id, {
         maxDepth: opts.traversalDepth,
         edgeKinds: opts.edgeKinds && opts.edgeKinds.length > 0 ? opts.edgeKinds : undefined,
@@ -1309,6 +1363,46 @@ export class ContextBuilder {
     return { nodes: finalNodes, edges: finalEdges, roots, confidence };
   }
 
+  /**
+   * Entry points for the COBOL copybooks a query names (#2342): each indexed
+   * copybook's top-level declarations (its record layouts, or the paragraphs
+   * of a procedure copybook), then the include statements themselves — taken
+   * round-robin across the named members, so one widely-included copybook
+   * cannot crowd out another the query also names. `members` holds the
+   * matched member names, upper-cased. Both are empty when the query names no
+   * copybook, which is every query on a project without COBOL.
+   */
+  private findCopybookEntries(query: string, nodeKinds?: NodeKind[]): { entries: SearchResult[]; members: Set<string> } {
+    const named = findNamedCopybooks(this.queries, query);
+    const members = new Set(named.map((c) => c.member.toUpperCase()));
+    const entries: SearchResult[] = [];
+    const seen = new Set<string>();
+    const add = (node: Node): void => {
+      if (nodeKinds?.length && !nodeKinds.includes(node.kind)) return;
+      if (seen.has(node.id)) return;
+      seen.add(node.id);
+      entries.push({ node, score: 1 });
+    };
+    for (const copybook of named) {
+      for (const file of copybook.files) {
+        const declarationIds = this.queries.getOutgoingEdges(file.id, ['contains']).map((e) => e.target);
+        [...this.queries.getNodesByIds(declarationIds).values()]
+          .filter((n) => n.kind !== 'import' && n.kind !== 'export')
+          .sort((a, b) => a.startLine - b.startLine || a.id.localeCompare(b.id))
+          .slice(0, MAX_COPYBOOK_DECLARATION_ENTRIES)
+          .forEach(add);
+      }
+    }
+    const longest = Math.max(0, ...named.map((c) => c.includes.length));
+    for (let i = 0; i < longest; i++) {
+      for (const copybook of named) {
+        const include = copybook.includes[i];
+        if (include) add(include);
+      }
+    }
+    return { entries, members };
+  }
+
   /**
    * Get the source code for a node
    *
diff --git a/src/db/queries.ts b/src/db/queries.ts
index 335dc6cbb6..4b8da91c30 100644
--- a/src/db/queries.ts
+++ b/src/db/queries.ts
@@ -363,6 +363,9 @@ export class QueryBuilder {
     getFileNodesByNamePrefix?: SqliteStatement;
     getNodesByQualifiedNameExact?: SqliteStatement;
     getNodesByLowerName?: SqliteStatement;
+    hasFilesOfLanguage?: SqliteStatement;
+    getCobolIncludesByMember?: SqliteStatement;
+    getCobolFilesByStem?: SqliteStatement;
     getUnresolvedCount?: SqliteStatement;
     getUnresolvedBatch?: SqliteStatement;
     getUnresolvedBatchAfter?: SqliteStatement;
@@ -1671,6 +1674,52 @@ export class QueryBuilder {
     return rows.map(rowToNode);
   }
 
+  /** Does the index hold any file of this language? One seek on idx_files_language. */
+  hasFilesOfLanguage(language: string): boolean {
+    if (!this.stmts.hasFilesOfLanguage) {
+      this.stmts.hasFilesOfLanguage = this.db.prepare('SELECT 1 FROM files WHERE language = ? LIMIT 1');
+    }
+    return this.stmts.hasFilesOfLanguage.get(language) !== undefined;
+  }
+
+  /**
+   * COBOL copybook includes naming `member`: the `import` node the COBOL
+   * extractor makes for every `COPY member` and `EXEC SQL INCLUDE member`,
+   * matched case-insensitively (COBOL names ignore case), in file/line order.
+   *
+   * Seeks idx_nodes_lower_name. The unary `+` keeps the planner off the kind
+   * and language indexes, which would otherwise read every import (or every
+   * COBOL node) in the project to find the few with this name.
+   */
+  getCobolIncludesByMember(member: string, limit: number): Node[] {
+    if (!this.stmts.getCobolIncludesByMember) {
+      this.stmts.getCobolIncludesByMember = this.db.prepare(
+        "SELECT * FROM nodes WHERE lower(name) = lower(?) AND +kind = 'import' AND +language = 'cobol'"
+        + ' ORDER BY file_path, start_line, id LIMIT ?'
+      );
+    }
+    const rows = this.stmts.getCobolIncludesByMember.all(member, limit) as NodeRow[];
+    return rows.map(rowToNode);
+  }
+
+  /**
+   * COBOL file nodes whose basename stem is `member`, case-insensitively —
+   * `member.cpy`, `MEMBER.CPY`, `member.cbl`. Every such basename sorts into
+   * [`member.`, `member/`) under lower(), so this is a range seek on
+   * idx_nodes_lower_name; the unary `+` stops the planner from preferring a
+   * walk of every file node in idx_nodes_kind to save the (tiny) sort.
+   */
+  getCobolFilesByStem(member: string): Node[] {
+    if (!this.stmts.getCobolFilesByStem) {
+      this.stmts.getCobolFilesByStem = this.db.prepare(
+        "SELECT * FROM nodes WHERE lower(name) >= lower(?) || '.' AND lower(name) < lower(?) || '/'"
+        + " AND +kind = 'file' AND +language = 'cobol' ORDER BY file_path"
+      );
+    }
+    const rows = this.stmts.getCobolFilesByStem.all(member, member) as NodeRow[];
+    return rows.map(rowToNode);
+  }
+
   /**
    * Search nodes by name using FTS with fallback to LIKE for better matching
    *
diff --git a/src/extraction/index.ts b/src/extraction/index.ts
index 8ad29b5d04..4b4ea31c82 100644
--- a/src/extraction/index.ts
+++ b/src/extraction/index.ts
@@ -115,6 +115,12 @@ export interface IndexResult {
   nodesCreated: number;
   edgesCreated: number;
   errors: ExtractionError[];
+  /**
+   * Wall time in milliseconds. `CodeGraph.indexAll` reports the whole run —
+   * scanning, parsing and storing, then resolving references and linking —
+   * as it does the node and edge totals; the orchestrator's own result
+   * covers only the files' extraction.
+   */
   durationMs: number;
 }
 
@@ -133,6 +139,11 @@ export interface SyncResult {
   filesModified: number;
   filesRemoved: number;
   nodesUpdated: number;
+  /**
+   * Wall time in milliseconds. `CodeGraph.sync` reports the whole sync,
+   * resolution and linking included; the orchestrator's own result covers
+   * only reconciling and re-extracting the files.
+   */
   durationMs: number;
   changedFilePaths?: string[];
   /** Tracked paths this sync removed from the index. */
diff --git a/src/extraction/kernel/loader.ts b/src/extraction/kernel/loader.ts
index 9b22a72bfe..3382f7676d 100644
--- a/src/extraction/kernel/loader.ts
+++ b/src/extraction/kernel/loader.ts
@@ -191,7 +191,7 @@ export interface KernelResolverConfig {
   /** Nested tsconfig/jsconfig aliases, deepest `dir` first; a file under `dir` uses `map` instead of `aliases`. */
   scopedAliases?: { dir: string; map: KernelAliasMapIn }[];
   workspaces?: KernelWorkspaceIn;
-  goModulePath?: string;
+  goModules?: { modulePath: string; dir: string }[];
   cppIncludeDirs?: string[];
   nodeBuiltinSpecifiers: string[];
   frameworksActive: boolean;
@@ -248,6 +248,8 @@ export interface KernelCandidateOut {
  */
 export interface ResolveOutcome {
   status: 'resolved' | 'unresolved' | string;
+  edgeKind?: string;
+  alsoTargetNodeIds?: string[];
   targetNodeId?: string;
   confidence?: number;
   resolvedBy?: string;
diff --git a/src/extraction/languages/dart.ts b/src/extraction/languages/dart.ts
index 56432ad002..a2ccb63d95 100644
--- a/src/extraction/languages/dart.ts
+++ b/src/extraction/languages/dart.ts
@@ -1,7 +1,89 @@
 import type { TreeNode as SyntaxNode } from '../parse-tree';
-import { getNodeText } from '../tree-sitter-helpers';
+import type { UnresolvedReference } from '../../types';
+import { getNodeText, BUILTIN_TYPE_NAMES } from '../tree-sitter-helpers';
 import type { LanguageExtractor } from '../tree-sitter-types';
 
+/**
+ * Whether a Dart `type_identifier` names a type a reference should point at.
+ * Dart writes types in UpperCamelCase (`_Private`, `$Generated` too), so a
+ * lowercase one is a built-in like `num` or `dynamic` — or no type at all:
+ * error recovery around syntax the grammar predates (dot shorthands like
+ * `.leading`) turns argument names into `type_identifier`s. Two more are not
+ * types of their own: the import prefix of `p.Foo` (it names a library), and
+ * the class a `new` / `const` constructor call names (the call links it).
+ */
+export function isDartTypeName(node: SyntaxNode): boolean {
+  if (!/^[_$]*[A-Z]/.test(node.text) || BUILTIN_TYPE_NAMES.has(node.text)) return false;
+  if (node.nextSibling?.type === '.') return false;
+  const parent = node.parent;
+  return parent?.type !== 'new_expression' && parent?.type !== 'const_object_expression';
+}
+
+/**
+ * A `references` ref from `fromNodeId` for every type named inside `node` — a
+ * declared type, a generic argument, a cast or a type test (#2327).
+ */
+export function pushDartTypeRefs(
+  node: SyntaxNode,
+  fromNodeId: string,
+  push: (ref: UnresolvedReference) => void,
+): void {
+  if (node.type === 'type_identifier') {
+    if (isDartTypeName(node)) {
+      push({
+        fromNodeId,
+        referenceName: node.text,
+        referenceKind: 'references',
+        line: node.startPosition.row + 1,
+        column: node.startPosition.column,
+      });
+    }
+    return;
+  }
+  for (const child of node.namedChildren) pushDartTypeRefs(child, fromNodeId, push);
+}
+
+/** The bodies a Dart field `declaration` can sit in: a class's or mixin's, an extension's, an enum's. */
+const DART_MEMBER_BODIES: ReadonlySet<string> = new Set(['class_body', 'extension_body', 'enum_body']);
+
+/** The named nodes a top-level variable's declared type is written as (`Report? x;`, `List<Report> xs = [];`). */
+const DART_TOP_LEVEL_TYPES: ReadonlySet<string> = new Set(['type_identifier', 'type_arguments', 'function_type', 'record_type']);
+
+/** Type refs from `fromNodeId` for the initializers in an `initialized_identifier_list` (each entry is its name, then its value). */
+function pushDartInitializerTypeRefs(
+  list: SyntaxNode,
+  fromNodeId: string,
+  push: (ref: UnresolvedReference) => void,
+): void {
+  for (const entry of list.namedChildren) {
+    if (entry.type !== 'initialized_identifier') continue;
+    for (const part of entry.namedChildren.slice(1)) pushDartTypeRefs(part, fromNodeId, push);
+  }
+}
+
+/**
+ * A Dart member read — `x.area`, `s?.label`, `Config.instance` — as the ref
+ * `<receiver>.<member>`, positioned on the member's name. Reading a getter runs
+ * it, so the resolver links the read to a getter, as a call, and to nothing
+ * else (#2338). The receiver must be a plain name, the one shape whose type the
+ * resolver can look up; a member that is called (`x.grow()`) is the call's.
+ */
+export function dartMemberRead(node: SyntaxNode): { name: string; node: SyntaxNode } | undefined {
+  if (node.type !== 'selector') return undefined;
+  const accessor = node.namedChildren.find((c: SyntaxNode) =>
+    c.type === 'unconditional_assignable_selector' || c.type === 'conditional_assignable_selector'
+  );
+  const member = accessor?.namedChildren.find((c: SyntaxNode) => c.type === 'identifier');
+  if (!member) return undefined;
+  const receiver = node.previousNamedSibling;
+  if (receiver?.type !== 'identifier') return undefined;
+  const next = node.nextNamedSibling;
+  if (next?.type === 'selector' && next.namedChildren.some((c: SyntaxNode) => c.type === 'argument_part')) {
+    return undefined;
+  }
+  return { name: `${receiver.text}.${member.text}`, node: member };
+}
+
 /**
  * The `function_signature` carrying a method's return type — unwrapped from a
  * `method_signature` wrapper (Dart nests the signature one level for methods).
@@ -147,17 +229,48 @@ export const dartExtractor: LanguageExtractor = {
   // parent scope (`file:` top-level / `class:` static member) comes from the
   // node stack, both of which the value-reference target gate accepts.
   visitNode: (node, ctx) => {
+    const push = (ref: UnresolvedReference) => ctx.addUnresolvedReference(ref);
     if (node.type === 'static_final_declaration') {
       const nameNode = node.namedChildren.find((c: SyntaxNode) => c.type === 'identifier');
       if (nameNode) {
         const valueNode = nameNode.nextNamedSibling;
         const initValue = valueNode ? getNodeText(valueNode, ctx.source).slice(0, 100) : undefined;
-        ctx.createNode('constant', getNodeText(nameNode, ctx.source), node, {
+        const constant = ctx.createNode('constant', getNodeText(nameNode, ctx.source), node, {
           signature: initValue ? `= ${initValue}${initValue.length >= 100 ? '...' : ''}` : undefined,
         });
+        // The types its initializer names are the constant's — riverpod's
+        // `final reportProvider = Family<Report?, String>();` (#2327).
+        if (constant) {
+          for (let value = valueNode; value; value = value.nextNamedSibling) pushDartTypeRefs(value, constant.id, push);
+        }
       }
       return true;
     }
+    // A field's declared type, and the types its initializer names, are its
+    // class's: Dart fields mint no nodes of their own (`final Report report;`,
+    // #2327). A `static final` / `const` field's initializer is its constant's.
+    if (node.type === 'declaration') {
+      const owner = ctx.nodeStack[ctx.nodeStack.length - 1];
+      const inBody = node.parent !== null && DART_MEMBER_BODIES.has(node.parent.type);
+      const isField = inBody && node.namedChildren.some((c: SyntaxNode) =>
+        c.type === 'initialized_identifier_list' || c.type === 'static_final_declaration_list'
+      );
+      if (owner && isField) {
+        for (const child of node.namedChildren) {
+          if (child.type === 'initialized_identifier_list') pushDartInitializerTypeRefs(child, owner, push);
+          else if (child.type !== 'static_final_declaration_list') pushDartTypeRefs(child, owner, push);
+        }
+      }
+      return false;
+    }
+    // A top-level variable's declared type and its (non-constant) initializer
+    // are the file's — the grammar lays them out directly under `program`.
+    const topLevelType = DART_TOP_LEVEL_TYPES.has(node.type);
+    if ((topLevelType || node.type === 'initialized_identifier_list') && node.parent?.type === 'program') {
+      const owner = ctx.nodeStack[ctx.nodeStack.length - 1];
+      if (owner && topLevelType) pushDartTypeRefs(node, owner, push);
+      else if (owner) pushDartInitializerTypeRefs(node, owner, push);
+    }
     return false;
   },
   resolveBody: (node, bodyField) => {
@@ -389,4 +502,5 @@ export const dartExtractor: LanguageExtractor = {
 
     return undefined;
   },
+  extractMemberRead: dartMemberRead,
 };
diff --git a/src/extraction/languages/go.ts b/src/extraction/languages/go.ts
index 0a19f0f879..c8fbf9b95d 100644
--- a/src/extraction/languages/go.ts
+++ b/src/extraction/languages/go.ts
@@ -7,35 +7,22 @@ import type { LanguageExtractor } from '../tree-sitter-types';
  * `New().Method()` could be called on (the #645/#608 mechanism). Reads the
  * `result` field: a pointer `*Foo` is unwrapped to `Foo`, a multi-return
  * `(*Foo, error)` takes the first result (the idiomatic value-or-error shape),
- * a qualified `pkg.Foo` reduces to its last segment, and generics to the base.
- * Built-ins / unnamed results simply fail the later existence check.
+ * a qualified `pkg.Foo` retains its package, and generics reduce to the base.
+ * Unnamed collection results are excluded; built-ins fail the later existence check.
  */
 function extractGoReturnType(node: SyntaxNode, source: string): string | undefined {
-  let result = getChildByField(node, 'result');
-  if (!result) return undefined;
-  // Multi-return `(T, error)` → the first result's type.
-  if (result.type === 'parameter_list') {
-    const first = result.namedChildren.find((c: SyntaxNode) => c.type === 'parameter_declaration');
-    if (!first) return undefined;
-    result = getChildByField(first, 'type') ?? first;
+  let result: SyntaxNode | null | undefined = getChildByField(node, 'result');
+  if (result?.type === 'parameter_list') {
+    const first = result.namedChildren.find((child: SyntaxNode) => child.type === 'parameter_declaration');
+    result = first ? getChildByField(first, 'type') : undefined;
   }
-  // Unwrap a pointer `*Foo` → `Foo`.
   if (result?.type === 'pointer_type') {
-    result =
-      result.namedChildren.find(
-        (c: SyntaxNode) =>
-          c.type === 'type_identifier' || c.type === 'qualified_type' || c.type === 'generic_type',
-      ) ?? result;
+    result = result.namedChildren.find((child: SyntaxNode) =>
+      ['type_identifier', 'qualified_type', 'generic_type'].includes(child.type));
   }
-  if (!result) return undefined;
-  const text = getNodeText(result, source)
-    .trim()
-    .replace(/^\*/, '')
-    .replace(/<[^>]*>/g, '')
-    .replace(/\[[^\]]*\]/g, ''); // strip generic args `Foo[T]`
-  const last = text.split('.').pop()?.trim(); // qualified `pkg.Foo` → `Foo`
-  if (!last || !/^[A-Za-z_]\w*$/.test(last)) return undefined;
-  return last;
+  if (!result || !['type_identifier', 'qualified_type', 'generic_type'].includes(result.type)) return undefined;
+  const base = getNodeText(result, source).trim().split('[')[0]!.trim();
+  return /^[A-Za-z_]\w*(?:\.[A-Za-z_]\w*)?$/.test(base) ? base : undefined;
 }
 
 export const goExtractor: LanguageExtractor = {
diff --git a/src/extraction/sfc-script.ts b/src/extraction/sfc-script.ts
index 0187abdb0a..2d120d95ea 100644
--- a/src/extraction/sfc-script.ts
+++ b/src/extraction/sfc-script.ts
@@ -72,7 +72,11 @@ export function foldScriptResult(result: ExtractionResult, fold: ScriptFold, sin
   for (const edge of result.edges) {
     if (edge.kind === 'contains' && edge.source === blockFile) continue;
     if (edge.line) edge.line += fold.lineOffset;
-    if (fold.perInstance && runsAsComponent(edge.source) && edge.kind !== 'imports') edge.source = fold.componentNodeId;
+    // What a top-level value DOES is the component's; what it HOLDS stays its
+    // own — `const api = { load() {…} }` keeps `api::load` (#2300).
+    if (fold.perInstance && runsAsComponent(edge.source) && edge.kind !== 'imports' && edge.kind !== 'contains') {
+      edge.source = fold.componentNodeId;
+    }
     sink.edges.push(edge);
   }
 
diff --git a/src/extraction/tree-sitter-helpers.ts b/src/extraction/tree-sitter-helpers.ts
index 55ef591b8e..38a63e31bd 100644
--- a/src/extraction/tree-sitter-helpers.ts
+++ b/src/extraction/tree-sitter-helpers.ts
@@ -60,6 +60,27 @@ export function getChildByField(node: SyntaxNode, fieldName: string): SyntaxNode
   return node.childForFieldName(fieldName);
 }
 
+/**
+ * Built-in/primitive type names that shouldn't create references. Shared by the
+ * core type-annotation walker and the per-language ones (Dart's), so every type
+ * position skips the same names.
+ */
+export const BUILTIN_TYPE_NAMES: ReadonlySet<string> = new Set([
+  'string', 'number', 'boolean', 'void', 'null', 'undefined', 'never', 'any', 'unknown',
+  'object', 'symbol', 'bigint', 'true', 'false',
+  // Rust
+  'str', 'bool', 'i8', 'i16', 'i32', 'i64', 'i128', 'isize',
+  'u8', 'u16', 'u32', 'u64', 'u128', 'usize', 'f32', 'f64', 'char',
+  // Java/C#
+  'int', 'long', 'short', 'byte', 'float', 'double', 'char',
+  // Go
+  'int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32', 'uint64',
+  'float32', 'float64', 'complex64', 'complex128', 'rune', 'error',
+  // Scala (capitalized primitives + ubiquitous stdlib aliases)
+  'Int', 'Long', 'Short', 'Byte', 'Float', 'Double', 'Boolean', 'Char', 'Unit',
+  'String', 'Any', 'AnyRef', 'AnyVal', 'Nothing', 'Null',
+]);
+
 /**
  * Node types that *wrap* a declaration so a leading comment is a sibling of the
  * wrapper, not of the emitted (inner) declaration node. CodeGraph emits the
diff --git a/src/extraction/tree-sitter-types.ts b/src/extraction/tree-sitter-types.ts
index 16c85398d6..7df63ed9ee 100644
--- a/src/extraction/tree-sitter-types.ts
+++ b/src/extraction/tree-sitter-types.ts
@@ -311,6 +311,15 @@ export interface LanguageExtractor {
    */
   extractBareCall?: (node: SyntaxNode, source: string) => string | undefined;
 
+  /**
+   * Detect a member read that may run code — Dart's `x.area`, which calls the
+   * getter `area` when `area` is one. Returns the ref name (`x.area`) and the
+   * node to position it on, or undefined. Emitted as a `references` ref from
+   * the function the read is in; the resolver links it only to a getter, with
+   * a `calls` edge (a plain field read links nothing).
+   */
+  extractMemberRead?: (node: SyntaxNode) => { name: string; node: SyntaxNode } | undefined;
+
   /**
    * Node types representing a file-level package/namespace declaration
    * (e.g. Kotlin `package_header`, Java `package_declaration`). When set,
diff --git a/src/extraction/tree-sitter.ts b/src/extraction/tree-sitter.ts
index faae8298e9..7297c33d20 100644
--- a/src/extraction/tree-sitter.ts
+++ b/src/extraction/tree-sitter.ts
@@ -19,13 +19,14 @@ import {
 import { detectLanguage, isLanguageSupported, isFileLevelOnlyLanguage } from './grammars';
 import { parseSourceTreeSync } from './parse-tree';
 import { KernelUnavailableError } from './kernel/loader';
-import { NodeIdAllocator, getNodeText, getChildByField, getPrecedingDocstring } from './tree-sitter-helpers';
+import { NodeIdAllocator, getNodeText, getChildByField, getPrecedingDocstring, BUILTIN_TYPE_NAMES } from './tree-sitter-helpers';
 import { FN_REF_SPECS, captureFnRefCandidates, type FnRefSpec, type FnRefCandidate } from './function-ref';
-import { isGeneratedFile } from './generated-detection';
+import { isGeneratedFile, isMinifiedContent } from './generated-detection';
 import type { LanguageExtractor, ExtractorContext } from './tree-sitter-types';
 import { EXTRACTORS } from './languages';
 import { stripCppTemplateArgs, isCppConstructorDeclaration } from './languages/c-cpp';
 import { rustImplTypeName } from './languages/rust';
+import { isDartTypeName, pushDartTypeRefs } from './languages/dart';
 import { LiquidExtractor } from './liquid-extractor';
 import { RazorExtractor } from './razor-extractor';
 import { SvelteExtractor } from './svelte-extractor';
@@ -256,6 +257,38 @@ function scalaBaseTypeName(node: SyntaxNode | null, source: string): string | nu
   }
 }
 
+/**
+ * The class a C# declared type names, as `new T()` would name it: `Foo`,
+ * `List<Foo>` → `List`, `Ns.Foo` → `Ns.Foo`, `global::Foo` → `global::Foo`, `Foo?` → `Foo`.
+ * Predefined, array, tuple and pointer types name no class → null. Mirrored
+ * in the kernel (csharp.rs class_type_name).
+ */
+function csharpClassTypeName(node: SyntaxNode | null, source: string): string | null {
+  if (!node) return null;
+  switch (node.type) {
+    case 'identifier':
+      return getNodeText(node, source) || null;
+    case 'generic_name':
+      return csharpClassTypeName(node.namedChildren.find((c: SyntaxNode) => c.type === 'identifier') ?? null, source);
+    case 'qualified_name': {
+      const qualifier = csharpClassTypeName(getChildByField(node, 'qualifier'), source);
+      const name = csharpClassTypeName(getChildByField(node, 'name'), source);
+      return qualifier && name ? `${qualifier}.${name}` : null;
+    }
+    case 'alias_qualified_name': {
+      const alias = getChildByField(node, 'alias');
+      const name = csharpClassTypeName(getChildByField(node, 'name'), source);
+      if (!alias || !name) return null;
+      const qualifier = getNodeText(alias, source);
+      return `${qualifier}::${name}`;
+    }
+    case 'nullable_type':
+      return csharpClassTypeName(getChildByField(node, 'type'), source);
+    default:
+      return null;
+  }
+}
+
 /**
  * Resolve the declared identifier inside a C declarator. A `declaration`'s
  * `declarator` field nests the name through `init_declarator` (with value),
@@ -355,7 +388,7 @@ const PHP_TYPE_NODES: ReadonlySet<string> = new Set([
  */
 const MEMBER_ACCESS_TYPES: ReadonlySet<string> = new Set([
   'field_access',                       // java (`Foo.BAR`)
-  'member_access_expression',           // c#  (`Foo.Bar`)
+  'member_access_expression',           // c# / vb.net (`Foo.Bar`)
   'navigation_expression',              // kotlin / swift (`Foo.bar`)
   'field_expression',                   // scala (`Foo.bar`)
   'class_constant_access_expression',   // php (`Foo::CONST`, `Foo::class`)
@@ -374,11 +407,33 @@ const MEMBER_ACCESS_TYPES: ReadonlySet<string> = new Set([
  * static read is pure duplication) — while adding real graph noise (+1813 edges /
  * +2448 `references` on excalidraw, the retrieval-perf benchmark, all pointing at
  * already-covered types). Don't re-add `member_expression`/`attribute` here.
+ * VB.NET (#2305) sends the member with its receiver instead, and its resolver
+ * decides whether the receiver is a type (see extractVbMemberRead).
+ * Rust imports too, but a variant is usually written through a path that names
+ * its module, not its enum (`mode::Mode::A` under `use crate::mode;`), so no
+ * `use` names the enum at all (#2328).
  */
 const STATIC_MEMBER_LANGS: ReadonlySet<string> = new Set([
-  'java', 'csharp', 'kotlin', 'swift', 'scala', 'dart', 'php', 'cpp',
+  'java', 'csharp', 'kotlin', 'swift', 'scala', 'dart', 'php', 'cpp', 'vbnet', 'rust',
 ]);
 
+/**
+ * Parents of a Rust `scoped_identifier` that is not a member written as a
+ * value or a pattern: the prefix of a longer path, or a `use` tree.
+ */
+const RUST_NON_MEMBER_PATH_PARENTS: ReadonlySet<string> = new Set([
+  'scoped_identifier', 'scoped_type_identifier',
+  'use_declaration', 'use_list', 'scoped_use_list', 'use_as_clause', 'use_wildcard',
+]);
+
+/**
+ * VB.NET receivers no project type can be named: the namespace roots
+ * (`System.IO.Path`, `My.Settings`, `Global.X`) and the built-in type keywords
+ * (`String.Empty`, `Integer.MaxValue`). A read through one is never sent.
+ */
+const VB_NON_TYPE_RECEIVERS =
+  /^(?:Global|System|Microsoft|My|Boolean|Byte|Char|Date|Decimal|Double|Integer|Long|Object|SByte|Short|Single|String|UInteger|ULong|UShort)$/i;
+
 /**
  * Tree-sitter node kinds that represent constructor invocations
  * (`new Foo()` and friends). Used by extractInstantiation to emit
@@ -427,6 +482,25 @@ const TS_JS_CHAIN_LANGUAGES = new Set(['typescript', 'tsx', 'javascript', 'jsx']
 
 /** Receiver node types (TS/JS grammars) that continue a member chain downward. */
 const TS_JS_CHAIN_RECEIVER_TYPES = new Set(['member_expression', 'subscript_expression']);
+
+/**
+ * A named object literal owns its function members (#2300): `const api = {
+ * load() {…}, save: () => {…} }`, the same object inside an IIFE or another
+ * function, or one hung on a path — `window.App = {…}`, `App.utils = {…}`.
+ * Each member is a `function` node qualified under its owner (`api::load`,
+ * `window.App::init`), and the calls written in it are its own. These are the
+ * values a member can hold, and the keys that name one — a computed `[expr]`
+ * key names nothing static, so its member's code stays with the owner.
+ * Mirrored in the kernel (tsjs/extractors.rs).
+ */
+const OBJECT_MEMBER_FUNCTION_TYPES: ReadonlySet<string> = new Set(['arrow_function', 'function_expression', 'generator_function']);
+const STATIC_OBJECT_KEY_TYPES: ReadonlySet<string> = new Set(['property_identifier', 'string', 'number']);
+/**
+ * Path roots that are the global object: `window.App = {…}` defines the global
+ * `App`. (`self` is the global only in a worker; in page code it is far more
+ * often `var self = this`, so `self.x = {…}` stays an ordinary path.)
+ */
+const HOST_GLOBAL_ROOTS: ReadonlySet<string> = new Set(['window', 'globalThis']);
 /** The field of a `this.<field>.<method>()` receiver: public or ES private (#1496, #1987). */
 const THIS_FIELD_PROPERTY_TYPES = new Set(['property_identifier', 'private_property_identifier']);
 /** A Swift receiver that is a path of types, `API.PackageController.GetRoute` — two segments or more, each capitalized. */
@@ -564,6 +638,8 @@ export class TreeSitterExtractor {
   private fnRefCandidates: Array<FnRefCandidate & { fromNodeId: string }> = [];
   // Memoized "is this a Vue store file" verdict (per-extractor = per-file).
   private vueStoreFile: boolean | null = null;
+  private objectPathOwners = new Map<string, string>();
+  private ownsObjects: boolean | null = null;
   // Source already went through the extractor's preParse at the kernel route
   // point (this instance is the generic extractor for a kernel-deferred file) —
   // don't blank it a second time.
@@ -886,7 +962,7 @@ export class TreeSitterExtractor {
    * distinctive names become reference targets; function/method/const/var symbols become reader
    * scopes whose bodies flushValueRefs scans.
    */
-  private captureValueRefScope(kind: NodeKind, name: string, id: string, node: SyntaxNode): void {
+  private captureValueRefScope(kind: NodeKind, name: string, id: string, node: SyntaxNode, valueTarget = true): void {
     // Pascal targets `constant` only: its extractor emits function PARAMETERS
     // (`Dest: TBufferWriter`) and class fields (`declField`) as `variable` at the
     // enclosing scope, which would otherwise become noisy targets (a param name
@@ -895,7 +971,7 @@ export class TreeSitterExtractor {
     // `var` globals are the rare cost; the parameter/field noise dominates.)
     const targetKindOk =
       this.language === 'pascal' ? kind === 'constant' : kind === 'constant' || kind === 'variable';
-    if (targetKindOk && name.length >= 3 && /[A-Z_]/.test(name)) {
+    if (valueTarget && targetKindOk && name.length >= 3 && /[A-Z_]/.test(name)) {
       const parentId = this.nodeStack[this.nodeStack.length - 1];
       // file-scope OR class/module/struct/enum-scope constants are targets.
       // Class/module scope matters for languages (Ruby) that keep nearly all
@@ -1192,6 +1268,10 @@ export class TreeSitterExtractor {
     // can never shadow or be shadowed by an extraction branch.
     this.maybeCaptureFnRefs(node, nodeType);
 
+    // `window.App = {…}` / `App.utils = {…}`: the object's functions are the
+    // path's members (#2300). Its whole subtree is handled there.
+    if (nodeType === 'assignment_expression' && this.extractAssignedObjectOwner(node, true)) return;
+
     // Check for function declarations
     // For Python/Ruby, function_definition inside a class should be treated as method
     if (this.extractor.functionTypes.includes(nodeType)) {
@@ -1303,22 +1383,27 @@ export class TreeSitterExtractor {
       const bodies = propNode ? this.propertyBodies(node) : [];
       if (propNode && bodies.length > 0) {
         this.nodeStack.push(propNode.id);
-        for (const body of bodies) this.visitFunctionBody(body, propNode.id);
+        const declaredType = getChildByField(node, 'type');
+        for (const body of bodies) {
+          this.extractTargetTypedNew(body, declaredType);
+          this.visitFunctionBody(body, propNode.id);
+        }
         this.nodeStack.pop();
       }
-      // Whatever the body walk didn't cover (a C# `= initializer`, any other
-      // language's whole declaration) is scanned for function-as-value
+      // Whatever the body walk didn't cover (a C# property's attributes, any
+      // other language's whole declaration) is scanned for function-as-value
       // candidates (#756); the bodies captured their own.
       this.scanFnRefSubtree(node, 0, new Set(bodies.map((b) => b.id)));
       skipChildren = true;
     }
     // Check for class fields (e.g. Java field_declaration, C# field_declaration)
     else if (this.extractor.fieldTypes?.includes(nodeType) && this.isInsideClassLikeNode()) {
-      this.extractField(node);
-      // Field initializers aren't walked — scan for function-as-value
-      // candidates (#756): Java `List<IntConsumer> table = List.of(Main::cb)`,
-      // C# `List<Action<int>> table = new() { TargetCb }`.
-      this.scanFnRefSubtree(node, 0);
+      const walked = this.extractField(node);
+      // Scan the declaration for function-as-value candidates (#756): Java
+      // `List<IntConsumer> table = List.of(Main::cb)`. A C# declarator
+      // extractField walked captured its own (`List<Action<int>> table =
+      // new() { TargetCb }` is the field's), so the scan skips it.
+      this.scanFnRefSubtree(node, 0, walked);
       skipChildren = true;
     }
     // Check for variable declarations (const, let, var, etc.)
@@ -1541,7 +1626,10 @@ export class TreeSitterExtractor {
     kind: NodeKind,
     name: string,
     node: SyntaxNode,
-    extra?: Partial<Node>
+    extra?: Partial<Node>,
+    // False for a value no other scope names by this name — a local, or an
+    // object hung on a dotted path (see captureValueRefScope).
+    valueTarget = true
   ): Node | null {
     // Skip nodes with empty/missing names — they are not meaningful symbols
     // and would cause FK violations when edges reference them (see issue #42)
@@ -1603,7 +1691,7 @@ export class TreeSitterExtractor {
       }
     }
 
-    if (this.valueRefsEnabled) this.captureValueRefScope(kind, name, id, node);
+    if (this.valueRefsEnabled) this.captureValueRefScope(kind, name, id, node, valueTarget);
 
     return newNode;
   }
@@ -1682,6 +1770,13 @@ export class TreeSitterExtractor {
     // C/C++ enclosing namespaces prefix first (empty for every other language).
     const parts: string[] = [...this.namespacePrefix];
     for (const nodeId of this.nodeStack) {
+      // An object literal hung on a path qualifies what it holds by that path
+      // (`window.App::init`), which already carries its own scope.
+      const pathOwner = this.objectPathOwners.get(nodeId);
+      if (pathOwner !== undefined) {
+        parts.splice(0, parts.length, pathOwner);
+        continue;
+      }
       const node = this.nodes.find((n) => n.id === nodeId);
       if (node && node.kind !== 'file') {
         parts.push(node.name);
@@ -2442,7 +2537,7 @@ export class TreeSitterExtractor {
    * as children of the declaration itself, so the declaration is walked
    * whole, the way its methods are (resolveBody). C# runs code in each
    * accessor's body (`get { … }`, `set => …`) and in an expression-bodied
-   * property's `=> …`; its `= initializer`, like a field's, stays unwalked.
+   * property's value, including its initializer.
    * Mirrored in the kernel (csharp/mod.rs property_bodies).
    */
   private propertyBodies(node: SyntaxNode): SyntaxNode[] {
@@ -2454,16 +2549,41 @@ export class TreeSitterExtractor {
       if (body) bodies.push(body);
     }
     const value = getChildByField(node, 'value');
-    if (value?.type === 'arrow_expression_clause') bodies.push(value);
+    if (value) bodies.push(value);
     return bodies;
   }
 
+  /**
+   * A C# target-typed `new()` names no type, which is why INSTANTIATION_KINDS
+   * leaves `implicit_object_creation_expression` out. As a field's or
+   * property's initializer, though, it constructs the declared type:
+   * `private readonly List<Foo> _items = new();` instantiates List, as
+   * `new List<Foo>()` does. Emitted from the node-stack top (the member).
+   * Mirrored in the kernel (csharp.rs extract_target_typed_new).
+   */
+  private extractTargetTypedNew(value: SyntaxNode | null, declaredType: SyntaxNode | null): void {
+    if (this.language !== 'csharp' || value?.type !== 'implicit_object_creation_expression') return;
+    const className = declaredType ? csharpClassTypeName(declaredType, this.source) : null;
+    const fromNodeId = this.nodeStack[this.nodeStack.length - 1];
+    if (!className || !fromNodeId) return;
+    this.unresolvedReferences.push({
+      fromNodeId,
+      referenceName: className,
+      referenceKind: 'instantiates',
+      line: value.startPosition.row + 1,
+      column: value.startPosition.column,
+    });
+  }
+
   /**
    * Extract a class field declaration (e.g. Java field_declaration, C# field_declaration).
    * Extracts each declarator as a 'field' kind node inside the owning class.
+   * Returns the C# declarators it walked, for the function-as-value scan to
+   * skip.
    */
-  private extractField(node: SyntaxNode): void {
-    if (!this.extractor) return;
+  private extractField(node: SyntaxNode): Set<number> {
+    const walked = new Set<number>();
+    if (!this.extractor) return walked;
 
     const docstring = this.docstringFor(node);
     const visibility = this.extractor.getVisibility?.(node);
@@ -2521,7 +2641,7 @@ export class TreeSitterExtractor {
             this.extractMarkdownPathReferencesFromSubtree(elem, fieldNode.id);
           }
         }
-        return;
+        return walked;
       }
     }
 
@@ -2568,11 +2688,24 @@ export class TreeSitterExtractor {
           // edge at all and `target` looked callerless. Keyed on the `value`
           // FIELD, which only Java's `variable_declarator` carries. VB.NET
           // writes `= expr` (the declarator's `initializer`) or `As New T(…)`
-          // (inside its as_clause), so its whole declarator is walked. C#
-          // and PHP spell their initializer differently and are untouched.
-          const valueNode = this.language === 'vbnet' ? decl : getChildByField(decl, 'value');
+          // (inside its as_clause), and C# writes `= expr` as the
+          // declarator's last, unnamed child, so both walk the whole
+          // declarator. PHP spells its initializer differently and is
+          // untouched.
+          const wholeDeclarator = this.language === 'vbnet' || this.language === 'csharp';
+          const valueNode = wholeDeclarator ? decl : getChildByField(decl, 'value');
           if (valueNode) {
             this.nodeStack.push(fieldNode.id);
+            if (this.language === 'csharp') {
+              this.extractTargetTypedNew(
+                decl.namedChild(decl.namedChildCount - 1),
+                varDecl ? getChildByField(varDecl, 'type') : null,
+              );
+              // Its function-as-value candidates are the field's, captured
+              // here once. (VB.NET captures none; Java's scan still takes
+              // its initializers for the class as well.)
+              walked.add(decl.id);
+            }
             this.visitFunctionBody(valueNode, fieldNode.id);
             this.nodeStack.pop();
           }
@@ -2594,6 +2727,7 @@ export class TreeSitterExtractor {
         }
       }
     }
+    return walked;
   }
 
   /**
@@ -2603,6 +2737,158 @@ export class TreeSitterExtractor {
    * object returned by a store-initializer call. Handles both `key: () => {}` /
    * `key: function() {}` pairs and method shorthand `key() {}`.
    */
+  private ownsObjectLiterals(): boolean {
+    this.ownsObjects ??= TS_JS_CHAIN_LANGUAGES.has(this.language) && !isGeneratedFile(this.filePath) &&
+      !isMinifiedContent(this.filePath, this.source);
+    return this.ownsObjects;
+  }
+
+  /**
+   * The function an owned literal's member becomes, named by its static key:
+   * `load() {…}`, `load: () => {…}`, `load: function () {…}`, `load: function* () {…}`.
+   * Null for every other member — a computed key, a value, a shorthand, a spread.
+   */
+  private ownedMemberFunction(member: SyntaxNode): { fn: SyntaxNode; name: string } | null {
+    if (member.type === 'method_definition') {
+      const key = getChildByField(member, 'name');
+      return key && STATIC_OBJECT_KEY_TYPES.has(key.type) ? { fn: member, name: this.objectKeyName(key) } : null;
+    }
+    if (member.type !== 'pair') return null;
+    const key = getChildByField(member, 'key');
+    const value = getChildByField(member, 'value');
+    if (!key || !value || !STATIC_OBJECT_KEY_TYPES.has(key.type) || !OBJECT_MEMBER_FUNCTION_TYPES.has(value.type)) return null;
+    return { fn: value, name: this.objectKeyName(key) };
+  }
+
+  /** `value` when it is an object literal that owns at least one function member, else null. */
+  private ownedObjectValue(value: SyntaxNode | null): SyntaxNode | null {
+    if (!value || (value.type !== 'object' && value.type !== 'object_expression') || !this.ownsObjectLiterals()) return null;
+    for (let i = 0; i < value.namedChildCount; i++) {
+      const member = value.namedChild(i);
+      if (member && this.ownedMemberFunction(member)) return value;
+    }
+    return null;
+  }
+
+  /**
+   * Extract an owned literal's members: each function member becomes a node
+   * of its own, qualified under the owner (at file scope for one on the global
+   * object, `global`). Every other member — a value, a computed key, a spread —
+   * runs where the literal is written, so it is walked there: under the owner
+   * for a module-scope declaration (`valuesUnderOwner`, its initializer's calls
+   * are the constant's, #693), under the enclosing function for a local or an
+   * assignment, as they were before members had nodes. The literal's shorthand
+   * members (`{ load }`) go to the function-as-value capture the same way.
+   */
+  private extractOwnedObjectMembers(obj: SyntaxNode, ownerId: string, valuesUnderOwner: boolean, global: boolean): void {
+    const enclosing = this.nodeStack;
+    const ownerStack = [...(global ? enclosing.slice(0, 1) : enclosing), ownerId];
+    const valueStack = valuesUnderOwner ? ownerStack : enclosing;
+    this.nodeStack = valueStack;
+    this.maybeCaptureFnRefs(obj, obj.type);
+    for (let i = 0; i < obj.namedChildCount; i++) {
+      const member = obj.namedChild(i);
+      if (!member) continue;
+      const owned = this.ownedMemberFunction(member);
+      this.nodeStack = owned ? ownerStack : valueStack;
+      if (owned) this.extractFunction(owned.fn, owned.name);
+      else this.visitFunctionBody(member, '');
+    }
+    this.nodeStack = enclosing;
+  }
+
+  /**
+   * `const api = { load() {…} }` written in a function body or an IIFE: the
+   * owner gets the node a module-scope declaration would, and its members are
+   * extracted under it (#2300). Returns false when the declarator holds no
+   * owned literal, leaving it to the walker.
+   */
+  private extractLocalObjectOwner(declarator: SyntaxNode): boolean {
+    const nameNode = getChildByField(declarator, 'name');
+    if (nameNode?.type !== 'identifier') return false;
+    const obj = this.ownedObjectValue(getChildByField(declarator, 'value'));
+    if (!obj) return false;
+    const declaration = declarator.parent;
+    const isConst = declaration ? (this.extractor?.isConst?.(declaration) ?? false) : false;
+    const initValue = getNodeText(obj, this.source).slice(0, 100);
+    // A local: never the target of another scope's value read.
+    const owner = this.createNode(isConst ? 'constant' : 'variable', getNodeText(nameNode, this.source), declarator, {
+      docstring: this.docstringFor(declarator),
+      signature: `= ${initValue}${initValue.length >= 100 ? '...' : ''}`,
+      isExported: false,
+    }, false);
+    if (!owner) return false;
+    this.extractVariableTypeAnnotation(declarator, owner.id);
+    this.extractOwnedObjectMembers(obj, owner.id, false, false);
+    return true;
+  }
+
+  /**
+   * `window.App = {…}` / `App.utils = {…}` / `dw_page = {…}`: an object
+   * literal assigned to a name owns its function members like a declared one
+   * (#2300). Assigned to a plain identifier — an implicit global, or a binding
+   * declared elsewhere — it is qualified like a declaration. Hung on a path,
+   * the owner is named by the path's last link and qualified by the path as
+   * written — `window.App`, `App.utils` — so its members read
+   * `window.App::init`: a property is reached through its object, not through
+   * the function that happened to assign it (Lua's `M.helpers::a` reads the
+   * same way). A path on the global object is global wherever it is written,
+   * so it is also contained by the file. CommonJS export objects and
+   * prototypes are not namespaces and are left alone. Returns false (nothing
+   * extracted) for any other assignment.
+   */
+  private extractAssignedObjectOwner(node: SyntaxNode, moduleLevel: boolean): boolean {
+    const obj = this.ownedObjectValue(getChildByField(node, 'right'));
+    if (!obj) return false;
+    const path = this.objectOwnerPath(getChildByField(node, 'left'));
+    // A plain name assigned at module level is a global (`dw_page = {…}`); in
+    // a function it is a local being reassigned (`e = {…}` in a bundle's IIFE).
+    if (!path || (path.length === 1 && !moduleLevel)) return false;
+    const qualifiedName = path.length > 1 ? path.join('.') : undefined;
+    const global = path.length > 1 && HOST_GLOBAL_ROOTS.has(path[0]!);
+    const saved = this.nodeStack;
+    if (global) this.nodeStack = saved.slice(0, 1);
+    const initValue = getNodeText(obj, this.source).slice(0, 100);
+    const statement = node.parent?.type === 'expression_statement' ? node.parent : node;
+    // `App.utils` is read as `App.utils`, never as a bare `utils`: only a name
+    // the code reads by that name is a value-read target.
+    const owner = this.createNode('variable', path[path.length - 1]!, node, {
+      docstring: this.docstringFor(statement),
+      signature: `= ${initValue}${initValue.length >= 100 ? '...' : ''}`,
+      isExported: false,
+      ...(qualifiedName !== undefined ? { qualifiedName } : {}),
+    }, path.length === 1 || global);
+    this.nodeStack = saved;
+    if (!owner) return false;
+    if (qualifiedName !== undefined) this.objectPathOwners.set(owner.id, qualifiedName);
+    this.extractOwnedObjectMembers(obj, owner.id, false, global);
+    return true;
+  }
+
+  /**
+   * The links of an assignment target written as plain names — `dw_page` →
+   * `['dw_page']`, `window.App` → `['window', 'App']`, `App.utils.dom` →
+   * `['App', 'utils', 'dom']` — or null for anything else: `this.x`, a
+   * computed `a[k]`, a call, CommonJS's `module.exports` / `exports.x`, or a
+   * prototype.
+   */
+  private objectOwnerPath(left: SyntaxNode | null): string[] | null {
+    const path: string[] = [];
+    let cur = left;
+    while (cur?.type === 'member_expression') {
+      const property = getChildByField(cur, 'property');
+      if (property?.type !== 'property_identifier') return null;
+      path.unshift(getNodeText(property, this.source));
+      cur = getChildByField(cur, 'object');
+    }
+    if (cur?.type !== 'identifier') return null;
+    const root = getNodeText(cur, this.source);
+    if (root === 'module' || root === 'exports' || path.includes('prototype')) return null;
+    path.unshift(root);
+    return path;
+  }
+
+
   private extractObjectLiteralFunctions(obj: SyntaxNode): void {
     for (let i = 0; i < obj.namedChildCount; i++) {
       const member = obj.namedChild(i);
@@ -3098,6 +3384,7 @@ export class TreeSitterExtractor {
                 // logger factories); unexported destructures stay skipped.
                 this.extractFactoryBindingNodes(nameNode, valueNode, kind, isExported);
               }
+              this.visitFunctionBody(child, '');
               continue;
             }
             const name = getNodeText(nameNode, this.source);
@@ -3140,9 +3427,15 @@ export class TreeSitterExtractor {
             // Extract type annotation references (e.g., const x: ITextModel = ...)
             if (varNode) {
               this.extractVariableTypeAnnotation(child, varNode.id);
-              this.extractMarkdownPathReferencesFromSubtree(valueNode, varNode.id);
             }
 
+            const ownedObject = this.ownedObjectValue(valueNode);
+            if (varNode && ownedObject) {
+              this.extractOwnedObjectMembers(ownedObject, varNode.id, true, false);
+              continue;
+            }
+            if (varNode) this.extractMarkdownPathReferencesFromSubtree(valueNode, varNode.id);
+
             // Exported const object-of-functions — extract each function-valued
             // property as a function named by its key + walk its body so its
             // calls are captured. Two shapes, both keyed on AST shape (not on any
@@ -5566,7 +5859,7 @@ export class TreeSitterExtractor {
       className.lastIndexOf('.'),
       className.lastIndexOf('::')
     );
-    if (lastDot >= 0) className = className.slice(lastDot + 1).replace(/^[:.]/, '');
+    if (lastDot >= 0 && this.language !== 'rust') className = className.slice(lastDot + 1).replace(/^[:.]/, '');
     className = className.trim();
 
     if (className) {
@@ -5681,7 +5974,7 @@ export class TreeSitterExtractor {
    * where types are Capitalized by convention, and skipped when the access is a
    * call's callee (the call extractor already links the method).
    */
-  private extractStaticMemberRef(node: SyntaxNode): void {
+  private extractStaticMemberRef(node: SyntaxNode, knownParent?: SyntaxNode): void {
     if (!STATIC_MEMBER_LANGS.has(this.language)) return;
     if (this.nodeStack.length === 0) return;
     const ownerId = this.nodeStack[this.nodeStack.length - 1];
@@ -5700,6 +5993,35 @@ export class TreeSitterExtractor {
       return;
     }
 
+    // Rust writes an enum variant as a path: read (`Mode::A`, `mode::Mode::B`,
+    // `xs.map(Mode::C)`), matched (`Mode::C(x) =>`, `Mode::D { .. } =>`), or
+    // `Self::A` in an impl (#2328). The receiver — the segment before the
+    // member — is referenced where it is written, so a `mode::` / `other::`
+    // prefix scopes it as it scopes a type annotation, and the resolver keeps it
+    // only on an enum that declares the member (an associated const read the
+    // same way, `Limits::MAX`, links nothing). A lowercase receiver is a module
+    // and a lowercase member a function (`util::take`, `Foo::new`); a call's
+    // callee (`Mode::C(1)`) and a struct literal's name are already linked to
+    // their member; the prefix of a longer path and a `use` tree name no member.
+    // Mirrored by the native kernel's `extract_static_member_ref` — change both.
+    if (this.language === 'rust') {
+      if (node.type !== 'scoped_identifier' && node.type !== 'scoped_type_identifier') return;
+      // Looked up only at a body's root (a `const X: M = M::A;` value).
+      const parent = knownParent ?? node.parent;
+      if (!parent) return;
+      if (node.type === 'scoped_type_identifier' ? parent.type !== 'struct_pattern'
+        : RUST_NON_MEMBER_PATH_PARENTS.has(parent.type)) return;
+      if (parent.type === 'call_expression' && getChildByField(parent, 'function')?.startIndex === node.startIndex) return;
+      const member = getChildByField(node, 'name');
+      let recv = getChildByField(node, 'path');
+      if (recv?.type === 'scoped_identifier') recv = getChildByField(recv, 'name');
+      if (!member || recv?.type !== 'identifier' || !/^[A-Z]/.test(getNodeText(member, this.source))) return;
+      let text = getNodeText(recv, this.source);
+      if (text === 'Self') text = this.extractor!.getReceiverType?.(node, this.source) ?? '';
+      if (/^[A-Z][A-Za-z0-9_]*$/.test(text)) this.pushStaticMemberRef(text, ownerId, recv);
+      return;
+    }
+
     if (!MEMBER_ACCESS_TYPES.has(node.type)) return;
 
     // Skip `Type.method()` — the access is the callee of a call, already linked.
@@ -5721,6 +6043,10 @@ export class TreeSitterExtractor {
       getChildByField(node, 'scope') ??
       node.namedChild(0);
     if (!recv) return;
+    if (this.language === 'vbnet') {
+      this.extractVbMemberRead(node, recv, ownerId);
+      return;
+    }
     const t = recv.type;
     if (
       t === 'identifier' || t === 'type_identifier' || t === 'simple_identifier' ||
@@ -5741,6 +6067,31 @@ export class TreeSitterExtractor {
     });
   }
 
+  /**
+   * VB.NET: a value read or write through a name — `AppSession.SessionId`,
+   * `AppSession.CurrentUser = "demo"`, `Logger.Level`, `Mode.Fast` — is a use
+   * of the member as well as of what the name names (#2305). One `references`
+   * ref carries both, as `Name.Member` (the receiver kept, as a call's is);
+   * the resolver links the member and the type when the name means a project
+   * type or module there, and nothing when it holds a value (a local, a
+   * parameter, a field), which only it can tell in case-insensitive VB.NET
+   * (see vbnet-receivers' matchVbMemberRead). Its types are Capitalized all
+   * the same, so a lowercase receiver — a local, nearly always — is skipped.
+   */
+  private extractVbMemberRead(node: SyntaxNode, recv: SyntaxNode, ownerId: string): void {
+    const member = getChildByField(node, 'member');
+    if (recv.type !== 'identifier' || member?.type !== 'identifier') return;
+    const name = getNodeText(recv, this.source);
+    if (!/^[A-Z]\w*$/.test(name) || VB_NON_TYPE_RECEIVERS.test(name)) return;
+    this.unresolvedReferences.push({
+      fromNodeId: ownerId,
+      referenceName: `${name}.${getNodeText(member, this.source)}`,
+      referenceKind: 'references',
+      line: node.startPosition.row + 1,
+      column: node.startPosition.column,
+    });
+  }
+
   /**
    * Find a `class_body` child of an `object_creation_expression` — the
    * marker for an anonymous class (`new T() { ... }`). Returns the body
@@ -6222,7 +6573,9 @@ export class TreeSitterExtractor {
   private visitFunctionBody(body: SyntaxNode, _functionId: string): void {
     if (!this.extractor) return;
 
-    const visitForCallsAndStructure = (node: SyntaxNode): void => {
+    // `parent` is handed down by the walk (absent at the body's root): reading
+    // `node.parent` walks down from the tree's root on every call.
+    const visitForCallsAndStructure = (node: SyntaxNode, parent?: SyntaxNode): void => {
       const nodeType = node.type;
 
       // A function-like macro defined inside a body is still a macro (#1838).
@@ -6235,6 +6588,13 @@ export class TreeSitterExtractor {
       // not in visitNode, so the capture hook must fire in both walkers.
       this.maybeCaptureFnRefs(node, nodeType);
 
+      // A named object literal in a body — an IIFE's `const App = {…}`, a
+      // handler map in a function — owns its function members as one at
+      // module scope does, and so does `window.App = {…}` written in here
+      // (#2300). Each handles its whole subtree.
+      if (nodeType === 'variable_declarator' && this.extractLocalObjectOwner(node)) return;
+      if (nodeType === 'assignment_expression' && this.extractAssignedObjectOwner(node, false)) return;
+
       // Rocket route-registration macros (`routes![…]` / `catchers![…]`): the
       // handler paths live in a raw token tree the call walker can't see.
       if (nodeType === 'macro_invocation') this.extractRustRouteMacro(node);
@@ -6339,7 +6699,41 @@ export class TreeSitterExtractor {
       }
 
       // Static-member / value-read: `Enum.value`, `Type.CONST`, `Foo::BAR`.
-      this.extractStaticMemberRef(node);
+      this.extractStaticMemberRef(node, parent);
+
+      // A member read that may run code — Dart's `x.area` calls the getter
+      // `area` (#2338). The resolver links it to a getter, as a call, or to
+      // nothing: a plain field read stays a reference that names no symbol.
+      const read = this.extractor!.extractMemberRead?.(node);
+      if (read) {
+        const readerId = this.nodeStack[this.nodeStack.length - 1];
+        if (readerId) {
+          this.unresolvedReferences.push({
+            fromNodeId: readerId,
+            referenceName: read.name,
+            referenceKind: 'references',
+            line: read.node.startPosition.row + 1,
+            column: read.node.startPosition.column,
+          });
+        }
+      }
+
+      // A type a Dart body names — a local's declared type, a generic argument
+      // (`Future<Report?>.value(null)`, `context.read<Report>()`), a cast, a
+      // type test — is the function's dependency, as a TS local's annotation
+      // is just below (#2327).
+      if (this.language === 'dart' && nodeType === 'type_identifier' && isDartTypeName(node)) {
+        const ownerId = this.nodeStack[this.nodeStack.length - 1];
+        if (ownerId) {
+          this.unresolvedReferences.push({
+            fromNodeId: ownerId,
+            referenceName: getNodeText(node, this.source),
+            referenceKind: 'references',
+            line: node.startPosition.row + 1,
+            column: node.startPosition.column,
+          });
+        }
+      }
 
       // Local variable type annotations inside a body — `const items: Foo[] = []`,
       // `const x: SomeType = svc.load()`. We deliberately do NOT create nodes for
@@ -6445,7 +6839,7 @@ export class TreeSitterExtractor {
       for (let i = 0; i < node.namedChildCount; i++) {
         const child = node.namedChild(i);
         if (child) {
-          visitForCallsAndStructure(child);
+          visitForCallsAndStructure(child, node);
         }
       }
     };
@@ -6493,6 +6887,15 @@ export class TreeSitterExtractor {
       return;
     }
 
+    // Dart: the type an extension is `on` is one it depends on — `extension
+    // ReportX on Report`, `on List<Report>` (#2327). Not a supertype: a
+    // `references` edge, as a C# extension method's `this Report r` gets.
+    if (this.language === 'dart' && node.type === 'extension_declaration') {
+      for (const onType of node.childrenForFieldName('class')) {
+        if (onType) pushDartTypeRefs(onType, classId, (ref) => this.unresolvedReferences.push(ref));
+      }
+    }
+
     // Look for extends/implements clauses
     for (let i = 0; i < node.namedChildCount; i++) {
       const child = node.namedChild(i);
@@ -6934,21 +7337,7 @@ export class TreeSitterExtractor {
   /**
    * Built-in/primitive type names that shouldn't create references
    */
-  private readonly BUILTIN_TYPES = new Set([
-    'string', 'number', 'boolean', 'void', 'null', 'undefined', 'never', 'any', 'unknown',
-    'object', 'symbol', 'bigint', 'true', 'false',
-    // Rust
-    'str', 'bool', 'i8', 'i16', 'i32', 'i64', 'i128', 'isize',
-    'u8', 'u16', 'u32', 'u64', 'u128', 'usize', 'f32', 'f64', 'char',
-    // Java/C#
-    'int', 'long', 'short', 'byte', 'float', 'double', 'char',
-    // Go
-    'int8', 'int16', 'int32', 'int64', 'uint8', 'uint16', 'uint32', 'uint64',
-    'float32', 'float64', 'complex64', 'complex128', 'rune', 'error',
-    // Scala (capitalized primitives + ubiquitous stdlib aliases)
-    'Int', 'Long', 'Short', 'Byte', 'Float', 'Double', 'Boolean', 'Char', 'Unit',
-    'String', 'Any', 'AnyRef', 'AnyVal', 'Nothing', 'Null',
-  ]);
+  private readonly BUILTIN_TYPES = BUILTIN_TYPE_NAMES;
 
   /**
    * Extract type references from type annotations on a function/method/field node.
diff --git a/src/extraction/vue-extractor.ts b/src/extraction/vue-extractor.ts
index 2f1c796116..c3e0db7dee 100644
--- a/src/extraction/vue-extractor.ts
+++ b/src/extraction/vue-extractor.ts
@@ -4,6 +4,7 @@ import { extractEmbeddedBlock } from './block-extract';
 import { isLanguageSupported } from './grammars';
 import { foldScriptResult, sfcFileNode } from './sfc-script';
 import { vueOptionsMembers } from './vue-options-api';
+import { vueTemplateCalls } from './vue-template-calls';
 
 /**
  * Vue built-in components — skipped so a `<Transition>` / `<KeepAlive>` in the
@@ -75,6 +76,11 @@ export class VueExtractor {
       // markup (incl. through a barrel import) is invisible to callers /
       // impact (#629 follow-up).
       this.extractTemplateComponents(componentNode.id);
+
+      // Calls the template makes — `{{ useBar(link) }}`, `:to="localePath(x)"`,
+      // `@click="save(item)"` — are the component's, like the calls its
+      // `<script setup>` makes (#2340).
+      this.extractTemplateCalls(componentNode.id);
     } catch (error) {
       this.errors.push({
         message: `Vue extraction error: ${error instanceof Error ? error.message : String(error)}`,
@@ -327,4 +333,50 @@ export class VueExtractor {
       }
     }
   }
+
+  /**
+   * Calls written in the `<template>` (see ./vue-template-calls), each made by
+   * the component at the line it is written on — the same `calls` reference a
+   * call in `<script setup>` makes, so a composable or helper used only in
+   * markup has its callers.
+   *
+   * A template calls an Options API component's own methods by their bare
+   * name (`{{ price(item) }}`, `@click="save(form)"`), where script code
+   * writes `this.save()`. Resolution only binds a bare call to a component
+   * method when it reads `this.` at the call site, so these are linked here,
+   * where the method is known to be this component's.
+   */
+  private extractTemplateCalls(componentNodeId: string): void {
+    const calls = vueTemplateCalls(this.source);
+    if (calls.length === 0) return;
+    const component = this.nodes.find((n) => n.id === componentNodeId);
+    const ownMethods = new Map<string, string>();
+    for (const n of this.nodes) {
+      if (n.kind === 'method' && n.qualifiedName === `${component?.name}::${n.name}`) ownMethods.set(n.name, n.id);
+    }
+    const lineStarts = [0];
+    for (let i = 0; i < this.source.length; i++) {
+      if (this.source.charCodeAt(i) === 10) lineStarts.push(i + 1);
+    }
+    let line = 0;
+    for (const call of calls) {
+      // Calls come in source order, so the line only moves forward.
+      while (line + 1 < lineStarts.length && lineStarts[line + 1]! <= call.offset) line++;
+      const column = call.offset - lineStarts[line]!;
+      const ownMethod = call.name.includes('.') ? undefined : ownMethods.get(call.name);
+      if (ownMethod) {
+        this.edges.push({ source: componentNodeId, target: ownMethod, kind: 'calls', line: line + 1, column });
+        continue;
+      }
+      this.unresolvedReferences.push({
+        fromNodeId: componentNodeId,
+        referenceName: call.name,
+        referenceKind: 'calls',
+        line: line + 1, // 1-indexed
+        column,
+        filePath: this.filePath,
+        language: 'vue',
+      });
+    }
+  }
 }
diff --git a/src/extraction/vue-template-calls.ts b/src/extraction/vue-template-calls.ts
new file mode 100644
index 0000000000..4936c8b328
--- /dev/null
+++ b/src/extraction/vue-template-calls.ts
@@ -0,0 +1,650 @@
+/**
+ * Calls written in a Vue single-file component's `<template>` (#2340).
+ *
+ * A template runs code as surely as the `<script>` does: `{{ formatDate(at) }}`,
+ * `:to="localePath(link)"`, `v-if="canEdit(user)"` and `@click="save(item)"`
+ * call a function every time the component renders or the event fires. The
+ * Vue extractor hands only `<script>` blocks to the TypeScript extractor, so
+ * none of these were calls: `callers` on a Nuxt composable used in markup
+ * came back empty.
+ *
+ * This finds them without a template compiler. A tag scanner reads the root
+ * `<template>` (quote-aware, so a `>` inside an attribute value never ends a
+ * tag) and collects the expressions Vue compiles: `{{ }}` interpolations in
+ * text, and the values of directives (`:x` / `v-bind`, `@x` / `v-on`, `v-if`,
+ * `v-show`, `v-model`, `v-for`'s source, custom `v-*`). A small JS lexer then
+ * names each call's callee the way a script-side call is named (`useBar`,
+ * `store.fetchUsers`), skipping strings and comments and reading into
+ * template-literal substitutions. The native parser supplies parameter names
+ * and their syntax ranges when an expression contains a function.
+ *
+ * What is never a call to project code is dropped: names the template binds
+ * itself (`v-for` aliases and slot props for their element's subtree, arrow
+ * and function parameters inside their own syntax ranges), `$`-prefixed
+ * instance helpers (`$t`, `$emit`, `$router.push`), the globals Vue lets a
+ * template reach (`Math`, `JSON`, `Date`...), keywords, `new X()`, and an
+ * object literal's method shorthand. A `v-pre` subtree is not compiled by Vue
+ * and is skipped, as is a template in another language (`lang="pug"`).
+ * Approach after the template-binding scan in #2073 by @L0garithmic.
+ */
+
+import { parseSourceTreeSync, type TreeNode } from './parse-tree';
+import { DecodingMode, EntityDecoder, htmlDecodeTree } from 'entities/decode';
+
+export interface VueTemplateCall {
+  /** The callee as a script-side call names it: `useBar`, `store.fetchUsers`. */
+  name: string;
+  /** Offset of the callee's first character in the SFC source. */
+  offset: number;
+}
+
+/** Elements that never have children: no closing tag, no scope of their own. */
+const VOID_ELEMENTS = new Set([
+  'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta',
+  'param', 'source', 'track', 'wbr',
+]);
+
+/**
+ * The globals a Vue template can reach — Vue's own allow-list
+ * (`isGloballyAllowed` in @vue/shared). Every other name in a template is the
+ * component's: a script binding, a prop, an auto-import.
+ */
+const TEMPLATE_GLOBALS = new Set([
+  'Infinity', 'undefined', 'NaN', 'isFinite', 'isNaN', 'parseFloat', 'parseInt',
+  'decodeURI', 'decodeURIComponent', 'encodeURI', 'encodeURIComponent', 'Math',
+  'Number', 'Date', 'Array', 'Object', 'Boolean', 'String', 'RegExp', 'Map', 'Set',
+  'JSON', 'Intl', 'BigInt', 'console', 'Error', 'Symbol',
+]);
+
+/** Words that can stand before `(` without being a call. */
+const KEYWORDS = new Set([
+  'if', 'else', 'for', 'while', 'do', 'switch', 'case', 'default', 'break',
+  'continue', 'return', 'throw', 'try', 'catch', 'finally', 'function', 'class',
+  'new', 'delete', 'typeof', 'void', 'instanceof', 'in', 'of', 'var', 'let',
+  'const', 'this', 'super', 'import', 'export', 'await', 'async', 'yield', 'with',
+  'debugger', 'true', 'false', 'null', 'undefined',
+]);
+
+/** Keywords that end an operand, as an identifier does (`this`, `true`). */
+const VALUE_KEYWORDS = new Set(['this', 'super', 'true', 'false', 'null', 'undefined']);
+
+const IDENT_START = /[A-Za-z_$]/;
+const IDENT_CHAR = /[\w$]/;
+const WS = /\s/;
+
+/** Vue's own `v-for` split: aliases, then `in` / `of`, then the source expression. */
+const FOR_ALIAS = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/;
+
+/** Every call written in the root `<template>` of a Vue SFC, in source order. */
+export function vueTemplateCalls(source: string): VueTemplateCall[] {
+  // Blank <script>/<style> blocks and HTML comments, keeping every offset.
+  const blank = (m: string) => m.replace(/[^\n]/g, ' ');
+  const masked = source
+    .replace(/<(script|style)(\s[^>]*)?>[\s\S]*?<\/\1\s*>/g, blank)
+    .replace(/<!--[\s\S]*?-->/g, blank);
+  const root = rootTemplate(masked);
+  if (!root) return [];
+  const calls: VueTemplateCall[] = [];
+  scanMarkup(masked, root.start, root.end, calls);
+  return calls.sort((a, b) => a.offset - b.offset);
+}
+
+/** The content range of the SFC's root `<template>`; null for none or a non-HTML one. */
+function rootTemplate(s: string): { start: number; end: number } | null {
+  const tagRe = /<(\/?)template(?=[\s/>])((?:[^>"']|"[^"]*"|'[^']*')*)>/g;
+  let m: RegExpExecArray | null;
+  let start = -1;
+  let depth = 0;
+  while ((m = tagRe.exec(s)) !== null) {
+    const closing = m[1] === '/';
+    const attrs = m[2] ?? '';
+    if (start === -1) {
+      if (closing || attrs.trimEnd().endsWith('/')) continue;
+      const lang = /\blang\s*=\s*["']?([\w-]+)/.exec(attrs)?.[1];
+      if (lang && lang.toLowerCase() !== 'html') return null;
+      start = m.index + m[0].length;
+      depth = 1;
+    } else if (closing) {
+      if (--depth === 0) return { start, end: m.index };
+    } else if (!attrs.trimEnd().endsWith('/')) {
+      depth++;
+    }
+  }
+  return start === -1 ? null : { start, end: s.length };
+}
+
+interface Attr {
+  name: string;
+  value: string | null;
+  /** Offset of the value's first character (inside any quotes). */
+  valueStart: number;
+  /** Original source offsets for decoded attribute characters. */
+  valueOffsets?: number[];
+}
+
+interface Frame {
+  tag: string;
+  locals: Set<string> | null;
+  pre: boolean;
+}
+
+/** The markup of `s[start, end)`: element nesting, directive values, interpolations. */
+function scanMarkup(s: string, start: number, end: number, out: VueTemplateCall[]): void {
+  const stack: Frame[] = [];
+  const inScope = (name: string, own?: Set<string>) =>
+    own?.has(name) === true || stack.some((f) => f.locals?.has(name) === true);
+  const inPre = () => stack.some((f) => f.pre);
+  const closeTag = /<\/([A-Za-z][^\s/>]*)\s*>/y;
+
+  // The next `{{` at or after `i`, searched for again only once `i` passes it
+  // (a fresh search per tag would rescan the rest of a mustache-free template).
+  let nextMustache = -1;
+  let i = start;
+  while (i < end) {
+    if (nextMustache < i) {
+      const mu = s.indexOf('{{', i);
+      nextMustache = mu === -1 || mu >= end ? end : mu;
+    }
+    const lt = s.indexOf('<', i);
+    const nextTag = lt === -1 || lt >= end ? end : lt;
+    if (nextMustache < nextTag) {
+      // A `{{ }}` interpolation runs to the first `}}`, as Vue's parser reads it.
+      const close = s.indexOf('}}', nextMustache + 2);
+      const exprEnd = close === -1 || close > end ? end : close;
+      if (!inPre()) scanExpression(s, nextMustache + 2, exprEnd, (n) => inScope(n), out);
+      i = exprEnd + 2;
+      continue;
+    }
+    if (nextTag >= end) break;
+
+    closeTag.lastIndex = nextTag;
+    const cm = closeTag.exec(s);
+    if (cm) {
+      const name = cm[1]!;
+      for (let k = stack.length - 1; k >= 0; k--) {
+        if (stack[k]!.tag === name || stack[k]!.tag.toLowerCase() === name.toLowerCase()) {
+          stack.length = k;
+          break;
+        }
+      }
+      i = nextTag + cm[0].length;
+      continue;
+    }
+    if (!/[A-Za-z]/.test(s[nextTag + 1] ?? '')) {
+      i = nextTag + 1; // a `<` in text, not a tag
+      continue;
+    }
+
+    const tag = parseOpenTag(s, nextTag, end);
+    i = tag.close;
+    // Names this element binds for itself and its subtree: `v-for` aliases,
+    // slot props (`#item="{ item }"`, `v-slot="props"`, Vue 2 `slot-scope`).
+    let own: Set<string> | null = null;
+    let pre = false;
+    let forSource: { start: number; end: number } | null = null;
+    for (const a of tag.attrs) {
+      if (a.name === 'v-pre') pre = true;
+      if (a.value === null) continue;
+      const kind = directiveKind(a.name);
+      if (kind === 'for') {
+        const fm = FOR_ALIAS.exec(a.value);
+        if (fm) {
+          own ??= new Set();
+          for (const id of templateBindings(fm[1]!)) own.add(id);
+          forSource = { start: a.value.length - fm[2]!.length, end: a.value.length };
+        }
+      } else if (kind === 'slot') {
+        own ??= new Set();
+        for (const id of templateBindings(a.value)) own.add(id);
+      }
+    }
+    if (!pre && !inPre()) {
+      const ownLocals = own ?? undefined;
+      const local = (n: string) => inScope(n, ownLocals);
+      for (const a of tag.attrs) {
+        if (a.value === null) continue;
+        const kind = directiveKind(a.name);
+        if (kind === 'expr' || kind === 'on') {
+          scanAttributeExpression(a, 0, a.value.length, local, out);
+        } else if (kind === 'for' && forSource) {
+          scanAttributeExpression(a, forSource.start, forSource.end, (n) => inScope(n), out);
+        }
+      }
+    }
+    if (!tag.selfClosing && !VOID_ELEMENTS.has(tag.name.toLowerCase())) {
+      stack.push({ tag: tag.name, locals: own, pre });
+    }
+  }
+}
+
+/** What an attribute is to Vue: a `v-for`, a slot-props pattern, a handler, an expression, or plain HTML. */
+function directiveKind(name: string): 'for' | 'slot' | 'on' | 'expr' | null {
+  if (name === 'v-for') return 'for';
+  if (name.startsWith('#') || name === 'v-slot' || name.startsWith('v-slot:') || name === 'slot-scope' || name === 'scope') {
+    return 'slot';
+  }
+  if (name.startsWith('@') || name === 'v-on' || name.startsWith('v-on:')) return 'on';
+  // `:x` / `.x` (v-bind and its `.prop` shorthand), `v-bind`, `v-if`, `v-model`, custom `v-*`.
+  if (name.startsWith(':') || name.startsWith('.') || name.startsWith('v-')) return 'expr';
+  return null;
+}
+
+/** An opening tag at `at`: its name, its attributes, where it ends. Quote-aware. */
+function parseOpenTag(
+  s: string,
+  at: number,
+  end: number
+): { name: string; attrs: Attr[]; close: number; selfClosing: boolean } {
+  let p = at + 1;
+  const nameStart = p;
+  while (p < end && !/[\s/>]/.test(s[p]!)) p++;
+  const name = s.slice(nameStart, p);
+  const attrs: Attr[] = [];
+  while (p < end) {
+    while (p < end && WS.test(s[p]!)) p++;
+    if (p >= end) break;
+    const c = s[p]!;
+    if (c === '>') return { name, attrs, close: p + 1, selfClosing: false };
+    if (c === '/' && s[p + 1] === '>') return { name, attrs, close: p + 2, selfClosing: true };
+    const attrStart = p;
+    while (p < end && !/[\s"'>/=]/.test(s[p]!)) p++;
+    if (p === attrStart) {
+      p++; // a stray `/`, quote or `=`
+      continue;
+    }
+    const attrName = s.slice(attrStart, p);
+    let q = p;
+    while (q < end && WS.test(s[q]!)) q++;
+    if (s[q] !== '=') {
+      attrs.push({ name: attrName, value: null, valueStart: -1 });
+      continue;
+    }
+    q++;
+    while (q < end && WS.test(s[q]!)) q++;
+    const quote = s[q];
+    if (quote === '"' || quote === "'") {
+      const closeQuote = s.indexOf(quote, q + 1);
+      const valueEnd = closeQuote === -1 || closeQuote > end ? end : closeQuote;
+      attrs.push({ name: attrName, ...decodeAttribute(s.slice(q + 1, valueEnd), q + 1) });
+      p = valueEnd + 1;
+    } else {
+      const valueStart = q;
+      while (q < end && !/[\s>]/.test(s[q]!)) q++;
+      attrs.push({ name: attrName, ...decodeAttribute(s.slice(valueStart, q), valueStart) });
+      p = q;
+    }
+  }
+  return { name, attrs, close: end, selfClosing: false };
+}
+
+/** Decode HTML attribute syntax while retaining each character's source position. */
+function decodeAttribute(raw: string, valueStart: number): Pick<Attr, 'value' | 'valueStart' | 'valueOffsets'> {
+  if (!raw.includes('&')) return { value: raw, valueStart };
+  let value = '';
+  const valueOffsets: number[] = [];
+  let at = 0;
+  const decoder = new EntityDecoder(htmlDecodeTree, codepoint => {
+    const decoded = String.fromCodePoint(codepoint);
+    value += decoded;
+    for (let unit = 0; unit < decoded.length; unit++) valueOffsets.push(valueStart + at);
+  });
+  while (at < raw.length) {
+    if (raw[at] === '&') {
+      decoder.startEntity(DecodingMode.Attribute);
+      let consumed = decoder.write(raw, at + 1);
+      if (consumed < 0) consumed = decoder.end();
+      if (consumed > 0) { at += consumed; continue; }
+    }
+    value += raw[at];
+    valueOffsets.push(valueStart + at++);
+  }
+  return { value, valueStart, valueOffsets };
+}
+
+function scanAttributeExpression(
+  attribute: Attr, start: number, end: number,
+  isLocal: (name: string) => boolean, out: VueTemplateCall[]
+): void {
+  const calls: VueTemplateCall[] = [];
+  scanExpression(attribute.value!, start, end, isLocal, calls);
+  for (const call of calls) out.push({ name: call.name,
+    offset: attribute.valueOffsets?.[call.offset] ?? attribute.valueStart + call.offset });
+}
+
+/** Prior token class, as the lexer needs it: what may follow, and what a `/` means. */
+type Prev = 'start' | 'operand' | 'dot' | 'new' | 'decl';
+
+interface Paren {
+  /** Index in `found` of the call this paren opens, or -1. */
+  call: number;
+}
+
+/**
+ * The calls in one template expression `s[start, end)`. `outerLocal` is the
+ * template scope (aliases and slot props in force); arrow and function
+ * parameters are local only inside their native syntax ranges.
+ */
+function scanExpression(
+  s: string,
+  start: number,
+  end: number,
+  outerLocal: (name: string) => boolean,
+  out: VueTemplateCall[]
+): void {
+  const bindings = expressionBindings(s.slice(start, end));
+  const isLocal = (name: string) => outerLocal(name) || bindings.some(scope =>
+    i - start >= scope.start && i - start < scope.end && scope.names.has(name));
+  const found: Array<VueTemplateCall & { dropped?: boolean }> = [];
+  const parens: Paren[] = [];
+  let prev: Prev = 'start';
+
+  const skipWs = (k: number) => {
+    while (k < end && WS.test(s[k]!)) k++;
+    return k;
+  };
+  const wordEnd = (k: number) => {
+    while (k < end && IDENT_CHAR.test(s[k]!)) k++;
+    return k;
+  };
+
+  let i = start;
+  while (i < end) {
+    const c = s[i]!;
+    if (WS.test(c)) {
+      i++;
+      continue;
+    }
+    if (c === '"' || c === "'") {
+      i = skipString(s, i, end);
+      prev = 'operand';
+      continue;
+    }
+    if (c === '`') {
+      i = skipTemplateLiteral(s, i, end, (a, b) => scanExpression(s, a, b, isLocal, out));
+      prev = 'operand';
+      continue;
+    }
+    if (c === '/') {
+      if (s[i + 1] === '/') {
+        const nl = s.indexOf('\n', i);
+        i = nl === -1 || nl > end ? end : nl;
+        continue;
+      }
+      if (s[i + 1] === '*') {
+        const close = s.indexOf('*/', i + 2);
+        i = close === -1 || close > end ? end : close + 2;
+        continue;
+      }
+      if (prev !== 'operand') {
+        i = skipRegex(s, i, end);
+        prev = 'operand';
+        continue;
+      }
+      i++;
+      prev = 'start';
+      continue;
+    }
+    if (/[0-9]/.test(c) || (c === '.' && /[0-9]/.test(s[i + 1] ?? ''))) {
+      i++;
+      while (i < end && /[\w.]/.test(s[i]!)) i++;
+      prev = 'operand';
+      continue;
+    }
+    if (IDENT_START.test(c)) {
+      const wEnd = wordEnd(i);
+      const word = s.slice(i, wEnd);
+      if (prev === 'dot') {
+        // A member tail of something that is not a plain path: `a().b`, `x[0].y`.
+        i = wEnd;
+        prev = 'operand';
+        continue;
+      }
+      if (KEYWORDS.has(word)) {
+        i = wEnd;
+        if (word === 'new') prev = 'new';
+        else if (word === 'function' || word === 'class') {
+          prev = 'decl';
+        } else prev = VALUE_KEYWORDS.has(word) ? 'operand' : 'start';
+        continue;
+      }
+      if (prev === 'decl') {
+        // A function or class name, not a call.
+        i = wEnd;
+        prev = 'operand';
+        continue;
+      }
+      // The member path rooted here: `a`, `a.b.c`, `a?.b`, TS `a!.b`.
+      const segments = [word];
+      let p = wEnd;
+      for (;;) {
+        let q = skipWs(p);
+        if (s[q] === '!' && s[q + 1] === '.') q++;
+        let r: number;
+        if (s[q] === '.' && s[q + 1] !== '.') r = skipWs(q + 1);
+        else if (s[q] === '?' && s[q + 1] === '.' && !/[0-9]/.test(s[q + 2] ?? '')) r = skipWs(q + 2);
+        else break;
+        if (!IDENT_START.test(s[r] ?? '')) break;
+        const segEnd = wordEnd(r);
+        segments.push(s.slice(r, segEnd));
+        p = segEnd;
+      }
+      // Called? `path(`, or optionally `path?.(`.
+      let q = skipWs(p);
+      if (s[q] === '?' && s[q + 1] === '.' && s[skipWs(q + 2)] === '(') q = skipWs(q + 2);
+      const root = segments[0]!;
+      if (s[q] === '(') {
+        let call = -1;
+        if (prev !== 'new' && !root.startsWith('$') && !TEMPLATE_GLOBALS.has(root) && !isLocal(root)) {
+          found.push({ name: segments.join('.'), offset: i });
+          call = found.length - 1;
+        }
+        parens.push({ call });
+        i = q + 1;
+        prev = 'start';
+        continue;
+      }
+      i = p;
+      prev = 'operand';
+      continue;
+    }
+    // Punctuation.
+    if (c === '(') {
+      parens.push({ call: -1 });
+      i++;
+      prev = 'start';
+      continue;
+    }
+    if (c === ')') {
+      const paren = parens.pop();
+      if (paren) {
+        // `{ fmt(v) { … } }` — an object literal's method, not a call.
+        if (paren.call >= 0 && s[skipWs(i + 1)] === '{') found[paren.call]!.dropped = true;
+      }
+      i++;
+      prev = 'operand';
+      continue;
+    }
+    if (c === '=' && s[i + 1] === '>') {
+      i += 2;
+      prev = 'start';
+      continue;
+    }
+    if (c === '.') {
+      if (s[i + 1] === '.' && s[i + 2] === '.') {
+        i += 3;
+        prev = 'start';
+      } else {
+        i++;
+        prev = 'dot';
+      }
+      continue;
+    }
+    if (c === '?' && s[i + 1] === '.' && !/[0-9]/.test(s[i + 2] ?? '')) {
+      i += 2;
+      prev = 'dot';
+      continue;
+    }
+    i++;
+    prev = c === ']' || c === '}' ? 'operand' : 'start';
+  }
+
+  for (const f of found) if (!f.dropped) out.push({ name: f.name, offset: f.offset });
+}
+
+/** Names a JavaScript parameter pattern binds, excluding property keys and defaults. */
+function patternBindings(node: TreeNode | null, names = new Set<string>()): Set<string> {
+  if (!node) return names;
+  switch (node.type) {
+    case 'identifier':
+    case 'type_identifier':
+    case 'shorthand_property_identifier_pattern':
+      names.add(node.text);
+      break;
+    case 'required_parameter':
+    case 'optional_parameter':
+      patternBindings(node.childForFieldName('pattern') ?? node.childForFieldName('name'), names);
+      break;
+    case 'pair_pattern':
+      patternBindings(node.childForFieldName('value'), names);
+      break;
+    case 'assignment_pattern':
+    case 'object_assignment_pattern':
+      patternBindings(node.childForFieldName('left'), names);
+      break;
+    case 'rest_pattern':
+      patternBindings(node.namedChild(0), names);
+      break;
+    case 'formal_parameters':
+    case 'object_pattern':
+    case 'array_pattern':
+      for (const child of node.namedChildren) patternBindings(child, names);
+      break;
+  }
+  return names;
+}
+
+/** Template aliases use the same binding grammar as arrow parameters. */
+function templateBindings(pattern: string): Set<string> {
+  const trimmed = pattern.trim();
+  if (/^[A-Za-z_$][\w$]*$/.test(trimmed)) return new Set([trimmed]);
+  const parameters = trimmed.startsWith('(') && trimmed.endsWith(')')
+    ? trimmed : `(${trimmed})`;
+  const tree = parseSourceTreeSync(`${parameters} => 0`, 'typescript');
+  try {
+    const arrow = tree?.rootNode.descendantsOfType('arrow_function')[0];
+    return patternBindings(arrow?.childForFieldName('parameters') ?? arrow?.childForFieldName('parameter') ?? null);
+  } finally { tree?.delete(); }
+}
+
+/** Native syntax ranges keep nested function parameters inside their own scopes. */
+function expressionBindings(expression: string): Array<{ start: number; end: number; names: Set<string> }> {
+  if (!expression.includes('=>') && !expression.includes('{') && !/\bfunction\b/.test(expression)) return [];
+  const tree = parseSourceTreeSync(`(${expression})`, 'typescript');
+  try {
+    const scopes = tree?.rootNode.descendantsOfType([
+      'arrow_function', 'function_expression', 'function_declaration', 'generator_function', 'generator_function_declaration', 'method_definition',
+    ]) ?? [];
+    const bindings = scopes.map(node => {
+      const names = patternBindings(node.childForFieldName('parameters') ?? node.childForFieldName('parameter'));
+      const name = node.childForFieldName('name');
+      if (name && node.type !== 'method_definition') names.add(name.text);
+      return { start: node.startIndex - 1, end: node.endIndex - 1, names };
+    });
+    for (const node of tree?.rootNode.descendantsOfType(['variable_declarator', 'function_declaration', 'generator_function_declaration', 'class_declaration']) ?? []) {
+      const names = patternBindings(node.childForFieldName('name'));
+      const functionScoped = node.type === 'variable_declarator' && node.parent?.type === 'variable_declaration';
+      let scope = node.parent;
+      while (scope && !scopes.some(fn => fn.id === scope!.id)
+        && (functionScoped || !['statement_block', 'for_statement', 'for_in_statement'].includes(scope.type))) scope = scope.parent;
+      if (scope) bindings.push({ start: scope.startIndex - 1, end: scope.endIndex - 1, names });
+    }
+    for (const node of tree?.rootNode.descendantsOfType(['catch_clause', 'for_in_statement']) ?? []) {
+      const loopKind = node.childForFieldName('kind')?.text;
+      if (node.type === 'for_in_statement' && !loopKind) continue;
+      const names = patternBindings(node.childForFieldName(node.type === 'catch_clause' ? 'parameter' : 'left'));
+      let scope: TreeNode | null = node;
+      if (loopKind === 'var') {
+        while (scope && !scopes.some(fn => fn.id === scope!.id)) scope = scope.parent;
+      }
+      if (scope) bindings.push({ start: scope.startIndex - 1, end: scope.endIndex - 1, names });
+    }
+    return bindings;
+  } finally { tree?.delete(); }
+}
+
+/** Past a `'…'` / `"…"` string starting at `i`. */
+function skipString(s: string, i: number, end: number): number {
+  const quote = s[i];
+  let k = i + 1;
+  while (k < end) {
+    const c = s[k]!;
+    if (c === '\\') k += 2;
+    else if (c === quote) return k + 1;
+    else k++;
+  }
+  return end;
+}
+
+/** Past a template literal starting at `i`, reporting each `${…}` substitution's range. */
+function skipTemplateLiteral(
+  s: string,
+  i: number,
+  end: number,
+  onSubstitution?: (start: number, end: number) => void
+): number {
+  let k = i + 1;
+  while (k < end) {
+    const c = s[k]!;
+    if (c === '\\') k += 2;
+    else if (c === '`') return k + 1;
+    else if (c === '$' && s[k + 1] === '{') {
+      const close = matchingBrace(s, k + 2, end);
+      onSubstitution?.(k + 2, close);
+      k = close + 1;
+    } else k++;
+  }
+  return end;
+}
+
+/** The `}` closing a brace opened just before `i` (strings and template literals skipped). */
+function matchingBrace(s: string, i: number, end: number): number {
+  let depth = 0;
+  let k = i;
+  while (k < end) {
+    const c = s[k]!;
+    if (c === '"' || c === "'") k = skipString(s, k, end);
+    else if (c === '`') k = skipTemplateLiteral(s, k, end);
+    else if (c === '{') {
+      depth++;
+      k++;
+    } else if (c === '}') {
+      if (depth === 0) return k;
+      depth--;
+      k++;
+    } else k++;
+  }
+  return end;
+}
+
+/** Past a regex literal starting at `i` (a `/` where an operand is expected). */
+function skipRegex(s: string, i: number, end: number): number {
+  let k = i + 1;
+  let inClass = false;
+  while (k < end) {
+    const c = s[k]!;
+    if (c === '\\') {
+      k += 2;
+      continue;
+    }
+    if (c === '\n') return i + 1; // not a regex after all
+    if (c === '[') inClass = true;
+    else if (c === ']') inClass = false;
+    else if (c === '/' && !inClass) {
+      k++;
+      while (k < end && /[a-z]/i.test(s[k]!)) k++;
+      return k;
+    }
+    k++;
+  }
+  return i + 1;
+}
diff --git a/src/graph/cobol-copybooks.ts b/src/graph/cobol-copybooks.ts
new file mode 100644
index 0000000000..a182db82ad
--- /dev/null
+++ b/src/graph/cobol-copybooks.ts
@@ -0,0 +1,122 @@
+/**
+ * COBOL copybooks a query names — one derivation of "the agent asked about
+ * copybook X" (#2342).
+ *
+ * The COBOL extractor records every `COPY X` and `EXEC SQL INCLUDE X` as an
+ * `import` node named X sitting on the include statement, and the resolver
+ * links X to the indexed copybook file (`X.cpy`, …) with an `imports` edge
+ * from the including scope. That `import` node is not the low-information
+ * line an `import { Foo } from './foo'` is in JavaScript: a copybook member
+ * name is how COBOL code is talked about, and the include statement is half of
+ * the answer to a question about it. So a query token that names a copybook
+ * asks for two things:
+ *
+ *  - the copybook's own source, when it is indexed (the record layout, the SQL
+ *    host variables, the shared paragraphs), and
+ *  - every statement that includes it — where that layout is pulled in, which
+ *    is what changing it would touch.
+ *
+ * A member whose source is not in the project (a DB2 DCLGEN member, a
+ * compiler-supplied copybook such as SQLCA or DFHAID) has include sites and no
+ * file, and saying so is part of the answer too: it tells the reader there is
+ * no copybook source here to go looking for.
+ *
+ * Shared by the context builder (entry points for `codegraph_explore` and
+ * `codegraph context`) and by explore's renderer (pinning the copybook, listing
+ * its include sites), so the two read one answer and cannot drift apart.
+ */
+
+import type { Edge, EdgeKind, Node } from '../types';
+
+/** The queries this derivation needs — satisfied by `QueryBuilder`. */
+export interface CopybookLookup {
+  hasFilesOfLanguage(language: string): boolean;
+  getCobolIncludesByMember(member: string, limit: number): Node[];
+  getCobolFilesByStem(member: string): Node[];
+  getIncomingEdges(targetId: string, kinds?: EdgeKind[]): Edge[];
+}
+
+/** One copybook member the query names, with what the index knows about it. */
+export interface NamedCopybook {
+  /** The member as the query spelled it. */
+  member: string;
+  /**
+   * The indexed copybook file(s) the member resolves to — a `.cpy` file, or
+   * any COBOL file an include actually resolved to. Empty when the member's
+   * source is not indexed.
+   */
+  files: Node[];
+  /** Every `COPY` / `EXEC SQL INCLUDE` statement naming the member, in file/line order. */
+  includes: Node[];
+}
+
+/**
+ * Most include statements gathered per member. A shared copybook in a large
+ * estate is included by hundreds of programs; past this the list is a count.
+ */
+export const MAX_COPYBOOK_INCLUDES = 200;
+
+/** Most query tokens looked up — a pasted paragraph must not become 200 probes. */
+const MAX_MEMBER_TOKENS = 16;
+
+/**
+ * A COBOL word: letters, digits, hyphens and the national characters `$ # @`
+ * (`CVACT01Y`, `CUST-REC`, `DFH$AID`). Wider than the identifier shapes the
+ * generic symbol extraction knows — a copybook name with a digit in it
+ * (`CVACT01Y`) was never extracted as a symbol at all.
+ */
+const COBOL_WORD = /[A-Za-z0-9$#@][A-Za-z0-9$#@-]*/g;
+
+/**
+ * The query's tokens that could name a copybook member. In a longer query a
+ * plain lowercase word is skipped: `customer` in a prose question is English,
+ * while a member name is written the way the code writes it (`CUSTOMER`,
+ * `cvact01y`) — the same rule explore's own symbol seeding applies to bare
+ * words. A query that is one word is a name lookup whatever its case
+ * (`lgpolicy`, after the file `lgpolicy.cpy`).
+ */
+export function copybookMemberTokens(query: string): string[] {
+  const words = (query.match(COBOL_WORD) ?? []).map((raw) => raw.replace(/-+$/, ''));
+  const lone = words.length === 1;
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const token of words) {
+    if (token.length < 3 || !/[A-Za-z]/.test(token) || (!lone && /^[a-z]+$/.test(token))) continue;
+    const key = token.toUpperCase();
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(token);
+    if (out.length >= MAX_MEMBER_TOKENS) break;
+  }
+  return out;
+}
+
+/**
+ * Is this node a COBOL copybook include — the statement `COPY X` /
+ * `EXEC SQL INCLUDE X` — rather than an import in any other language?
+ */
+export function isCopybookInclude(node: Pick<Node, 'kind' | 'language'>): boolean {
+  return node.kind === 'import' && node.language === 'cobol';
+}
+
+/**
+ * The copybooks `query` names. A token qualifies when the index holds a COBOL
+ * include of that member or a copybook file with that name. A project without
+ * COBOL answers after one index seek, so every other language's queries are
+ * untouched.
+ */
+export function findNamedCopybooks(lookup: CopybookLookup, query: string): NamedCopybook[] {
+  const tokens = copybookMemberTokens(query);
+  if (tokens.length === 0 || !lookup.hasFilesOfLanguage('cobol')) return [];
+  const named: NamedCopybook[] = [];
+  for (const member of tokens) {
+    const includes = lookup.getCobolIncludesByMember(member, MAX_COPYBOOK_INCLUDES);
+    // A same-named PROGRAM (`COACTUPC.cbl` for the query `COACTUPC`) is not a
+    // copybook: only a `.cpy` file, or a file some include resolved to, is.
+    const files = lookup.getCobolFilesByStem(member).filter((file) =>
+      /\.cpy$/i.test(file.filePath) || lookup.getIncomingEdges(file.id, ['imports']).length > 0);
+    if (includes.length === 0 && files.length === 0) continue;
+    named.push({ member, files, includes });
+  }
+  return named;
+}
diff --git a/src/mcp/server-instructions.ts b/src/mcp/server-instructions.ts
index a832804e62..f981030888 100644
--- a/src/mcp/server-instructions.ts
+++ b/src/mcp/server-instructions.ts
@@ -62,6 +62,7 @@ against dozens of greps and reads.
 
 ## Reading results
 
+- A named COBOL copybook prioritizes its indexed source and lists COPY and EXEC SQL INCLUDE sites. If no source is indexed, the result says so.
 - When a query names functions in pinned files, local callee bodies are prioritized through two call or callback hops. At most sixteen local helpers per file are selected, each at most 200 lines; file and output budgets still apply.
 - Quoted spans of three or more words also match current indexed code by word sequence, ignoring case and punctuation. This includes script strings and unquoted template text. The scan checks its 300 ms budget between files and stops at sixteen matches or 64 MiB read. It skips files over 1 MiB and considers up to four spans of at most 300 characters each. File and output budgets still apply; no re-index is needed.
 - Questions about tests include source from the nearest test callers of named symbols, within three caller hops and the file/output budgets. These are static caller links, not measured runtime coverage. Naming a JavaScript or TypeScript test file prioritizes matching \`it\`/\`test\` callbacks.
diff --git a/src/mcp/tools.ts b/src/mcp/tools.ts
index 79470024c8..248bef858a 100644
--- a/src/mcp/tools.ts
+++ b/src/mcp/tools.ts
@@ -59,6 +59,7 @@ import { findDynamicBoundaries, type BoundarySite } from '../graph/dynamic-bound
 import { countImplementers } from '../graph/type-hierarchy';
 import { isNameGuess } from '../graph/edge-trust';
 import { isDocumentationNode } from '../graph/traversal';
+import { isCopybookInclude, MAX_COPYBOOK_INCLUDES, type NamedCopybook } from '../graph/cobol-copybooks';
 import {
   findAllSymbols,
   resolveNamedSymbolFlow,
@@ -4244,6 +4245,46 @@ export class ToolHandler {
     ].join('\n');
   }
 
+  /**
+   * The COBOL copybooks an explore query named (#2342): where each one's source
+   * lives, and every `COPY` / `EXEC SQL INCLUDE` statement that pulls it in —
+   * locations only, one per line. The source section can afford a few include
+   * windows; this list is what answers "what includes X / what does changing X
+   * touch" without a grep for `COPY X`. A member whose source is not indexed
+   * says so, so nobody goes hunting for a copybook file that is not here.
+   */
+  private buildCopybookSection(copybooks: NamedCopybook[]): string {
+    const MAX_LISTED_SITES = 25;
+    const blocks: string[] = [];
+    for (const copybook of copybooks) {
+      // Spelled as the code spells it — an include's member, else the file's
+      // stem — not as the query happened to type it.
+      const name = copybook.includes[0]?.name
+        ?? copybook.files[0]?.name.replace(/\.[^.]*$/, '')
+        ?? copybook.member;
+      const source = copybook.files.length > 0
+        ? `source ${copybook.files.map((f) => `\`${f.filePath}\``).join(', ')}`
+        : 'no indexed source (typically a DB2 DCLGEN member, a compiler-supplied copybook such as SQLCA, or one kept outside this project)';
+      const count = copybook.includes.length;
+      if (count === 0) {
+        blocks.push(`**COBOL copybook \`${name}\`** — ${source}; nothing indexed includes it (no \`COPY\` or \`EXEC SQL INCLUDE\` of it).`, '');
+        continue;
+      }
+      const sites = `${count}${count >= MAX_COPYBOOK_INCLUDES ? '+' : ''} site${count === 1 ? '' : 's'}`;
+      blocks.push(`**COBOL copybook \`${name}\`** — ${source}; included at ${sites}:`, '');
+      for (const include of copybook.includes.slice(0, MAX_LISTED_SITES)) {
+        const statement = /^\s*EXEC\b/i.test(include.signature ?? '') ? 'EXEC SQL INCLUDE' : 'COPY';
+        blocks.push(`- \`${include.filePath}:${include.startLine}\` — ${statement}`);
+      }
+      if (count > MAX_LISTED_SITES) {
+        const files = new Set(copybook.includes.slice(MAX_LISTED_SITES).map((n) => n.filePath)).size;
+        blocks.push(`- … +${count - MAX_LISTED_SITES} more site${count - MAX_LISTED_SITES === 1 ? '' : 's'} in ${files} file${files === 1 ? '' : 's'}`);
+      }
+      blocks.push('');
+    }
+    return blocks.join('\n');
+  }
+
   /**
    * Which earlier agent sessions mentioned the entry symbols by name, from the
    * session index as it stands (no refresh). Only identifier-shaped names are
@@ -4611,6 +4652,22 @@ export class ToolHandler {
         }
       } catch { /* path pinning must never fail an explore call */ }
     }
+    // A COBOL copybook the query names (`CVACT01Y`) names its FILE as surely as
+    // `app/cpy/CVACT01Y.cpy` would (#2342), so it is pinned the same way: the
+    // copybook's own source is admitted, ranked first and funded first. Looked
+    // up on the path-stripped query — a query that already pinned the file by
+    // path gets exactly the answer it got before. The include sites are listed
+    // in their own section below.
+    let namedCopybooks: NamedCopybook[] = [];
+    try {
+      namedCopybooks = cg.findNamedCopybooks(matchQuery);
+    } catch { /* copybook pinning must never fail an explore call */ }
+    for (const copybook of namedCopybooks) {
+      for (const file of copybook.files) {
+        if (pinnedFiles.length >= maxFiles) break;
+        if (!pinnedFiles.includes(file.filePath)) pinnedFiles = [...pinnedFiles, file.filePath];
+      }
+    }
     // A same-named file the span did not pin is named in the summary line, so
     // an agent that did mean it sees where it went instead of a silent drop.
     const setAsideNote = setAsideMatches.map((s) => {
@@ -5519,9 +5576,20 @@ export class ToolHandler {
       }
     }
 
+    // Import/export nodes add noise without information — except a COBOL
+    // include the query named (#2342). `COPY CVACT01Y` is where the copybook is
+    // pulled in, half of what a question about the copybook asks, so it is
+    // grouped, rendered (a window around the statement) and listed like any
+    // symbol. The context builder makes one an entry point only when the query
+    // names its member, so no other import ever passes this test.
+    const namedIncludeIds = new Set(subgraph.roots.filter((id) => {
+      const root = subgraph.nodes.get(id);
+      return root !== undefined && isCopybookInclude(root);
+    }));
+    const isListedSymbol = (n: Node): boolean =>
+      n.kind !== 'export' && (n.kind !== 'import' || namedIncludeIds.has(n.id));
     for (const node of subgraph.nodes.values()) {
-      // Skip import/export nodes — they add noise without information
-      if (node.kind === 'import' || node.kind === 'export') continue;
+      if (!isListedSymbol(node)) continue;
       // SECURITY (#383): never render the on-disk source of a config-leaf
       // (Spring application.{yml,properties} key) — its line is `key = <secret>`,
       // so whole-file/cluster rendering here would push secrets into context
@@ -6040,6 +6108,12 @@ export class ToolHandler {
       '',
     ];
 
+    // A named COBOL copybook's include sites, ALL of them (#2342) — the source
+    // below has room for a few include windows, and "what includes X" is the
+    // question a copybook name asks.
+    const copybookSection = this.buildCopybookSection(namedCopybooks);
+    if (copybookSection) lines.push(copybookSection);
+
     // Blast radius (always-on, compact): for the entry symbols, who depends on
     // them + which tests cover them — locations only, no source — so the agent
     // knows what to update/verify before editing without a separate call.
@@ -6505,7 +6579,7 @@ export class ToolHandler {
       const hit = overheadCache.get(filePath);
       if (hit !== undefined) return hit;
       const names = [...new Set(
-        nodes.filter((n) => n.kind !== 'import' && n.kind !== 'export')
+        nodes.filter(isListedSymbol)
           .map((n) => `${n.name}(${n.kind})`),
       )].slice(0, budget.maxSymbolsInFileHeader);
       // header + blank, then ```lang / body / ``` / blank around the source.
@@ -7141,7 +7215,7 @@ export class ToolHandler {
       // The file node is not one of them: no section delivers "the file" as a
       // symbol, and it spans trailing lines no render prints.
       const wantedFrom = (nodes: readonly Node[]): ExploreWantedSpan[] => nodes
-        .filter((n) => n.kind !== 'import' && n.kind !== 'export' && n.kind !== 'file' && n.startLine > 0)
+        .filter((n) => isListedSymbol(n) && n.kind !== 'file' && n.startLine > 0)
         .map((n) => ({
           name: n.name,
           kind: n.kind,
@@ -7178,7 +7252,7 @@ export class ToolHandler {
           && !anchorSpans.has(filePath)
           && (onSpineGodFile || (!hasSpineNode && isPolymorphicSibling(group.nodes) && !spared))) {
         const syms = group.nodes
-          .filter(n => n.kind !== 'import' && n.kind !== 'export' && n.startLine > 0)
+          .filter(n => isListedSymbol(n) && n.startLine > 0)
           .sort((a, b) => a.startLine - b.startLine);
         // Pass 1: choose which symbols get a FULL body, by priority, greedily within
         // a per-file body cap — so one huge family file can't body every named method
@@ -7321,7 +7395,7 @@ export class ToolHandler {
           }
         }
         if (skel.length > 0) {
-          const names = [...new Set(group.nodes.filter(n => n.kind !== 'import' && n.kind !== 'export').map(n => n.name))]
+          const names = [...new Set(group.nodes.filter(isListedSymbol).map(n => n.name))]
             .slice(0, budget.maxSymbolsInFileHeader).join(', ');
           // Steer the agent to codegraph_explore for an elided body — NEVER to
           // Read. The old "Read for more" / "Read for a full body" tags invited
@@ -7480,7 +7554,7 @@ export class ToolHandler {
         const wholeSection = ddWhole.parts.map((p) => p.text).join(GAP_MARKER);
         const uniqSymbols = [...new Set(
           group.nodes
-            .filter(n => n.kind !== 'import' && n.kind !== 'export')
+            .filter(isListedSymbol)
             .map(n => `${n.name}(${n.kind})`)
         )];
         const headerNames = uniqSymbols.slice(0, budget.maxSymbolsInFileHeader);
@@ -8660,7 +8734,7 @@ export class ToolHandler {
       const g = fileGroups.get(fp);
       if (!g) return sum;
       return sum + new Set(
-        g.nodes.filter((n) => n.kind !== 'import' && n.kind !== 'export').map((n) => n.id),
+        g.nodes.filter(isListedSymbol).map((n) => n.id),
       ).size;
     }, 0);
     // Path pinning is visible, not silent: say which query-named files were
diff --git a/src/resolution/callback-synthesizer.ts b/src/resolution/callback-synthesizer.ts
index 3b9b4b3015..59e062d68c 100644
--- a/src/resolution/callback-synthesizer.ts
+++ b/src/resolution/callback-synthesizer.ts
@@ -1853,9 +1853,14 @@ async function vueTemplateEdges(ctx: ResolutionContext, onYield: MaybeYield): Pr
       const event = m[1]!;
       const expr = m[2]!.trim();
       if (expr.includes('=>') || expr.startsWith('$')) continue; // inline arrow / $emit
-      const name = expr.match(/^([A-Za-z_]\w*)/)?.[1];
+      // `@click="save"` names a method Vue calls with the event. A handler that
+      // is an expression — `save(item)`, `emit('close')`, `open = true` — is
+      // the template's own code: the Vue extractor records its calls, on their
+      // line (#2340), so resolving its leading name here too doubled those
+      // edges and bound `emit(…)` / `open = …` to any function of that name.
+      const name = expr.match(/^([A-Za-z_$][\w$]*)\s*(?:\(|$)/)?.[1];
       if (!name) continue;
-      const direct = resolve(name, HANDLER_KINDS);
+      const direct = name === expr ? resolve(name, HANDLER_KINDS) : undefined;
       if (direct) { addEdge(direct, { synthesizedBy: 'vue-handler', event }); continue; }
       // Composable-destructure handler → resolve to the composable's returned fn.
       const d = destructured.get(name);
diff --git a/src/resolution/frameworks/rust.ts b/src/resolution/frameworks/rust.ts
index 1d9f2c2d01..b701dfed8a 100644
--- a/src/resolution/frameworks/rust.ts
+++ b/src/resolution/frameworks/rust.ts
@@ -107,6 +107,13 @@ export const rustResolver: FrameworkResolver = {
     const references: UnresolvedRef[] = [];
     const now = Date.now();
     const safe = stripCommentsForRegex(content, 'rust');
+    // Where a handler's own name is written, for the handler expression `expr`
+    // ending at `exprEnd`: the Rust scope gate reads the reference's line, and
+    // rustfmt wraps a long `.route(` call so its handler sits below it (#2326).
+    const handlerSite = (exprEnd: number, expr: string, handler: string) => {
+      const offset = exprEnd - expr.length + expr.lastIndexOf(handler);
+      return { line: safe.slice(0, offset).split('\n').length, column: offset - safe.lastIndexOf('\n', offset - 1) - 1 };
+    };
 
     // Actix-web / Rocket attribute: #[get("/path")] fn handler(..)
     // Capture the method, path, and the fn identifier that follows.
@@ -165,12 +172,24 @@ export const rustResolver: FrameworkResolver = {
       const line = safe.slice(0, match.index).split('\n').length;
 
       const methodBody = args.slice(pathMatch[0].length);
+      const bodyAt = openIdx + 1 + pathMatch[0].length;
       const methodHandlerRegex = /\b(get|post|put|patch|delete|head|options|trace)\s*\(\s*([A-Za-z_][\w:]*)/g;
       let mh: RegExpExecArray | null;
+      // The method routers are the argument's top-level chain (`get(a).post(b)`);
+      // a `get(` nested in it — `get(|| async { cache.get(key) })` — is a call
+      // inside a closure handler, not a route.
+      let depth = 0;
+      let scanned = 0;
       while ((mh = methodHandlerRegex.exec(methodBody)) !== null) {
+        for (; scanned < mh.index; scanned++) {
+          if (methodBody[scanned] === '(') depth++;
+          else if (methodBody[scanned] === ')') depth--;
+        }
+        if (depth > 0) continue;
         const upper = mh[1]!.toUpperCase();
         const handler = mh[2]!.split('::').filter(Boolean).pop();
         if (!handler) continue;
+        const site = handlerSite(bodyAt + mh.index + mh[0].length, mh[2]!, handler);
 
         const routeNode: Node = {
           id: `route:${filePath}:${line}:${upper}:${routePath}`,
@@ -191,8 +210,8 @@ export const rustResolver: FrameworkResolver = {
           fromNodeId: routeNode.id,
           referenceName: handler,
           referenceKind: 'references',
-          line,
-          column: 0,
+          line: site.line,
+          column: site.column,
           filePath,
           language: 'rust',
         });
@@ -235,9 +254,10 @@ export const rustResolver: FrameworkResolver = {
 
     // Actix-web builder API (the dominant actix routing style; attribute macros
     // are handled above). The handler lives in `.to(handler)`, not `get(handler)`.
-    const pushActixRoute = (routePath: string, method: string, handlerExpr: string, line: number) => {
+    const pushActixRoute = (routePath: string, method: string, handlerExpr: string, line: number, exprEnd: number) => {
       const handler = handlerExpr.split('::').filter(Boolean).pop();
       if (!handler) return;
+      const site = handlerSite(exprEnd, handlerExpr, handler);
       const upper = method.toUpperCase();
       const routeNode: Node = {
         id: `route:${filePath}:${line}:${upper}:${routePath}`,
@@ -257,8 +277,8 @@ export const rustResolver: FrameworkResolver = {
         fromNodeId: routeNode.id,
         referenceName: handler,
         referenceKind: 'references',
-        line,
-        column: 0,
+        line: site.line,
+        column: site.column,
         filePath,
         language: 'rust',
       });
@@ -283,13 +303,13 @@ export const rustResolver: FrameworkResolver = {
         if (chain[1] === 'route') {
           const m2 = /web::(get|post|put|patch|delete|head)\s*\(\s*\)\s*\.to\s*\(\s*([A-Za-z_][\w:]*)/.exec(args);
           if (m2) {
-            pushActixRoute(routePath, m2[1]!, m2[2]!, safe.slice(0, open).split('\n').length);
+            pushActixRoute(routePath, m2[1]!, m2[2]!, safe.slice(0, open).split('\n').length, open + 1 + m2.index + m2[0].length);
           }
         } else if (chain[1] === 'to') {
           // Direct `.resource("/x").to(handler)` (all methods).
           const m2 = /^\s*([A-Za-z_][\w:]*)/.exec(args);
           if (m2) {
-            pushActixRoute(routePath, 'ANY', m2[1]!, safe.slice(0, open).split('\n').length);
+            pushActixRoute(routePath, 'ANY', m2[1]!, safe.slice(0, open).split('\n').length, open + 1 + m2.index + m2[0].length);
           }
         }
         p = close + 1;
@@ -300,7 +320,7 @@ export const rustResolver: FrameworkResolver = {
     const appRouteRegex = /\.route\s*\(\s*"([^"]+)"\s*,\s*web::(get|post|put|patch|delete|head)\s*\(\s*\)\s*\.to\s*\(\s*([A-Za-z_][\w:]*)/g;
     while ((match = appRouteRegex.exec(safe)) !== null) {
       const line = safe.slice(0, match.index).split('\n').length;
-      pushActixRoute(scopedPath(match.index, match[1]!), match[2]!, match[3]!, line);
+      pushActixRoute(scopedPath(match.index, match[1]!), match[2]!, match[3]!, line, match.index + match[0].length);
     }
 
     return { nodes, references };
diff --git a/src/resolution/frameworks/svelte.ts b/src/resolution/frameworks/svelte.ts
index 9598f98107..8a8495fc53 100644
--- a/src/resolution/frameworks/svelte.ts
+++ b/src/resolution/frameworks/svelte.ts
@@ -80,8 +80,10 @@ export const svelteResolver: FrameworkResolver = {
       };
     }
 
-    // Pattern 2: Store auto-subscriptions ($storeName)
-    if (ref.referenceName.startsWith('$') && !ref.referenceName.startsWith('$$')) {
+    // Pattern 2: Store auto-subscriptions ($storeName) — a `.svelte`
+    // component's syntax only. In any other script `$n` is a name of its own
+    // (jQuery's `$el`, a compiler's `$n`), never the store `n`.
+    if (ref.language === 'svelte' && ref.referenceName.startsWith('$') && !ref.referenceName.startsWith('$$')) {
       const storeName = ref.referenceName.substring(1);
       const storeNode = context.getNodesByName(storeName).find(
         (n) => n.kind === 'variable' || n.kind === 'constant'
diff --git a/src/resolution/frameworks/vue.ts b/src/resolution/frameworks/vue.ts
index 4ecdf9b844..66f2e22bc6 100644
--- a/src/resolution/frameworks/vue.ts
+++ b/src/resolution/frameworks/vue.ts
@@ -121,8 +121,10 @@ export const vueResolver: FrameworkResolver = {
       };
     }
 
-    // Pattern 2: Nuxt auto-imported composables
-    if (NUXT_AUTO_IMPORTS.has(ref.referenceName)) {
+    // Pattern 2: Nuxt auto-imported composables — unless the file declares
+    // its own function of that name, which shadows the auto-import: elk's
+    // lists page calls its own `clearError(true)`, not Nuxt's (#2340).
+    if (NUXT_AUTO_IMPORTS.has(ref.referenceName) && !declaresOwnFunction(ref, context)) {
       return {
         original: ref,
         targetNodeId: ref.fromNodeId,
@@ -346,6 +348,13 @@ export const nuxtResolver: FrameworkResolver = {
   },
 };
 
+/** Does the reference's own file declare a function (or a const holding one) by that name? */
+function declaresOwnFunction(ref: UnresolvedRef, context: ResolutionContext): boolean {
+  return context
+    .getNodesInFile(ref.filePath)
+    .some((n) => n.name === ref.referenceName && (n.kind === 'function' || n.kind === 'constant' || n.kind === 'variable'));
+}
+
 /**
  * Check if string is PascalCase
  */
diff --git a/src/resolution/go-module.ts b/src/resolution/go-module.ts
index 03f6b9b237..73ff77de67 100644
--- a/src/resolution/go-module.ts
+++ b/src/resolution/go-module.ts
@@ -7,6 +7,12 @@
  * — `github.com/example/myproject/pkga` — as a third-party package, so
  * resolution falls through to name-matching with path proximity and returns
  * a tiny fraction of the real call sites. See issue #388.
+ *
+ * A project can hold several modules — a Go backend in `server/` next to a
+ * frontend, or etcd's root module beside `server/go.mod` and
+ * `client/v3/go.mod` — so the resolver reads the `go.mod` nearest every
+ * directory with indexed Go files and maps an import path to the module
+ * that declares the longest prefix of it (#2322).
  */
 
 import * as fs from 'fs';
@@ -20,15 +26,11 @@ export interface GoModule {
 }
 
 /**
- * Read the `go.mod` file at the project root and extract the module path.
- * Returns `null` if no `go.mod` exists or it has no `module` directive.
- *
- * Limitation: only the project-root `go.mod` is read. Nested `go.mod` files
- * (Go workspaces, monorepos with multiple modules) are not yet resolved —
- * a follow-up if a real repro shows up.
+ * Read the `go.mod` file in `moduleDir` and extract the module path.
+ * Returns `null` if no `go.mod` exists there or it has no `module` directive.
  */
-export function loadGoModule(projectRoot: string): GoModule | null {
-  const goModPath = path.join(projectRoot, 'go.mod');
+export function loadGoModule(moduleDir: string): GoModule | null {
+  const goModPath = path.join(moduleDir, 'go.mod');
   let content: string;
   try {
     content = fs.readFileSync(goModPath, 'utf-8');
@@ -43,5 +45,37 @@ export function loadGoModule(projectRoot: string): GoModule | null {
   // Strip optional quoting around the module path.
   const modulePath = match[1]!.replace(/^["']|["']$/g, '');
   if (!modulePath) return null;
-  return { modulePath, rootDir: projectRoot };
+  return { modulePath, rootDir: moduleDir };
+}
+
+/**
+ * The module an import path belongs to: the one whose module path equals it
+ * or is a `/`-bounded prefix of it. Nested modules (`example.com/app` and
+ * `example.com/app/tools`) take the longest module path, as Go does; two
+ * modules declaring the same path prefer `own`, the importing file's module.
+ * `null` for the standard library and third-party modules.
+ */
+export function findGoModuleForImport(
+  importPath: string,
+  modules: readonly GoModule[],
+  own?: GoModule | null
+): GoModule | null {
+  let best: GoModule | null = null;
+  for (const mod of own && !modules.includes(own) ? [...modules, own] : modules) {
+    if (importPath !== mod.modulePath && !importPath.startsWith(`${mod.modulePath}/`)) continue;
+    const length = best ? best.modulePath.length : -1;
+    if (mod.modulePath.length > length || (mod.modulePath.length === length && mod === own)) best = mod;
+  }
+  return best;
+}
+
+/**
+ * The project-relative directory (`/`-separated, `.` for the project root)
+ * of the package `importPath` names inside module `mod`: the module's own
+ * directory followed by the rest of the import path.
+ */
+export function goModulePackageDir(importPath: string, mod: GoModule, projectRoot: string): string {
+  const modDir = path.relative(projectRoot, mod.rootDir).split(path.sep).join('/');
+  const rest = importPath === mod.modulePath ? '' : importPath.slice(mod.modulePath.length + 1);
+  return path.posix.join(modDir, rest);
 }
diff --git a/src/resolution/import-resolver.ts b/src/resolution/import-resolver.ts
index 645d03bfd8..59803b7edb 100644
--- a/src/resolution/import-resolver.ts
+++ b/src/resolution/import-resolver.ts
@@ -285,8 +285,7 @@ function isExternalImport(
     // In-module imports look like `<module-path>/sub/pkg` — local to
     // this project. Without the module-path check we'd flag every
     // cross-package call in a Go monorepo as external (issue #388).
-    const mod = context?.getGoModule?.();
-    if (mod && (importPath === mod.modulePath || importPath.startsWith(mod.modulePath + '/'))) {
+    if (context?.getGoPackageDir?.(importPath) != null) {
       return false;
     }
     // `internal/` packages stay local even when go.mod is missing —
diff --git a/src/resolution/index.ts b/src/resolution/index.ts
index 3999fb50e3..d9f6dd0f36 100644
--- a/src/resolution/index.ts
+++ b/src/resolution/index.ts
@@ -34,7 +34,7 @@ import { synthesizeCallbackEdges } from './callback-synthesizer';
 import { createYielder, type MaybeYield } from './cooperative-yield';
 import { MAX_SOURCE_FILE_SIZE_BYTES } from '../file-limits';
 import { loadProjectAliases, loadScopedAliases, scopedAliasesForFile, type AliasMap, type AliasScope } from './path-aliases';
-import { loadGoModule, type GoModule } from './go-module';
+import { findGoModuleForImport, goModulePackageDir, loadGoModule, type GoModule } from './go-module';
 import { loadWorkspacePackages, type WorkspacePackages } from './workspace-packages';
 import { logDebug } from '../errors';
 import { lexicalPathWithinRoot, safeJsonParse } from '../utils';
@@ -158,7 +158,9 @@ export class ReferenceResolver {
   private projectAliases: AliasMap | null | undefined = undefined;
   private aliasScopes: AliasScope[] | undefined = undefined;
   // go.mod module path. Same lazy/immutable convention as projectAliases.
-  private goModule: GoModule | null | undefined = undefined;
+  private goModuleByDir = new Map<string, GoModule | null>();
+  private goModules: GoModule[] | null = null;
+  private goPackageDirs = new Map<string, string | null>();
   // Monorepo workspace member packages. Same lazy/immutable convention.
   private workspacePackages: WorkspacePackages | null | undefined = undefined;
 
@@ -297,6 +299,9 @@ export class ReferenceResolver {
     this.nodesByKindCache.clear();
     this.fileExistsMemo.clear();
     this.knownFiles = null;
+    this.goModules = null;
+    this.goPackageDirs.clear();
+    this.goModuleByDir.clear();
     this.allFilesCache = null;
     this.cachesWarmed = false;
     // The import-resolver's per-context memos assume the
@@ -309,6 +314,43 @@ export class ReferenceResolver {
     }
   }
 
+  private nearestGoModule(dir: string): GoModule | null {
+    const walked: string[] = [];
+    let found: GoModule | null | undefined;
+    for (;;) {
+      found = this.goModuleByDir.get(dir);
+      if (found !== undefined) break;
+      walked.push(dir);
+      found = loadGoModule(path.join(this.projectRoot, dir));
+      if (found || dir === '') break;
+      dir = goDirOf(dir);
+    }
+    for (const d of walked) this.goModuleByDir.set(d, found);
+    return found;
+  }
+
+  /**
+   * The project's Go modules: the root `go.mod`'s, and the nearest `go.mod`
+   * of every directory holding an indexed `.go` file — so an ignored or
+   * vendored tree, which holds no indexed file, adds none, and nothing walks
+   * the disk. The go tool ignores `testdata/` and `_`/`.`-prefixed
+   * directories, so a module there serves only its own files (#2322).
+   */
+  private getGoModules(): GoModule[] {
+    if (this.goModules) return this.goModules;
+    const dirs = new Set<string>(['']);
+    for (const file of this.knownFiles ?? this.queries.getAllFilePaths()) {
+      if (file.endsWith('.go')) dirs.add(goDirOf(file));
+    }
+    const modules = new Set<GoModule>();
+    for (const dir of dirs) {
+      const mod = this.nearestGoModule(dir);
+      if (mod) modules.add(mod);
+    }
+    this.goModules = [...modules];
+    return this.goModules;
+  }
+
   /** `readFile` through the LRU content cache (null = read failed, also cached). */
   private readFileCached(filePath: string): string | null {
     if (this.fileCache.has(filePath)) {
@@ -554,11 +596,15 @@ export class ReferenceResolver {
 
       getScopedAliasesFor: (filePath: string) => scopedAliasesForFile(filePath, this.context.getAliasScopes!()),
 
-      getGoModule: () => {
-        if (this.goModule === undefined) {
-          this.goModule = loadGoModule(this.projectRoot);
-        }
-        return this.goModule;
+      getGoPackageDir: (importPath: string, fromFile?: string) => {
+        const own = fromFile === undefined ? null : this.nearestGoModule(goDirOf(fromFile));
+        const key = `${importPath}\0${own?.rootDir ?? ''}`;
+        const hit = this.goPackageDirs.get(key);
+        if (hit !== undefined) return hit;
+        const mod = findGoModuleForImport(importPath, this.getGoModules().filter(m => !/(?:^|\/)(?:testdata|[_.][^/]*)(?:\/|$)/.test(path.relative(this.projectRoot, m.rootDir).split(path.sep).join('/'))), own);
+        const dir = mod ? goModulePackageDir(importPath, mod, this.projectRoot) : null;
+        this.goPackageDirs.set(key, dir);
+        return dir;
       },
 
       getWorkspacePackages: () => {
@@ -783,7 +829,7 @@ export class ReferenceResolver {
     if (!snapshot) this.queries.mapWalIndex();
     const aliases = this.context.getProjectAliases?.() ?? null;
     const workspaces = this.context.getWorkspacePackages?.() ?? null;
-    const goModule = this.context.getGoModule?.() ?? null;
+
     const toKv = (m: Map<string, string> | undefined): { key: string; value: string }[] =>
       m ? [...m].map(([key, value]) => ({ key, value })) : [];
     return new kernelModule.KernelResolver({
@@ -804,7 +850,7 @@ export class ReferenceResolver {
             localLinkNames: workspaces.localLinkNames ? [...workspaces.localLinkNames] : undefined,
           }
         : undefined,
-      goModulePath: goModule?.modulePath,
+      goModules: this.getGoModules().map(m => ({ modulePath: m.modulePath, dir: path.relative(this.projectRoot, m.rootDir).split(path.sep).join('/') })),
       cppIncludeDirs: this.context.getCppIncludeDirs?.() ?? [],
       nodeBuiltinSpecifiers: [...builtinModules],
       frameworksActive: this.frameworks.length > 0,
@@ -840,6 +886,8 @@ export class ReferenceResolver {
     return {
       original: ref,
       targetNodeId: outcome.targetNodeId,
+      edgeKind: outcome.edgeKind as ResolvedRef['edgeKind'],
+      alsoTargets: outcome.alsoTargetNodeIds?.map(targetNodeId => ({ targetNodeId })),
       confidence: outcome.confidence ?? 0,
       resolvedBy: (outcome.resolvedBy ?? 'exact-match') as ResolvedRef['resolvedBy'],
     };
@@ -2379,3 +2427,8 @@ export function createResolver(projectRoot: string, queries: QueryBuilder): Refe
   resolver.initialize();
   return resolver;
 }
+
+function goDirOf(p: string): string {
+  const dir = path.posix.dirname(p.replace(/\\/g, '/'));
+  return dir === '.' || dir === '/' ? '' : dir;
+}
diff --git a/src/resolution/strip-comments.ts b/src/resolution/strip-comments.ts
index 542368ad65..18e38ed7c2 100644
--- a/src/resolution/strip-comments.ts
+++ b/src/resolution/strip-comments.ts
@@ -27,8 +27,10 @@
  * Blank string contents while preserving quotes and offsets. Template
  * interpolations are blanked too; callers checking executable expressions
  * must conservatively inspect those expressions in the original source.
+ * `regexLiterals`, when given, receives the offsets of the opening and
+ * closing `/` of every span read as a regex literal (left as is).
  */
-export function blankStringContents(text: string): string {
+export function blankStringContents(text: string, regexLiterals?: number[]): string {
   const out = text.split('');
   let i = 0;
   const n = text.length;
@@ -45,7 +47,11 @@ export function blankStringContents(text: string): string {
         if (text[end] === ']') inClass = false;
         if (text[end] === '/' && !inClass) break;
       }
-      if (end < n && text[end] === '/') { i = end + 1; continue; }
+      if (end < n && text[end] === '/') {
+        regexLiterals?.push(i, end);
+        i = end + 1;
+        continue;
+      }
     }
     if (c === '"' || c === "'" || c === '`') {
       const quote = c;
diff --git a/src/resolution/types.ts b/src/resolution/types.ts
index 61b375164e..fa17c78d13 100644
--- a/src/resolution/types.ts
+++ b/src/resolution/types.ts
@@ -182,13 +182,16 @@ export interface ResolutionContext {
   /** The aliases of the nearest nested config enclosing a file, tried before the root's. */
   getScopedAliasesFor?(filePath: string): import('./path-aliases').AliasMap | null;
   /**
-   * Go module info from `go.mod` at the project root. Returns `null`
-   * when the project has no `go.mod` (non-Go projects, pre-modules
-   * Go code, or projects whose modules live in subdirectories). Used
-   * by the Go branch of import resolution to distinguish in-module
-   * cross-package imports from third-party packages.
+   * The project-relative directory (`/`-separated, `.` for the root) of
+   * the Go package an import path names, when it is a package of one of the
+   * project's own modules — the `go.mod` at the root or any `go.mod` above
+   * an indexed `.go` file (#2322) — else `null` (the standard library,
+   * third-party modules, a project with no `go.mod`). `fromFile`, the
+   * importing file, breaks a tie between two modules declaring one path.
+   * Used by the Go branch of resolution to tell in-project cross-package
+   * imports from outside ones, and to find the package's files.
    */
-  getGoModule?(): import('./go-module').GoModule | null;
+  getGoPackageDir?(importPath: string, fromFile?: string): string | null;
   /**
    * Monorepo workspace member packages, keyed by declared package name.
    * Returns `null` for single-package repos (no `workspaces` field).
diff --git a/src/ui-server/index.ts b/src/ui-server/index.ts
index eb5e25c749..7b379416d5 100644
--- a/src/ui-server/index.ts
+++ b/src/ui-server/index.ts
@@ -398,9 +398,10 @@ function safeDecode(value: string): string {
 /**
  * Bind the first free port at or after `port`, on loopback only.
  *
- * Only `EADDRINUSE` advances to the next port — a permission failure or a bad
- * address will not get better one port over, and retrying twenty times would
- * only bury the real error.
+ * Only a port that is taken advances to the next one (see
+ * {@link shouldTryNextPort}) — a permission failure every port shares, or a
+ * bad address, will not get better one port over, and retrying twenty times
+ * would only bury the real error.
  */
 async function listenWithFallback(
   server: http.Server,
@@ -408,6 +409,9 @@ async function listenWithFallback(
 ): Promise<number> {
   // Port 0 means "any free port", so there is nothing to fall back from.
   const attempts = opts.port === 0 || !opts.fallback ? 1 : Math.max(1, opts.attempts);
+  const platform = process.platform;
+  // Whether any port was refused rather than in use — the message says so.
+  let refused = false;
 
   for (let i = 0; i < attempts; i++) {
     const candidate = opts.port === 0 ? 0 : opts.port + i;
@@ -420,8 +424,9 @@ async function listenWithFallback(
       return address.port;
     } catch (err) {
       const code = (err as NodeJS.ErrnoException).code;
-      if (code !== 'EADDRINUSE' || i === attempts - 1) {
-        throw describeBindFailure(err, candidate, opts);
+      if (code === 'EACCES') refused = true;
+      if (!shouldTryNextPort(code, candidate, platform) || i === attempts - 1) {
+        throw describeBindFailure(err, candidate, opts, platform, refused);
       }
     }
   }
@@ -435,7 +440,8 @@ async function listenWithFallback(
  * The same `http.Server` is reused across attempts: a `listen()` that failed
  * with EADDRINUSE never took a handle, so it can be listened on again directly
  * (verified on Node 20 and 22 — `server.listening` is still `false` afterwards,
- * and `close()` on a never-listening server would itself throw).
+ * and `close()` on a never-listening server would itself throw). The same goes
+ * for a port Windows refused with EACCES (checked on Node 22 and 24).
  */
 function listenOnce(server: http.Server, port: number): Promise<void> {
   return new Promise<void>((resolve, reject) => {
@@ -453,22 +459,78 @@ function listenOnce(server: http.Server, port: number): Promise<void> {
   });
 }
 
-/** Turn a bind failure into something a user can act on. */
-function describeBindFailure(
+/**
+ * Whether a `listen()` on `port` that failed with `code` leaves the next port
+ * worth trying.
+ *
+ * `EADDRINUSE` does, and so does `EACCES` on Windows: a port another program
+ * holds exclusively (`SO_EXCLUSIVEADDRUSE`), or one inside a range the system
+ * reserves (Hyper-V and WinNAT reserve whole blocks of them), fails there with
+ * EACCES rather than EADDRINUSE. Elsewhere, EACCES below 1024 is the
+ * privileged-port rule, which the next port is under too, so walking on would
+ * only bury it. From 1024 up it is something refusing that one port — a
+ * security policy, say — and the next one may be allowed.
+ */
+export function shouldTryNextPort(
+  code: string | undefined,
+  port: number,
+  platform: NodeJS.Platform = process.platform
+): boolean {
+  if (code === 'EADDRINUSE') return true;
+  return code === 'EACCES' && !isPrivilegedPort(port, platform);
+}
+
+/**
+ * Whether `port` is one only an administrator may bind: below 1024, on every
+ * platform but Windows, which has no such rule.
+ */
+function isPrivilegedPort(port: number, platform: NodeJS.Platform): boolean {
+  return platform !== 'win32' && port > 0 && port < 1024;
+}
+
+/** The command that lists the port ranges Windows reserves. */
+const LIST_RESERVED_PORTS = '`netsh int ipv4 show excludedportrange protocol=tcp`';
+
+/**
+ * Turn a bind failure into something a user can act on, and that is true where
+ * it is read: Windows refuses ports for reasons POSIX doesn't have, and has no
+ * privileged ports.
+ *
+ * `refused` says whether any port a fallback walk tried was refused (EACCES)
+ * rather than in use; it only changes the message for a walk that ran out.
+ */
+export function describeBindFailure(
   err: unknown,
   port: number,
-  opts: { port: number; fallback: boolean; attempts: number }
+  opts: { port: number; fallback: boolean },
+  platform: NodeJS.Platform = process.platform,
+  refused = false
 ): Error {
   const code = (err as NodeJS.ErrnoException).code;
+  const windows = platform === 'win32';
+  if (opts.fallback && shouldTryNextPort(code, port, platform)) {
+    // A failure that moves on only ends the walk when there is nowhere left.
+    const taken =
+      !refused && code === 'EADDRINUSE'
+        ? 'in use'
+        : windows
+          ? `in use or reserved (${LIST_RESERVED_PORTS} lists the reserved ranges)`
+          : 'in use or not allowed';
+    return new Error(`Ports ${opts.port}–${port} are all ${taken}. Free one, or pick another with --port.`);
+  }
   if (code === 'EADDRINUSE') {
-    return opts.fallback
-      ? new Error(
-          `Ports ${opts.port}–${port} are all in use. Free one, or pick another with --port.`
-        )
-      : new Error(`Port ${port} is already in use. Pick another with --port, or omit --port to let CodeGraph find a free one.`);
+    return new Error(`Port ${port} is already in use. Pick another with --port, or omit --port to let CodeGraph find a free one.`);
   }
   if (code === 'EACCES') {
-    return new Error(`Not allowed to listen on port ${port}. Ports below 1024 usually need elevated privileges — pick a higher one with --port.`);
+    if (isPrivilegedPort(port, platform)) {
+      return new Error(`Not allowed to listen on port ${port}. Ports below 1024 usually need elevated privileges — pick a higher one with --port.`);
+    }
+    return new Error(
+      (windows
+        ? `Windows refused port ${port}: another program holds it, or it is in a reserved range (${LIST_RESERVED_PORTS} lists them).`
+        : `Not allowed to listen on port ${port}: the system refused permission.`) +
+        ' Pick another with --port, or omit --port to let CodeGraph find a free one.'
+    );
   }
   return err instanceof Error ? err : new Error(String(err));
 }
diff --git a/telemetry-dashboard/README.md b/telemetry-dashboard/README.md
index 26feaac2df..10c1fb3fc2 100644
--- a/telemetry-dashboard/README.md
+++ b/telemetry-dashboard/README.md
@@ -40,7 +40,7 @@ renders. Bad input is a `400` with a message, never a guess. Chart data carries
 
 | Endpoint | Answers |
 |---|---|
-| `/api/meta` | How current the data is: `today`, the rollup's last day (`latest_rollup_day`), the last day an event arrived, machines active yesterday, and two flags — `ingest_stalled` and `rollup_behind` — that put a warning above the panels when either writer stops. Cached 60 s. |
+| `/api/meta` | How current the data is: `today`, the rollup's last day (`latest_rollup_day`), the last day ingest stored anything (`latest_ingest_day` — a lifecycle event or a usage counter), machines active yesterday, and two flags — `ingest_stalled` and `rollup_behind` — that put a warning above the panels when either writer stops. Cached 60 s. |
 | `/api/summary` | Big numbers: production users, active machines, new machines, installs, uninstalls, indexing runs, tool calls. |
 | `/api/timeseries?metric=` | `installs_uninstalls`, `new_installs`, `production_users`, `indexing_activity`, `tool_calls`, `duration_buckets`. One dense point per day — a day with nothing is a zero, not a gap. Days after the rollup's last day are `null` ("not counted yet") and `covered_through` says where that is; `new_installs` is written live and runs through today. |
 | `/api/breakdown?dim=` | `os`, `arch`, `codegraph_version`, `node_major`, `language`, `file_count_bucket`, `duration_bucket`, `target`, `scope`, `kind`, `name`, `client_name`, `name_error`. Optional `&event=`, `&metric=count\|machines`, `&limit=`. |
@@ -53,7 +53,8 @@ kept forever, so a chart stays correct for days whose raw events have been purge
 panel reads raw `events`.** D1 runs one query at a time per database: the activation funnel
 used to join every cohort machine against `events`, which took ~55 s for one week of
 cohorts in production and failed every panel queued behind it. It now reads
-`machine_first_seen.first_index_day`, which the nightly rollup maintains.
+`machine_first_seen.first_index_day`, which the ingest worker lowers as each index event is
+stored and the nightly rollup re-derives from raw events.
 
 The presets end on **today** (UTC — every event and rollup is keyed on the UTC day). Live
 numbers — production users, new machines, retention — run through today; rolled-up ones
@@ -138,6 +139,10 @@ npm run smoke:render             # the panels, in a browser (79 assertions)
 Each suite starts its own throwaway `wrangler dev` on its own port and cleans up after
 itself, so they can be run in any order (`DASH_PORT` overrides the port).
 
+The repo's own test suite also runs `src/api.ts`, with the ingest worker feeding it, against
+the writer's migrations in an in-memory SQLite database — no wrangler needed. From the repo
+root (it is part of `npm test` there): `npx vitest run __tests__/telemetry-services.test.ts`.
+
 **`smoke-auth.sh`** is the regression net for the gate: unauthenticated requests reach
 nothing (pages, API *and* static assets), the cookie is persistent and correctly flagged,
 flipped/truncated/forged cookies are all rejected, brute force is capped, and rotating the
diff --git a/telemetry-dashboard/public/app.js b/telemetry-dashboard/public/app.js
index b29506aada..abb2f46efa 100644
--- a/telemetry-dashboard/public/app.js
+++ b/telemetry-dashboard/public/app.js
@@ -408,7 +408,8 @@ function drawDataWarning() {
 
   if (meta?.ingest_stalled) {
     lines.push([
-      `No new events since ${shortDay(meta.latest_raw_day)}.`,
+      // The last day anything was stored, lifecycle event or usage counter.
+      `No new events since ${shortDay(meta.latest_ingest_day ?? meta.latest_raw_day)}.`,
       ' The ingest worker at telemetry.getcodegraph.com is not storing anything; its logs and the D1 database are where to look.',
     ]);
   }
diff --git a/telemetry-dashboard/scripts/fixture.sql b/telemetry-dashboard/scripts/fixture.sql
index 9e2ddef020..e9ca7c151d 100644
--- a/telemetry-dashboard/scripts/fixture.sql
+++ b/telemetry-dashboard/scripts/fixture.sql
@@ -36,6 +36,7 @@ DELETE FROM daily_machines;
 DELETE FROM machine_days;
 DELETE FROM machine_first_seen;
 DELETE FROM events;
+DELETE FROM usage_daily;
 
 -- ---------------------------------------------------------------------------
 -- install — 12, one per machine on its first day
diff --git a/telemetry-dashboard/scripts/smoke-api.sh b/telemetry-dashboard/scripts/smoke-api.sh
index 67008c47b4..8dda68403b 100755
--- a/telemetry-dashboard/scripts/smoke-api.sh
+++ b/telemetry-dashboard/scripts/smoke-api.sh
@@ -105,6 +105,7 @@ field "retention window"     retention_days   14         "$META"
 # The fixture stops on 07-10, months ago: nothing has arrived since, but the
 # rollup did cover every day that saw activity, so it is not behind.
 field "ingest stalled (no events since 07-10)" ingest_stalled true "$META"
+field "…named by the last day anything was stored" latest_ingest_day 2026-07-10 "$META"
 field "rollup not behind (it covered every active day)" rollup_behind false "$META"
 field "nobody active yesterday" machines_yesterday 0 "$META"
 
@@ -307,6 +308,19 @@ field "…and yesterday's machine is counted"     machines_yesterday 1 "$META"
 npx wrangler d1 execute codegraph-telemetry --local \
   --command "DELETE FROM machine_days WHERE machine_id = '$STALE_ID'" >/dev/null 2>&1
 
+echo
+echo "Usage counters alone are not a stalled ingest"
+# Usage lands in usage_daily, not events, so a day of tool calls with no install or
+# index run must not read as "not storing anything". Removed again straight after.
+npx wrangler d1 execute codegraph-telemetry --local \
+  --command "INSERT INTO usage_daily (day, machine_id, kind, name, count) VALUES ('$YESTERDAY', '$STALE_ID', 'mcp_tool', 'codegraph_explore', 3)" >/dev/null 2>&1
+META="$(get "/api/meta")"
+field "not stalled while usage arrives"           ingest_stalled    false        "$META"
+field "…the usage day is the last day stored"     latest_ingest_day "$YESTERDAY" "$META"
+field "…though the last lifecycle event is 07-10" latest_raw_day    2026-07-10   "$META"
+npx wrangler d1 execute codegraph-telemetry --local \
+  --command "DELETE FROM usage_daily WHERE machine_id = '$STALE_ID'" >/dev/null 2>&1
+
 echo
 printf '%d passed, %d failed\n' "$PASS" "$FAIL"
 [[ "$FAIL" -eq 0 ]]
diff --git a/telemetry-dashboard/src/api.ts b/telemetry-dashboard/src/api.ts
index 63b77556c6..24deb33522 100644
--- a/telemetry-dashboard/src/api.ts
+++ b/telemetry-dashboard/src/api.ts
@@ -6,8 +6,8 @@
  * - **Rollups only.** Every panel is answered from `daily_*`, `machine_days` and
  *   `machine_first_seen`, which are kept forever. No panel reads raw `events`:
  *   D1 runs one query at a time per database, so one slow scan there fails every
- *   panel queued behind it. (/api/meta reads the table's first and last day, one
- *   indexed lookup each.)
+ *   panel queued behind it. (/api/meta reads the table's first and last day, and
+ *   `usage_daily`'s last, one indexed lookup each.)
  * - **Today is in range; uncounted days are not zeros.** Rolled-up numbers stop
  *   at the nightly rollup's last day and come back null after it, so a chart
  *   ending today draws a gap where the count has not happened yet, not a cliff.
@@ -214,6 +214,7 @@ interface MetaRow {
   earliest_active_day: string | null;
   earliest_raw_day: string | null;
   latest_raw_day: string | null;
+  latest_usage_day: string | null;
   machines_yesterday: number | null;
 }
 
@@ -246,6 +247,7 @@ async function meta(env: Env): Promise<ApiResult> {
             (SELECT min(day) FROM machine_days)       AS earliest_active_day,
             (SELECT min(day) FROM events)             AS earliest_raw_day,
             (SELECT max(day) FROM events)             AS latest_raw_day,
+            (SELECT max(day) FROM usage_daily)        AS latest_usage_day,
             (SELECT count(*) FROM machine_days WHERE day = ?) AS machines_yesterday`,
   )
     .bind(yesterday)
@@ -253,11 +255,22 @@ async function meta(env: Env): Promise<ApiResult> {
 
   const latestRollup = row?.latest_rollup_day ?? null;
   const latestRaw = row?.latest_raw_day ?? null;
+  const latestUsage = row?.latest_usage_day ?? null;
   const latestActive = row?.latest_active_day ?? null;
-
-  // Nothing at all since before yesterday. (Client clocks may run a few minutes
-  // ahead, so the latest day can be tomorrow — that is fresh, not stale.)
-  const ingestStalled = latestRaw !== null && latestRaw < yesterday;
+  // Ingest stores lifecycle events in `events` and usage counters in `usage_daily`, so
+  // either one arriving means it is working — a day of usage and no installs or index
+  // runs is quiet, not stalled.
+  const latestIngest =
+    latestUsage !== null && (latestRaw === null || latestUsage > latestRaw) ? latestUsage : latestRaw;
+
+  // Stalled: nothing stored since before yesterday. (Client clocks may run a few
+  // minutes ahead, so the latest day can be tomorrow — that is fresh, not stale.) Usage
+  // counters get a day more, because a client uploads a day's counters only once that
+  // day is over: just after midnight UTC the newest one can be the day before yesterday.
+  const ingestStalled =
+    latestIngest !== null &&
+    (latestRaw === null || latestRaw < yesterday) &&
+    (latestUsage === null || latestUsage < addDays(today, -2));
   // The 00:30 UTC run rolls up yesterday, so the day before that must always be in
   // by now. Only "behind" if there was activity after the last rolled-up day — a day
   // nobody used codegraph would be a silent rollup, not a missed one.
@@ -274,7 +287,12 @@ async function meta(env: Env): Promise<ApiResult> {
       latest_rollup_day: latestRollup,
       latest_active_day: latestActive,
       earliest_raw_day: row?.earliest_raw_day ?? null,
+      /** The last day of a stored lifecycle event (install, index, uninstall). */
       latest_raw_day: latestRaw,
+      /** The last day of a stored usage counter. */
+      latest_usage_day: latestUsage,
+      /** The later of the two: the last day ingest stored anything, which the stall banner names. */
+      latest_ingest_day: latestIngest,
       machines_yesterday: row?.machines_yesterday ?? 0,
       rollup_behind: rollupBehind,
       ingest_stalled: ingestStalled,
@@ -670,17 +688,18 @@ interface ActivationRow {
  * reinstalls does not re-enter the funnel, which is what makes this a
  * conversion rate rather than an install-event ratio.
  *
- * "Ran an index" is `machine_first_seen.first_index_day`, which the nightly rollup
- * keeps at the earliest day each machine indexed. That makes this a range read over
- * one small table. It used to be a join against raw `events` — on production volume
- * ~55 s per week of cohorts, which held D1's single query lane long enough to fail
- * every other panel waiting behind it. A first index day is never before the first
- * day (the ingest path keeps first_day at the machine's earliest event), so "within
- * the window" is just `first_index_day <= first_day + window`.
+ * "Ran an index" is `machine_first_seen.first_index_day`, the earliest day each
+ * machine indexed. The ingest worker lowers it as each index event is stored — so a
+ * run that uploads days late still counts — and the nightly rollup re-derives it from
+ * raw events. That makes this a range read over one small table. It used to be a
+ * join against raw `events` — on production volume ~55 s per week of cohorts, which
+ * held D1's single query lane long enough to fail every other panel waiting behind
+ * it. A first index day is never before the first day (the ingest path keeps
+ * first_day at the machine's earliest event), so "within the window" is just
+ * `first_index_day <= first_day + window`.
  *
- * Because first_index_day is rolled up, cohorts after the rollup's last day have no
- * conversions counted yet. They are left out of the totals and drawn as gaps —
- * counting them would show a drop in conversion that is only a lag.
+ * Cohorts after the rollup's last day are left out of the totals and drawn as gaps,
+ * like every other rolled-up number on the page.
  */
 async function activation(env: Env, url: URL, range: Range): Promise<ApiResult> {
   const rawWindow = url.searchParams.get('window');
diff --git a/telemetry-worker/README.md b/telemetry-worker/README.md
index 296ec2251d..077d0812f0 100644
--- a/telemetry-worker/README.md
+++ b/telemetry-worker/README.md
@@ -80,7 +80,8 @@ nothing looks broken from the outside. That ran from 2026-08-11 to October 2026.
 
 ## Rollups & retention (nightly cron)
 
-`src/rollup.ts` runs on a Cron Trigger at **00:30 UTC** and does two things.
+`src/rollup.ts` runs on a Cron Trigger at **00:30 UTC** and does two things, the purge
+first.
 
 **Rolls up** the day that just ended into `daily_machines`, `daily_event_counts`,
 `daily_dim_counts` and `machine_first_seen.first_index_day`, then re-runs the two days before
@@ -88,7 +89,12 @@ it — offline clients ship completed-day rollups late, so a day keeps growing a
 It then **catches up** on any earlier day that saw activity but never got a rollup (a
 `machine_days` day with no `daily_machines` row — a night the run failed or the database
 refused writes), newest first, up to 31 a night. An outage heals on the first good night
-instead of leaving a hole someone has to notice. The aggregation is one
+instead of leaving a hole someone has to notice. Cloudflare ends a Cron Trigger after 15
+minutes of wall-clock time, and a day that still holds millions of legacy usage rows (below)
+takes minutes, so the run starts no new day and no new fold chunk once 10 minutes have
+passed (`NIGHTLY_BUDGET_MS`). A day it stops partway gets no rollup at all, so it is still a
+missed day the next night, which carries on from the last folded chunk; the summary line
+counts those days as `deferred`. The aggregation is one
 `INSERT … SELECT … ON CONFLICT DO UPDATE` per table or dimension, so it happens inside D1 and
 no event row crosses the wire. Every write overwrites the recomputed value rather than adding
 to it: **re-running a day is a no-op, never a double count.** Two things the SQL is careful
@@ -100,7 +106,9 @@ rollup over old days is the whole migration. Adding a breakdown is a line in `RO
 never a migration — that is what the generic `(dim, value)` shape buys.
 
 **Purges** raw `events` and `usage_daily` rows older than `RETENTION_DAYS` (90, a var in
-`wrangler.jsonc`) in bounded `DELETE` batches, and logs one line of counts. `machine_days` and `machine_first_seen` are
+`wrangler.jsonc`) in bounded `DELETE` batches, before any rollup: behind a long catch-up it
+would be the part the 15-minute limit cuts off, night after night, while the database
+grows. The run ends with one line of counts. `machine_days` and `machine_first_seen` are
 never purged — retention cohorts need the full history and they are two orders of magnitude
 smaller. Rollups are kept forever, so shortening the window costs ad-hoc drill-back, never a
 chart.
@@ -122,10 +130,13 @@ each day is a full scan of that day's events, and the request has a wall-clock b
 
 ### Backfilling first_index_day
 
-`first_index_day` (migration `0002`) is what the dashboard's activation funnel reads, and only
-the rollup writes it. Days rolled up before the migration left it NULL, and days stored before
+`first_index_day` (migration `0002`) is what the dashboard's activation funnel reads. The
+ingest worker lowers it as each index event is stored, so an index run that uploads days late
+still counts, and the rollup re-derives it from the raw events of every day it rolls up. Days
+rolled up before the migration left it NULL, an index event stored before the ingest worker
+began setting it (#2333) counts only once its day is rolled up again, and days stored before
 `0003` still hold their usage as one `events` row per upload. Re-running the rollup over every
-day that still has raw events fixes both — it folds that day's legacy usage rows into
+day that still has raw events fixes all three — it folds that day's legacy usage rows into
 `usage_daily`, sets `first_index_day`, and recomputes the day's rollups. It is idempotent, so
 overlapping or repeating a range is harmless. A day with millions of legacy rows takes several
 minutes, so go a day at a time:
@@ -300,6 +311,15 @@ To drive the cron body by hand, run `wrangler dev --test-scheduled` and hit
 `.dev.vars.example` to `.dev.vars` — without an `ADMIN_TOKEN` the route 404s, exactly as a
 deploy that never set the secret does.
 
+The repo's own test suite also covers this worker and the dashboard API without wrangler:
+it runs their source against these migrations in an in-memory SQLite database, including
+late uploads and a nightly run whose catch-up outlasts the cron's time limit. From the repo
+root (it is part of `npm test` there):
+
+```bash
+npx vitest run __tests__/telemetry-services.test.ts
+```
+
 ## Changing the schema
 
 The allowlist in `src/index.ts` mirrors `docs/design/telemetry.md` (and the user-facing
diff --git a/telemetry-worker/scripts/smoke-cutover.sh b/telemetry-worker/scripts/smoke-cutover.sh
index f0dff12443..6d55f8c79a 100755
--- a/telemetry-worker/scripts/smoke-cutover.sh
+++ b/telemetry-worker/scripts/smoke-cutover.sh
@@ -235,11 +235,14 @@ ts "tool calls (sums the prop)" tool_calls       '[20]' '[2]'
 MET=$(api "meta")
 is "meta reports the rolled-up day"     "$DAY" "$(jget "$MET" latest_day)"
 is "meta reports the rollup ran"       "$DAY" "$(jget "$MET" latest_rollup_day)"
+# Usage lands in usage_daily rather than events; the stalled-ingest check reads both.
+is "meta reports the last day ingest stored" "$DAY" "$(jget "$MET" latest_ingest_day)"
 
-# The funnel reads machine_first_seen.first_index_day, which only the nightly
-# rollup writes (from raw `index` events). This is the seam that pins it: ingest
-# writes the events, the rollup sets the column, the dashboard reads it. If the
-# rollup stopped setting it, "activated" here would read 0.
+# The funnel reads machine_first_seen.first_index_day. The ingest worker sets it as
+# each index event is stored, and the nightly rollup re-derives it from raw `index`
+# events (smoke-rollup.sh pins that half, on events it seeds past the ingest path).
+# This is the seam: ingest writes the column, the dashboard reads it. If neither
+# writer set it, "activated" here would read 0.
 #
 # Its denominator is FIRST-SEEN MACHINES, not `install` events (api.ts: "a machine
 # that reinstalls does not re-enter the funnel"). m3 is the discriminator: it never
diff --git a/telemetry-worker/scripts/smoke-ingest.sh b/telemetry-worker/scripts/smoke-ingest.sh
index 458123443a..9fd2b87fe4 100755
--- a/telemetry-worker/scripts/smoke-ingest.sh
+++ b/telemetry-worker/scripts/smoke-ingest.sh
@@ -214,6 +214,14 @@ is "machine_days: each backdated batch gets its own day" "$BACK_DAY,$RECENT_DAY"
 is "machine_first_seen recorded" "$RECENT_DAY" "$(q "select first_day from machine_first_seen where machine_id='$M_OK'")"
 is "machine_first_seen only moves earlier" "$BACK_DAY" \
    "$(q "select first_day from machine_first_seen where machine_id='$M_BACK'")"
+# The activation funnel's input is kept here too, not only by the nightly rollup: an
+# index run that uploads after the cron stopped re-rolling its day must still count.
+is "first_index_day recorded as the index run is stored" "$RECENT_DAY" \
+   "$(q "select first_index_day from machine_first_seen where machine_id='$M_OK'")"
+is "first_index_day only moves earlier, like first_day" "$BACK_DAY" \
+   "$(q "select first_index_day from machine_first_seen where machine_id='$M_BACK'")"
+is "a machine that never sent an index run has none" "null" \
+   "$(q "select coalesce(first_index_day, 'null') from machine_first_seen where machine_id='$M_USE'")"
 
 echo
 echo "usage counters add up instead of piling up"
diff --git a/telemetry-worker/scripts/smoke-rollup.sh b/telemetry-worker/scripts/smoke-rollup.sh
index 294b4378f8..2befab4eb8 100755
--- a/telemetry-worker/scripts/smoke-rollup.sh
+++ b/telemetry-worker/scripts/smoke-rollup.sh
@@ -16,7 +16,8 @@
 #   * the purge deletes only rows past the window, and leaves machine_days /
 #     machine_first_seen alone
 #   * each machine's first_index_day is its earliest index, and survives the purge
-#   * the cron catches up on a day that saw activity but was never rolled up
+#   * the cron catches up on a day that saw activity but was never rolled up, and
+#     logs its one summary line
 #   * usage comes from usage_daily; a legacy usage row still in `events` is folded
 #     into it (counts added, row deleted) before the day is rolled up
 #   * /admin/rollup does not exist without ADMIN_TOKEN, and rejects a wrong one
@@ -196,6 +197,12 @@ is "rollup $DAY_RESET with reset → 200" 200 "$(roll "day=$DAY_RESET&reset=1")"
 # rolled up), and purges everything past the window.
 is "cron trigger → 200" 200 "$(curl -s -o /dev/null -w '%{http_code}' "$BASE/__scheduled?cron=30+0+*+*+*")"
 sleep 2
+# Its one summary line: written once the purge and every rollup are done, and with
+# nothing this small left for the next night by the time budget.
+is "the cron logs its summary, nothing failed or deferred" "0/0" \
+   "$(grep -ao '{"msg":"nightly rollup".*}' "$LOG" | tail -1 |
+      node -e 'let s="";process.stdin.on("data",d=>s+=d).on("end",()=>{
+        const r=JSON.parse(s||"{}");console.log(`${r.failed}/${r.deferred}`);})')"
 
 # Rolling a purged day with reset=1 must NOT blank the rollups it already has: past
 # the window the reset is ignored, so the delete-then-rebuild can't find zero events.
diff --git a/telemetry-worker/src/index.ts b/telemetry-worker/src/index.ts
index 9a6efa3394..3c4ac7cde3 100644
--- a/telemetry-worker/src/index.ts
+++ b/telemetry-worker/src/index.ts
@@ -200,9 +200,18 @@ const INSERT_EVENT = `INSERT INTO events (
 const UPSERT_MACHINE_DAY = `INSERT INTO machine_days (machine_id, day, prod) VALUES (?, ?, ?)
   ON CONFLICT (machine_id, day) DO UPDATE SET prod = max(machine_days.prod, excluded.prod)`;
 
-// A late-arriving offline buffer can move a machine's first day earlier, never later.
-const UPSERT_FIRST_SEEN = `INSERT INTO machine_first_seen (machine_id, first_day) VALUES (?, ?)
-  ON CONFLICT (machine_id) DO UPDATE SET first_day = min(machine_first_seen.first_day, excluded.first_day)`;
+// A late-arriving offline buffer can move a machine's first day earlier, never later —
+// and its first index day (the activation funnel's input) the same way. That one is set
+// here as well as by the nightly rollup because the rollup only re-rolls the last three
+// days, while this path accepts events up to 30 days old: an index run that uploads a
+// week late would otherwise never count. SQLite's multi-argument min() is NULL when
+// either side is, hence the coalesce: a batch with no index run leaves the stored day
+// alone, and the first index run on record sets it.
+const UPSERT_FIRST_SEEN = `INSERT INTO machine_first_seen (machine_id, first_day, first_index_day) VALUES (?, ?, ?)
+  ON CONFLICT (machine_id) DO UPDATE SET
+    first_day = min(machine_first_seen.first_day, excluded.first_day),
+    first_index_day = coalesce(min(machine_first_seen.first_index_day, excluded.first_index_day),
+                               machine_first_seen.first_index_day, excluded.first_index_day)`;
 
 // usage_rollup counters ADD into one row per machine × day × tool (migrations/0003):
 // clients upload the same counter many times over — once per process — so storing
@@ -305,10 +314,13 @@ async function writeToD1(
       }
     }
 
+    // The earliest day this batch indexed on, if it did — see UPSERT_FIRST_SEEN.
+    let firstIndexDay: string | null = null;
     for (const e of batch) {
       if (e.event === 'usage_rollup') continue;
       const day = (e.ts ?? receivedAt).slice(0, 10);
       days.add(day);
+      if (e.event === 'index' && (firstIndexDay === null || day < firstIndexDay)) firstIndexDay = day;
       stmts.push(
         insertEvent.bind(
           receivedAt,
@@ -328,7 +340,7 @@ async function writeToD1(
 
     const firstDay = [...days].sort()[0];
     if (firstDay !== undefined) {
-      stmts.push(env.DB.prepare(UPSERT_FIRST_SEEN).bind(machineId, firstDay));
+      stmts.push(env.DB.prepare(UPSERT_FIRST_SEEN).bind(machineId, firstDay, firstIndexDay));
     }
 
     await env.DB.batch(stmts);
diff --git a/telemetry-worker/src/rollup.ts b/telemetry-worker/src/rollup.ts
index 87072a59a9..9502210984 100644
--- a/telemetry-worker/src/rollup.ts
+++ b/telemetry-worker/src/rollup.ts
@@ -9,12 +9,13 @@
  * 1. ROLL UP the just-completed UTC day into `daily_machines`, `daily_event_counts`,
  *    `daily_dim_counts` and `machine_first_seen.first_index_day` — plus the two days
  *    before it, because clients buffer offline and ship completed-day rollups late, so
- *    a day keeps growing after it ends, plus any earlier day a failed run missed. Every
- *    write is an upsert that OVERWRITES the recomputed value rather than adding to it
- *    (or, for first_index_day, only ever lowers it), so re-running a day is a no-op
- *    and never double-counts.
+ *    a day keeps growing after it ends, plus any earlier day a failed run missed, as
+ *    many as fit in the run's time budget. Every write is an upsert that OVERWRITES
+ *    the recomputed value rather than adding to it (or, for first_index_day, only ever
+ *    lowers it), so re-running a day is a no-op and never double-counts.
  *
- * 2. PURGE raw `events` past the retention window, in bounded batches. Rollups are
+ * 2. PURGE raw `events` past the retention window, in bounded batches — first, so a
+ *    long catch-up can never push it past the cron's wall-clock limit. Rollups are
  *    kept forever, so only ad-hoc drill-down has a horizon; `machine_days` and
  *    `machine_first_seen` are never purged, because retention cohorts need the full
  *    history and they are two orders of magnitude smaller than the raw rows.
@@ -32,6 +33,15 @@ export const ROLLUP_LOOKBACK_DAYS = 3;
 export const MAX_MANUAL_DAYS = 31;
 /** Most missed days one nightly run catches up on, newest first; the next night takes the rest. */
 export const MAX_CATCHUP_DAYS = 31;
+/**
+ * How long into a nightly run it still starts rollup work. Cloudflare ends a Cron
+ * Trigger after 15 minutes of wall-clock time, and catching up a day that still holds
+ * millions of legacy usage rows takes minutes, so a backlog can run straight into that
+ * limit. Past this point the run starts no new day and no new fold chunk; the 5
+ * minutes left cover the one statement already in flight and the summary line. What
+ * did not fit stays a missed day, so the next night carries on from there.
+ */
+export const NIGHTLY_BUDGET_MS = 10 * 60_000;
 
 /** Rows per purge DELETE — bounded so one statement stays well inside D1's limits. */
 const PURGE_BATCH_ROWS = 5_000;
@@ -148,6 +158,10 @@ const DAILY_MACHINES = `INSERT INTO daily_machines (day, machines, prod_machines
  * it straight off `machine_first_seen`, which keeps the funnel off raw `events` (a
  * cohort join there took most of a minute per week of cohorts) and past the purge.
  *
+ * The ingest path lowers it the same way as each index event is stored (src/index.ts),
+ * because a run that uploads late lands on a day this cron has stopped re-rolling. This
+ * statement is what fills it for events stored before that, and what a backfill re-runs.
+ *
  * Only rows that actually move are written, so re-running a day is free. `?1` is the
  * day — still the one bound parameter, used three times.
  */
@@ -221,6 +235,11 @@ export interface DayResult {
   rows: number;
   /** Day is past the retention window — a `reset` on it is ignored (see below). */
   pastRetention: boolean;
+  /**
+   * The deadline passed before the day's legacy usage rows were all folded, so nothing
+   * was rolled up: the next run finishes the fold and rolls the day up then.
+   */
+  deferred: boolean;
 }
 
 /**
@@ -236,14 +255,20 @@ export interface DayResult {
  * exists would otherwise linger. It is IGNORED past the retention window, where it
  * would delete rows and then find no events to rebuild them from: silently blanking a
  * real day is the one irreversible thing this file could do.
+ *
+ * `deadline` (epoch ms) bounds the legacy fold that runs first. If it stops the fold
+ * partway, the day is not rolled up at all — usage counted from a half-folded day would
+ * be short, and its `daily_machines` row would stop the nightly run from ever coming
+ * back to it. The chunks already folded are committed, so the next call carries on.
  */
 export async function rollupDay(
   env: Env,
   day: string,
-  opts: { cutoff: string; reset?: boolean },
+  opts: { cutoff: string; reset?: boolean; deadline?: number },
 ): Promise<DayResult> {
   const pastRetention = day < opts.cutoff;
-  await foldLegacyUsage(env, day);
+  const fold = await foldLegacyUsage(env, day, opts.deadline);
+  if (!fold.complete) return { day, rows: 0, pastRetention, deferred: true };
   const statements: D1PreparedStatement[] = [];
 
   if (opts.reset && !pastRetention) {
@@ -257,7 +282,7 @@ export async function rollupDay(
 
   const results = await env.DB.batch(statements);
   const rows = results.reduce((total, r) => total + (r.meta?.changes ?? 0), 0);
-  return { day, rows, pastRetention };
+  return { day, rows, pastRetention, deferred: false };
 }
 
 // ---------------------------------------------------------------------------
@@ -298,15 +323,32 @@ const LEGACY_FOLD = `INSERT INTO usage_daily (
 
 const LEGACY_DELETE = `DELETE FROM events WHERE day = ?1 AND event = 'usage_rollup' AND id < ?2`;
 
-/** Folds any legacy usage rows for `day` into usage_daily. Returns how many rows it moved. */
-export async function foldLegacyUsage(env: Env, day: string): Promise<number> {
+export interface FoldResult {
+  /** Legacy rows moved into usage_daily by this call. */
+  moved: number;
+  /** False when the deadline stopped it with rows still to fold; the next call carries on. */
+  complete: boolean;
+}
+
+/**
+ * Folds any legacy usage rows for `day` into usage_daily, a chunk per transaction.
+ * With a `deadline` (epoch ms) it starts no chunk once that has passed: each chunk
+ * commits on its own and always takes the oldest rows left, so stopping between two
+ * loses nothing and the next call simply continues.
+ */
+export async function foldLegacyUsage(
+  env: Env,
+  day: string,
+  deadline = Number.POSITIVE_INFINITY,
+): Promise<FoldResult> {
   const any = await env.DB.prepare(`SELECT 1 AS hit FROM events WHERE day = ? AND event = 'usage_rollup' LIMIT 1`)
     .bind(day)
     .first<{ hit: number }>();
-  if (!any) return 0;
+  if (!any) return { moved: 0, complete: true };
 
   let moved = 0;
   for (let chunk = 0; chunk < LEGACY_MAX_CHUNKS; chunk++) {
+    if (Date.now() >= deadline) return { moved, complete: false };
     // Always the oldest remaining rows: everything below the next chunk's first id.
     // Rows folded by earlier chunks are gone, so there is no cursor to carry.
     const next = await env.DB.prepare(
@@ -320,7 +362,7 @@ export async function foldLegacyUsage(env: Env, day: string): Promise<number> {
       env.DB.prepare(LEGACY_DELETE).bind(day, below),
     ]);
     moved += deleted?.meta?.changes ?? 0;
-    if (!next) return moved;
+    if (!next) return { moved, complete: true };
   }
   throw new Error(`legacy usage fold for ${day} did not finish within ${LEGACY_MAX_CHUNKS} chunks`);
 }
@@ -399,56 +441,81 @@ async function missedDays(env: Env, cutoff: string, before: string): Promise<str
 }
 
 /**
- * The cron body: roll up the completed day and the two before it, catch up any
- * earlier day a past run missed, then purge.
+ * The cron body: purge, roll up the completed day and the two before it, then catch
+ * up any earlier day a past run missed, for as long as the time budget lasts.
+ *
+ * The purge goes first. It is bounded, it deletes only days past the window (which
+ * nothing below reads), and it is the job that must not slip: a database that stops
+ * purging grows until D1's size cap refuses every write. Run last, it was what
+ * Cloudflare's 15-minute limit cut off whenever a catch-up ran long, night after night.
+ *
+ * Rollups then start until NIGHTLY_BUDGET_MS has passed. A day the budget stops —
+ * before it starts, or partway through its legacy fold — gets no rollup at all, so it
+ * is still a missed day tomorrow and picks up where it stopped (each fold chunk is
+ * already committed).
  *
  * Logs one line of counts — never a day's contents, never a machine id. Throws if
  * anything failed so the invocation is marked failed (and retried) rather than
- * quietly skipping a day; every write here is idempotent, so a retry is safe.
+ * quietly skipping a day; every write here is idempotent, so a retry is safe. A day
+ * left for tomorrow is not a failure.
  */
 export async function runNightly(env: Env, atMs: number): Promise<void> {
   const started = Date.now();
+  const deadline = started + NIGHTLY_BUDGET_MS;
   const keepDays = retentionDays(env);
   const cutoff = retentionCutoff(atMs, keepDays);
 
-  const days: string[] = [];
-  for (let back = 1; back <= ROLLUP_LOOKBACK_DAYS; back++) days.push(utcDay(atMs - back * DAY_MS));
+  let purge: PurgeResult | null = null;
+  try {
+    purge = await purgeOldEvents(env, cutoff);
+  } catch (err) {
+    console.error(JSON.stringify({ msg: 'purge failed', cutoff, err: String(err) }));
+  }
+
+  const regular: string[] = [];
+  for (let back = 1; back <= ROLLUP_LOOKBACK_DAYS; back++) regular.push(utcDay(atMs - back * DAY_MS));
 
   // A failure to find the missed days must not cost tonight's regular rollup.
-  let caughtUp = 0;
+  let missed: string[] = [];
   try {
-    const missed = await missedDays(env, cutoff, days[days.length - 1] ?? utcDay(atMs));
-    days.push(...missed);
-    caughtUp = missed.length;
+    missed = await missedDays(env, cutoff, regular[regular.length - 1] ?? utcDay(atMs));
   } catch (err) {
     console.error(JSON.stringify({ msg: 'missed-day scan failed', err: String(err) }));
   }
 
   const rolled: string[] = [];
   const failed: string[] = [];
+  const deferred: string[] = [];
+  let caughtUp = 0;
   let rows = 0;
-  for (const day of days) {
+  for (const day of [...regular, ...missed]) {
+    if (Date.now() >= deadline) {
+      deferred.push(day);
+      continue;
+    }
     try {
-      rows += (await rollupDay(env, day, { cutoff })).rows;
+      const result = await rollupDay(env, day, { cutoff, deadline });
+      if (result.deferred) {
+        deferred.push(day);
+        continue;
+      }
+      rows += result.rows;
       rolled.push(day);
+      if (!regular.includes(day)) caughtUp++;
     } catch (err) {
       failed.push(day);
       console.error(JSON.stringify({ msg: 'rollup day failed', day, err: String(err) }));
     }
   }
 
-  let purge: PurgeResult | null = null;
-  try {
-    purge = await purgeOldEvents(env, cutoff);
-  } catch (err) {
-    console.error(JSON.stringify({ msg: 'purge failed', cutoff, err: String(err) }));
-  }
-
   console.log(
     JSON.stringify({
       msg: 'nightly rollup',
       days: rolled,
+      /** Missed days rolled up tonight. */
       caught_up: caughtUp,
+      /** Days the time budget left for the next run. */
+      deferred: deferred.length,
       rows,
       failed: failed.length,
       retention_days: keepDays,