gitnexus 1.6.11 → 1.6.12-rc.2

package/README.md

@@ -631,7 +631,7 @@ results until you re-run `gitnexus analyze --repair-fts` from a shell where the
 
 ### Installation fails with native module errors
 
-Some optional language grammars (Dart, Proto, Swift, Kotlin) require native compilation. If they fail, GitNexus still works — those languages will be skipped. To skip them intentionally (no C++ toolchain needed), set `GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1` before installing. Zig (`@tree-sitter-grammars/tree-sitter-zig`, an npm `optionalDependency`) behaves the same way: if its native binding fails to install, `.zig` files are skipped.
+Some optional language grammars (Dart, Proto, Swift, Kotlin, Zig) ship vendored native prebuilds. If a prebuild is missing and a source build is not possible, GitNexus still works — those languages will be skipped. To skip them intentionally (no C++ toolchain needed), set `GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1` before installing.
 
 If `npm install -g gitnexus` fails on native modules:
 

package/dist/cli/optional-grammars.d.ts

@@ -1,14 +1,13 @@
 /**
  * Optional grammar availability check.
  *
- * tree-sitter-dart, -proto, -swift, and -kotlin are vendored under vendor/ and
- * loaded from there by absolute path (NEVER copied into node_modules — see
- * core/tree-sitter/vendored-grammars.ts / #2111). Each ships committed platform
- * prebuilds activated via node-gyp-build. All can be skipped via
- * GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1 (postinstall scripts), or can silently
- * soft-fail when no prebuild matches the host platform (and a source build was
- * unavailable / not attempted). tree-sitter-zig is the one npm-installed
- * optionalDependency in the list; its `probe` overrides the vendored load.
+ * tree-sitter-dart, -proto, -swift, -kotlin, and -zig are vendored under
+ * vendor/ and loaded from there by absolute path (NEVER copied into
+ * node_modules — see core/tree-sitter/vendored-grammars.ts / #2111). Each
+ * ships committed platform prebuilds activated via node-gyp-build. All can
+ * be skipped via GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1 (postinstall scripts), or
+ * can silently soft-fail when no prebuild matches the host platform (and a
+ * source build was unavailable / not attempted).
  *
  * Either path produces the same observable: the .node binding is absent
  * at runtime. This helper detects that condition and surfaces a single

package/dist/cli/optional-grammars.js

@@ -1,26 +1,23 @@
 /**
  * Optional grammar availability check.
  *
- * tree-sitter-dart, -proto, -swift, and -kotlin are vendored under vendor/ and
- * loaded from there by absolute path (NEVER copied into node_modules — see
- * core/tree-sitter/vendored-grammars.ts / #2111). Each ships committed platform
- * prebuilds activated via node-gyp-build. All can be skipped via
- * GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1 (postinstall scripts), or can silently
- * soft-fail when no prebuild matches the host platform (and a source build was
- * unavailable / not attempted). tree-sitter-zig is the one npm-installed
- * optionalDependency in the list; its `probe` overrides the vendored load.
+ * tree-sitter-dart, -proto, -swift, -kotlin, and -zig are vendored under
+ * vendor/ and loaded from there by absolute path (NEVER copied into
+ * node_modules — see core/tree-sitter/vendored-grammars.ts / #2111). Each
+ * ships committed platform prebuilds activated via node-gyp-build. All can
+ * be skipped via GITNEXUS_SKIP_OPTIONAL_GRAMMARS=1 (postinstall scripts), or
+ * can silently soft-fail when no prebuild matches the host platform (and a
+ * source build was unavailable / not attempted).
  *
  * Either path produces the same observable: the .node binding is absent
  * at runtime. This helper detects that condition and surfaces a single
  * stderr line per missing grammar so users learn why .dart/.proto/.swift/.kt/.zig
  * support is unavailable instead of silently getting a degraded index.
  */
-import { createRequire } from 'node:module';
 import { SupportedLanguages } from '../_shared/index.js';
 import { isGrammarRuntimeSkipped } from '../core/tree-sitter/parser-loader.js';
 import { requireVendoredGrammar } from '../core/tree-sitter/vendored-grammars.js';
 import { cliWarn } from './cli-message.js';
