mbeditor 0.3.9 → 0.4.3

data/app/channels/mbeditor/editor_channel.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require "fileutils"
+require "pathname"
+
+module Mbeditor
+  CableBaseClass = defined?(ActionCable::Channel::Base) ? ActionCable::Channel::Base : Object
+
+  class EditorChannel < CableBaseClass
+    STATE_MAX_BYTES    = 1 * 1024 * 1024
+    SAFE_BRANCH_NAME   = /\A[a-zA-Z0-9._\-\/]+\z/
+
+    def subscribed
+      stream_from "mbeditor_editor" if respond_to?(:stream_from)
+    end
+
+    def unsubscribed
+      # no-op
+    end
+
+    # Called via WebSocketService.perform('save_state', { state: ... })
+    def save_state(data)
+      Rails.logger.silence do
+        payload = (data["state"] || data).to_json
+        return if payload.bytesize > STATE_MAX_BYTES
+
+        root = workspace_root
+        path = root.join("tmp", "mbeditor_workspace.json")
+        FileUtils.mkdir_p(root.join("tmp"))
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          f.flock(File::LOCK_EX)
+          f.truncate(0)
+          f.rewind
+          f.write(payload)
+        end
+      end
+    rescue StandardError
+      # Never let a state-save failure crash the WebSocket connection
+    end
+
+    # Called via WebSocketService.perform('save_branch_state', { branch: ..., state: ... })
+    def save_branch_state(data)
+      Rails.logger.silence do
+        branch = data["branch"].to_s.strip
+        return unless branch.match?(SAFE_BRANCH_NAME)
+
+        state_data = data["state"]
+        payload_json = state_data.to_json
+        return if payload_json.bytesize > STATE_MAX_BYTES
+
+        root = workspace_root
+        path = root.join("tmp", "mbeditor_branch_states.json")
+        FileUtils.mkdir_p(root.join("tmp"))
+        File.open(path, File::RDWR | File::CREAT) do |f|
+          f.flock(File::LOCK_EX)
+          existing = f.size > 0 ? JSON.parse(f.read) : {}
+          existing[branch] = state_data
+          f.truncate(0)
+          f.rewind
+          f.write(existing.to_json)
+        end
+      end
+    rescue StandardError
+      # Never let a state-save failure crash the WebSocket connection
+    end
+
+    private
+
+    def workspace_root
+      configured = Mbeditor.configuration.workspace_root
+      return Pathname.new(configured.to_s) if configured.present?
+
+      # Fall back to git root, same logic as ApplicationController
+      rails_root = Rails.root.to_s
+      out, _err, status = Open3.capture3("git", "-C", rails_root, "rev-parse", "--show-toplevel")
+      Pathname.new(status.success? && out.strip.present? ? out.strip : rails_root)
+    rescue StandardError
+      Rails.root
+    end
+  end
+end

data/app/controllers/mbeditor/editors_controller.rb

@@ -38,7 +38,8 @@ module Mbeditor
         gitAvailable: git_available?,
         blameAvailable: git_blame_available?,
         redmineEnabled: Mbeditor.configuration.redmine_enabled == true,
-        testAvailable: test_available?
+        testAvailable: test_available?,
+        actionCableEnabled: action_cable_enabled?
       }
     end
 
@@ -206,6 +207,7 @@ module Mbeditor
       return render_file_too_large(content.bytesize) if content.bytesize > MAX_OPEN_FILE_SIZE_BYTES
 
       File.write(path, content)
+      broadcast_files_changed
       render json: { ok: true, path: relative_path(path) }
     rescue StandardError => e
       render json: { error: e.message }, status: :unprocessable_content
@@ -223,6 +225,7 @@ module Mbeditor
 
       FileUtils.mkdir_p(File.dirname(path))
       File.write(path, content)
+      broadcast_files_changed
 
       render json: { ok: true, type: "file", path: relative_path(path), name: File.basename(path) }
     rescue StandardError => e
@@ -237,6 +240,7 @@ module Mbeditor
       return render json: { error: "Path already exists" }, status: :unprocessable_content if File.exist?(path)
 
       FileUtils.mkdir_p(path)
