diff --git a/.claude/skills/codegraph-build-validation/SKILL.md b/.claude/skills/codegraph-build-validation/SKILL.md
index 57a659830d..189e99b2f9 100644
--- a/.claude/skills/codegraph-build-validation/SKILL.md
+++ b/.claude/skills/codegraph-build-validation/SKILL.md
@@ -97,6 +97,12 @@ Behavior that differs by platform (path resolution, drive letters, `SENSITIVE_PA
 
 The development host and default test target are Ubuntu under WSL. Run CodeGraph build and test commands through `fnm exec --using codegraph` so they use the supported Node 24 runtime, and have a Rust toolchain on PATH for the kernel. Platform-sensitive changes (file watching, sockets or named pipes, paths and symlinks, process lifecycle, and inotify limits) still need validation on every affected operating system.
 
+The **Highlight process lifecycle** pull-request job runs
+`node scripts/check-highlight-lifecycle.cjs` on Linux, Windows and macOS. It
+transpiles the production process adapter and uses a deliberately stuck helper
+to check deadline handling, queued requests, reaping, restart and shutdown. It
+does not load native grammars; native parse correctness uses the engine tests.
+
 ### Linux and containers
 
 Run Linux validation directly in WSL. Use Docker only when a clean container or PID-1 behavior is part of the test; Docker is optional isolation, not the default Linux route.
diff --git a/.github/workflows/highlight-lifecycle.yml b/.github/workflows/highlight-lifecycle.yml
new file mode 100644
index 0000000000..5e391977d5
--- /dev/null
+++ b/.github/workflows/highlight-lifecycle.yml
@@ -0,0 +1,28 @@
+name: Highlight process lifecycle
+on:
+  pull_request:
+    branches: [fork/consolidated]
+    paths:
+      - 'src/ui-server/highlight/**'
+      - 'scripts/check-highlight-lifecycle.cjs'
+      - '.github/workflows/highlight-lifecycle.yml'
+permissions:
+  contents: read
+jobs:
+  lifecycle:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v7.0.1
+        with:
+          persist-credentials: false
+      - uses: actions/setup-node@v7.0.0
+        with:
+          node-version: 24
+          cache: npm
+      - run: npm ci --ignore-scripts
+      - run: node scripts/check-highlight-lifecycle.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32a366807..34bcaa9698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -301,6 +301,9 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Lua built-in calls avoid unrelated table methods, while locally bound aliases of project or host table members follow their declared owner.
 - PHP class names follow namespaces and imports, Objective-C conformance reaches the protocol, and C calls avoid C++ methods. Dart unnamed extensions stay local and extension methods require receiver evidence; R calls skip non-function data bindings.
 - Delegation through another object avoids false self-calls, and production references avoid unrelated test declarations or unproven test doubles. Calls also avoid mangled names in minified JavaScript.
+- CommonJS requires and module-path imports link files to the exact module they name, including directory entries and configured aliases. Quoted examples and locally shadowed `require` calls do not add dependencies.
+- Vue, Svelte and Astro components own their instance script execution and members while preserving nested function scopes and module scripts. Nuxt and Astro pages call their own component.
+- Rails resource action filters recognize symbol and word arrays, strings, and hash-rocket options in both flat and scoped routes.
 - Express inline function-expression handlers, including wrapped handlers and trailing commas, link routes to their body calls. The last argument selects the handler; functions in parameter defaults do not replace its body. Calls retain their lexical scope, and external `require` bindings remain external when framework references are resolved.
 - A barrel's `export * as core from './core'` now exports only `core`, not everything in `./core`. In zod, `z.string()` and `z.number()` had been landing on same-named regex constants deep in its core module instead of the schema functions. Calls through `import * as ns` also find members a barrel forwards by name (`export { safeParse } from '../core'`). They follow a namespace path like `z.coerce.number()` too.
 - JavaScript calls through CommonJS `require` bindings now reach the right function. `var express = require('../')` follows `module.exports` through an `index.js` to the function it exports, and every binding in a `var a = require('x'), b = require('y')` list is read. `require('./utils').setCharset` means that module's `setCharset` rather than its first export, and a call to a package from outside the project (`supertest`, `node:assert`) is no longer an edge to the local variable. Re-index affected JavaScript projects after upgrading.
diff --git a/README.md b/README.md
index d6ae643cdb..9637eed8dd 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 all of upstream `main` (last merged: [`81e08b7`](https://github.com/colbymchenry/codegraph/commit/81e08b76), after v1.6.1, 2026-10-01) 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 all of upstream `main` (last merged: [`e12f5bbb`](https://github.com/colbymchenry/codegraph/commit/e12f5bbb925b91e0fd1f641c67db34065cc6b7f4), after v1.6.1, 2026-10-01) 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).
 
@@ -102,6 +102,8 @@ Compared with upstream `main` at `290e03f`. Each item was checked against upstre
 
 The other languages are the same in both, listed under [Supported Languages](#supported-languages).
 
+Vue, Svelte and Astro files have one file node containing their component. The component contains top-level script members, while nested functions and methods keep their own parents. Vue `<script setup>`, Svelte instance scripts and Astro frontmatter assign top-level calls and references, including constant initializers, to the component. Imports, module-level execution and Astro browser scripts remain with the file. Svelte recognizes both `context="module"` and the `module` attribute.
+
 Dispatch and framework coverage the fork adds, by kind:
 
 **Dispatch links**
@@ -118,7 +120,11 @@ Kotlin infix expressions contribute call edges with parenthesized operands and c
 
 Kotlin `when` guards, open-ended ranges, multi-dollar strings and nullable function-type receivers retain their source offsets during normalization. Multi-dollar strings retain their interpolation threshold. C++ namespace-opening macros and aliases use the declarations visible to each caller; argument-compatible overloads resolve when the declaration and call supply enough evidence, and ambiguous owners remain unresolved. Objective-C `super` calls follow the superclass, Solidity bare calls follow contract inheritance, and Erlang bare calls honor explicit module imports.
 
-Lua local aliases follow members exported by a required project module, including renamed members and bounded re-exports. Standard-library and external-module aliases remain unresolved. CommonJS calls follow explicit default exports, module forwarding and `require('./module').member` bindings. TypeScript namespace re-exports retain their namespace boundary and allow nested member calls. C++ access macros and mid-declaration conditionals preserve members, indexing the first branch of each normalized conditional. Visible class-scoped aliases and declared complex receivers retain their method owners; unsubstituted template parameters and ambiguous owners remain unresolved.
+Lua local aliases follow members exported by a required project module, including renamed members and bounded re-exports. Standard-library and external-module aliases remain unresolved. CommonJS calls follow explicit default exports, module forwarding and `require('./module').member` bindings.
+
+Literal local `require` calls also create file dependencies, including side-effect calls and calls inside functions. Computed specifiers, external packages and a locally shadowed `require` do not create these dependencies.
+
+TypeScript namespace re-exports retain their namespace boundary and allow nested member calls. C++ access macros and mid-declaration conditionals preserve members, indexing the first branch of each normalized conditional. Visible class-scoped aliases and declared complex receivers retain their method owners; unsubstituted template parameters and ambiguous owners remain unresolved.
 
 Java and Kotlin enum constants retain their own methods and body calls. Explicit external imports own their names, while project imports follow nested types and aliases. Scala block locals and package objects, C# namespaces and nested types, and Java types follow their lexical and import scopes. Calls distinguish overloads by argument shape or Swift labels; receiver calls keep the owner supplied by construction, typed properties, Kotlin DSL lambdas or pytest fixtures. Python package imports follow bounded re-exports. Framework name heuristics start in the calling file and apply the native visibility checks. React and Express naming conventions require imports to reach another file. NestJS provider lookup also supports convention siblings in the same directory. Minified bundles, private component scripts and test suites do not supply unrelated production call targets.
 
@@ -138,7 +144,7 @@ React Router links and `navigate` calls can use a route-config object's `getHref
 |---|---|
 | Analog | `src/app/pages/**/*.page.ts` file routes, linked to their page component classes |
 | Angular Router | On top of upstream's reader: `provideRouter` / `RouterModule` imported under an alias (a `$`-prefixed one included) still register routes, a routes file behind an NgModule's routing module or an `export *` barrel sits under its lazy path, and named-`outlet` or `...spread` entries name no screen |
-| Astro routes | Pages linked to their components, endpoint method exports to handlers, and `<a href>` / `Astro.redirect` navigation |
+| Astro routes | Pages calling their own file's components, endpoint method exports to handlers, and `<a href>` / `Astro.redirect` navigation |
 | Qwik City | `src/routes` index pages and `onGet`/`onPost`-style endpoint handlers, linked to their components and handlers |
 | React Router framework mode | Pages declared in `app/routes.ts`, linked to each module's default component |
 | RedwoodSDK routes | `defineApp` route trees (`route`, `index`, `render`, `layout`, `prefix`, method tables), linked to their handlers |
@@ -505,7 +511,7 @@ CodeGraph detects web-framework routing files and emits `route` nodes linked by
 | **NestJS** | `@Controller` + `@Get/@Post/...` (with `RouterModule` prefixes, `setGlobalPrefix` and URI versioning), GraphQL `@Resolver` + `@Query/@Mutation`, `@MessagePattern`/`@EventPattern`, `@SubscribeMessage` |
 | **Laravel** | `Route::get()`, `Route::resource()`, `Controller@action`, tuple syntax |
 | **Drupal** | `*.routing.yml` routes (`_controller`, `_form`, entity handlers); `hook_*` implementations in `.module`/`.theme`/`.install`/`.inc` |
-| **Rails** | `get '/x', to: 'users#index'`, hash-rocket `=>` syntax, `resources` / `resource`, and the paths and controller modules of `namespace`, `scope`, nested resources and `member` / `collection` blocks; a Rails engine's `config/routes.rb` too |
+| **Rails** | `get '/x', to: 'users#index'`, hash-rocket `=>` syntax, `resources` / `resource` with literal `only:` / `except:` action filters, and the paths and controller modules of `namespace`, `scope`, nested resources and `member` / `collection` blocks; a Rails engine's `config/routes.rb` too |
 | **Spring** | `@GetMapping`, `@PostMapping`, `@RequestMapping` on methods |
 | **Play** | `GET`/`POST`/… verb routes in `conf/routes` → `Controller.method` actions (Scala + Java), including projects kept in subdirectories |
 | **Gin / chi / gorilla / mux** | `r.GET(...)`, `router.HandleFunc(...)` |
@@ -513,7 +519,7 @@ CodeGraph detects web-framework routing files and emits `route` nodes linked by
 | **ASP.NET** | `[HttpGet("/x")]` attributes on action methods and FastEndpoints `Configure()` verb calls |
 | **Vapor** | `app.get("x", use: handler)` and closure handlers |
 | **Analog** | `src/app/pages/**/*.page.ts` files (`index`, dot segments, `[param]`, `[...rest]` and `(group)` names) bound to the page's default component class; a page with a same-named folder is a layout, not a route | — |
-| **Astro** | `src/pages/` file-based routes (`.astro` pages + `.ts` endpoints, `[param]`/`[...rest]` syntax); each page links to its component, exported `GET`/`POST`/… endpoint methods link to their handlers, and `<a href>` / `Astro.redirect` link to the page they name |
+| **Astro** | `src/pages/` file-based routes (`.astro` pages + `.ts` endpoints, `[param]`/`[...rest]` syntax); each page calls its own file's component, exported `GET`/`POST`/… endpoint methods link to their handlers, and `<a href>` / `Astro.redirect` link to the page they name |
 | **RedwoodSDK** | Literal `defineApp([...])` trees with `route`, `index`, `render`, `layout` and `prefix`, plus `{ get, post, … }` method tables; each route links to its final handler and becomes a page once that handler is shown to return JSX | — |
 
 ### Routers — routes *and* the navigation between them
@@ -526,7 +532,7 @@ These frameworks additionally emit **`navigates`** edges: the function that send
 | **Next.js** | App Router `app/**/page.tsx` and Pages Router pages (`(group)` stripped, `[slug]` → `:slug`); `app/api/**/route.ts` exports and `pages/api/*` are endpoints, not screens | `router.push` / `replace` / `prefetch`, `redirect()` / `permanentRedirect()` in a server action or page, `NextResponse.redirect(new URL(…))` in middleware, `<Link href>` and internal `<a href>` |
 | **React Router** | `<Route path component/element>` (v5 and v6), `createBrowserRouter` / `createHashRouter` / `createMemoryRouter` arrays with nested `children`, constant paths, `Component` and lazy module exports, framework mode's `app/routes.ts` (`route`, `index`, `layout`, `prefix`), and the default file convention under `app/routes/` (Remix, or React Router with `flatRoutes()`: dot nesting, index and pathless segments, `$param`, optional `($segment)` and `$` splats), each bound to its module's default component | `history.push` / `replace`, `useNavigate`'s `navigate`, a loader's `redirect`, `<Link to>` / `<NavLink to>` / `<Navigate to>` / v5's `<Redirect to>` / react-router-bootstrap's `<LinkContainer to>`, and a `styled(Link)` wrapper |
 | **TanStack Router** | `createFileRoute('/posts/$postId')` (file-based) and `createRoute({ path, getParentRoute })` composed up its parent chain (code-based); `_pathless` segments, `(group)` folders, `__root` and `<Outlet/>` layouts are not addresses; TanStack Start `server.handlers` (and `createHandlers`) in those files become method-qualified endpoints (`GET /api/users`) | `navigate({ to })`, a thrown `redirect({ to })`, `<Link to>` / `<Navigate to>` — where `to` is the route PATTERN and the values ride beside it in `params` |
-| **Vue Router** / **Nuxt** | `createRouter({ routes: [...] })` / `new Router(...)` and the route tables it's given (`export const constantRoutes = [...]`, per-module route files), with the view each entry names — a lazy `() => import(…)` bound to its file — and `children` joined onto their parent's path, the parent being the layout around them; plus, in a Nuxt app, `pages/` file-based routes, each linked to its page component (`index` folders, root index pages, Nuxt 4 route groups), `server/api/` and `server/routes/` endpoints (method suffixes such as `.get.ts`, catch-alls) and route middleware | `router.push` / `replace`, `$router.push` / `this.$router.push`, Nuxt's `navigateTo`, `<router-link>` / `<RouterLink>` / `<NuxtLink>` — **by route name** (`push({ name: 'profile' })`) as well as by path |
+| **Vue Router** / **Nuxt** | `createRouter({ routes: [...] })` / `new Router(...)` and the route tables it's given (`export const constantRoutes = [...]`, per-module route files), with the view each entry names — a lazy `() => import(…)` bound to its file — and `children` joined onto their parent's path, the parent being the layout around them; plus, in a Nuxt app, `pages/` file-based routes, each calling its own file's page component (`index` folders, root index pages, Nuxt 4 route groups), `server/api/` and `server/routes/` endpoints (method suffixes such as `.get.ts`, catch-alls) and route middleware | `router.push` / `replace`, `$router.push` / `this.$router.push`, Nuxt's `navigateTo`, `<router-link>` / `<RouterLink>` / `<NuxtLink>` — **by route name** (`push({ name: 'profile' })`) as well as by path |
 | **Solid Router** | Imported `Router`/`Route` JSX and route-config arrays (`path`, `component`, `children`) with static `lazy(() => import(...))` components. A table exported from another file as `RouteDefinition[]` (the official template's `routes.ts`) is read too, prefixed by where it is registered | — |
 | **SolidStart** | SolidStart 1 (`app.config` with `defineConfig`) and 2 (the `solidStart()` Vite plugin): `src/routes/` file routes (`[param]`, `[[optional]]`, `[...rest]`, `(group)` folders, `index`), each page bound to its default component; exported `GET`/`POST`/… functions in API route files become endpoints | — |
 | **Vike** | `+Page` files under `pages/` (filesystem routing, `index`, `(group)` folders, `@param` segments) and `+route` string overrides, each bound to its page component | — |
@@ -1019,9 +1025,9 @@ is written):
 | Kotlin | `.kt`, `.kts` | Full support |
 | Scala | `.scala`, `.sc` | Full support (classes, traits, objects, methods, type aliases, Scala 3 enums) |
 | Dart | `.dart` | Full support |
-| Svelte | `.svelte` | Full support (script extraction, Svelte 5 runes, SvelteKit routes) |
-| Vue | `.vue` | Full support (script + script-setup extraction, Options API methods, computed properties, watchers and lifecycle hooks, Nuxt page/API/middleware routes) |
-| Astro | `.astro` | Full support (frontmatter + script extraction, template component/call references, `src/pages/` routes) |
+| Svelte | `.svelte` | Full support (instance and module script extraction, Svelte 5 runes, SvelteKit routes) |
+| Vue | `.vue` | Full support (script + script-setup extraction with component ownership, Options API methods, computed properties, watchers and lifecycle hooks, Nuxt page/API/middleware routes) |
+| Astro | `.astro` | Full support (component-owned frontmatter + browser-script extraction, template component/call references, `src/pages/` routes) |
 | Liquid | `.liquid` | Full support |
 | Pascal / Delphi | `.pas`, `.dpr`, `.dpk`, `.lpr` | Full support (classes, records, interfaces, enums, DFM/FMX form files) |
 | Lua | `.lua` | Full support (functions, methods with receivers, local variables, `require` imports, call edges) |
diff --git a/__tests__/astro-routes.test.ts b/__tests__/astro-routes.test.ts
index d9948b542d..9c38f0e7dd 100644
--- a/__tests__/astro-routes.test.ts
+++ b/__tests__/astro-routes.test.ts
@@ -172,7 +172,7 @@ export function POST(){return getItems()}`,
       write('src/pages/api.ts', 'export function GET(){return new Response("ok")}');
       const script = `const {CodeGraph}=require(${JSON.stringify(path.resolve('dist/index.js'))});
 (async()=>{const cg=await CodeGraph.init(${JSON.stringify(dir)},{index:true});
-console.log(JSON.stringify(cg.getNodesByKind('route').map(r=>[r.name,cg.getOutgoingEdges(r.id).filter(e=>e.kind==='references').map(e=>cg.getNode(e.target)?.name)]).sort()));cg.close();})().catch(e=>{console.error(e);process.exit(1)});`;
+console.log(JSON.stringify(cg.getNodesByKind('route').map(r=>[r.name,cg.getOutgoingEdges(r.id).filter(e=>e.kind==='references'||e.kind==='calls').map(e=>[cg.getNode(e.target)?.name,e.kind,cg.getNode(e.target)?.filePath])]).sort()));cg.close();})().catch(e=>{console.error(e);process.exit(1)});`;
       const output = execFileSync(process.execPath, ['-e', script], {
         encoding: 'utf8',
         timeout: 60000,
@@ -184,8 +184,8 @@ console.log(JSON.stringify(cg.getNodesByKind('route').map(r=>[r.name,cg.getOutgo
         },
       });
       expect(JSON.parse(output.trim().split('\n').at(-1)!)).toEqual([
-        ['/', ['index']],
-        ['GET /api', ['GET']],
+        ['/', [['index', 'calls', 'src/pages/index.astro']]],
+        ['GET /api', [['GET', 'references', 'src/pages/api.ts']]],
       ]);
     },
   );
diff --git a/__tests__/commonjs-require-imports.test.ts b/__tests__/commonjs-require-imports.test.ts
new file mode 100644
index 0000000000..3fd68abeed
--- /dev/null
+++ b/__tests__/commonjs-require-imports.test.ts
@@ -0,0 +1,104 @@
+/**
+ * A CommonJS `require('./x')` is a file import, as ESM's `import` is: Express's
+ * `lib/express.js` requires `./application`, `./request` and `./response`, and
+ * the index said it imported nothing — an empty Imports rail in the viewer and
+ * no file dependency — because those bindings are used as values, never
+ * called. A module path also resolves the way the runtime finds it, so an
+ * extensionless ESM side-effect import (`import './polyfills'`) reaches its
+ * file instead of stopping at its own import statement. A package
+ * (`require('express')`) stays outside the index.
+ */
+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-cjs-require-'));
+  const files: Record<string, string> = {
+    'package.json': JSON.stringify({ name: 'web', main: 'index.js' }),
+    'index.js': `module.exports = require('./lib/express');
+`,
+    'lib/express.js': `var EventEmitter = require('events').EventEmitter;
+var mixin = require('merge-descriptors');
+var proto = require('./application');
+var req = require('./request');
+
+function createApplication() {
+  var app = function () {};
+  mixin(app, EventEmitter.prototype, false);
+  mixin(app, proto, false);
+  app.request = Object.create(req);
+  return app;
+}
+
+module.exports = createApplication;
+`,
+    'lib/application.js': `var app = exports = module.exports = {};
+app.init = function init() {};
+`,
+    'lib/request.js': `var req = Object.create({});
+module.exports = req;
+`,
+    'test/app.js': `var express = require('..');
+var assert = require("assert");
+`,
+    'src/main.ts': `import './polyfills';
+import helper = require('./helper');
+export const value = helper.run();
+`,
+    'src/polyfills.ts': `export {};
+`,
+    'src/helper.ts': `export function run(): number {
+  return 1;
+}
+`,
+  };
+  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 });
+});
+
+const importedFiles = (file: string) => {
+  const ids = cg.getNodesInFile(file).map((n) => n.id);
+  return [...new Set(cg.getOutgoingEdgesFrom(ids, ['imports'])
+    .map((e) => cg.getNode(e.target)!.filePath)
+    .filter((p) => p !== file))].sort();
+};
+
+describe('CommonJS require', () => {
+  it('imports the files a module requires, used as values or not, and no package', () => {
+    expect(importedFiles('lib/express.js')).toEqual(['lib/application.js', 'lib/request.js']);
+    expect(cg.getFileDependencies('lib/express.js')).toEqual(expect.arrayContaining(['lib/application.js', 'lib/request.js']));
+  });
+
+  it('follows a directory require to its package entry', () => {
+    expect(importedFiles('index.js')).toEqual(['lib/express.js']);
+    expect(importedFiles('test/app.js')).toEqual(['index.js']);
+  });
+});
+
+describe('a module path', () => {
+  it('reaches an extensionless side-effect import’s file', () => {
+    expect(importedFiles('src/main.ts')).toContain('src/polyfills.ts');
+  });
+
+  it('reaches a TypeScript import-equals file once', () => {
+    const ids = cg.getNodesInFile('src/main.ts').map((n) => n.id);
+    const toHelper = cg.getOutgoingEdgesFrom(ids, ['imports'])
+      .filter((e) => cg.getNode(e.target)!.filePath === 'src/helper.ts' && cg.getNode(e.target)!.kind === 'file');
+    expect(toHelper).toHaveLength(1);
+    expect(toHelper[0]!.target).toBe('file:src/helper.ts');
+  });
+});
diff --git a/__tests__/commonjs-require-shapes.test.ts b/__tests__/commonjs-require-shapes.test.ts
new file mode 100644
index 0000000000..f69d5e11c5
--- /dev/null
+++ b/__tests__/commonjs-require-shapes.test.ts
@@ -0,0 +1,62 @@
+import { it, expect } from 'vitest';
+import { extractFromSource } from '../src/extraction';
+import { commonJsRequireRefs } from '../src/extraction/commonjs-requires';
+
+it('imports real literal requires and refuses quoted examples, packages, properties and local shadows', () => {
+  const source = `const text = "require('./ghost-string')";
+const template = \`require('./ghost-template')\`;
+// require('./ghost-comment')
+function local(require) { require('./ghost-local'); }
+function scoped() { const require = () => 1; require('./ghost-scoped'); }
+other.require('./ghost-property');
+require.resolve('./ghost-resolve');
+require('express');
+require('./real');
+require(\`./literal\`);
+require(\`./dynamic-\${text}\`);
+`;
+  const result = extractFromSource('entry.js', source);
+  const refs = result.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports' && ref.fromNodeId === 'file:entry.js');
+  expect(refs.map((ref) => ref.referenceName)).toEqual(['./real', './literal']);
+});
+
+it('keeps a global require outside a same-line local scope', () => {
+  const source = "function scoped(require) { require('./local'); } require('./global');";
+  const result = extractFromSource('entry.js', source);
+  expect(result.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports' && ref.fromNodeId === 'file:entry.js').map((ref) => ref.referenceName)).toEqual(['./global']);
+});
+
+
+it('does not treat a TypeScript import-equals binding named require as the module loader', () => {
+  const result = extractFromSource('entry.ts', "import require = require('./helper'); require('./ghost');");
+  expect(result.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports' && ref.fromNodeId === 'file:entry.ts').map((ref) => ref.referenceName)).toEqual(['./helper']);
+});
+
+
+it('does not mistake method names or static-block vars for module-wide require bindings', () => {
+  const source = "class Loader { require() { return require('./class-real'); } static { var require = other; require('./local'); } } const object = { require() { return require('./object-real'); } }; require('./global');";
+  const result = extractFromSource('entry.js', source);
+  expect(result.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports' && ref.fromNodeId === 'file:entry.js').map((ref) => ref.referenceName)).toEqual(['./class-real', './object-real', './global']);
+});
+
+
+it('cooks escaped module literals and retains configurable path prefixes for native alias resolution', () => {
+  const source = String.raw`require('./re\u0061l'); require('@lib/helper'); require('tools/helper'); require('external');`;
+  const result = extractFromSource('entry.js', source);
+  expect(result.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports' && ref.fromNodeId === 'file:entry.js').map((ref) => ref.referenceName)).toEqual(['./real', '@lib/helper', 'tools/helper']);
+});
+
+
+it('distinguishes loop bindings, parameter defaults, type-only imports and identity escapes', () => {
+  const cases: Array<[string, string[]]> = [
+    ["for (const require of loaders) require('./ghost'); require('./real');", ['./real']],
+    ["for (const {require} of loaders) require('./ghost'); require('./real');", ['./real']],
+    ["function f(a=require('./real')) { var require; require('./ghost'); }", ['./real']],
+    ["import type { require } from './types'; require('./real');", ['./real']],
+    ["import { type require } from './types'; require('./real');", ['./real']],
+    [String.raw`require('./re\U0061l'); require('./re\X61l');`, ['./reU0061l', './reX61l']],
+  ];
+  for (const [source, expected] of cases) {
+    expect(commonJsRequireRefs('entry.ts', source, 'typescript').map((ref) => ref.referenceName), source).toEqual(expected);
+  }
+});
diff --git a/__tests__/extraction.test.ts b/__tests__/extraction.test.ts
index cc8c94b9dd..27d94cbca6 100644
--- a/__tests__/extraction.test.ts
+++ b/__tests__/extraction.test.ts
@@ -9799,8 +9799,9 @@ function greet() {
     expect(componentNode?.name).toBe('Static');
     expect(componentNode?.language).toBe('vue');
 
-    // Only the component node should exist (no script nodes)
-    expect(result.nodes.length).toBe(1);
+    // A scriptless component has its file parent and no script nodes.
+    expect(result.nodes.map((n) => n.kind).sort()).toEqual(['component', 'file']);
+    expect(result.edges).toContainEqual(expect.objectContaining({ source: 'file:Static.vue', target: componentNode!.id, kind: 'contains' }));
   });
 
   it('should create containment edges from component to script nodes', () => {
diff --git a/__tests__/file-routed-page-component.test.ts b/__tests__/file-routed-page-component.test.ts
new file mode 100644
index 0000000000..ef7ee63f04
--- /dev/null
+++ b/__tests__/file-routed-page-component.test.ts
@@ -0,0 +1,137 @@
+/**
+ * A file-routed page is served by the component its file is: Nuxt's
+ * `pages/admin.vue`, Astro's `src/pages/about.astro`. The route stood alone,
+ * so the viewer's Steps tab drew nothing for a page and the routes list never
+ * named what serves it — it did not list a component-served route at all,
+ * Vue Router's included. The link goes to the page file's OWN component,
+ * never a same-named one (every `index.vue` is a component named `index`),
+ * and an Astro endpoint is served by the verbs it exports.
+ */
+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 { buildRoutes } from '../src/ui-server/api/routes';
+
+const projects: Record<string, Record<string, string>> = {
+  nuxt: {
+    'package.json': JSON.stringify({ name: 'shop', private: true, dependencies: { nuxt: '^3.0.0' } }),
+    'pages/index.vue': `<template><button @click="load">Load</button></template>
+<script setup lang="ts">
+import { readOrders } from '../lib/orders';
+function load() { return readOrders(); }
+</script>
+`,
+    'lib/orders.ts': 'export function readOrders() { return 1; }',
+    'pages/fetch.vue': '<template><p>fetch page</p></template>',
+    'pages/admin.vue': `<template><div>admin</div></template>
+`,
+    'pages/orders/index.vue': `<template><div>orders</div></template>
+`,
+    'components/index.vue': `<template><div>not a page</div></template>
+`,
+  },
+  astro: {
+    'package.json': JSON.stringify({ name: 'site', private: true, dependencies: { astro: '^4.0.0' } }),
+    'src/pages/index.astro': `---
+import { readTitle } from '../lib/title';
+const title = readTitle();
+---
+<h1>{title}</h1>
+`,
+    'src/lib/title.ts': 'export function readTitle() { return \"Home\"; }',
+    'src/pages/fetch.astro': '<p>fetch page</p>',
+    'src/pages/about.astro': `<p>about</p>
+`,
+    'src/pages/blog/index.astro': `<p>blog</p>
+`,
+    'src/pages/api/hello.ts': `export const GET = async () => new Response('hi');
+export async function POST() { return new Response('ok'); }
+`,
+  },
+};
+
+const graphs: Record<string, { root: string; cg: CodeGraph }> = {};
+
+beforeAll(async () => {
+  for (const [name, files] of Object.entries(projects)) {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), `cg-page-${name}-`));
+    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);
+    }
+    graphs[name] = { root, cg: await CodeGraph.init(root, { index: true }) };
+  }
+});
+
+afterAll(() => {
+  for (const { root, cg } of Object.values(graphs)) {
+    cg.close();
+    fs.rmSync(root, { recursive: true, force: true });
+  }
+});
+
+/** route name → the files of what it calls or references. */
+function served(cg: CodeGraph): Record<string, string[]> {
+  const out: Record<string, string[]> = {};
+  for (const route of cg.getNodesByKind('route')) {
+    out[route.name] = cg.getOutgoingEdgesFrom([route.id], ['calls', 'references'])
+      .map((e) => cg.getNode(e.target)!)
+      .map((n) => `${n.kind} ${n.filePath}`);
+  }
+  return out;
+}
+
+describe('a Nuxt page', () => {
+  it('is served by its own file’s component', () => {
+    const map = served(graphs.nuxt!.cg);
+    expect(map['/']).toEqual(['component pages/index.vue']);
+    expect(map['/fetch']).toEqual(['component pages/fetch.vue']);
+    expect(map['/admin']).toEqual(['component pages/admin.vue']);
+    expect(map['/orders']).toEqual(['component pages/orders/index.vue']);
+  });
+
+  it('is listed with the component that serves it', () => {
+    const { entries } = buildRoutes(graphs.nuxt!.cg, new URLSearchParams());
+    expect(entries.map((e) => `${e.url} ${e.handler} ${e.file}`).sort()).toEqual([
+      '/ index pages/index.vue',
+      '/admin admin pages/admin.vue',
+      '/fetch fetch pages/fetch.vue',
+      '/orders index pages/orders/index.vue',
+    ]);
+  });
+});
+
+describe('an Astro page', () => {
+  it('is served by its own file’s component, and an endpoint by the verbs it exports', () => {
+    const cg = graphs.astro!.cg;
+    const map = served(cg);
+    expect(map['/']).toEqual(['component src/pages/index.astro']);
+    expect(map['/fetch']).toEqual(['component src/pages/fetch.astro']);
+    expect(map['/about']).toEqual(['component src/pages/about.astro']);
+    expect(map['/blog']).toEqual(['component src/pages/blog/index.astro']);
+    for (const verb of ['GET', 'POST']) {
+      expect(map[`${verb} /api/hello`]).toEqual(['function src/pages/api/hello.ts']);
+      const route = cg.getNodesByKind('route').find((node) => node.name === `${verb} /api/hello`)!;
+      const targets = cg.getOutgoingEdgesFrom([route.id], ['calls', 'references']).map((edge) => cg.getNode(edge.target)!.name);
+      expect(targets).toContain(verb);
+    }
+  });
+});
+
+
+it('connects each page through its own component to an imported helper', () => {
+  for (const [project, page, helper] of [
+    ['nuxt', 'pages/index.vue', 'lib/orders.ts'],
+    ['astro', 'src/pages/index.astro', 'src/lib/title.ts'],
+  ]) {
+    const cg = graphs[project!]!.cg;
+    const route = cg.getNodesByKind('route').find((node) => node.name === '/')!;
+    const component = cg.getOutgoingEdgesFrom([route.id], ['calls']).map((edge) => cg.getNode(edge.target)!).find((node) => node.kind === 'component')!;
+    expect(component.filePath).toBe(page);
+    const owned = [component.id, ...cg.getOutgoingEdgesFrom([component.id], ['contains']).map((edge) => edge.target)];
+    const targets = cg.getOutgoingEdgesFrom(owned, ['calls']).map((edge) => cg.getNode(edge.target)!);
+    expect(targets.some((node) => node.filePath === helper && node.kind === 'function')).toBe(true);
+  }
+});
diff --git a/__tests__/fixtures/golden/sfc-mix.dump b/__tests__/fixtures/golden/sfc-mix.dump
index 3ee48d717c..7429d6f925 100644
--- a/__tests__/fixtures/golden/sfc-mix.dump
+++ b/__tests__/fixtures/golden/sfc-mix.dump
@@ -10,10 +10,10 @@
 {"id":"constant:731fa565cbbeb3c83ef6f360af0deffb","kind":"constant","name":"panelKind","qualified_name":"panelKind","file_path":"src/lib/Panel.svelte","language":"svelte","start_line":2,"end_line":2,"start_column":15,"end_column":33,"docstring":null,"signature":"= \"info\"","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:a603db0f72cd274c10bfb9baaf23a035","kind":"constant","name":"heading","qualified_name":"heading","file_path":"src/pages/index.astro","language":"astro","start_line":6,"end_line":6,"start_column":6,"end_column":41,"docstring":null,"signature":"= formatCount(items.length)","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"file:Components/GreetingService.cs","kind":"file","name":"GreetingService.cs","qualified_name":"Components/GreetingService.cs","file_path":"Components/GreetingService.cs","language":"csharp","start_line":1,"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":"file:src/lib/Counter.svelte","kind":"file","name":"Counter.svelte","qualified_name":"src/lib/Counter.svelte","file_path":"src/lib/Counter.svelte","language":"svelte","start_line":1,"end_line":9,"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:src/lib/Panel.svelte","kind":"file","name":"Panel.svelte","qualified_name":"src/lib/Panel.svelte","file_path":"src/lib/Panel.svelte","language":"svelte","start_line":4,"end_line":8,"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:src/lib/Counter.svelte","kind":"file","name":"Counter.svelte","qualified_name":"src/lib/Counter.svelte","file_path":"src/lib/Counter.svelte","language":"svelte","start_line":1,"end_line":16,"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:src/lib/Panel.svelte","kind":"file","name":"Panel.svelte","qualified_name":"src/lib/Panel.svelte","file_path":"src/lib/Panel.svelte","language":"svelte","start_line":1,"end_line":11,"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:src/lib/store.ts","kind":"file","name":"store.ts","qualified_name":"src/lib/store.ts","file_path":"src/lib/store.ts","language":"typescript","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:src/pages/index.astro","kind":"file","name":"index.astro","qualified_name":"src/pages/index.astro","file_path":"src/pages/index.astro","language":"astro","start_line":13,"end_line":16,"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:src/pages/index.astro","kind":"file","name":"index.astro","qualified_name":"src/pages/index.astro","file_path":"src/pages/index.astro","language":"astro","start_line":1,"end_line":19,"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:0026a1cae8e888523240c893a10aa70d","kind":"function","name":"increment","qualified_name":"increment","file_path":"src/lib/store.ts","language":"typescript","start_line":3,"end_line":3,"start_column":7,"end_column":65,"docstring":null,"signature":"(): 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:9777ee45a9be2e3fad362e78e1d7b6f9","kind":"function","name":"shout","qualified_name":"shout","file_path":"src/pages/index.astro","language":"astro","start_line":5,"end_line":5,"start_column":0,"end_column":61,"docstring":null,"signature":"(s: string): 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:d2e12acb9fe4991a6ddced760347b343","kind":"function","name":"onReady","qualified_name":"onReady","file_path":"src/pages/index.astro","language":"astro","start_line":14,"end_line":14,"start_column":6,"end_column":56,"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}
