rigortype 0.4.5 → 0.4.7

data/lib/rigor/sig_gen/generator.rb

@@ -4,6 +4,7 @@ require "prism"
 
 require_relative "../configuration"
 require_relative "../environment"
+require_relative "../run_scoped_slots"
 require_relative "../project_environment"
 require_relative "../scope"
 require_relative "../reflection"
@@ -14,6 +15,7 @@ require_relative "../source/literals"
 require_relative "../source/node_children"
 require_relative "../inference/def_return_typer"
 require_relative "../inference/scope_indexer"
+require_relative "../inference/project_seed_tables"
 require_relative "../inference/module_function_state"
 require_relative "../inference/rbs_type_translator"
 require_relative "alias_index"
@@ -25,6 +27,7 @@ require_relative "declaration_equivalence"
 require_relative "inline_declarations"
 require_relative "layout_index"
 require_relative "method_candidate"
+require_relative "type_name_qualification"
 require_relative "writer"
 require_relative "../rooted_glob"
 
@@ -78,16 +81,20 @@ module Rigor
       attr_reader :unrenderable, :unresolvable_superclasses
 
       # @param paths — files / directories to scan.
-      # @param observations — => Array<Array<Rigor::Type>>}]
+      # @param observations —
       #   ADR-14 slice 3 — per-target-method arg-tuple observations
       #   produced by {ObservationCollector}. An empty Hash (the default)
       #   means "no observations available; emit `untyped` for every
       #   parameter position" per ADR-5 clause 2.
+      # @param target_writer — the {Writer} a `--write` or `--check` run hands the candidates to. When given, a
+      #   class counts as written for a subclass only if that writer accepts its target file (#2461); nil (print,
+      #   diff, JSON) counts every class with a candidate the writer is sure to write.
       # @param overwrite — `--overwrite`: a member declared inline whose `sig/` copy disagrees is proposed as an
       #   `inline-overwrite` of the whole member instead of refused (ADR-112 WD4).
       def initialize(configuration:, paths:, observations: {}, include_private: false, effect_annotator: nil,
-                     overwrite: false)
+                     overwrite: false, target_writer: nil)
         @configuration = configuration
+        @target_writer = target_writer
         @overwrite = overwrite
         @paths = paths
         @observations = normalize_observations(observations)
@@ -99,7 +106,7 @@ module Rigor
         # candidates from one file don't leak into another; initialising empty here gives downstream consumers
         # (`build_candidate`, `method_def_prefix`) a never-nil invariant without per-call-site defensive guards.
         @namespace_kinds = {}
-        @module_function_methods = Set.new
+        @module_function_methods = Set.new.compare_by_identity
         @uncertain_module_function_defs = Set.new.compare_by_identity
         @class_shells = Set.new
         @class_superclasses = {}
@@ -113,6 +120,36 @@ module Rigor
         @unresolvable_superclasses = {}
         # Issue #722 — whole-run: `{ class name => the lexical nesting its header is written in }`.
         @superclass_nestings = {}
+        # Issue #2437 — whole-run: every class a walked file declares with a `class` keyword or a `Data.define` /
+        # `Struct.new` layout, so the report can tell a project superclass this run did not write from one nothing
+        # declares.
+        @source_classes = Set.new
+      end
+
+      # How the report names an unresolvable superclass token ({#unresolvable_superclasses}). It is a project
+      # superclass when it names a class the walked source declares and this run wrote nothing for, whose own chain
+      # would close if the project's classes were written:
+      # each step a source class, ending at no superclass or at one the RBS environment knows (#2437). What is
+      # missing is then the project's own declaration, not a gem's RBS. `class ApplicationRecord <
+      # ActiveRecord::Base` with no RBS for the gem is not such a class: writing it would not help.
+      #
+      # Returns `[:project, token]` for such a class. Otherwise `[:external, root]`, where `root` is the first token
+      # on the chain that is not a source class: `User < ApplicationRecord` reports `ActiveRecord::Base`, the class
+      # whose RBS is missing, rather than the project class between them.
+      def unresolvable_superclass_report(token)
+        name = bare_superclass_name(token)
+        root = token
+        seen = {}
+        while @source_classes.include?(name) && !seen[name]
+          seen[name] = true
+          nesting, superclass = @superclass_nestings[name]
+          return [:project, token] if superclass.nil?
+
+          root = resolve_superclass_token(superclass, nesting, @source_classes, name)
+          name = bare_superclass_name(root)
+          return [:project, token] if Reflection.rbs_class_known?(name, environment: @environment)
+        end
+        [:external, root]
       end
 
       # Lifts legacy plain-`Array[Type]` observation entries into {ObservedCall} carriers. Specs from the
@@ -126,13 +163,30 @@ module Rigor
 
       def run
         resolved = resolve_paths(@paths)
+        @resolved_paths = resolved
         @environment = build_environment(resolved)
+        # ADR-84 WD2, as `Runner#run_analysis` mints it for `check` (#2300): one return-memo bucket for the whole
+        # run. Without it the memo keys on each file's merged `discovered_def_nodes`, a new table per file, so a
+        # callee reached from two files was re-inferred in each. A fresh token per run keeps a second run in one
+        # process from reading the first's entries, and the bucket is released with the other run-scoped slots
+        # when the run ends ({RunScopedSlots}), so a finished run holds none of it.
+        @run_generation = Object.new.freeze
+        # Both read the files as they are now, so a second `run` of one generator re-reads them.
+        @project_tables = nil
+        @file_base_scope = nil
+        # #2461 — which `sig/` targets the writer will write to, read from the files as they are now.
+        @writable_targets = {}
         candidates = resolved.flat_map { |path| analyse_file(path, @environment) }
