mbeditor 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dffea86be286ee0bdcb216589b12264dcac613a33e59aa2828490706785e1825
-  data.tar.gz: f786fe449deccc7ff1971c8df15015b7ee0507b45b14a332f83e162b44facc01
+  metadata.gz: 7e19be096529fa5f410c792379f88395494fa7783964604b2ff07bb5a93d39d8
+  data.tar.gz: d491ca7214661784bbb9d6bc78c13da045a2da9529649d088dae1b0171d17868
 SHA512:
-  metadata.gz: b1cf4fcf24d9868b1b5a284c1de2f8eb3b5032a10d8cb3a9ebb1677eed3a6ce9660e658a43f80652ec1a3edb5195aadcf01fc428fc381ed5f62618d59dde4286
-  data.tar.gz: 3c0c8dc6d5d2aee702d0ed1af2814e884cd204702383dafc21871ffcf2a0b8fa8e871a971d69824ea44f7831f335d3f7e8d0999c832142e5b510d43033ad10cd
+  metadata.gz: 99bbd0a1dd19d7191563ea1586f5c38f9b68d0b70319f412be5439fb1588148b135aed1b8a20b66023129065ea84d71880d80054d6500a8ff1f2b83879f941c0
+  data.tar.gz: de0e4dfbb928584209ff4d5f1ace4a0bdb5c3b56a20c9a695c3c4770e2ccfd3a5063d9274f450706e13cabf4edd6ce2fdc3313b8477c6cecd28432eabc877246

data/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.12.7] - 2026-08-06
+
+### Fixed
+- **Project search was 10-80x slower than terminal grep on hosts without
+  ripgrep.** grep's `--exclude-dir` only accepts plain directory names, so the
+  slashed default exclusions (`vendor/bundle`, `public/assets`) never reached
+  the command line and grep walked those trees in full on every search, with
+  the matches discarded in Ruby afterwards. The grep tier now prunes every
+  exclusion with `find` — slashed paths included — and feeds the survivors to
+  grep in parallel batches (`xargs -P`), measured 7.2 s → 0.09 s on a 350 MB
+  tree with a realistic `vendor/bundle`, 3-4x faster than a plain terminal
+  `grep -r`. The same fix applies to `CodeSearchService`, which backs the JS
+  definition/global lookups and was reading precompiled `public/assets`
+  bundles on every "Cannot find name" the editor reported.
+- **A search query starting with `-` was parsed as grep options.** Queries now
+  pass through `-e … --` on the grep tier.
+- **Superseding a search now kills the whole pipeline.** The subprocess is
+  spawned in its own process group and the TERM goes to the group, so a
+  stacked keystroke cannot leave a find/grep pipeline running behind the
+  shell.
+- **`vendor/cache` is excluded from search by default.** `bundle install
+  --local` keeps every `.gem` archive there — gigabytes of binary files search
+  has no business opening.
+
 ## [0.12.6] - 2026-08-05
 
 ### Added

data/app/services/mbeditor/code_search_service.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "shellwords"
+require "etc"
+
 module Mbeditor
   # Line-oriented regex search over the workspace's JS-family files. Backs the
   # JS definition/member lookups. Same three-tier backend as
@@ -86,15 +89,26 @@ module Mbeditor
         lines.map { |l| "#{workspace_root}/#{l}" }
       end
 
+      # Same shape as SearchReplaceService's grep tier: find prunes every
+      # exclusion — slashed ones included, which --exclude-dir cannot express —
+      # before the walk, and applies the include/minified globs there too, so
+      # grep only ever opens candidate JS files. grep -r --include still walked
+      # (and for public/assets, read) the excluded trees on every lookup.
+      # ProcessRunner kills the process group, so the sh -c pipeline dies as
+      # one unit on timeout.
       def run_grep(pattern, workspace_root, globs)
-        includes = globs.map { |g| "--include=#{g}" }
-        excludes = MINIFIED_GLOBS.map { |g| "--exclude=#{g}" }
-        args = ["grep", "-I", "-rn", "--color=never", "-E", pattern] + includes + excludes
-        excluded_paths.reject { |p| p.include?("/") }.select { |d| d.match?(/\A[\w.-]+\z/) }.each do |d|
-          args << "--exclude-dir=#{d}"
+        prune = excluded_paths.flat_map do |p|
+          p.include?("/") ? ["-path", File.join(workspace_root, p), "-o"] : ["-name", p, "-o"]
         end
-        args << workspace_root
-        run_command(args, env: { "LC_ALL" => "C" })
+        find = ["find", workspace_root]
+        find += ["("] + prune[0..-2] + [")", "-prune", "-o"] unless prune.empty?
+        find += ["-type", "f", "("] + globs.flat_map { |g| ["-name", g, "-o"] }[0..-2] + [")"]
+        MINIFIED_GLOBS.each { |g| find += ["!", "-name", g] }
+        find << "-print0"
+        xargs = ["xargs", "-0", "-P", Etc.nprocessors.clamp(2, 8).to_s, "-n", "500",
+                 "grep", "-I", "-Hn", "--line-buffered", "--color=never", "-E", "-e", pattern, "--"]
+        cmd = "#{Shellwords.shelljoin(find)} | #{Shellwords.shelljoin(xargs)}"
+        run_command(["sh", "-c", cmd], env: { "LC_ALL" => "C" })
       end
     end
   end

