rigortype 0.4.6 → 0.4.7

data/lib/rigor/cli/lsp_command.rb

@@ -4,6 +4,7 @@ require_relative "command"
 require_relative "options"
 require_relative "../runtime/jit"
 
+require "json"
 require "optionparser"
 
 module Rigor
@@ -15,6 +16,179 @@ module Rigor
     class LspCommand < Command
       USAGE = "Usage: rigor lsp [options]"
 
+      # Records each JSON-RPC message one per line, prefixed with the direction (`<-` read from the client, `->`
+      # written to it) and a timestamp. Only the message framing is logged; the server's own debug output joins the
+      # same file through `$stderr` (see {#with_debug_output}).
+      #
+      # It never raises into the protocol path. A message the JSON encoder rejects (raw invalid UTF-8 in a string) is
+      # logged as a scrubbed rendering, so its line is still written. Any IO failure disables the log for the rest of
+      # the session: records are dropped, and debug output falls back to `fallback` (the real stderr). Nothing is
+      # `warn`ed into the failing log.
+      class WireLog
+        def initialize(io, fallback)
+          @io = io
+          @fallback = fallback
+          @broken = false
+        end
+
+        def record(direction, message)
+          deliver("#{stamp} #{direction} #{render(message)}\n")
+          nil
+        end
+
+        # Debug output written to `$stderr` while the session runs (`Kernel#warn` calls `write`). The parts are joined
+        # as binary, so an odd encoding in one part cannot raise here.
+        def write(*parts)
+          text = parts.map { |part| part.to_s.b }.join
+          @fallback.write(text) unless deliver(text)
+          text.bytesize
+        end
+
+        def print(*parts)
+          write(*parts)
+          nil
+        end
+
+        def puts(*args)
+          lines = if args.empty?
+                    ["\n"]
+                  else
+                    args.flatten.map { |arg| arg.to_s.end_with?("\n") ? arg.to_s : "#{arg}\n" }
+                  end
+          write(*lines)
+          nil
+        end
+
+        def printf(format_string, *)
+          write(format(format_string, *))
+          nil
+        end
+
+        def putc(char)
+          write(char.is_a?(Integer) ? char.chr : char.to_s[0])
+          char
+        end
+
+        def syswrite(text)
+          write(text)
+        end
+
+        def <<(part)
+          write(part)
+          self
+        end
+
+        def flush
+          self
+        end
+
+        # The exception that escaped the server loop, with its backtrace, so a crash is in the log, not only on stderr.
+        def crash(error)
+          lines = ["#{stamp} ! #{error.class}: #{error.message}\n"]
+          lines.concat((error.backtrace || []).map { |frame| "    #{frame}\n" })
+          text = lines.join
+          @fallback.write(text) unless deliver(text)
+          nil
+        end
+
+        def close
+          @io.close unless @io.closed?
+        end
+
+        # Every other IO method (`tty?`, `closed?`, `fileno`, `sync=`, `to_io` for `system(err: $stderr)`, ...) goes to
+        # the current sink: the file while the log works, the real stderr once it has failed.
+        def method_missing(name, ...)
+          return super unless sink.respond_to?(name)
+
+          sink.public_send(name, ...)
+        end
+
+        def respond_to_missing?(name, include_private = false)
+          sink.respond_to?(name) || super
+        end
+
+        private
+
+        def sink
+          @broken ? @fallback : @io
+        end
+
+        # Writes `text` to the file. Returns false when the log is (or just became) unusable. Only a failure of the
+        # write itself disables the log.
+        def deliver(text)
+          return false if @broken
+
+          @io.write(text)
+          true
+        rescue StandardError
+          @broken = true
+          false
+        end
+
+        def stamp
+          Time.now.strftime("%FT%T.%6N%:z")
+        end
+
+        # The JSON line for `message`. One the encoder rejects (invalid UTF-8, nesting past its limit, a `to_json` that
+        # raises) is rendered from its scrubbed copy, or from its `inspect` when even that does not encode.
+        def render(message)
+          JSON.generate(message)
+        rescue StandardError
+          begin
+            JSON.generate(scrub(message))
+          rescue StandardError
+            JSON.generate(message.inspect)
+          end
+        end
+
+        def scrub(value)
+          case value
+          when Hash then value.to_h { |key, val| [scrub(key), scrub(val)] }
+          when Array then value.map { |item| scrub(item) }
+          when Symbol then scrub(value.to_s).to_sym
+          when String then value.dup.force_encoding(Encoding::UTF_8).scrub
+          else value
+          end
+        end
+      end
+
+      # Wraps the framed reader so every request or notification it yields is logged before the Loop dispatches it.
+      class WireLogReader
+        def initialize(inner, log)
+          @inner = inner
+          @log = log
+        end
+
+        def read(&block)
+          @inner.read do |message|
+            @log.record("<-", message)
+            block.call(message)
+          end
+        end
+
+        def close
+          @inner.close
+        end
+      end
+
+      # Wraps the framed writer so every outgoing message is logged as it goes on the wire. It sits inside
+      # `SynchronizedWriter`, so the log line and the frame it describes are written under the same lock.
+      class WireLogWriter
+        def initialize(inner, log)
+          @inner = inner
+          @log = log
+        end
+
+        def write(message)
+          @log.record("->", message.merge(jsonrpc: "2.0"))
+          @inner.write(message)
+        end
+
+        def close
+          @inner.close
+        end
+      end
+
       # @return CLI exit status.
       def run
         options = parse_options
