rigortype 0.2.9 → 0.3.0

data/lib/rigor/language_server/folding_range_provider.rb

@@ -4,6 +4,7 @@ require "prism"
 
 require_relative "uri"
 require_relative "buffer_resolution"
+require_relative "../source/node_children"
 
 module Rigor
   module LanguageServer
@@ -48,7 +49,7 @@ module Rigor
              Prism::BlockNode
           add_range(node, ranges)
         end
-        node.compact_child_nodes.each { |child| walk(child, ranges) }
+        node.rigor_each_child { |child| walk(child, ranges) }
       end
 
       def add_range(node, ranges)

data/lib/rigor/language_server/selection_range_provider.rb

@@ -4,6 +4,7 @@ require "prism"
 
 require_relative "uri"
 require_relative "buffer_resolution"
+require_relative "../source/node_children"
 
 module Rigor
   module LanguageServer
@@ -48,7 +49,7 @@ module Rigor
         return chain unless node.location && offset_in?(node.location, offset)
 
         chain << node
-        node.compact_child_nodes.each { |child| ancestor_chain(child, offset, chain) }
+        node.rigor_each_child { |child| ancestor_chain(child, offset, chain) }
         chain
       end
 

data/lib/rigor/language_server/signature_help_provider.rb

@@ -8,6 +8,7 @@ require_relative "../environment"
 require_relative "../reflection"
 require_relative "../scope"
 require_relative "../source/node_locator"
+require_relative "../source/node_children"
 require_relative "../inference/scope_indexer"
 require_relative "../type/nominal"
 require_relative "../type/singleton"
@@ -99,7 +100,7 @@ module Rigor
           if n.is_a?(Prism::CallNode) && n.arguments && offset_in?(n.arguments.location, cursor_offset)
             result = n # Innermost-wins because we keep walking children.
           end
-          n.compact_child_nodes.each(&walk)
+          n.rigor_each_child(&walk)
         end
         walk.call(root)
         result

data/lib/rigor/plugin/base.rb

@@ -390,8 +390,8 @@ module Rigor
         # the fact slot.
         #
         # Renamed from `type_specifier` (ADR-80): the old name read as a parallel to `dynamic_return` (a
-        # type) when it actually returns facts. {.type_specifier} survives as a deprecating alias through
-        # 0.2.x and is removed in 0.3.0.
+        # type) when it actually returns facts. The old verb was a deprecating alias through 0.2.x and is
+        # gone in 0.3.0 — `narrowing_facts` is the only spelling.
         def narrowing_facts(methods:, &block)
           raise ArgumentError, "Plugin::Base.narrowing_facts requires a block body" if block.nil?
           unless methods.is_a?(Array) && !methods.empty? &&
@@ -401,30 +401,17 @@ module Rigor
                   "got #{methods.inspect}"
           end
 
-          @type_specifiers ||= []
-          @type_specifiers << { methods: methods.map(&:to_sym).freeze, block: block }.freeze
+          @narrowing_facts_rules ||= []
+          @narrowing_facts_rules << { methods: methods.map(&:to_sym).freeze, block: block }.freeze
           nil
         end
 
-        # DEPRECATED (ADR-80) — renamed to {.narrowing_facts}. This hook supplies post-return narrowing
-        # *facts*, not a type; the old name misleads by parallel with {.dynamic_return}. Retained as a
-        # warning-emitting alias through 0.2.x; REMOVED in 0.3.0. Migrate `type_specifier methods: …` →
-        # `narrowing_facts methods: …`.
-        def type_specifier(methods:, &)
-          unless @type_specifier_deprecation_warned
-            @type_specifier_deprecation_warned = true
-            warn("[rigor] Plugin::Base.type_specifier is deprecated (ADR-80) and will be " \
-                 "removed in Rigor 0.3.0; rename it to `narrowing_facts`. (#{name})")
-          end
-          narrowing_facts(methods:, &)
-        end
-
-        # Frozen snapshot of the declared type-specifier rules. Memoised for the same reason as
+        # Frozen snapshot of the declared narrowing-facts rules. Memoised for the same reason as
         # {dynamic_returns} — consulted per plugin per dispatch, over an array fixed at class-definition
         # time.
         # rubocop:disable Naming/MemoizedInstanceVariableName -- see dynamic_returns