@@ -30,20 +30,19 @@
 {"id":"variable:5158b0a1f92af32a12f69947ecb9bc16","kind":"variable","name":"doubled","qualified_name":"doubled","file_path":"src/lib/Counter.svelte","language":"svelte","start_line":4,"end_line":4,"start_column":6,"end_column":17,"docstring":null,"signature":"= 0","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"variable:91a83e89785d63330141724a9e77ecaf","kind":"variable","name":"title","qualified_name":"title","file_path":"src/lib/Panel.svelte","language":"svelte","start_line":6,"end_line":6,"start_column":13,"end_column":18,"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":"variable:b010b506bf4b046bcce67431112fcc62","kind":"variable","name":"label","qualified_name":"label","file_path":"src/lib/Counter.svelte","language":"svelte","start_line":3,"end_line":3,"start_column":13,"end_column":38,"docstring":null,"signature":"= \"Counter\"","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-== edges (60)
+== edges (46)
 {"source":"class:e0436e1c421fad6fb415ebf1250fc957","target":"method:0fb9589fa48847b470e36febaa20fd6a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:3c652b3a8468352ce722877b478d750c","target":"class:9250e5f7a14d90af56522055875d3efc","kind":"instantiates","metadata":"{\"confidence\":0.5,\"resolvedBy\":\"exact-match\",\"refName\":\"GreetRequest\"}","line":13,"col":18,"provenance":null}
 {"source":"component:3c652b3a8468352ce722877b478d750c","target":"class:e0436e1c421fad6fb415ebf1250fc957","kind":"references","metadata":"{\"confidence\":0.5,\"resolvedBy\":\"exact-match\",\"refName\":\"GreetingService\"}","line":2,"col":0,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"component:f618e74c9653d19f14a4517ffbcc5a50","kind":"references","metadata":"{\"framework\":\"astro\",\"confidence\":0.8,\"resolvedBy\":\"framework\",\"refName\":\"Panel\"}","line":12,"col":5,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"constant:065e374572e8fdbbdc1b3f23a2d4fae7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"constant:a603db0f72cd274c10bfb9baaf23a035","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:9ab44aceec99c2241ddd988791f90540","target":"file:src/pages/index.astro","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"function:9777ee45a9be2e3fad362e78e1d7b6f9","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"shout\"}","line":11,"col":30,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"function:9777ee45a9be2e3fad362e78e1d7b6f9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"function:d2e12acb9fe4991a6ddced760347b343","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"component:9ab44aceec99c2241ddd988791f90540","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatCount\"}","line":6,"col":16,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"import:5768886a079628a326b519ee5dd8ec52","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:9ab44aceec99c2241ddd988791f90540","target":"import:7e12aa398bd31cc8ad3c376496090ad5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:c072dde69c5406b8fc182d1339f31b54","target":"file:src/lib/Counter.svelte","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:c072dde69c5406b8fc182d1339f31b54","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatCount\"}","line":11,"col":40,"provenance":null}
 {"source":"component:c072dde69c5406b8fc182d1339f31b54","target":"function:ed48ef0a7c92c2fe0641a87932a6e507","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:c072dde69c5406b8fc182d1339f31b54","target":"import:bd7c59a8ed1bfac8345e8ab60e865a83","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -51,46 +50,33 @@
 {"source":"component:c072dde69c5406b8fc182d1339f31b54","target":"variable:b010b506bf4b046bcce67431112fcc62","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"component:c072dde69c5406b8fc182d1339f31b54","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Counter\"}","line":10,"col":31,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"constant:731fa565cbbeb3c83ef6f360af0deffb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"file:src/lib/Panel.svelte","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"function:d4e27dd1f8cc937cd2912ff3cfb54de3","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"describe\"}","line":10,"col":13,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"function:d4e27dd1f8cc937cd2912ff3cfb54de3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"import:b6babedd191b7c5407cfcb5599bf90ef","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:f618e74c9653d19f14a4517ffbcc5a50","target":"variable:91a83e89785d63330141724a9e77ecaf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"constant:a603db0f72cd274c10bfb9baaf23a035","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatCount\"}","line":6,"col":16,"provenance":null}
 {"source":"file:Components/GreetingService.cs","target":"class:9250e5f7a14d90af56522055875d3efc","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:Components/GreetingService.cs","target":"class:e0436e1c421fad6fb415ebf1250fc957","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/lib/Counter.svelte","target":"component:c072dde69c5406b8fc182d1339f31b54","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/Counter.svelte","target":"constant:3fe6a7023d4d5ff3237fe178e2f0759f","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"count\"}","line":2,"col":11,"provenance":null}
 {"source":"file:src/lib/Counter.svelte","target":"file:src/lib/store.ts","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"./store\"}","line":2,"col":2,"provenance":null}
 {"source":"file:src/lib/Counter.svelte","target":"function:0026a1cae8e888523240c893a10aa70d","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"increment\"}","line":2,"col":18,"provenance":null}
 {"source":"file:src/lib/Counter.svelte","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatCount\"}","line":2,"col":29,"provenance":null}
-{"source":"file:src/lib/Counter.svelte","target":"function:ed48ef0a7c92c2fe0641a87932a6e507","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/lib/Counter.svelte","target":"import:bd7c59a8ed1bfac8345e8ab60e865a83","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/lib/Counter.svelte","target":"variable:5158b0a1f92af32a12f69947ecb9bc16","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/lib/Counter.svelte","target":"variable:b010b506bf4b046bcce67431112fcc62","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/Panel.svelte","target":"component:c072dde69c5406b8fc182d1339f31b54","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Counter\"}","line":5,"col":9,"provenance":null}
-{"source":"file:src/lib/Panel.svelte","target":"constant:731fa565cbbeb3c83ef6f360af0deffb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/lib/Panel.svelte","target":"component:f618e74c9653d19f14a4517ffbcc5a50","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/Panel.svelte","target":"file:src/lib/Counter.svelte","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"./Counter.svelte\"}","line":5,"col":2,"provenance":null}
-{"source":"file:src/lib/Panel.svelte","target":"function:d4e27dd1f8cc937cd2912ff3cfb54de3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/lib/Panel.svelte","target":"import:b6babedd191b7c5407cfcb5599bf90ef","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/lib/Panel.svelte","target":"variable:91a83e89785d63330141724a9e77ecaf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/store.ts","target":"constant:3fe6a7023d4d5ff3237fe178e2f0759f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/store.ts","target":"function:0026a1cae8e888523240c893a10aa70d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/store.ts","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/lib/store.ts","target":"import:953305409c84a199d8d2b49218329392","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/pages/index.astro","target":"component:9ab44aceec99c2241ddd988791f90540","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/pages/index.astro","target":"component:f618e74c9653d19f14a4517ffbcc5a50","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"Panel\"}","line":2,"col":7,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"constant:065e374572e8fdbbdc1b3f23a2d4fae7","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"constant:a603db0f72cd274c10bfb9baaf23a035","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/pages/index.astro","target":"file:src/lib/Panel.svelte","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"../lib/Panel.svelte\"}","line":2,"col":0,"provenance":null}
 {"source":"file:src/pages/index.astro","target":"file:src/lib/store.ts","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"../lib/store\"}","line":3,"col":0,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"function:9777ee45a9be2e3fad362e78e1d7b6f9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"function:d2e12acb9fe4991a6ddced760347b343","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/pages/index.astro","target":"function:d2e12acb9fe4991a6ddced760347b343","kind":"references","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"function-ref\",\"refName\":\"onReady\",\"refKind\":\"function_ref\",\"fnRef\":true}","line":15,"col":52,"provenance":null}
 {"source":"file:src/pages/index.astro","target":"function:e532a19cd6548d38325d9c3c5fab5190","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatCount\"}","line":3,"col":9,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"import:5768886a079628a326b519ee5dd8ec52","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/pages/index.astro","target":"import:7e12aa398bd31cc8ad3c376496090ad5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:ed48ef0a7c92c2fe0641a87932a6e507","target":"function:0026a1cae8e888523240c893a10aa70d","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"increment\"}","line":7,"col":4,"provenance":null}
 {"source":"method:0fb9589fa48847b470e36febaa20fd6a","target":"class:9250e5f7a14d90af56522055875d3efc","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"GreetRequest\"}","line":4,"col":24,"provenance":null}
-{"source":"route:src/pages/index.astro:/:1","target":"component:9ab44aceec99c2241ddd988791f90540","kind":"references","metadata":"{\"framework\":\"astro\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"astro-page-component\"}","line":1,"col":0,"provenance":null}
+{"source":"route:src/pages/index.astro:/:1","target":"component:9ab44aceec99c2241ddd988791f90540","kind":"calls","metadata":"{\"framework\":\"astro\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"page-component:index\"}","line":1,"col":0,"provenance":null}
 == refs (9)
 {"from_node_id":"component:3c652b3a8468352ce722877b478d750c","reference_name":"Greeter.Greet","reference_kind":"calls","line":14,"col":18,"candidates":null,"file_path":"Components/Greeter.razor","language":"razor","status":"failed","name_tail":"Greet"}
 {"from_node_id":"component:9ab44aceec99c2241ddd988791f90540","reference_name":"items.map","reference_kind":"calls","line":11,"col":8,"candidates":null,"file_path":"src/pages/index.astro","language":"astro","status":"failed","name_tail":"map","failure_reason":"unknown-receiver"}
@@ -129,6 +115,6 @@
 {"path":"Components/Greeter.razor","language":"razor","node_count":1}
 {"path":"Components/GreetingService.cs","language":"csharp","node_count":4}
 {"path":"src/lib/Counter.svelte","language":"svelte","node_count":6}
-{"path":"src/lib/Panel.svelte","language":"svelte","node_count":7}
+{"path":"src/lib/Panel.svelte","language":"svelte","node_count":6}
 {"path":"src/lib/store.ts","language":"typescript","node_count":5}
-{"path":"src/pages/index.astro","language":"astro","node_count":10}
+{"path":"src/pages/index.astro","language":"astro","node_count":9}
diff --git a/__tests__/fixtures/golden/tail-langs.dump b/__tests__/fixtures/golden/tail-langs.dump
index 2e2f02b3a3..2bff48eab6 100644
--- a/__tests__/fixtures/golden/tail-langs.dump
+++ b/__tests__/fixtures/golden/tail-langs.dump
@@ -132,7 +132,7 @@
 {"id":"variable:d66985bd46f73c589bf626a476ca4dd9","kind":"variable","name":"name","qualified_name":"name","file_path":"nix/module.nix","language":"nix","start_line":6,"end_line":6,"start_column":4,"end_column":61,"docstring":null,"signature":"= mkOption { type = types.str; default = \"world\"; }","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"variable:ec44d88622b9664503f7698cd63e9df9","kind":"variable","name":"options.services.greeter","qualified_name":"options.services.greeter","file_path":"nix/module.nix","language":"nix","start_line":4,"end_line":7,"start_column":2,"end_column":4,"docstring":null,"signature":"= {\n    enable = mkEnableOption \"greeter\";\n    name = mkOption { type = types.str; default = \"world\"; ...","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"variable:fc46c3957e062c09f1d7dfd0c4e39e68","kind":"variable","name":"WS-COUNT","qualified_name":"WS-COUNT","file_path":"cobol/GREETWS.cpy","language":"cobol","start_line":2,"end_line":2,"start_column":7,"end_column":50,"docstring":null,"signature":"01 WS-COUNT PIC 9(4) VALUE ZERO","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-== edges (161)
+== edges (162)
 {"source":"class:1354e5dd108f836e76d61a4ecedb6262","target":"class:ef405d3eb35a6ee244944eec0c93b6d4","kind":"extends","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"exact-match\",\"refName\":\"Ownable\"}","line":5,"col":0,"provenance":null}
 {"source":"class:1354e5dd108f836e76d61a4ecedb6262","target":"field:084206ff4dcb8c3b848851b6f90bb652","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:1354e5dd108f836e76d61a4ecedb6262","target":"field:d5355ecdd0413fd3b56cdb0e7f75e0d5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -173,6 +173,7 @@
 {"source":"class:ef405d3eb35a6ee244944eec0c93b6d4","target":"method:8774622dcc04ad898541b769e736065f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"class:ef405d3eb35a6ee244944eec0c93b6d4","target":"method:bce8c6cce85fec8bd2df9223eaf629de","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:arkts/Greeter.ets","target":"class:3e6591165ac27455fccf18fc888a0823","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:arkts/Greeter.ets","target":"file:arkts/util.ets","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"./util\"}","line":1,"col":0,"provenance":null}
 {"source":"file:arkts/Greeter.ets","target":"function:5616f3b8fc746c8c0c09a11ece0dbf24","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"formatName\"}","line":1,"col":9,"provenance":null}
 {"source":"file:arkts/Greeter.ets","target":"import:00cbe392ac9a605f9cae41475a23f438","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:arkts/Greeter.ets","target":"struct:00b863e6b6e7bd6569a36e94f72d3aaa","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -294,11 +295,10 @@
 {"source":"struct:00b863e6b6e7bd6569a36e94f72d3aaa","target":"property:81982deaee358e155a33af725d85bd97","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"struct:8050a2eb89168a19b5ac70b577047b96","target":"field:e2c04abad409b6092124d38ce58616bb","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"variable:62c285bb0e5c30272251db2b4966175f","target":"class:8da3dc4378a8ad4becad38a01a3d4d63","kind":"references","metadata":"{\"framework\":\"terraform\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"aws_instance.web\"}","line":14,"col":26,"provenance":null}
-== refs (55)
+== refs (54)
 {"from_node_id":"class:85e303095ea33303cdff1b72c25fb6db","reference_name":"IGreeter","reference_kind":"implements","line":1,"col":43,"candidates":null,"file_path":"cfml/Greeter.cfc","language":"cfml","status":"failed","name_tail":"IGreeter"}
 {"from_node_id":"class:8da3dc4378a8ad4becad38a01a3d4d63","reference_name":"module.network:output.subnet_id","reference_kind":"references","line":10,"col":18,"candidates":null,"file_path":"terraform/main.tf","language":"terraform","status":"failed","name_tail":"subnet_id"}
 {"from_node_id":"class:aa6851d523fe7c352fff4cc32fdcb79f","reference_name":"NSObject","reference_kind":"extends","line":5,"col":21,"candidates":null,"file_path":"objc/Greeter.h","language":"objc","status":"failed","name_tail":"NSObject"}
-{"from_node_id":"file:arkts/Greeter.ets","reference_name":"./util","reference_kind":"imports","line":1,"col":0,"candidates":null,"file_path":"arkts/Greeter.ets","language":"arkts","status":"failed","name_tail":"/util"}
 {"from_node_id":"file:nix/default.nix","reference_name":"builtins.concatStringsSep","reference_kind":"calls","line":14,"col":25,"candidates":null,"file_path":"nix/default.nix","language":"nix","status":"failed","name_tail":"concatStringsSep"}
 {"from_node_id":"file:nix/default.nix","reference_name":"map","reference_kind":"calls","line":7,"col":14,"candidates":null,"file_path":"nix/default.nix","language":"nix","status":"failed","name_tail":"map"}
 {"from_node_id":"file:nix/default.nix","reference_name":"map","reference_kind":"calls","line":9,"col":9,"candidates":null,"file_path":"nix/default.nix","language":"nix","status":"failed","name_tail":"map"}
diff --git a/__tests__/fixtures/golden/torture-multilang.dump b/__tests__/fixtures/golden/torture-multilang.dump
index c3b10a2193..7cdaa71673 100644
--- a/__tests__/fixtures/golden/torture-multilang.dump
+++ b/__tests__/fixtures/golden/torture-multilang.dump
@@ -1486,7 +1486,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 (1919)
+== edges (1915)
 {"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}
@@ -2799,13 +2799,9 @@
 {"source":"file:torture.tsx","target":"function:f00a265ed388e20f65b3357ab065773e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"function:f11355267c15b025e65a025974c2a4d1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"import:29c3cc32eeee07c3c2b96bf6f1b275d2","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"import:29c3cc32eeee07c3c2b96bf6f1b275d2","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"./side-effect\"}","line":7,"col":0,"provenance":null}
 {"source":"file:torture.tsx","target":"import:4935bc32d5f33e8f95c3cb009bf0935d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"import:4935bc32d5f33e8f95c3cb009bf0935d","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"./default-module\"}","line":6,"col":0,"provenance":null}
 {"source":"file:torture.tsx","target":"import:7bff5cb286a60587ad04b8eed5de0e67","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"import:7bff5cb286a60587ad04b8eed5de0e67","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"./namespace-module\"}","line":5,"col":0,"provenance":null}
 {"source":"file:torture.tsx","target":"import:92cf06e18d12ccca19cc4fcd24ce1065","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:torture.tsx","target":"import:92cf06e18d12ccca19cc4fcd24ce1065","kind":"imports","metadata":"{\"confidence\":0.95,\"resolvedBy\":\"qualified-name\",\"refName\":\"./helpers\"}","line":8,"col":0,"provenance":null}
 {"source":"file:torture.tsx","target":"import:d3f11476b3c70d68f9f9724f3e6ab699","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"interface:a05baa699fc9324830859524f09604c9","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:torture.tsx","target":"type_alias:600473b4a3158649443b2f214febf906","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -3406,7 +3402,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 (1295)
+== refs (1299)
 {"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"}
@@ -3747,7 +3743,11 @@
 {"from_node_id":"file:torture.scala","reference_name":"xs.drop","reference_kind":"calls","line":117,"col":54,"candidates":null,"file_path":"torture.scala","language":"scala","status":"failed","name_tail":"drop"}
 {"from_node_id":"file:torture.swift","reference_name":"Foundation","reference_kind":"imports","line":1,"col":0,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"Foundation"}
 {"from_node_id":"file:torture.swift","reference_name":"TortureKit","reference_kind":"imports","line":213,"col":0,"candidates":null,"file_path":"torture.swift","language":"swift","status":"failed","name_tail":"TortureKit"}
+{"from_node_id":"file:torture.tsx","reference_name":"./default-module","reference_kind":"imports","line":6,"col":0,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"/default-module"}
 {"from_node_id":"file:torture.tsx","reference_name":"./dynamic-module","reference_kind":"imports","line":211,"col":0,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"/dynamic-module"}
+{"from_node_id":"file:torture.tsx","reference_name":"./helpers","reference_kind":"imports","line":8,"col":0,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"/helpers"}
+{"from_node_id":"file:torture.tsx","reference_name":"./namespace-module","reference_kind":"imports","line":5,"col":0,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"/namespace-module"}
+{"from_node_id":"file:torture.tsx","reference_name":"./side-effect","reference_kind":"imports","line":7,"col":0,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"/side-effect"}
 {"from_node_id":"file:torture.tsx","reference_name":"CONFIG_TABLE","reference_kind":"imports","line":8,"col":19,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"CONFIG_TABLE"}
 {"from_node_id":"file:torture.tsx","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":"file:torture.tsx","reference_name":"DefaultThing","reference_kind":"imports","line":6,"col":7,"candidates":null,"file_path":"torture.tsx","language":"tsx","status":"failed","name_tail":"DefaultThing"}
diff --git a/__tests__/fixtures/golden/vue-sfc.dump b/__tests__/fixtures/golden/vue-sfc.dump
index 40a73a9d51..d359ad5660 100644
--- a/__tests__/fixtures/golden/vue-sfc.dump
+++ b/__tests__/fixtures/golden/vue-sfc.dump
@@ -14,13 +14,13 @@
 {"id":"constant:cc53d30032c6a64950637c56908b7d0b","kind":"constant","name":"router","qualified_name":"router","file_path":"src/router/index.ts","language":"typescript","start_line":2,"end_line":9,"start_column":6,"end_column":2,"docstring":null,"signature":"= createRouter({\n  history: createWebHistory(),\n  routes: [\n    { name: \"home\", path: \"/\", component: ...","visibility":null,"is_exported":1,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:d9be2d3d04398687cd5215bbe3161ba5","kind":"constant","name":"title","qualified_name":"title","file_path":"src/views/Home.vue","language":"vue","start_line":13,"end_line":13,"start_column":6,"end_column":87,"docstring":null,"signature":"= computed(() => (session.loggedIn ? `Hi ${session.username}` : \"Welcome\"))","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
 {"id":"constant:ff0949df989967149797da1892030a1d","kind":"constant","name":"name","qualified_name":"name","file_path":"src/views/Login.vue","language":"vue","start_line":8,"end_line":8,"start_column":6,"end_column":20,"docstring":null,"signature":"= ref(\"\")","visibility":null,"is_exported":0,"is_async":0,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
-{"id":"file:src/components/PlayerTable.vue","kind":"file","name":"PlayerTable.vue","qualified_name":"src/components/PlayerTable.vue","file_path":"src/components/PlayerTable.vue","language":"vue","start_line":4,"end_line":9,"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:src/components/TheHeader.vue","kind":"file","name":"TheHeader.vue","qualified_name":"src/components/TheHeader.vue","file_path":"src/components/TheHeader.vue","language":"vue","start_line":4,"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}
+{"id":"file:src/components/PlayerTable.vue","kind":"file","name":"PlayerTable.vue","qualified_name":"src/components/PlayerTable.vue","file_path":"src/components/PlayerTable.vue","language":"vue","start_line":1,"end_line":14,"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:src/components/TheHeader.vue","kind":"file","name":"TheHeader.vue","qualified_name":"src/components/TheHeader.vue","file_path":"src/components/TheHeader.vue","language":"vue","start_line":1,"end_line":8,"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:src/router/index.ts","kind":"file","name":"index.ts","qualified_name":"src/router/index.ts","file_path":"src/router/index.ts","language":"typescript","start_line":1,"end_line":11,"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:src/stores/session.ts","kind":"file","name":"session.ts","qualified_name":"src/stores/session.ts","file_path":"src/stores/session.ts","language":"typescript","start_line":1,"end_line":10,"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:src/views/Home.vue","kind":"file","name":"Home.vue","qualified_name":"src/views/Home.vue","file_path":"src/views/Home.vue","language":"vue","start_line":4,"end_line":17,"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:src/views/Login.vue","kind":"file","name":"Login.vue","qualified_name":"src/views/Login.vue","file_path":"src/views/Login.vue","language":"vue","start_line":4,"end_line":15,"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:src/views/Profile.vue","kind":"file","name":"Profile.vue","qualified_name":"src/views/Profile.vue","file_path":"src/views/Profile.vue","language":"vue","start_line":4,"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:src/views/Home.vue","kind":"file","name":"Home.vue","qualified_name":"src/views/Home.vue","file_path":"src/views/Home.vue","language":"vue","start_line":1,"end_line":21,"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:src/views/Login.vue","kind":"file","name":"Login.vue","qualified_name":"src/views/Login.vue","file_path":"src/views/Login.vue","language":"vue","start_line":1,"end_line":16,"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:src/views/Profile.vue","kind":"file","name":"Profile.vue","qualified_name":"src/views/Profile.vue","file_path":"src/views/Profile.vue","language":"vue","start_line":1,"end_line":13,"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:085111786b044269e1e486b05662945a","kind":"function","name":"logout","qualified_name":"logout","file_path":"src/stores/session.ts","language":"typescript","start_line":7,"end_line":7,"start_column":4,"end_column":53,"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:6be3944381225a6a828e91729caf5788","kind":"function","name":"login","qualified_name":"login","file_path":"src/stores/session.ts","language":"typescript","start_line":6,"end_line":6,"start_column":4,"end_column":92,"docstring":null,"signature":"(username: string, token: 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:8d98565edda11804927409e8e272013e","kind":"function","name":"submit","qualified_name":"submit","file_path":"src/views/Login.vue","language":"vue","start_line":11,"end_line":14,"start_column":0,"end_column":1,"docstring":null,"signature":"()","visibility":null,"is_exported":0,"is_async":1,"is_static":0,"is_abstract":0,"decorators":null,"type_parameters":null,"return_type":null}
@@ -41,16 +41,17 @@
 {"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 (82)
+== edges (63)
+{"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}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"component:d243da7dd7c0285f73fbc46926de4830","kind":"calls","metadata":"{\"synthesizedBy\":\"jsx-render\",\"via\":\"PlayerTable\"}","line":1,"col":null,"provenance":"heuristic"}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"component:d243da7dd7c0285f73fbc46926de4830","kind":"references","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"PlayerTable\"}","line":2,"col":60,"provenance":null}
+{"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":11,"col":16,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"constant:5d677039776558e912ac55676ec98100","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"constant:751e16382875beaa12f2dc749e1d9872","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"constant:c14c87c0b0c5b511e512bce492e77e4d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"constant:d9be2d3d04398687cd5215bbe3161ba5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"file:src/views/Home.vue","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"function:acb5cc12f5a5aac4fe728346a0195105","kind":"calls","metadata":"{\"synthesizedBy\":\"vue-handler\",\"event\":\"go\"}","line":1,"col":null,"provenance":"heuristic"}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"function:acb5cc12f5a5aac4fe728346a0195105","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"import:027a889525f1e6e315129a7ad281251d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -58,32 +59,26 @@
 {"source":"component:4adc8e1e4bb22917b580e3d56a1ea521","target":"import:b13abb7ec1b5f328bf02153acc3271a5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"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":"file:src/views/Profile.vue","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":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:a2b972002bba2cab19e7c5b8376f5608","target":"file:src/components/TheHeader.vue","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}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"constant:17aec3feee6b90e31758cb1b41bc1451","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":10,"col":16,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"constant:cb450172e958b905f9dac8f66786c11a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"constant:ff0949df989967149797da1892030a1d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"file:src/views/Login.vue","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"function:8d98565edda11804927409e8e272013e","kind":"calls","metadata":"{\"synthesizedBy\":\"vue-handler\",\"event\":\"submit\"}","line":1,"col":null,"provenance":"heuristic"}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"function:8d98565edda11804927409e8e272013e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:bb25dfa092c88625d329317b0410e2cf","target":"import:18d11ae5a76f290915b58b51dd533f3f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"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":"file:src/components/PlayerTable.vue","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"component:d243da7dd7c0285f73fbc46926de4830","target":"function:cbf5b3b6d9cf6f3f971b79716cb24ec1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"constant:17aec3feee6b90e31758cb1b41bc1451","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":10,"col":16,"provenance":null}
-{"source":"constant:751e16382875beaa12f2dc749e1d9872","target":"constant:751e16382875beaa12f2dc749e1d9872","kind":"calls","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":10,"col":15,"provenance":null}
-{"source":"constant:c14c87c0b0c5b511e512bce492e77e4d","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"calls","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":11,"col":16,"provenance":null}
-{"source":"constant:cb450172e958b905f9dac8f66786c11a","target":"constant:cb450172e958b905f9dac8f66786c11a","kind":"calls","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":9,"col":15,"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}
 {"source":"constant:cc53d30032c6a64950637c56908b7d0b","target":"component:bb25dfa092c88625d329317b0410e2cf","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/views/Login.vue\"}","line":6,"col":54,"provenance":null}
-{"source":"file:src/components/PlayerTable.vue","target":"function:cbf5b3b6d9cf6f3f971b79716cb24ec1","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/components/TheHeader.vue","target":"constant:a9f2e86d1d4a623601d625c820f6d4f8","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/components/PlayerTable.vue","target":"component:d243da7dd7c0285f73fbc46926de4830","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/components/TheHeader.vue","target":"component:a2b972002bba2cab19e7c5b8376f5608","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/router/index.ts","target":"constant:cc53d30032c6a64950637c56908b7d0b","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/router/index.ts","target":"import:5d64257bf8c0a7bc1b0e85cb44911c7f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/stores/session.ts","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
@@ -91,33 +86,19 @@
 {"source":"file:src/stores/session.ts","target":"function:6be3944381225a6a828e91729caf5788","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/stores/session.ts","target":"function:98084f78440e902f0fb6526f37df2e46","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/stores/session.ts","target":"import:4c3d03fe5b468700553c025bde17c5da","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/views/Home.vue","target":"component:4adc8e1e4bb22917b580e3d56a1ea521","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"component:a2b972002bba2cab19e7c5b8376f5608","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"TheHeader\"}","line":7,"col":7,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"component:a2b972002bba2cab19e7c5b8376f5608","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/components/TheHeader.vue\"}","line":7,"col":0,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"component:d243da7dd7c0285f73fbc46926de4830","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"PlayerTable\"}","line":8,"col":7,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"component:d243da7dd7c0285f73fbc46926de4830","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/components/PlayerTable.vue\"}","line":8,"col":0,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":9,"col":9,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"constant:5d677039776558e912ac55676ec98100","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"constant:751e16382875beaa12f2dc749e1d9872","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"constant:c14c87c0b0c5b511e512bce492e77e4d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"constant:d9be2d3d04398687cd5215bbe3161ba5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"file:src/stores/session.ts","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/stores/session\"}","line":9,"col":0,"provenance":null}
 {"source":"file:src/views/Home.vue","target":"file:src/views/Home.vue","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":6,"col":9,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"function:acb5cc12f5a5aac4fe728346a0195105","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"import:027a889525f1e6e315129a7ad281251d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"import:abb463c3ae2e046fb414b1cc9e6791d0","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"import:b13abb7ec1b5f328bf02153acc3271a5","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"import:e479f74976640946cd942a1c120728fd","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Home.vue","target":"import:e725b097897b9381f422d2cc6a84390d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"constant:17aec3feee6b90e31758cb1b41bc1451","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/views/Login.vue","target":"component:bb25dfa092c88625d329317b0410e2cf","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/views/Login.vue","target":"constant:452cdd44fc910418f24644cca18f6ebf","kind":"imports","metadata":"{\"confidence\":0.9,\"resolvedBy\":\"import\",\"refName\":\"useSessionStore\"}","line":7,"col":9,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"constant:cb450172e958b905f9dac8f66786c11a","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"constant:ff0949df989967149797da1892030a1d","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"file:src/views/Login.vue","target":"file:src/stores/session.ts","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":0.9,\"resolvedBy\":\"framework\",\"refName\":\"@/stores/session\"}","line":7,"col":0,"provenance":null}
 {"source":"file:src/views/Login.vue","target":"file:src/views/Login.vue","kind":"imports","metadata":"{\"framework\":\"vue\",\"confidence\":1,\"resolvedBy\":\"framework\",\"refName\":\"useRouter\"}","line":6,"col":9,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"function:8d98565edda11804927409e8e272013e","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"import:18d11ae5a76f290915b58b51dd533f3f","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"import:cb1810af8536de8faf29efc9265c1557","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
-{"source":"file:src/views/Login.vue","target":"import:f38ceaeccfd0e13483a209bbc3005ae3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
+{"source":"file:src/views/Profile.vue","target":"component:51ec8fb32fb2e5eb0334651e5437dbb3","kind":"contains","metadata":null,"line":null,"col":null,"provenance":null}
 {"source":"function:8d98565edda11804927409e8e272013e","target":"function:6be3944381225a6a828e91729caf5788","kind":"calls","metadata":"{\"synthesizedBy\":\"pinia-store\",\"via\":\"login\",\"registeredAt\":\"src/views/Login.vue:12\"}","line":12,"col":null,"provenance":"heuristic"}
 {"source":"function:8d98565edda11804927409e8e272013e","target":"route:src/router/index.ts:5:/:vue","kind":"navigates","metadata":"{\"href\":\"home\",\"navMethod\":\"push\",\"by\":\"name\",\"framework\":\"vue-router\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"router.push\",\"refKind\":\"calls\"}","line":13,"col":8,"provenance":null}
 {"source":"function:acb5cc12f5a5aac4fe728346a0195105","target":"route:src/router/index.ts:5:/:vue","kind":"navigates","metadata":"{\"href\":\"/\",\"navMethod\":\"push\",\"framework\":\"vue-router\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"router.push\",\"refKind\":\"calls\"}","line":15,"col":2,"provenance":null}
@@ -125,16 +106,16 @@
 {"source":"route:src/router/index.ts:6:/login:vue","target":"component:bb25dfa092c88625d329317b0410e2cf","kind":"calls","metadata":"{\"framework\":\"vue-router\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"import:@/views/Login.vue#Login\"}","line":6,"col":0,"provenance":null}
 {"source":"route:src/router/index.ts:7:/profile/:username:vue","target":"component:51ec8fb32fb2e5eb0334651e5437dbb3","kind":"calls","metadata":"{\"framework\":\"vue-router\",\"confidence\":0.95,\"resolvedBy\":\"framework\",\"refName\":\"import:@/views/Profile.vue#Profile\"}","line":7,"col":0,"provenance":null}
 == refs (24)
+{"from_node_id":"component:4adc8e1e4bb22917b580e3d56a1ea521","reference_name":"computed","reference_kind":"calls","line":13,"col":14,"candidates":null,"file_path":"src/views/Home.vue","language":"vue","status":"failed","name_tail":"computed"}
+{"from_node_id":"component:4adc8e1e4bb22917b580e3d56a1ea521","reference_name":"ref","reference_kind":"calls","line":12,"col":13,"candidates":null,"file_path":"src/views/Home.vue","language":"vue","status":"failed","name_tail":"ref"}
 {"from_node_id":"component:a2b972002bba2cab19e7c5b8376f5608","reference_name":"RouterLink","reference_kind":"references","line":2,"col":77,"candidates":null,"file_path":"src/components/TheHeader.vue","language":"vue","status":"failed","name_tail":"RouterLink"}
+{"from_node_id":"component:a2b972002bba2cab19e7c5b8376f5608","reference_name":"defineEmits","reference_kind":"calls","line":6,"col":13,"candidates":null,"file_path":"src/components/TheHeader.vue","language":"vue","status":"failed","name_tail":"defineEmits"}
+{"from_node_id":"component:a2b972002bba2cab19e7c5b8376f5608","reference_name":"defineProps","reference_kind":"calls","line":5,"col":0,"candidates":null,"file_path":"src/components/TheHeader.vue","language":"vue","status":"failed","name_tail":"defineProps"}
 {"from_node_id":"component:bb25dfa092c88625d329317b0410e2cf","reference_name":"RouterLink","reference_kind":"references","line":2,"col":58,"candidates":null,"file_path":"src/views/Login.vue","language":"vue","status":"failed","name_tail":"RouterLink"}
-{"from_node_id":"constant:5d677039776558e912ac55676ec98100","reference_name":"ref","reference_kind":"calls","line":12,"col":13,"candidates":null,"file_path":"src/views/Home.vue","language":"vue","status":"failed","name_tail":"ref"}
-{"from_node_id":"constant:a9f2e86d1d4a623601d625c820f6d4f8","reference_name":"defineEmits","reference_kind":"calls","line":6,"col":13,"candidates":null,"file_path":"src/components/TheHeader.vue","language":"vue","status":"failed","name_tail":"defineEmits"}
+{"from_node_id":"component:bb25dfa092c88625d329317b0410e2cf","reference_name":"ref","reference_kind":"calls","line":8,"col":13,"candidates":null,"file_path":"src/views/Login.vue","language":"vue","status":"failed","name_tail":"ref"}
+{"from_node_id":"component:d243da7dd7c0285f73fbc46926de4830","reference_name":"defineProps","reference_kind":"calls","line":5,"col":0,"candidates":null,"file_path":"src/components/PlayerTable.vue","language":"vue","status":"failed","name_tail":"defineProps"}
 {"from_node_id":"constant:cc53d30032c6a64950637c56908b7d0b","reference_name":"createRouter","reference_kind":"calls","line":2,"col":15,"candidates":null,"file_path":"src/router/index.ts","language":"typescript","status":"failed","name_tail":"createRouter"}
 {"from_node_id":"constant:cc53d30032c6a64950637c56908b7d0b","reference_name":"createWebHistory","reference_kind":"calls","line":3,"col":11,"candidates":null,"file_path":"src/router/index.ts","language":"typescript","status":"failed","name_tail":"createWebHistory"}
-{"from_node_id":"constant:d9be2d3d04398687cd5215bbe3161ba5","reference_name":"computed","reference_kind":"calls","line":13,"col":14,"candidates":null,"file_path":"src/views/Home.vue","language":"vue","status":"failed","name_tail":"computed"}
-{"from_node_id":"constant:ff0949df989967149797da1892030a1d","reference_name":"ref","reference_kind":"calls","line":8,"col":13,"candidates":null,"file_path":"src/views/Login.vue","language":"vue","status":"failed","name_tail":"ref"}
-{"from_node_id":"file:src/components/PlayerTable.vue","reference_name":"defineProps","reference_kind":"calls","line":5,"col":0,"candidates":null,"file_path":"src/components/PlayerTable.vue","language":"vue","status":"failed","name_tail":"defineProps"}
-{"from_node_id":"file:src/components/TheHeader.vue","reference_name":"defineProps","reference_kind":"calls","line":5,"col":0,"candidates":null,"file_path":"src/components/TheHeader.vue","language":"vue","status":"failed","name_tail":"defineProps"}
 {"from_node_id":"file:src/router/index.ts","reference_name":"createRouter","reference_kind":"imports","line":1,"col":9,"candidates":null,"file_path":"src/router/index.ts","language":"typescript","status":"failed","name_tail":"createRouter"}
 {"from_node_id":"file:src/router/index.ts","reference_name":"createWebHistory","reference_kind":"imports","line":1,"col":23,"candidates":null,"file_path":"src/router/index.ts","language":"typescript","status":"failed","name_tail":"createWebHistory"}
 {"from_node_id":"file:src/router/index.ts","reference_name":"vue-router","reference_kind":"imports","line":1,"col":0,"candidates":null,"file_path":"src/router/index.ts","language":"typescript","status":"failed","name_tail":"vue-router"}
diff --git a/__tests__/flow-directed-exact-names.test.ts b/__tests__/flow-directed-exact-names.test.ts
new file mode 100644
index 0000000000..6636c837fa
--- /dev/null
+++ b/__tests__/flow-directed-exact-names.test.ts
@@ -0,0 +1,66 @@
+/**
+ * A directed Flow question ("how does X reach Y") names its two ends exactly,
+ * as the viewer's links write them — a symbol's own name. Names the free-text
+ * token filter drops were lost: an Objective-C selector (`initWithFrame:`), a
+ * Ruby predicate (`valid?`), a two-letter method (`ok`). The other end was
+ * then reported as naming nothing, though it was in the index.
+ */
+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 { resolveNamedSymbolFlow } from '../src/graph/named-symbol-flow';
+
+let root = '';
+let cg: CodeGraph;
+
+beforeAll(async () => {
+  root = fs.mkdtempSync(path.join(os.tmpdir(), 'cg-flow-exact-'));
+  const files: Record<string, string> = {
+    'src/check.ts': `export function ok(): number {
+  return go();
+}
+
+export function go(): number {
+  return 1;
+}
+`,
+    'app/models/order.rb': `class Order
+  def save!
+    raise ArgumentError unless valid?
+  end
+
+  def valid?
+    true
+  end
+end
+`,
+  };
+  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 });
+});
+
+const directed = (from: string, to: string) =>
+  resolveNamedSymbolFlow(cg, `${from} ${to}`, { mode: 'directed', from, to });
+
+describe('a directed flow question', () => {
+  it('reaches a two-letter name', () => {
+    const flow = directed('ok', 'go');
+    expect(flow.chains[0]?.steps.map((s) => s.node.name)).toEqual(['ok', 'go']);
+  });
+
+  it('reaches a name with punctuation', () => {
+    const flow = directed('save!', 'valid?');
+    expect(flow.tokens).toEqual(['save!', 'valid?']);
+    expect(flow.chains[0]?.steps.map((s) => s.node.name)).toEqual(['save!', 'valid?']);
+  });
+});
diff --git a/__tests__/rails-only-except-forms.test.ts b/__tests__/rails-only-except-forms.test.ts
new file mode 100644
index 0000000000..c72e582e3c
--- /dev/null
+++ b/__tests__/rails-only-except-forms.test.ts
@@ -0,0 +1,57 @@
+/**
+ * A `resources` line's `only:` / `except:` is read however Rails lets it be
+ * written. maybe's `resources :family_exports, only: %i[new create index]` was
+ * not read, so it drew all seven RESTful routes — four of them to actions the
+ * controller does not have, which the viewer listed as routes bound to nothing.
+ */
+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-rails-only-'));
+  const files: Record<string, string> = {
+    'Gemfile': 'source "https://rubygems.org"\ngem "rails", "~> 7.1"\n',
+    'config/routes.rb': `Rails.application.routes.draw do
+  resources :family_exports, only: %i[new create index] do
+    member do
+      get :download
+    end
+  end
+  resources :tags, except: %w(destroy edit update)
+  resources :imports, :only => [:index, :show]
+  resource :session, only: "show"
+end
+`,
+  };
+  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 });
+});
+
+const routes = (controller: string) =>
+  cg.getNodesByKind('route').map((r) => r.qualifiedName).filter((q) => q.includes(`${controller}#`)).map((q) => q.slice(q.lastIndexOf('#') + 1)).sort();
+
+describe('Rails resources only: / except:', () => {
+  it('reads %i[] and %w() lists', () => {
+    expect(routes('family_exports')).toEqual(['create', 'download', 'index', 'new']);
+    expect(routes('tags')).toEqual(['create', 'index', 'new', 'show']);
+  });
+
+  it('reads the hash-rocket and string forms', () => {
+    expect(routes('imports')).toEqual(['index', 'show']);
+    expect(routes('sessions')).toEqual(['show']);
+  });
+});
diff --git a/__tests__/request-parse-budget.test.ts b/__tests__/request-parse-budget.test.ts
new file mode 100644
index 0000000000..5c275e26d8
--- /dev/null
+++ b/__tests__/request-parse-budget.test.ts
@@ -0,0 +1,11 @@
+import { it, expect } from 'vitest';
+import { parseWithinBudget } from '../src/extraction/parse-budget';
+
+it('cancels request parsing and reuses the parser for a different document', () => {
+  expect(parseWithinBudget('const oldValue = 1;\n'.repeat(20_000), 'typescript', 1)).toBeNull();
+  const tree = parseWithinBudget('const freshValue = 2;', 'typescript');
+  expect(tree).not.toBeNull();
+  expect(tree!.rootNode.text).toBe('const freshValue = 2;');
+  expect(tree!.rootNode.descendantsOfType('identifier').map((node) => node.text)).toContain('freshValue');
+  tree!.delete();
+});
diff --git a/__tests__/sfc-component-owns-script.test.ts b/__tests__/sfc-component-owns-script.test.ts
new file mode 100644
index 0000000000..a7a2d89672
--- /dev/null
+++ b/__tests__/sfc-component-owns-script.test.ts
@@ -0,0 +1,103 @@
+/**
+ * A Vue / Svelte / Astro file is one file node holding the component it is,
+ * and the component holds its script: each symbol has one parent, and a
+ * component never contains its own file. What a per-instance script does at
+ * its top level — `<script setup>`, a Svelte instance script, Astro's
+ * frontmatter — is the component's doing (a Nuxt page's `useAsyncData(…)`, a
+ * Svelte page's `onMount(…)`); a module-level script's, and every import,
+ * stays with the file.
+ */
+import { describe, it, expect, beforeAll } from 'vitest';
+import { extractFromSource } from '../src/extraction';
+import { initGrammars, loadAllGrammars } from '../src/extraction/grammars';
+import type { ExtractionResult } from '../src/types';
+
+beforeAll(async () => {
+  await initGrammars();
+  await loadAllGrammars();
+});
+
+const componentOf = (r: ExtractionResult) => r.nodes.find((n) => n.kind === 'component')!;
+const from = (r: ExtractionResult, name: string) =>
+  r.unresolvedReferences.filter((ref) => ref.referenceName === name && ref.referenceKind === 'calls').map((ref) => ref.fromNodeId);
+const parents = (r: ExtractionResult) => {
+  const out = new Map<string, string[]>();
+  for (const e of r.edges) if (e.kind === 'contains') out.set(e.target, [...(out.get(e.target) ?? []), e.source]);
+  return out;
+};
+
+describe('a single-file component’s structure', () => {
+  it('is a file holding the component holding the script, one parent each', () => {
+    const r = extractFromSource('pages/index.vue', `<template><button @click="load">Load</button></template>
+<script setup lang="ts">
+import { useFetch } from '#app';
+const data = useFetch('/api/items');
+function load() {
+  return data;
+}
+</script>
+`);
+    const file = r.nodes.find((n) => n.kind === 'file')!;
+    const component = componentOf(r);
+    expect(file).toMatchObject({ id: 'file:pages/index.vue', startLine: 1, endLine: 9 });
+    const p = parents(r);
+    expect(p.get(component.id)).toEqual([file.id]);
+    expect(p.get(file.id)).toBeUndefined();
+    const load = r.nodes.find((n) => n.name === 'load')!;
+    expect(p.get(load.id)).toEqual([component.id]);
+    for (const [, list] of p) expect(list).toHaveLength(1);
+  });
+
+  it('gives a <script setup>’s top-level calls to the component, and its imports to the file', () => {
+    const r = extractFromSource('pages/index.vue', `<template><div /></template>
+<script setup lang="ts">
+import { useFetch } from '#app';
+const data = useFetch('/api/items');
+</script>
+`);
+    expect(from(r, 'useFetch').filter((id) => id.startsWith('component:'))).toHaveLength(1);
+    expect(r.unresolvedReferences.filter((ref) => ref.referenceKind === 'imports').every((ref) => ref.fromNodeId === 'file:pages/index.vue')).toBe(true);
+  });
+
+  it('leaves a plain <script>’s module-level calls with the file', () => {
+    const r = extractFromSource('src/Widget.vue', `<template><div /></template>
+<script>
+registerWidget('widget');
+export default { name: 'Widget' };
+</script>
+`);
+    expect(from(r, 'registerWidget')).toEqual(['file:src/Widget.vue']);
+  });
+
+  it('gives a Svelte instance script to the component, and a module script to the file', () => {
+    const r = extractFromSource('src/routes/+page.svelte', `<script context="module">
+  preload();
+</script>
+<script module>
+  register();
+</script>
+<script>
+  import { onMount } from 'svelte';
+  onMount(() => fetchItems());
+</script>
+<p>items</p>
+`);
+    const component = componentOf(r).id;
+    expect(from(r, 'onMount')).toEqual([component]);
+    expect(from(r, 'preload')).toEqual(['file:src/routes/+page.svelte']);
+    expect(from(r, 'register')).toEqual(['file:src/routes/+page.svelte']);
+  });
+
+  it('gives Astro frontmatter to the component, and makes a file node for a file without one', () => {
+    const r = extractFromSource('src/pages/blog.astro', `---
+const posts = await getCollection('blog');
+---
+<ul>{posts.map((p) => <li>{p.title}</li>)}</ul>
+<script>registerWidget();</script>
+`);
+    expect(from(r, 'getCollection')).toEqual([componentOf(r).id]);
+    expect(from(r, 'registerWidget')).toEqual(['file:src/pages/blog.astro']);
+    const bare = extractFromSource('src/pages/about.astro', `<p>about</p>\n`);
+    expect(bare.nodes.map((n) => n.kind).sort()).toEqual(['component', 'file']);
+  });
+});
diff --git a/__tests__/ui-highlight-bounded.test.ts b/__tests__/ui-highlight-bounded.test.ts
new file mode 100644
index 0000000000..e0d0175a54
--- /dev/null
+++ b/__tests__/ui-highlight-bounded.test.ts
@@ -0,0 +1,24 @@
+import { describe, it, expect, afterAll } from 'vitest';
+import { highlightLines, clearHighlightCache } from '../src/ui-server/highlight';
+import { tokenizeBounded, stopHighlightWorker } from '../src/ui-server/highlight/bounded-tokenize';
+
+afterAll(() => stopHighlightWorker());
+
+describe('highlighting a slice', () => {
+  it('finishes a COBOL slice ending in the sequence area', async () => {
+    clearHighlightCache();
+    const started = Date.now();
+    const slice = await highlightLines(['    PERFORM AssertOk', '    .'], { language: 'cobol' });
+    expect(slice.reason ?? '').not.toMatch(/took too long/);
+    expect(Date.now() - started).toBeLessThan(10_000);
+    const fine = await highlightLines(['export const x: number = 1;'], { language: 'typescript' });
+    expect(fine.engine).toBe('tree-sitter');
+  }, 20_000);
+
+  it('reaps a child past its deadline and classifies the next slice', async () => {
+    await stopHighlightWorker();
+    expect(await tokenizeBounded('export const x = 1;', 'typescript', 0)).toEqual({ timedOut: true });
+    const next = await tokenizeBounded('export const value: number = 1;', 'typescript');
+    expect('result' in next && next.result?.spans.length).toBeGreaterThan(0);
+  });
+});
diff --git a/__tests__/ui-highlight-orderings.test.ts b/__tests__/ui-highlight-orderings.test.ts
new file mode 100644
index 0000000000..997053c850
--- /dev/null
+++ b/__tests__/ui-highlight-orderings.test.ts
@@ -0,0 +1,109 @@
+import { it, expect, vi } from 'vitest';
+
+type Request = { id: number; text: string; language: string };
+type Child = { pid: number; killed: boolean; closed: boolean; sent: Request[]; finish(): void; emit(event: string, ...args: unknown[]): void };
+const state = vi.hoisted(() => ({ children: [] as Child[], nextPid: 1 }));
+vi.mock('fs', () => ({ existsSync: () => true }));
+vi.mock('child_process', async () => {
+  const { EventEmitter } = await import('events');
+  class Child extends EventEmitter {
+    pid = state.nextPid++;
+    killed = false;
+    closed = false;
+    exitCode: number | null = null;
+    signalCode: string | null = null;
+    channel = { unref() {} };
+    sent: Request[] = [];
+    unref() {}
+    ref() {}
+    send(message: Request, callback: (error: Error | null) => void) { this.sent.push(message); callback(null); }
+    kill() { this.killed = true; return true; }
+    finish() { if (this.closed) return; this.closed = true; this.exitCode = 0; this.emit('exit', 0); this.emit('close', 0); }
+  }
+  return { fork: () => { const child = new Child(); state.children.push(child); return child; } };
+});
+import { tokenizeBounded, stopHighlightWorker } from '../src/ui-server/highlight/bounded-tokenize';
+
+type Event = 'request' | 'reply' | 'timeout' | 'stop' | 'old-error' | 'old-close';
+const events: Event[] = ['request', 'reply', 'timeout', 'stop', 'old-error', 'old-close'];
+function sequences(prefix: Event[] = []): Event[][] {
+  if (prefix.length === 4) return [prefix];
+  return [prefix, ...events.flatMap((event) => sequences([...prefix, event]))];
+}
+
+it('isolates child generations and settles requests after every bounded event ordering', async () => {
+  vi.useFakeTimers();
+  const violations: string[] = [];
+  try {
+    for (const sequence of sequences()) {
+      state.children.length = 0;
+      const allowedKills = new Set<number>();
+      const requests: Promise<void>[] = [];
+      const stops: Promise<void>[] = [];
+      let requestCount = 0;
+      const allowCurrent = () => { const child = state.children.at(-1); if (child && !child.closed) allowedKills.add(child.pid); };
+      for (const event of sequence) {
+        if (event === 'request') {
+          const label = `request-${++requestCount}`;
+          requests.push(tokenizeBounded(label, 'typescript', 10).then((result) => {
+            if ('result' in result && result.result && result.result.grammars[0] !== label) violations.push(`${sequence}: wrong reply for ${label}`);
+          }));
+        } else if (event === 'reply') {
+          const child = state.children.at(-1);
+          const message = child?.sent.at(-1);
+          if (message) child!.emit('message', { id: message.id, result: { spans: [], grammars: [message.text] } });
+        } else if (event === 'timeout') {
+          allowCurrent();
+          vi.advanceTimersByTime(10);
+        } else if (event === 'stop') {
+          allowCurrent();
+          stops.push(stopHighlightWorker());
+        } else {
+          const old = state.children.find((child) => child.killed && !child.closed);
+          if (event === 'old-error') old?.emit('error', new Error('old child'));
+          else old?.finish();
+        }
+        await Promise.resolve();
+        for (const child of state.children) if (child.killed && !allowedKills.has(child.pid)) violations.push(`${sequence}: stale event killed child ${child.pid}`);
+      }
+      allowCurrent();
+      stops.push(stopHighlightWorker());
+      for (const child of state.children) child.finish();
+      await Promise.all([...requests, ...stops]);
+      expect(vi.getTimerCount(), sequence.join(' → ')).toBe(0);
+    }
+    expect(violations).toEqual([]);
+  } finally {
+    for (const child of state.children) child.finish();
+    await stopHighlightWorker();
+    vi.useRealTimers();
+  }
+});
+
+
+it.each(['timeout', 'stop'] as const)('keeps a replacement child alive after %s then a stale error', async (event) => {
+  vi.useFakeTimers();
+  try {
+    const first = tokenizeBounded('first', 'typescript', 10);
+    const old = state.children.at(-1)!;
+    const stopping = event === 'stop' ? stopHighlightWorker() : Promise.resolve();
+    if (event === 'timeout') vi.advanceTimersByTime(10);
+    const second = tokenizeBounded('second', 'typescript', 10);
+    const replacement = state.children.at(-1)!;
+    old.emit('error', new Error('stale'));
+    expect(replacement.killed).toBe(false);
+    old.finish();
+    await Promise.all([first, stopping]);
+    const message = replacement.sent[0]!;
+    replacement.emit('message', { id: message.id, result: { spans: [], grammars: ['second'] } });
+    expect(await second).toEqual({ result: { spans: [], grammars: ['second'] } });
+    const finalStop = stopHighlightWorker();
+    replacement.finish();
+    await finalStop;
+  } finally {
+    const cleanup = stopHighlightWorker();
+    for (const child of state.children) child.finish();
+    await cleanup;
+    vi.useRealTimers();
+  }
+});
diff --git a/__tests__/ui-map-api.test.ts b/__tests__/ui-map-api.test.ts
index 75e083162c..fa73d07f4d 100644
--- a/__tests__/ui-map-api.test.ts
+++ b/__tests__/ui-map-api.test.ts
@@ -30,6 +30,7 @@ import {
   pickDefaultDepth,
   passThroughDirs,
   pickDefaultRoot,
+  pickDefaultView,
   resetMapCache,
 } from '../src/ui-server/api/map';
 
@@ -641,3 +642,37 @@ describe('GET /api/map', () => {
     expect(all.modules.map((m: any) => m.id)).not.toEqual(src.modules.map((m: any) => m.id));
   });
 });
+
+describe('the view the map opens on', () => {
+  it('counts files loose in the repository root as program', () => {
+    // git: hundreds of top-level `.c` files beside `builtin/`.
+    expect(
+      pickDefaultRoot([
+        { path: 'git.c', symbols: 60, test: false },
+        { path: 'refs.c', symbols: 50, test: false },
+        { path: 'builtin/add.c', symbols: 40, test: false },
+        { path: 'builtin/commit.c', symbols: 30, test: false },
+      ])
+    ).toBe('');
+  });
+
+  it('opens on the repository when the source folder is one flat folder', () => {
+    // Express: everything under `lib/` sits in `lib/` itself.
+    const files = [
+      ...Array.from({ length: 30 }, (_, i) => ({ path: `lib/f${i}.js`, symbols: 10, test: false })),
+      { path: 'index.js', symbols: 1, test: false },
+      { path: 'benchmarks/run.js', symbols: 3, test: false },
+      { path: 'test/app.js', symbols: 50, test: true },
+    ];
+    expect(pickDefaultView(files)).toEqual({ root: '', depth: 1 });
+  });
+
+  it('keeps a source folder that draws a picture of its own', () => {
+    const files = [
+      { path: 'src/a/x.ts', symbols: 40, test: false },
+      { path: 'src/b/y.ts', symbols: 40, test: false },
+      { path: 'scripts/z.ts', symbols: 2, test: false },
+    ];
+    expect(pickDefaultView(files).root).toBe('src');
+  });
+});
diff --git a/codegraph-kernel/grammars/PROVENANCE.md b/codegraph-kernel/grammars/PROVENANCE.md
index 8bbc3d862e..cd4686b159 100644
--- a/codegraph-kernel/grammars/PROVENANCE.md
+++ b/codegraph-kernel/grammars/PROVENANCE.md
@@ -19,3 +19,8 @@ Phase 4 notes record the kind-table drift.
 | objc | npm tree-sitter-objc 2.1.0 (the revision tree-sitter-wasms 0.1.13 built; wasm sha 7c1b5bfdca7e64b6…) | package `src/` | ABI 14; replaces the crates.io 3.0.2 pin (35 kinds differed) |
 | solidity | JoranHonig/tree-sitter-solidity | b239a95f (the revision tree-sitter-wasms 0.1.13 pinned) | ABI 14; replaces the crates.io 1.2.13 pin (39 kinds differed) |
 | cfml, cfscript, cfquery, cfml-common | cfmleditor/tree-sitter-cfml | a224ff10 (2026-06-30, the last commit before the 2026-07-02 vendoring) | three grammars sharing `common/scanner.h` + `tag.h` (include paths rewritten to `../cfml-common/`); ABI 15 |
+
+The COBOL scanner also supports the `CGWIDE` sequence-area sentinel for
+preprocessed free-format source. Its sequence-area loop stops at EOF and
+CR/LF boundaries, so a short final line cannot spin at EOF or consume the
+next line. A boundary with no consumed sequence-area text returns no token.
diff --git a/codegraph-kernel/grammars/cobol/scanner.c b/codegraph-kernel/grammars/cobol/scanner.c
index 86e3d7e70c..4c4d74a676 100644
--- a/codegraph-kernel/grammars/cobol/scanner.c
+++ b/codegraph-kernel/grammars/cobol/scanner.c
@@ -129,8 +129,10 @@ bool tree_sitter_COBOL_external_scanner_scan(void *payload, TSLexer *lexer,
     if(valid_symbols[LINE_PREFIX_COMMENT] && lexer->get_column(lexer) <= 5) {
         // The sequence area is ignored content — but the free-format
         // preprocessor plants the CGWIDE sentinel here on the first line.
+        const unsigned start_column = lexer->get_column(lexer);
         int match = 0;
-        while(lexer->get_column(lexer) <= 5) {
+        while(lexer->get_column(lexer) <= 5 && !lexer->eof(lexer) &&
+              lexer->lookahead != '\n' && lexer->lookahead != '\r') {
             if(match >= 0 && match < 6 && lexer->lookahead == CG_WIDE_SENTINEL[match]) {
                 match++;
             } else {
@@ -138,6 +140,9 @@ bool tree_sitter_COBOL_external_scanner_scan(void *payload, TSLexer *lexer,
             }
             lexer->advance(lexer, true);
         }
+        if(lexer->get_column(lexer) == start_column) {
+            return false;
+        }
         if(match == 6 && wide) {
             *wide = 1;
         }
diff --git a/codegraph-kernel/src/resolve/imports.rs b/codegraph-kernel/src/resolve/imports.rs
index 2e6621393a..a546125e85 100644
--- a/codegraph-kernel/src/resolve/imports.rs
+++ b/codegraph-kernel/src/resolve/imports.rs
@@ -643,35 +643,23 @@ impl KernelResolver {
         if is_nix_path_import_ref(r) {
             return self.resolve_import_path_to_file_node(r);
         }
-        // TS/JS path-shaped `imports` ref whose referenceName IS the module
-        // specifier — the module ref of `import … from './x'` or a dynamic
-        // `import('./x')` call site. Resolve the specifier (extension- and
-        // alias-aware) straight to the file node like the c/cpp include arm:
-        // name-match would bind the file's own `import` STATEMENT node —
-        // `./cmd.config` literally matches that node's name — or a same-named
-        // file elsewhere. Needs no binding rows, so it precedes the empty-
-        // imports early return, mirroring the TS-side arm's position ahead of
-        // the mappings lookup (import-resolver.ts resolveViaImport).
-        if r.reference_kind == "imports"
-            && is_esm_import_language(&r.language)
-            && r.reference_name.contains('/')
-        {
-            if let Some(resolved) =
+        // Module-path imports resolve to the exact indexed file or nothing,
+        // including extensionless CommonJS paths and configured aliases.
+        if is_js_path_import_ref(r) {
+            let Some(resolved) =
                 self.resolve_import_path(&r.reference_name, &r.file_path, &r.language)?
-            {
-                if let Some(file_node) = self
-                    .nodes_in_file(&resolved)?
-                    .iter()
-                    .find(|n| n.kind == "file")
-                    .cloned()
-                {
-                    return Ok(Some(KCand {
-                        node: file_node,
-                        confidence: 0.9,
-                        resolved_by: "import",
-                    }));
-                }
+            else {
+                return Ok(None);
+            };
+            if resolved == r.file_path {
+                return Ok(None);
             }
+            return Ok(self
+                .nodes_in_file(&resolved)?
+                .iter()
+                .find(|n| n.kind == "file")
+                .cloned()
+                .map(|node| KCand { node, confidence: 0.9, resolved_by: "import" }));
         }
         let imports = self.import_mappings(&r.file_path)?;
         if imports.is_empty() && self.read_file(&r.file_path).is_none() {
diff --git a/codegraph-kernel/src/resolve/pipeline.rs b/codegraph-kernel/src/resolve/pipeline.rs
index 329ac58449..875605ae3f 100644
--- a/codegraph-kernel/src/resolve/pipeline.rs
+++ b/codegraph-kernel/src/resolve/pipeline.rs
@@ -178,6 +178,7 @@ impl KernelResolver {
             &r.reference_name
         };
         let pre_pass = probe!(r, "pre-pass", is_nix_path_import_ref(r)
+            || is_js_path_import_ref(r)
             || self.has_any_possible_match_in(existence, &r.language)
             || self.matches_any_import(r)?
             || self.framework_claims(&r.reference_name));
diff --git a/codegraph-kernel/src/resolve/tables.rs b/codegraph-kernel/src/resolve/tables.rs
index d46919181f..114cb6be82 100644
--- a/codegraph-kernel/src/resolve/tables.rs
+++ b/codegraph-kernel/src/resolve/tables.rs
@@ -364,7 +364,7 @@ pub(super) fn framework_claims_reference(framework: &str, name: &str) -> bool {
                 || angular_lazy_re().is_match(name)
         }
         "astro" => {
-            name == "astro-page-component" || name.starts_with("astro-href:") || name == "Astro.redirect"
+            name.starts_with("page-component:") || name.starts_with("astro-href:") || name == "Astro.redirect"
         }
         "cics" => name.starts_with("cics-transid:"),
         "django" => name == "_iterable_class" || name.ends_with(".urls"),
@@ -394,7 +394,7 @@ pub(super) fn framework_claims_reference(framework: &str, name: &str) -> bool {
         "vue-router" => {
             vue_nav_re().is_match(name) || name.starts_with("import:") || name.starts_with("layout:")
         }
-        "vue" => name.starts_with("nuxt-page:"),
+        "vue" => name.starts_with("page-component:"),
         "aspnet" | "express" | "expo-modules" | "expo-modules-js" | "fabric-view" | "fastapi" | "flask"
         | "go" | "goframe" | "http-routing" | "nestjs" | "nuxt" | "react-router-files" | "redwood"
         | "rust" | "svelte"
@@ -505,12 +505,27 @@ pub(super) fn is_nix_path_import_ref(r: &ResolveRefIn) -> bool {
         && !r.reference_name.chars().any(|c| c.is_whitespace() || "{}()[];\"'<>$".contains(c))
 }
 
+/// A JS-family module path names a file, never an imported symbol. Bare
+/// packages keep their existing import handling; slash paths and `#`
+/// specifiers retain the external-package and configured-alias checks.
+pub(super) fn is_js_path_import_ref(r: &ResolveRefIn) -> bool {
+    let name = r.reference_name.as_str();
+    r.reference_kind == "imports"
+        && is_esm_import_language(&r.language)
+        && (name.starts_with("./")
+            || name.starts_with("../")
+            || name == "."
+            || name == ".."
+            || name.starts_with('#')
+            || name.contains('/'))
+}
+
 /// resolveOneInner's import-only refs: a PHP include path, a COBOL copybook,
-/// a Nix path import or any Terraform ref resolves through the import arm
+/// a Nix or JS module path import, or any Terraform ref, resolves through the import arm
 /// (and frameworks) only — a name match would bind an unrelated same-named
 /// file or cross a module boundary Terraform forbids.
 pub(super) fn is_import_only_ref(r: &ResolveRefIn) -> bool {
-    is_php_include_path_ref(r) || is_cobol_copybook_ref(r) || is_nix_path_import_ref(r) || r.language == "terraform"
+    is_php_include_path_ref(r) || is_cobol_copybook_ref(r) || is_nix_path_import_ref(r) || is_js_path_import_ref(r) || r.language == "terraform"
 }
 
 /// isPhpIncludePathRef (import-resolver.ts): a PHP `imports` ref shaped like
diff --git a/codegraph-kernel/src/tree.rs b/codegraph-kernel/src/tree.rs
index 3825a3c60b..6ef348724c 100644
--- a/codegraph-kernel/src/tree.rs
+++ b/codegraph-kernel/src/tree.rs
@@ -59,7 +59,8 @@
 
 use napi::bindgen_prelude::*;
 use napi_derive::napi;
-use tree_sitter::{Node, Parser};
+use std::time::{Duration, Instant};
+use tree_sitter::{Node, ParseOptions, Parser};
 
 use crate::langs::grammar_for;
 
@@ -115,6 +116,10 @@ struct Row {
 
 /// Parse with this thread's parser for `language` (created on first use).
 pub(crate) fn parse_with_cached_parser(content: &str, language: &str) -> Result<tree_sitter::Tree> {
+    parse_with_cached_parser_budget(content, language, None)
+}
+
+fn parse_with_cached_parser_budget(content: &str, language: &str, budget_ms: Option<u32>) -> Result<tree_sitter::Tree> {
     // One parser per language per thread: read-time callers parse many small
     // files in a row, and Parser::new + set_language per call was measurable
     // against a sub-millisecond parse.
@@ -132,14 +137,41 @@ pub(crate) fn parse_with_cached_parser(content: &str, language: &str) -> Result<
                 v.insert(parser)
             }
         };
-        parser
-            .parse(content, None)
-            .ok_or_else(|| Error::from_reason("parser returned null tree".to_string()))
+        let tree = if let Some(ms) = budget_ms {
+            if ms == 0 {
+                return Err(Error::from_reason("parse budget exceeded"));
+            }
+            let started = Instant::now();
+            let budget = Duration::from_millis(u64::from(ms));
+            let mut cancelled = false;
+            let mut progress = |_: &tree_sitter::ParseState| {
+                cancelled = started.elapsed() >= budget;
+                cancelled
+            };
+            let bytes = content.as_bytes();
+            let tree = parser.parse_with_options(
+                &mut |offset, _| bytes.get(offset..).unwrap_or_default(),
+                None,
+                Some(ParseOptions::new().progress_callback(&mut progress)),
+            );
+            if tree.is_none() {
+                // Cancellation leaves resumable state in the cached parser.
+                // The next request must start from its own source instead.
+                parser.reset();
+                if cancelled {
+                    return Err(Error::from_reason("parse budget exceeded"));
+                }
+            }
+            tree
+        } else {
+            parser.parse(content, None)
+        };
+        tree.ok_or_else(|| Error::from_reason("parser returned null tree".to_string()))
     })
 }
 
-fn parse_tree_inner(content: &str, language: &str) -> Result<TreeBuffers> {
-    let tree = parse_with_cached_parser(content, language)?;
+fn parse_tree_inner(content: &str, language: &str, budget_ms: Option<u32>) -> Result<TreeBuffers> {
+    let tree = parse_with_cached_parser_budget(content, language, budget_ms)?;
 
     // ASCII: byte offsets ARE UTF-16 offsets and tree-sitter's byte columns
     // are code-unit columns. Only a non-ASCII file pays for the prefix table.
@@ -330,7 +362,9 @@ pub fn tree_names(language: String) -> Option<TreeNames> {
 /// Parse `content` with the native grammar for `language` and return the
 /// whole tree. The walk is a cursor loop, not recursion, so deep nesting
 /// needs no stack guard; a missing grammar surfaces as a napi error.
+/// An optional request budget cancels parsing at progress callbacks. It does
+/// not interrupt external scanners or bound tree serialization.
 #[napi]
-pub fn parse_tree(content: String, language: String) -> Result<TreeBuffers> {
-    parse_tree_inner(&content, &language)
+pub fn parse_tree(content: String, language: String, budget_ms: Option<u32>) -> Result<TreeBuffers> {
+    parse_tree_inner(&content, &language, budget_ms)
 }
diff --git a/docs/design/framework-coverage.md b/docs/design/framework-coverage.md
index 045b430771..31ce8e0189 100644
--- a/docs/design/framework-coverage.md
+++ b/docs/design/framework-coverage.md
@@ -132,13 +132,15 @@ direct calls from inline handlers. They do not add Screens navigation.
 `http-routing.test.ts` covers all nine through full indexing and imported-handler
 resolution, as well as false-positive controls, prefixes and same-file mounts.
 
-Nuxt file routing in `frameworks/vue.ts` now includes root index pages, `index`
-folders anywhere in the path, a `calls` link from each page route to its own
-file's component (a `nuxt-page:` reference, since every `index.vue` shares a
-name), Nuxt 4 route groups, server method suffixes, `server/routes/` and server catch-all
-segments. `nuxt-routes.test.ts` checks extraction and imported-handler resolution;
-the existing Next Pages/App Router and Vue navigation tests remain controls.
-This update does not re-verify the older coverage rows above.
+Nuxt file routing in `frameworks/vue.ts` includes root index pages, `index`
+folders anywhere in the path, Nuxt 4 route groups, server method suffixes,
+`server/routes/` and server catch-all segments. Each page route calls the component
+extracted from the same file. `page-component.ts` resolves that exact file's
+component, including scriptless pages, without choosing a same-named component
+elsewhere. Astro pages use the same call contract. `nuxt-routes.test.ts` checks
+extraction and imported-handler resolution; the existing Next Pages/App Router
+and Vue navigation tests remain controls. The older coverage rows above retain
+their recorded measurements.
 
 Untouched official source checks (routes and indexing, no application execution):
 
@@ -412,3 +414,26 @@ Interface dispatch synthesis links supported base methods to concrete overrides.
 ### Express inline handler bodies
 
 Express uses the last registration argument as the handler, excluding a trailing comma. Inline arrows and function expressions contribute their body calls, including handlers inside wrapper calls and chained `router.route(path)` registrations. An earlier inline middleware does not replace a named final handler. Regression coverage is in `__tests__/express-inline-function-handler.test.ts`.
+
+
+### Single-file component ownership
+
+`extraction/sfc-script.ts` folds Vue, Svelte and Astro script results into one
+whole-file node containing the component. Top-level script members have the
+component as their only parent; nested symbols retain their script parent. Vue
+`<script setup>`, Svelte instance scripts and Astro frontmatter
+assign top-level calls and references, including constant initializers, to the
+component. Imports, module-level execution and Astro browser scripts remain with the file. Svelte
+recognizes `context="module"` and `<script module>`. The native embedded-block
+seam preserves literal metadata and rebases binding scopes and lines to full-file
+positions. `sfc-component-owns-script.test.ts` covers hierarchy and execution
+ownership.
+
+### Rails resource action filters
+
+`frameworks/ruby.ts` reads literal `only:` and `except:` action filters for both
+`resources` and `resource`. Supported forms are symbol/string arrays, a single
+symbol or string, `%i`/`%w` lists with brackets or parentheses, and hash-rocket
+options such as `:only => [:index, :show]`. These filters restrict which REST
+actions receive routes; namespaces, scopes, nested resources and member/collection
+blocks keep their existing path and controller rules.
diff --git a/docs/viewer-launch-changelog.md b/docs/viewer-launch-changelog.md
index 8d2864db25..370cb46894 100644
--- a/docs/viewer-launch-changelog.md
+++ b/docs/viewer-launch-changelog.md
@@ -125,6 +125,8 @@ These describe `codegraph ui` and its screens. They were taken out of `## [Unrel
 
 ## Fixes — Screens, links and navigation
 
+- **Routes served by a component are listed.** Entry points and the Steps picker listed a route only when a function, method or class served it. A Vue Router, Nuxt, Svelte or Astro screen is served by a component, so those apps' routes weren't listed at all. They are now, each with the component that serves it.
+
 - **Where the app goes after login is a fork, not two always-es.** A navigation whose destination comes back from a helper — `router.replace(await resolvePostLoginRoute())` over `return (await hasSeenWelcome(…)) ? '/home/' : '/welcome/'` — drew both screens with no condition, reading as if the welcome screen always shows. The two arms share a line, and only a column can tell them apart; each synthesized edge now carries its literal's own position, so the guard reader says which arm it is: `WHEN await hasSeenWelcome(…)` → home, and its negation → welcome. And the scan starts at the helper's body, so a literal-union return type — `Promise<'/welcome/' | '/home/'>`, whose routes are string literals too, written first — no longer stands in for the navigation itself. Re-index after upgrading to pick the positions up.
 
 - **A screen that talks to native code keeps its own navigations.** In a React Native or Expo app, a `router.push` written inside a listener for a native event was credited to whichever screen had *started* that round trip, not to the screen the push is written on. In one app that moved seven transitions off the capture screen and onto the review screen it opens — leaving the review screen looking as though nothing in the app could reach it, stranded in the "no transition reaches this" band at the bottom of the Screens tab, and printing Swift conditions like `Thread.isMainThread` on a JavaScript navigation. A navigation now belongs to the screen whose file it is written in; an event arriving from native code, from an HTTP call or off a queue is no longer read backwards as if it were a caller.
@@ -171,6 +173,12 @@ These describe `codegraph ui` and its screens. They were taken out of `## [Unrel
 
 ## Fixes — Symbols, tests and the viewer
 
+- **A slow file cannot freeze the viewer.** Highlighting runs in a child process that is stopped when its deadline expires; the file is shown without highlighting while other requests remain available. Native request parses also have a cooperative time budget. The COBOL scanner handles a short sequence-area line at end of input, including `    .`.
+
+- **The Map opens on a picture, not a single box.** A project whose code sits in one flat folder, like Express's `lib/`, an R package's `R/`, an Erlang app's `src/` or fmt's `include/fmt/`, opened as one box with nothing to say. It now opens on the whole repository when that draws more. Files at the repository's top level also count when the Map picks where the program lives: git's hundreds of top-level `.c` files had made `builtin/` look like most of the code.
+
+- **A Flow between two symbols finds names of any shape.** A Flow opened from a Steps link, an entry point or the search box names its two ends by the symbols' own names, and names that don't look like plain identifiers were dropped: an Objective-C selector like `initWithFrame:`, a Ruby method like `save!` or `valid?`, and any name shorter than three letters, like `ok`. The strip then said the other end "names nothing in this index", even though it was there. Both ends are now looked up exactly as written.
+
 - **Entry points and the Symbol view no longer go blank.** The Symbol view of every Vue, Svelte and Astro component stayed on "Loading…", because its member list held the component's script symbols twice, along with the component and its file. Entry points went blank on apps with inline route handlers like `app.get('/x', async (c) => { … })`, which came back once per call in the handler, each call listed as if it were the handler. Each member is now listed once, and each route is one row: the handler it is bound to, or "inline handler" when the handler is written at the registration.
 
 - **Entry points' most-depended-on list shows your code, not a vendored bundle's.** A minified library or bundled docs script (`n`, `t`, `Buffer` with thousands of callers, all from inside the bundle) could top the list. Symbols in generated files are now left out of it, like test files.
diff --git a/scripts/check-highlight-lifecycle.cjs b/scripts/check-highlight-lifecycle.cjs
new file mode 100644
index 0000000000..96e3f0bf3c
--- /dev/null
+++ b/scripts/check-highlight-lifecycle.cjs
@@ -0,0 +1,70 @@
+#!/usr/bin/env node
+/** Verify the production process adapter on the current OS without loading native grammars. */
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+const { execFileSync } = require('node:child_process');
+const ts = require('typescript');
+
+const root = fs.mkdtempSync(path.join(os.tmpdir(), 'codegraph-highlight-lifecycle-'));
+let completed = false;
+try {
+  const source = fs.readFileSync(path.join(__dirname, '../src/ui-server/highlight/bounded-tokenize.ts'), 'utf8');
+  const output = ts.transpileModule(source, { compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 } }).outputText;
+  fs.writeFileSync(path.join(root, 'bounded-tokenize.js'), output);
+  fs.writeFileSync(path.join(root, 'tokenize-worker.js'), `
+const fs = require('node:fs');
+const path = require('node:path');
+process.on('message', message => {
+  fs.appendFileSync(path.join(__dirname, 'children.jsonl'), JSON.stringify({ pid: process.pid, text: message.text }) + '\\n');
+  if (message.text === 'busy') { while (true) {} }
+  process.send({ id: message.id, result: { spans: [], grammars: [message.text] } });
+});
+process.on('disconnect', () => process.exit(0));
+`);
+  fs.writeFileSync(path.join(root, 'probe.cjs'), `
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const { tokenizeBounded, stopHighlightWorker } = require('./bounded-tokenize.js');
+(async () => {
+  const stalled = tokenizeBounded('busy', 'typescript', 1500);
+  const queued = tokenizeBounded('queued', 'typescript', 1500);
+  assert.deepEqual(await stalled, { timedOut: true });
+  assert.deepEqual(await queued, { timedOut: true });
+  const first = JSON.parse(fs.readFileSync(path.join(__dirname, 'children.jsonl'), 'utf8').trim().split('\\n')[0]);
+  assert.equal(first.text, 'busy');
+  assert.throws(() => process.kill(first.pid, 0), error => error.code === 'ESRCH');
+  assert.deepEqual(await tokenizeBounded('fresh', 'typescript', 1500), { result: { spans: [], grammars: ['fresh'] } });
+  const last = JSON.parse(fs.readFileSync(path.join(__dirname, 'children.jsonl'), 'utf8').trim().split('\\n').at(-1));
+  assert.notEqual(last.pid, first.pid);
+  await stopHighlightWorker();
+  assert.throws(() => process.kill(last.pid, 0), error => error.code === 'ESRCH');
+  console.log(JSON.stringify({ platform: process.platform, node: process.version, timedOutAndQueuedSettled: true, restarted: true, shutdownReaped: true }));
+})().catch(async error => {
+  console.error(error);
+  await stopHighlightWorker();
+  process.exitCode = 1;
+});
+`);
+  // The supervisor checks a completion marker: an unreferenced child must not let
+  // the probe exit successfully before its awaited teardown has finished.
+  const stdout = execFileSync(process.execPath, [path.join(root, 'probe.cjs')], { encoding: 'utf8', timeout: 15_000 });
+  const result = JSON.parse(stdout.trim());
+  assert.equal(result.platform, process.platform);
+  assert.equal(result.timedOutAndQueuedSettled, true);
+  assert.equal(result.restarted, true);
+  assert.equal(result.shutdownReaped, true);
+  console.log(JSON.stringify(result));
+  completed = true;
+} finally {
+  const children = path.join(root, 'children.jsonl');
+  if (!completed && fs.existsSync(children)) {
+    for (const line of fs.readFileSync(children, 'utf8').trim().split('\n').filter(Boolean)) {
+      const { pid } = JSON.parse(line);
+      try { process.kill(pid, 'SIGKILL'); } catch (error) { if (error.code !== 'ESRCH') throw error; }
+    }
+  }
+  fs.rmSync(root, { recursive: true, force: true, maxRetries: 5 });
+}
diff --git a/site/src/content/docs/guides/framework-routes.md b/site/src/content/docs/guides/framework-routes.md
index b2057fe110..a0990e40b4 100644
--- a/site/src/content/docs/guides/framework-routes.md
+++ b/site/src/content/docs/guides/framework-routes.md
@@ -23,7 +23,7 @@ CodeGraph detects web-framework routing files and emits `route` nodes linked by
 | **NestJS** | `@Controller` + `@Get/@Post/...` (with `RouterModule` prefixes, `setGlobalPrefix` and URI versioning), GraphQL `@Resolver` + `@Query/@Mutation`, `@MessagePattern`/`@EventPattern`, `@SubscribeMessage` |
 | **Laravel** | `Route::get()`, `Route::resource()`, `Controller@action`, tuple syntax; `Route::prefix()` and group prefixes, and the `/api` mount of `routes/api.php` |
 | **Drupal** | `*.routing.yml` routes (`_controller`, `_form`, entity handlers); `hook_*` implementations in `.module`/`.theme`/`.install`/`.inc` |
-| **Rails** | `get '/x', to: 'users#index'`, hash-rocket `=>` syntax, `resources` / `resource`, and the paths and controller modules of `namespace`, `scope`, nested resources and `member` / `collection` blocks; a Rails engine's `config/routes.rb` too |
+| **Rails** | `get '/x', to: 'users#index'`, hash-rocket `=>` syntax, `resources` / `resource` with literal `only:` / `except:` action filters, and the paths and controller modules of `namespace`, `scope`, nested resources and `member` / `collection` blocks; a Rails engine's `config/routes.rb` too |
 | **Spring** | `@GetMapping`, `@PostMapping`, `@RequestMapping` on methods |
 | **Play** | `GET`/`POST`/… verb routes in `conf/routes` → `Controller.method` actions (Scala + Java), including projects kept in subdirectories |
 | **Gin / chi / gorilla / mux** | `r.GET(...)`, `router.HandleFunc(...)` |
@@ -35,8 +35,8 @@ CodeGraph detects web-framework routing files and emits `route` nodes linked by
 | **TanStack Router / Start** | Page routes plus literal `server.handlers` method tables and `createHandlers` callbacks on exported file routes; middleware is excluded from handler links |
 | **Next.js** | App Router and Pages Router pages; `app/api/**/route.ts` method exports and `pages/api/**` default handlers |
 | **Expo Router** | `app/` screen files linked to their default-export components; `+api` files' method exports as endpoints (`GET /hello`). In a monorepo, each file-based router reads only the app whose `package.json` declares it |
-| **Vue Router** / **Nuxt** | Vue route tables, named or split across module files (`export const constantRoutes = [...]`, `new Router(...)`), with nested `children` joined onto their parent's path and linked to the parent's layout component, and lazy `() => import(…)` views linked to the file they import; in a Nuxt app, `.vue` pages in `pages/` or Nuxt 4 `app/pages/`, each linked to its page component, with `index` folders, dynamic/optional/catch-all segments and route groups; `server/api/` and `server/routes/` with method suffixes; route middleware |
-| **Astro** | `src/pages/` `.astro` pages linked to components; `.ts`/`.js` HTTP-method exports linked to handlers; anchors and `Astro.redirect` link to local pages |
+| **Vue Router** / **Nuxt** | Vue route tables, named or split across module files (`export const constantRoutes = [...]`, `new Router(...)`), with nested `children` joined onto their parent's path and linked to the parent's layout component, and lazy `() => import(…)` views linked to the file they import; in a Nuxt app, `.vue` pages in `pages/` or Nuxt 4 `app/pages/`, each calling its own file's page component, with `index` folders, dynamic/optional/catch-all segments and route groups; `server/api/` and `server/routes/` with method suffixes; route middleware |
+| **Astro** | `src/pages/` `.astro` pages calling their own file's components; `.ts`/`.js` HTTP-method exports linked to handlers; anchors and `Astro.redirect` link to local pages |
 | **RedwoodSDK** | Registered `defineApp` trees with `route`, `index`, `render`, `layout`, `prefix` and standard method tables; exact handlers and JSX page classification |
 | **Angular Router** | `Routes` arrays (`RouterModule.forRoot` / `forChild`, `provideRouter`, a routes file's default export), including routes in Nx workspace libraries reached through barrel files, nested children, lazy `loadComponent` / `loadChildren` (an NgModule's through its routing module, a barrel in front of it, or the routes file it imports), route-constant and `$localize` paths; navigation from `router.navigate`, `navigateByUrl`, `createUrlTree`, `routerLink` and `redirectTo` |
 | **Analog** | Registered default `src/app/pages/**/*.page.ts` pages, linked to named default classes; directory layouts, dot paths, index/pathless segments and parameters |
@@ -66,6 +66,10 @@ Angular reads a routes array where it is declared: typed `Routes` / `Route[]`, h
 
 RedwoodSDK handler arrays use the final handler as the route root. A route stays `ANY /path` until its handler is shown to return JSX. Cross-file route arrays, custom methods, mutations, dynamic paths, ambiguous method tables and wrapped/anonymous exported components remain unsupported.
 
+Nuxt and Astro page routes call the component extracted from the same file, including pages without scripts. Instance-level script calls belong to that component, so a route can reach work done in Vue `<script setup>` or Astro frontmatter.
+
+Rails `resources` and `resource` accept literal `only:` and `except:` action filters as symbol/string arrays, a single symbol or string, and `%i`/`%w` lists using brackets or parentheses. Hash-rocket options such as `:only => [:index, :show]` are supported.
+
 Astro supports default roots, `[param]`/`[...rest]` filenames and exported handlers, including `ALL` as `ANY`. Type-only exports, underscore-prefixed paths and `.mjs` endpoints are excluded. Custom routing configuration, Markdown/MDX, cross-file re-exports, client transition calls and navigation to rest routes remain unsupported.
 
 React Router framework mode assumes the default `app/` directory. Computed arrays, custom app directories, `relative` helpers, anonymous defaults, and re-exports remain unsupported. Layout helpers contribute nesting without creating extra pages; an index page takes precedence over its parent layout.
diff --git a/site/src/content/docs/reference/languages.md b/site/src/content/docs/reference/languages.md
index 8ee019d0b7..d5e96649b5 100644
--- a/site/src/content/docs/reference/languages.md
+++ b/site/src/content/docs/reference/languages.md
@@ -23,9 +23,9 @@ Language support is automatic from the file extension — there's nothing to con
 | Kotlin | `.kt`, `.kts` | Full support |
 | Scala | `.scala`, `.sc` | Full support (classes, traits, objects, methods, type aliases, Scala 3 enums) |
 | Dart | `.dart` | Full support |
-| Svelte | `.svelte` | Full support (script extraction, Svelte 5 runes, SvelteKit routes) |
-| Vue | `.vue` | Full support (script + script-setup, Options API methods, computed properties, watchers and lifecycle hooks, Nuxt page/API/middleware routes) |
-| Astro | `.astro` | Full support (frontmatter + script extraction, template component/call references, `src/pages/` routes) |
+| Svelte | `.svelte` | Full support (instance and module script extraction, Svelte 5 runes, SvelteKit routes) |
+| Vue | `.vue` | Full support (script + script-setup with component ownership, Options API methods, computed properties, watchers and lifecycle hooks, Nuxt page/API/middleware routes) |
+| Astro | `.astro` | Full support (component-owned frontmatter + browser-script extraction, template component/call references, `src/pages/` routes) |
 | Liquid | `.liquid` | Full support |
 | Pascal / Delphi | `.pas`, `.dpr`, `.dpk`, `.lpr` | Full support (classes, records, interfaces, enums, DFM/FMX forms) |
 | Lua | `.lua` | Full support (functions, methods, locals, `require` imports, call edges) |
@@ -33,6 +33,8 @@ Language support is automatic from the file extension — there's nothing to con
 | Luau | `.luau` | Full support (Lua, plus typed signatures, `type` aliases, Roblox `require`) |
 | Markdown | `.md`, `.mdx`, `.markdown` | Documentation structure (headings, sections, local links, selected table rows/list items, shell command references) |
 
+Vue, Svelte and Astro files have one file node containing their component. Top-level script members belong to that component, while nested symbols retain their own parents. Vue `<script setup>`, Svelte instance scripts and Astro frontmatter assign top-level execution, including constant initializers, to the component. Imports, module-level execution and Astro browser scripts remain with the file. Svelte recognizes both `context="module"` and `<script module>`.
+
 Markdown files use a dedicated documentation extractor. `.mdx` files receive the same documentation indexing; embedded JSX and JavaScript are not parsed as MDX code.
 
 JavaScript files with a Flow pragma use the TSX grammar after Flow-only syntax is blanked, preserving source locations.
@@ -49,7 +51,11 @@ Calls through class names follow inherited class methods in Python, Pascal, Ruby
 
 Lua local aliases can call a function exported by a required project module, including a renamed field and bounded module re-exports. The returned module table determines its exported fields. Standard-library aliases, external modules and out-of-scope locals do not become project calls.
 
-CommonJS calls follow explicit `module.exports` defaults, module forwarding, destructured bindings and `require('./module').member` aliases. Namespace re-exports such as `export * as core` expose members through their namespace, including nested namespaces, without exposing those members as flat wildcard exports.
+CommonJS calls follow explicit `module.exports` defaults, module forwarding, destructured bindings and `require('./module').member` aliases.
+
+Literal local `require` calls create file dependencies even when used for side effects or inside functions. Computed specifiers, external packages and a locally shadowed `require` do not create these dependencies.
+
+Namespace re-exports such as `export * as core` expose members through their namespace, including nested namespaces, without exposing those members as flat wildcard exports.
 
 C++ access macros and conditionals inside declarations preserve class members. A normalized mid-declaration conditional indexes its first branch and preserves source locations.
 
diff --git a/src/db/queries.ts b/src/db/queries.ts
index 32f0fa3cb7..761f710143 100644
--- a/src/db/queries.ts
+++ b/src/db/queries.ts
@@ -1354,7 +1354,8 @@ export class QueryBuilder {
     if (!this.stmts.getRoutingManifest) {
       // Edge kind varies across framework resolvers: Spring/Rails/
       // Laravel/Drupal emit `references`, Express emits `calls`. Accept
-      // both — the semantic is the same (route → its handler).
+      // both — the semantic is the same (route → its handler). A screen in
+      // a Vue / Svelte / Astro app is served by a `component`.
       this.stmts.getRoutingManifest = this.db.prepare(`
         SELECT
           r.name AS url,
@@ -1370,7 +1371,7 @@ export class QueryBuilder {
         JOIN nodes h ON e.target = h.id
         WHERE r.kind = 'route'
           AND e.kind IN ('references', 'calls')
-          AND h.kind IN ('function', 'method', 'class', 'constant', 'variable')
+          AND h.kind IN ('function', 'method', 'class', 'constant', 'variable', 'component')
         ORDER BY r.file_path, r.start_line
         LIMIT ?
       `);
diff --git a/src/extraction/astro-extractor.ts b/src/extraction/astro-extractor.ts
index 53a0c47348..83c9da465b 100644
--- a/src/extraction/astro-extractor.ts
+++ b/src/extraction/astro-extractor.ts
@@ -2,6 +2,7 @@ import { Binding, Node, Edge, ExtractionResult, ExtractionError, UnresolvedRefer
 import { generateNodeId } from './tree-sitter-helpers';
 import { extractEmbeddedBlock } from './block-extract';
 import { isLanguageSupported } from './grammars';
+import { foldScriptResult, sfcFileNode } from './sfc-script';
 
 /**
  * Astro built-in components — compiler-provided (`<Fragment>`) or shipped by
@@ -47,8 +48,9 @@ export class AstroExtractor {
     const startTime = Date.now();
 
     try {
-      // Create component node for the .astro file itself
+      this.nodes.push(sfcFileNode(this.filePath, this.source, 'astro'));
       const componentNode = this.createComponentNode();
+      this.edges.push({ source: `file:${this.filePath}`, target: componentNode.id, kind: 'contains' });
 
       // Extract and process the frontmatter block (--- fenced, TypeScript)
       const frontmatter = this.extractFrontmatter();
@@ -198,59 +200,14 @@ export class AstroExtractor {
       return;
     }
 
-    // Kernel first, wasm fallback (block-extract.ts)
+    // The embedded-block seam preserves native extraction and literal metadata.
     const result = extractEmbeddedBlock(this.filePath, block.content, 'typescript');
 
-    // Offset line numbers from the block back to .astro file positions
-    for (const node of result.nodes) {
-      node.startLine += block.startLine;
-      node.endLine += block.startLine;
-      node.language = 'astro'; // Mark as astro, not TS
-
-      this.nodes.push(node);
-
-      // Add containment edge from component to this node
-      this.edges.push({
-        source: componentNodeId,
-        target: node.id,
-        kind: 'contains',
-      });
-    }
-
-    // Offset edges (they reference line numbers)
-    for (const edge of result.edges) {
-      if (edge.line) {
-        edge.line += block.startLine;
-      }
-      this.edges.push(edge);
-    }
-
-    // Offset unresolved references
-    for (const ref of result.unresolvedReferences) {
-      ref.line += block.startLine;
-      ref.filePath = this.filePath;
-      ref.language = 'astro';
-      this.unresolvedReferences.push(ref);
-    }
-
-    // Offset binding rows (scopes and lines are block-relative)
-    for (const b of result.bindings ?? []) {
-      this.bindings.push({
-        ...b,
-        filePath: this.filePath,
-        scopeStart: b.scopeStart + block.startLine,
-        scopeEnd: b.scopeEnd + block.startLine,
-        line: b.line + block.startLine,
-      });
-    }
-
-    // Carry over errors
-    for (const error of result.errors) {
-      if (error.line) {
-        error.line += block.startLine;
-      }
-      this.errors.push(error);
-    }
+    foldScriptResult(
+      result,
+      { filePath: this.filePath, componentNodeId, lineOffset: block.startLine, language: 'astro', perInstance: label === 'frontmatter' },
+      { nodes: this.nodes, edges: this.edges, unresolvedReferences: this.unresolvedReferences, errors: this.errors, bindings: this.bindings }
+    );
   }
 
   /**
diff --git a/src/extraction/commonjs-requires.ts b/src/extraction/commonjs-requires.ts
new file mode 100644
index 0000000000..b3c764024c
--- /dev/null
+++ b/src/extraction/commonjs-requires.ts
@@ -0,0 +1,101 @@
+/** File dependencies from literal CommonJS calls that use the module's require. */
+import type { Language, UnresolvedReference } from '../types';
+import { parseSourceTreeSync, type TreeNode } from './parse-tree';
+
+const COMMONJS_LANGUAGES: ReadonlySet<Language> = new Set(['javascript', 'jsx', 'typescript', 'tsx']);
+const MODULE_SPECIFIER = /^(?:\.{1,2}(?:\/|$)|#)|\//;
+const FUNCTIONS = new Set(['function_declaration', 'function_expression', 'generator_function', 'generator_function_declaration', 'arrow_function', 'method_definition']);
+const BLOCKS = new Set(['program', 'statement_block', 'for_statement', 'for_in_statement', 'switch_body']);
+
+/** Only binding positions count: object keys, types and default values do not bind a name. */
+function bindsRequire(pattern: TreeNode | null): boolean {
+  if (!pattern) return false;
+  if (['identifier', 'shorthand_property_identifier_pattern'].includes(pattern.type)) return pattern.text === 'require';
+  if (['assignment_pattern', 'object_assignment_pattern'].includes(pattern.type)) return bindsRequire(pattern.childForFieldName('left'));
+  if (pattern.type === 'pair_pattern') return bindsRequire(pattern.childForFieldName('value'));
+  if (['required_parameter', 'optional_parameter'].includes(pattern.type)) return bindsRequire(pattern.childForFieldName('pattern'));
+  if (['formal_parameters', 'rest_pattern', 'object_pattern', 'array_pattern'].includes(pattern.type)) return pattern.namedChildren.some(bindsRequire);
+  return false;
+}
+
+/** Cook a literal without evaluating source; package paths may contain escaped characters. */
+function literalValue(text: string): string | null {
+  const escapes: Record<string, string> = { n: '\n', r: '\r', t: '\t', b: '\b', f: '\f', v: '\v' };
+  try {
+    return text.slice(1, -1).replace(/\\(?:u\{([\da-fA-F]+)\}|u([\da-fA-F]{4})|x([\da-fA-F]{2})|([0-3][0-7]{2}|[0-7]{1,2})|(\r\n|[\s\S]))/g,
+      (_match, point: string | undefined, unicode: string | undefined, hex: string | undefined, octal: string | undefined, character: string | undefined) => {
+        if (point || unicode || hex) return String.fromCodePoint(parseInt((point ?? unicode ?? hex)!, 16));
+        if (octal) return String.fromCharCode(parseInt(octal, 8));
+        if (character === '\n' || character === '\r' || character === '\r\n') return '';
+        return escapes[character!] ?? character!;
+      });
+  } catch { return null; }
+}
+
+function scopeFor(node: TreeNode, functionScoped = false): TreeNode {
+  for (let owner = node.parent; owner; owner = owner.parent) {
+    if (FUNCTIONS.has(owner.type)) return functionScoped ? (owner.childForFieldName('body') ?? owner) : owner;
+    if (owner.type === 'program' || owner.type === 'class_static_block' || (!functionScoped && BLOCKS.has(owner.type))) return owner;
+  }
+  return node;
+}
+
+export function commonJsRequireRefs(filePath: string, source: string, language: Language): UnresolvedReference[] {
+  if (!COMMONJS_LANGUAGES.has(language) || !source.includes('require')) return [];
+  const tree = parseSourceTreeSync(source, language);
+  if (!tree) return [];
+  const scopes: TreeNode[] = [];
+  const calls: TreeNode[] = [];
+  const stack = [tree.rootNode];
+  try {
+    while (stack.length) {
+      const node = stack.pop()!;
+      const children = node.namedChildren;
+      for (let i = children.length - 1; i >= 0; i--) stack.push(children[i]!);
+      if ((node.type === 'call_expression' && node.childForFieldName('function')?.text === 'require') || node.type === 'import_require_clause') calls.push(node);
+      if (FUNCTIONS.has(node.type)) {
+        if (bindsRequire(node.childForFieldName('parameters')) || bindsRequire(node.childForFieldName('parameter'))) scopes.push(node);
+        if (node.type !== 'method_definition' && node.childForFieldName('name')?.text === 'require') scopes.push(node.type.endsWith('declaration') ? scopeFor(node) : node);
+      } else if (node.type === 'variable_declarator' && bindsRequire(node.childForFieldName('name'))) {
+        scopes.push(scopeFor(node, node.parent?.type === 'variable_declaration'));
+      } else if (node.type === 'for_in_statement' && bindsRequire(node.childForFieldName('left'))) {
+        scopes.push(node.children.some((child) => child.type === 'var') ? scopeFor(node, true) : node);
+      } else if (node.type === 'catch_clause' && bindsRequire(node.childForFieldName('parameter'))) {
+        scopes.push(node);
+      } else if (['class_declaration', 'class'].includes(node.type) && node.childForFieldName('name')?.text === 'require') {
+        scopes.push(node.type === 'class_declaration' ? scopeFor(node) : node);
+      } else if (node.type === 'import_require_clause') {
+        if (node.namedChildren[0]?.text === 'require') scopes.push(tree.rootNode);
+      } else if (node.type === 'import_clause') {
+        if (!node.parent?.children.some((child) => child.type === 'type') && node.namedChildren.some((child) => child.type === 'identifier' && child.text === 'require')) scopes.push(tree.rootNode);
+      } else if (node.type === 'import_specifier' || node.type === 'namespace_import') {
+        const local = node.childForFieldName('alias') ?? node.childForFieldName('name') ?? node.namedChildren.at(-1);
+        let typeOnly = node.children.some((child) => child.type === 'type');
+        for (let owner = node.parent; owner && owner.type !== 'program'; owner = owner.parent) {
+          if (owner.type === 'import_statement') typeOnly ||= owner.children.some((child) => child.type === 'type');
+        }
+        if (!typeOnly && local?.text === 'require') scopes.push(tree.rootNode);
+      }
+    }
+    const out: UnresolvedReference[] = [];
+    const seen = new Set<string>();
+    for (const node of calls) {
+      const importEquals = node.type === 'import_require_clause';
+      const callee = importEquals ? node : node.childForFieldName('function')!;
+      if (!importEquals && (callee.type !== 'identifier' || scopes.some((scope) => scope.startIndex <= callee.startIndex && scope.endIndex > callee.startIndex))) continue;
+      const args = importEquals ? node.namedChildren.filter((child) => child.type === 'string')
+        : node.childForFieldName('arguments')?.namedChildren.filter((child) => child.type !== 'comment');
+      if (args?.length !== 1 || !['string', 'template_string'].includes(args[0]!.type)) continue;
+      const text = args[0]!.text;
+      if (args[0]!.namedChildren.some((child) => child.type === 'template_substitution')) continue;
+      const specifier = literalValue(text);
+      if (!specifier || !MODULE_SPECIFIER.test(specifier) || seen.has(specifier)) continue;
+      seen.add(specifier);
+      out.push({ fromNodeId: `file:${filePath}`, referenceName: specifier, referenceKind: 'imports',
+        line: callee.startPosition.row + 1, column: callee.startPosition.column, filePath, language });
+    }
+    return out;
+  } finally {
+    tree.delete();
+  }
+}
diff --git a/src/extraction/index.ts b/src/extraction/index.ts
index 4d198534cc..39f50d2640 100644
--- a/src/extraction/index.ts
+++ b/src/extraction/index.ts
@@ -2265,6 +2265,7 @@ export class ExtractionOrchestrator {
             language,
             buffers: result.kernelBuffers,
             file: this.buildFileRecord(filePath, content, language, stats, nodeCount, result.errors),
+            ...(result.unresolvedReferences.length > 0 ? { extraRefs: result.unresolvedReferences } : {}),
           });
         } else {
           storeWriter.send(this.buildFreshStoreBundle(filePath, content, language, stats, result));
diff --git a/src/extraction/kernel/index.ts b/src/extraction/kernel/index.ts
index 8df5f032aa..2b2d44300b 100644
--- a/src/extraction/kernel/index.ts
+++ b/src/extraction/kernel/index.ts
@@ -14,6 +14,7 @@
  */
 
 import type { Binding, ExtractionResult, Language, Node } from '../../types';
+import { commonJsRequireRefs } from '../commonjs-requires';
 import { EXTRACTORS } from '../languages';
 import { getKernel, kernelSupports } from './loader';
 import { decodeExtractBuffers } from './decode';
@@ -142,6 +143,8 @@ export function materializeKernelResult(
   );
   if (b.literalSource !== undefined) captureLiterals(b.literalSource, decoded.nodes);
   decoded.durationMs = result.durationMs;
+  // References read beside the tables (a CommonJS `require`) ride on the transport.
+  if (result.unresolvedReferences.length > 0) decoded.unresolvedReferences.push(...result.unresolvedReferences);
   return decoded;
 }
 
@@ -176,6 +179,8 @@ export function tryKernelExtract(
     // unrouted ones keep theirs, and a quoted-key explore query silently stops
     // finding holders.
     captureLiterals(pre, result.nodes);
+    // Read beside the tables, as TreeSitterExtractor does (a CommonJS `require`).
+    result.unresolvedReferences.push(...commonJsRequireRefs(filePath, source, language));
     result.durationMs = Date.now() - t0;
     return result;
   } catch (err) {
diff --git a/src/extraction/kernel/loader.ts b/src/extraction/kernel/loader.ts
index 0c28519ecd..5be270b890 100644
--- a/src/extraction/kernel/loader.ts
+++ b/src/extraction/kernel/loader.ts
@@ -289,8 +289,8 @@ export interface KernelModule {
   KernelResolver?: new (config: KernelResolverConfig) => KernelResolverLike;
   /** Parse-tree service for read-time consumers (Phase 3). OPTIONAL: absent
    *  on older binaries — kernel/tree.ts feature-detects and the consumers
-   *  keep the wasm parser. */
-  parseTree?(content: string, language: string): KernelTreeBuffers;
+   *  return no tree when that optional API is unavailable. */
+  parseTree?(content: string, language: string, budgetMs?: number): KernelTreeBuffers;
   /** Kind and field name tables for a grammar, fetched once per language. */
   treeNames?(language: string): KernelTreeNames | null;
   contractInfo(): KernelContractInfo;
diff --git a/src/extraction/kernel/tree.ts b/src/extraction/kernel/tree.ts
index 9e693e16d3..405837735c 100644
--- a/src/extraction/kernel/tree.ts
+++ b/src/extraction/kernel/tree.ts
@@ -345,10 +345,10 @@ function splitNames(buf: Buffer, count: number, from: number): { names: string[]
 }
 
 /**
- * Parse with the kernel, or null when it cannot (no binary, language not
- * compiled in, stack guard tripped). Callers fall back to the wasm parser.
+ * Parse with the kernel, or null when unavailable or cancelled. The optional
+ * budget applies to parser progress callbacks, not external scanners or serialization.
  */
-export function parseNativeTree(source: string, language: Language): NativeTree | null {
+export function parseNativeTree(source: string, language: Language, budgetMs?: number): NativeTree | null {
   const kernel = getKernel();
   if (!kernel || typeof kernel.parseTree !== 'function') return null;
   // A fresh kernel instance (tests reset it) must not reuse another's tables.
@@ -363,7 +363,7 @@ export function parseNativeTree(source: string, language: Language): NativeTree
   if (!names) return null;
   let buffers;
   try {
-    buffers = kernel.parseTree(source, language);
+    buffers = kernel.parseTree(source, language, budgetMs);
   } catch {
     return null;
   }
diff --git a/src/extraction/parse-budget.ts b/src/extraction/parse-budget.ts
new file mode 100644
index 0000000000..118dc00456
--- /dev/null
+++ b/src/extraction/parse-budget.ts
@@ -0,0 +1,10 @@
+/** Cooperative deadline for request-time native parsing. */
+import type { Language } from '../types';
+import { parseSourceTreeSync, type ParsedTree } from './parse-tree';
+
+export const REQUEST_PARSE_BUDGET_MS = 3000;
+
+/** Native parser progress checks stop parsing; external scanners need their own guards. */
+export function parseWithinBudget(source: string, language: Language, budgetMs = REQUEST_PARSE_BUDGET_MS): ParsedTree | null {
+  return parseSourceTreeSync(source, language, budgetMs);
+}
diff --git a/src/extraction/parse-tree.ts b/src/extraction/parse-tree.ts
index db1053f134..a176014c3a 100644
--- a/src/extraction/parse-tree.ts
+++ b/src/extraction/parse-tree.ts
@@ -63,13 +63,13 @@ export interface ParsedTree {
   delete(): void;
 }
 
-/** Parse with the kernel. Null only when the binary carries no grammar for `language`. */
-export async function parseSourceTree(source: string, language: Language): Promise<ParsedTree | null> {
-  return parseSourceTreeSync(source, language);
+/** Parse with the kernel. An optional budget bounds cooperative parsing; cancellation returns null. */
+export async function parseSourceTree(source: string, language: Language, budgetMs?: number): Promise<ParsedTree | null> {
+  return parseSourceTreeSync(source, language, budgetMs);
 }
 
 /** Synchronous form; the kernel path is always synchronous. */
-export function parseSourceTreeSync(source: string, language: Language): ParsedTree | null {
+export function parseSourceTreeSync(source: string, language: Language, budgetMs?: number): ParsedTree | null {
   requireKernel();
-  return parseNativeTree(source, language) as ParsedTree | null;
+  return parseNativeTree(source, language, budgetMs) as ParsedTree | null;
 }
diff --git a/src/extraction/parse-worker.ts b/src/extraction/parse-worker.ts
index 7f515ac00c..974d556f7e 100644
--- a/src/extraction/parse-worker.ts
+++ b/src/extraction/parse-worker.ts
@@ -17,6 +17,7 @@ import { parentPort } from 'worker_threads';
 import { extractFromSource } from './tree-sitter';
 import { detectLanguage } from './grammars';
 import { tryKernelExtractRaw } from './kernel';
+import { commonJsRequireRefs } from './commonjs-requires';
 import { getAllFrameworkResolvers, getApplicableFrameworks } from '../resolution/frameworks';
 import type { Language, ExtractionResult } from '../types';
 
@@ -58,7 +59,8 @@ parentPort!.on('message', async (msg: { type: string; id?: number; filePath?: st
           result = {
             nodes: [],
             edges: [],
-            unresolvedReferences: [],
+            // Read beside the kernel's tables (extractFromSource's own post-step).
+            unresolvedReferences: commonJsRequireRefs(filePath!, content!, language),
             errors: raw.errors,
             durationMs: 0,
             kernelBuffers: raw.buffers,
diff --git a/src/extraction/sfc-script.ts b/src/extraction/sfc-script.ts
new file mode 100644
index 0000000000..0187abdb0a
--- /dev/null
+++ b/src/extraction/sfc-script.ts
@@ -0,0 +1,103 @@
+/** Fold embedded scripts into one SFC file/component hierarchy, preserving nested owners. */
+
+import type { Binding, Edge, ExtractionError, ExtractionResult, Language, Node, UnresolvedReference } from '../types';
+import * as path from 'path';
+
+/** The SFC's own file node — the whole file, as the tree-sitter extractor makes one. */
+export function sfcFileNode(filePath: string, source: string, language: Language): Node {
+  return {
+    id: `file:${filePath}`,
+    kind: 'file',
+    name: path.basename(filePath),
+    qualifiedName: filePath,
+    filePath,
+    language,
+    startLine: 1,
+    endLine: source.split('\n').length,
+    startColumn: 0,
+    endColumn: 0,
+    isExported: false,
+    updatedAt: Date.now(),
+  };
+}
+
+export interface ScriptFold {
+  filePath: string;
+  componentNodeId: string;
+  /** Lines before the block in the SFC file: the block's line 1 is `lineOffset + 1`. */
+  lineOffset: number;
+  language: Language;
+  /** The block runs once per component instance — Vue `<script setup>`, a Svelte instance script, Astro frontmatter. */
+  perInstance: boolean;
+}
+
+export interface ScriptSink {
+  nodes: Node[];
+  edges: Edge[];
+  unresolvedReferences: UnresolvedReference[];
+  errors: ExtractionError[];
+  bindings: Binding[];
+}
+
+/** What a per-instance block does at its top level, as opposed to what it imports. */
+const INSTANCE_REF_KINDS: ReadonlySet<string> = new Set(['calls', 'references', 'instantiates', 'function_ref']);
+
+export function foldScriptResult(result: ExtractionResult, fold: ScriptFold, sink: ScriptSink): void {
+  const blockFile = `file:${fold.filePath}`;
+  // Nested symbols retain their script parent; top-level symbols belong to the component.
+  const parented = new Set<string>();
+  for (const edge of result.edges) {
+    if (edge.kind === 'contains' && edge.source !== blockFile) parented.add(edge.target);
+  }
+
+  // A per-instance block's top-level `const data = useFetch(…)` is component
+  // state: its initializer runs on every instance, as the component's doing.
+  const instanceValues = new Set<string>();
+  if (fold.perInstance) {
+    for (const node of result.nodes) {
+      if ((node.kind === 'constant' || node.kind === 'variable') && !parented.has(node.id)) instanceValues.add(node.id);
+    }
+  }
+  const runsAsComponent = (id: string) => id === blockFile || instanceValues.has(id);
+
+  for (const node of result.nodes) {
+    if (node.kind === 'file') continue;
+    node.startLine += fold.lineOffset;
+    node.endLine += fold.lineOffset;
+    node.language = fold.language;
+    sink.nodes.push(node);
+    if (!parented.has(node.id)) sink.edges.push({ source: fold.componentNodeId, target: node.id, kind: 'contains' });
+  }
+
+  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;
+    sink.edges.push(edge);
+  }
+
+  for (const ref of result.unresolvedReferences) {
+    ref.line += fold.lineOffset;
+    ref.filePath = fold.filePath;
+    ref.language = fold.language;
+    if (fold.perInstance && runsAsComponent(ref.fromNodeId) && INSTANCE_REF_KINDS.has(ref.referenceKind)) {
+      ref.fromNodeId = fold.componentNodeId;
+    }
+    sink.unresolvedReferences.push(ref);
+  }
+
+  for (const binding of result.bindings ?? []) {
+    sink.bindings.push({
+      ...binding,
+      filePath: fold.filePath,
+      scopeStart: binding.scopeStart + fold.lineOffset,
+      scopeEnd: binding.scopeEnd + fold.lineOffset,
+      line: binding.line + fold.lineOffset,
+    });
+  }
+
+  for (const error of result.errors) {
+    if (error.line) error.line += fold.lineOffset;
+    sink.errors.push(error);
+  }
+}
diff --git a/src/extraction/store-worker.ts b/src/extraction/store-worker.ts
index 45d781e242..c062c5c43f 100644
--- a/src/extraction/store-worker.ts
+++ b/src/extraction/store-worker.ts
@@ -75,6 +75,7 @@ function decodeKernelBundle(bundle: KernelStoreBundle): StoreBundle {
   if (bundle.buffers.literalSource !== undefined) {
     captureLiterals(bundle.buffers.literalSource, decoded.nodes);
   }
+  if (bundle.extraRefs?.length) decoded.unresolvedReferences.push(...bundle.extraRefs);
   return finalizeStoreBundle(decoded, bundle.filePath, bundle.language, bundle.file);
 }
 
diff --git a/src/extraction/store-writer.ts b/src/extraction/store-writer.ts
index 80e7fa18fe..1baddc0db4 100644
--- a/src/extraction/store-writer.ts
+++ b/src/extraction/store-writer.ts
@@ -52,6 +52,8 @@ export interface KernelStoreBundle {
   language: Language;
   buffers: NonNullable<ExtractionResult['kernelBuffers']>;
   file: FileRecord;
+  /** References read beside the kernel's tables (a CommonJS `require`). */
+  extraRefs?: ExtractionResult['unresolvedReferences'];
 }
 
 /**
diff --git a/src/extraction/svelte-extractor.ts b/src/extraction/svelte-extractor.ts
index cbedc011c9..6773d06a7e 100644
--- a/src/extraction/svelte-extractor.ts
+++ b/src/extraction/svelte-extractor.ts
@@ -2,6 +2,7 @@ import { Binding, Node, Edge, ExtractionResult, ExtractionError, UnresolvedRefer
 import { generateNodeId } from './tree-sitter-helpers';
 import { extractEmbeddedBlock } from './block-extract';
 import { isLanguageSupported } from './grammars';
+import { foldScriptResult, sfcFileNode } from './sfc-script';
 
 /** Svelte 5 rune names — compiler builtins, not real functions */
 const SVELTE_RUNES = new Set([
@@ -14,7 +15,7 @@ const SVELTE_RUNES = new Set([
  *
  * Svelte files are multi-language (script + template + style). Rather than
  * parsing the full Svelte grammar, we extract the <script> block content
- * and delegate it to the TypeScript/JavaScript extractor (kernel first, wasm fallback).
+ * and delegate it to the TypeScript/JavaScript extractor (kernel first).
  *
  * Also extracts function calls from template expressions (`{fn(...)}`) so
  * cross-file call edges are captured even when calls live in markup.
@@ -43,8 +44,9 @@ export class SvelteExtractor {
     const startTime = Date.now();
 
     try {
-      // Create component node for the .svelte file itself
+      this.nodes.push(sfcFileNode(this.filePath, this.source, 'svelte'));
       const componentNode = this.createComponentNode();
+      this.edges.push({ source: `file:${this.filePath}`, target: componentNode.id, kind: 'contains' });
 
       // Extract and process script blocks
       const scriptBlocks = this.extractScriptBlocks();
@@ -135,8 +137,8 @@ export class SvelteExtractor {
       // Detect TypeScript from lang attribute
       const isTypeScript = /lang\s*=\s*["'](ts|typescript)["']/.test(attrs);
 
-      // Detect module script
-      const isModule = /context\s*=\s*["']module["']/.test(attrs);
+      // Svelte 4 uses context="module"; Svelte 5 also accepts the module attribute.
+      const isModule = /context\s*=\s*["']module["']|(?:^|\s)module(?=[\s=]|$)/.test(attrs);
 
       // Calculate the 0-indexed line where the content begins. The content
       // starts right after the opening tag's `>` — its leading `\n` is part
@@ -178,59 +180,14 @@ export class SvelteExtractor {
       return;
     }
 
-    // Kernel first, wasm fallback (block-extract.ts)
+    // The embedded-block seam preserves native extraction and literal metadata.
     const result = extractEmbeddedBlock(this.filePath, block.content, scriptLanguage);
 
-    // Offset line numbers from script block back to .svelte file positions
-    for (const node of result.nodes) {
-      node.startLine += block.startLine;
-      node.endLine += block.startLine;
-      node.language = 'svelte'; // Mark as svelte, not TS/JS
-
-      this.nodes.push(node);
-
-      // Add containment edge from component to this node
-      this.edges.push({
-        source: componentNodeId,
-        target: node.id,
-        kind: 'contains',
-      });
-    }
-
-    // Offset edges (they reference line numbers)
-    for (const edge of result.edges) {
-      if (edge.line) {
-        edge.line += block.startLine;
-      }
-      this.edges.push(edge);
-    }
-
-    // Offset unresolved references
-    for (const ref of result.unresolvedReferences) {
-      ref.line += block.startLine;
-      ref.filePath = this.filePath;
-      ref.language = 'svelte';
-      this.unresolvedReferences.push(ref);
-    }
-
-    // Offset binding rows (scopes and lines are block-relative)
-    for (const b of result.bindings ?? []) {
-      this.bindings.push({
-        ...b,
-        filePath: this.filePath,
-        scopeStart: b.scopeStart + block.startLine,
-        scopeEnd: b.scopeEnd + block.startLine,
-        line: b.line + block.startLine,
-      });
-    }
-
-    // Carry over errors
-    for (const error of result.errors) {
-      if (error.line) {
-        error.line += block.startLine;
-      }
-      this.errors.push(error);
-    }
+    foldScriptResult(
+      result,
+      { filePath: this.filePath, componentNodeId, lineOffset: block.startLine, language: 'svelte', perInstance: !block.isModule },
+      { nodes: this.nodes, edges: this.edges, unresolvedReferences: this.unresolvedReferences, errors: this.errors, bindings: this.bindings }
+    );
   }
 
   /**
diff --git a/src/extraction/syntax-tokens.ts b/src/extraction/syntax-tokens.ts
index b82ce100a3..b8e93859ea 100644
--- a/src/extraction/syntax-tokens.ts
+++ b/src/extraction/syntax-tokens.ts
@@ -40,7 +40,8 @@
 
 import { Language } from '../types';
 import { EXTRACTORS } from './languages';
-import { parseSourceTree, type TreeNode as SyntaxNode } from './parse-tree';
+import type { TreeNode as SyntaxNode } from './parse-tree';
+import { parseWithinBudget } from './parse-budget';
 import type { LanguageExtractor } from './tree-sitter-types';
 
 /* ------------------------------------------------------------- the classes -- */
@@ -446,9 +447,8 @@ async function tokenizeRegion(
   offset: number
 ): Promise<SyntaxSpan[] | null> {
   try {
-    // Kernel first, wasm fallback (parse-tree.ts): the same grammar the
-    // graph was built from, from the native parser when there is one.
-    const tree = await parseSourceTree(source, language);
+    // Use the same native grammar as indexing, with a request-time budget.
+    const tree = parseWithinBudget(source, language);
     if (!tree) return null;
     try {
       return classifyTree(tree.rootNode, source, language, offset);
diff --git a/src/extraction/tree-sitter.ts b/src/extraction/tree-sitter.ts
index 273ec9d07b..fcc9df20bc 100644
--- a/src/extraction/tree-sitter.ts
+++ b/src/extraction/tree-sitter.ts
@@ -36,6 +36,7 @@ import { MarkdownExtractor } from './markdown-extractor';
 import { CfmlExtractor } from './cfml-extractor';
 import { tryKernelExtract, tryKernelBindings, attachBindingNodeIds } from './kernel';
 import { captureLiterals } from './literal-capture';
+import { commonJsRequireRefs } from './commonjs-requires';
 import {
   getAllFrameworkResolvers,
   getApplicableFrameworks,
@@ -671,6 +672,10 @@ export class TreeSitterExtractor {
       if (packageNodeId) this.nodeStack.pop();
       this.nodeStack.pop();
 
+      // A CommonJS `require('./x')` is a file import, like ESM's `import`. The
+      // kernel reads the same (kernel/index.ts and the parse worker's transport).
+      this.unresolvedReferences.push(...commonJsRequireRefs(this.filePath, this.source, this.language));
+
       // hasError is routine for several grammars; warn only when no symbols survived.
       const symbolCount = this.nodes.filter((n) => n.kind !== 'file').length;
       if (this.tree?.rootNode.hasError && symbolCount === 0) {
diff --git a/src/extraction/vue-extractor.ts b/src/extraction/vue-extractor.ts
index c9a5315377..2f1c796116 100644
--- a/src/extraction/vue-extractor.ts
+++ b/src/extraction/vue-extractor.ts
@@ -2,6 +2,7 @@ import { Binding, Node, Edge, ExtractionResult, ExtractionError, UnresolvedRefer
 import { generateNodeId } from './tree-sitter-helpers';
 import { extractEmbeddedBlock } from './block-extract';
 import { isLanguageSupported } from './grammars';
+import { foldScriptResult, sfcFileNode } from './sfc-script';
 import { vueOptionsMembers } from './vue-options-api';
 
 /**
@@ -32,7 +33,7 @@ function kebabToPascal(name: string): string {
  *
  * Vue SFCs are multi-language (script + template + style). Rather than
  * parsing the full Vue grammar, we extract the <script> block content
- * and delegate it to the TypeScript/JavaScript extractor (kernel first, wasm fallback).
+ * and delegate it to the TypeScript/JavaScript extractor (kernel first).
  *
  * Every .vue file produces a component node (Vue components are always importable).
  */
@@ -58,8 +59,9 @@ export class VueExtractor {
     const startTime = Date.now();
 
     try {
-      // Create component node for the .vue file itself
+      this.nodes.push(sfcFileNode(this.filePath, this.source, 'vue'));
       const componentNode = this.createComponentNode();
+      this.edges.push({ source: `file:${this.filePath}`, target: componentNode.id, kind: 'contains' });
 
       // Extract and process script blocks
       const scriptBlocks = this.extractScriptBlocks();
@@ -248,7 +250,7 @@ export class VueExtractor {
       return;
     }
 
-    // Kernel first, wasm fallback (block-extract.ts)
+    // The embedded-block seam preserves native extraction and literal metadata.
     const result = extractEmbeddedBlock(this.filePath, block.content, scriptLanguage);
 
     // An Options API component's functions — `methods`, `computed`, `watch`,
@@ -256,56 +258,11 @@ export class VueExtractor {
     // part of the file. Name each one, and hand it the calls written inside it.
     if (!block.isSetup) this.addOptionsMembers(block, result, componentNodeId);
 
-    // Offset line numbers from script block back to .vue file positions
-    for (const node of result.nodes) {
-      node.startLine += block.startLine;
-      node.endLine += block.startLine;
-      node.language = 'vue'; // Mark as vue, not TS/JS
-
-      this.nodes.push(node);
-
-      // Add containment edge from component to this node
-      this.edges.push({
-        source: componentNodeId,
-        target: node.id,
-        kind: 'contains',
-      });
-    }
-
-    // Offset edges (they reference line numbers)
-    for (const edge of result.edges) {
-      if (edge.line) {
-        edge.line += block.startLine;
-      }
-      this.edges.push(edge);
-    }
-
-    // Offset unresolved references
-    for (const ref of result.unresolvedReferences) {
-      ref.line += block.startLine;
-      ref.filePath = this.filePath;
-      ref.language = 'vue';
-      this.unresolvedReferences.push(ref);
-    }
-
-    // Offset binding rows (scopes and lines are block-relative)
-    for (const b of result.bindings ?? []) {
-      this.bindings.push({
-        ...b,
-        filePath: this.filePath,
-        scopeStart: b.scopeStart + block.startLine,
-        scopeEnd: b.scopeEnd + block.startLine,
-        line: b.line + block.startLine,
-      });
-    }
-
-    // Carry over errors
-    for (const error of result.errors) {
-      if (error.line) {
-        error.line += block.startLine;
-      }
-      this.errors.push(error);
-    }
+    foldScriptResult(
+      result,
+      { filePath: this.filePath, componentNodeId, lineOffset: block.startLine, language: 'vue', perInstance: block.isSetup },
+      { nodes: this.nodes, edges: this.edges, unresolvedReferences: this.unresolvedReferences, errors: this.errors, bindings: this.bindings }
+    );
   }
 
   /**
diff --git a/src/graph/branch-guards.ts b/src/graph/branch-guards.ts
index 675dff0431..cde4aa9d61 100644
--- a/src/graph/branch-guards.ts
+++ b/src/graph/branch-guards.ts
@@ -33,11 +33,10 @@ import * as fs from 'fs';
 import type { Language } from '../types';
 import { loadGrammarsForLanguages } from '../extraction/grammars';
 import {
-  parseSourceTree,
-  parseSourceTreeSync,
   type ParsedTree as Tree,
   type TreeNode as SyntaxNode,
 } from '../extraction/parse-tree';
+import { parseWithinBudget } from '../extraction/parse-budget';
 
 // =============================================================================
 // Public shape
@@ -214,8 +213,7 @@ async function treeFor(absPath: string, language: Language): Promise<CachedTree
 }
 
 async function parse(source: string, language: Language): Promise<Tree | null> {
-  // Kernel first, wasm fallback (parse-tree.ts).
-  return parseSourceTree(source, language);
+  return parseWithinBudget(source, language);
 }
 
 // =============================================================================
@@ -290,9 +288,7 @@ export function guardsForFileSync(
     } catch {
       return out;
     }
-    // The kernel path is synchronous; the wasm path serves only a grammar
-    // that warmBranchGuardGrammars already loaded.
-    const tree = parseSourceTreeSync(source, language);
+    const tree = parseWithinBudget(source, language);
     if (!tree) return out;
     cached = { key, tree, source };
     remember(absPath, cached);
diff --git a/src/graph/named-symbol-flow.ts b/src/graph/named-symbol-flow.ts
index a83edf2d82..1652a2c6da 100644
--- a/src/graph/named-symbol-flow.ts
+++ b/src/graph/named-symbol-flow.ts
@@ -287,7 +287,14 @@ export function resolveNamedTokens(
 ): NamedSymbolFlow {
   const directed = opts.mode === 'directed';
   const out = EMPTY_FLOW();
-  const tokens = flowTokens(query);
+  // A directed question names its two ends exactly — a symbol's own name, as
+  // the viewer's links write it: an Objective-C selector (`initWithFrame:`), a
+  // Ruby predicate (`valid?`), a two-letter method (`ok`, Go's `Do`). The
+  // free-text filter below is for explore's bag of words, and it dropped every
+  // one of those, leaving the other end reported as naming nothing.
+  const tokens = directed && opts.from && opts.to
+    ? [...new Set([normalizeToken(opts.from), normalizeToken(opts.to)])]
+    : flowTokens(query);
   out.tokens = tokens;
   if (tokens.length < 2) return out;
 
diff --git a/src/resolution/frameworks/astro.ts b/src/resolution/frameworks/astro.ts
index fc1c07dd8e..16626319c0 100644
--- a/src/resolution/frameworks/astro.ts
+++ b/src/resolution/frameworks/astro.ts
@@ -11,6 +11,7 @@ import { detectLanguage } from '../../extraction/grammars';
 import { parseSourceTreeSync } from '../../extraction/parse-tree';
 import { generateNodeId } from '../../extraction/tree-sitter-helpers';
 import { httpHandlerReferences } from './http-routing';
+import { pageComponentRef, resolvePageComponent } from './page-component';
 import {
   addRouteTo,
   appRootFor,
@@ -76,7 +77,7 @@ const ASTRO_VIRTUAL_MODULES = [
 export const astroResolver: FrameworkResolver = {
   name: 'astro',
   claimsReference: (name) =>
-    name === 'astro-page-component' || name.startsWith('astro-href:') || name === 'Astro.redirect',
+    name.startsWith('page-component:') || name.startsWith('astro-href:') || name === 'Astro.redirect',
 
   detect(context: ResolutionContext): boolean {
     // Check for astro in package.json
@@ -99,12 +100,8 @@ export const astroResolver: FrameworkResolver = {
   },
 
   resolve(ref: UnresolvedRef, context: ResolutionContext): ResolvedRef | null {
-    if (ref.referenceName === 'astro-page-component') {
-      const target = context.getNodeById?.(pageComponentId(ref.filePath));
-      return target
-        ? { original: ref, targetNodeId: target.id, confidence: 1, resolvedBy: 'framework' }
-        : null;
-    }
+    const page = resolvePageComponent(ref, context);
+    if (page) return page;
     const link = ref.referenceName.startsWith('astro-href:');
     const redirect =
       ref.referenceName === 'Astro.redirect' &&
@@ -272,15 +269,7 @@ export const astroResolver: FrameworkResolver = {
         };
         if (node.language === 'astro') {
           nodes.push(node);
-          references.push({
-            fromNodeId: node.id,
-            referenceName: 'astro-page-component',
-            referenceKind: 'references',
-            filePath,
-            language: 'astro',
-            line: 1,
-            column: 0,
-          });
+          references.push(pageComponentRef(node, '.astro', 'astro'));
         } else if (content.includes('export')) {
           const tree = parseSourceTreeSync(content, node.language);
           if (!tree) return { nodes, references };
diff --git a/src/resolution/frameworks/page-component.ts b/src/resolution/frameworks/page-component.ts
new file mode 100644
index 0000000000..8a0250cdd0
--- /dev/null
+++ b/src/resolution/frameworks/page-component.ts
@@ -0,0 +1,44 @@
+/**
+ * A file-routed page — Nuxt's `pages/admin.vue`, Astro's `src/pages/about.astro`
+ * — is served by the component its file IS: the single-file-component
+ * extractor's one component per file, named after the file. Without the link a
+ * page route stood alone, so the viewer's Steps tab drew nothing for a page and
+ * the routes list never named what serves it.
+ *
+ * The route emits a framework-owned `calls` reference so a component filename
+ * cannot collide with a built-in function. {@link resolvePageComponent} lands it on
+ * the SAME file's component — never on a same-named one elsewhere, since every
+ * `index.vue` is a component named `index`.
+ */
+
+import type { Language, Node } from '../../types';
+import type { ResolutionContext, ResolvedRef, UnresolvedRef } from '../types';
+
+/** The component name a single-file-component extractor gives a file: its basename, extension off. */
+export function pageComponentName(filePath: string, extension: string): string {
+  const base = filePath.split(/[/\\]/).pop() ?? filePath;
+  return base.endsWith(extension) ? base.slice(0, -extension.length) : base;
+}
+
+export function pageComponentRef(route: Node, extension: string, language: Language): UnresolvedRef {
+  const name = pageComponentName(route.filePath, extension);
+  return {
+    fromNodeId: route.id,
+    referenceName: `page-component:${name}`,
+    referenceKind: 'calls',
+    line: 1,
+    column: 0,
+    filePath: route.filePath,
+    language,
+    candidates: [name],
+  };
+}
+
+/** A page route's reference to its file's own component, or null when this is not one. */
+export function resolvePageComponent(ref: UnresolvedRef, context: ResolutionContext): ResolvedRef | null {
+  if (ref.referenceKind !== 'calls' || !ref.referenceName.startsWith('page-component:') || !ref.fromNodeId.startsWith(`route:${ref.filePath}:`)) return null;
+  const component = context
+    .getNodesInFile(ref.filePath)
+    .find((n) => n.kind === 'component' && n.name === ref.referenceName.slice('page-component:'.length));
+  return component ? { original: ref, targetNodeId: component.id, confidence: 0.95, resolvedBy: 'framework' } : null;
+}
diff --git a/src/resolution/frameworks/ruby.ts b/src/resolution/frameworks/ruby.ts
index 85460393b2..7d81024dc5 100644
--- a/src/resolution/frameworks/ruby.ts
+++ b/src/resolution/frameworks/ruby.ts
@@ -8,6 +8,25 @@ import { Node } from '../../types';
 import { FrameworkResolver, FrameworkExtractionResult, UnresolvedRef, ResolvedRef, ResolutionContext } from '../types';
 import { stripCommentsForRegex } from '../strip-comments';
 
+/**
+ * A `resources` line's `only:` / `except:` action list, written any way Rails
+ * accepts it: `[:index, :show]`, `:show`, `%i[new create index]`, `%w(index
+ * show)`, `"show"`, or the older `:only => [...]`. Null when the option is
+ * absent. maybe's `only: %i[new create index]` was not read, so every
+ * resource drew all seven routes, four of them to actions that do not exist.
+ */
+function railsActionOption(tail: string, key: 'only' | 'except'): Set<string> | null {
+  const m = new RegExp(
+    String.raw`(?:\b${key}:|:${key}\s*=>)\s*(?:\[([^\]]*)\]|%[iIwW]\s*[\[(]([^\])]*)[\])]|:(\w+)|["'](\w+)["'])`
+  ).exec(tail);
+  if (!m) return null;
+  if (m[1] !== undefined) {
+    return new Set(m[1].split(',').map((v) => v.trim().replace(/^:/, '').replace(/^["']|["']$/g, '')).filter(Boolean));
+  }
+  if (m[2] !== undefined) return new Set(m[2].trim().split(/\s+/).filter(Boolean));
+  return new Set([m[3] ?? m[4]!]);
+}
+
 export const railsResolver: FrameworkResolver = {
   name: 'rails',
   languages: ['ruby'],
@@ -165,11 +184,10 @@ export const railsResolver: FrameworkResolver = {
       const resName = match[2]!;
       const tail = match[3] || '';
       let actions = plural ? PLURAL_ACTIONS : SINGULAR_ACTIONS;
-      const only = tail.match(/only:\s*\[([^\]]*)\]/);
-      const except = tail.match(/except:\s*\[([^\]]*)\]/);
-      const symList = (s: string) => new Set(s.split(',').map((x) => x.trim().replace(/^:/, '')));
-      if (only) { const s = symList(only[1]!); actions = actions.filter((a) => s.has(a)); }
-      else if (except) { const s = symList(except[1]!); actions = actions.filter((a) => !s.has(a)); }
+      const only = railsActionOption(tail, 'only');
+      const except = railsActionOption(tail, 'except');
+      if (only) actions = actions.filter((a) => only.has(a));
+      else if (except) actions = actions.filter((a) => !except.has(a));
       // `resources :articles` → ArticlesController; `resource :user` → UsersController.
       const ctrl = plural ? resName : pluralize(resName);
       const line = safe.slice(0, match.index).split('\n').length;
@@ -276,11 +294,10 @@ function extractScopedRailsRoutes(filePath: string, safe: string): FrameworkExtr
       const collectionPath = join(frame.path, segment);
       const memberPath = plural ? join(collectionPath, ':id') : collectionPath;
       let actions = plural ? PLURAL_ACTIONS : SINGULAR_ACTIONS;
-      const only = /only:\s*(?:\[([^\]]*)\]|(:\w+))/.exec(tail);
-      const except = /except:\s*(?:\[([^\]]*)\]|(:\w+))/.exec(tail);
-      const symList = (x: RegExpExecArray) => new Set((x[1] ?? x[2] ?? '').split(',').map((v) => sym(v.trim())));
-      if (only) { const keep = symList(only); actions = actions.filter((a) => keep.has(a)); }
-      else if (except) { const drop = symList(except); actions = actions.filter((a) => !drop.has(a)); }
+      const only = railsActionOption(tail, 'only');
+      const except = railsActionOption(tail, 'except');
+      if (only) actions = actions.filter((a) => only.has(a));
+      else if (except) actions = actions.filter((a) => !except.has(a));
       for (const action of actions) {
         const spec = RESTFUL_ROUTES[action]!;
         const path = action === 'index' || action === 'create' ? collectionPath
diff --git a/src/resolution/frameworks/vue.ts b/src/resolution/frameworks/vue.ts
index e5a7169f57..4ecdf9b844 100644
--- a/src/resolution/frameworks/vue.ts
+++ b/src/resolution/frameworks/vue.ts
@@ -11,6 +11,7 @@ import { detectLanguage } from '../../extraction/grammars';
 import { parseSourceTreeSync } from '../../extraction/parse-tree';
 import { httpHandlerReferences } from './http-routing';
 import { dependsOn } from './package-deps';
+import { pageComponentRef, resolvePageComponent } from './page-component';
 
 /** The languages a Vue app's scripts are written in. */
 const VUE_SCRIPT_LANGUAGES: ReadonlySet<string> = new Set(['vue', 'javascript', 'typescript', 'tsx', 'jsx']);
@@ -79,10 +80,10 @@ const NUXT_AUTO_IMPORTS = new Set([
 const NUXT_VIRTUAL_MODULES = ['#imports', '#components', '#app', '#build', '#head'];
 
 /** Reference name prefix binding a Nuxt page route to its own file's component. */
-const NUXT_PAGE = 'nuxt-page:';
 
 export const vueResolver: FrameworkResolver = {
   name: 'vue',
+  claimsReference: (name) => name.startsWith('page-component:'),
 
   detect(context: ResolutionContext): boolean {
     // Check for vue or nuxt in package.json
@@ -104,16 +105,7 @@ export const vueResolver: FrameworkResolver = {
     return allFiles.some((f) => f.endsWith('.vue'));
   },
 
-  claimsReference: (name) => name.startsWith(NUXT_PAGE),
-
   resolve(ref: UnresolvedRef, context: ResolutionContext): ResolvedRef | null {
-    if (ref.referenceName.startsWith(NUXT_PAGE)) {
-      const file = ref.referenceName.slice(NUXT_PAGE.length);
-      const component = context.getNodesInFile(file).find((n) => n.kind === 'component');
-      return component
-        ? { original: ref, targetNodeId: component.id, confidence: 1, resolvedBy: 'framework' }
-        : null;
-    }
     // Vue's macros, auto-imports and components are a script's, never a
     // backend's: mealie's Python `QueryFilterBuilder(...)` is not the
     // `QueryFilterBuilder.vue` component.
@@ -221,8 +213,9 @@ export const nuxtResolver: FrameworkResolver = {
     return context.getAllFiles().some((f) => /(?:^|\/)nuxt\.config\.(?:[cm]?[jt]s)$/.test(f));
   },
 
-  resolve(): ResolvedRef | null {
-    return null;
+  resolve(ref: UnresolvedRef, context: ResolutionContext): ResolvedRef | null {
+    // A page route names the component its file is.
+    return resolvePageComponent(ref, context);
   },
 
   extract(filePath: string, content: string) {
@@ -238,9 +231,8 @@ export const nuxtResolver: FrameworkResolver = {
     if (pagesIndex !== -1 && normalized.endsWith('.vue')) {
       const routePath = filePathToNuxtRoute(normalized, pagesIndex + '/pages/'.length);
       if (routePath !== null) {
-        const id = `route:${filePath}:${routePath}:1`;
-        nodes.push({
-          id,
+        const route: Node = {
+          id: `route:${filePath}:${routePath}:1`,
           kind: 'route',
           name: routePath,
           qualifiedName: `${filePath}::route:${routePath}`,
@@ -251,20 +243,9 @@ export const nuxtResolver: FrameworkResolver = {
           endColumn: 0,
           language: 'vue',
           updatedAt: now,
-        });
-        // The page IS this file's component. A bare name would be ambiguous
-        // (every `index.vue` is a component named `index`), so the reference
-        // names the file and `resolve` binds it to that file's component.
-        // `calls`, as every component-backed screen binds (route-roots.ts).
-        references.push({
-          fromNodeId: id,
-          referenceName: `${NUXT_PAGE}${filePath}`,
-          referenceKind: 'calls',
-          line: 1,
-          column: 0,
-          filePath,
-          language: 'vue',
-        });
+        };
+        nodes.push(route);
+        references.push(pageComponentRef(route, '.vue', 'vue'));
       }
     }
 
diff --git a/src/ui-server/api/map.ts b/src/ui-server/api/map.ts
index a78f63e7f9..5f48bfd9e3 100644
--- a/src/ui-server/api/map.ts
+++ b/src/ui-server/api/map.ts
@@ -348,11 +348,13 @@ export function pickDefaultRoot(
   let total = 0;
   for (const file of files) {
     if (file.test) continue;
+    // A file loose in the repository root is program too: git's hundreds of
+    // top-level `.c` files made `builtin/` look like the majority of the code.
+    total += file.symbols;
     const slash = file.path.indexOf('/');
     if (slash <= 0) continue;
     const dir = file.path.slice(0, slash);
     byDir.set(dir, (byDir.get(dir) ?? 0) + file.symbols);
-    total += file.symbols;
   }
   if (total === 0) return '';
   let best = '';
@@ -475,6 +477,26 @@ export function pickDefaultDepth(
   return fallback;
 }
 
+/**
+ * The root and depth the map opens on when the reader named neither.
+ *
+ * A source directory whose files all sit in one folder — Express's `lib/`, an
+ * R package's `R/`, an Erlang app's `src/`, fmt's `include/fmt/` — draws as one
+ * box at any depth, and a map whose subject is one box has said nothing. The
+ * repository around it (that folder beside a CLI, a `src/`, the examples) is
+ * then the picture worth opening on, when it draws more than one box.
+ */
+export function pickDefaultView(
+  files: ReadonlyArray<{ path: string; symbols: number; test: boolean }>,
+  passThrough?: ReadonlySet<string>
+): { root: string; depth: number } {
+  const root = pickDefaultRoot(files);
+  const depth = pickDefaultDepth(files, root, passThrough);
+  if (root === '' || tallyModules(files, root, depth, passThrough).count > 1) return { root, depth };
+  const wholeDepth = pickDefaultDepth(files, '', passThrough);
+  return tallyModules(files, '', wholeDepth, passThrough).count > 1 ? { root: '', depth: wholeDepth } : { root, depth };
+}
+
 // =============================================================================
 // Cache
 // =============================================================================
@@ -572,12 +594,13 @@ export function buildMap(cg: CodeGraph, projectRoot: string, query: URLSearchPar
     };
   });
 
-  const root = requestedRoot ?? pickDefaultRoot(fileRecords);
   const passThrough = passThroughDirs(fileRecords.map((f) => f.path));
   // Root first, then depth against THAT root: how finely to cut depends on
   // what is being cut. Choosing `src` and then asking for one level under it
   // is the same question as choosing the whole project and asking for two.
-  const depth = requestedDepth ?? pickDefaultDepth(fileRecords, root, passThrough);
+  const view = requestedRoot === null ? pickDefaultView(fileRecords, passThrough) : null;
+  const root = view?.root ?? requestedRoot ?? '';
+  const depth = requestedDepth ?? view?.depth ?? pickDefaultDepth(fileRecords, root, passThrough);
   const stats = cg.getStats();
   const key = [
     projectRoot,
diff --git a/src/ui-server/highlight/bounded-tokenize.ts b/src/ui-server/highlight/bounded-tokenize.ts
new file mode 100644
index 0000000000..061654b6f2
--- /dev/null
+++ b/src/ui-server/highlight/bounded-tokenize.ts
@@ -0,0 +1,67 @@
+/** Native highlighting runs in a child that a deadline can kill and reap. */
+import { existsSync } from 'fs';
+import * as path from 'path';
+import { fork, type ChildProcess } from 'child_process';
+import type { TokenizeResult } from '../../extraction/syntax-tokens';
+import type { Language } from '../../types';
+
+export const TOKENIZE_DEADLINE_MS = 2000;
+export type BoundedTokenize = { result: TokenizeResult | null } | { timedOut: true };
+interface Pending { resolve: (outcome: BoundedTokenize) => void; timer: NodeJS.Timeout; }
+let child: ChildProcess | null = null;
+let nextId = 1;
+const pending = new Map<number, Pending>();
+
+function childFile(): string | null {
+  const sibling = path.join(__dirname, 'tokenize-worker.js');
+  if (existsSync(sibling)) return sibling;
+  const built = path.resolve(__dirname, '../../../dist/ui-server/highlight/tokenize-worker.js');
+  return existsSync(built) ? built : null;
+}
+
+/** Clear queued requests, then resolve them only after the captured child has exited. */
+function retire(outcome: BoundedTokenize): Promise<void> {
+  const dead = child;
+  child = null;
+  const waiting = [...pending.values()];
+  pending.clear();
+  for (const p of waiting) clearTimeout(p.timer);
+  const stopped = !dead || dead.exitCode !== null || dead.signalCode !== null ? Promise.resolve()
+    : new Promise<void>((resolve) => { dead.ref(); dead.once('close', () => resolve()); dead.kill('SIGKILL'); });
+  return stopped.then(() => { for (const p of waiting) p.resolve(outcome); });
+}
+
+function ensureChild(file: string): ChildProcess {
+  if (child) return child;
+  const c = fork(file, [], { stdio: ['ignore', 'ignore', 'ignore', 'ipc'], execArgv: [] });
+  c.unref();
+  c.channel?.unref();
+  c.on('message', (msg: { id: number; result: TokenizeResult | null }) => {
+    if (child !== c) return;
+    const p = pending.get(msg.id);
+    if (!p) return;
+    clearTimeout(p.timer);
+    pending.delete(msg.id);
+    p.resolve({ result: msg.result });
+  });
+  c.on('error', () => { if (child === c) void retire({ result: null }); });
+  c.on('exit', () => { if (child === c) void retire({ result: null }); });
+  child = c;
+  return c;
+}
+
+export async function tokenizeBounded(text: string, language: Language, deadlineMs = TOKENIZE_DEADLINE_MS): Promise<BoundedTokenize> {
+  const file = childFile();
+  if (!file) return { result: null };
+  let c: ChildProcess;
+  try { c = ensureChild(file); } catch { return { result: null }; }
+  const id = nextId++;
+  return new Promise<BoundedTokenize>((resolve) => {
+    const timer = setTimeout(() => { if (child === c) void retire({ timedOut: true }); }, deadlineMs);
+    pending.set(id, { resolve, timer });
+    c.send({ id, text, language }, (error) => { if (error && child === c) void retire({ result: null }); });
+  });
+}
+
+export function stopHighlightWorker(): Promise<void> { return retire({ result: null }); }
+process.once('exit', () => { child?.kill('SIGKILL'); });
diff --git a/src/ui-server/highlight/index.ts b/src/ui-server/highlight/index.ts
index 11e69861e0..3e3b5a9cc9 100644
--- a/src/ui-server/highlight/index.ts
+++ b/src/ui-server/highlight/index.ts
@@ -42,7 +42,8 @@
  * whole-file view pages the same file repeatedly.
  */
 
-import { SYNTAX_TOKEN_CLASSES, tokenizeSource, type SyntaxTokenClass } from '../../extraction/syntax-tokens';
+import { SYNTAX_TOKEN_CLASSES, type SyntaxTokenClass } from '../../extraction/syntax-tokens';
+import { tokenizeBounded } from './bounded-tokenize';
 import type { Language } from '../../types';
 import { grammarFor } from './languages';
 
@@ -208,7 +209,11 @@ async function highlightUncached(
     return plain(lines, grammar, 'Too much text on too few lines to highlight (minified?).');
   }
 
-  const tokenized = await tokenizeSource(text, language as Language);
+  const bounded = await tokenizeBounded(text, language as Language);
+  if ('timedOut' in bounded) {
+    return plain(lines, grammar, `The ${grammar} grammar took too long on this slice, so it is shown unhighlighted.`);
+  }
+  const tokenized = bounded.result;
   if (!tokenized || tokenized.spans.length === 0) {
     return plain(lines, grammar, `The ${grammar} grammar is not available in this build.`);
   }
diff --git a/src/ui-server/highlight/tokenize-worker.ts b/src/ui-server/highlight/tokenize-worker.ts
new file mode 100644
index 0000000000..7cab592765
--- /dev/null
+++ b/src/ui-server/highlight/tokenize-worker.ts
@@ -0,0 +1,10 @@
+/** IPC side of native highlighting; the parent owns this process's deadline. */
+import { tokenizeSource } from '../../extraction/syntax-tokens';
+import type { Language } from '../../types';
+interface TokenizeRequest { id: number; text: string; language: Language; }
+process.on('message', async (msg: TokenizeRequest) => {
+  let result: Awaited<ReturnType<typeof tokenizeSource>> = null;
+  try { result = await tokenizeSource(msg.text, msg.language); } catch { result = null; }
+  process.send?.({ id: msg.id, result });
+});
+process.on('disconnect', () => process.exit(0));
diff --git a/src/ui-server/index.ts b/src/ui-server/index.ts
index 40c170f703..eb5e25c749 100644
--- a/src/ui-server/index.ts
+++ b/src/ui-server/index.ts
@@ -20,6 +20,7 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as path from 'path';
 import { resolveViewerDir } from './assets';
+import { stopHighlightWorker } from './highlight/bounded-tokenize';
 import {
   ALLOWED_METHODS,
   READ_METHODS,
@@ -216,7 +217,7 @@ export async function startUiServer(options: UiServerOptions): Promise<UiServerH
       closed = true;
       return new Promise<void>((resolve) => {
         server.closeAllConnections();
-        server.close(() => resolve());
+        server.close(() => { void stopHighlightWorker().then(resolve); });
       });
     },
   };