@@ -26,6 +200,9 @@ module Rigor
           return CLI::EXIT_USAGE
         end
 
+        log = open_wire_log(options.fetch(:log))
+        return CLI::EXIT_USAGE if log == :usage_error
+
         # A long-lived server always outlasts the JIT compile cost, so enable
         # YJIT at boot rather than on the analysis deadline (Runtime::Jit).
         Runtime::Jit.enable_now
@@ -34,23 +211,83 @@ module Rigor
         require_relative "../configuration"
         require "language_server-protocol"
 
-        # STDIN is read frame-by-frame via the gem's `Io::Reader`; STDOUT is wrapped in `SynchronizedWriter` so
-        # concurrent writes from the main dispatch thread + the Debouncer's async threads don't interleave frames. The
-        # Loop runs until either STDIN hits EOF or `server.exited?`; the process then exits with the server's recorded
-        # code (0 after a clean shutdown+exit, 1 otherwise).
-        writer = LanguageServer::SynchronizedWriter.new(
-          ::LanguageServer::Protocol::Transport::Io::Writer.new($stdout)
-        )
-        server, loop_runner = build_server(writer: writer, config_path: options.fetch(:config))
-        loop_runner.run
-        server.exit_code || 0
+        begin
+          serve(config_path: options.fetch(:config), log: log)
+        ensure
+          log&.close
+        end
+      end
+
+      # The parser this command parses with, built without parsing anything: the catalogue reads the
+      # flags and formats from it (ADR-126 WD3). `options` is only written by the switches' blocks.
+      def option_parser(options = {})
+        OptionParser.new do |opts|
+          opts.banner = USAGE
+          opts.on("--transport=NAME", "Transport (default: stdio; only stdio supported in v1)") do |value|
+            options[:transport] = value
+          end
+          opts.on("--log=PATH",
+                  "Append the LSP wire log and server debug output to PATH " \
+                  "(default: no wire log; debug output goes to stderr)") do |value|
+            options[:log] = value
+          end
+          Options.add_config(opts, options)
+        end
       end
 
       private
 
+      # STDIN is read frame-by-frame via the gem's `Io::Reader`; STDOUT is wrapped in `SynchronizedWriter` so
+      # concurrent writes from the main dispatch thread + the Debouncer's async threads don't interleave frames. The
+      # Loop runs until either STDIN hits EOF or `server.exited?`; the process then exits with the server's recorded
+      # code (0 after a clean shutdown+exit, 1 otherwise). With a wire log, both directions are logged inside the lock.
+      def serve(config_path:, log:)
+        reader = ::LanguageServer::Protocol::Transport::Io::Reader.new($stdin)
+        frame_writer = ::LanguageServer::Protocol::Transport::Io::Writer.new($stdout)
+        if log
+          reader = WireLogReader.new(reader, log)
+          frame_writer = WireLogWriter.new(frame_writer, log)
+        end
+        writer = LanguageServer::SynchronizedWriter.new(frame_writer)
+        server, loop_runner = build_server(writer: writer, reader: reader, config_path: config_path)
+        with_debug_output(log) { loop_runner.run }
+        server.exit_code || 0
+      end
+
+      # Opens PATH for appending with synchronous writes, so a crash loses no logged line. Returns nil without a
+      # PATH, the open file, or `:usage_error` after reporting why it could not be opened.
+      def open_wire_log(path)
+        return nil if path.nil?
+
+        io = File.new(path, "a")
+        io.sync = true
+        WireLog.new(io, $stderr)
+      rescue SystemCallError => e
+        @err.puts("rigor lsp: cannot open --log file #{path.inspect}: #{e.message}")
+        :usage_error
+      end
+
+      # Routes the server's debug output (`warn` and the Ruby runtime's warnings, both written to `$stderr`) into the
+      # wire log for the length of the session. An exception that escapes the loop is written to the log before
+      # `$stderr` is restored and the exception is re-raised. Without a log, `$stderr` is left alone.
+      def with_debug_output(log)
+        return yield if log.nil?
+
+        saved = $stderr
+        begin
+          $stderr = log
+          yield
+        rescue StandardError, ScriptError, SystemStackError => e
+          log.crash(e)
+          raise
+        ensure
+          $stderr = saved
+        end
+      end
+
       # Builds the full collaborator graph from a fresh `Configuration` + `ProjectContext`. Returns `[server, loop]` so
       # the caller drives the loop and reads `server.exit_code` for the process exit status.
-      def build_server(writer:, config_path:) # rubocop:disable Metrics/MethodLength
+      def build_server(writer:, reader:, config_path:) # rubocop:disable Metrics/MethodLength
         configuration = Configuration.load(config_path)
         # ProjectContext caches Environment + Cache::Store across requests so hover / publish hit the warm path.
         # Invalidated by `workspace/didChangeWatchedFiles` and `workspace/didChangeConfiguration`; every save round
@@ -89,7 +326,7 @@ module Rigor
           project_context: project_context
         )
         loop_runner = LanguageServer::Loop.new(
-          reader: ::LanguageServer::Protocol::Transport::Io::Reader.new($stdin),
+          reader: reader,
           writer: writer,
           server: server
         )
@@ -99,17 +336,7 @@ module Rigor
       def parse_options
         options = { transport: "stdio", log: nil, config: nil }
 
-        parser = OptionParser.new do |opts|
-          opts.banner = USAGE
-          opts.on("--transport=NAME", "Transport (default: stdio; only stdio supported in v1)") do |value|
-            options[:transport] = value
-          end
-          opts.on("--log=PATH", "Write LSP wire log + server debug to PATH (default: stderr)") do |value|
-            options[:log] = value
-          end
-          Options.add_config(opts, options)
-        end
-        parser.parse!(@argv)
+        option_parser(options).parse!(@argv)
         options
       rescue OptionParser::ParseError => e
         @err.puts(e.message)

data/lib/rigor/cli/mcp_command.rb

@@ -42,12 +42,10 @@ module Rigor
         0
       end
 
-      private
-
-      def parse_options
-        options = { transport: "stdio", config: nil }
-
-        parser = OptionParser.new do |opts|
+      # The parser this command parses with, built without parsing anything: the catalogue reads the
+      # flags and formats from it (ADR-126 WD3). `options` is only written by the switches' blocks.
+      def option_parser(options = {})
+        OptionParser.new do |opts|
           opts.banner = USAGE
           opts.on("--transport=NAME",
                   "Transport (default: stdio; only stdio is supported in v1)") do |value|
@@ -58,7 +56,14 @@ module Rigor
             options[:config] = Options.config_path(value)
           end
         end
-        parser.parse!(@argv)
+      end
+
+      private
+
+      def parse_options
+        options = { transport: "stdio", config: nil }
+
+        option_parser(options).parse!(@argv)
         options
       rescue OptionParser::ParseError => e
         @err.puts(e.message)

data/lib/rigor/cli/mutation_fork_scan.rb

@@ -40,7 +40,7 @@ module Rigor
       # @return one entry per path.
       def run(paths:, scanner:, environment:, configuration:, workers:)
         # Force the full RBS load on the parent so children copy-on-write inherit a warm environment rather
-        # than each rebuilding it after the fork. A no-op on the sequential path but cheap.
+        # than each rebuilding it after the fork. Skipped when the run is sequential.
         environment.rbs_loader&.prewarm if Inference::ForkMap.parallel?([workers, paths.size].min)
 
         payloads = Inference::ForkMap.call(items: paths, workers: workers) do |slice|

data/lib/rigor/cli/mutation_protection_renderer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require_relative "json_document"
 
 module Rigor
   class CLI
@@ -22,7 +23,7 @@ module Rigor
       private
 
       def render_json(report)
-        @out.puts(JSON.pretty_generate(report.to_h))
+        @out.puts(JSON.pretty_generate(JsonDocument.stamp(report.to_h)))
       end
 
       def render_text(report)