-        def type_specifiers
-          @type_specifiers_snapshot ||= (@type_specifiers || []).dup.freeze
+        def narrowing_facts_rules
+          @narrowing_facts_rules_snapshot ||= (@narrowing_facts_rules || []).dup.freeze
         end
         # rubocop:enable Naming/MemoizedInstanceVariableName
       end
@@ -558,8 +545,8 @@ module Rigor
       # ADR-37 slice 2 — the post-return narrowing facts contributed by this plugin's {.narrowing_facts}
       # rules for a call. The engine calls this from `StatementEvaluator`; a rule fires only when
       # `call_node.name` is one of its declared `methods:`. Failures isolate to [].
-      def type_specifier_facts(call_node:, scope:)
-        rules = self.class.type_specifiers
+      def narrowing_facts_for(call_node:, scope:)
+        rules = self.class.narrowing_facts_rules
         return [] if rules.empty? || !call_node.respond_to?(:name)
 
         name = call_node.name

data/lib/rigor/plugin/inflector.rb

@@ -18,9 +18,12 @@ module Rigor
     # rules are ingested by *statically parsing* `config/initializers/inflections.rb` in a later slice, never
     # by executing it.)
     #
-    # **Absence is silence, never a guess.** When `ActiveSupport::Inflector` cannot be loaded (a
-    # misconfiguration — the consuming plugins declare it as a dependency, so it is present in practice), the
-    # inflection methods raise {Unavailable} rather than approximate. That raise propagates to the caller's
+    # **Absence is silence, never a guess.** ActiveSupport is resolved from Rigor's host gem environment
+    # first, then from the analyzed project's own bundler install tree ({Isolation.target_bundle_root},
+    # ADR-90) — a Rails project always carries its locked activesupport on disk, and that copy is the
+    # higher-fidelity source of inflection rules anyway. When neither resolves (a standalone install
+    # analyzing a project whose bundle is not installed), the inflection methods raise {Unavailable}
+    # rather than approximate. That raise propagates to the caller's
     # per-plugin rescue boundary, so the inflection-dependent check degrades to **no diagnostics** — reduced
     # coverage, never a wrong fact. A consumer that wants to fail cleanly up front can gate on {available?}
     # and emit a single load-error.
@@ -39,6 +42,12 @@ module Rigor
       FEATURE = "active_support/inflector"
       RECEIVER = "ActiveSupport::Inflector"
 
+      # The bundled plugins whose checks consume this helper (each README documents the dependency). Used
+      # by `rigor plugins` (ADR-90) to probe {available?} at activation time — so a standalone install
+      # where inflection silently degrades reports the degradation instead of an unqualified `[OK]`. When
+      # a new plugin adopts the helper, add its manifest id here.
+      CONSUMER_PLUGIN_IDS = %w[actionmailer actionpack activerecord factorybot rails-routes].freeze
+
       # Raised when `ActiveSupport::Inflector` is required for an inflection but cannot be loaded. Caught by
       # the per-plugin isolation boundary, so it surfaces as "this plugin produced no diagnostics" rather than
       # a wrong inflection.

data/lib/rigor/plugin/io_boundary.rb

@@ -97,8 +97,12 @@ module Rigor
       private
 
       def record_file_entry(path, contents)
+        # ADR-87 WD1 — the boundary descriptor is validation-only (it never keys a cache), so a plugin-read
+        # file rides the stat-then-digest `:stat` tier: a warm run stat-checks the (on a Rails monorepo,
+        # 30k+ file) plugin-read set instead of re-hashing it. The digest is taken from the in-memory content
+        # we just read; `FileEntry.stat` stats the same path to pack the tuple.
         digest = Digest::SHA256.hexdigest(contents)
-        entry = Cache::Descriptor::FileEntry.new(path: path, comparator: :digest, value: digest)
+        entry = Cache::Descriptor::FileEntry.stat(path: path, digest: digest)
         @mutex.synchronize { @file_entries[path] = entry }
       end
 

data/lib/rigor/plugin/isolation.rb

@@ -30,6 +30,65 @@ module Rigor
 
       module_function
 
