mbeditor 0.3.8 → 0.4.2

data/app/services/mbeditor/git_service.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "open3"
+require "timeout"
 
 module Mbeditor
   # Shared helpers for running git CLI commands read-only inside a repo.
@@ -10,16 +11,37 @@ module Mbeditor
     module_function
 
     # Safe pattern for git ref names (branch, remote/branch, tag).
-    # Rejects refs containing whitespace, NUL, shell metacharacters, or
-    # git reflog syntax (e.g. "@{" sequences beyond the trailing "@{u}").
+    # Excludes @ to prevent reflog syntax like @{-1} or @{u}.
     SAFE_GIT_REF = %r{\A[\w./-]+\z}
 
     # Run an arbitrary git command inside +repo_path+.
     # Returns [stdout, Process::Status]. stderr is captured and discarded to
     # prevent git diagnostic messages from leaking into the Rails server log.
+    # Honors config.git_timeout (seconds) when set.
     def run_git(repo_path, *args)
-      out, _err, status = Open3.capture3("git", "-C", repo_path, *args)
-      [out, status]
+      timeout_secs = Mbeditor.configuration.git_timeout&.to_i
+      out = +""; timed_out = false; exit_status = nil
+
+      Open3.popen3("git", "-C", repo_path, *args, pgroup: true) do |stdin, stdout, _stderr, wait_thr|
+        stdin.close
+
+        timer = if timeout_secs && timeout_secs > 0
+          Thread.new do
+            sleep timeout_secs
+            timed_out = true
+            Process.kill("-KILL", wait_thr.pid)
+          rescue Errno::ESRCH
+            nil
+          end
+        end
+
+        out = stdout.read
+        exit_status = wait_thr.value
+        timer&.kill
+      end
+
+      raise Timeout::Error, "git timed out after #{timeout_secs}s" if timed_out
+      [out, exit_status]
     end
 
     # Current branch name, or nil if not in a git repo.
@@ -51,36 +73,57 @@ module Mbeditor
       [parts[0].to_i, parts[1].to_i]
     end
 
+    # Returns [merge_base_sha, ref_name] of the first candidate base branch found,
+    # or [nil, nil] if none can be determined.  Candidates are tried in preference
+    # order; skips the current branch and refs whose merge-base equals HEAD.
+    def find_branch_base(repo_path, current_branch, candidates: nil)
+      candidates ||= Mbeditor.configuration.base_branch_candidates
+      head_sha_out, = run_git(repo_path, "rev-parse", "HEAD")
+      head_sha = head_sha_out.strip
+
+      candidates.each do |ref|
+        short = ref.delete_prefix("origin/")
+        next if short == current_branch || ref == current_branch
+
+        _o, st = run_git(repo_path, "rev-parse", "--verify", "--quiet", ref)
+        next unless st.success?
+
+        base_out, base_st = run_git(repo_path, "merge-base", "HEAD", ref)
+        next unless base_st.success?
+
+        sha = base_out.strip
+        next unless sha.match?(/\A[0-9a-f]{40}\z/)
+        next if sha == head_sha
+
+        return [sha, ref]
+      end
+
+      [nil, nil]
+    rescue StandardError
+      [nil, nil]
+    end
+
+    # Parse `git diff --numstat` output.
+    # Returns Hash of path => { added: Integer, removed: Integer }.
+    def parse_numstat(output)
+      (output || "").lines.each_with_object({}) do |line, map|
+        parts = line.strip.split("\t", 3)
+        next if parts.length < 3 || parts[0] == "-"
+
+        map[parts[2].strip] = { added: parts[0].to_i, removed: parts[1].to_i }
+      end
+    end
+
     # Parse compact `git log --pretty=format:%H%x1f%P%x1f%s%x1f%an%x1f%aI%x1e` output.
-    # Returns Array of hashes.
+    # Returns Array of hashes with string keys.
     def self.parse_git_log_with_parents(raw_output)