@@ -46,7 +47,7 @@ module Rigor
       end
 
       # Issue #686 — the count that makes the command exit non-zero, on stdout beside the ratio it qualifies
-      # (the stderr twin in `CoverageMutation#warn_unmeasured_files` carries the explanation).
+      # (the stderr twin in {MeasurementIntegrityWarning} carries the explanation).
       def render_unmeasured_files(report)
         count = report.unmeasured_files
         return if count.zero?

data/lib/rigor/cli/options.rb

@@ -16,6 +16,13 @@ module Rigor
     module Options
       module_function
 
+      # The formats `parser` accepts for `--format`, or nil when {.add_format} did not define the switch. A
+      # block-validated switch carries no list of its own, so {.add_format} leaves it on the parser for the CLI
+      # catalogue (ADR-126 WD3) to read.
+      def accepted_formats(parser)
+        parser.instance_variable_get(:@rigor_accepted_formats)
+      end
+
       # Defines the standard `--config=PATH` flag on `parser`, writing the path into `options[:config]`. Used by every
       # subcommand that loads a `.rigor.yml`; the few whose `--config` help text is intentionally bespoke (`diff`,
       # `mcp`, `show-bleedingedge`) keep their own `parser.on` and call {.config_path} for the same check.
@@ -25,6 +32,20 @@ module Rigor
         end
       end
 
+      # Defines `--format=FORMAT` restricted to `formats`, so an unsupported value is an `OptionParser::InvalidArgument`
+      # raised while the options are parsed (#2502). A check left to the renderer ran the whole analysis first, and a
+      # renderer that read only `format == "json"` printed text for any other value. The match is exact: an
+      # OptionParser enum would also complete a prefix (`--format=j`), which then turns ambiguous the day a second
+      # format shares it. The renderers' own "unsupported format" branches remain as a guard against internal drift.
+      def add_format(parser, options, description, formats: %w[text json])
+        parser.instance_variable_set(:@rigor_accepted_formats, formats.dup.freeze)
+        parser.on("--format=FORMAT", description) do |value|
+          raise OptionParser::InvalidArgument, value unless formats.include?(value)
+
+          options[:format] = value
+        end
+      end
+
       # The `--config` value, checked where the flag is read (#1992). A named file that is not there is an error, not
       # a request for the defaults: the run would otherwise analyse under a configuration the caller did not ask for,
       # and an MCP caller would get a result for it with no sign anything was missing. Auto-discovery, with no
@@ -42,22 +63,40 @@ module Rigor
       def add_editor_mode(parser, options)
         parser.on("--tmp-file=PATH",
                   "Editor mode: read source bytes from PATH instead of --instead-of (paired)") do |value|
+          note_repeated_editor_flag(options, :tmp_file, "--tmp-file")
           options[:tmp_file] = value
         end
         parser.on("--instead-of=PATH",
                   "Editor mode: the logical project path the buffer represents (paired with --tmp-file)") do |value|
+          note_repeated_editor_flag(options, :instead_of, "--instead-of")
           options[:instead_of] = value
         end
       end
 
+      # Issue #2233 — editor mode binds one buffer per run, so a second `--tmp-file` or `--instead-of` cannot be
+      # honoured beside the first. Overwriting it dropped the first pair with no message; the repeat is recorded here
+      # and rejected by {resolve_buffer_binding} as a usage error instead.
+      def note_repeated_editor_flag(options, key, flag)
+        return if options[key].nil?
+
+        (options[:repeated_editor_flags] ||= []) << flag
+      end
+
       # Resolves the editor-mode buffer binding from parsed `options`: returns nil when neither editor-mode flag is set,
       # a `Analysis::BufferBinding` when the pair is valid, or `:usage_error` (after writing the reason to `err`) when
-      # the flags are unpaired or the temp file is unreadable.
+      # a flag is repeated, the flags are unpaired, or the temp file is unreadable.
       def resolve_buffer_binding(options, err:)
         tmp = options[:tmp_file]
         instead = options[:instead_of]
         return nil if tmp.nil? && instead.nil?
 
+        repeated = Array(options[:repeated_editor_flags])
+        unless repeated.empty?
+          err.puts("#{repeated.join(' and ')} given more than once; editor mode takes one buffer per run " \
+                   "(a single --tmp-file / --instead-of pair)")
+          return :usage_error
+        end
+
         if tmp.nil? || instead.nil?
           err.puts("--tmp-file and --instead-of must appear together")
           return :usage_error