+      # The analyzed project's resolved bundler install root (e.g. `<project>/vendor/bundle`), or nil.
+      # Set from the same `bundler.*` resolution that feeds bundle sig discovery (O4 / ADR-82 WD9) — by
+      # the runner's pre-passes BEFORE any plugin `#prepare` runs, by `Environment.for_project` (which
+      # also covers pool workers), and by `rigor plugins`' probe. When a target library cannot be
+      # required from Rigor's own gem
+      # environment (the standalone `gem install rigortype` case — activesupport is deliberately NOT a
+      # runtime dependency), {require_with_target_bundle} falls back to requiring it from this bundle:
+      # the analyzed Rails project always carries its own activesupport on disk, and loading the
+      # project's locked copy is the higher-fidelity source of inflection rules anyway (ADR-79).
+      def target_bundle_root
+        @target_bundle_root
+      end
+
+      def target_bundle_root=(root)
+        @target_bundle_root = root.nil? ? nil : File.expand_path(root.to_s)
+      end
+
+      # Requires `feature`, falling back to the analyzed project's bundler install tree. The fallback
+      # appends every bundle gem's `full_require_paths` (from its RubyGems-generated `specifications/`
+      # gemspec — the gem's own metadata, so nonstandard require paths like concurrent-ruby's
+      # `lib/concurrent-ruby` resolve correctly) to `$LOAD_PATH` and retries. `$LOAD_PATH` is appended,
+      # never prepended, and only on a failed require: Rigor's own activated gems keep precedence, and a
+      # host environment that carries the gem never consults the bundle. (`Gem.paths` augmentation was
+      # rejected — Bundler-locked processes silently ignore it.) Under the default `process` strategy the
+      # mutation happens inside the forked worker only; under `none`/Direct it lands in the main space,
+      # which is what that strategy means (documented tradeoff — the invoked library is trusted + pure).
+      def require_with_target_bundle(feature, bundle_root)
+        require feature
+      rescue ::LoadError
+        added = bundle_require_paths(bundle_root) - $LOAD_PATH
+        raise if added.empty?
+
+        $LOAD_PATH.concat(added)
+        require feature
+      end
+
+      # Every bundle gem's require paths, newest version per gem name. Loading a `specifications/*.gemspec`
+      # evaluates RubyGems-generated metadata of an installed third-party gem — the same trust level as
+      # requiring the gem, which is what the caller is about to do.
+      def bundle_require_paths(bundle_root)
+        bundle_gem_dirs(bundle_root).flat_map do |gem_home|
+          specs = Dir.glob(File.join(gem_home, "specifications", "*.gemspec"))
+                     .filter_map { |file| Gem::Specification.load(file) }
+          specs.group_by(&:name)
+               .flat_map { |_, versions| versions.max_by(&:version).full_require_paths }
+        end
+      end
+
+      # The RubyGems-shaped directories under a bundler install root: bundler nests them as
+      # `<root>/ruby/<ruby-version>/`; a `BUNDLE_PATH` may also point directly at such a directory. Only
+      # directories that actually carry a `specifications/` index are returned.
+      def bundle_gem_dirs(bundle_root)
+        return [] if bundle_root.nil? || bundle_root.to_s.empty?
+
+        root = bundle_root.to_s
+        (Dir.glob(File.join(root, "ruby", "*")) + [root])
+          .select { |dir| File.directory?(File.join(dir, "specifications")) }
+      end
+
       # The default strategy. `process` (a crash-contained forked worker) is the default: it isolates the
       # target library's monkey-patches + crashes from Rigor with no in-process contamination, and forks a
       # single persistent worker (not one per call). It falls back to `none` where fork is unavailable (see
@@ -68,10 +127,15 @@ module Rigor
       module Direct
         module_function
 
+        # NOTE: rescue classes are `::`-qualified throughout this file: `Rigor::Plugin::LoadError` (the
+        # plugin-loading error) shadows the global `LoadError` in this lexical scope once plugin machinery
+        # is loaded, so a bare `rescue LoadError` matches the WRONG class — the real `::LoadError` (a
+        # ScriptError, not a StandardError) then escapes, kills the worker, and surfaces as an opaque
+        # EOFError instead of the clean decline (the standalone-install regression of 2026-07-16).
         def call(feature:, receiver:, method:, args:)
-          require feature
+          Isolation.require_with_target_bundle(feature, Isolation.target_bundle_root)
           Object.const_get(receiver).public_send(method, *args)
-        rescue LoadError, NameError => e
+        rescue ::LoadError, ::NameError => e
           raise Unavailable, "#{receiver} could not be loaded (#{e.class}: #{e.message})"
         end
       end