data/app/services/mbeditor/search_replace_service.rb

@@ -3,6 +3,8 @@
 require "open3"
 require "json"
 require "timeout"
+require "shellwords"
+require "etc"
 
 module Mbeditor
   # Project-wide text search and replace-in-files.
@@ -213,7 +215,9 @@ module Mbeditor
         timed_out = false
         timeout_secs = Mbeditor.configuration.search_timeout
 
-        io = IO.popen(env, args, err: File::NULL)
+        # pgroup: the grep tier is a sh -c pipeline; killing only the shell
+        # would leave find/xargs/grep running. TERM goes to the whole group.
+        io = IO.popen(env, args, err: File::NULL, pgroup: true)
         pid = io.pid
         register_search(root, pid) if supersede
         watchdog = nil
@@ -301,18 +305,32 @@ module Mbeditor
           # for -E, and the UTF-8 locale case-folds non-ASCII correctly.
           [{}, args]
         else
-          base_flags = use_regex ? "-E" : "-F"
-          args = ["grep", "-I", "-Hn", base_flags]
-          args << "-r" unless paths
-          args << "-i" unless match_case
-          args << "-w" if whole_word
-          # grep --exclude-dir only accepts plain directory names, not paths with
-          # slashes; slashed patterns are enforced by the ExclusionMatcher
-          # post-filter instead.
-          exclusions.reject { |p| p.include?("/") }.select { |d| d.match?(/\A[\w.-]+\z/) }.each { |d| args << "--exclude-dir=#{d}" }
-          args << query
-          args += paths ? paths.map { |p| File.expand_path(p, root) } : [root]
-          [{ "LC_ALL" => "C" }, args]
+          grep = ["grep", "-I", "-Hn", "--line-buffered", use_regex ? "-E" : "-F"]
+          grep << "-i" unless match_case
+          grep << "-w" if whole_word
+          # -e + -- so a query starting with "-" can't be parsed as options.
+          grep += ["-e", query, "--"]
+          if paths
+            [{ "LC_ALL" => "C" }, grep + paths.map { |p| File.expand_path(p, root) }]
+          else
+            # find prunes every exclusion — slashed ones included, which
+            # --exclude-dir cannot express — *before* the walk, then feeds the
+            # survivors to grep in parallel batches. grep -r with post-filtered
+            # exclusions read vendor/bundle and public/assets in full on every
+            # search; measured 7.2 s -> 0.09 s on a 350 MB tree. --line-buffered
+            # keeps concurrent greps from tearing lines mid-row on the shared
+            # pipe.
+            prune = exclusions.flat_map do |p|
+              p.include?("/") ? ["-path", File.join(root, p), "-o"] : ["-name", p, "-o"]
+            end
+            find = ["find", root]
+            find += ["("] + prune[0..-2] + [")", "-prune", "-o"] unless prune.empty?
+            find += ["-type", "f", "-print0"]
+            workers = Etc.nprocessors.clamp(2, 8)
+            xargs = ["xargs", "-0", "-P", workers.to_s, "-n", "500"] + grep
+            cmd = "#{Shellwords.shelljoin(find)} | #{Shellwords.shelljoin(xargs)}"
+            [{ "LC_ALL" => "C" }, ["sh", "-c", cmd]]
+          end
         end
       end
 
@@ -370,9 +388,15 @@ module Mbeditor
       end
 
       def kill_quietly(pid)
-        Process.kill("TERM", pid) if pid
+        return unless pid
+
+        Process.kill("TERM", -pid)
       rescue StandardError
-        nil
+        begin
+          Process.kill("TERM", pid)
+        rescue StandardError
+          nil
+        end
       end
 
       def monotonic

data/lib/mbeditor/configuration.rb

@@ -18,7 +18,7 @@ module Mbeditor
     def initialize
       @allowed_environments = [:development]
       @workspace_root = nil
-      @excluded_paths = %w[.git tmp log node_modules .bundle coverage vendor/bundle public/assets storage]
+      @excluded_paths = %w[.git tmp log node_modules .bundle coverage vendor/bundle vendor/cache public/assets storage]
       @rubocop_command = "rubocop"
       @rubocop_server  = true # use rubocop's --server daemon (rubocop >= 1.31) for ~10x faster lint; false forces --no-server
       @redmine_enabled       = false

data/lib/mbeditor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbeditor
-  VERSION = "0.12.6"
+  VERSION = "0.12.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-05 00:00:00.000000000 Z
+date: 2026-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails