diff --git a/README.md b/README.md
index 62d7d251..ef5529f5 100644
--- a/README.md
+++ b/README.md
@@ -572,7 +572,7 @@ Only **3 runtime dependencies** — everything else is optional or a devDependen
 
 | Dependency | What it does | | |
 |---|---|---|---|
-| [better-sqlite3](https://github.com/WiseLibs/better-sqlite3) | Fast, synchronous SQLite driver | ![GitHub stars](https://img.shields.io/github/stars/WiseLibs/better-sqlite3?style=flat-square&label=%E2%AD%90) | ![npm downloads](https://img.shields.io/npm/dw/better-sqlite3?style=flat-square&label=%F0%9F%93%A5%2Fwk) |
+| [better-sqlite3](https://github.com/WiseLibs/better-sqlite3) | SQLite driver (WASM engine; lazy-loaded, not used for native-engine reads) | ![GitHub stars](https://img.shields.io/github/stars/WiseLibs/better-sqlite3?style=flat-square&label=%E2%AD%90) | ![npm downloads](https://img.shields.io/npm/dw/better-sqlite3?style=flat-square&label=%F0%9F%93%A5%2Fwk) |
 | [commander](https://github.com/tj/commander.js) | CLI argument parsing | ![GitHub stars](https://img.shields.io/github/stars/tj/commander.js?style=flat-square&label=%E2%AD%90) | ![npm downloads](https://img.shields.io/npm/dw/commander?style=flat-square&label=%F0%9F%93%A5%2Fwk) |
 | [web-tree-sitter](https://github.com/tree-sitter/tree-sitter) | WASM tree-sitter bindings | ![GitHub stars](https://img.shields.io/github/stars/tree-sitter/tree-sitter?style=flat-square&label=%E2%AD%90) | ![npm downloads](https://img.shields.io/npm/dw/web-tree-sitter?style=flat-square&label=%F0%9F%93%A5%2Fwk) |
 
diff --git a/crates/codegraph-core/src/ast_db.rs b/crates/codegraph-core/src/ast_db.rs
index b67b94fc..400878e1 100644
--- a/crates/codegraph-core/src/ast_db.rs
+++ b/crates/codegraph-core/src/ast_db.rs
@@ -7,7 +7,7 @@
 use std::collections::HashMap;
 
 use napi_derive::napi;
-use rusqlite::{params, Connection, OpenFlags};
+use rusqlite::{params, Connection};
 use serde::{Deserialize, Serialize};
 
 /// A single AST node to insert (received from JS).
@@ -62,28 +62,9 @@ fn find_parent_id(defs: &[NodeDef], line: u32) -> Option<i64> {
     best_id
 }
 
-/// Bulk-insert AST nodes into the database, resolving `parent_node_id`
-/// from the `nodes` table. Runs all inserts in a single SQLite transaction.
-///
-/// Returns the number of rows inserted. Returns 0 on any error (DB open
-/// failure, missing table, transaction failure).
-#[napi]
-pub fn bulk_insert_ast_nodes(db_path: String, batches: Vec<FileAstBatch>) -> u32 {
-    if batches.is_empty() {
-        return 0;
-    }
-
-    let flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
-    let conn = match Connection::open_with_flags(&db_path, flags) {
-        Ok(c) => c,
-        Err(_) => return 0,
-    };
-
-    // Match the JS-side performance pragmas (including busy_timeout for WAL contention)
-    let _ = conn.execute_batch("PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000");
-
-    do_insert_ast_nodes(&conn, &batches).unwrap_or(0)
-}
+// NOTE: The standalone `bulk_insert_ast_nodes` napi export was removed in Phase 6.17.
+// All callers now use `NativeDatabase::bulk_insert_ast_nodes()` which reuses the
+// persistent connection, eliminating the double-connection antipattern.
 
 /// Internal implementation: insert AST nodes using an existing connection.
 /// Used by both the standalone `bulk_insert_ast_nodes` function and `NativeDatabase`.
diff --git a/crates/codegraph-core/src/edges_db.rs b/crates/codegraph-core/src/edges_db.rs
index 1d4ba297..518d1578 100644
--- a/crates/codegraph-core/src/edges_db.rs
+++ b/crates/codegraph-core/src/edges_db.rs
@@ -5,7 +5,7 @@
 //! implements edges directly to SQLite without marshaling back to JS.
 
 use napi_derive::napi;
-use rusqlite::{Connection, OpenFlags};
+use rusqlite::Connection;
 
 /// A single edge row to insert: [source_id, target_id, kind, confidence, dynamic].
 #[napi(object)]
@@ -20,25 +20,9 @@ pub struct EdgeRow {
     pub dynamic: u32,
 }
 
-/// Bulk-insert edge rows into the database via rusqlite.
-/// Runs all writes in a single SQLite transaction with chunked multi-value
-/// INSERT statements for maximum throughput.
-///
-/// Returns `true` on success, `false` on any error so the JS caller can
-/// fall back to the JS batch insert path.
-#[napi]
-pub fn bulk_insert_edges(db_path: String, edges: Vec<EdgeRow>) -> bool {
-    if edges.is_empty() {
-        return true;
-    }
-    let flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
-    let conn = match Connection::open_with_flags(&db_path, flags) {
-        Ok(c) => c,
-        Err(_) => return false,
-    };
-    let _ = conn.execute_batch("PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000");
-    do_insert_edges(&conn, &edges).is_ok()
-}
+// NOTE: The standalone `bulk_insert_edges` napi export was removed in Phase 6.17.
+// All callers now use `NativeDatabase::bulk_insert_edges()` which reuses the
+// persistent connection, eliminating the double-connection antipattern.
 
 /// 199 rows × 5 params = 995 bind parameters per statement, safely under
 /// the legacy `SQLITE_MAX_VARIABLE_NUMBER` default of 999.
diff --git a/crates/codegraph-core/src/insert_nodes.rs b/crates/codegraph-core/src/insert_nodes.rs
index 1f594d19..c680eb31 100644
--- a/crates/codegraph-core/src/insert_nodes.rs
+++ b/crates/codegraph-core/src/insert_nodes.rs
@@ -7,7 +7,7 @@
 use std::collections::HashMap;
 
 use napi_derive::napi;
-use rusqlite::{params, Connection, OpenFlags};
+use rusqlite::{params, Connection};
 use serde::{Deserialize, Serialize};
 
 // ── Input types (received from JS via napi) ─────────────────────────
@@ -63,28 +63,9 @@ pub struct FileHashEntry {
 
 // ── Public napi entry point ─────────────────────────────────────────
 
-/// Bulk-insert nodes, children, containment edges, exports, and file hashes
-/// into the database. Runs all writes in a single SQLite transaction.
-///
-/// Returns `true` on success, `false` on any error (DB open failure,
-/// missing table, transaction failure) so the JS caller can fall back.
-#[napi]
-pub fn bulk_insert_nodes(
-    db_path: String,
-    batches: Vec<InsertNodesBatch>,
-    file_hashes: Vec<FileHashEntry>,
-    removed_files: Vec<String>,
-) -> bool {
-    let flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
-    let conn = match Connection::open_with_flags(&db_path, flags) {
-        Ok(c) => c,
-        Err(_) => return false,
-    };
-
-    let _ = conn.execute_batch("PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000");
-
-    do_insert_nodes(&conn, &batches, &file_hashes, &removed_files).is_ok()
-}
+// NOTE: The standalone `bulk_insert_nodes` napi export was removed in Phase 6.17.
+// All callers now use `NativeDatabase::bulk_insert_nodes()` which reuses the
+// persistent connection, eliminating the double-connection antipattern.
 
 // ── Internal implementation ─────────────────────────────────────────
 
diff --git a/crates/codegraph-core/src/native_db.rs b/crates/codegraph-core/src/native_db.rs
index a01cb1b3..e773740a 100644
--- a/crates/codegraph-core/src/native_db.rs
+++ b/crates/codegraph-core/src/native_db.rs
@@ -305,8 +305,15 @@ impl NativeDatabase {
             | OpenFlags::SQLITE_OPEN_NO_MUTEX;
         let conn = Connection::open_with_flags(&db_path, flags)
             .map_err(|e| napi::Error::from_reason(format!("Failed to open DB: {e}")))?;
+        // 64 entries comfortably holds the 40+ prepare_cached() queries in read_queries.rs
+        // plus build-path queries, avoiding LRU eviction (default is 16).
+        conn.set_prepared_statement_cache_capacity(64);
         conn.execute_batch(
-            "PRAGMA journal_mode = WAL; PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000;",
+            "PRAGMA journal_mode = WAL; \
+             PRAGMA synchronous = NORMAL; \
+             PRAGMA busy_timeout = 5000; \
+             PRAGMA mmap_size = 268435456; \
+             PRAGMA temp_store = MEMORY;",
         )
         .map_err(|e| napi::Error::from_reason(format!("Failed to set pragmas: {e}")))?;
         Ok(Self {
@@ -321,8 +328,13 @@ impl NativeDatabase {
         let flags = OpenFlags::SQLITE_OPEN_READ_ONLY | OpenFlags::SQLITE_OPEN_NO_MUTEX;
         let conn = Connection::open_with_flags(&db_path, flags)
             .map_err(|e| napi::Error::from_reason(format!("Failed to open DB readonly: {e}")))?;
-        conn.execute_batch("PRAGMA busy_timeout = 5000;")
-            .map_err(|e| napi::Error::from_reason(format!("Failed to set pragmas: {e}")))?;
+        conn.set_prepared_statement_cache_capacity(64);
+        conn.execute_batch(
+            "PRAGMA busy_timeout = 5000; \
+             PRAGMA mmap_size = 268435456; \
+             PRAGMA temp_store = MEMORY;",
+        )
+        .map_err(|e| napi::Error::from_reason(format!("Failed to set pragmas: {e}")))?;
         Ok(Self {
             conn: SendWrapper::new(Some(conn)),
             db_path,
diff --git a/crates/codegraph-core/src/roles_db.rs b/crates/codegraph-core/src/roles_db.rs
index 24f36e84..a901f392 100644
--- a/crates/codegraph-core/src/roles_db.rs
+++ b/crates/codegraph-core/src/roles_db.rs
@@ -8,7 +8,7 @@
 use std::collections::HashMap;
 
 use napi_derive::napi;
-use rusqlite::{Connection, OpenFlags};
+use rusqlite::Connection;
 
 // ── Constants ────────────────────────────────────────────────────────
 
@@ -68,30 +68,10 @@ pub struct RoleSummary {
 
 // ── Public napi entry points ─────────────────────────────────────────
 
-/// Full role classification: queries all nodes, computes fan-in/fan-out,
-/// classifies roles, and batch-updates the `role` column.
-/// Returns a summary of role counts, or null on failure.
-#[napi]
-pub fn classify_roles_full(db_path: String) -> Option<RoleSummary> {
-    let flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
-    let conn = Connection::open_with_flags(&db_path, flags).ok()?;
-    let _ = conn.execute_batch("PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000");
-    do_classify_full(&conn).ok()
-}
-
-/// Incremental role classification: only reclassifies nodes from changed files
-/// plus their immediate edge neighbours.
-/// Returns a summary of role counts for the affected nodes, or null on failure.
-#[napi]
-pub fn classify_roles_incremental(
-    db_path: String,
-    changed_files: Vec<String>,
-) -> Option<RoleSummary> {
-    let flags = OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_NO_MUTEX;
-    let conn = Connection::open_with_flags(&db_path, flags).ok()?;
-    let _ = conn.execute_batch("PRAGMA synchronous = NORMAL; PRAGMA busy_timeout = 5000");
-    do_classify_incremental(&conn, &changed_files).ok()
-}
+// NOTE: The standalone `classify_roles_full` and `classify_roles_incremental`
+// napi exports were removed in Phase 6.17. All callers now use the corresponding
+// NativeDatabase methods which reuse the persistent connection, eliminating the
+// double-connection antipattern.
 
 // ── Shared helpers ───────────────────────────────────────────────────
 
diff --git a/src/db/better-sqlite3.ts b/src/db/better-sqlite3.ts
new file mode 100644
index 00000000..a471fde1
--- /dev/null
+++ b/src/db/better-sqlite3.ts
@@ -0,0 +1,20 @@
+/**
+ * Lazy-loaded better-sqlite3 constructor.
+ *
+ * Centralises the `createRequire` + cache pattern so every call site that
+ * needs a JS-side SQLite handle can `import { getDatabase } from '…/db/better-sqlite3.js'`
+ * instead of duplicating the boilerplate.  The native engine path (NativeDatabase /
+ * rusqlite) never touches this module.
+ */
+import { createRequire } from 'node:module';
+
+const _require = createRequire(import.meta.url);
+let _Database: any;
+
+/** Return the `better-sqlite3` Database constructor, loading it on first call. */
+export function getDatabase(): new (...args: any[]) => any {
+  if (!_Database) {
+    _Database = _require('better-sqlite3');
+  }
+  return _Database;
+}
diff --git a/src/db/connection.ts b/src/db/connection.ts
index e048b5de..058e51af 100644
--- a/src/db/connection.ts
+++ b/src/db/connection.ts
@@ -2,11 +2,11 @@ import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import Database from 'better-sqlite3';
 import { debug, warn } from '../infrastructure/logger.js';
 import { getNative, isNativeAvailable } from '../infrastructure/native.js';
 import { DbError } from '../shared/errors.js';
 import type { BetterSqlite3Database, NativeDatabase } from '../types.js';
+import { getDatabase } from './better-sqlite3.js';
 import { Repository } from './repository/base.js';
 import { NativeRepository } from './repository/native-repository.js';
 import { SqliteRepository } from './repository/sqlite-repository.js';
@@ -150,6 +150,7 @@ export function openDb(dbPath: string): LockedDatabase {
   const dir = path.dirname(dbPath);
   if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
   acquireAdvisoryLock(dbPath);
+  const Database = getDatabase();
   const db = new Database(dbPath) as unknown as LockedDatabase;
   db.pragma('journal_mode = WAL');
   db.pragma('busy_timeout = 5000');
@@ -295,6 +296,7 @@ export function openReadonlyOrFail(customPath?: string): BetterSqlite3Database {
       { file: dbPath },
     );
   }
+  const Database = getDatabase();
   const db = new Database(dbPath, { readonly: true }) as unknown as BetterSqlite3Database;
 
   // Warn once per process if the DB was built with a different codegraph version
diff --git a/src/domain/graph/builder/stages/build-edges.ts b/src/domain/graph/builder/stages/build-edges.ts
index f5fc1794..626d5e6d 100644
--- a/src/domain/graph/builder/stages/build-edges.ts
+++ b/src/domain/graph/builder/stages/build-edges.ts
@@ -673,7 +673,7 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
 
     // When using native edge insert, skip JS insert here — do it after tx commits.
     // Otherwise insert edges within this transaction for atomicity.
-    const useNativeEdgeInsert = !!(ctx.nativeDb?.bulkInsertEdges || native?.bulkInsertEdges);
+    const useNativeEdgeInsert = !!ctx.nativeDb?.bulkInsertEdges;
     if (!useNativeEdgeInsert) {
       batchInsertEdges(db, allEdgeRows);
     }
@@ -681,9 +681,9 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
   computeEdgesTx();
 
   // Phase 2: Native rusqlite bulk insert (outside better-sqlite3 transaction
-  // to avoid SQLITE_BUSY contention). Prefer NativeDatabase persistent
-  // connection (6.15), fall back to standalone function (6.12).
-  if ((ctx.nativeDb?.bulkInsertEdges || native?.bulkInsertEdges) && allEdgeRows.length > 0) {
+  // to avoid SQLITE_BUSY contention). Uses NativeDatabase persistent connection.
+  // Standalone napi functions were removed in 6.17.
+  if (ctx.nativeDb?.bulkInsertEdges && allEdgeRows.length > 0) {
     const nativeEdges = allEdgeRows.map((r) => ({
       sourceId: r[0],
       targetId: r[1],
@@ -691,12 +691,7 @@ export async function buildEdges(ctx: PipelineContext): Promise<void> {
       confidence: r[3],
       dynamic: r[4],
     }));
-    let ok: boolean;
-    if (ctx.nativeDb?.bulkInsertEdges) {
-      ok = ctx.nativeDb.bulkInsertEdges(nativeEdges);
-    } else {
-      ok = native!.bulkInsertEdges(db.name, nativeEdges);
-    }
+    const ok = ctx.nativeDb.bulkInsertEdges(nativeEdges);
     if (!ok) {
       debug('Native bulkInsertEdges failed — falling back to JS batchInsertEdges');
       batchInsertEdges(db, allEdgeRows);
diff --git a/src/domain/graph/builder/stages/build-structure.ts b/src/domain/graph/builder/stages/build-structure.ts
index ab8ec295..5030a823 100644
--- a/src/domain/graph/builder/stages/build-structure.ts
+++ b/src/domain/graph/builder/stages/build-structure.ts
@@ -6,7 +6,6 @@
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { debug } from '#infrastructure/logger.js';
-import { loadNative } from '#infrastructure/native.js';
 import { normalizePath } from '#shared/constants.js';
 import type { ExtractorOutput } from '#types';
 import type { PipelineContext } from '../context.js';
@@ -95,7 +94,8 @@ export async function buildStructure(ctx: PipelineContext): Promise<void> {
   try {
     let roleSummary: Record<string, number> | null = null;
 
-    // Try NativeDatabase persistent connection first (6.15), then standalone (6.12)
+    // Use NativeDatabase persistent connection (Phase 6.15+).
+    // Standalone napi functions were removed in 6.17 — falls through to JS if nativeDb unavailable.
     if (ctx.nativeDb?.classifyRolesFull) {
       const nativeResult =
         changedFileList && changedFileList.length > 0
@@ -116,30 +116,6 @@ export async function buildStructure(ctx: PipelineContext): Promise<void> {
           leaf: nativeResult.leaf,
         };
       }
-    } else if (ctx.engineName === 'native') {
-      const native = loadNative();
-      if (native?.classifyRolesFull) {
-        const dbPath = db.name;
-        const nativeResult =
-          changedFileList && changedFileList.length > 0
-            ? native.classifyRolesIncremental?.(dbPath, changedFileList)
-            : native.classifyRolesFull(dbPath);
-        if (nativeResult) {
-          roleSummary = {
-            entry: nativeResult.entry,
-            core: nativeResult.core,
-            utility: nativeResult.utility,
-            adapter: nativeResult.adapter,
-            dead: nativeResult.dead,
-            'dead-leaf': nativeResult.deadLeaf,
-            'dead-entry': nativeResult.deadEntry,
-            'dead-ffi': nativeResult.deadFfi,
-            'dead-unresolved': nativeResult.deadUnresolved,
-            'test-only': nativeResult.testOnly,
-            leaf: nativeResult.leaf,
-          };
-        }
-      }
     }
 
     // Fall back to JS path
diff --git a/src/domain/graph/builder/stages/insert-nodes.ts b/src/domain/graph/builder/stages/insert-nodes.ts
index c6197a55..32cebfd5 100644
--- a/src/domain/graph/builder/stages/insert-nodes.ts
+++ b/src/domain/graph/builder/stages/insert-nodes.ts
@@ -11,7 +11,6 @@
 import path from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { bulkNodeIdsByFile } from '../../../../db/index.js';
-import { loadNative } from '../../../../infrastructure/native.js';
 import type {
   BetterSqlite3Database,
   ExtractorOutput,
@@ -40,13 +39,11 @@ interface PrecomputedFileData {
 // ── Native fast-path ─────────────────────────────────────────────────
 
 function tryNativeInsert(ctx: PipelineContext): boolean {
-  // Prefer NativeDatabase persistent connection (6.15), fall back to standalone (6.12)
-  const hasNativeDb = !!ctx.nativeDb?.bulkInsertNodes;
-  const native = hasNativeDb ? null : loadNative();
-  if (!hasNativeDb && !native?.bulkInsertNodes) return false;
+  // Use NativeDatabase persistent connection (Phase 6.15+).
+  // Standalone napi functions were removed in 6.17 — falls through to JS if nativeDb unavailable.
+  if (!ctx.nativeDb?.bulkInsertNodes) return false;
 
-  const { dbPath, allSymbols, filesToParse, metadataUpdates, rootDir, removed } = ctx;
-  if (!hasNativeDb && !dbPath) return false;
+  const { allSymbols, filesToParse, metadataUpdates, rootDir, removed } = ctx;
 
   // Marshal allSymbols → InsertNodesBatch[]
   const batches: Array<{
@@ -141,11 +138,7 @@ function tryNativeInsert(ctx: PipelineContext): boolean {
     fileHashes.push({ file: item.relPath, hash: item.hash, mtime, size });
   }
 
-  // Route through persistent NativeDatabase when available (6.15)
-  if (ctx.nativeDb?.bulkInsertNodes) {
-    return ctx.nativeDb.bulkInsertNodes(batches, fileHashes, removed);
-  }
-  return native!.bulkInsertNodes(dbPath!, batches, fileHashes, removed);
+  return ctx.nativeDb.bulkInsertNodes(batches, fileHashes, removed);
 }
 
 // ── JS fallback: Phase 1 ────────────────────────────────────────────
diff --git a/src/features/ast.ts b/src/features/ast.ts
index b92a9e4e..01cc984c 100644
--- a/src/features/ast.ts
+++ b/src/features/ast.ts
@@ -6,7 +6,6 @@ import { createAstStoreVisitor } from '../ast-analysis/visitors/ast-store-visito
 import { bulkNodeIdsByFile, openReadonlyOrFail } from '../db/index.js';
 import { buildFileConditionSQL } from '../db/query-builder.js';
 import { debug } from '../infrastructure/logger.js';
-import { loadNative } from '../infrastructure/native.js';
 import { outputResult } from '../infrastructure/result-formatter.js';
 import { paginateResult } from '../shared/paginate.js';
 import type { ASTNodeKind, BetterSqlite3Database, Definition, TreeSitterNode } from '../types.js';
@@ -84,10 +83,10 @@ export async function buildAstNodes(
   },
 ): Promise<void> {
   // ── Native bulk-insert fast path ──────────────────────────────────────
-  // Prefer NativeDatabase persistent connection (6.15), then standalone (6.12)
+  // Uses NativeDatabase persistent connection (Phase 6.15+).
+  // Standalone napi functions were removed in 6.17.
   const nativeDb = engineOpts?.nativeDb;
-  const native = nativeDb ? null : loadNative();
-  if (nativeDb?.bulkInsertAstNodes || native?.bulkInsertAstNodes) {
+  if (nativeDb?.bulkInsertAstNodes) {
     let needsJsFallback = false;
     const batches: Array<{
       file: string;
@@ -120,9 +119,7 @@ export async function buildAstNodes(
 
     if (!needsJsFallback) {
       const expectedNodes = batches.reduce((s, b) => s + b.nodes.length, 0);
-      const inserted = nativeDb
-        ? nativeDb.bulkInsertAstNodes(batches)
-        : native!.bulkInsertAstNodes(db.name, batches);
+      const inserted = nativeDb.bulkInsertAstNodes(batches);
       if (inserted === expectedNodes) {
         debug(`AST extraction (native bulk): ${inserted} nodes stored`);
         return;
diff --git a/src/features/branch-compare.ts b/src/features/branch-compare.ts
index e7855eb5..f9f849a2 100644
--- a/src/features/branch-compare.ts
+++ b/src/features/branch-compare.ts
@@ -2,7 +2,7 @@ import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import Database from 'better-sqlite3';
+import { getDatabase } from '../db/better-sqlite3.js';
 import { buildGraph } from '../domain/graph/builder.js';
 import { kindIcon } from '../domain/queries.js';
 import { isTestFile } from '../infrastructure/test-filter.js';
@@ -105,6 +105,7 @@ function loadSymbolsFromDb(
   changedFiles: string[],
   noTests: boolean,
 ): Map<string, SymbolInfo> {
+  const Database = getDatabase();
   const db = new Database(dbPath, { readonly: true });
   try {
     const symbols = new Map<string, SymbolInfo>();
@@ -174,6 +175,7 @@ function loadCallersFromDb(
 ): CallerInfo[] {
   if (nodeIds.length === 0) return [];
 
+  const Database = getDatabase();
   const db = new Database(dbPath, { readonly: true });
   try {
     const allCallers = new Set<string>();
diff --git a/src/features/snapshot.ts b/src/features/snapshot.ts
index 1345fa9a..c4dbd469 100644
--- a/src/features/snapshot.ts
+++ b/src/features/snapshot.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import Database from 'better-sqlite3';
+import { getDatabase } from '../db/better-sqlite3.js';
 import { findDbPath } from '../db/index.js';
 import { debug } from '../infrastructure/logger.js';
 import { ConfigError, DbError } from '../shared/errors.js';
@@ -47,6 +47,7 @@ export function snapshotSave(
 
   fs.mkdirSync(dir, { recursive: true });
 
+  const Database = getDatabase();
   const db = new Database(dbPath, { readonly: true });
   try {
     db.exec(`VACUUM INTO '${dest.replace(/'/g, "''")}'`);
diff --git a/src/types.ts b/src/types.ts
index 718ec319..91b89d10 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1804,81 +1804,6 @@ export interface NativeAddon {
   computeConfidence(callerFile: string, targetFile: string, importedFrom: string | null): number;
   detectCycles(edges: Array<{ source: string; target: string }>): string[][];
   buildCallEdges(files: unknown[], nodes: unknown[], builtinReceivers: string[]): unknown[];
-  bulkInsertAstNodes(
-    dbPath: string,
-    batches: Array<{
-      file: string;
-      nodes: Array<{
-        line: number;
-        kind: string;
-        name: string;
-        text?: string | null;
-        receiver?: string | null;
-      }>;
-    }>,
-  ): number;
-  bulkInsertNodes(
-    dbPath: string,
-    batches: Array<{
-      file: string;
-      definitions: Array<{
-        name: string;
-        kind: string;
-        line: number;
-        endLine?: number | null;
-        visibility?: string | null;
-        children: Array<{
-          name: string;
-          kind: string;
-          line: number;
-          endLine?: number | null;
-          visibility?: string | null;
-        }>;
-      }>;
-      exports: Array<{ name: string; kind: string; line: number }>;
-    }>,
-    fileHashes: Array<{ file: string; hash: string; mtime: number; size: number }>,
-    removedFiles: string[],
-  ): boolean;
-  bulkInsertEdges(
-    dbPath: string,
-    edges: Array<{
-      sourceId: number;
-      targetId: number;
-      kind: string;
-      confidence: number;
-      dynamic: number;
-    }>,
-  ): boolean;
-  classifyRolesFull(dbPath: string): {
-    entry: number;
-    core: number;
-    utility: number;
-    adapter: number;
-    dead: number;
-    deadLeaf: number;
-    deadEntry: number;
-    deadFfi: number;
-    deadUnresolved: number;
-    testOnly: number;
-    leaf: number;
-  } | null;
-  classifyRolesIncremental(
-    dbPath: string,
-    changedFiles: string[],
-  ): {
-    entry: number;
-    core: number;
-    utility: number;
-    adapter: number;
-    dead: number;
-    deadLeaf: number;
-    deadEntry: number;
-    deadFfi: number;
-    deadUnresolved: number;
-    testOnly: number;
-    leaf: number;
-  } | null;
   engineVersion(): string;
   ParseTreeCache: new () => NativeParseTreeCache;
   NativeDatabase: {
diff --git a/tests/integration/build-parity.test.ts b/tests/integration/build-parity.test.ts
index a059d452..f03ecea0 100644
--- a/tests/integration/build-parity.test.ts
+++ b/tests/integration/build-parity.test.ts
@@ -56,8 +56,24 @@ function readGraph(dbPath) {
     ORDER BY n1.name, n2.name, e.kind
   `)
     .all();
+  const roles = db
+    .prepare(
+      "SELECT name, role FROM nodes WHERE role IS NOT NULL AND kind != 'constant' ORDER BY name, role",
+    )
+    .all();
+
+  // ast_nodes may not exist on older schemas — read if available
+  let astNodes: unknown[] = [];
+  try {
+    astNodes = db
+      .prepare('SELECT file, line, kind, name FROM ast_nodes ORDER BY file, line, kind, name')
+      .all();
+  } catch {
+    /* table may not exist */
+  }
+
   db.close();
-  return { nodes, edges };
+  return { nodes, edges, roles, astNodes };
 }
 
 describeOrSkip('Build parity: native vs WASM', () => {
@@ -98,4 +114,17 @@ describeOrSkip('Build parity: native vs WASM', () => {
     const nativeGraph = readGraph(path.join(nativeDir, '.codegraph', 'graph.db'));
     expect(nativeGraph.edges).toEqual(wasmGraph.edges);
   });
+
+  it('produces identical roles', () => {
+    const wasmGraph = readGraph(path.join(wasmDir, '.codegraph', 'graph.db'));
+    const nativeGraph = readGraph(path.join(nativeDir, '.codegraph', 'graph.db'));
+    expect(nativeGraph.roles).toEqual(wasmGraph.roles);
+  });
+
+  // Skip: WASM ast-store-visitor does not extract call-site AST nodes (#674)
+  it.skip('produces identical ast_nodes', () => {
+    const wasmGraph = readGraph(path.join(wasmDir, '.codegraph', 'graph.db'));
+    const nativeGraph = readGraph(path.join(nativeDir, '.codegraph', 'graph.db'));
+    expect(nativeGraph.astNodes).toEqual(wasmGraph.astNodes);
+  });
 });