@@ -109,13 +173,13 @@ module Rigor
         def call(feature:, receiver:, method:, args:)
           raise Unavailable, "process isolation unavailable: fork is not supported" unless available?
 
-          status, value = exchange([feature, receiver, method, args])
+          status, value = exchange([feature, receiver, method, args, Isolation.target_bundle_root])
           raise Unavailable, "process isolation worker error: #{value}" if status == :error
 
           value
         rescue Unavailable
           raise
-        rescue StandardError => e
+        rescue ::StandardError => e
           # A dead worker surfaces as EOFError (Marshal.load) or Errno::EPIPE (Marshal.dump) — both
           # StandardError. The crash is contained: the parent resets the worker (respawn next call) and
           # declines.
@@ -123,7 +187,9 @@ module Rigor
           raise Unavailable, "process isolation worker failed (#{e.class})"
         end
 
-        # Sends one request to the persistent worker and reads its reply.
+        # Sends one request to the persistent worker and reads its reply. The request carries the
+        # target-bundle root so the fallback require (see {Isolation.require_with_target_bundle}) happens
+        # inside the worker — the parent's gem environment is never touched.
         def exchange(request)
           w = worker
           Marshal.dump(request, w[:req])
@@ -152,22 +218,26 @@ module Rigor
           end
         end
 
-        # The child loop: read a `[feature, receiver, method, args]` request, require + call, and write
-        # `[:ok, result]` or `[:error, message]`. EOF (parent gone) ends the loop.
+        # The child loop: read a `[feature, receiver, method, args, bundle_root]` request, require + call,
+        # and write `[:ok, result]` or `[:error, message]`. EOF (parent gone) ends the loop.
+        #
+        # The rescue is `::`-qualified (see {Direct.call}) and covers `::ScriptError` so a failed require
+        # (`::LoadError` is a ScriptError) replies with the clean `[:error, …]` decline instead of
+        # silently killing the worker — the parent would otherwise see only an opaque EOFError.
         def run_worker_loop(req_r, res_w)
           loop do
-            feature, receiver, method, args = Marshal.load(req_r) # rubocop:disable Security/MarshalLoad -- parent input
+            feature, receiver, method, args, bundle_root = Marshal.load(req_r) # rubocop:disable Security/MarshalLoad -- parent input
             reply =
               begin
-                require feature
+                Isolation.require_with_target_bundle(feature, bundle_root)
                 [:ok, Object.const_get(receiver).public_send(method, *args)]
-              rescue StandardError, LoadError => e
+              rescue ::StandardError, ::ScriptError => e
                 [:error, "#{e.class}: #{e.message}"]
               end
             Marshal.dump(reply, res_w)
             res_w.flush
           end
-        rescue EOFError
+        rescue ::EOFError
           # parent closed the request pipe — exit quietly
         ensure
           exit!(0)

data/lib/rigor/plugin/load_error.rb

@@ -11,6 +11,14 @@ module Rigor
     class LoadError < StandardError
       attr_reader :plugin_ref, :cause_class, :reason
 
+      # #194 slice 1 — the file `require` resolved the plugin gem to, when the require SUCCEEDED but the
+      # later configuration / instantiation step then failed. The loader stamps it in a rescue after a
+      # successful require (a require that failed outright never resolves a file and leaves this nil), so a
+      # config/init failure names the exact plugin copy it loaded from — the engine↔plugin version skew that
+      # made #194 a multi-round diagnosis. Consumed by the `plugin_loader.load-error` diagnostic message and
+      # the `rigor plugins` load-error row.
+      attr_accessor :resolved_path
+
       # ADR-9 slice 5 introduces two new reason codes alongside the implicit "load failure" used for require /
       # configuration / init failures:
       #
@@ -19,11 +27,12 @@ module Rigor
       #   - `:dependency-cycle` — the consumes graph forms a cycle.
       #
       # Older callers omit `reason:` and the field defaults to nil (the legacy "load failure" envelope).
-      def initialize(message, plugin_ref:, cause: nil, reason: nil)
+      def initialize(message, plugin_ref:, cause: nil, reason: nil, resolved_path: nil)
         super(message)
         @plugin_ref = plugin_ref
         @cause_class = cause&.class
         @reason = reason&.to_sym
