diff --git a/gitnexus/scripts/build-tree-sitter-dart.cjs b/gitnexus/scripts/build-tree-sitter-dart.cjs
index 60da9a751..7a32c045a 100644
--- a/gitnexus/scripts/build-tree-sitter-dart.cjs
+++ b/gitnexus/scripts/build-tree-sitter-dart.cjs
@@ -26,6 +26,94 @@ try {
     process.exit(0);
   }
 
+  // ── Patch NAN → NAPI bindings ──────────────────────────────────────────
+  // tree-sitter-dart@1.0.0 ships old NAN-style bindings that are
+  // incompatible with the tree-sitter@0.21.x runtime bundled by GitNexus.
+  // Rewrite binding.cc, binding.gyp, and index.js to NAPI style (same
+  // pattern used by tree-sitter-go, tree-sitter-python, etc.).
+  const bindingCc = path.join(dartDir, 'bindings', 'node', 'binding.cc');
+  const indexJs = path.join(dartDir, 'bindings', 'node', 'index.js');
+
+  if (fs.existsSync(bindingCc)) {
+    const currentCc = fs.readFileSync(bindingCc, 'utf8');
+    if (currentCc.includes('Nan::') || !currentCc.includes('Napi::')) {
+      console.log('[tree-sitter-dart] Patching binding.cc (NAN → NAPI)...');
+      fs.writeFileSync(
+        bindingCc,
+        [
+          '#include <napi.h>',
+          '',
+          'typedef struct TSLanguage TSLanguage;',
+          '',
+          'extern "C" TSLanguage *tree_sitter_dart();',
+          '',
+          '// "tree-sitter", "language" is a convention that lets the',
+          '// temporary `node-tree-sitter` binding find the language.',
+          'Napi::Object Init(Napi::Env env, Napi::Object exports) {',
+          '  exports["name"] = Napi::String::New(env, "dart");',
+          '  auto language = Napi::External<TSLanguage>::New(env, tree_sitter_dart());',
+          '  language.TypeTag(&language);',
+          '  exports["language"] = language;',
+          '  return exports;',
+          '}',
+          '',
+          'NODE_API_MODULE(tree_sitter_dart_binding, Init)',
+          '',
+        ].join('\n'),
+      );
+    }
+  }
+
+  if (fs.existsSync(bindingGyp)) {
+    const currentGyp = fs.readFileSync(bindingGyp, 'utf8');
+    if (currentGyp.includes('nan') || !currentGyp.includes('node-addon-api')) {
+      console.log('[tree-sitter-dart] Patching binding.gyp (NAN → NAPI)...');
+      fs.writeFileSync(
+        bindingGyp,
+        JSON.stringify(
+          {
+            targets: [
+              {
+                target_name: 'tree_sitter_dart_binding',
+                dependencies: ['<!(node -p "require(\'node-addon-api\').targets"):node_addon_api'],
+                include_dirs: ['src'],
+                sources: ['bindings/node/binding.cc', 'src/parser.c', 'src/scanner.c'],
+                cflags_c: ['-std=c11'],
+                cflags_cc: ['-std=c++17'],
+                defines: ['NAPI_VERSION=8', 'NODE_ADDON_API_DISABLE_DEPRECATED'],
+                xcode_settings: {
+                  OTHER_CFLAGS: ['-std=c11'],
+                  OTHER_CPLUSPLUSFLAGS: ['-std=c++17'],
+                },
+              },
+            ],
+          },
+          null,
+          2,
+        ) + '\n',
+      );
+    }
+  }
+
+  if (fs.existsSync(indexJs)) {
+    const currentIdx = fs.readFileSync(indexJs, 'utf8');
+    if (!currentIdx.includes('node-gyp-build')) {
+      console.log('[tree-sitter-dart] Patching index.js (node-gyp-build loader)...');
+      fs.writeFileSync(
+        indexJs,
+        [
+          'try {',
+          "  module.exports = require('node-gyp-build')(__dirname + '/../..');",
+          '} catch (e) {',
+          "  throw new Error('tree-sitter-dart native binding not found: ' + e.message);",
+          '}',
+          '',
+        ].join('\n'),
+      );
+    }
+  }
+
+  // ── Build ──────────────────────────────────────────────────────────────
   console.log('[tree-sitter-dart] Building native binding...');
   execSync('npx node-gyp rebuild', {
     cwd: dartDir,
diff --git a/gitnexus/src/core/ingestion/tree-sitter-queries.ts b/gitnexus/src/core/ingestion/tree-sitter-queries.ts
index 8e165a837..88a127eb6 100644
--- a/gitnexus/src/core/ingestion/tree-sitter-queries.ts
+++ b/gitnexus/src/core/ingestion/tree-sitter-queries.ts
@@ -1330,13 +1330,6 @@ export const DART_QUERIES = `
     (initialized_identifier
       (identifier) @name))) @definition.property
 
-; ── Nullable field declarations (String? name) ──────────────────────────────
-(declaration
-  (nullable_type)
-  (initialized_identifier_list
-    (initialized_identifier
-      (identifier) @name))) @definition.property
-
 ; ── Getters ──────────────────────────────────────────────────────────────────
 (method_signature
   (getter_signature