grepmax 0.24.0 → 0.25.0

package/dist/commands/search.js

@@ -43,13 +43,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = void 0;
-const path = __importStar(require("node:path"));
 const commander_1 = require("commander");
 const setup_helpers_1 = require("../lib/setup/setup-helpers");
 const cross_project_1 = require("../lib/utils/cross-project");
 const exit_1 = require("../lib/utils/exit");
 const project_registry_1 = require("../lib/utils/project-registry");
 const project_root_1 = require("../lib/utils/project-root");
+const scope_filter_1 = require("../lib/utils/scope-filter");
 const server_registry_1 = require("../lib/utils/server-registry");
 const stale_hint_1 = require("../lib/utils/stale-hint");
 const search_output_1 = require("./search-output");
@@ -99,7 +99,7 @@ Examples:
   gmax "auth middleware" --projects api,gateway --plain
 `)
     .action((pattern, exec_path, _options, cmd) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const options = cmd.optsWithGlobals();
     const root = process.cwd();
     const minScore = Number.isFinite(Number.parseFloat(options.minScore))
@@ -133,6 +133,14 @@ Examples:
             process.exitCode = 1;
             return;
         }
+        if (options.root ||
+            exec_path ||
+            ((_a = options.in) === null || _a === void 0 ? void 0 : _a.length) ||
+            ((_b = options.exclude) === null || _b === void 0 ? void 0 : _b.length)) {
+            console.error("--root, [path], --in, and --exclude are single-project; drop --all-projects/--projects or remove the project/path scope.");
+            process.exitCode = 1;
+            return;
+        }
         for (const w of crossProject.warnings)
             console.warn(`Warning: ${w}`);
         if (!crossProject.roots.length) {
@@ -146,16 +154,37 @@ Examples:
     // daemon-mediated / in-process path (both query the shared table).
     let resolvedOptionRoot;
     if (options.root && !crossProject.active) {
-        resolvedOptionRoot = (0, project_registry_1.resolveRootOrExit)(options.root);
-        if (resolvedOptionRoot === null)
+        const resolved = (0, project_registry_1.resolveRootOrExit)(options.root);
+        if (resolved === null)
             return;
+        resolvedOptionRoot = (_c = (0, project_root_1.findProjectRoot)(resolved)) !== null && _c !== void 0 ? _c : resolved;
+    }
+    const cwdProjectRoot = (_d = (0, project_root_1.findProjectRoot)(root)) !== null && _d !== void 0 ? _d : root;
+    const projectRootForServer = resolvedOptionRoot !== null && resolvedOptionRoot !== void 0 ? resolvedOptionRoot : cwdProjectRoot;
+    if (exec_path && options.in && options.in.length > 0) {
+        console.warn("Warning: --in overrides positional [path]; using --in.");
+    }
+    let scope;
+    try {
+        scope = (0, scope_filter_1.resolveScope)({
+            projectRoot: projectRootForServer,
+            in: options.in && options.in.length > 0
+                ? options.in
+                : exec_path
+                    ? [exec_path]
+                    : undefined,
+            exclude: options.exclude,
+        });
+    }
+    catch (err) {
+        console.error(`Search failed: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
+        yield (0, exit_1.gracefulExit)(1);
+        return;
     }
-    const execPathForServer = resolvedOptionRoot
-        ? resolvedOptionRoot
-        : exec_path
-            ? path.resolve(exec_path)
-            : root;
-    const projectRootForServer = (_a = (0, project_root_1.findProjectRoot)(execPathForServer)) !== null && _a !== void 0 ? _a : execPathForServer;
+    const containedExecPath = exec_path && !(options.in && options.in.length > 0)
+        ? scope.pathPrefix.replace(/\/$/, "")
+        : undefined;
     const server = crossProject.active
         ? null
         : (0, server_registry_1.getServerForProject)(projectRootForServer);