+        @resolved_path = resolved_path
       end
     end
   end

data/lib/rigor/plugin/loader.rb

@@ -12,7 +12,8 @@ module Rigor
     #
     # Steps per entry (in order):
     #
-    # 1. Normalise the entry into `{ gem:, id:, config: }`.
+    # 0. Skip the entry entirely when it carries `enabled: false` (the ADR-93 WD2 opt-out).
+    # 1. Normalise the entry into `{ gem:, id:, config:, enabled: }`.
     # 2. `require` the gem (failures surface as a {LoadError}).
     # 3. Look up the registered plugin class by id (or by gem name if the entry omitted an explicit id).
     # 4. Validate the user's config against the manifest's `config_schema`.
@@ -22,18 +23,57 @@ module Rigor
     # entries that resolve to the same gem. Failures do not abort the run; the loader collects them on the
     # {Registry} so the runner can convert each one into a `:plugin_loader` diagnostic.
     class Loader # rubocop:disable Metrics/ClassLength
-      attr_reader :services, :requirer
+      attr_reader :services, :requirer, :feature_resolver
+
+      # #194 slice 1 — resolve the file that satisfied `require <gem>` by scanning `$LOADED_FEATURES` for the
+      # entry ending in `/<gem>.rb`, LAST match preferred. Provenance-agnostic: it pins the actual file for a
+      # Bundler path gem, an installed gem, and a `-I`-injected checkout alike, and — because the feature is
+      # already present from the first load — it still resolves when `require` no-ops on a repeat in-process
+      # load (ADR-88 WD4b). Returns nil, never raises, in the degenerate cases: a gem whose entry-file
+      # basename differs from the gem name, and a spec's fake requirer that never populated `$LOADED_FEATURES`.
+      FEATURE_RESOLVER = lambda do |gem_name|
+        suffix = "/#{gem_name}.rb"
+        $LOADED_FEATURES.rfind { |feature| feature.end_with?(suffix) }
+      end
+
+      # #194 slice 2 (ADR-93 WD5) — the engine's own root, anchored from THIS file's location: the loader
+      # lives at `<root>/lib/rigor/plugin/loader.rb`, so three levels up is the engine root. It resolves
+      # identically in a git checkout and inside an installed `rigortype` gem, because the gem packages the
+      # `plugins/` tree at the same relative path — which is exactly what makes it a trustworthy anchor for
+      # the engine's own bundled plugin copies.
+      ENGINE_ROOT = File.expand_path("../../..", __dir__)
 
       # @param services [Rigor::Plugin::Services]
-      # @param requirer [#call] takes a gem name and returns truthy on successful require. Defaulted to
-      #   `Kernel.require` via a lambda; the spec injects a fake to avoid touching the real load path.
-      def initialize(services:, requirer: ->(name) { require name })
+      # @param requirer [#call] takes a gem name OR an absolute file path (#194 slice 2 — a bundled plugin is
+      #   required by its {.bundled_plugin_path}) and returns truthy on successful require. Defaulted to
+      #   `Kernel.require` via a lambda, which accepts both forms; the spec injects a fake to avoid touching
+      #   the real load path.
+      # @param feature_resolver [#call] takes a gem name and returns the absolute path `require` resolved it
+      #   to (or nil). Defaulted to {FEATURE_RESOLVER}; the spec injects a fake so it never has to mutate the
+      #   real `$LOADED_FEATURES` global.
+      def initialize(services:, requirer: ->(name) { require name }, feature_resolver: FEATURE_RESOLVER)
         @services = services
         @requirer = requirer
+        @feature_resolver = feature_resolver
+      end
+
+      def self.load(configuration:, services:, requirer: ->(name) { require name }, feature_resolver: FEATURE_RESOLVER)
+        new(services: services, requirer: requirer, feature_resolver: feature_resolver).load(configuration.plugins)
       end
 