-        annotate_effects(
-          demote_overridden_base_methods(
-            demote_unresolvable_superclasses(demote_inline_generic_classes(resolve_superclass_spellings(candidates)))
+        demoted = demote_overridden_base_methods(
+          demote_unresolvable_superclasses(
+            demote_generic_reopenings(demote_inline_generic_classes(resolve_superclass_spellings(candidates)))
           )
         )
+        # Again after the override demotion: a demoted method can leave its file with nothing to write, and a class
+        # shell riding on that file then declares nothing a subclass elsewhere could rest on.
+        annotate_effects(stamp_generic_reopenings(demote_unresolvable_superclasses(demoted)))
+      ensure
+        RunScopedSlots.release
       end
 
       private
@@ -207,10 +261,10 @@ module Rigor
         decls.each do |decl|
           next unless decl.is_a?(::RBS::AST::Declarations::Class) || decl.is_a?(::RBS::AST::Declarations::Module)
 
-          name = (prefix + [decl.name.to_s.delete_prefix("::")]).join("::")
-          return decl if name == class_name
+          path = ::Rigor::Environment::RbsLoader.declared_class_path(decl, prefix)
+          return decl if path.join("::") == class_name
 
-          found = find_declaration(decl.members, name.split("::"), class_name)
+          found = find_declaration(decl.members, path, class_name)
           return found if found
         end
         nil
@@ -221,6 +275,88 @@ module Rigor
         (1..segments.size).any? { |n| generic.key?(segments.first(n).join("::")) }
       end
 
+      # Issue #2436 — a class the loaded RBS declares generic (`Array`, `Hash`, a gem's or the project's own) is
+      # reopened with that declaration's type parameters copied onto the header ({#stamp_generic_reopenings}),
+      # which is exact only while every parameter is plain. A bound or a default is a type spelled relative to the
+      # declaring file's namespace, and copying it under another nesting can resolve it to a different class, so
+      # rbs would reject the header as it rejects a parameterless one (`GenericParameterMismatchError`): the class,
+      # and every class whose signature mentions it, fails its definition build. A method of such a class, or of
+      # one nested in it, is skipped instead — unless `sig/` already declares the class, whose own header the
+      # writer then writes into ({#demote_inline_generic_classes}' rule).
+      def demote_generic_reopenings(candidates)
+        loader = @environment&.rbs_loader
+        return candidates if loader.nil?
+
+        layout = nil
+        candidates.map do |candidate|
+          next candidate unless Classification::EMITTABLE.include?(candidate.classification)
+          next candidate unless namespace_prefixes(candidate.class_name).any? { |name| bounded_generic?(loader, name) }
+
+          layout ||= LayoutIndex.new(signature_paths: @configuration.signature_paths)
+          next candidate if layout.file_for(candidate.class_name)
+
+          demoted_candidate(candidate, :generic_reopening)
+        end
+      end
+
+      # The other half of {#demote_generic_reopenings}: every emittable candidate carries the header spelling of
+      # each generic class the run may open a header for — its own class, the classes it is nested in, and the
+      # file's class shells and theirs — so the writer and `--print` spell the same header. Method bodies keep
+      # `untyped` for element types; nothing here names `E` in a member.
+      #
+      # Issue #2580 — a skipped candidate is stamped too, and its class counts towards the map: the writer
+      # repairs a parameterless header an earlier run wrote into the file a candidate routes to, and a file whose
+      # every proposal is already declared (or untyped) would otherwise keep a header rbs rejects.
+      def stamp_generic_reopenings(candidates)
+        loader = @environment&.rbs_loader
+        return candidates if loader.nil?
+
+        spelled = header_type_params(candidates.flat_map { |c| [c.class_name, *c.class_shells] }.compact)
+        return candidates if spelled.empty?
+
+        candidates.map { |candidate| candidate.with_class_type_params(spelled) }
+      end
+
+      # #2603 — the header spelling {#header_type_params} gives `class_name` alone, or nil when the loaded RBS does
+      # not declare it generic with plain parameters only. The writer asks it for a bare header in a `sig/` file no
+      # candidate of the run routes to. Nil before {#run} has built the environment.
+      def generic_header_spelling(class_name)
+        loader = @environment&.rbs_loader
+        return nil if loader.nil?
+
+        params = loader.class_declaration_type_params(class_name)
+        "[#{params.join(', ')}]" if !params.empty? && params.all? { |p| plain_type_param?(p) }
+      end
+      public :generic_header_spelling
+
+      # `{ class name => "[unchecked out E]" }` for every name in `names`, or a namespace it is nested in, whose
+      # loaded declaration is generic with plain parameters only.
+      def header_type_params(names)
+        names.uniq.flat_map { |name| namespace_prefixes(name) }.uniq.each_with_object({}) do |name, acc|
+          spelling = generic_header_spelling(name)
+          acc[name] = spelling if spelling
+        end.freeze
+      end
+
+      def namespace_prefixes(class_name)
+        return [] if class_name.nil?
+
+        segments = class_name.split("::")
+        (1..segments.size).map { |n| segments.first(n).join("::") }
+      end
+
+      def bounded_generic?(loader, name)
+        params = loader.class_declaration_type_params(name)
+        !params.empty? && !params.all? { |param| plain_type_param?(param) }
+      end
+
+      # A name, a variance and `unchecked`, and nothing that spells a type: no upper or lower bound, no default.
+      def plain_type_param?(param)
+        %i[upper_bound lower_bound default_type].none? do |reader|
+          param.respond_to?(reader) && param.public_send(reader)
+        end
+      end
+
       # Issue #744 — a base class's method is NOT emitted when a project subclass overrides it and the
       # override is not emitted itself.
       #
@@ -239,7 +375,7 @@ module Rigor
       # (#744 half 2) and is not decided here: this pass only stops sig-gen manufacturing the conflict.
       def demote_overridden_base_methods(candidates)
         superclasses = candidates.each_with_object({}) do |candidate, acc|
-          (candidate.class_superclasses || {}).each { |name, sup| acc[name] = sup.sub(/\[.*\]\z/, "") }
+          (candidate.class_superclasses || {}).each { |name, sup| acc[name] = bare_superclass_name(sup) }
         end
         return candidates if superclasses.empty?
 
@@ -303,6 +439,10 @@ module Rigor
       def resolve_superclass_spellings(candidates)
         return candidates if @superclass_nestings.empty?
 
+        # Every shell counts here, written or not: the question is which class Ruby means by the token, and the
+        # source declares `Lib::Error` whether or not its file is written. Whether the resolved superclass reaches
+        # disk is {#demote_unresolvable_superclasses}'s question. Counting only written shells would leave `Error`
+        # unresolved, and a top-level `Error` some signature declares would then take it (#2454).
         known = candidates.each_with_object(Set.new) do |candidate, acc|
           acc << candidate.class_name if candidate.class_name
           acc.merge(candidate.class_shells || [])
@@ -322,20 +462,32 @@ module Rigor
         @superclass_nestings.each_with_object({}) do |(full, (nesting, token)), acc|
           next if token.nil? || nesting.empty?
 
-          resolved = resolve_superclass_token(token, nesting, known)
+          resolved = resolve_superclass_token(token, nesting, known, full)
           acc[full] = resolved if resolved && resolved != token
         end
       end
 
       # The first candidate spelling that names a class this run declares or the RBS environment knows, or
-      # nil when none does — an unresolvable superclass is #735's business, not this pass's.
-      def resolve_superclass_token(token, nesting, known)
+      # the token itself when none does — an unresolvable superclass is #735's business, not this pass's.
+      #
+      # `full` is the class whose header carries the token. Ruby evaluates the superclass expression before the
+      # new constant exists, so the innermost candidate `full` itself (`module A; module C; class B < B`, where
+      # `A::C::B` is the class being opened) is not yet a candidate: the lookup falls through to `A::B` (#2579).
+      def resolve_superclass_token(token, nesting, known, full)
+        # A rooted token (`::Hash`) already names one class; the nesting must not capture it (#2459).
+        return token if token.start_with?("::")
+
         base = token.sub(/\[.*\]\z/, "")
-        args = token[base.length..] || ""
         nesting.length.downto(1) do |i|
           candidate = "#{nesting[0, i].join('::')}::#{base}"
-          return "#{candidate}#{args}" if known.include?(candidate) ||
-                                          Reflection.rbs_class_known?(candidate, environment: @environment)
+          next if candidate == full
+
+          # The arguments {#record_superclass} computed belong to the top-level class of the bare name, so they are
+          # computed again for the class the token resolves to: `Hash` inside a `module Foo` declaring a plain
+          # `Foo::Hash` takes none (#2459).
+          return generic_superclass_spelling(candidate) if known.include?(candidate) ||
+                                                           Reflection.rbs_class_known?(candidate,
+                                                                                       environment: @environment)
         end
         token
       end
@@ -368,28 +520,77 @@ module Rigor
       # ran — source discovery and the plugins still type it. Emitting the class with the superclass merely
       # OMITTED would be the harmful middle: the class becomes RBS-known with only the emitted methods, so
       # every inherited call fires `call.undefined-method`.
+      #
+      # Demoting a class can leave a file with nothing to write, which takes the class shells riding on it off the
+      # emitted set, so the pass repeats until no further class becomes unresolvable. The emitted set only shrinks,
+      # so the unresolvable set only grows and the loop ends.
       def demote_unresolvable_superclasses(candidates)
         superclasses = candidates.each_with_object({}) do |candidate, acc|
           (candidate.class_superclasses || {}).each { |name, sup| acc[name] = sup }
         end
-        # Everything this run declares, superclass or not: a chain that reaches `class Record` — emitted
-        # here, with no superclass of its own — terminates in a class the next run WILL know.
-        emitted = candidates.each_with_object(Set.new) do |candidate, acc|
-          acc << candidate.class_name if candidate.class_name
-          acc.merge(candidate.class_shells || [])
+        current = candidates
+        unresolvable = {}
+        loop do
+          found = unresolvable_superclass_roots(superclasses, declared_by_run(current))
+          return current if found.size == unresolvable.size
+
+          unresolvable = found
+          current = candidates.map do |candidate|
+            owner = unresolvable_for(candidate.class_name, unresolvable)
+            owner ? record_unresolvable_superclass(candidate, owner) : candidate
+          end
         end
-        unresolvable = superclasses.each_with_object({}) do |(name, _sup), acc|
+      end
+
+      def unresolvable_superclass_roots(superclasses, emitted)
+        superclasses.each_with_object({}) do |(name, _sup), acc|
           root = unresolved_superclass_root(name, superclasses, emitted)
           acc[name] = root if root
         end
-        return candidates if unresolvable.empty?
-
-        candidates.map do |candidate|
-          owner = unresolvable_for(candidate.class_name, unresolvable)
-          next candidate if owner.nil?
+      end
 
-          record_unresolvable_superclass(candidate, owner)
+      # Everything this run puts on disk, superclass or not: a chain that reaches `class Record` — emitted here, with
+      # no superclass of its own — terminates in a class the next run WILL know. Only what the writer is sure to
+      # write counts, because a subclass written against a class nothing declares fails its build
+      # (`RBS::NoSuperclassFoundError`) on the next run:
+      #
+      # - a class with a candidate the writer is sure to write ({#written?}). A class whose every method is skipped
+      #   is not written, so it does not count (#2437); a class shell on it would close it instead (#2438);
+      # - a class shell on a file with such a candidate: a shell on a file whose every method is skipped, already
+      #   declared by `sig/`, or a tighter return the writer will not apply never reaches disk (#2454);
+      # - the wrapper namespaces of either, which the writer renders around them with their recorded superclasses.
+      #
+      # Counting too few only demotes a subclass, the output before #2454 (ADR-5).
+      def declared_by_run(candidates)
+        written = candidates.select { |candidate| written?(candidate) }
+        written_paths = written.to_set(&:path)
+        declared = Set.new
+        written.each { |candidate| declared << candidate.class_name if candidate.class_name }
+        candidates.each do |candidate|
+          declared.merge(candidate.class_shells || []) if written_paths.include?(candidate.path)
         end
+        declared.flat_map { |name| wrapper_names(name) }.to_set | declared
+      end
+
+      # `A::B::C` is written inside `A` and `A::B`.
+      def wrapper_names(name)
+        segments = name.split("::")
+        (1...segments.size).map { |n| segments.first(n).join("::") }
+      end
+
+      # Whether the writer will put `candidate` on disk: a candidate it is sure to write ({Writer.writes?}), and,
+      # when the run writes or compares files (`--write`, `--check`), aimed at a target that writer will write to
+      # (#2461). Print, diff and JSON runs have no writer: where a file would go depends on the working directory
+      # the writer takes its sig root from, and their output must not.
+      def written?(candidate)
+        return false unless Writer.writes?(candidate)
+        return true if @target_writer.nil?
+
+        target = @target_writer.path_mapper.target_for(candidate.path, class_name: candidate.class_name,
+                                                                       method_name: candidate.method_name,
+                                                                       kind: candidate.rbs_kind)
+        @writable_targets[target] = @target_writer.accepts_target?(target) unless @writable_targets.key?(target)
+        @writable_targets[target]
       end
 
       # A nested class or module goes with its wrapper. `WikiPage::Webhookable`'s declaration is emitted
@@ -415,9 +616,9 @@ module Rigor
         return superclass if seen[name]
 
         seen[name] = true
-        # The recorded spelling may carry the type arguments {#generic_superclass_spelling} added; the
-        # resolvability question is about the class, so it is asked of the bare name.
-        base = superclass.sub(/\[.*\]\z/, "")
+        # The recorded spelling may carry the type arguments {#generic_superclass_spelling} added, and a rooted
+        # token its `::` (#2459); the resolvability question is about the class, so it is asked of the bare name.
+        base = bare_superclass_name(superclass)
         return nil if Reflection.rbs_class_known?(base, environment: @environment)
         return superclass unless emitted.include?(base)
 
@@ -458,22 +659,65 @@ module Rigor
         end.uniq
       end
 
+      # #1154 / #2300 — the project's discovery tables, built once per run over the configured project paths as well
+      # as the files sig-gen reads, so a run over one file reads what a `check` of it reads. Every file is indexed
+      # over them ({#file_base_scope}): a helper, an ancestor or a constant another file defines resolves as it does
+      # under `check` instead of reading ABSENT. The declared-parameter ivar credit reads them whole
+      # ({#ivar_writer_scope}).
+      def project_tables
+        @project_tables ||= Inference::ProjectSeedTables.for_paths(
+          ((@resolved_paths || []) + resolve_paths(Array(@configuration.paths))).uniq { |path| File.expand_path(path) }
+        )
+      end
+
+      # The member layouts stay per-file. sig-gen writes a value class for every `Data.define` / `Struct.new` layout
+      # the indexed scope carries ({#collect_meta_layouts}), so a seeded layout would re-emit every value class of the
+      # project in every file.
+      PER_FILE_TABLES = %i[data_member_layouts struct_member_layouts].freeze
+      private_constant :PER_FILE_TABLES
+
+      # #1154 — the declared-parameter ivar credit must see the ivar writers in other files (an ancestor, another
+      # object's `instance_variable_set`, a reopening) as `rigor check` does.
+      def ivar_writer_scope(base_scope)
+        base_scope.with_discovery(base_scope.discovery.with(**project_tables))
+      end
+
+      # #1406 — sig-gen keeps the census's own answer: a declared ivar type read back would echo the declaration.
+      def index_file(root, base_scope)
+        Inference::ScopeIndexer.index(
+          root, default_scope: base_scope, ivar_writer_scope: ivar_writer_scope(base_scope), declared_ivar_types: false
+        )
+      end
+
+      # The scope each file is indexed under: the project's tables less the per-file ones ({#project_tables}), and the
+      # run's return-memo token (see {#run}), which {#ivar_writer_scope} inherits, so every reading of a callee shares
+      # one memo bucket. Built once per run.
+      def file_base_scope(environment)
+        @file_base_scope ||= begin
+          base = Scope.empty(environment: environment)
+          tables = project_tables.except(*PER_FILE_TABLES)
+          tables = tables.merge(run_generation: @run_generation) if @run_generation
+          base.with_discovery(base.discovery.with(**tables))
+        end
+      end
+
       def analyse_file(path, environment)
         source = File.read(path)
         parse_result = Prism.parse(source, filepath: path, version: @configuration.target_ruby)
         return [] if parse_result.errors.any?
 
-        base_scope = Scope.empty(environment: environment)
-        scope_index = Inference::ScopeIndexer.index(parse_result.value, default_scope: base_scope)
+        scope_index = index_file(parse_result.value, file_base_scope(environment))
 
         reset_file_maps
         @meta_layouts = collect_meta_layouts(scope_index)
         register_meta_classes
         defs = collect_method_definitions(parse_result.value, scope_index)
+        definers = definer_table(parse_result.value, defs)
+        defs = live_definitions(defs, definers)
         # Candidate construction freezes the per-file maps above (see {#build_candidate}), so every registration
         # pass has to be finished before the first `build_candidate` call. Meta members lead the RETURNED order —
         # a value class's members and constructors read first, ahead of the methods its block body defines.
-        meta_candidates = collect_meta_member_candidates(path, scope_index)
+        meta_candidates = live_meta_candidates(path, scope_index, definers)
         candidates_from_defs = defs.filter_map do |def_node, class_name, kind|
           # An analyzer bug typing one def's body must cost only that def's candidate, never the whole
           # `rigor sig-gen` run. The `check` path recovers each *file* this way (worker_session.rb); sig-gen
@@ -485,13 +729,109 @@ module Rigor
         end
         obs_ivar_map = build_observed_ivar_map(parse_result.value)
         meta_candidates + candidates_from_defs +
-          collect_attr_candidates(parse_result.value, path, scope_index, obs_ivar_map)
+          collect_attr_candidates(parse_result.value, path, scope_index, obs_ivar_map, definers)
+      end
+
+      # Ruby keeps the LAST definition of a name: a `def x` followed by `attr_reader :x` (or the reverse) defines
+      # `x` once, and a second `def x` after a `module_function` reset replaces only the instance method. Writing
+      # one entry per definition gave RBS a duplicate method definition (#2008, #2023), so every definer of a
+      # `(class, kind, name)` slot is recorded with its source offset, and only the last one in a file is written.
+      # A module function defines two slots, its singleton copy and its instance method. A `Data.define` or
+      # `Struct.new` member is defined before any body that could redefine it, so it ranks first.
+      #
+      # Only a definer whose statement certainly runs can be last: a direct statement of a `class`, `module` or
+      # `class << self` body, of a `Data.define` / `Struct.new` block or of the file ({#walk_statements} records
+      # them), or a `def` passed to `private`, `public` or `protected` in such a statement ({#walk_statements}, #2254).
+      # One under a condition, in a block or a lambda, or after an uncertain `module_function` reset may not run, as
+      # far as this reading tells. A slot such a definer could
+      # still take over from the last certain one is contested, and nothing is written for it.
+      #
+      # @return the definers of each slot as `[offset, certain]` pairs, keyed by `[class_name, kind, method_name]`.
+      MEMBER_OFFSET = -1
+      private_constant :MEMBER_OFFSET
+
+      def definer_table(root, defs)
+        certain = @certain_definers
+        table = Hash.new { |h, k| h[k] = [] }
+        record_def_definers(defs, certain, table)
+        meta_member_slots.each { |slot| table[slot] << [MEMBER_OFFSET, true] }
+        ctx = AttrWalkContext.new(definers: [])
+        walk_attr_calls(root, [], false, ctx)
+        ctx.definers.each do |slot, call_node|
+          table[slot] << [call_node.location.start_offset, certain.include?(call_node)]
+        end
+        table
+      end
+
+      def record_def_definers(defs, certain, table)
+        defs.each do |def_node, class_name, kind|
+          next if class_name.nil?
+
+          definer_slots(def_node, class_name, kind).each do |slot, possible_only|
+            table[slot] << [def_node.location.start_offset, !possible_only && certain.include?(def_node)]
+          end
+        end
+      end
+
+      def live_meta_candidates(path, scope_index, table)
+        collect_meta_member_candidates(path, scope_index).select do |c|
+          live_definer?(table, [c.class_name, c.kind, c.method_name], MEMBER_OFFSET)
+        end
+      end
+
+      # `[slot, possible_only]` pairs. A `def` after an uncertain `module_function` reset may or may not install a
+      # singleton copy, so it is a possible definer of that slot only.
+      def definer_slots(def_node, class_name, kind)
+        slots = [[[class_name, kind, def_node.name], false]]
+        if @module_function_methods.include?(def_node)
+          slots << [[class_name, :singleton, def_node.name], false]
+        elsif @uncertain_module_function_defs.include?(def_node)
+          slots << [[class_name, :singleton, def_node.name], true]
+        end
+        slots
+      end
+
+      def meta_member_slots
+        @meta_layouts.flat_map do |class_name, layout|
+          MetaClassShape.of(kind: layout.kind, members: layout.member_names, keyword_init: layout.keyword_init)
+                        .member_decls.map { |member| [class_name, member.kind, member.method_name] }
+        end
+      end
+
+      # Whether the definer at `offset` is the one Ruby keeps for `slot`. A slot with a single definer keeps it,
+      # certain or not, as before.
+      def live_definer?(table, slot, offset)
+        entries = table.fetch(slot, [])
+        return true if entries.size <= 1
+
+        last_certain = entries.select { |_, certain| certain }.map(&:first).max
+        return false if last_certain.nil?
+        return false if entries.any? { |entry_offset, certain| !certain && entry_offset > last_certain }
+
+        offset == last_certain
+      end
+
+      # The `defs` whose definition Ruby keeps. A module function whose instance method a later definition
+      # replaced keeps only its singleton copy (`M.label` still returns the first body), so it is written as
+      # `def self.label`. One whose singleton copy was replaced keeps only a private instance method, which
+      # sig-gen does not write, so it is dropped.
+      def live_definitions(defs, table)
+        defs.filter_map do |def_node, class_name, kind|
+          next [def_node, class_name, kind] if class_name.nil?
+
+          slots = definer_slots(def_node, class_name, kind).reject(&:last).map(&:first)
+          live = slots.select { |slot| live_definer?(table, slot, def_node.location.start_offset) }
+          next [def_node, class_name, kind] if live.size == slots.size
+          next nil unless live == [[class_name, :singleton, def_node.name]]
+
+          [def_node, class_name, :singleton]
+        end
       end
 
       # The per-file scratch state {#analyse_file} starts each file with.
       def reset_file_maps
         @namespace_kinds = {}
-        @module_function_methods = Set.new
+        @module_function_methods = Set.new.compare_by_identity
         @uncertain_module_function_defs = Set.new.compare_by_identity
         @class_shells = Set.new
         @class_superclasses = {}
@@ -509,15 +849,19 @@ module Rigor
       # - `@namespace_kinds[qualified_name]` records whether each segment came from `class Foo` (`:class`) or
       #   `module Foo` (`:module`). Used by the writer's `wrap_in_modules` step to emit the right keyword for
       #   each intermediate segment AND the leaf.
-      # - `@module_function_methods` records `(class_name, method_name)` pairs where a `module_function` (no
-      #   args) call preceded the `def` inside a module body. The renderer emits `def self?.name` for these, the
-      #   RBS spelling that matches the dual instance + singleton dispatch the runtime produces.
+      # - `@module_function_methods` records the `def` nodes a `module_function` (no args) call preceded inside
+      #   a module body. The renderer emits `def self?.name` for these, the RBS spelling that matches the dual
+      #   instance + singleton dispatch the runtime produces. It is keyed by node, not by name: a later `def` of
+      #   the same name after a reset is an ordinary method (#2023).
       def collect_method_definitions(root, scope_index)
         @declared_types = scope_index[root].declared_types
         @walk_root = root
         @in_effect_refinements = nil
         out = []
         @block_depth = 0
+        @certain_bodies = Set.new.compare_by_identity
+        @certain_definers = Set.new.compare_by_identity
+        mark_certain_body(root.statements)
         walk_defs(root, [], false, false, out)
         out
       end
@@ -530,6 +874,7 @@ module Rigor
           return if descend_into_namespace?(node, prefix, out)
         when Prism::SingletonClassNode
           if node.expression.is_a?(Prism::SelfNode) && node.body
+            mark_certain_body(node.body)
             walk_defs(node.body, prefix, true, false, out)
             return
           end
@@ -539,6 +884,7 @@ module Rigor
         when Prism::ConstantWriteNode
           body = meta_block_body(node, prefix)
           if body
+            mark_certain_body(body)
             walk_defs(body, prefix + [node.name.to_s], false, false, out)
             return
           end
@@ -555,6 +901,9 @@ module Rigor
       # the `self` one returns above): it defines a singleton method on `obj`, not a private `Object` method.
       def walk_def_children(node, prefix, in_singleton_class, module_function_active, out)
         return if refine_block_call?(node)
+        # #2259 — a `def` in `class_methods do … end` (ActiveSupport::Concern) defines a method of the including class's
+        # singleton, not of this module. Omitted, not written class-side: no precedent places it on the singleton.
+        return if class_methods_block?(node)
 
         in_block = node.is_a?(Prism::BlockNode) || node.is_a?(Prism::LambdaNode) ||
                    node.is_a?(Prism::SingletonClassNode)
@@ -584,6 +933,7 @@ module Rigor
 
         full = child_prefix.join("::")
         @namespace_kinds[full] = node.is_a?(Prism::ClassNode) ? :class : :module
+        @source_classes << full if node.is_a?(Prism::ClassNode)
         record_superclass(node, full, prefix)
         walk_namespace_body(node, child_prefix, out)
         true
@@ -603,6 +953,17 @@ module Rigor
         !@in_effect_refinements.class_body_refine?(node)
       end
 
+      # A block call whose members are not this class body's: a `refine` block (#1763), and a `class_methods` block
+      # (#2259), whose members belong to the including class's singleton.
+      def skipped_block_call?(node)
+        refine_block_call?(node) || class_methods_block?(node)
+      end
+
+      def class_methods_block?(node)
+        node.is_a?(Prism::CallNode) && node.receiver.nil? && node.name == :class_methods &&
+          node.block.is_a?(Prism::BlockNode)
+      end
+
       def declined_self_header?(node)
         path = node.constant_path
         path.is_a?(Prism::ConstantPathNode) && path.parent.is_a?(Prism::SelfNode) &&
@@ -628,10 +989,43 @@ module Rigor
         # the name it resolves to may be a class another file declares. Resolved once every file has been
         # walked, in {#resolve_superclass_spellings}.
         spelling = generic_superclass_spelling(superclass)
+        # Issue #2579 — a token that names the class being opened (`class A::B < A::B`, or a top-level `class B < B`
+        # with nothing else of that name) would write a self-superclass, which RBS rejects as a recursive ancestor.
+        # No superclass is safer than that, so the declaration is written without one.
+        return if bare_superclass_name(spelling) == full
+
         # The token rides along because `@class_superclasses` is per-FILE scratch, reset before the next
         # file, while this table is whole-run.
         @superclass_nestings[full] = [prefix.dup, spelling]
         @class_superclasses[full] = spelling
+        register_core_subclass_shell(full, prefix, superclass)
+      end
+
+      # Issue #2224 — a subclass of a core or stdlib class got a declaration only when it had a method of its own to
+      # emit, so after `class MyHash < Hash; end` a method returning one was written `-> MyHash` against a class no
+      # signature declared, and `rbs validate` failed with `NoTypeFoundError`. As a class shell it is declared
+      # `class MyHash < ::Hash[untyped, untyped]` beside the file's other declarations. A class the RBS environment
+      # already declares (the project's `sig/`, an earlier run) is left to that declaration, and a superclass the
+      # header's nesting shadows is not core's: `Hash` inside a `module Foo` that declares `Foo::Hash` is the project's.
+      # A rooted `::Hash` names core's class whatever the nesting declares, so the shadow cannot capture it (#2459).
+      def register_core_subclass_shell(full, prefix, superclass)
+        return if class_known?(full)
+
+        bare = bare_superclass_name(superclass)
+        return unless @environment&.rbs_loader&.core_or_stdlib_class?(bare)
+
+        unless superclass.start_with?("::")
+          namespaces = TypeNameQualification.enclosing_namespaces(prefix.join("::"))
+          return if TypeNameQualification.shadowed?(bare.split("::").first, namespaces, method(:declared_constant?))
+        end
+
+        @class_shells << full
+      end
+
+      # The class a recorded superclass token names, as the fully qualified key every class-name set and the RBS
+      # loader use: the type arguments {#generic_superclass_spelling} added and a rooted token's `::` both dropped.
+      def bare_superclass_name(token)
+        token.sub(/\[.*\]\z/, "").delete_prefix("::")
       end
 
       # Issue #735 — a GENERIC superclass has to be written with its arguments. `class Entries < Array`
@@ -644,7 +1038,7 @@ module Rigor
         loader = @environment&.rbs_loader
         return superclass if loader.nil?
 
-        arity = loader.class_type_param_names(superclass).size
+        arity = loader.class_type_param_names(bare_superclass_name(superclass)).size
         return superclass if arity.zero?
 
         "#{superclass}[#{(['untyped'] * arity).join(', ')}]"
@@ -692,6 +1086,7 @@ module Rigor
         @meta_layouts.each do |class_name, layout|
           @namespace_kinds[class_name] = :class
           @class_shells << class_name
+          @source_classes << class_name
           @class_superclasses[class_name] = MetaClassShape::SUPERCLASSES.fetch(layout.kind)
         end
       end
@@ -717,13 +1112,32 @@ module Rigor
       def walk_namespace_body(namespace_node, prefix, out)
         return if namespace_node.body.nil?
 
+        mark_certain_body(namespace_node.body)
         walk_defs(namespace_node.body, prefix, false, false, out)
       end
 
+      # A body whose direct statements certainly run when it does ({#definer_table}): its statement list unless the
+      # body has a `rescue` clause, and its `ensure` clause. A `rescue` or `else` clause may not run.
+      def mark_certain_body(body)
+        return @certain_bodies << body unless body.is_a?(Prism::BeginNode)
+
+        # With a `rescue`, a statement before a definer can raise and skip it, so the main list is not certain.
+        @certain_bodies << body.statements if body.statements && body.rescue_clause.nil?
+        @certain_bodies << body.ensure_clause.statements if body.ensure_clause&.statements
+      end
+
       # The directive's reach is {Inference::ModuleFunctionState.each_sig_gen_statement}.
       def walk_statements(stmts_node, prefix, in_singleton_class, module_function_active, out)
+        certain_body = @certain_bodies.include?(stmts_node)
         Inference::ModuleFunctionState.each_sig_gen_statement(stmts_node.body,
                                                               module_function_active) do |stmt, active|
+          if certain_body
+            @certain_definers << stmt
+            # A `begin … end` statement's body (and `ensure`) runs whenever the statement does.
+            mark_certain_body(stmt) if stmt.is_a?(Prism::BeginNode)
+            # A `def` passed to a visibility call (`private def x`, #2254) runs with its statement.
+            @certain_definers.merge(Inference::ModuleFunctionState.visibility_call_defs(stmt))
+          end
           walk_defs(stmt, prefix, in_singleton_class, active, out)
         end
       end
@@ -740,7 +1154,7 @@ module Rigor
         kind = node.receiver.is_a?(Prism::SelfNode) || in_singleton_class ? :singleton : :instance
         class_name = prefix.join("::")
         if Inference::ModuleFunctionState.sig_gen_module_function?(module_function_active, kind)
-          @module_function_methods << [class_name, node.name]
+          @module_function_methods << node
         elsif Inference::ModuleFunctionState.sig_gen_uncertain?(module_function_active, kind)
           @uncertain_module_function_defs << node
         end
@@ -782,9 +1196,9 @@ module Rigor
 
       # Returns "def self." (kind: :singleton), "def self?." (instance method declared inside a
       # `module_function` region — both instance + singleton dispatch at runtime), or "def " (plain instance).
-      def method_def_prefix(class_name, method_name, kind)
+      def method_def_prefix(def_node, kind)
         return "def self." if kind == :singleton
-        return "def self?." if @module_function_methods.include?([class_name, method_name])
+        return "def self?." if @module_function_methods.include?(def_node)
 
         "def "
       end
@@ -800,7 +1214,7 @@ module Rigor
       def visibility_excludes?(def_node, class_name, kind, scope_index)
         return false if kind == :singleton
         return false if @include_private
-        return false if @module_function_methods.include?([class_name, def_node.name])
+        return false if @module_function_methods.include?(def_node)
 
         scope = scope_index[def_node] || scope_index.each_value.first
         return false if scope.nil?
@@ -820,8 +1234,8 @@ module Rigor
       # `Object#initialize: () -> void`. The mismatch surfaces a `Ruby::MethodParameterMismatch` warning even
       # when `rigor check` itself is clean.
       #
-      # Returning `nil` here causes `classify_def` to skip emission; returning `:emit_stub` causes
-      # `initialize_stub_candidate` to emit a permissive `(<param shape>) -> void` stub matching the runtime
+      # A default constructor is skipped (`classify_def` returns nil for it); a non-trivial one is not, and
+      # {#initialize_stub_candidate} emits a permissive `(<param shape>) -> void` stub matching the runtime
       # parameter list.
       def initialize_excludes?(def_node, kind)
         return false unless kind == :instance
@@ -949,25 +1363,36 @@ module Rigor
       # return position it is not parenthesised.
       def positional_type(observations, index, prefix, owner = nil)
         types = observations.filter_map { |obs| obs.positional[index] }
-        "#{prefix}#{union_erase(types, owner: owner)}"
+        "#{prefix}#{union_erase(widen_observed_params(types), owner: owner)}"
       end
 
       def render_keyword_param(keyword, observations, owner = nil)
         optional_marker = keyword.is_a?(Prism::OptionalKeywordParameterNode) ? "?" : ""
         types = observations.filter_map { |obs| obs.keyword[keyword.name] }
-        rendered = types.empty? ? "untyped" : paren_wrap_union(union_erase(types, owner: owner))
+        rendered = types.empty? ? "untyped" : paren_wrap_union(union_erase(widen_observed_params(types), owner: owner))
         "#{optional_marker}#{keyword.name}: #{rendered}"
       end
 
+      # #2254 — an observed argument is one call's value, so a literal (`"hello"`) proposes its class (`String`), as
+      # {#widen_value_literals} does for a return. Widening always: a parameter the body only compares against a
+      # literal (a discriminant) is widened too, which loses precision and never adds a false positive.
+      def widen_observed_params(types)
+        types.map { |type| widen_value_literals(type) }
+      end
+
+      # Issue #2459 — a ROOTED path (`::Hash`, `::A::B`) keeps its leading `::`: it names exactly one class, and the
+      # passes after {#record_superclass} must not re-resolve it against the header's nesting, where a project
+      # `Foo::Hash` would capture it. Every pass that compares the token against class names strips the anchor.
       def qualified_constant_path(constant_path)
         case constant_path
         when Prism::ConstantReadNode
           constant_path.name.to_s
         when Prism::ConstantPathNode
-          parent = qualified_constant_path(constant_path.parent) if constant_path.parent
           name = constant_path.name&.to_s
           return nil if name.nil?
+          return "::#{name}" if constant_path.parent.nil?
 
+          parent = qualified_constant_path(constant_path.parent)
           parent ? "#{parent}::#{name}" : name
         end
       end
@@ -1038,7 +1463,7 @@ module Rigor
 
         scope = scope_index[def_node]
         method_def = lookup_existing_method(class_name, def_node.name, kind, scope&.environment, scope)
-        head = "#{method_def_prefix(class_name, def_node.name, kind)}#{def_node.name}: "
+        head = "#{method_def_prefix(def_node, kind)}#{def_node.name}: "
         if return_defaulted
           return mixed_provenance_candidate(path, def_node, class_name, kind, scope_index, inline, method_def, head)
         end
@@ -1258,7 +1683,37 @@ module Rigor
       # different method (issue #1382). Delegates to {Rigor::Inference::DefReturnTyper} — the same body-typing +
       # explicit-return-union the `rigor annotate` def-line annotator uses.
       def infer_return_type(def_node, scope_index)
-        Inference::DefReturnTyper.call(def_node, scope_index)
+        absorb_empty_literals(Inference::DefReturnTyper.call(def_node, scope_index, keep_lookup_nil: true))
+      end
+
+      # Issue #1153 — an empty-collection early return (`return [] if table.empty?`) types its arm `[]`, which the
+      # engine's union keeps beside a sibling `Array[E]` arm on purpose (the empty tuple is a distinct shape). A
+      # signature has no use for the distinction: `[]` is an `Array[E]` for every `E`, so `Array[E] | []` is just
+      # `Array[E]`, and the leftover `[]` arm made the proposal read as if the empty literal pinned the element.
+      # Issue #1149 — the same holds for the empty closed hash shape `{}` (a frozen empty fallback,
+      # `table[key] || EMPTY`) beside a `Hash[K, V]` nominal. Each empty literal is absorbed only beside its OWN
+      # nominal: a `[]` beside a `Hash` arm, or a `{}` beside an `Array` arm, is untouched. A lone empty literal,
+      # one beside another tuple / shape (`[1, 2] | []`), an open `{ ... }` shape, and a non-empty shape are
+      # untouched too, since each of those is information the declaration should keep.
+      def absorb_empty_literals(type)
+        return type unless type.is_a?(Type::Union)
+
+        kept = type.members.reject { |member| absorbed_empty_literal?(member, type.members) }
+        kept.size == type.members.size ? type : Type::Combinator.union(*kept)
+      end
+
+      def absorbed_empty_literal?(member, members)
+        if member.is_a?(Type::Tuple) && member.elements.empty?
+          nominal_arm?(members, "Array")
+        elsif member.is_a?(Type::HashShape) && member.pairs.empty? && member.closed?
+          nominal_arm?(members, "Hash")
+        else
+          false
+        end
+      end
+
+      def nominal_arm?(members, class_name)
+        members.any? { |member| member.is_a?(Type::Nominal) && member.class_name == class_name }
       end
 
       def dynamic_top?(type)
@@ -1305,7 +1760,7 @@ module Rigor
         return equivalent(path, def_node, class_name, kind, inferred, VOID_RETURN_RBS) if declares_void?(method_def)
 
         declared = build_declared_return(method_def)
-        if declared_untyped?(declared)
+        if declared_untyped?(declared, method_def)
           return declared_untyped_candidate(path, def_node, class_name, kind, inferred, method_def, rendered: rendered)
         end
 
@@ -1351,16 +1806,16 @@ module Rigor
       # about the return. The class's own declaration is kept whole instead: its visibility, the overload's
       # annotations, type parameters, parameters and block, with only the return replaced.
       #
-      # Three shapes are declined (`nil`):
+      # Two shapes are declined (`nil`):
       # - several overloads. The body is typed once, so the inferred return covers every overload together and
       #   says nothing about which overload returns what: collapsing them into one line would drop the
       #   overloads, and giving each the joint return would widen the overloads the author wrote narrower.
       # - a name the class's own `sig/` spells as an `alias`. Its parameters are the aliased method's, and a
       #   proposal would read as a rewrite of that method's line rather than of the alias. An alias only an
       #   ancestor declares takes the override path below, like any other ancestor declaration.
-      # - nothing else: when only an ancestor declares the method, the proposal is a new override on this
-      #   class, and is rendered from the `def`'s own shape like any new method. The ancestor's parameters
-      #   describe the ancestor's `def`, not this one, which may take other arguments (ADR-14 clause 2).
+      # A method this class does not declare is not declined: when only an ancestor declares it, the proposal is a
+      # new override on this class, rendered from the `def`'s own shape like any new method. The ancestor's
+      # parameters describe the ancestor's `def`, not this one, which may take other arguments (ADR-14 clause 2).
       def tighter_return_line(def_node, method_def, class_name, kind, inferred)
         member = signature_member(method_def, class_name)
         return render_rbs_line(def_node, inferred, class_name, kind) if member.nil?
@@ -1372,7 +1827,7 @@ module Rigor
         returned = paren_wrap_union(elaborated_rbs(inferred, owner: class_name))
         annotations = overload.annotations.map { |a| "#{a.location&.source || "%a{#{a.string}}"} " }.join
         visibility = member.respond_to?(:visibility) && member.visibility ? "#{member.visibility} " : ""
-        "#{visibility}#{method_def_prefix(class_name, def_node.name, kind)}#{def_node.name}: " \
+        "#{visibility}#{method_def_prefix(def_node, kind)}#{def_node.name}: " \
           "#{annotations}#{spell_with_return(overload.method_type, returned)}"
       end
 
@@ -1431,8 +1886,13 @@ module Rigor
       # skips. ADR-93's inline `# @rbs param: Type` annotation (no return clause) synthesizes exactly this
       # spelling for every method it documents, so the silent drop hit the parameter-annotated, return-bare
       # shape ADR-14 exists to help.
-      def declared_untyped?(declared)
-        declared.is_a?(Type::Dynamic)
+      #
+      # The translation alone cannot say the author wrote `untyped`: an interface return (`-> _Taker[1]`,
+      # `-> _ToS`) also translates to `Dynamic`, and reading it as an absent declaration replaced it with an
+      # unrelated nominal under `--overwrite` (#2178). So every overload's return must be `untyped` as written.
+      def declared_untyped?(declared, method_def)
+        declared.is_a?(Type::Dynamic) &&
+          method_def.method_types.all? { |mt| mt.type.return_type.is_a?(RBS::Types::Bases::Any) }
       end
 
       # Proposed without {#tighter?}: a declared `untyped` return carries no information to weigh it against, the
@@ -1465,7 +1925,16 @@ module Rigor
       VALUE_LITERAL_CLASSES = [Integer, String, Symbol].freeze
       private_constant :VALUE_LITERAL_CLASSES
 
-      # The same object back when nothing needed widening.
+      # Core generics whose RBS parameters are all `out` or `unchecked out`, so a widened argument is a supertype of
+      # the body's type. An invariant or `in` parameter (a user `class Sink[in T]`) is not widened: `Sink[Integer]`
+      # is no supertype of `Sink[1]` there.
+      COVARIANT_CARRIERS = %w[Array Hash Set Range Enumerator].freeze
+      private_constant :COVARIANT_CARRIERS
+
+      # The same object back when nothing needed widening. A literal nested in a tuple element, a record or hash
+      # value, or a covariant generic argument (`[1, "a"]`, `{ a: 1 }`, `Hash[String, 1]`) widens the same way, while
+      # the carrier's shape and a record's keys stay: a subclass override returning `[2, "b"]` is no widening of
+      # `[Integer, String]`. A nested `nil` is an honest member there, as in a top-level union.
       def widen_value_literals(type)
         case type
         when Type::Constant
@@ -1473,14 +1942,35 @@ module Rigor
           return type unless VALUE_LITERAL_CLASSES.any? { |klass| type.value.instance_of?(klass) }
 
           Type::Combinator.nominal_of(type.value.class.name)
-        when Type::Union
-          members = type.members.map { |member| widen_value_literals(member) }
-          members.each_with_index.all? { |m, i| m.equal?(type.members[i]) } ? type : Type::Combinator.union(*members)
+        when Type::Union then widen_members(type.members, type) { |members| Type::Combinator.union(*members) }
+        when Type::Tuple then widen_members(type.elements, type) { |elements| Type::Combinator.tuple_of(*elements) }
+        when Type::HashShape then widen_hash_shape_values(type)
+        when Type::Nominal
+          return type unless COVARIANT_CARRIERS.include?(type.class_name)
+
+          widen_members(type.type_args, type) do |args|
+            Type::Combinator.nominal_of(type.class_name, type_args: args)
+          end
         else
           type
         end
       end
 
+      def widen_members(members, type)
+        widened = members.map { |member| widen_value_literals(member) }
+        widened.each_with_index.all? { |m, i| m.equal?(members[i]) } ? type : yield(widened)
+      end
+
+      def widen_hash_shape_values(shape)
+        widen_members(shape.pairs.values, shape) do |values|
+          Type::HashShape.new(
+            shape.pairs.keys.zip(values).to_h,
+            required_keys: shape.required_keys, optional_keys: shape.optional_keys,
+            read_only_keys: shape.read_only_keys, extra_keys: shape.extra_keys
+          )
+        end
+      end
+
       def widen_boolean_literal
         Type::Combinator.union(Type::Combinator.constant_of(true), Type::Combinator.constant_of(false))
       end
@@ -1624,11 +2114,12 @@ module Rigor
       # `Type::Constant#erase_to_rbs` spells the values RBS writes as literal types (`true` / `false` /
       # `nil`, an Integer, a Symbol, a String) as that literal and every other carrier as a nominal. Asking
       # which of the two branches it took keeps the list of literal-spellable classes from forking a second
-      # copy into this file. A Range's nominal carries its element type (`Range[Integer]`, #1891), so it is
-      # excluded by class rather than by comparing the erasure with the class name: like a Float it is a
-      # nominal, not a pinned literal.
+      # copy into this file. A Range's and a Set's nominal carries a type argument (`Range[Integer]`, #1891;
+      # `Set[untyped]`, #2177), so they are excluded by class rather than by comparing the erasure with the class
+      # name: like a Float each is a nominal, not a pinned literal.
       def rbs_literal?(type)
-        type.is_a?(Type::Constant) && !type.value.is_a?(Range) && type.erase_to_rbs != type.value.class.name
+        type.is_a?(Type::Constant) && !type.value.is_a?(Range) && !type.value.is_a?(::Set) &&
+          type.erase_to_rbs != type.value.class.name
       end
 
       # Heuristic added after the third-round self-dogfood: `FallbackTracer#size` body is `@events.size`, where
@@ -1696,7 +2187,7 @@ module Rigor
       def render_rbs_line(def_node, inferred, class_name, kind)
         params = def_node.parameters
         head = "(#{render_param_list(params, class_name, def_node.name)})#{block_signature_suffix(params)}"
-        prefix = method_def_prefix(class_name, def_node.name, kind)
+        prefix = method_def_prefix(def_node, kind)
         "#{prefix}#{def_node.name}: #{head} -> #{paren_wrap_union(elaborated_rbs(inferred, owner: class_name))}"
       end
 
@@ -1707,8 +2198,35 @@ module Rigor
       # `owner:` is the class or module the rendered member belongs to. {AliasIndex} needs it to judge whether
       # a matching alias is one this reader would expect to see; a call site that cannot supply it renders the
       # type unfolded, which is the same output as before #1002.
+      #
+      # Issue #2230 — qualified last, after the alias fold has matched the unqualified spelling it keys on, so a core
+      # name a namespace of the owner shadows (`Set` inside a `module Foo` that declares `Foo::Set`) is written `::Set`.
       def elaborated_rbs(type, owner: nil)
-        alias_index.fold(TypeElaborator.elaborate(type, environment: @environment).erase_to_rbs, owner)
+        folded = alias_index.fold(TypeElaborator.elaborate(type, environment: @environment).erase_to_rbs, owner)
+        captured = owner_type_param_names(owner)
+        TypeNameQualification.qualify(folded, owner) { |name| captured.include?(name) || declared_constant?(name) }
+      end
+
+      # Issue #2436 — inside `class Array[unchecked out E]` a bare `E` names the type variable, not a class `::E`,
+      # so a class whose spelling equals one of the owner's declared type-parameter names is anchored. The names
+      # come as `"Array::E"`, the form {TypeNameQualification.qualify} asks about for the owner's own namespace;
+      # a namespace the owner is nested in does not bind its parameters inside the owner's declaration.
+      def owner_type_param_names(owner)
+        loader = owner && @environment&.rbs_loader
+        return Set.new if loader.nil?
+
+        @owner_type_param_names ||= {}
+        @owner_type_param_names.fetch(owner) do
+          @owner_type_param_names[owner] = loader.class_declaration_type_params(owner).to_set do |p|
+            "#{owner}::#{p.name}"
+          end
+        end
+      end
+
+      # Whether a type name written as `name` resolves to a constant the run can see: one the RBS environment
+      # declares, or a class or module the project's source declares, whether or not `sig/` has caught up with it.
+      def declared_constant?(name)
+        class_known?(name) || Reflection.discovered_class?(name, scope: file_base_scope(@environment))
       end
 
       # Issue #1002 — the reverse of {#translate_method_type_return}'s `alias_expander:`. Folding happens here,
@@ -1800,12 +2318,17 @@ module Rigor
       # Per-file context the attr_* walker threads through its recursive descent. Keeps parameter lists in
       # check. `obs_ivar_map` carries the observation-derived fallback types built by
       # {#build_observed_ivar_map}; it is empty when sig-gen is invoked without `--params=observed`.
-      AttrWalkContext = Struct.new(:path, :scope_index, :obs_ivar_map, :out, keyword_init: true)
+      # `definer_table` is {#definer_table}'s map, which drops an attribute another definer replaces. A context
+      # with `definers` only records each attribute's slot and call node for that map, and builds nothing.
+      AttrWalkContext = Struct.new(:path, :scope_index, :obs_ivar_map, :out, :definer_table, :definers,
+                                   keyword_init: true)
       private_constant :AttrWalkContext
 
-      def collect_attr_candidates(root, path, scope_index, obs_ivar_map = {})
+      def collect_attr_candidates(root, path, scope_index, obs_ivar_map = {}, definer_table = {})
+        @lookup_ivars = Set.new
+        collect_lookup_ivar_writes(root, scope_index)
         ctx = AttrWalkContext.new(path: path, scope_index: scope_index,
-                                  obs_ivar_map: obs_ivar_map, out: [])
+                                  obs_ivar_map: obs_ivar_map, out: [], definer_table: definer_table)
         walk_attr_calls(root, [], false, ctx)
         ctx.out
       end
@@ -1834,7 +2357,7 @@ module Rigor
             return
           end
         when Prism::CallNode
-          return if refine_block_call?(node)
+          return if skipped_block_call?(node)
 
           collect_attr_call(node, prefix, in_singleton_class, ctx)
         end
@@ -1850,11 +2373,67 @@ module Rigor
         class_name = prefix.join("::")
         symbol_names = extract_symbol_arguments(call_node)
         return if symbol_names.empty?
+        return record_attr_definers(call_node, class_name, symbol_names, ctx) if ctx.definers
 
         ivar_lookup = ivar_type_lookup(ctx.scope_index, class_name, ctx.obs_ivar_map)
+        offset = call_node.location.start_offset
         symbol_names.each do |attr_name|
-          ivar_type = ivar_lookup.call(attr_name)
-          ctx.out.concat(build_attr_candidates(call_node.name, class_name, attr_name, ivar_type, ctx))
+          ivar_type = with_lookup_nil(ivar_lookup.call(attr_name), class_name, attr_name)
+          candidates = build_attr_candidates(call_node.name, class_name, attr_name, ivar_type, ctx)
+          ctx.out.concat(candidates.select do |c|
+            live_definer?(ctx.definer_table, [class_name, :instance, c.method_name], offset)
+          end)
+        end
+      end
+
+      # #2197 — an attribute whose ivar an instance method assigns from an optimistic lookup (`@x = h[k]`) reads
+      # `nil` on a miss, as such a return does ({Inference::DefReturnTyper.optimistic_value?}), so the written
+      # reader keeps the `nil` the engine's nil-free reading of the lookup drops.
+      def with_lookup_nil(type, class_name, attr_name)
+        return type if type.nil? || !@lookup_ivars.include?([class_name, :"@#{attr_name}"])
+
+        Type::Combinator.union(type, Type::Combinator.constant_of(nil))
+      end
+
+      LOOKUP_IVAR_WRITES = [
+        Prism::InstanceVariableWriteNode, Prism::InstanceVariableOrWriteNode, Prism::InstanceVariableAndWriteNode
+      ].freeze
+      private_constant :LOOKUP_IVAR_WRITES
+
+      # Records `[class_name, ivar]` for each ivar an instance `def` assigns an optimistic lookup to. The class
+      # prefixes come from {#collect_other_ivar_writes}' walk, whose own result is not needed here.
+      def collect_lookup_ivar_writes(root, scope_index)
+        collect_other_ivar_writes(root, [], false, Hash.new { |h, k| h[k] = Set.new }) do |def_node, prefix|
+          next if def_node.receiver || prefix.empty?
+
+          scan_lookup_ivar_writes(def_node.body, prefix, scope_index)
+        end
+      end
+
+      def scan_lookup_ivar_writes(node, prefix, scope_index)
+        return unless node.is_a?(Prism::Node)
+
+        record_lookup_ivar_write(node, prefix, scope_index)
+        node.rigor_each_child { |child| scan_lookup_ivar_writes(child, prefix, scope_index) }
+      end
+
+      def record_lookup_ivar_write(node, prefix, scope_index)
+        return unless LOOKUP_IVAR_WRITES.any? { |klass| node.is_a?(klass) }
+
+        scope = scope_index[node.value] || scope_index[node]
+        return if scope.nil? || !Inference::DefReturnTyper.optimistic_value?(
+          node.value, scope, Inference::DefReturnTyper::LookupContext.new(scope_index, {}.compare_by_identity)
+        )
+
+        @lookup_ivars << [prefix.join("::"), node.name]
+      end
+
+      def record_attr_definers(call_node, class_name, symbol_names, ctx)
+        symbol_names.each do |attr_name|
+          ATTR_KINDS.fetch(call_node.name).each do |variant|
+            method_name = variant == :writer ? :"#{attr_name}=" : attr_name
+            ctx.definers << [[class_name, :instance, method_name], call_node]
+          end
         end
       end
 
@@ -1885,8 +2464,8 @@ module Rigor
         end
       end
 
-      # Build a { class_name => { attr_name_sym => Type } } map that records observation-derived types for
-      # ivars assigned directly from `def initialize` parameters. Only populated when `@observations` is
+      # Records the observation-derived types of ivars assigned directly from `def initialize` parameters, keyed
+      # by class name and then attribute name. Only populated when `@observations` is
       # non-empty (i.e. `--params=observed` was supplied). Matches the pattern `@ivar_name = param_name` where
       # `param_name` is a required / optional positional or keyword parameter of `initialize`.
       #
@@ -1919,20 +2498,25 @@ module Rigor
       # and every write inside an instance `def` or a block, an `instance_variable_set` on `self` included
       # ({#written_ivar}). `def self.x`, a `class << self` body and a bare class-body write set the class
       # object's ivars and do not count.
-      def collect_other_ivar_writes(node, prefix, in_block, other_writes)
+      #
+      # `on_def`, when given, is called with each instance `def` reached and its class prefix, so another
+      # per-class reading of instance-method ivar writes shares this walk ({#collect_lookup_ivar_writes}).
+      def collect_other_ivar_writes(node, prefix, in_block, other_writes, &on_def)
         return unless node.is_a?(Prism::Node)
 
         case node
         when Prism::ClassNode, Prism::ModuleNode
           child_prefix = Source::ConstantPath.declaration_prefix(prefix, node.constant_path)
-          return collect_other_ivar_writes(node.body, child_prefix, false, other_writes) if child_prefix
+          return collect_other_ivar_writes(node.body, child_prefix, false, other_writes, &on_def) if child_prefix
         when Prism::SingletonClassNode then return
-        when Prism::DefNode then return record_def_ivar_writes(node, prefix, other_writes)
+        when Prism::DefNode
+          on_def&.call(node, prefix)
+          return record_def_ivar_writes(node, prefix, other_writes)
         when Prism::BlockNode, Prism::LambdaNode then in_block = true
         end
         record_class_level_write(node, prefix, in_block, other_writes) unless prefix.empty?
 
-        node.rigor_each_child { |child| collect_other_ivar_writes(child, prefix, in_block, other_writes) }
+        node.rigor_each_child { |child| collect_other_ivar_writes(child, prefix, in_block, other_writes, &on_def) }
       end
 
       # The ivars an `attr_writer` / `attr_accessor` on `self` names, or the ivar a write in a block sets.
@@ -2014,7 +2598,7 @@ module Rigor
         node.rigor_each_child { |c| collect_init_ivar_obs(c, prefix, result) }
       end
 
-      # Derive { attr_name_sym => Type } for a single `def initialize` by matching `@ivar = param_name`
+      # Derives the observation-derived attribute types of a single `def initialize`, matching `@ivar = param_name`
       # assignments against the available `[class_name, :initialize]` observations.
       def ivar_obs_from_initialize(class_name, def_node)
         obs_list = @observations[[class_name, :initialize]]
@@ -2029,8 +2613,8 @@ module Rigor
         build_ivar_obs_type_map(ivar_to_param, param_index, obs_list)
       end
 
-      # Map `{ ivar_name => param_name }` → `{ attr_name_sym => Type }` by looking up each param's observation
-      # types and unioning them.
+      # Maps `{ ivar_name => param_name }` to attribute types by looking up each param's observation types and
+      # unioning them.
       def build_ivar_obs_type_map(ivar_to_param, param_index, obs_list)
         ivar_to_param.filter_map do |ivar_name, param_name|
           types = collect_param_obs_types(obs_list, param_name, param_index[param_name])