@grec0/memory-bank-mcp 0.1.40 → 0.1.41

package/dist/common/astChunker.js

@@ -7,9 +7,11 @@ import * as path from "path";
 import * as fs from "fs";
 import * as crypto from "crypto";
 import { fileURLToPath } from "url";
+import { createRequire } from "module";
 import { encode } from "gpt-tokenizer";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+const require = createRequire(import.meta.url);
 // Constants
 const MAX_TOKENS_PER_CHUNK = 6000;
 const DEFAULT_CHUNK_OVERLAP_TOKENS = 200;
@@ -131,6 +133,7 @@ const SEMANTIC_NODE_TYPES = {
 // Cache for loaded languages
 // Using 'any' types because web-tree-sitter's TypeScript types don't work well with dynamic imports
 let ParserClass = null;
+let LanguageClass = null;
 const loadedLanguages = new Map();
 let treeSitterInitialized = false;
 /**
@@ -155,15 +158,28 @@ function generateChunkId(filePath, content, startLine) {
  * Initializes Tree-sitter WASM module
  */
 async function initTreeSitter() {
-    if (treeSitterInitialized && ParserClass) {
+    if (treeSitterInitialized && ParserClass && LanguageClass) {
         return true;
     }
     try {
         // Dynamic import of web-tree-sitter
-        // web-tree-sitter exports Parser as a named export, not default
         const TreeSitterModule = await import("web-tree-sitter");
-        // Get Parser from named export
-        ParserClass = TreeSitterModule.Parser;
+        // Handle different export formats across web-tree-sitter versions:
+        // - v0.20.x: exports Parser as default, Language is Parser.Language
+        // - v0.26.x: exports Parser and Language as separate named exports
+        if (TreeSitterModule.Parser) {
+            // v0.26.x style: named exports
+            ParserClass = TreeSitterModule.Parser;
+            LanguageClass = TreeSitterModule.Language;
+        }
+        else if (TreeSitterModule.default) {
+            // v0.20.x style: default export is Parser, Language is a static property
+            ParserClass = TreeSitterModule.default;
+            LanguageClass = null; // Will use ParserClass.Language after init
+        }
+        else {
+            throw new Error('Could not find Parser in web-tree-sitter module');
+        }
         if (!ParserClass) {
             throw new Error('Parser class not found in web-tree-sitter module');
         }
@@ -171,6 +187,13 @@ async function initTreeSitter() {
         if (typeof ParserClass.init === 'function') {
             await ParserClass.init();
         }
+        // For v0.20.x, Language becomes available after init
+        if (!LanguageClass && ParserClass.Language) {
+            LanguageClass = ParserClass.Language;
+        }
+        if (!LanguageClass) {
+            throw new Error('Language class not found in web-tree-sitter module');
+        }
         treeSitterInitialized = true;
         console.error("[AST Chunker] Tree-sitter initialized successfully");
         return true;
@@ -179,6 +202,7 @@ async function initTreeSitter() {
         console.error(`[AST Chunker] Failed to initialize Tree-sitter: ${error}`);
         treeSitterInitialized = false;
         ParserClass = null;
+        LanguageClass = null;
         return false;
     }
 }
@@ -190,26 +214,46 @@ function getWasmPath(language) {
     if (!wasmFile) {
         return null;
     }
-    // Try to find in node_modules
+    // Build comprehensive list of possible paths
+    // The compiled JS runs from dist/common/, so we need to account for various scenarios:
+    // 1. Local development: dist/common/../node_modules = dist/node_modules (wrong)
+    // 2. Local development: __dirname/../../node_modules = node_modules (correct)
+    // 3. NPM installed package: need to resolve from the package location
+    // 4. Global install or monorepo: process.cwd() based paths
     const possiblePaths = [
-        path.join(__dirname, "..", "node_modules", "tree-sitter-wasms", "out", wasmFile),
-        path.join(process.cwd(), "node_modules", "tree-sitter-wasms", "out", wasmFile),
+        // From dist/common/ go up two levels to project root then into node_modules
         path.join(__dirname, "..", "..", "node_modules", "tree-sitter-wasms", "out", wasmFile),
+        // From current working directory
+        path.join(process.cwd(), "node_modules", "tree-sitter-wasms", "out", wasmFile),
+        // From dist/ go up one level (in case __dirname is dist/)
+        path.join(__dirname, "..", "node_modules", "tree-sitter-wasms", "out", wasmFile),
+        // Three levels up (for nested structures like dist/common/subdir)
+        path.join(__dirname, "..", "..", "..", "node_modules", "tree-sitter-wasms", "out", wasmFile),
     ];
+    // Try to use require.resolve to find the package (works in most Node.js scenarios)
+    try {
+        const treeSitterWasmsPath = require.resolve("tree-sitter-wasms/package.json");
+        const packageDir = path.dirname(treeSitterWasmsPath);
+        possiblePaths.unshift(path.join(packageDir, "out", wasmFile));
+    }
+    catch {
+        // Package not found via require.resolve, continue with file-based search
+    }
     for (const p of possiblePaths) {
         if (fs.existsSync(p)) {
             return p;
         }
     }
     console.error(`[AST Chunker] WASM file not found for ${language}: ${wasmFile}`);
+    console.error(`[AST Chunker] Searched paths: ${possiblePaths.map(p => `\n  - ${p}`).join('')}`);
     return null;
 }
 /**
  * Loads a language parser
  */
 async function loadLanguage(language) {
-    if (!ParserClass) {
-        console.error("[AST Chunker] Parser not initialized");
+    if (!ParserClass || !LanguageClass) {
+        console.error("[AST Chunker] Parser or Language not initialized");
         return null;
     }
     const langKey = language.toLowerCase();
@@ -220,15 +264,19 @@ async function loadLanguage(language) {
     if (!wasmPath) {
         return null;
     }
+    console.error(`[AST Chunker] Attempting to load WASM from: ${wasmPath}`);
     try {
         // Use the Language.load static method
-        const lang = await ParserClass.Language.load(wasmPath);
+        const lang = await LanguageClass.load(wasmPath);
         loadedLanguages.set(langKey, lang);
         console.error(`[AST Chunker] Loaded language: ${language}`);
         return lang;
     }
     catch (error) {
-        console.error(`[AST Chunker] Failed to load language ${language}: ${error}`);
+        console.error(`[AST Chunker] Failed to load language ${language}: ${error instanceof Error ? error.message : error}`);
+        if (error instanceof Error && error.stack) {
+            console.error(`[AST Chunker] Stack: ${error.stack}`);
+        }
         return null;
     }
 }
@@ -556,5 +604,6 @@ export function disposeASTChunker() {
     loadedLanguages.clear();
     treeSitterInitialized = false;
     ParserClass = null;
+    LanguageClass = null;
     console.error("[AST Chunker] Disposed");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grec0/memory-bank-mcp",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "MCP server for semantic code indexing with Memory Bank - AI-powered codebase understanding",
   "license": "MIT",
   "author": "@grec0",
@@ -40,14 +40,14 @@
     "@lancedb/lancedb": "^0.9.0",
     "@modelcontextprotocol/sdk": "1.25.2",
     "@types/node": "^22",
+    "better-sqlite3": "^11.7.0",
     "gpt-tokenizer": "3.4.0",
     "ignore": "^5.3.0",
     "openai": "^4.0.0",
     "tree-sitter-wasms": "0.1.13",
-    "web-tree-sitter": "0.26.3",
+    "web-tree-sitter": "0.20.8",
     "zod": "^3.22.4",
-    "zod-to-json-schema": "^3.23.5",
-    "better-sqlite3": "^11.7.0"
+    "zod-to-json-schema": "^3.23.5"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",