-      raw_output.split("\x1e").map do |entry|
-        fields = entry.strip.split("\x1f", 5)
-        next unless fields.length == 5
-
-        {
-          "hash"    => fields[0],
-          "parents" => fields[1].split.reject(&:blank?),
-          "title"   => fields[2],
-          "author"  => fields[3],
-          "date"    => fields[4]
-        }
-      end.compact
+      parse_log_entries(raw_output, with_parents: true)
     end
 
     # Parse compact `git log --pretty=format:%H%x1f%s%x1f%an%x1f%aI%x1e` output.
+    # Returns Array of hashes with string keys.
     def self.parse_git_log(raw_output)
-      raw_output.split("\x1e").map do |entry|
-        fields = entry.strip.split("\x1f", 4)
-        next unless fields.length == 4
-
-        {
-          "hash"   => fields[0],
-          "title"  => fields[1],
-          "author" => fields[2],
-          "date"   => fields[3]
-        }
-      end.compact
+      parse_log_entries(raw_output, with_parents: false)
     end
 
     # Resolve a file path safely within repo_path.  Returns full path string or
@@ -91,5 +134,31 @@ module Mbeditor
       full = File.expand_path(relative.to_s, repo_path.to_s)
       full.start_with?(repo_path.to_s + "/") || full == repo_path.to_s ? full : nil
     end
+
+    def self.parse_log_entries(raw_output, with_parents:)
+      field_count = with_parents ? 5 : 4
+      raw_output.split("\x1e").filter_map do |entry|
+        fields = entry.strip.split("\x1f", field_count)
+        next unless fields.length == field_count
+
+        if with_parents
+          {
+            "hash"    => fields[0],
+            "parents" => fields[1].split.reject(&:blank?),
+            "title"   => fields[2],
+            "author"  => fields[3],
+            "date"    => fields[4]
+          }
+        else
+          {
+            "hash"   => fields[0],
+            "title"  => fields[1],
+            "author" => fields[2],
+            "date"   => fields[3]
+          }
+        end
+      end
+    end
+    private_class_method :parse_log_entries
   end
 end

data/app/services/mbeditor/redmine_service.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "net/http"
+require "openssl"
 require "uri"
 require "json"
 
@@ -42,6 +43,9 @@ module Mbeditor
       raise RedmineConfigError, "redmine_url is not configured" if config.redmine_url.blank?
       raise RedmineConfigError, "redmine_api_key is not configured" if config.redmine_api_key.blank?
 
+      uri = URI.parse(config.redmine_url.to_s.chomp("/"))
+      raise RedmineConfigError, "redmine_url must use http or https scheme" unless %w[http https].include?(uri.scheme)
+
       fetch_issue(config.redmine_url, config.redmine_api_key)
     end
 
@@ -52,6 +56,9 @@ module Mbeditor
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == "https"
+      if uri.scheme == "https"
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
       http.open_timeout = TIMEOUT_SECONDS
       http.read_timeout = TIMEOUT_SECONDS
 

data/app/services/mbeditor/ruby_definition_service.rb

@@ -22,6 +22,7 @@ module Mbeditor
   class RubyDefinitionService
     MAX_RESULTS = 20
     MAX_COMMENT_LOOKAHEAD = 15
+    MAX_FILES_SCANNED = 10_000
 
     # In-process file-index cache.
     # Structure: { absolute_path => { mtime: Float, lines: [String], all_defs: { method_name => [line, ...] } } }
@@ -101,8 +102,11 @@ module Mbeditor
     def call
       self.class.load_disk_cache_once
 
-      results     = []
-      @new_entries = false
+      results       = []
+      @new_entries  = false
+      files_scanned = 0
+
+      evict_deleted_cache_entries
 
       Find.find(@workspace_root) do |path|
         # Prune excluded directories
@@ -120,6 +124,12 @@ module Mbeditor
         rel = relative_path(path)
         next if excluded_rel_path?(rel, File.basename(path))
 
