grepmax 0.7.25 → 0.7.26

package/dist/lib/search/searcher.js

@@ -10,10 +10,67 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Searcher = void 0;
+exports.buildWhereClause = buildWhereClause;
 const config_1 = require("../../config");
 const filter_builder_1 = require("../utils/filter-builder");
 const pool_1 = require("../workers/pool");
 const intent_1 = require("./intent");
+function buildWhereClause(pathPrefix, filters, searchIntent) {
+    var _a;
+    const parts = [];
+    if (pathPrefix) {
+        parts.push(`path LIKE '${(0, filter_builder_1.escapeSqlString)((0, filter_builder_1.normalizePath)(pathPrefix))}%'`);
+    }
+    const fileFilter = filters === null || filters === void 0 ? void 0 : filters.file;
+    if (typeof fileFilter === "string" && fileFilter) {
+        parts.push(`path LIKE '%/${(0, filter_builder_1.escapeSqlString)(fileFilter)}'`);
+    }
+    const excludeFilter = filters === null || filters === void 0 ? void 0 : filters.exclude;
+    if (typeof excludeFilter === "string" && excludeFilter) {
+        const absExclude = pathPrefix
+            ? (0, filter_builder_1.normalizePath)(pathPrefix + excludeFilter)
+            : excludeFilter;
+        parts.push(`path NOT LIKE '${(0, filter_builder_1.escapeSqlString)(absExclude)}%'`);
+    }
+    const langFilter = filters === null || filters === void 0 ? void 0 : filters.language;
+    if (typeof langFilter === "string" && langFilter) {
+        const ext = langFilter.startsWith(".") ? langFilter : `.${langFilter}`;
+        parts.push(`path LIKE '%${(0, filter_builder_1.escapeSqlString)(ext)}'`);
+    }
+    const roleFilter = filters === null || filters === void 0 ? void 0 : filters.role;
+    if (typeof roleFilter === "string" && roleFilter) {
+        parts.push(`role = '${(0, filter_builder_1.escapeSqlString)(roleFilter)}'`);
+    }
+    const projectRoots = filters === null || filters === void 0 ? void 0 : filters.project_roots;
+    if (typeof projectRoots === "string" && projectRoots) {
+        const roots = projectRoots.split(",");
+        const clauses = roots.map((r) => {
+            const prefix = r.endsWith("/") ? r : `${r}/`;
+            return `path LIKE '${(0, filter_builder_1.escapeSqlString)(prefix)}%'`;
+        });
+        parts.push(`(${clauses.join(" OR ")})`);
+    }
+    const excludeRoots = filters === null || filters === void 0 ? void 0 : filters.exclude_project_roots;
+    if (typeof excludeRoots === "string" && excludeRoots) {
+        for (const r of excludeRoots.split(",")) {
+            const prefix = r.endsWith("/") ? r : `${r}/`;
+            parts.push(`path NOT LIKE '${(0, filter_builder_1.escapeSqlString)(prefix)}%'`);
+        }
+    }
+    const defFilter = filters === null || filters === void 0 ? void 0 : filters.def;
+    if (typeof defFilter === "string" && defFilter) {
+        parts.push(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(defFilter)}')`);
+    }
+    else if (searchIntent.type === "DEFINITION" &&
+        ((_a = searchIntent.filters) === null || _a === void 0 ? void 0 : _a.definitionsOnly)) {
+        parts.push(`(role = 'DEFINITION' OR array_length(defined_symbols) > 0)`);
+    }
+    const refFilter = filters === null || filters === void 0 ? void 0 : filters.ref;
+    if (typeof refFilter === "string" && refFilter) {
+        parts.push(`array_contains(referenced_symbols, '${(0, filter_builder_1.escapeSqlString)(refFilter)}')`);
+    }
+    return parts.length > 0 ? parts.join(" AND ") : undefined;
+}
 class Searcher {
     constructor(db) {
         this.db = db;
@@ -254,7 +311,7 @@ class Searcher {
     }
     search(query, top_k, _search_options, _filters, pathPrefix, intent, signal) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g;
             const finalLimit = top_k !== null && top_k !== void 0 ? top_k : 10;
             const doRerank = (_a = _search_options === null || _search_options === void 0 ? void 0 : _search_options.rerank) !== null && _a !== void 0 ? _a : true;
             const searchIntent = intent || (0, intent_1.detectIntent)(query);
@@ -273,74 +330,8 @@ class Searcher {
             if (colbertDim !== config_1.CONFIG.COLBERT_DIM) {
                 throw new Error(`[Searcher] Query ColBERT dim (${colbertDim}) != Config (${config_1.CONFIG.COLBERT_DIM})`);
             }
-            const whereClauseParts = [];
-            if (pathPrefix) {
-                whereClauseParts.push(`path LIKE '${(0, filter_builder_1.escapeSqlString)((0, filter_builder_1.normalizePath)(pathPrefix))}%'`);
-            }
-            // Handle file name filter
-            const fileFilter = _filters === null || _filters === void 0 ? void 0 : _filters.file;
-            if (typeof fileFilter === "string" && fileFilter) {
-                whereClauseParts.push(`path LIKE '%/${(0, filter_builder_1.escapeSqlString)(fileFilter)}'`);
-            }
-            // Handle exclude filter
-            const excludeFilter = _filters === null || _filters === void 0 ? void 0 : _filters.exclude;
-            if (typeof excludeFilter === "string" && excludeFilter) {
-                const absExclude = pathPrefix
-                    ? (0, filter_builder_1.normalizePath)(pathPrefix + excludeFilter)
-                    : excludeFilter;
-                whereClauseParts.push(`path NOT LIKE '${(0, filter_builder_1.escapeSqlString)(absExclude)}%'`);
-            }
-            // Handle language filter (by file extension)
-            const langFilter = _filters === null || _filters === void 0 ? void 0 : _filters.language;
-            if (typeof langFilter === "string" && langFilter) {
-                const ext = langFilter.startsWith(".") ? langFilter : `.${langFilter}`;
-                whereClauseParts.push(`path LIKE '%${(0, filter_builder_1.escapeSqlString)(ext)}'`);
-            }
-            // Handle role filter
-            const roleFilter = _filters === null || _filters === void 0 ? void 0 : _filters.role;
-            if (typeof roleFilter === "string" && roleFilter) {
-                whereClauseParts.push(`role = '${(0, filter_builder_1.escapeSqlString)(roleFilter)}'`);
-            }
-            // Handle project roots filter (from search_all projects param)
-            const projectRoots = _filters === null || _filters === void 0 ? void 0 : _filters.project_roots;
-            if (typeof projectRoots === "string" && projectRoots) {
-                const roots = projectRoots.split(",");
-                const clauses = roots.map((r) => {
-                    const prefix = r.endsWith("/") ? r : `${r}/`;
-                    return `path LIKE '${(0, filter_builder_1.escapeSqlString)(prefix)}%'`;
-                });
-                whereClauseParts.push(`(${clauses.join(" OR ")})`);
-            }
-            // Handle exclude project roots filter
-            const excludeRoots = _filters === null || _filters === void 0 ? void 0 : _filters.exclude_project_roots;
-            if (typeof excludeRoots === "string" && excludeRoots) {
-                for (const r of excludeRoots.split(",")) {
-                    const prefix = r.endsWith("/") ? r : `${r}/`;
-                    whereClauseParts.push(`path NOT LIKE '${(0, filter_builder_1.escapeSqlString)(prefix)}%'`);
-                }
-            }
-            // Handle --def (definition) filter
-            const defFilter = _filters === null || _filters === void 0 ? void 0 : _filters.def;
-            if (typeof defFilter === "string" && defFilter) {
-                whereClauseParts.push(`array_contains(defined_symbols, '${(0, filter_builder_1.escapeSqlString)(defFilter)}')`);
-            }
-            else if (searchIntent.type === "DEFINITION" &&
-                ((_b = searchIntent.filters) === null || _b === void 0 ? void 0 : _b.definitionsOnly)) {
-                // If intent is DEFINITION but no specific symbol provided, filter by role
-                whereClauseParts.push(`(role = 'DEFINITION' OR array_length(defined_symbols) > 0)`);
-            }
-            // Handle --ref (reference) filter
-            const refFilter = _filters === null || _filters === void 0 ? void 0 : _filters.ref;
-            if (typeof refFilter === "string" && refFilter) {
-                whereClauseParts.push(`array_contains(referenced_symbols, '${(0, filter_builder_1.escapeSqlString)(refFilter)}')`);
-            }
-            else if (searchIntent.type === "USAGE" &&
-                ((_c = searchIntent.filters) === null || _c === void 0 ? void 0 : _c.usagesOnly)) {
-                // If intent is USAGE, we might want to filter out definitions?
-                // For now, let's just rely on boosting.
-            }
-            const whereClause = whereClauseParts.length > 0 ? whereClauseParts.join(" AND ") : undefined;
-            const envPreK = Number.parseInt((_d = process.env.GMAX_PRE_K) !== null && _d !== void 0 ? _d : "", 10);
+            const whereClause = buildWhereClause(pathPrefix, _filters, searchIntent);
+            const envPreK = Number.parseInt((_b = process.env.GMAX_PRE_K) !== null && _b !== void 0 ? _b : "", 10);
             const PRE_RERANK_K = Number.isFinite(envPreK) && envPreK > 0
                 ? envPreK
                 : Math.max(finalLimit * 5, 500);
@@ -348,7 +339,7 @@ class Searcher {
             try {
                 table = yield this.db.ensureTable();
             }
-            catch (_k) {
+            catch (_h) {
                 return { data: [] };
             }
             // Ensure FTS index exists (lazy init, retry periodically on failure)
@@ -417,17 +408,17 @@ class Searcher {
                 .filter(Boolean);
             // Item 8: Widen PRE_RERANK_K
             // Retrieve a wide set for Stage 1 filtering
-            const envStage1 = Number.parseInt((_e = process.env.GMAX_STAGE1_K) !== null && _e !== void 0 ? _e : "", 10);
+            const envStage1 = Number.parseInt((_c = process.env.GMAX_STAGE1_K) !== null && _c !== void 0 ? _c : "", 10);
             const STAGE1_K = Number.isFinite(envStage1) && envStage1 > 0 ? envStage1 : 200;
             const topCandidates = fused.slice(0, STAGE1_K);
             // Item 9: Two-stage rerank
             // Stage 1: Cheap pooled cosine filter
             let stage2Candidates = topCandidates;
-            const envStage2K = Number.parseInt((_f = process.env.GMAX_STAGE2_K) !== null && _f !== void 0 ? _f : "", 10);
+            const envStage2K = Number.parseInt((_d = process.env.GMAX_STAGE2_K) !== null && _d !== void 0 ? _d : "", 10);
             const STAGE2_K = Number.isFinite(envStage2K) && envStage2K > 0 ? envStage2K : 40;
-            const envRerankTop = Number.parseInt((_g = process.env.GMAX_RERANK_TOP) !== null && _g !== void 0 ? _g : "", 10);
+            const envRerankTop = Number.parseInt((_e = process.env.GMAX_RERANK_TOP) !== null && _e !== void 0 ? _e : "", 10);
             const RERANK_TOP = Number.isFinite(envRerankTop) && envRerankTop > 0 ? envRerankTop : 20;
-            const envBlend = Number.parseFloat((_h = process.env.GMAX_RERANK_BLEND) !== null && _h !== void 0 ? _h : "");
+            const envBlend = Number.parseFloat((_f = process.env.GMAX_RERANK_BLEND) !== null && _f !== void 0 ? _f : "");
             const FUSED_WEIGHT = Number.isFinite(envBlend) && envBlend >= 0 ? envBlend : 0.5;
             if (queryPooled && topCandidates.length > STAGE2_K) {
                 const cosineScores = topCandidates.map((doc) => {
@@ -493,7 +484,7 @@ class Searcher {
             // Item 10: Per-file diversification
             const seenFiles = new Map();
             const diversified = [];
-            const envMaxPerFile = Number.parseInt((_j = process.env.GMAX_MAX_PER_FILE) !== null && _j !== void 0 ? _j : "", 10);
+            const envMaxPerFile = Number.parseInt((_g = process.env.GMAX_MAX_PER_FILE) !== null && _g !== void 0 ? _g : "", 10);
             const MAX_PER_FILE = Number.isFinite(envMaxPerFile) && envMaxPerFile > 0 ? envMaxPerFile : 3;
             for (const item of uniqueScored) {
                 const path = item.record.path || "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "author": "Robert Owens <robowens@me.com>",
   "homepage": "https://github.com/reowens/grepmax",
   "bugs": {

package/plugins/grepmax/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "grepmax",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "description": "Semantic code search for Claude Code. Automatically indexes your project and provides intelligent search capabilities.",
   "author": {
     "name": "Robert Owens",