@@ -166,7 +195,7 @@ Examples:
         const handled = yield (0, search_output_1.executeServerSearch)({
             server,
             pattern,
-            exec_path,
+            exec_path: containedExecPath,
             projectRootForServer,
             options,
             minScore,
@@ -176,8 +205,6 @@ Examples:
     }
     try {
         yield (0, setup_helpers_1.ensureSetup)();
-        const searchRoot = exec_path ? path.resolve(exec_path) : root;
-        const cwdProjectRoot = (_b = (0, project_root_1.findProjectRoot)(searchRoot)) !== null && _b !== void 0 ? _b : searchRoot;
         let checkRoot = cwdProjectRoot;
         if (options.root) {
             const resolved = resolvedOptionRoot !== undefined
@@ -185,7 +212,7 @@ Examples:
                 : (0, project_registry_1.resolveRootOrExit)(options.root);
             if (resolved === null)
                 return;
-            checkRoot = (_c = (0, project_root_1.findProjectRoot)(resolved)) !== null && _c !== void 0 ? _c : resolved;
+            checkRoot = (_e = (0, project_root_1.findProjectRoot)(resolved)) !== null && _e !== void 0 ? _e : resolved;
         }
         const projectRoot = crossProject.active ? cwdProjectRoot : checkRoot;
         const paths = (0, project_root_1.ensureProjectPaths)(projectRoot);
@@ -210,34 +237,7 @@ Examples:
         // and in-process search paths need them. Reuse the resolved checkRoot
         // so --root <name> only resolves once per invocation.
         const effectiveRoot = checkRoot;
-        // --in / --exclude / [path positional] composition. --in wins over the
-        // positional [path] when both are given (positional was the older
-        // shape; --in is canonical going forward).
-        if (exec_path && options.in && options.in.length > 0) {
-            console.warn("Warning: --in overrides positional [path]; using --in.");
-        }
-        const { resolveScope } = yield Promise.resolve().then(() => __importStar(require("../lib/utils/scope-filter")));
-        const scope = resolveScope({
-            projectRoot: effectiveRoot,
-            in: options.in,
-            exclude: options.exclude,
-        });
-        // Cross-project mode drops the single-project path prefix (and any
-        // --in/[path] sub-scoping, which is meaningless across roots) in favor of
-        // the project_roots filter clauses computed below.
-        if (crossProject.active && (exec_path || ((_d = options.in) === null || _d === void 0 ? void 0 : _d.length))) {
-            console.warn("Warning: --in / [path] are single-project; ignored under --all-projects/--projects.");
-        }
-        const pathFilter = crossProject.active
-            ? undefined
-            : options.in && options.in.length > 0
-                ? scope.pathPrefix
-                : exec_path
-                    ? (() => {
-                        const p = path.resolve(exec_path);
-                        return p.endsWith("/") ? p : `${p}/`;
-                    })()
-                    : scope.pathPrefix;
+        const pathFilter = crossProject.active ? undefined : scope.pathPrefix;
         const searchFilters = {};
         if (options.file)
             searchFilters.file = options.file;
@@ -246,11 +246,7 @@ Examples:
         if (options.role)
             searchFilters.role = options.role;
         if (crossProject.active) {
-            if (crossProject.projectRootsCsv)
-                searchFilters.project_roots = crossProject.projectRootsCsv;
-            if (crossProject.excludeProjectRootsCsv)
-                searchFilters.exclude_project_roots =
-                    crossProject.excludeProjectRootsCsv;
+            searchFilters.projectRoots = crossProject.projectRoots;
         }
         else {
             if (scope.inPrefixes.length > 0)
@@ -324,13 +320,13 @@ Examples:
                 source: "cli",
                 tool: "search",
                 query: pattern,
-                project: (_e = (0, project_root_1.findProjectRoot)(root)) !== null && _e !== void 0 ? _e : root,
+                project: (_f = (0, project_root_1.findProjectRoot)(root)) !== null && _f !== void 0 ? _f : root,
                 results: _searchResultCount,
                 ms: Date.now() - _searchStartMs,
                 error: _searchError,
             });
         }
-        catch (_f) { }
+        catch (_g) { }
         if (vectorDb) {
             try {
                 yield vectorDb.close();