+        files_scanned += 1
+        if files_scanned > MAX_FILES_SCANNED
+          Rails.logger.warn("[mbeditor] RubyDefinitionService: workspace exceeds #{MAX_FILES_SCANNED} .rb files; stopping scan early")
+          break
+        end
+
         begin
           cached = cache_entry_for(path)
           next unless cached
@@ -147,6 +157,17 @@ module Mbeditor
 
     private
 
+    # Remove cache entries for files that no longer exist on disk.
+    def evict_deleted_cache_entries
+      stale_keys = self.class.mutex.synchronize do
+        self.class.file_cache.keys.select { |p| !File.exist?(p) }
+      end
+      return if stale_keys.empty?
+
+      self.class.mutex.synchronize { stale_keys.each { |k| self.class.file_cache.delete(k) } }
+      @new_entries = true
+    end
+
     # Returns the cached index entry for +path+, rebuilding it if the file has
     # been modified since the last parse.  Returns nil on any read/parse error.
     def cache_entry_for(path)

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,28 @@
+# 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.call }
+      else
+        block.call
+      end
+    end
+  end
+end

data/lib/mbeditor/configuration.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Mbeditor
   class Configuration
     attr_accessor :allowed_environments, :workspace_root, :excluded_paths, :rubocop_command,
                   :redmine_enabled, :redmine_url, :redmine_api_key, :redmine_ticket_source,
                   :test_framework, :test_command, :test_timeout,
-                  :authenticate_with
+                  :authenticate_with,
+                  :lint_timeout, :base_branch_candidates, :git_timeout
 
     def initialize
       @allowed_environments = [:development]
@@ -17,6 +20,9 @@ module Mbeditor
       @test_framework   = nil # :minitest or :rspec — auto-detected when nil
       @test_command     = nil # e.g. "bundle exec ruby -Itest" or "bundle exec rspec"
       @test_timeout     = 60  # seconds
+      @lint_timeout     = 15  # seconds for RuboCop/haml-lint subprocesses
+      @base_branch_candidates = %w[origin/develop origin/main origin/master develop main master]
+      @git_timeout      = nil # seconds; nil disables (no timeout on git subprocesses)
     end
   end
 end

data/lib/mbeditor/engine.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "mbeditor/rack/silence_ping_request"
 require "mbeditor/rack/handle_pending_migrations"
+require "mbeditor/cable_log_filter"
 
 module Mbeditor
   class Engine < ::Rails::Engine
@@ -22,8 +25,42 @@ 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
+
+      cfg = Mbeditor.configuration
+
+      if cfg.workspace_root.present? && !File.directory?(cfg.workspace_root.to_s)
+        raise ArgumentError, "[mbeditor] config.workspace_root is set to '#{cfg.workspace_root}' but that path is not a directory"
+      end
+
+      if cfg.redmine_enabled
+        require "uri"
+        if cfg.redmine_url.blank?
+          Rails.logger.warn("[mbeditor] redmine_enabled is true but redmine_url is not configured")
+        else
+          begin
+            uri = URI.parse(cfg.redmine_url.to_s)
+            unless %w[http https].include?(uri.scheme)
+              Rails.logger.warn("[mbeditor] redmine_url must use http or https scheme")
+            end
+          rescue URI::InvalidURIError
+            Rails.logger.warn("[mbeditor] redmine_url is not a valid URI")
+          end
+        end
+        if cfg.redmine_api_key.blank?
+          Rails.logger.warn("[mbeditor] redmine_enabled is true but redmine_api_key is not configured")
+        end
+      end
     end
 
     initializer "mbeditor.assets.precompile" do |app|

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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mbeditor
-  VERSION = "0.3.8"
+  VERSION = "0.4.2"
 end

data/lib/mbeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mbeditor/version"
 require "mbeditor/configuration"
 require "mbeditor/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.2
 platform: ruby
 authors:
 - Oliver Noonan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-16 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