-const _require = createRequire(import.meta.url);
 const OPTIONAL_GRAMMARS = [
     {
         name: 'tree-sitter-dart',
@@ -43,11 +40,9 @@ const OPTIONAL_GRAMMARS = [
     },
     {
         name: 'tree-sitter-zig',
-        pkg: '@tree-sitter-grammars/tree-sitter-zig',
+        pkg: 'tree-sitter-zig',
         extensions: ['.zig'],
         language: SupportedLanguages.Zig,
-        // npm optionalDependency, not vendored — probe via plain require.
-        probe: () => _require('@tree-sitter-grammars/tree-sitter-zig'),
     },
 ];
 /**
@@ -84,12 +79,7 @@ export function detectMissingOptionalGrammars() {
             continue;
         }
         try {
-            if (g.probe !== undefined) {
-                g.probe();
-            }
-            else {
-                requireVendoredGrammar(g.pkg);
-            }
+            requireVendoredGrammar(g.pkg);
         }
         catch (err) {
             const code = err?.code;

package/dist/core/ingestion/languages/zig/query.js

@@ -1,14 +1,13 @@
 import Parser from 'tree-sitter';
-import { createRequire } from 'node:module';
-const _require = createRequire(import.meta.url);
+import { requireVendoredGrammar } from '../../../tree-sitter/vendored-grammars.js';
 /**
  * Zig scope-resolution query (RFC #909 Ring 3).
  *
- * The grammar is an optionalDependency (`@tree-sitter-grammars/tree-sitter-zig`),
- * so the language module is required lazily and `getZigParser` /
- * `getZigScopeQuery` throw only when actually invoked without the grammar
- * installed. That is safe: the parse pipeline filters `.zig` files through
- * `parser-loader.isLanguageAvailable` before any scope extraction runs.
+ * The grammar is vendored (`vendor/tree-sitter-zig`) and may be absent on a
+ * platform without a prebuild, so the language module is required lazily and
+ * `getZigParser` / `getZigScopeQuery` throw only when actually invoked without
+ * the grammar installed. That is safe: the parse pipeline filters `.zig` files
+ * through `parser-loader.isLanguageAvailable` before any scope extraction runs.
  *
  * Zig specifics encoded here:
  *   - Containers (struct/enum/union/opaque) are anonymous nodes bound by the
@@ -409,7 +408,7 @@ const ZIG_SCOPE_QUERY = `
 let _parser = null;
 let _query = null;
 function getZigLanguage() {
-    return _require('@tree-sitter-grammars/tree-sitter-zig');
+    return requireVendoredGrammar('tree-sitter-zig');
 }
 export function getZigParser() {
     if (_parser === null) {

package/dist/core/ingestion/workers/parse-worker.js

@@ -1,5 +1,4 @@
 import { parentPort, threadId, workerData } from 'node:worker_threads';
-import { createRequire } from 'node:module';
 import { boundCallableStartPosition, localIdentity, nestedCallableQualifiedName, positionQualifiedCallableName, } from './callable-id.js';
 import Parser from 'tree-sitter';
 import JavaScript from 'tree-sitter-javascript';
@@ -34,7 +33,7 @@ import { mergeResult } from './result-merge.js';
 // `isLanguageAvailable` must re-introduce the gate here. (The cleaner end-state
 // — routing this table through `parser-loader.getLanguageGrammar` so there is
 // one loader — is the deferred Tier-1 consolidation.)
-// Swift/Dart/Kotlin/C are vendored grammars loaded from `vendor/` by absolute
+// Swift/Dart/Kotlin/C/Zig are vendored grammars loaded from `vendor/` by absolute
 // path (NEVER copied into node_modules — see vendored-grammars.ts / #2111). Each
 // may be absent on a platform without a prebuild or a toolchain-less /
 // `--ignore-scripts` install, so every load is guarded so a missing binding
@@ -59,11 +58,9 @@ try {
     C = requireVendoredGrammar('tree-sitter-c');
 }
 catch { }
-// @tree-sitter-grammars/tree-sitter-zig is an optionalDependency — may not be installed
-const _require = createRequire(import.meta.url);
 let Zig = null;
 try {
-    Zig = _require('@tree-sitter-grammars/tree-sitter-zig');
+    Zig = requireVendoredGrammar('tree-sitter-zig');
 }
 catch { }
 import { getLanguageFromFilename } from '../../../_shared/index.js';

package/dist/core/tree-sitter/parser-loader.js

@@ -112,21 +112,13 @@ const SOURCES = {
             'Likely cause: no prebuilt `.node` for this platform/architecture. ' +
             `See ${ISSUES_URL}/2107.`,
     },
-    // Zig grammar declares peerOptional `tree-sitter@^0.22.1` but its native
-    // binding is ABI-compatible with the bundled `tree-sitter@0.21.x` runtime
-    // (verified by load-time smoke test). The peer-dep mismatch is suppressed
-    // via the `overrides` block in package.json. Listed as `optional: true`
-    // because the package is in `optionalDependencies` — users on platforms
-    // without a prebuild may not have it — and `userSkippable` because it is
-    // a genuinely-optional grammar: `GITNEXUS_SKIP_OPTIONAL_GRAMMARS` must be
-    // able to disable it at analyze time like swift/dart/kotlin.
     [SupportedLanguages.Zig]: {
-        load: () => _require('@tree-sitter-grammars/tree-sitter-zig'),
+        load: () => requireVendoredGrammar('tree-sitter-zig'),
         optional: true,
         userSkippable: true,
-        unavailableNote: 'Zig parsing disabled: `@tree-sitter-grammars/tree-sitter-zig` is an ' +
-            'optionalDependency and is not installed (or its native binding failed ' +
-            'to load on this platform).',
+        unavailableNote: 'Zig parsing disabled: vendored `tree-sitter-zig` (under ' +
+            '`gitnexus/vendor/tree-sitter-zig`) failed to load. ' +
+            'Likely cause: no prebuilt `.node` for this platform/architecture.',
     },
 };
 export const listGrammarSources = () => Object.entries(SOURCES).map(([key, source]) => ({

package/dist/core/tree-sitter/vendored-grammars.d.ts

@@ -20,7 +20,7 @@ export declare const vendoredGrammarDir: (packageName: string) => string;
 /**
  * Load a vendored tree-sitter grammar by its absolute path under `vendor/`.
  *
- * GitNexus vendors five grammars (c/dart/proto/swift/kotlin) inside its own
+ * GitNexus vendors six grammars (c/dart/proto/swift/kotlin/zig) inside its own
  * package under `vendor/`, each shipping committed per-platform prebuilds. They
  * are deliberately NOT npm dependencies and must NEVER be copied into
  * `node_modules`: an undeclared package under `node_modules` is "extraneous" to

package/dist/core/tree-sitter/vendored-grammars.js

@@ -24,13 +24,14 @@ export const VENDORED_GRAMMAR_PACKAGES = new Set([
     'tree-sitter-proto',
     'tree-sitter-swift',
     'tree-sitter-kotlin',
+    'tree-sitter-zig',
 ]);
 /** Absolute directory of a vendored grammar package under `vendor/`. */
 export const vendoredGrammarDir = (packageName) => path.join(VENDOR_ROOT, packageName);
 /**
  * Load a vendored tree-sitter grammar by its absolute path under `vendor/`.
  *
- * GitNexus vendors five grammars (c/dart/proto/swift/kotlin) inside its own
+ * GitNexus vendors six grammars (c/dart/proto/swift/kotlin/zig) inside its own
  * package under `vendor/`, each shipping committed per-platform prebuilds. They
  * are deliberately NOT npm dependencies and must NEVER be copied into
  * `node_modules`: an undeclared package under `node_modules` is "extraneous" to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitnexus",
-  "version": "1.6.11",
+  "version": "1.6.12-rc.2",
   "description": "Graph-powered code intelligence for AI agents. Index any codebase, query via MCP or CLI.",
   "author": "Abhigyan Patwari",
   "license": "PolyForm-Noncommercial-1.0.0",
@@ -99,7 +99,6 @@
   },
   "optionalDependencies": {
     "@huggingface/transformers": "^4.1.0",
-    "@tree-sitter-grammars/tree-sitter-zig": "1.1.2",
     "onnxruntime-node": "^1.24.0"
   },
   "trustedDependencies": [
@@ -129,9 +128,6 @@
     "sharp": ">=0.35.0",
     "@huggingface/transformers": {
       "onnxruntime-node": "$onnxruntime-node"
-    },
-    "@tree-sitter-grammars/tree-sitter-zig": {
-      "tree-sitter": "$tree-sitter"
     }
   },
   "engines": {

package/scripts/build-tree-sitter-grammars.cjs

@@ -4,7 +4,7 @@
  * One registry-driven script replaces the former per-grammar
  * build-tree-sitter-<name>.cjs files (they were ~95% identical).
  *
- * The grammars (tree-sitter-c/dart/proto/swift/kotlin) are loaded from
+ * The grammars (tree-sitter-c/dart/proto/swift/kotlin/zig) are loaded from
  * `vendor/<name>/` by absolute path at runtime (see
  * src/core/tree-sitter/vendored-grammars.ts) and are NEVER copied into
  * node_modules — an undeclared package under node_modules is "extraneous" to
@@ -44,6 +44,7 @@ const GRAMMARS = {
   proto: { required: false, display: 'Proto', ext: '.proto' },
   swift: { required: false, display: 'Swift', ext: '.swift' },
   kotlin: { required: false, display: 'Kotlin', ext: '.kt/.kts' },
+  zig: { required: false, display: 'Zig', ext: '.zig' },
 };
 
 const skipOptional = process.env.GITNEXUS_SKIP_OPTIONAL_GRAMMARS === '1';

package/vendor/tree-sitter-zig/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 Amaan Qureshi <amaanq12@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/vendor/tree-sitter-zig/README.md

@@ -0,0 +1,25 @@
+## GitNexus vendor notice
+
+This directory is a GitNexus-managed vendored copy of
+`@tree-sitter-grammars/tree-sitter-zig@1.1.2`. GitNexus keeps the top-level
+`tree-sitter` dependency pinned to `0.21.1` until the broader parser runtime
+upgrade is handled separately (#858). The upstream package declares
+`peerOptional tree-sitter@^0.22.1`; that peer is ABI-compatible with 0.21.x
+but npm still warns on `npm i -g gitnexus` because a published package's
+`overrides` are ignored by dependents.
+
+Unified with the Dart/Proto/Kotlin/Swift/C vendored grammars, this copy
+vendors the grammar **source** — `binding.gyp`, `bindings/node/binding.cc`,
+`src/parser.c` (ABI 14), and `src/tree_sitter/` — so
+`gitnexus/scripts/build-tree-sitter-grammars.cjs` can source-build the native
+binding on a toolchain host when no committed prebuild matches. The native
+`prebuilds/` are loaded in place by `node-gyp-build`. Upstream's published
+`linux-arm64` `.node` is a mispackaged x86-64 binary and is not shipped;
+`.github/workflows/build-tree-sitter-prebuilds.yml` rebuilds all six tuples.
+
+When updating this vendor package, replace it from the official
+`@tree-sitter-grammars/tree-sitter-zig` npm release: refresh
+`src/parser.c`/`src/tree_sitter/`/`binding.gyp`/`bindings/node/`, bump
+`version` in `package.json` to retrigger the prebuild workflow, update the
+`_vendoredBy` provenance, and verify the packed GitNexus tarball can both
+load a committed prebuild and source-build `tree-sitter-zig`.

package/vendor/tree-sitter-zig/binding.gyp

@@ -0,0 +1,29 @@
+{
+  "targets": [
+    {
+      "target_name": "tree_sitter_zig_binding",
+      "dependencies": [
+        "<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except",
+      ],
+      "include_dirs": [
+        "src",
+      ],
+      "sources": [
+        "bindings/node/binding.cc",
+        "src/parser.c",
+      ],
+      "conditions": [
+        ["OS!='win'", {
+          "cflags_c": [
+            "-std=c11",
+          ],
+        }, { # OS == "win"
+          "cflags_c": [
+            "/std:c11",
+            "/utf-8",
+          ],
+        }],
+      ],
+    }
+  ]
+}

package/vendor/tree-sitter-zig/bindings/node/binding.cc

@@ -0,0 +1,20 @@
+#include <napi.h>
+
+typedef struct TSLanguage TSLanguage;
+
+extern "C" TSLanguage *tree_sitter_zig();
+
+// "tree-sitter", "language" hashed with BLAKE2
+const napi_type_tag LANGUAGE_TYPE_TAG = {
+    0x8AF2E5212AD58ABF, 0xD5006CAD83ABBA16
+};
+
+Napi::Object Init(Napi::Env env, Napi::Object exports) {
+    exports["name"] = Napi::String::New(env, "zig");
+    auto language = Napi::External<TSLanguage>::New(env, tree_sitter_zig());
+    language.TypeTag(&LANGUAGE_TYPE_TAG);
+    exports["language"] = language;
+    return exports;
+}
+
+NODE_API_MODULE(tree_sitter_zig_binding, Init)

package/vendor/tree-sitter-zig/bindings/node/index.d.ts

@@ -0,0 +1,28 @@
+type BaseNode = {
+  type: string;
+  named: boolean;
+};
+
+type ChildNode = {
+  multiple: boolean;
+  required: boolean;
+  types: BaseNode[];
+};
+
+type NodeInfo =
+  | (BaseNode & {
+      subtypes: BaseNode[];
+    })
+  | (BaseNode & {
+      fields: { [name: string]: ChildNode };
+      children?: ChildNode;
+    });
+
+type Language = {
+  name: string;
+  language: unknown;
+  nodeTypeInfo: NodeInfo[];
+};
+
+declare const language: Language;
+export = language;

package/vendor/tree-sitter-zig/bindings/node/index.js

@@ -0,0 +1,11 @@
+const root = require("path").join(__dirname, "..", "..");
+
+module.exports =
+  typeof process.versions.bun === "string"
+    // Support `bun build --compile` by being statically analyzable enough to find the .node file at build-time
+    ? require(`../../prebuilds/${process.platform}-${process.arch}/tree-sitter-zig.node`)
+    : require("node-gyp-build")(root);
+
+try {
+  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+} catch (_) {}