+      broadcast_files_changed
       render json: { ok: true, type: "folder", path: relative_path(path), name: File.basename(path) }
     rescue StandardError => e
       render json: { error: e.message }, status: :unprocessable_content
@@ -253,6 +257,7 @@ module Mbeditor
 
       FileUtils.mkdir_p(File.dirname(new_path))
       FileUtils.mv(old_path, new_path)
+      broadcast_files_changed
 
       render json: {
         ok: true,
@@ -274,9 +279,11 @@ module Mbeditor
 
       if File.directory?(path)
         FileUtils.rm_rf(path)
+        broadcast_files_changed
         render json: { ok: true, type: "folder", path: relative_path(path) }
       else
         File.delete(path)
+        broadcast_files_changed
         render json: { ok: true, type: "file", path: relative_path(path) }
       end
     rescue StandardError => e
@@ -312,23 +319,31 @@ module Mbeditor
       render json: { error: e.message }, status: :unprocessable_content
     end
 
-    # GET /mbeditor/search?q=...&offset=0&limit=50
+    # GET /mbeditor/search?q=...&offset=0&limit=50&regex=false&match_case=false&whole_word=false
     def search
-      query  = params[:q].to_s.strip
-      offset = [params[:offset].to_i, 0].max
-      limit  = [[params[:limit].to_i > 0 ? params[:limit].to_i : 50, 200].min, 1].max
-      needed = offset + limit + 1   # collect one extra to detect has_more
+      query      = params[:q].to_s.strip
+      offset     = [params[:offset].to_i, 0].max
+      limit      = [[params[:limit].to_i > 0 ? params[:limit].to_i : 50, 200].min, 1].max
+      use_regex  = params[:regex] == 'true'
+      match_case = params[:match_case] == 'true'
+      whole_word = params[:whole_word] == 'true'
+      needed     = offset + limit + 1   # collect one extra to detect has_more
 
       return render json: [] if query.blank?
       return render json: { error: "Query too long" }, status: :bad_request if query.length > 500
 
       # On first page, count total matches in parallel with fetching results.
-      count_thread = offset == 0 ? Thread.new { count_search_results(query) } : nil
+      count_thread = offset == 0 ? Thread.new { count_search_results(query, use_regex: use_regex, match_case: match_case, whole_word: whole_word) } : nil
 
-      results   = stream_search_results(query, needed)
+      results   = stream_search_results(query, needed, use_regex: use_regex, match_case: match_case, whole_word: whole_word)
       has_more  = results.length > offset + limit
       response  = { results: results[offset, limit] || [], has_more: has_more }
-      response[:total_count] = count_thread.value if count_thread
+      if count_thread
+        # Give the count thread up to 100 ms; omit total_count when it hasn't finished yet
+        # so the first page is never blocked by the counting subprocess.
+        count_thread.join(0.1)
+        response[:total_count] = count_thread.value unless count_thread.alive?
+      end
 
       render json: response
     rescue StandardError => e
@@ -661,6 +676,14 @@ module Mbeditor
 
     private
 
+    def broadcast_files_changed
+      return unless defined?(ActionCable.server)
+
+      ActionCable.server.broadcast("mbeditor_editor", { type: "files_changed" })
+    rescue StandardError
+      # Never let a broadcast failure affect the HTTP response
+    end
+
     def sanitize_branch_name(branch)
       return nil if branch.blank?
       str = branch.to_s.strip
@@ -668,6 +691,23 @@ module Mbeditor
       str.match?(SAFE_BRANCH_NAME) ? str : nil
     end
 
+    def action_cable_enabled?
+      return false unless defined?(ActionCable::Channel::Base)
+
+      mount_path = begin
+        ActionCable.server.config.mount_path
+      rescue StandardError
+        nil
+      end
+      mount_path = '/cable' if mount_path.blank?
+
+      Rails.application.routes.routes.any? do |route|
+        route.path.spec.to_s.start_with?(mount_path)
+      end
+    rescue StandardError
+      false
+    end
+
     def allow_missing_file?
       %w[1 true yes on].include?(params[:allow_missing].to_s.downcase)
     end
@@ -696,11 +736,14 @@ module Mbeditor
     # Stream search results using popen so we can stop reading early once we
     # have collected `limit` matches (avoids buffering the entire rg/grep output
     # in memory when searching large codebases for common tokens).
-    def stream_search_results(query, limit)
+    def stream_search_results(query, limit, use_regex: false, match_case: false, whole_word: false)
       results = []
 
       if RG_AVAILABLE
         args = ["rg", "--json", "--no-ignore"]
+        args << "-F" unless use_regex
+        args << "--ignore-case" unless match_case
+        args << "--word-regexp" if whole_word
         excluded_paths.each { |p| args << "--glob=!#{p}" }
         args += ["--", query, workspace_root.to_s]
 
@@ -725,7 +768,10 @@ module Mbeditor
           end
         end
       else
-        args = ["grep", "-rn", "-F"]
+        base_flags = use_regex ? "-E" : "-F"
+        args = ["grep", "-rn", base_flags]
+        args << "-i" unless match_case
+        args << "-w" if whole_word
         excluded_dirnames.select { |d| d.match?(/\A[\w.\/-]+\z/) }.each { |d| args << "--exclude-dir=#{d}" }
         args += [query, workspace_root.to_s]
 
@@ -756,17 +802,23 @@ module Mbeditor
 
     # Count total matching lines across the workspace using rg --count (or grep -c).
     # Fast: rg just counts without extracting context. Runs in a background thread.
-    def count_search_results(query)
+    def count_search_results(query, use_regex: false, match_case: false, whole_word: false)
       total = 0
       if RG_AVAILABLE
         args = ["rg", "--count", "--no-ignore"]
+        args << "-F" unless use_regex
+        args << "--ignore-case" unless match_case
+        args << "--word-regexp" if whole_word
         excluded_paths.each { |p| args << "--glob=!#{p}" }
         args += ["--", query, workspace_root.to_s]
         IO.popen(args, err: File::NULL) do |io|
           io.each_line { |line| total += line.strip.split(":").last.to_i rescue 0 }
         end
       else
-        args = ["grep", "-rc", "-F"]
+        base_flags = use_regex ? "-E" : "-F"
+        args = ["grep", "-rc", base_flags]
+        args << "-i" unless match_case
+        args << "-w" if whole_word
         excluded_dirnames.each { |d| args << "--exclude-dir=#{d}" }
         args += [query, workspace_root.to_s]
         IO.popen(args, err: File::NULL) do |io|

data/app/views/layouts/mbeditor/application.html.erb

@@ -20,6 +20,10 @@
   <%= stylesheet_link_tag "fontawesome.min", media: "all", preload_links_header: false %>
   <%= stylesheet_link_tag "mbeditor/application", media: "all", preload_links_header: false %>
 
+  <!-- ── ActionCable (deferred — sets window.ActionCable for WebSocket service) ── -->
+  <% if defined?(ActionCable::Channel::Base) %>
+  <script defer src="<%= asset_path('actioncable.js') %>"></script>
+  <% end %>
   <!-- ── Vendor JS (deferred — only needed inside Monaco callback) ── -->
   <script defer src="<%= asset_path('react.min.js') %>"></script>
   <script defer src="<%= asset_path('react-dom.min.js') %>"></script>

data/lib/mbeditor/cable_log_filter.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Mbeditor
+  # Wraps the ActionCable logger and suppresses all log lines that mention
+  # Mbeditor channels so the development console stays readable.
+  # Non-Mbeditor ActionCable messages pass through unchanged.
+  class CableLogFilter < SimpleDelegator
+    SUPPRESS_PATTERN = /Mbeditor::|mbeditor_editor/
+
+    %w[debug info warn error fatal unknown].each do |level|
+      define_method(level) do |message = nil, &block|
+        msg = message.nil? && block ? block.call : message.to_s
+        return if msg.match?(SUPPRESS_PATTERN)
+
+        super(message, &block)
+      end
+    end
+
+    # Tagged-logging compat — the block body still passes through the filter.
+    def tagged(*tags, &block)
+      if __getobj__.respond_to?(:tagged)
+        __getobj__.tagged(*tags, &block)
+      elsif block
+        block.call
+      else
+        self
+      end
+    end
+
+    # Rails/ActiveSupport logger compatibility. Some logger stacks call these
+    # methods even when the underlying logger is not TaggedLogging.
+    def current_tags
+      return __getobj__.current_tags if __getobj__.respond_to?(:current_tags)
+
+      []
+    end
+
+    def push_tags(*tags)
+      return __getobj__.push_tags(*tags) if __getobj__.respond_to?(:push_tags)
+
+      tags
+    end
+
+    def pop_tags(count = 1)
+      return __getobj__.pop_tags(count) if __getobj__.respond_to?(:pop_tags)
+
+      []
+    end
+
+    def clear_tags!
+      return __getobj__.clear_tags! if __getobj__.respond_to?(:clear_tags!)
+
+      nil
+    end
+  end
+end

data/lib/mbeditor/engine.rb

@@ -2,6 +2,7 @@
 
 require "mbeditor/rack/silence_ping_request"
 require "mbeditor/rack/handle_pending_migrations"
+require "mbeditor/cable_log_filter"
 
 module Mbeditor
   class Engine < ::Rails::Engine
@@ -24,6 +25,15 @@ module Mbeditor
     end
 
     config.after_initialize do
+      # Silence ActionCable framework logs for Mbeditor channels (subscription
+      # confirmations, streaming notices, action invocations, disconnect messages).
+      # We wrap the existing ActionCable logger in a filter proxy rather than
+      # replacing it, so the host app's non-Mbeditor channel logs are unaffected.
+      if defined?(ActionCable)
+        original_logger = ActionCable.server.config.logger || Rails.logger
+        ActionCable.server.config.logger = Mbeditor::CableLogFilter.new(original_logger)
+      end
+
       Mbeditor::RubyDefinitionService.cache_path =
         Rails.root.join("tmp", "mbeditor_ruby_defs.json").to_s
 

data/lib/mbeditor/rack/silence_ping_request.rb

@@ -17,7 +17,7 @@ module Mbeditor
         path = normalized_request_path(env)
         if root_request?(env, path)
           @app.call(env)
-        elsif mbeditor_request?(path) || editor_asset_request?(env, path)
+        elsif mbeditor_request?(path) || cable_request?(path) || editor_asset_request?(env, path)
           Rails.logger.silence { @app.call(env) }
         else
           @app.call(env)
@@ -30,6 +30,9 @@ module Mbeditor
         path.start_with?("/mbeditor/")
       end
 
+      def cable_request?(path)
+        path == "/cable" || path.start_with?("/cable/")
+      end
       # Silence asset pipeline requests that belong to the editor:
       # - /assets/mbeditor/... is always an editor asset (CSS/JS bundle)
       # - other /assets/... requests are silenced only when the browser is

data/lib/mbeditor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.3
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-21 00:00:00.000000000 Z
+date: 2026-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,9 +78,11 @@ files:
 - app/assets/javascripts/mbeditor/git_service.js
 - app/assets/javascripts/mbeditor/search_service.js
 - app/assets/javascripts/mbeditor/tab_manager.js
+- app/assets/javascripts/mbeditor/websocket_service.js
 - app/assets/stylesheets/mbeditor/application.css
 - app/assets/stylesheets/mbeditor/editor.css
 - app/assets/stylesheets/mbeditor/themes.css
+- app/channels/mbeditor/editor_channel.rb
 - app/controllers/mbeditor/application_controller.rb
 - app/controllers/mbeditor/editors_controller.rb
 - app/controllers/mbeditor/git_controller.rb
@@ -98,6 +100,7 @@ files:
 - config/initializers/assets.rb
 - config/routes.rb
 - lib/mbeditor.rb
+- lib/mbeditor/cable_log_filter.rb
 - lib/mbeditor/configuration.rb
 - lib/mbeditor/engine.rb
 - lib/mbeditor/rack/handle_pending_migrations.rb