-      def self.load(configuration:, services:, requirer: ->(name) { require name })
-        new(services: services, requirer: requirer).load(configuration.plugins)
+      # #194 slice 2 (ADR-93 WD5) — the absolute path of the engine's OWN bundled copy of a plugin gem
+      # (`<ENGINE_ROOT>/plugins/<gem>/lib/<gem>.rb`), or nil when the engine does not bundle it. A bundled
+      # plugin is required by this path rather than by gem name, so a stale installed `rigortype` gem can
+      # never displace the engine's own versioned copy through RubyGems name resolution — the engine and its
+      # bundled plugins are versioned together. Returns nil for a third-party / project-bundle plugin and for
+      # a trimmed packaging (the ADR-27 single-binary target that ships no `plugins/` tree), where the caller
+      # falls back to today's gem-name require so no install mode regresses. The rule is uniform across the
+      # auto-wired `rigor-rbs-inline` default and every user-listed entry, because the skew mechanism is
+      # identical for both. Also read by `rigor doctor`'s skew check (#194 slice 3) to decide which loaded
+      # plugins the engine bundles.
+      def self.bundled_plugin_path(gem_name)
+        path = File.join(ENGINE_ROOT, "plugins", gem_name, "lib", "#{gem_name}.rb")
+        File.file?(path) ? path : nil
       end
 
       # @param entries [Array<String, Hash>] the raw `plugins:` list from the configuration.
@@ -42,12 +82,21 @@ module Rigor
         plugins = []
         load_errors = []
         seen_ids = {}
+        # #194 slice 1 — `gem name => resolved file path` for every gem the loader successfully required.
+        # A frozen plugin instance (e.g. `rigor-rbs-inline` self-freezes per ADR-32) can't carry the path,
+        # so it rides on the Registry keyed by gem name; the `rigor plugins` loaded row reads it back.
+        @resolved_gem_paths = {}
 
         Array(entries).each_with_index do |raw, index|
           entry = normalise_entry(raw, index)
         rescue LoadError => e
           load_errors << e
         else
+          # ADR-93 WD2 — `enabled: false` opts a listed plugin out entirely: it is neither required nor
+          # trusted nor id-checked. This is the project-level opt-out for the auto-wired `rigor-rbs-inline`
+          # default (a user re-lists it with `enabled: false`), but it works for any entry.
+          next unless entry[:enabled]
+
           begin
             plugin = resolve_and_instantiate(entry, seen_ids)
             plugins << plugin if plugin
@@ -64,19 +113,23 @@ module Rigor
         load_errors.concat(sort_errors)
 
         blueprints = plugins.map { |plugin| Blueprint.new(klass_name: plugin.class.name, config: plugin.config) }
-        Registry.new(plugins: plugins, blueprints: blueprints, load_errors: load_errors)
+        Registry.new(plugins: plugins, blueprints: blueprints, load_errors: load_errors,
+                     resolved_gem_paths: @resolved_gem_paths)
       end
 
       private
 
       # Accepts:
-      #   "rigor-rails"
-      #   { "gem" => "rigor-rails", "id" => "rails", "config" => {...} }
-      #   { gem: "rigor-rails", id: "rails", config: {...} }
+      #   "rigor-activerecord"
+      #   { "gem" => "rigor-activerecord", "id" => "activerecord", "config" => {...} }
+      #   { gem: "rigor-activerecord", id: "activerecord", config: {...} }
+      #
+      # The `id:` form selects one plugin from a gem that registers several — the bare-string form
+      # raises for those (see `lookup_plugin_class!`).
       def normalise_entry(raw, index)
         case raw
         when String
-          { gem: raw, id: nil, config: {} }
+          { gem: raw, id: nil, config: {}, enabled: true }
         when Hash
           string_keyed = raw.to_h { |k, v| [k.to_s, v] }
           gem_name = string_keyed["gem"] || string_keyed["id"]
@@ -87,7 +140,9 @@ module Rigor
             )
           end
 
-          { gem: gem_name, id: string_keyed["id"], config: string_keyed["config"] || {} }
+          # `enabled:` defaults to true; only the explicit `false` disables (nil / absent stays enabled).
+          { gem: gem_name, id: string_keyed["id"], config: string_keyed["config"] || {},
+            enabled: string_keyed["enabled"] != false }
         else
           raise LoadError.new(
             "plugin entry ##{index} must be a String or Hash, got #{raw.class}",
@@ -99,9 +154,24 @@ module Rigor
       def resolve_and_instantiate(entry, seen_ids) # rubocop:disable Metrics/AbcSize
         before = Plugin.registered.keys.to_set
         require_gem!(entry)
+        # The require SUCCEEDED — pin the file it resolved to (nil when the resolver can't, never a raise).
+        # Recorded before the fallible steps below so a config/init failure can still name the loaded copy.
+        @resolved_gem_paths[entry[:gem]] = @feature_resolver.call(entry[:gem])
         after = Plugin.registered.keys.to_set
         newly_registered = (after - before).to_a
 
+        # ADR-88 WD4b — `require` runs a gem's body (and its `Rigor::Plugin.register` calls) at most ONCE per
+        # process. A first load captures the gem's ids in `newly_registered` and memoises the gem→ids mapping;
+        # a SECOND in-process load (the `--verify-incremental` full-run oracle, the incremental session's
+        # subset re-analysis, LSP re-loads) sees `require` no-op and an empty delta, so a bare-string
+        # (`id:`-less) entry recovers the gem's ids from the memo instead of raising "did not register any
+        # plugin". An explicit `id:` entry never needs this — it resolves by id directly in `lookup_plugin_class!`.
+        if newly_registered.any?
+          Plugin.record_gem_registration(entry[:gem], newly_registered)
+        elsif entry[:id].nil?
+          newly_registered = Plugin.ids_for_gem(entry[:gem])
+        end
+
         plugin_class = lookup_plugin_class!(entry, newly_registered)
         manifest = plugin_class.manifest
 
@@ -118,6 +188,13 @@ module Rigor
         plugin = instantiate(plugin_class, entry[:config])
         validate_signature_paths!(plugin)
         plugin
+      rescue LoadError => e
+        # #194 slice 1 — annotate a POST-require failure (bad config, a raising `#init`, a missing signature
+        # dir, a duplicate id, no/many registrations) with the file the gem loaded from, so the surfaced
+        # diagnostic names the exact plugin copy. A require that failed outright never populated the map for
+        # this gem, so the lookup is nil and the message is left unchanged.
+        e.resolved_path ||= @resolved_gem_paths[entry[:gem]]
+        raise
       end
 
       # ADR-25 — a plugin's manifest-declared `signature_paths:` are resolved (by
@@ -137,8 +214,13 @@ module Rigor
         end
       end
 
+      # #194 slice 2 (ADR-93 WD5) — a bundled plugin is required by its engine-anchored absolute path; every
+      # other gem keeps today's bare-name require. The injectable `requirer` seam therefore widens from gem
+      # names to name-or-absolute-path (both are valid arguments to `Kernel.require`). The slice-1
+      # `feature_resolver` is unaffected: an absolute-path require's `$LOADED_FEATURES` entry still ends in
+      # `/<gem>.rb`, the suffix {FEATURE_RESOLVER} matches.
       def require_gem!(entry)
-        @requirer.call(entry[:gem])
+        @requirer.call(self.class.bundled_plugin_path(entry[:gem]) || entry[:gem])
       rescue ::LoadError => e
         raise LoadError.new(
           "could not load plugin gem #{entry[:gem].inspect}: #{e.message}",

data/lib/rigor/plugin/node_rule_walk.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "node_context"
+require_relative "../source/node_children"
 require_relative "../source/node_walker"
 require_relative "../analysis/check_rules/rule_walk"
 
@@ -82,8 +83,9 @@ module Rigor
       # The single converged DFS pre-order traversal. Threads both the live `ancestors` stack (for plugin
       # {NodeContext}) and the immutable built-in {RuleWalk::Context} (for the collectors), derived together
       # as the walk descends — the cheap-ancestors option from the ADR-53 B4 design note. Identical pre-order
-      # over `compact_child_nodes` to both the legacy `Source::NodeWalker.each_with_ancestors` and
-      # `RuleWalk.walk`, so every node is visited in the same order each side saw before.
+      # over each node's children (`#rigor_each_child`, which yields `compact_child_nodes` order) to
+      # both the legacy `Source::NodeWalker.each_with_ancestors` and `RuleWalk.walk`, so every node is visited in
+      # the same order each side saw before.
       def walk_node(node, ancestors, context, path, scope, states, collector_driver)
         return unless node.is_a?(Prism::Node)
 
@@ -92,7 +94,7 @@ module Rigor
 
         child_context = collector_driver&.descend(node, context)
         ancestors.push(node)
-        node.compact_child_nodes.each do |child|
+        node.rigor_each_child do |child|
           walk_node(child, ancestors, child_context, path, scope, states, collector_driver)
         end
         ancestors.pop